Browse Source

build: we need device in base set too

pull/141/head
Franco Fichtner 1 year ago
parent
commit
fd9e920b21
6 changed files with 11 additions and 9 deletions
  1. +2
    -2
      build/base.sh
  2. +1
    -1
      build/clean.sh
  3. +2
    -2
      build/common.sh
  4. +1
    -1
      build/rebase.sh
  5. +4
    -2
      build/rename.sh
  6. +1
    -1
      build/sign.sh

+ 2
- 2
build/base.sh View File

@ -31,7 +31,7 @@ SELF=base
. ./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
echo ">>> Reusing base set: ${BASE_SET}"
@ -69,7 +69,7 @@ setup_stage ${STAGEDIR} work
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}

+ 1
- 1
build/clean.sh View File

@ -39,7 +39,7 @@ for ARG in ${@}; do
;;
base)
echo ">>> Removing base set"
rm -f ${SETSDIR}/base-*-${PRODUCT_ARCH}.*
rm -f ${SETSDIR}/base-*-${PRODUCT_ARCH}${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}.*
;;
core)
echo ">>> Removing core from packages set"

+ 2
- 2
build/common.sh View File

@ -448,7 +448,7 @@ setup_xbase()
XTOOLS="${XTOOLS} ${XTOOL}"
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()
@ -544,7 +544,7 @@ setup_base()
{
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
# belongs to the base system, we create it from here.

+ 1
- 1
build/rebase.sh View File

@ -33,7 +33,7 @@ SELF=rebase
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
tar -tf ${BASE_SET} | sed -e 's/^\.//g' -e '/\/$/d' | sort > \

+ 4
- 2
build/rename.sh View File

@ -43,7 +43,7 @@ for ARG in ${@}; do
base)
setup_stage ${STAGEDIR} work
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}
cp ${STAGEDIR}/work/usr/local/opnsense/version/base.obsolete \
${STAGEDIR}/obsolete
@ -54,7 +54,8 @@ for ARG in ${@}; do
generate_signature ${BASE_SET}
echo ">>> Renaming base set: ${PRODUCT_VERSION}"
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##*-}
done
;;
@ -88,6 +89,7 @@ for ARG in ${@}; do
echo ">>> Renaming kernel set: ${PRODUCT_VERSION}"
for FILE in $(find ${SETSDIR} -name \
"kernel-*-${PRODUCT_ARCH}${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}.*"); do
# XXX likely doesn't work for PRODUCT_DEVICE
mv ${FILE} ${SETSDIR}/${KERNEL_NAME}-${PRODUCT_VERSION}-${FILE##*-}
done
;;

+ 1
- 1
build/sign.sh View File

@ -31,7 +31,7 @@ SELF=sign
. ./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
generate_signature ${BASE_SET}
fi

Loading…
Cancel
Save