diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2012-08-01 17:14:53 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-01 23:11:17 +0100 |
commit | 148e19e880f0c132f7679bd8779377fa4e1e6778 (patch) | |
tree | cb6c9f92cecd1ed0e67dedeb019b51e4456c2504 | |
parent | fd6251ef548da7dbca354754cc0b666b2ccd0c45 (diff) | |
download | poky-148e19e880f0c132f7679bd8779377fa4e1e6778.tar.gz |
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]
(From OE-Core rev: 72d673bef385e756bd858f9eca7fe419efaceb39)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/rootfs_rpm.bbclass | 2 | ||||
-rwxr-xr-x | meta/recipes-support/createrepo/createrepo/rpm-createsolvedb.py (renamed from scripts/rpm-createsolvedb.py) | 0 | ||||
-rw-r--r-- | meta/recipes-support/createrepo/createrepo_0.4.11.bb | 4 |
3 files changed, 4 insertions, 2 deletions
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" | |||
17 | do_rootfs[depends] += "opkg-native:do_populate_sysroot" | 17 | do_rootfs[depends] += "opkg-native:do_populate_sysroot" |
18 | 18 | ||
19 | # Creating the repo info in do_rootfs | 19 | # Creating the repo info in do_rootfs |
20 | #do_rootfs[depends] += "createrepo-native:do_populate_sysroot" | 20 | do_rootfs[depends] += "createrepo-native:do_populate_sysroot" |
21 | 21 | ||
22 | do_rootfs[recrdeptask] += "do_package_write_rpm" | 22 | do_rootfs[recrdeptask] += "do_package_write_rpm" |
23 | 23 | ||
diff --git a/scripts/rpm-createsolvedb.py b/meta/recipes-support/createrepo/createrepo/rpm-createsolvedb.py index a5b61bade7..a5b61bade7 100755 --- a/scripts/rpm-createsolvedb.py +++ b/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" | |||
6 | 6 | ||
7 | RDEPENDS_${PN}_virtclass-native += "libxml2-native rpm-native" | 7 | RDEPENDS_${PN}_virtclass-native += "libxml2-native rpm-native" |
8 | 8 | ||
9 | PR = "r4" | 9 | PR = "r5" |
10 | 10 | ||
11 | SRC_URI= "http://createrepo.baseurl.org/download/${BP}.tar.gz \ | 11 | SRC_URI= "http://createrepo.baseurl.org/download/${BP}.tar.gz \ |
12 | file://fix-native-install.patch \ | 12 | file://fix-native-install.patch \ |
13 | file://python-scripts-should-use-interpreter-from-env.patch \ | 13 | file://python-scripts-should-use-interpreter-from-env.patch \ |
14 | file://createrepo-rpm549.patch \ | 14 | file://createrepo-rpm549.patch \ |
15 | file://rpm-createsolvedb.py \ | ||
15 | " | 16 | " |
16 | 17 | ||
17 | SRC_URI[md5sum] = "3e9ccf4abcffe3f49af078c83611eda2" | 18 | SRC_URI[md5sum] = "3e9ccf4abcffe3f49af078c83611eda2" |
@@ -21,4 +22,5 @@ BBCLASSEXTEND = "native" | |||
21 | 22 | ||
22 | do_install () { | 23 | do_install () { |
23 | oe_runmake -e 'DESTDIR=${D}' install | 24 | oe_runmake -e 'DESTDIR=${D}' install |
25 | install -m 0755 ${WORKDIR}/rpm-createsolvedb.py ${D}${bindir}/ | ||
24 | } | 26 | } |