build: we need device in base set too
This commit is contained in:
parent
ea5155836e
commit
fd9e920b21
|
@ -31,7 +31,7 @@ SELF=base
|
||||||
|
|
||||||
. ./common.sh
|
. ./common.sh
|
||||||
|
|
||||||
BASE_SET=$(find ${SETSDIR} -name "base-*-${PRODUCT_ARCH}.txz")
|
BASE_SET=$(find ${SETSDIR} -name "base-*-${PRODUCT_ARCH}${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}.txz")
|
||||||
|
|
||||||
if [ -f "${BASE_SET}" -a -z "${1}" ]; then
|
if [ -f "${BASE_SET}" -a -z "${1}" ]; then
|
||||||
echo ">>> Reusing base set: ${BASE_SET}"
|
echo ">>> Reusing base set: ${BASE_SET}"
|
||||||
|
@ -69,7 +69,7 @@ setup_stage ${STAGEDIR} work
|
||||||
|
|
||||||
echo ">>> Generating base set:"
|
echo ">>> Generating base set:"
|
||||||
|
|
||||||
BASE_SET=${SETSDIR}/base-${REPO_VERSION}-${PRODUCT_ARCH}.txz
|
BASE_SET=${SETSDIR}/base-${REPO_VERSION}-${PRODUCT_ARCH}${PRODUCUT_DEVICE+"-${PRODUCT_DEVICE}"}.txz
|
||||||
|
|
||||||
setup_set ${STAGEDIR}/work ${BASE_OBJ}
|
setup_set ${STAGEDIR}/work ${BASE_OBJ}
|
||||||
|
|
||||||
|
|
|
@ -39,7 +39,7 @@ for ARG in ${@}; do
|
||||||
;;
|
;;
|
||||||
base)
|
base)
|
||||||
echo ">>> Removing base set"
|
echo ">>> Removing base set"
|
||||||
rm -f ${SETSDIR}/base-*-${PRODUCT_ARCH}.*
|
rm -f ${SETSDIR}/base-*-${PRODUCT_ARCH}${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}.*
|
||||||
;;
|
;;
|
||||||
core)
|
core)
|
||||||
echo ">>> Removing core from packages set"
|
echo ">>> Removing core from packages set"
|
||||||
|
|
|
@ -448,7 +448,7 @@ setup_xbase()
|
||||||
XTOOLS="${XTOOLS} ${XTOOL}"
|
XTOOLS="${XTOOLS} ${XTOOL}"
|
||||||
done
|
done
|
||||||
|
|
||||||
tar -C ${1} -xpf ${SETSDIR}/base-*-${PRODUCT_ARCH}.txz ${XTOOLS}
|
tar -C ${1} -xpf ${SETSDIR}/base-*-${PRODUCT_ARCH}${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}.txz ${XTOOLS}
|
||||||
}
|
}
|
||||||
|
|
||||||
setup_xtools()
|
setup_xtools()
|
||||||
|
@ -544,7 +544,7 @@ setup_base()
|
||||||
{
|
{
|
||||||
echo ">>> Setting up world in ${1}"
|
echo ">>> Setting up world in ${1}"
|
||||||
|
|
||||||
tar -C ${1} -xpf ${SETSDIR}/base-*-${PRODUCT_ARCH}.txz
|
tar -C ${1} -xpf ${SETSDIR}/base-*-${PRODUCT_ARCH}${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}.txz
|
||||||
|
|
||||||
# /home is needed for LiveCD images, and since it
|
# /home is needed for LiveCD images, and since it
|
||||||
# belongs to the base system, we create it from here.
|
# belongs to the base system, we create it from here.
|
||||||
|
|
|
@ -33,7 +33,7 @@ SELF=rebase
|
||||||
|
|
||||||
setup_stage ${STAGEDIR}
|
setup_stage ${STAGEDIR}
|
||||||
|
|
||||||
BASE_SET=$(find ${SETSDIR} -name "base-*-${PRODUCT_ARCH}.txz")
|
BASE_SET=$(find ${SETSDIR} -name "base-*-${PRODUCT_ARCH}${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}.txz")
|
||||||
BASE_OBSOLETE=/usr/local/opnsense/version/base.obsolete
|
BASE_OBSOLETE=/usr/local/opnsense/version/base.obsolete
|
||||||
|
|
||||||
tar -tf ${BASE_SET} | sed -e 's/^\.//g' -e '/\/$/d' | sort > \
|
tar -tf ${BASE_SET} | sed -e 's/^\.//g' -e '/\/$/d' | sort > \
|
||||||
|
|
|
@ -43,7 +43,7 @@ for ARG in ${@}; do
|
||||||
base)
|
base)
|
||||||
setup_stage ${STAGEDIR} work
|
setup_stage ${STAGEDIR} work
|
||||||
echo ">>> Repacking base set..."
|
echo ">>> Repacking base set..."
|
||||||
BASE_SET=$(find ${SETSDIR} -name "base-*-${PRODUCT_ARCH}.txz")
|
BASE_SET=$(find ${SETSDIR} -name "base-*-${PRODUCT_ARCH}${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}.txz")
|
||||||
setup_set ${STAGEDIR}/work ${BASE_SET}
|
setup_set ${STAGEDIR}/work ${BASE_SET}
|
||||||
cp ${STAGEDIR}/work/usr/local/opnsense/version/base.obsolete \
|
cp ${STAGEDIR}/work/usr/local/opnsense/version/base.obsolete \
|
||||||
${STAGEDIR}/obsolete
|
${STAGEDIR}/obsolete
|
||||||
|
@ -54,7 +54,8 @@ for ARG in ${@}; do
|
||||||
generate_signature ${BASE_SET}
|
generate_signature ${BASE_SET}
|
||||||
echo ">>> Renaming base set: ${PRODUCT_VERSION}"
|
echo ">>> Renaming base set: ${PRODUCT_VERSION}"
|
||||||
for FILE in $(find ${SETSDIR} -name \
|
for FILE in $(find ${SETSDIR} -name \
|
||||||
"base-*-${PRODUCT_ARCH}.*"); do
|
"base-*-${PRODUCT_ARCH}${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}.*"); do
|
||||||
|
# XXX likely doesn't work for PRODUCT_DEVICE
|
||||||
mv ${FILE} ${SETSDIR}/base-${PRODUCT_VERSION}-${FILE##*-}
|
mv ${FILE} ${SETSDIR}/base-${PRODUCT_VERSION}-${FILE##*-}
|
||||||
done
|
done
|
||||||
;;
|
;;
|
||||||
|
@ -88,6 +89,7 @@ for ARG in ${@}; do
|
||||||
echo ">>> Renaming kernel set: ${PRODUCT_VERSION}"
|
echo ">>> Renaming kernel set: ${PRODUCT_VERSION}"
|
||||||
for FILE in $(find ${SETSDIR} -name \
|
for FILE in $(find ${SETSDIR} -name \
|
||||||
"kernel-*-${PRODUCT_ARCH}${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}.*"); do
|
"kernel-*-${PRODUCT_ARCH}${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}.*"); do
|
||||||
|
# XXX likely doesn't work for PRODUCT_DEVICE
|
||||||
mv ${FILE} ${SETSDIR}/${KERNEL_NAME}-${PRODUCT_VERSION}-${FILE##*-}
|
mv ${FILE} ${SETSDIR}/${KERNEL_NAME}-${PRODUCT_VERSION}-${FILE##*-}
|
||||||
done
|
done
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -31,7 +31,7 @@ SELF=sign
|
||||||
|
|
||||||
. ./common.sh
|
. ./common.sh
|
||||||
|
|
||||||
BASE_SET=$(find ${SETSDIR} -name "base-*-${PRODUCT_ARCH}.txz")
|
BASE_SET=$(find ${SETSDIR} -name "base-*-${PRODUCT_ARCH}${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}.txz")
|
||||||
if [ -f "${BASE_SET}" ]; then
|
if [ -f "${BASE_SET}" ]; then
|
||||||
generate_signature ${BASE_SET}
|
generate_signature ${BASE_SET}
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue