diff options
| author | Luiz Souza <luiz@netgate.com> | 2017-09-15 11:29:20 -0500 |
|---|---|---|
| committer | Luiz Souza <luiz@netgate.com> | 2017-09-15 11:30:49 -0500 |
| commit | 318a7b7766d442c9c4de0f29bea5f587040ae243 (patch) | |
| tree | 884e004a18751a0a9d50827b2077a0f096840c9f /tools | |
| parent | d8455e10d71ab90b7faa96bc1748fa761e7a4166 (diff) | |
| download | pfsense-318a7b7766d442c9c4de0f29bea5f587040ae243.zip pfsense-318a7b7766d442c9c4de0f29bea5f587040ae243.tar.gz | |
Pass the search path to create_core_package.sh.
This allows the use of more than one path to build the package.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/builder_common.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 3bcb6d1..74b9b11 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -77,7 +77,8 @@ core_pkg_create() { local _flavor="${2}" local _version="${3}" local _root="${4}" - local _filter="${5}" + local _findroot="${5}" + local _filter="${6}" local _template_path=${BUILDER_TOOLS}/templates/core_pkg/${_template} @@ -86,6 +87,7 @@ core_pkg_create() { -f "${_flavor}" \ -v "${_version}" \ -r "${_root}" \ + -s "${_findroot}" \ -F "${_filter}" \ -d "${CORE_PKG_REAL_PATH}/All" \ || print_error_pfS @@ -161,7 +163,7 @@ 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} \*.ko.debug + core_pkg_create kernel-debug ${KERNEL_NAME} ${CORE_PKG_VERSION} ${KERNEL_DESTDIR} ./boot/kernel \*.ko.debug rm -rf ${KERNEL_DESTDIR}/usr echo ">>> Creating pkg of $KERNEL_NAME kernel to staging area..." | tee -a ${LOGFILE} |
