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

build: kernel set device name if device config does not unset

This commit is contained in:
Franco Fichtner 2019-05-06 19:49:31 +02:00
parent bb1b755b09
commit 5dfee1c041
6 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/clean.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh
# Copyright (c) 2014-2018 Franco Fichtner <franco@opnsense.org>
# Copyright (c) 2014-2019 Franco Fichtner <franco@opnsense.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -62,7 +62,7 @@ for ARG in ${@}; do
;;
kernel)
echo ">>> Removing kernel set"
rm -f ${SETSDIR}/kernel-*-${PRODUCT_ARCH}.*
rm -f ${SETSDIR}/kernel-*-${PRODUCT_ARCH}${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}.*
;;
logs)
setup_stage ${LOGSDIR}

2
build/common.sh
View File

@ -561,7 +561,7 @@ setup_kernel()
{
echo ">>> Setting up kernel in ${1}"
tar -C ${1} -xpf ${SETSDIR}/kernel-*-${PRODUCT_ARCH}.txz
tar -C ${1} -xpf ${SETSDIR}/kernel-*-${PRODUCT_ARCH}${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}.txz
}
setup_distfiles()

6
build/kernel.sh
View File

@ -31,7 +31,7 @@ SELF=kernel
. ./common.sh
KERNEL_SET=$(find ${SETSDIR} -name "kernel-*-${PRODUCT_ARCH}.txz")
KERNEL_SET=$(find ${SETSDIR} -name "kernel-*-${PRODUCT_ARCH}${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}.txz")
if [ -f "${KERNEL_SET}" -a -z "${1}" ]; then
echo ">>> Reusing kernel set: ${KERNEL_SET}"
@ -41,8 +41,8 @@ fi
git_branch ${SRCDIR} ${SRCBRANCH} SRCBRANCH
git_describe ${SRCDIR}
KERNEL_DEBUG_SET=${SETSDIR}/kernel-dbg-${REPO_VERSION}-${PRODUCT_ARCH}.txz
KERNEL_RELEASE_SET=${SETSDIR}/kernel-${REPO_VERSION}-${PRODUCT_ARCH}.txz
KERNEL_DEBUG_SET=${SETSDIR}/kernel-dbg-${REPO_VERSION}-${PRODUCT_ARCH}${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}.txz
KERNEL_RELEASE_SET=${SETSDIR}/kernel-${REPO_VERSION}-${PRODUCT_ARCH}${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}.txz
if [ -f ${CONFIGDIR}/${PRODUCT_KERNEL} ]; then
cp "${CONFIGDIR}/${PRODUCT_KERNEL}" \

6
build/rename.sh
View File

@ -73,10 +73,10 @@ for ARG in ${@}; do
kernel)
setup_stage ${STAGEDIR} work
echo ">>> Repacking kernel set..."
KERNEL_SET=$(find ${SETSDIR} -name "kernel-dbg-*-${PRODUCT_ARCH}.txz")
KERNEL_SET=$(find ${SETSDIR} -name "kernel-dbg-*-${PRODUCT_ARCH}${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}.txz")
KERNEL_NAME="kernel-dbg"
if [ -z "${KERNEL_SET}" ]; then
KERNEL_SET=$(find ${SETSDIR} -name "kernel-*-${PRODUCT_ARCH}.txz")
KERNEL_SET=$(find ${SETSDIR} -name "kernel-*-${PRODUCT_ARCH}${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}.txz")
KERNEL_NAME="kernel"
fi
setup_set ${STAGEDIR}/work ${KERNEL_SET}
@ -87,7 +87,7 @@ for ARG in ${@}; do
generate_signature ${KERNEL_SET}
echo ">>> Renaming kernel set: ${PRODUCT_VERSION}"
for FILE in $(find ${SETSDIR} -name \
"kernel-*-${PRODUCT_ARCH}.*"); do
"kernel-*-${PRODUCT_ARCH}${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}.*"); do
mv ${FILE} ${SETSDIR}/${KERNEL_NAME}-${PRODUCT_VERSION}-${FILE##*-}
done
;;

2
build/sign.sh
View File

@ -36,7 +36,7 @@ if [ -f "${BASE_SET}" ]; then
generate_signature ${BASE_SET}
fi
KERNEL_SET=$(find ${SETSDIR} -name "kernel-*-${PRODUCT_ARCH}.txz")
KERNEL_SET=$(find ${SETSDIR} -name "kernel-*-${PRODUCT_ARCH}${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}.txz")
if [ -f "${KERNEL_SET}" ]; then
generate_signature ${KERNEL_SET}
fi

2
device/a10.conf
View File

@ -5,3 +5,5 @@ serial_hook()
# We do not require any custom hooks for the A10, but for
# the sake of demonstration, we keep this little stub. :)
}
unset PRODUCT_DEVICE