From a9b6c951bc23b55eb9e9f945aa17a838f461f25c Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Fri, 13 Oct 2023 16:56:07 +0800 Subject: 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 Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie --- ...mpress_groupfile-outside-WITH_LIBMODULEMD.patch | 46 ---------------------- .../createrepo-c/createrepo-c_1.0.0.bb | 43 -------------------- .../createrepo-c/createrepo-c_1.0.1.bb | 42 ++++++++++++++++++++ 3 files changed, 42 insertions(+), 89 deletions(-) delete mode 100644 meta/recipes-devtools/createrepo-c/createrepo-c/0001-Move-cr_compress_groupfile-outside-WITH_LIBMODULEMD.patch delete mode 100644 meta/recipes-devtools/createrepo-c/createrepo-c_1.0.0.bb create mode 100644 meta/recipes-devtools/createrepo-c/createrepo-c_1.0.1.bb (limited to 'meta/recipes-devtools/createrepo-c') 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 -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 ---- - 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.0.bb deleted file mode 100644 index f4e65492f8..0000000000 --- a/meta/recipes-devtools/createrepo-c/createrepo-c_1.0.0.bb +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY = "C implementation of createrepo." -HOMEPAGE = "https://github.com/rpm-software-management/createrepo_c/wiki" - -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRC_URI = "git://github.com/rpm-software-management/createrepo_c;branch=master;protocol=https \ - 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" - -S = "${WORKDIR}/git" - -DEPENDS = "expat curl glib-2.0 libxml2 openssl bzip2 zlib file sqlite3 xz rpm" -DEPENDS:append:class-native = " file-replacement-native" - -inherit cmake pkgconfig bash-completion setuptools3-base - -EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3 -DWITH_ZCHUNK=OFF -DENABLE_DRPM=OFF -DWITH_LIBMODULEMD=OFF" - -BBCLASSEXTEND = "native nativesdk" - -# Direct createrepo to read rpm configuration from our sysroot, not the one it was compiled in -do_install:append:class-native() { - create_wrapper ${D}/${bindir}/createrepo_c \ - RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \ - MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc - create_wrapper ${D}/${bindir}/modifyrepo_c \ - MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc -} - -do_install:append:class-nativesdk() { - create_wrapper ${D}/${bindir}/createrepo_c \ - RPM_CONFIGDIR=${SDKPATHNATIVE}${libdir_nativesdk}/rpm \ - MAGIC=${datadir}/misc/magic.mgc - create_wrapper ${D}/${bindir}/modifyrepo_c \ - MAGIC=${datadir}/misc/magic.mgc - rm -rf ${D}/etc -} diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_1.0.1.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_1.0.1.bb new file mode 100644 index 0000000000..44d9213bd4 --- /dev/null +++ b/meta/recipes-devtools/createrepo-c/createrepo-c_1.0.1.bb @@ -0,0 +1,42 @@ +SUMMARY = "C implementation of createrepo." +HOMEPAGE = "https://github.com/rpm-software-management/createrepo_c/wiki" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "git://github.com/rpm-software-management/createrepo_c;branch=master;protocol=https \ + file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ + file://0001-include-rpm-rpmstring.h.patch \ + file://time64fix.patch \ + " + +SRCREV = "e7af838e04009cd2f848a00e1ea31cc42c8f3ae7" + +S = "${WORKDIR}/git" + +DEPENDS = "expat curl glib-2.0 libxml2 openssl bzip2 zlib file sqlite3 xz rpm" +DEPENDS:append:class-native = " file-replacement-native" + +inherit cmake pkgconfig bash-completion setuptools3-base + +EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3 -DWITH_ZCHUNK=OFF -DENABLE_DRPM=OFF -DWITH_LIBMODULEMD=OFF" + +BBCLASSEXTEND = "native nativesdk" + +# Direct createrepo to read rpm configuration from our sysroot, not the one it was compiled in +do_install:append:class-native() { + create_wrapper ${D}/${bindir}/createrepo_c \ + RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \ + MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc + create_wrapper ${D}/${bindir}/modifyrepo_c \ + MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc +} + +do_install:append:class-nativesdk() { + create_wrapper ${D}/${bindir}/createrepo_c \ + RPM_CONFIGDIR=${SDKPATHNATIVE}${libdir_nativesdk}/rpm \ + MAGIC=${datadir}/misc/magic.mgc + create_wrapper ${D}/${bindir}/modifyrepo_c \ + MAGIC=${datadir}/misc/magic.mgc + rm -rf ${D}/etc +} -- cgit v1.2.3-54-g00ecf