summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuiz Souza <luiz@netgate.com>2017-09-15 23:12:42 -0500
committerLuiz Souza <luiz@netgate.com>2017-09-15 23:12:57 -0500
commit1ec6f217695fd15e9d1e9b3c0b6829e4b86eda0c (patch)
treec2d1c655e78a4cd6a1d608c18ece0f88d5bcc174
parent48009b827409d6d6dd19a9f0d5d18f80ca62092a (diff)
downloadpfsense-1ec6f217695fd15e9d1e9b3c0b6829e4b86eda0c.zip
pfsense-1ec6f217695fd15e9d1e9b3c0b6829e4b86eda0c.tar.gz
Fix the kern-debug package. The debug modules are now in /usr/lib/debug/boot/kernel.
Include /boot/modules in the kernel package.
-rw-r--r--tools/builder_common.sh5
-rw-r--r--tools/templates/core_pkg/base/exclude_files2
2 files changed, 4 insertions, 3 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index 74b9b11..e0cf706 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -163,11 +163,12 @@ build_all_kernels() {
ensure_kernel_exists $KERNEL_DESTDIR
echo ">>> Creating pkg of $KERNEL_NAME-debug kernel to staging area..." | tee -a ${LOGFILE}
- core_pkg_create kernel-debug ${KERNEL_NAME} ${CORE_PKG_VERSION} ${KERNEL_DESTDIR} ./boot/kernel \*.ko.debug
+ core_pkg_create kernel-debug ${KERNEL_NAME} ${CORE_PKG_VERSION} ${KERNEL_DESTDIR} \
+ "/usr/lib/debug/boot/kernel" \*.ko.debug
rm -rf ${KERNEL_DESTDIR}/usr
echo ">>> Creating pkg of $KERNEL_NAME kernel to staging area..." | tee -a ${LOGFILE}
- core_pkg_create kernel ${KERNEL_NAME} ${CORE_PKG_VERSION} ${KERNEL_DESTDIR}
+ core_pkg_create kernel ${KERNEL_NAME} ${CORE_PKG_VERSION} ${KERNEL_DESTDIR} "./boot/kernel ./boot/modules"
rm -rf $KERNEL_DESTDIR 2>&1 1>/dev/null
done
diff --git a/tools/templates/core_pkg/base/exclude_files b/tools/templates/core_pkg/base/exclude_files
index 464d547..3aa6d3f 100644
--- a/tools/templates/core_pkg/base/exclude_files
+++ b/tools/templates/core_pkg/base/exclude_files
@@ -4,7 +4,7 @@
./boot/loader.conf
./boot/loader.conf.local
./boot/loader.rc.local
-./boot/modules/bwi_v3_ucode.ko
+./boot/modules
./cf/conf/config.xml
./cf/conf/enableserial_force
./cf/conf/trigger_initial_wizard
OpenPOWER on IntegriCloud