1 files changed, 3 insertions, 5 deletions

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 5c672f19bc..fde0f59993 100644
--- 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"