Attachment 134323 Details for Bug 178978 – 0001-Fix-a-race-condition-between-make-distribution-and-i.patch.txt

0001-Fix-a-race-condition-between-make-distribution-and-i.patch.txt

0001-Fix-a-race-condition-between-make-distribution-and-i.patch.txt (text/plain), 2.49 KB, created by Enji Cooper on 2013-05-25 20:50:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Enji Cooper

Created: 2013-05-25 20:50:24 UTC

Size: 2.49 KB

patch

obsolete

>From 30afc6a82692dff83dc5803f1ff2cefaf331ff5e Mon Sep 17 00:00:00 2001
>From: Garrett Cooper <yanegomi@gmail.com>
>Date: Sat, 25 May 2013 11:05:21 -0700
>Subject: [PATCH] Fix a race condition between make distribution and
> installworld
>
>installworld must finish before distribution can complete.
>
>Signed-off-by: Garrett Cooper <yanegomi@gmail.com>
>---
> release/Makefile            | 8 ++++++--
> release/generate-release.sh | 4 +++-
> 2 files changed, 9 insertions(+), 3 deletions(-)
>
>diff --git a/release/Makefile b/release/Makefile
>index 975f70e..6932166 100644
>--- a/release/Makefile
>+++ b/release/Makefile
>@@ -138,8 +138,10 @@ tests.txz:
> system: packagesystem
> # Install system
> 	mkdir -p release
>-	cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \
>+.for t in installkernel installworld distribution
>+	cd ${WORLDDIR} && ${IMAKE} $t \
> 	    DESTDIR=${.OBJDIR}/release WITHOUT_RESCUE=1 WITHOUT_KERNEL_SYMBOLS=1
>+.endfor
> # Copy distfiles
> 	mkdir -p release/usr/freebsd-dist
> 	cp *.txz MANIFEST release/usr/freebsd-dist
>@@ -157,7 +159,8 @@ system: packagesystem
> bootonly: packagesystem
> # Install system
> 	mkdir -p bootonly
>-	cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \
>+.for t in installkernel installworld distribution
>+	cd ${WORLDDIR} && ${IMAKE} $t \
> 	    DESTDIR=${.OBJDIR}/bootonly WITHOUT_AMD=1 WITHOUT_AT=1 \
> 	    WITHOUT_BIND_DNSSEC=1 WITHOUT_BIND_ETC=1 WITHOUT_BIND_MTREE=1 \
> 	    WITHOUT_BIND_NAMED=1 WITHOUT_GAMES=1 WITHOUT_GROFF=1 \
>@@ -165,6 +168,7 @@ bootonly: packagesystem
> 	    WITHOUT_NCP=1 WITHOUT_TOOLCHAIN=1 WITHOUT_PROFILE=1 \
> 	    WITHOUT_INSTALLIB=1 WITHOUT_RESCUE=1 WITHOUT_DICT=1 \
> 	    WITHOUT_KERNEL_SYMBOLS=1
>+.endfor
> # Copy manifest only (no distfiles) to get checksums
> 	mkdir -p bootonly/usr/freebsd-dist
> 	cp MANIFEST bootonly/usr/freebsd-dist
>diff --git a/release/generate-release.sh b/release/generate-release.sh
>index 7d17bfd..8a4c137 100755
>--- a/release/generate-release.sh
>+++ b/release/generate-release.sh
>@@ -81,7 +81,9 @@ fi
> ${SVN_CMD} co ${SVNROOTPORTS}/${BRANCHPORTS} ${CHROOTDIR}/usr/ports
> 
> ${SETENV} ${NWMAKE} -C ${CHROOTDIR}/usr/src ${WORLD_FLAGS} buildworld
>-${SETENV} ${NWMAKE} -C ${CHROOTDIR}/usr/src installworld distribution DESTDIR=${CHROOTDIR}
>+for t in installworld distribution; do
>+	${SETENV} ${NWMAKE} -C ${CHROOTDIR}/usr/src $t DESTDIR=${CHROOTDIR}
>+done
> mount -t devfs devfs ${CHROOTDIR}/dev
> trap "umount ${CHROOTDIR}/dev" EXIT # Clean up devfs mount on exit
> 
>-- 
>1.8.2.3

Actions: View

Attachments on bug 178978: 134322 | 134323