diff options
| -rw-r--r-- | release/Makefile | 28 | ||||
| -rwxr-xr-x | release/release.sh | 4 | ||||
| -rwxr-xr-x | release/scripts/pkg-stage.sh | 2 | ||||
| -rw-r--r-- | share/man/man7/release.7 | 10 |
4 files changed, 22 insertions, 22 deletions
diff --git a/release/Makefile b/release/Makefile index d9ea29d..976e994 100644 --- a/release/Makefile +++ b/release/Makefile @@ -18,7 +18,7 @@ # NOPORTS: if set, do not distribute ports tree # NOSRC: if set, do not distribute source tree # NODOC: if set, do not generate release documentation -# NODVD: if set, do not generate dvd1.iso +# WITH_DVD: if set, generate dvd1.iso # TARGET/TARGET_ARCH: architecture of built release # @@ -27,11 +27,15 @@ PORTSDIR?= /usr/ports DOCDIR?= /usr/doc RELNOTES_LANG?= en_US.ISO8859-1 -TARGET?= ${MACHINE} +.if !defined(TARGET) || empty(TARGET) +TARGET= ${MACHINE} +.endif +.if !defined(TARGET_ARCH) || empty(TARGET_ARCH) .if ${TARGET} == ${MACHINE} -TARGET_ARCH?= ${MACHINE_ARCH} +TARGET_ARCH= ${MACHINE_ARCH} .else -TARGET_ARCH?= ${TARGET} +TARGET_ARCH= ${TARGET} +.endif .endif IMAKE= ${MAKE} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} DISTDIR= dist @@ -73,7 +77,7 @@ IMAGES= .if exists(${.CURDIR}/${TARGET}/mkisoimages.sh) RELEASE_TARGETS+= cdrom IMAGES+= disc1.iso bootonly.iso -. if(!defined(NODVD)) +. if defined(WITH_DVD) && !empty(WITH_DVD) RELEASE_TARGETS+= dvdrom IMAGES+= dvd1.iso . endif @@ -83,7 +87,12 @@ RELEASE_TARGETS+= memstick.img IMAGES+= memstick.img .endif +CLEANFILES= packagesystem *.txz MANIFEST system ${IMAGES} +CLEANDIRS= dist ftp release bootonly dvd +beforeclean: + chflags -R noschg . .include <bsd.obj.mk> +clean: beforeclean base.txz: mkdir -p ${DISTDIR} @@ -220,15 +229,6 @@ release: ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} obj ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${RELEASE_TARGETS} -clean: - chflags -R noschg . - rm -rf dist ftp - rm -f packagesystem - rm -f *.txz MANIFEST - rm -f system - rm -rf release bootonly dvd - rm -f ${IMAGES} - install: .if defined(DESTDIR) && !empty(DESTDIR) mkdir -p ${DESTDIR} diff --git a/release/release.sh b/release/release.sh index 2baeeb5..9186c05 100755 --- a/release/release.sh +++ b/release/release.sh @@ -176,9 +176,9 @@ build_doc_ports() { _OSVERSION=$(sysctl -n kern.osreldate) if [ -d ${CHROOTDIR}/usr/doc ] && [ "x${NODOC}" = "x" ]; then PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes" - PBUILD_FLAGS="${PBUILD_FLAGS} OPTIONS_UNSET='FOP IGOR'" + PBUILD_FLAGS="${PBUILD_FLAGS}" chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \ - ${PBUILD_FLAGS} install clean distclean + ${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" install clean distclean fi } diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index 348e153..93768ff 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -25,7 +25,7 @@ REVISION="${2}" . "${1}" || exit 1 if [ ! -x /usr/local/sbin/pkg ]; then - /usr/sbin/pkg bootstrap + /usr/bin/make -C /usr/ports/ports-mgmt/pkg install clean fi /bin/mkdir -p ${PKG_CACHEDIR} diff --git a/share/man/man7/release.7 b/share/man/man7/release.7 index 9941b01..f8fc42b 100644 --- a/share/man/man7/release.7 +++ b/share/man/man7/release.7 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 18, 2013 +.Dd December 2, 2013 .Dt RELEASE 7 .Os .Sh NAME @@ -230,10 +230,6 @@ When set, will prevent the .Fa doc.txz distribution package from being created. -.It Va NODVD -Set to a non-empty value to skip the -.Cm dvdrom -target. .It Va NOPORTS Set to a non-empty value to skip the .Li ports/ @@ -245,6 +241,10 @@ will prevent the distribution package from being created. Setting this also sets .Va NODOC . +.It Va WITH_DVD +Set to a non-empty value to include the +.Cm dvdrom +target. .El .Sh MAKEFILE TARGETS The release makefile |
