diff options
author | Richard Purdie <richard@openedhand.com> | 2006-02-13 13:09:56 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-02-13 13:09:56 +0000 |
commit | d0bf2b3192862de9027f64c2b71151940b9a1e0c (patch) | |
tree | bde412d42698353cdeff8578bc61fbd37feb5210 | |
parent | a6775856463dd3cab66ee40fb7a25ac4e5d184ac (diff) | |
download | poky-d0bf2b3192862de9027f64c2b71151940b9a1e0c.tar.gz |
Fix an bitbake RDEPENDS bug and add a hack to work around quilt-native issues (the alternative is to start creating a load of native packages to map the runtime depends to build time ones).
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@275 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rwxr-xr-x | bitbake/bin/bitbake | 1 | ||||
-rw-r--r-- | openembedded/conf/bitbake.conf | 2 | ||||
-rw-r--r-- | openembedded/packages/quilt/quilt-native_0.42.bb | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake index b1fd76a4f1..f371bfe165 100755 --- a/bitbake/bin/bitbake +++ b/bitbake/bin/bitbake | |||
@@ -655,6 +655,7 @@ class BBCooker: | |||
655 | if (item == pn): | 655 | if (item == pn): |
656 | rdepends += bb.utils.explode_deps(bb.data.getVar('RDEPENDS', the_data, True) or "") | 656 | rdepends += bb.utils.explode_deps(bb.data.getVar('RDEPENDS', the_data, True) or "") |
657 | rdepends += bb.utils.explode_deps(bb.data.getVar('RRECOMMENDS', the_data, True) or "") | 657 | rdepends += bb.utils.explode_deps(bb.data.getVar('RRECOMMENDS', the_data, True) or "") |
658 | rdepends += bb.utils.explode_deps(bb.data.getVar("RDEPENDS_%s" % pn, the_data, True) or "") | ||
658 | else: | 659 | else: |
659 | packages = (bb.data.getVar('PACKAGES', the_data, 1).split() or "") | 660 | packages = (bb.data.getVar('PACKAGES', the_data, 1).split() or "") |
660 | for package in packages: | 661 | for package in packages: |
diff --git a/openembedded/conf/bitbake.conf b/openembedded/conf/bitbake.conf index 89ab4ff924..1b567fe521 100644 --- a/openembedded/conf/bitbake.conf +++ b/openembedded/conf/bitbake.conf | |||
@@ -72,7 +72,7 @@ DATETIME = "${DATE}${TIME}" | |||
72 | 72 | ||
73 | # python-native should be here but python relies on building | 73 | # python-native should be here but python relies on building |
74 | # its own in staging | 74 | # its own in staging |
75 | ASSUME_PROVIDED = "cvs-native svn-native" | 75 | ASSUME_PROVIDED = "cvs-native svn-native bzip2-native patch-native diffstat-native" |
76 | 76 | ||
77 | ################################################################## | 77 | ################################################################## |
78 | # Package default variables. | 78 | # Package default variables. |
diff --git a/openembedded/packages/quilt/quilt-native_0.42.bb b/openembedded/packages/quilt/quilt-native_0.42.bb index ad3834ea21..6c54c476ce 100644 --- a/openembedded/packages/quilt/quilt-native_0.42.bb +++ b/openembedded/packages/quilt/quilt-native_0.42.bb | |||
@@ -14,6 +14,9 @@ PATCHCLEANCMD = "" | |||
14 | PATCHCMD = "num='%s'; name='%s'; file='%s'; patch -p "$num" -i "$file"" | 14 | PATCHCMD = "num='%s'; name='%s'; file='%s'; patch -p "$num" -i "$file"" |
15 | EXTRA_OECONF = "--disable-nls" | 15 | EXTRA_OECONF = "--disable-nls" |
16 | 16 | ||
17 | #RDEPENDS_${PN} = "patch-native diffstat-native bzip2-native" | ||
18 | RDEPENDS_${PN} = "" | ||
19 | |||
17 | do_configure () { | 20 | do_configure () { |
18 | chmod 755 configure | 21 | chmod 755 configure |
19 | oe_runconf | 22 | oe_runconf |