From 0013f8195c046031aad5156d889b86676144e74b Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 5 May 2021 17:18:17 +0200 Subject: createrepo-c: upgrade 0.17.0 -> 0.17.2 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...-set-PYTHON_INSTALL_DIR-by-running-python.patch | 6 ++-- .../createrepo-c/createrepo-c_0.17.0.bb | 40 ---------------------- .../createrepo-c/createrepo-c_0.17.2.bb | 40 ++++++++++++++++++++++ 3 files changed, 43 insertions(+), 43 deletions(-) delete mode 100644 meta/recipes-devtools/createrepo-c/createrepo-c_0.17.0.bb create mode 100644 meta/recipes-devtools/createrepo-c/createrepo-c_0.17.2.bb (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch b/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch index d675af4f8b..4b844574ea 100644 --- a/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch +++ b/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch @@ -1,4 +1,4 @@ -From 218a4760945be7a404df6515ffbc769c92791f9b Mon Sep 17 00:00:00 2001 +From 6f8f6d151b831b60f6e7892aa9294a6361353c72 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 30 Dec 2016 18:31:02 +0200 Subject: [PATCH] Do not set PYTHON_INSTALL_DIR by running python @@ -11,11 +11,11 @@ Signed-off-by: Alexander Kanavin 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt -index 855127f..dff1d97 100644 +index ecc262d..a86514c 100644 --- a/src/python/CMakeLists.txt +++ b/src/python/CMakeLists.txt @@ -14,7 +14,7 @@ if (NOT SKBUILD) - FIND_PACKAGE(PythonInterp 3 EXACT REQUIRED) + FIND_PACKAGE(PythonLibs 3 REQUIRED) endif (NOT SKBUILD) -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.0.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.0.bb deleted file mode 100644 index e0433806b2..0000000000 --- a/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.0.bb +++ /dev/null @@ -1,40 +0,0 @@ -DESCRIPTION = "C implementation of createrepo." -HOMEPAGE = "https://github.com/rpm-software-management/createrepo_c/wiki" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRC_URI = "git://github.com/rpm-software-management/createrepo_c \ - file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ - " - -SRCREV = "909a0636665ed96f97babc3b887f9badc88875c3" - -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 distutils3-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=${SDKPATHNATIVE}${datadir}/misc/magic.mgc - create_wrapper ${D}/${bindir}/modifyrepo_c \ - MAGIC=${SDKPATHNATIVE}${datadir}/misc/magic.mgc - rm -rf ${D}/etc -} diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.2.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.2.bb new file mode 100644 index 0000000000..76bdd69836 --- /dev/null +++ b/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.2.bb @@ -0,0 +1,40 @@ +DESCRIPTION = "C implementation of createrepo." +HOMEPAGE = "https://github.com/rpm-software-management/createrepo_c/wiki" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "git://github.com/rpm-software-management/createrepo_c \ + file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ + " + +SRCREV = "8eff6ed99f5fd0ba844cb8513963435caab5fd3c" + +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 distutils3-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=${SDKPATHNATIVE}${datadir}/misc/magic.mgc + create_wrapper ${D}/${bindir}/modifyrepo_c \ + MAGIC=${SDKPATHNATIVE}${datadir}/misc/magic.mgc + rm -rf ${D}/etc +} -- cgit 1.2.3-korg