diff options
| author | Renato Botelho <renato@netgate.com> | 2015-11-18 09:12:38 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-11-18 09:12:38 -0200 |
| commit | 10742be999bf024d92e0847f305053ba536da7e8 (patch) | |
| tree | 81261e8085b584c658f474ee5fdaf8d278634c75 /tools/builder_common.sh | |
| parent | ad3c976343c3bae77a548d654d159173c0ad72ef (diff) | |
| download | pfsense-10742be999bf024d92e0847f305053ba536da7e8.zip pfsense-10742be999bf024d92e0847f305053ba536da7e8.tar.gz | |
Include pkg repo conf samples into base, to help disaster recovery
Diffstat (limited to 'tools/builder_common.sh')
| -rw-r--r-- | tools/builder_common.sh | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 6e5c62a..eeaa09f 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -1048,6 +1048,22 @@ clone_to_staging_area() { > ${_exclude_files} mkdir -p ${STAGE_CHROOT_DIR}/usr/local/share/${PRODUCT_NAME} >/dev/null 2>&1 + + # Include a sample pkg stable conf to base + setup_pkg_repo \ + ${STAGE_CHROOT_DIR}/usr/local/share/${PRODUCT_NAME}/${PRODUCT_NAME}-repo.conf + ${TARGET} \ + ${TARGET_ARCH} \ + ${PKG_REPO_CONF_BRANCH} \ + "release" + + # Include a sample pkg devel conf to base + setup_pkg_repo \ + ${STAGE_CHROOT_DIR}/usr/local/share/${PRODUCT_NAME}/${PRODUCT_NAME}-repo-devel.conf + ${TARGET} \ + ${TARGET_ARCH} \ + ${PKG_REPO_CONF_BRANCH} \ + mtree \ -c \ -k uid,gid,mode,size,flags,sha256digest \ @@ -1060,22 +1076,17 @@ clone_to_staging_area() { -X ${_exclude_files} \ . - setup_pkg_repo \ - ${STAGE_CHROOT_DIR}${PKG_REPO_PATH} \ - ${TARGET} \ - ${TARGET_ARCH} \ - ${PKG_REPO_CONF_BRANCH} \ - "release" + # Create repo and repo-devel packages + cp -f ${STAGE_CHROOT_DIR}/usr/local/share/${PRODUCT_NAME}/${PRODUCT_NAME}-repo.conf \ + ${STAGE_CHROOT_DIR}${PKG_REPO_PATH} core_pkg_create repo "" ${CORE_PKG_VERSION} ${STAGE_CHROOT_DIR} - setup_pkg_repo \ - ${STAGE_CHROOT_DIR}${PKG_REPO_PATH} \ - ${TARGET} \ - ${TARGET_ARCH} \ - ${PKG_REPO_CONF_BRANCH} + cp -f ${STAGE_CHROOT_DIR}/usr/local/share/${PRODUCT_NAME}/${PRODUCT_NAME}-repo-devel.conf \ + ${STAGE_CHROOT_DIR}${PKG_REPO_PATH} core_pkg_create repo-devel "" ${CORE_PKG_VERSION} ${STAGE_CHROOT_DIR} + rm -f ${STAGE_CHROOT_DIR}${PKG_REPO_PATH} core_pkg_create rc "" ${CORE_PKG_VERSION} ${STAGE_CHROOT_DIR} |
