From: Koen Kooi <koen@openembedded.org>
Date: Wed, 19 Mar 2008 10:31:59 +0000 (+0000)
Subject: rootfs_{deb,ipk}.bbclass: the o-hand dudes went overboard with sed, and opkg-native... 
X-Git-Tag: Release-2010-05/1~7363
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45a148b7496883244b04fc5dc0fe6ab30629cf36;p=openembedded.git

rootfs_{deb,ipk}.bbclass: the o-hand dudes went overboard with sed, and opkg-native overwrites our u-a-native, so we need to set both IPKG_OFFLINE_ROOT *and* OPKG_OFFLINE_ROOT
---

diff --git a/classes/rootfs_deb.bbclass b/classes/rootfs_deb.bbclass
index c59c75e1e5..3a69b82010 100644
--- a/classes/rootfs_deb.bbclass
+++ b/classes/rootfs_deb.bbclass
@@ -46,6 +46,7 @@ fakeroot rootfs_deb_do_rootfs () {
 	export D=${IMAGE_ROOTFS}
 	export OFFLINE_ROOT=${IMAGE_ROOTFS}
 	export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS}
+	export OPKG_OFFLINE_ROOT=${IPKG_OFFLINE_ROOT}
 
 	mkdir -p ${IMAGE_ROOTFS}/var/lib/dpkg/alternatives
 
diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index 4954fb2c44..c8e068f739 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -39,6 +39,8 @@ fakeroot rootfs_ipk_do_rootfs () {
 	export D=${IMAGE_ROOTFS}
 	export OFFLINE_ROOT=${IMAGE_ROOTFS}
 	export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS}
+	export OPKG_OFFLINE_ROOT=${IPKG_OFFLINE_ROOT}
+	
 	mkdir -p ${IMAGE_ROOTFS}${sysconfdir}/opkg/
 	grep "^arch" ${IPKGCONF_TARGET} >${IMAGE_ROOTFS}${sysconfdir}/opkg/arch.conf