diff options
| author | Renato Botelho <renato@netgate.com> | 2015-09-03 08:02:47 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-09-03 08:02:47 -0300 |
| commit | a7a0034182027d0cb4935867fc5d56e0fd8e2b07 (patch) | |
| tree | 0a64e5d218a3e86240055a49272ef4f553cdd5eb /tools/builder_common.sh | |
| parent | 6b733d47f3213d34faf43201cc19b24c4f941d05 (diff) | |
| download | pfsense-a7a0034182027d0cb4935867fc5d56e0fd8e2b07.zip pfsense-a7a0034182027d0cb4935867fc5d56e0fd8e2b07.tar.gz | |
Change core pkg dir to have packages under All/ and repo on ./
Diffstat (limited to 'tools/builder_common.sh')
| -rw-r--r-- | tools/builder_common.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 0ecbe58..57a51bd 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -117,8 +117,8 @@ core_pkg_create() { rm -f ${_plist}.tmp ${plist}.exclude fi - mkdir -p ${CORE_PKG_PATH} - if ! pkg create -o ${CORE_PKG_PATH} -p ${_plist} -r ${_root} -m ${_metadir}; then + mkdir -p ${CORE_PKG_PATH}/All + if ! pkg create -o ${CORE_PKG_PATH}/All -p ${_plist} -r ${_root} -m ${_metadir}; then echo ">>> ERROR: Error building package ${_template} ${_flavor}" print_error_pfS fi @@ -245,7 +245,7 @@ build_all_kernels() { print_error_pfS fi - if [ -n "${NO_BUILDKERNEL:-}" -a -f "${CORE_PKG_PATH}/$(get_pkg_name kernel-${KERNEL_NAME}).txz" ]; then + if [ -n "${NO_BUILDKERNEL:-}" -a -f "${CORE_PKG_PATH}/All/$(get_pkg_name kernel-${KERNEL_NAME}).txz" ]; then echo ">>> NO_BUILDKERNEL set, skipping build" | tee -a ${LOGFILE} continue fi @@ -292,10 +292,10 @@ install_default_kernel() { fi mkdir -p $FINAL_CHROOT_DIR/pkgs if [ -z "${2}" -o -n "${INSTALL_EXTRA_KERNELS}" ]; then - cp ${CORE_PKG_PATH}/$(get_pkg_name kernel-${KERNEL_NAME}).txz $FINAL_CHROOT_DIR/pkgs + cp ${CORE_PKG_PATH}/All/$(get_pkg_name kernel-${KERNEL_NAME}).txz $FINAL_CHROOT_DIR/pkgs if [ -n "${INSTALL_EXTRA_KERNELS}" ]; then for _EXTRA_KERNEL in $INSTALL_EXTRA_KERNELS; do - _EXTRA_KERNEL_PATH=${CORE_PKG_PATH}/$(get_pkg_name kernel-${_EXTRA_KERNEL}).txz + _EXTRA_KERNEL_PATH=${CORE_PKG_PATH}/All/$(get_pkg_name kernel-${_EXTRA_KERNEL}).txz if [ -f "${_EXTRA_KERNEL_PATH}" ]; then echo -n ". adding ${_EXTRA_KERNEL_PATH} on image /pkgs folder" cp ${_EXTRA_KERNEL_PATH} $FINAL_CHROOT_DIR/pkgs @@ -1100,7 +1100,7 @@ customize_stagearea_for_image() { "${1}" = "memstickadi" ]; then install_bsdinstaller mkdir -p ${FINAL_CHROOT_DIR}/pkgs - cp ${CORE_PKG_PATH}/*default-config*.txz ${FINAL_CHROOT_DIR}/pkgs + cp ${CORE_PKG_PATH}/All/*default-config*.txz ${FINAL_CHROOT_DIR}/pkgs fi if [ "${1}" = "nanobsd" -o \ @@ -1455,12 +1455,12 @@ pkg_chroot_add() { print_error_pfS fi - if [ ! -f ${CORE_PKG_PATH}/${_pkg} ]; then + if [ ! -f ${CORE_PKG_PATH}/All/${_pkg} ]; then echo ">>> ERROR: Package ${_pkg} not found" print_error_pfS fi - cp ${CORE_PKG_PATH}/${_pkg} ${_target} + cp ${CORE_PKG_PATH}/All/${_pkg} ${_target} pkg_chroot ${_target} add /${_pkg} rm -f ${_target}/${_pkg} } |
