image.bbclass: Fix IMAGE_BASENAME and PACKAGE_INSTALL variables

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2691 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 5c672f19bc3e2d1c31316d875e5767c53ecd5388..fde0f5999307cbbb2c678e4bd0164d284fc205dd 100644 (file)
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -4,11 +4,9 @@ LICENSE = "MIT"
 PACKAGES = ""
 RDEPENDS += "${IMAGE_INSTALL}"
 
-#bitbake doesn't seem to cope with this :-(
-#export IMAGE_BASENAME ?= "${PN}"
-#export PACKAGE_INSTALL ?= "${IMAGE_INSTALL}"
-export IMAGE_BASENAME = "${PN}"
-export PACKAGE_INSTALL = "${IMAGE_INSTALL}"
+# "export IMAGE_BASENAME" not supported at this time
+IMAGE_BASENAME[export] = 1
+export PACKAGE_INSTALL ?= "${IMAGE_INSTALL}"
 
 # We need to recursively follow RDEPENDS and RRECOMMENDS for images
 do_rootfs[recrdeptask] += "do_deploy do_populate_staging"