From: Richard Purdie <richard@openedhand.com>
Date: Sun, 2 Sep 2007 23:24:51 +0000 (+0000)
Subject: image.bbclass: Revert some changes as bitbake can't seem to cope with them :-(
X-Git-Tag: 2011-1~10758
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=903bd14738c0418eedc4c930028db9ffdd86d6a9;p=openembedded-core.git

image.bbclass: Revert some changes as bitbake can't seem to cope with them :-(

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

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index ead1708d5b..5c672f19bc 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -4,8 +4,11 @@ LICENSE = "MIT"
 PACKAGES = ""
 RDEPENDS += "${IMAGE_INSTALL}"
 
-export IMAGE_BASENAME ?= "${PN}"
-export PACKAGE_INSTALL ?= "${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}"
 
 # We need to recursively follow RDEPENDS and RRECOMMENDS for images
 do_rootfs[recrdeptask] += "do_deploy do_populate_staging"