Attachment 181503 Details for Bug 218393 – release tweaks

[patch] release tweaks

release-tweaks.diff (text/plain), 2.15 KB, created by Johannes Jost Meixner on 2017-04-05 08:15:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Johannes Jost Meixner

Created: 2017-04-05 08:15:44 UTC

Size: 2.15 KB

patch

obsolete

>diff --git a/release/Makefile b/release/Makefile
>index 4ea2340b634..93820976784 100644
>--- a/release/Makefile
>+++ b/release/Makefile
>@@ -284,7 +284,7 @@ packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES}
> 
> pkg-stage:
> .if !defined(NOPKG)
>-	env REPOS_DIR=${.CURDIR}/pkg_repos/ \
>+	env PORTSDIR=${PORTSDIR} REPOS_DIR=${.CURDIR}/pkg_repos/ \
> 		sh ${.CURDIR}/scripts/pkg-stage.sh
> 	mkdir -p ${.OBJDIR}/dvd/packages/repos/
> 	cp ${.CURDIR}/scripts/FreeBSD_install_cdrom.conf \
>diff --git a/release/scripts/FreeBSD_install_cdrom.conf b/release/scripts/FreeBSD_install_cdrom.conf
>index 7a6d7878a62..eeb3aa83798 100644
>--- a/release/scripts/FreeBSD_install_cdrom.conf
>+++ b/release/scripts/FreeBSD_install_cdrom.conf
>@@ -5,7 +5,7 @@
> #
> 
> FreeBSD_install_cdrom: {
>-  url: "file:///dist/packages/${ABI}",
>+  url: "file:///packages/${ABI}",
>   mirror_type: "none",
>   enabled: yes
> }
>diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh
>index 4339c6a78c0..51a800fc089 100755
>--- a/release/scripts/pkg-stage.sh
>+++ b/release/scripts/pkg-stage.sh
>@@ -10,6 +10,7 @@ export PKG_DBDIR="/tmp/pkg"
> export PERMISSIVE="YES"
> export REPO_AUTOUPDATE="NO"
> export PKGCMD="/usr/sbin/pkg -d"
>+export PORTSDIR="${PORTSDIR:-/usr/ports}
> 
> _DVD_PACKAGES="archivers/unzip
> devel/git
>@@ -33,8 +34,8 @@ x11/kde4
> x11/xorg"
> 
> # If NOPORTS is set for the release, do not attempt to build pkg(8).
>-if [ ! -f /usr/ports/Makefile ]; then
>-	echo "*** /usr/ports is missing!    ***"
>+if [ ! -f ${PORTSDIR}/Makefile ]; then
>+	echo "*** ${PORTSDIR} is missing!    ***"
> 	echo "*** Skipping pkg-stage.sh     ***"
> 	echo "*** Unset NOPORTS to fix this ***"
> 	exit 0
>@@ -42,7 +43,7 @@ fi
> 
> if [ ! -x /usr/local/sbin/pkg ]; then
> 	/etc/rc.d/ldconfig restart
>-	/usr/bin/make -C /usr/ports/ports-mgmt/pkg install clean
>+	/usr/bin/make -C ${PORTSDIR}/ports-mgmt/pkg install clean
> fi
> 
> export DVD_DIR="dvd/packages"
>@@ -58,7 +59,7 @@ fi
> # Ensure the ports listed in _DVD_PACKAGES exist to sanitize the
> # final list.
> for _P in ${_DVD_PACKAGES}; do
>-	if [ -d "/usr/ports/${_P}" ]; then
>+	if [ -d "${PORTSDIR}/${_P}" ]; then
> 		DVD_PACKAGES="${DVD_PACKAGES} ${_P}"
> 	else
> 		echo "*** Skipping nonexistent port: ${_P}"

Actions: View | Diff

Attachments on bug 218393: 181503