Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/06/12 23:43:23+02:00 (none)!br1
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into null.(none):/data/mtx/src/build/unstable.wrt/openembedded

2005/06/12 23:42:45+02:00 (none)!br1
fixing wrt-image.bbclass and wrt54.conf DEPENDS with funny python syntax

BKrev: 42acb9c9k4Ubl1K4XdonutrYBFf7QQ

diff --git a/classes/wrt-image.bbclass b/classes/wrt-image.bbclass
index f6ca5bc..f8ecce3 100644 (file)
--- a/classes/wrt-image.bbclass
+++ b/classes/wrt-image.bbclass
@@ -31,4 +31,4 @@ wrt_create_images() {
 
 IMAGE_POSTPROCESS_COMMAND += "wrt_create_images;"
 
-DEPENDS += "wrt-imagetools"
\ No newline at end of file
+DEPENDS_prepend = "${@["wrt-imagetools-native ", ""][(bb.data.getVar('PACKAGES', d, 1) == '')]}"
\ No newline at end of file

diff --git a/conf/machine/wrt54.conf b/conf/machine/wrt54.conf
index 856ca97..6883782 100644 (file)
--- a/conf/machine/wrt54.conf
+++ b/conf/machine/wrt54.conf
@@ -29,5 +29,5 @@ EXTRA_IMAGECMD_squashfs-lzma = "-root-owned -le"
 INHERIT += "wrt-image"
 
 # strip even more:
-DEPENDS += "elfkickers-native"
+DEPENDS_prepend = "${@["elfkickers-native ", ""][(bb.data.getVar('PACKAGES', d, 1) == '')]}"
 export STRIP = "sstrip"
\ No newline at end of file