aboutsummaryrefslogtreecommitdiff
path: root/release/scripts
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2015-01-13 21:29:24 +0000
committerGlen Barber <gjb@FreeBSD.org>2015-01-13 21:29:24 +0000
commit8f0ea33f2bbf3a6aa80235f0a02fa5f2780c2b17 (patch)
treeaccce800a23406d946f94129ba725630eaac6766 /release/scripts
parente5b4ea4d4ebec42ddea93abcc39615b0926bf0f2 (diff)
parent39a9ae0f39534511160dd1dc15530a7c743ee493 (diff)
downloadsrc-8f0ea33f2bbf3a6aa80235f0a02fa5f2780c2b17.tar.gz
src-8f0ea33f2bbf3a6aa80235f0a02fa5f2780c2b17.zip
Reintegrate head revisions r273096-r277147
Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/projects/release-vmimage/; revision=277148
Diffstat (limited to 'release/scripts')
-rwxr-xr-xrelease/scripts/pkg-stage.sh34
-rwxr-xr-xrelease/scripts/relnotes-search.sh2
2 files changed, 32 insertions, 4 deletions
diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh
index 0b9963284d60..095f9962b644 100755
--- a/release/scripts/pkg-stage.sh
+++ b/release/scripts/pkg-stage.sh
@@ -11,7 +11,7 @@ export PERMISSIVE="YES"
export REPO_AUTOUPDATE="NO"
export PKGCMD="/usr/sbin/pkg -d"
-DVD_PACKAGES="archivers/unzip
+_DVD_PACKAGES="archivers/unzip
devel/subversion
devel/subversion-static
emulators/linux_base-f10
@@ -27,23 +27,51 @@ sysutils/screen
www/firefox
www/links
x11-drivers/xf86-video-vmware
-x11/gnome2
+x11/gnome3
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! ***"
+ echo "*** Skipping pkg-stage.sh ***"
+ echo "*** Unset NOPORTS to fix this ***"
exit 0
fi
if [ ! -x /usr/local/sbin/pkg ]; then
+ /etc/rc.d/ldconfig restart
/usr/bin/make -C /usr/ports/ports-mgmt/pkg install clean
fi
+export DVD_DIR="dvd/packages"
export PKG_ABI=$(pkg config ABI)
-export PKG_REPODIR="dvd/packages/${PKG_ABI}"
+export PKG_ALTABI=$(pkg config ALTABI 2>/dev/null)
+export PKG_REPODIR="${DVD_DIR}/${PKG_ABI}"
/bin/mkdir -p ${PKG_REPODIR}
+if [ ! -z "${PKG_ALTABI}" ]; then
+ (cd ${DVD_DIR} && ln -s ${PKG_ABI} ${PKG_ALTABI})
+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
+ DVD_PACKAGES="${DVD_PACKAGES} ${_P}"
+ else
+ echo "*** Skipping nonexistent port: ${_P}"
+ fi
+done
+
+# Make sure the package list is not empty.
+if [ -z "${DVD_PACKAGES}" ]; then
+ echo "*** The package list is empty."
+ echo "*** Something is very wrong."
+ # Exit '0' so the rest of the build process continues
+ # so other issues (if any) can be addressed as well.
+ exit 0
+fi
# Print pkg(8) information to make debugging easier.
${PKGCMD} -vv
diff --git a/release/scripts/relnotes-search.sh b/release/scripts/relnotes-search.sh
index a9a931a84c10..895f3998f8ad 100755
--- a/release/scripts/relnotes-search.sh
+++ b/release/scripts/relnotes-search.sh
@@ -125,7 +125,7 @@ main() {
# All tests passed. Let's see what can possibly go wrong
# from here. The search string specified should match this
# in PCRE speak: ':[\t ]*'
- ${svn} log ${rev} --search 'Relnotes:?[^ ]*' ${1} > ${where}
+ ${svn} log ${rev} --search 'Relnotes:*[A-Za-z0-9]*' ${1} > ${where}
return $?
}