From ee3561ee184d41ea50ba86eed0a5c315df51b6b0 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Sun, 8 Feb 2009 12:15:52 -0800 Subject: [PATCH] Adjust the ${ISODIR}/.didbootstrap logic a little, add needed licenses. Adjust the bootstrap logic a bit and add the following licenses to the release build's mk.conf so the gui packages all build: The openmotif-license and the vim-license. --- nrelease/Makefile | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/nrelease/Makefile b/nrelease/Makefile index b201897c5b..b35caf8345 100644 --- a/nrelease/Makefile +++ b/nrelease/Makefile @@ -309,13 +309,23 @@ customizeiso: cp /etc/shells ${ISOROOT}/usr/pkgsrc/distfiles/.test || \ mount_null ${ISODIR}/distfiles ${ISOROOT}/usr/pkgsrc/distfiles # - # Bootstrap, if not already installed + # Bootstrap, if not already installed, and added licenses needed + # for the gui release # - test -e ${ISODIR}/.didbootstrap || \ - ${CHROOT_CMD} "cd /usr/pkgsrc/bootstrap; \ +.if !exists (${ISODIR}/.didbootstrap) + ${CHROOT_CMD} "cd /usr/pkgsrc/bootstrap; \ ./bootstrap --workdir /usr/pkgobj/bootstrap/work" + echo ".ifdef BSD_PKG_MK # added by nrelease" \ + >> ${ISOROOT}/usr/pkg/etc/mk.conf + echo "ACCEPTABLE_LICENSES+=openmotif-license" \ + >> ${ISOROOT}/usr/pkg/etc/mk.conf + echo "ACCEPTABLE_LICENSES+=vim-license" \ + >> ${ISOROOT}/usr/pkg/etc/mk.conf + echo ".endif # added by nrelease" \ + >> ${ISOROOT}/usr/pkg/etc/mk.conf sync touch ${ISODIR}/.didbootstrap +.endif # # Build and install packages, skip packages already installed # -- 2.41.0