diff options
| author |   Wang Mingyu <wangmy@fujitsu.com> | 2023-10-13 16:56:07 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-10-19 13:38:54 +0100 |
| commit | 531b32892e3e4bfa43a8809c36432a86fe93e69b (patch) | |
| tree | f3e16d81377ac8c43940940be0814dcbad38f6fa | |
| parent | 116895c05c78a60488b14516ea25f8c27d2ece7e (diff) | |
| download | openembedded-core-contrib-531b32892e3e4bfa43a8809c36432a86fe93e69b.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.
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
| -rw-r--r-- | meta/recipes-devtools/createrepo-c/createrepo-c/0001-Move-cr_compress_groupfile-outside-WITH_LIBMODULEMD.patch | 46 | ||||
| -rw-r--r-- | meta/recipes-devtools/createrepo-c/createrepo-c_1.0.1.bb (renamed from meta/recipes-devtools/createrepo-c/createrepo-c_1.0.0.bb) | 3 |
2 files changed, 1 insertions, 48 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 @@ -From 5326969acc0c7e9e3cabca202154e4120c0d2c2f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 26 Sep 2023 14:52:11 -0700 -Subject: [PATCH] Move cr_compress_groupfile outside WITH_LIBMODULEMD - -This function is used in code which is not conditional under WITH_LIBMODULEMD -therefore the declaration should also match its definition scope - -Fixes build issues flagged by clang - -src/createrepo_c.c:850:16: error: incompatible integer to pointer conversion initializing 'gchar *' (aka 'char *') with an - expression of type 'int' [-Wint-conversion] -| 850 | gchar *compressed_path = cr_compress_groupfile(cmd_options->groupfile_fullpath, tmp_out_repo, compression); -| | ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Upstream-Status: Submitted [https://github.com/rpm-software-management/createrepo_c/pull/387] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/metadata_internal.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/metadata_internal.h b/src/metadata_internal.h -index 8ba0576..ecfbac2 100644 ---- a/src/metadata_internal.h -+++ b/src/metadata_internal.h -@@ -52,14 +52,14 @@ cr_metadata_load_modulemd(ModulemdModuleIndex **moduleindex, - * @param dest_dir Path to directory where the compressed groupfile should be stored. - * @return Path to the new compressed groupfile. Has to be freed by the caller. - */ -+ -+#endif /* WITH_LIBMODULEMD */ -+ - gchar * - cr_compress_groupfile(const char *groupfile, - const char *dest_dir, - cr_CompressionType compression); - -- --#endif /* WITH_LIBMODULEMD */ -- - #ifdef __cplusplus - } - #endif --- -2.42.0 - diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_1.0.0.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_1.0.1.bb index f4e65492f8..44d9213bd4 100644 --- a/meta/recipes-devtools/createrepo-c/createrepo-c_1.0.0.bb +++ b/meta/recipes-devtools/createrepo-c/createrepo-c_1.0.1.bb @@ -8,10 +8,9 @@ SRC_URI = "git://github.com/rpm-software-management/createrepo_c;branch=master;p file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ file://0001-include-rpm-rpmstring.h.patch \ file://time64fix.patch \ - file://0001-Move-cr_compress_groupfile-outside-WITH_LIBMODULEMD.patch \ " -SRCREV = "0cc13920991b2fb8f87fb9d352bd3394c2983289" +SRCREV = "e7af838e04009cd2f848a00e1ea31cc42c8f3ae7" S = "${WORKDIR}/git" |