opensourcemirror
/
opnsense-tools
mirror of https://github.com/opnsense/tools.git
1
0
Fork 0
Code Issues Releases Wiki Activity

build: when inside the chroot don't use STAGEDIR again

This commit is contained in:
Franco Fichtner 2016-07-25 08:54:32 +02:00
parent 13fa483590
commit 44ccf5dcd7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/common.sh
View File

@ -599,14 +599,14 @@ custom_packages()
{
chroot ${1} /bin/sh -es << EOF
# clear the internal staging area and package files
rm -rf ${1}
rm -rf /work
# run the package build process
make -C ${2} DESTDIR=${1} ${3} FLAVOUR=${PRODUCT_FLAVOUR} metadata
make -C ${2} DESTDIR=${1} ${3} FLAVOUR=${PRODUCT_FLAVOUR} install
make -C ${2} DESTDIR=/work ${3} FLAVOUR=${PRODUCT_FLAVOUR} metadata
make -C ${2} DESTDIR=/work ${3} FLAVOUR=${PRODUCT_FLAVOUR} install
echo -n ">>> Creating custom package for ${2}... "
pkg create -m ${1} -r ${1} -p ${1}/plist -o ${PACKAGESDIR}/All
pkg create -m /work -r /work -p /work/plist -o ${PACKAGESDIR}/All
echo "done"
EOF
}