From 1ec6f217695fd15e9d1e9b3c0b6829e4b86eda0c Mon Sep 17 00:00:00 2001
From: Luiz Souza <luiz@netgate.com>
Date: Fri, 15 Sep 2017 23:12:42 -0500
Subject: Fix the kern-debug package.  The debug modules are now in
 /usr/lib/debug/boot/kernel.

Include /boot/modules in the kernel package.
---
 tools/builder_common.sh                     | 5 +++--
 tools/templates/core_pkg/base/exclude_files | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'tools')

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
-- 
cgit v1.1