summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/builder_common.sh69
-rw-r--r--tools/templates/core_pkg/base-nanobsd/metadir/+MANIFEST1
-rw-r--r--tools/templates/core_pkg/base/metadir/+MANIFEST1
-rw-r--r--tools/templates/core_pkg/repo/metadir/+DESC3
-rw-r--r--tools/templates/core_pkg/repo/metadir/+INSTALL22
-rw-r--r--tools/templates/core_pkg/repo/metadir/+MANIFEST15
6 files changed, 18 insertions, 93 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index 79ab4a1..99255cd 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -910,55 +910,6 @@ clone_to_staging_area() {
-X ${_exclude_files} \
.
- local _share_repos_path="${SCRATCHDIR}/repo-tmp/${PRODUCT_SHARE_DIR}/pkg/repos"
- rm -rf ${SCRATCHDIR}/repo-tmp >/dev/null 2>&1
- mkdir -p ${_share_repos_path} >/dev/null 2>&1
-
- local _freebsd_major_version=$( \
- sed -n '/^REVISION=/ {; s,\.[0-9]*"$,,; s,^.*",,; p; q; };' \
- ${FREEBSD_SRC_DIR}/sys/conf/newvers.sh \
- )
- local _default_abi="FreeBSD:${_freebsd_major_version}:${TARGET_ARCH}"
-
- local _default_altabi="freebsd:${_freebsd_major_version}"
- if [ "${TARGET_ARCH}" = "armv6" ]; then
- _default_altabi="${_default_altabi}:${TARGET_ARCH}:32:el:eabi:hardfp"
- elif [ "${TARGET_ARCH}" = "i386" ]; then
- _default_altabi="${_default_altabi}:x86:32"
- else
- _default_altabi="${_default_altabi}:x86:64"
- fi
-
- # Add all repos
- for _template in ${PKG_REPO_BASE}/${PRODUCT_NAME}-repo*.conf; do
- _template_filename=$(basename ${_template})
- setup_pkg_repo \
- ${_template} \
- ${_share_repos_path}/${_template_filename} \
- ${TARGET} \
- ${TARGET_ARCH}
-
- cp -f ${_template%%.conf}.descr ${_share_repos_path}
-
- if [ -f ${_template%%.conf}.abi ]; then
- sed -e "s,%%ARCH%%,${TARGET_ARCH},g" ${_template%%.conf}.abi \
- > ${_share_repos_path}/${_template_filename%%.conf}.abi
- else
- echo ${_default_abi} \
- > ${_share_repos_path}/${_template_filename%%.conf}.abi
- fi
-
- if [ -f ${_template%%.conf}.altabi ]; then
- sed -e "s,%%ARCH%%,${TARGET_ARCH},g" ${_template%%.conf}.altabi \
- > ${_share_repos_path}/${_template_filename%%.conf}.altabi
- else
- echo ${_default_altabi} \
- > ${_share_repos_path}/${_template_filename%%.conf}.altabi
- fi
- done
-
- core_pkg_create repo "" ${CORE_PKG_VERSION} ${SCRATCHDIR}/repo-tmp
-
core_pkg_create rc "" ${CORE_PKG_VERSION} ${STAGE_CHROOT_DIR}
core_pkg_create base "" ${CORE_PKG_VERSION} ${STAGE_CHROOT_DIR}
core_pkg_create base-nanobsd "" ${CORE_PKG_VERSION} ${STAGE_CHROOT_DIR}
@@ -2034,18 +1985,34 @@ poudriere_bulk() {
mkdir -p /usr/local/etc/poudriere.d
if [ -f "${BUILDER_TOOLS}/conf/pfPorts/make.conf" ]; then
- cp -f "${BUILDER_TOOLS}/conf/pfPorts/make.conf" /usr/local/etc/poudriere.d/${POUDRIERE_PORTS_NAME}-make.conf
+ cp -f "${BUILDER_TOOLS}/conf/pfPorts/make.conf" \
+ /usr/local/etc/poudriere.d/${POUDRIERE_PORTS_NAME}-make.conf
fi
+ cat <<EOF >>/usr/local/etc/poudriere.d/${POUDRIERE_PORTS_NAME}-make.conf
+PKG_REPO_BRANCH_DEVEL=${PKG_REPO_BRANCH_DEVEL}
+PKG_REPO_BRANCH_RELEASE=${PKG_REPO_BRANCH_RELEASE}
+PKG_REPO_SERVER_DEVEL=${PKG_REPO_SERVER_DEVEL}
+PKG_REPO_SERVER_RELEASE=${PKG_REPO_SERVER_RELEASE}
+POUDRIERE_PORTS_NAME=${POUDRIERE_PORTS_NAME}
+PRODUCT_NAME=${PRODUCT_NAME}
+EOF
+
# Change version of pfSense meta ports for snapshots
if [ -z "${_IS_RELEASE}" ]; then
local _meta_pkg_version="$(echo "${PRODUCT_VERSION}" | sed 's,DEVELOPMENT,ALPHA,')-${DATESTRING}"
sed -i '' \
-e "/^DISTVERSION/ s,^.*,DISTVERSION= ${_meta_pkg_version}," \
-e "/^PORTREVISION=/d" \
- /usr/local/poudriere/ports/${POUDRIERE_PORTS_NAME}/security/${PRODUCT_NAME}/Makefile
+ /usr/local/poudriere/ports/${POUDRIERE_PORTS_NAME}/security/${PRODUCT_NAME}/Makefile \
+ /usr/local/poudriere/ports/${POUDRIERE_PORTS_NAME}/sysutils/${PRODUCT_NAME}-repo/Makefile
fi
+ # Copy over pkg repo templates to pfSense-repo
+ mkdir -p /usr/local/poudriere/ports/${POUDRIERE_PORTS_NAME}/sysutils/${PRODUCT_NAME}-repo/files
+ cp -f ${BUILDER_TOOLS}/templates/pkg_repos/* \
+ /usr/local/poudriere/ports/${POUDRIERE_PORTS_NAME}/sysutils/${PRODUCT_NAME}-repo/files
+
for jail_arch in ${_archs}; do
jail_name=$(poudriere_jail_name ${jail_arch})
diff --git a/tools/templates/core_pkg/base-nanobsd/metadir/+MANIFEST b/tools/templates/core_pkg/base-nanobsd/metadir/+MANIFEST
index 19229a3..3ec1089 100644
--- a/tools/templates/core_pkg/base-nanobsd/metadir/+MANIFEST
+++ b/tools/templates/core_pkg/base-nanobsd/metadir/+MANIFEST
@@ -8,7 +8,6 @@ maintainer: development@pfsense.org
prefix: /usr/local
deps: {
"%%PRODUCT_NAME%%-rc": {origin: "security/%%PRODUCT_NAME%%-rc", version: "%%VERSION%%"},
-"%%PRODUCT_NAME%%-repo": {origin: "security/%%PRODUCT_NAME%%-repo", version: "%%VERSION%%"}
}
categories [ security, ]
licenselogic: single
diff --git a/tools/templates/core_pkg/base/metadir/+MANIFEST b/tools/templates/core_pkg/base/metadir/+MANIFEST
index 3e0a111..131620e 100644
--- a/tools/templates/core_pkg/base/metadir/+MANIFEST
+++ b/tools/templates/core_pkg/base/metadir/+MANIFEST
@@ -8,7 +8,6 @@ maintainer: development@pfsense.org
prefix: /usr/local
deps: {
"%%PRODUCT_NAME%%-rc": {origin: "security/%%PRODUCT_NAME%%-rc", version: "%%VERSION%%"},
-"%%PRODUCT_NAME%%-repo": {origin: "security/%%PRODUCT_NAME%%-repo", version: "%%VERSION%%"}
}
categories [ security, ]
licenselogic: single
diff --git a/tools/templates/core_pkg/repo/metadir/+DESC b/tools/templates/core_pkg/repo/metadir/+DESC
deleted file mode 100644
index ec6bbc5..0000000
--- a/tools/templates/core_pkg/repo/metadir/+DESC
+++ /dev/null
@@ -1,3 +0,0 @@
-%%PRODUCT_NAME%% pkg repository configuration (stable)
-
-WWW: %%PRODUCT_URL%%
diff --git a/tools/templates/core_pkg/repo/metadir/+INSTALL b/tools/templates/core_pkg/repo/metadir/+INSTALL
deleted file mode 100644
index 8e67eca..0000000
--- a/tools/templates/core_pkg/repo/metadir/+INSTALL
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-if [ "${2}" != "POST-INSTALL" ]; then
- exit 0
-fi
-
-if [ ! -f /usr/local/share/%%PRODUCT_NAME%%/pkg/repos/%%PRODUCT_NAME%%-repo.conf ]; then
- echo "===> ERROR: Default repo conf not found!"
- exit 1
-fi
-
-if [ ! -L /usr/local/etc/pkg/repos/%%PRODUCT_NAME%%.conf ]; then
- if [ -f /usr/local/etc/pkg/repos/%%PRODUCT_NAME%%.conf ]; then
- rm -f /usr/local/etc/pkg/repos/%%PRODUCT_NAME%%.conf
- fi
- mkdir -p /usr/local/etc/pkg/repos
- ln -sf \
- /usr/local/share/%%PRODUCT_NAME%%/pkg/repos/%%PRODUCT_NAME%%-repo.conf \
- /usr/local/etc/pkg/repos/%%PRODUCT_NAME%%.conf
-fi
-
-exit 0
diff --git a/tools/templates/core_pkg/repo/metadir/+MANIFEST b/tools/templates/core_pkg/repo/metadir/+MANIFEST
deleted file mode 100644
index bcec7f2..0000000
--- a/tools/templates/core_pkg/repo/metadir/+MANIFEST
+++ /dev/null
@@ -1,15 +0,0 @@
-name: "%%PRODUCT_NAME%%-repo"
-version: "%%VERSION%%"
-origin: "security/%%PRODUCT_NAME%%-repo"
-comment: <<EOD
-%%PRODUCT_NAME%% pkg repository configuration (stable)
-EOD
-maintainer: development@pfsense.org
-prefix: /usr/local
-deps: {
-
-}
-categories [ security, ]
-licenselogic: single
-licenses: [ APACHE20, ]
-options: { }
OpenPOWER on IntegriCloud