]> git.openpandora.org Git - openembedded.git/commitdiff
Merge bk://oe-devel.bkbits.net/openembedded
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>
Sun, 12 Jun 2005 22:40:09 +0000 (22:40 +0000)
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>
Sun, 12 Jun 2005 22:40:09 +0000 (22:40 +0000)
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

classes/wrt-image.bbclass
conf/machine/wrt54.conf

index f6ca5bcb1935451020379975bb0537132ed5a4d7..f8ecce320b2933693db9c1f2baa2e48cd39257e5 100644 (file)
@@ -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
index 856ca97013fe9274addd280e29b28dbdc2fc9cc6..6883782799877a5a0a7ec6e80cf60c50e65570b8 100644 (file)
@@ -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