Permalink
Browse files

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

  • Loading branch information...
1 parent 61372f7 commit a46a8eac447e4dfbe7fe686b9664e36eac1d78b4 @koenkooi koenkooi committed Jan 18, 2009
Showing with 11 additions and 0 deletions.
  1. +2 −0 scripts/assemble-image.sh
  2. +3 −0 scripts/configure-image.sh
  3. +6 −0 scripts/install-package.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
@@ -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"
@@ -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

0 comments on commit a46a8ea

Please sign in to comment.