narcissus: add the same OPKG and PATH exports to all shell scripts

Angstrom-distribution · Feb 3, 2010 · a46a8ea · a46a8ea
1 parent 61372f7
commit a46a8ea
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/scripts/assemble-image.sh b/scripts/assemble-image.sh
@@ -11,6 +11,8 @@ TARGET_DIR="${WORKDIR}/deploy/${MACHINE}/${IMAGENAME}"
 OPKG_CONFDIR_TARGET="${TARGET_DIR}/etc/opkg"
 export D="${TARGET_DIR}"
 export OPKG_OFFLINE_ROOT="${TARGET_DIR}"
+export OFFLINE_ROOT="${TARGET_DIR}"
+export IPKG_OFFLINE_ROOT="${TARGET_DIR}"
 export PATH=${WORKDIR}/bin:${PATH}
 
 if ! [ -e ${TARGET_DIR}/etc/opkg.conf ] ; then

diff --git a/scripts/configure-image.sh b/scripts/configure-image.sh
@@ -10,6 +10,9 @@ TARGET_DIR="${PWD}/deploy/${MACHINE}/${IMAGENAME}"
 OPKG_CONFDIR_TARGET="${TARGET_DIR}/etc/opkg"
 export D="${TARGET_DIR}"
 export OPKG_OFFLINE_ROOT="${TARGET_DIR}"
+export OFFLINE_ROOT="${TARGET_DIR}"
+export IPKG_OFFLINE_ROOT="${TARGET_DIR}"
+export PATH=${WORKDIR}/bin:${PATH}
 
 if [ -e ${TARGET_DIR} ] ; then
 	echo "Stale directory found, removing  it"

diff --git a/scripts/install-package.sh b/scripts/install-package.sh
@@ -12,6 +12,12 @@ TARGET_DIR="${PWD}/deploy/${MACHINE}/${IMAGENAME}"
 OPKG_CONFDIR_TARGET="${TARGET_DIR}/etc/opkg"
 PACKAGELISTFILE="${PWD}/deploy/${MACHINE}/${IMAGENAME}-packages.txt"
 
+export D="${TARGET_DIR}"
+export OPKG_OFFLINE_ROOT="${TARGET_DIR}"
+export OFFLINE_ROOT="${TARGET_DIR}"
+export IPKG_OFFLINE_ROOT="${TARGET_DIR}"
+export PATH=${WORKDIR}/bin:${PATH}
+
 if ! [ -e ${TARGET_DIR}/etc/opkg.conf ] ; then
 	print "Initial filesystem not found, something went wrong in the configure step!"
 	exit 0