diff options
| -rwxr-xr-x | build/scripts/create_core_pkg.sh | 17 | ||||
| -rw-r--r-- | tools/builder_common.sh | 6 |
2 files changed, 16 insertions, 7 deletions
diff --git a/build/scripts/create_core_pkg.sh b/build/scripts/create_core_pkg.sh index 9b08d05..377be9f 100755 --- a/build/scripts/create_core_pkg.sh +++ b/build/scripts/create_core_pkg.sh @@ -38,6 +38,7 @@ Options: -f flavor -- package flavor -v version -- package version -r root -- root directory containing package files + -s search -- search path -F filter -- filter pattern to exclude files from plist -d destdir -- Destination directory to create package -h -- Show this help and exit @@ -64,6 +65,9 @@ while getopts t:f:v:r:F:d:h opt; do r) root=$OPTARG ;; + s) + findroot=$OPTARG + ;; F) filter=$OPTARG ;; @@ -125,11 +129,14 @@ else if [ -n "${filter}" ]; then filter="-name ${filter}" fi - (cd ${root} \ - && find . ${filter} -type f -or -type l \ - | sed 's,^.,,' \ - | sort -u \ - ) > ${plist} + : ${findroot="."} + for froot in ${findroot}; do + (cd ${root} \ + && find ${froot} ${filter} -type f -or -type l \ + | sed 's,^.,,' \ + | sort -u \ + ) >> ${plist} + done fi if [ -f "${template_path}/exclude_plist" ]; then 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} |
