From 72d673bef385e756bd858f9eca7fe419efaceb39 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Wed, 1 Aug 2012 17:14:53 +0800 Subject: [PATCH] createrepo 0.4.11: add rpm-createsolvedb.py Move scripts/rpm-createsolvedb.py to meta/recipes-support/createrepo/createrepo/ since we should wrap it to use the native python. [YOCTO #2822] Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/classes/rootfs_rpm.bbclass | 2 +- .../createrepo/createrepo}/rpm-createsolvedb.py | 0 meta/recipes-support/createrepo/createrepo_0.4.11.bb | 4 +++- 3 files changed, 4 insertions(+), 2 deletions(-) rename {scripts => meta/recipes-support/createrepo/createrepo}/rpm-createsolvedb.py (100%) diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass index c9258dfe39..a03e9f379d 100644 --- a/meta/classes/rootfs_rpm.bbclass +++ b/meta/classes/rootfs_rpm.bbclass @@ -17,7 +17,7 @@ do_rootfs[depends] += "rpmresolve-native:do_populate_sysroot" do_rootfs[depends] += "opkg-native:do_populate_sysroot" # Creating the repo info in do_rootfs -#do_rootfs[depends] += "createrepo-native:do_populate_sysroot" +do_rootfs[depends] += "createrepo-native:do_populate_sysroot" do_rootfs[recrdeptask] += "do_package_write_rpm" diff --git a/scripts/rpm-createsolvedb.py b/meta/recipes-support/createrepo/createrepo/rpm-createsolvedb.py similarity index 100% rename from scripts/rpm-createsolvedb.py rename to meta/recipes-support/createrepo/createrepo/rpm-createsolvedb.py diff --git a/meta/recipes-support/createrepo/createrepo_0.4.11.bb b/meta/recipes-support/createrepo/createrepo_0.4.11.bb index 7a4d05968e..dcddcf8331 100644 --- a/meta/recipes-support/createrepo/createrepo_0.4.11.bb +++ b/meta/recipes-support/createrepo/createrepo_0.4.11.bb @@ -6,12 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760" RDEPENDS_${PN}_virtclass-native += "libxml2-native rpm-native" -PR = "r4" +PR = "r5" SRC_URI= "http://createrepo.baseurl.org/download/${BP}.tar.gz \ file://fix-native-install.patch \ file://python-scripts-should-use-interpreter-from-env.patch \ file://createrepo-rpm549.patch \ + file://rpm-createsolvedb.py \ " SRC_URI[md5sum] = "3e9ccf4abcffe3f49af078c83611eda2" @@ -21,4 +22,5 @@ BBCLASSEXTEND = "native" do_install () { oe_runmake -e 'DESTDIR=${D}' install + install -m 0755 ${WORKDIR}/rpm-createsolvedb.py ${D}${bindir}/ } -- 2.40.1