summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/createrepo-c/createrepo-c
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2023-10-13 16:56:07 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-10-19 13:38:57 +0100
commita9b6c951bc23b55eb9e9f945aa17a838f461f25c (patch)
tree3c86b51b49c4bb9d31d03f6b248aef0d56945093 /meta/recipes-devtools/createrepo-c/createrepo-c
parent1e21429a49bc2b09ce16a8a0a81e9d1f2800f1ee (diff)
downloadpoky-a9b6c951bc23b55eb9e9f945aa17a838f461f25c.tar.gz
createrepo-c: upgrade 1.0.0 -> 1.0.1
0001-Move-cr_compress_groupfile-outside-WITH_LIBMODULEMD.patch removed since it's included in 1.0.1. (From OE-Core rev: 531b32892e3e4bfa43a8809c36432a86fe93e69b) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/createrepo-c/createrepo-c')
-rw-r--r--meta/recipes-devtools/createrepo-c/createrepo-c/0001-Move-cr_compress_groupfile-outside-WITH_LIBMODULEMD.patch46
1 files changed, 0 insertions, 46 deletions
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Move-cr_compress_groupfile-outside-WITH_LIBMODULEMD.patch b/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Move-cr_compress_groupfile-outside-WITH_LIBMODULEMD.patch
deleted file mode 100644
index ea768e06e6..0000000000
--- a/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Move-cr_compress_groupfile-outside-WITH_LIBMODULEMD.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From 5326969acc0c7e9e3cabca202154e4120c0d2c2f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 26 Sep 2023 14:52:11 -0700
4Subject: [PATCH] Move cr_compress_groupfile outside WITH_LIBMODULEMD
5
6This function is used in code which is not conditional under WITH_LIBMODULEMD
7therefore the declaration should also match its definition scope
8
9Fixes build issues flagged by clang
10
11src/createrepo_c.c:850:16: error: incompatible integer to pointer conversion initializing 'gchar *' (aka 'char *') with an
12 expression of type 'int' [-Wint-conversion]
13| 850 | gchar *compressed_path = cr_compress_groupfile(cmd_options->groupfile_fullpath, tmp_out_repo, compression);
14| | ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
15
16Upstream-Status: Submitted [https://github.com/rpm-software-management/createrepo_c/pull/387]
17Signed-off-by: Khem Raj <raj.khem@gmail.com>
18---
19 src/metadata_internal.h | 6 +++---
20 1 file changed, 3 insertions(+), 3 deletions(-)
21
22diff --git a/src/metadata_internal.h b/src/metadata_internal.h
23index 8ba0576..ecfbac2 100644
24--- a/src/metadata_internal.h
25+++ b/src/metadata_internal.h
26@@ -52,14 +52,14 @@ cr_metadata_load_modulemd(ModulemdModuleIndex **moduleindex,
27 * @param dest_dir Path to directory where the compressed groupfile should be stored.
28 * @return Path to the new compressed groupfile. Has to be freed by the caller.
29 */
30+
31+#endif /* WITH_LIBMODULEMD */
32+
33 gchar *
34 cr_compress_groupfile(const char *groupfile,
35 const char *dest_dir,
36 cr_CompressionType compression);
37
38-
39-#endif /* WITH_LIBMODULEMD */
40-
41 #ifdef __cplusplus
42 }
43 #endif
44--
452.42.0
46