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

build: unify a few moving parts before obsolete rework

This commit is contained in:
Franco Fichtner 2018-10-15 07:48:05 +02:00
parent 998ac7a73a
commit 68e33100d4
4 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/base.sh
View File

@ -73,11 +73,9 @@ echo ">>> Generating kernel set:"
BASE_SET=${SETSDIR}/base-${REPO_VERSION}-${PRODUCT_ARCH}
tar -C ${STAGEDIR}/work -xJpf ${BASE_OBJ}
setup_version ${STAGEDIR} work ${SELF}
tar -C ${STAGEDIR}/work -cvf - . | xz > ${BASE_SET}.txz
setup_set ${STAGEDIR}/work ${BASE_OBJ}
setup_version ${STAGEDIR} ${STAGEDIR}/work ${SELF}
generate_set ${STAGEDIR}/work ${BASE_SET}.txz
echo -n ">>> Generating obsolete file list... "

16
build/common.sh
View File

@ -479,13 +479,13 @@ setup_chroot()
setup_version()
{
VERSIONDIR="${1}/${2}/usr/local/opnsense/version"
VERSIONDIR="${2}/usr/local/opnsense/version"
# clear previous in case of rename
rm -rf ${VERSIONDIR}
mkdir -p ${VERSIONDIR}
if [ -f ${CONFIGDIR}/plist.${2}.${PRODUCT_ARCH} ]; then
if [ -f ${CONFIGDIR}/plist.${3}.${PRODUCT_ARCH} ]; then
: # XXX obsolete file handling
fi
@ -493,7 +493,7 @@ setup_version()
echo ${REPO_VERSION}-${PRODUCT_ARCH} > ${VERSIONDIR}/${3}
# mtree generation must come LAST
mtree -c -k uid,gid,mode,size,sha256digest -p ${1}/${2} > ${1}/mtree
mtree -c -k uid,gid,mode,size,sha256digest -p ${2} > ${1}/mtree
mv ${1}/mtree ${VERSIONDIR}/${3}.mtree
chmod 600 ${VERSIONDIR}/${3}.mtree
}
@ -550,6 +550,16 @@ setup_entropy()
umask 022
}
setup_set()
{
tar -C ${1} -xJpf ${2}
}
generate_set()
{
tar -C ${1} -cvf - . | xz > ${2}
}
generate_signature()
{
if [ -n "$(${PRODUCT_SIGNCHK})" ]; then

10
build/kernel.sh
View File

@ -84,17 +84,15 @@ setup_stage ${STAGEDIR} work
echo ">>> Generating kernel set:"
tar -C ${STAGEDIR}/work -xJpf ${KERNEL_OBJ}
setup_set ${STAGEDIR}/work ${KERNEL_OBJ}
KERNEL_SET=${KERNEL_RELEASE_SET}
if [ -n "$(test -f ${DEBUG_OBJ} && tar -tf ${DEBUG_OBJ})" ]; then
tar -C ${STAGEDIR}/work -xJpf ${DEBUG_OBJ}
setup_set ${STAGEDIR}/work ${DEBUG_OBJ}
KERNEL_SET=${KERNEL_DEBUG_SET}
fi
setup_version ${STAGEDIR} work ${SELF}
tar -C ${STAGEDIR}/work -cvf - . | xz > ${KERNEL_SET}
setup_version ${STAGEDIR} ${STAGEDIR}/work ${SELF}
generate_set ${STAGEDIR}/work ${KERNEL_SET}
generate_signature ${KERNEL_SET}

12
build/rename.sh
View File

@ -42,11 +42,11 @@ for ARG in ${@}; do
setup_stage ${STAGEDIR} work
echo ">>> Repacking base set..."
BASE_SET=$(find ${SETSDIR} -name "base-*-${PRODUCT_ARCH}.txz")
tar -C ${STAGEDIR}/work -xJpf ${BASE_SET}
setup_set ${STAGEDIR}/work ${BASE_SET}
REPO_VERSION=${PRODUCT_VERSION}
setup_version ${STAGEDIR} work ${ARG}
setup_version ${STAGEDIR} ${STAGEDIR}/work ${ARG}
rm ${BASE_SET}
tar -C ${STAGEDIR}/work -cvf - . | xz > ${BASE_SET}
generate_set ${STAGEDIR}/work ${BASE_SET}
generate_signature ${BASE_SET}
echo ">>> Renaming base set: ${PRODUCT_VERSION}"
for FILE in $(find ${SETSDIR} -name \
@ -68,11 +68,11 @@ for ARG in ${@}; do
setup_stage ${STAGEDIR} work
echo ">>> Repacking kernel set..."
KERNEL_SET=$(find ${SETSDIR} -name "kernel-*-${PRODUCT_ARCH}.txz")
tar -C ${STAGEDIR}/work -xJpf ${KERNEL_SET}
setup_set ${STAGEDIR}/work ${KERNEL_SET}
REPO_VERSION=${PRODUCT_VERSION}
setup_version ${STAGEDIR} work ${ARG}
setup_version ${STAGEDIR} ${STAGEDIR}/work ${ARG}
rm ${KERNEL_SET}
tar -C ${STAGEDIR}/work -cvf - . | xz > ${KERNEL_SET}
generate_set ${STAGEDIR}/work ${KERNEL_SET}
generate_signature ${KERNEL_SET}
echo ">>> Renaming kernel set: ${PRODUCT_VERSION}"
for FILE in $(find ${SETSDIR} -name \