diff options
| author | gjb <gjb@FreeBSD.org> | 2013-12-11 19:26:56 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2013-12-11 19:26:56 +0000 |
| commit | 3a49f6f7cfa70e150a74b05a14460649c3d7a4bd (patch) | |
| tree | 0fd5ef6f78c63cbb47411d286f0b16e2dffab817 /release | |
| parent | de938e4059cac64f6b3db3f757aeed24ca149f05 (diff) | |
| download | FreeBSD-src-3a49f6f7cfa70e150a74b05a14460649c3d7a4bd.zip FreeBSD-src-3a49f6f7cfa70e150a74b05a14460649c3d7a4bd.tar.gz | |
MFC r257805, r257806, r257807, r257942:
r257805:
Add a 'mini-memstick.img' release target, which will use the
'bootonly.iso' components to create a smaller memory stick image.
This is useful for system recovery, where a full memstick.img image
is not necessarily needed (or wanted). In addition, it is possible
to do bootonly-style installation, where the base.txz, kernel.txz,
etc. are fetched from a remote source.
Provide backwards-compatible target (mini-memstick), to keep in sync
with the targets documented in release/Makefile.
r257806:
Remove extra target from 'memstick' that I forgot to remove before
previous commit.
r257807:
Update release(7) to include 'mini-memstick'.
r257942:
Fix a few style nits.
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile | 7 | ||||
| -rwxr-xr-x | release/release.sh | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/release/Makefile b/release/Makefile index 976e994..8db3a73 100644 --- a/release/Makefile +++ b/release/Makefile @@ -6,6 +6,7 @@ # cdrom: Builds release CD-ROM media (disc1.iso) # dvdrom: Builds release DVD-ROM media (dvd1.iso) # memstick: Builds memory stick image (memstick.img) +# mini-memstick: Builds minimal memory stick image (mini-memstick.img) # ftp: Sets up FTP distribution area (ftp) # release: Build all media and FTP distribution area # install: Copies all release media into ${DESTDIR} @@ -84,7 +85,9 @@ IMAGES+= dvd1.iso .endif .if exists(${.CURDIR}/${TARGET}/make-memstick.sh) RELEASE_TARGETS+= memstick.img +RELEASE_TARGETS+= mini-memstick.img IMAGES+= memstick.img +IMAGES+= mini-memstick.img .endif CLEANFILES= packagesystem *.txz MANIFEST system ${IMAGES} @@ -208,6 +211,10 @@ memstick: memstick.img memstick.img: system sh ${.CURDIR}/${TARGET}/make-memstick.sh release ${.TARGET} +mini-memstick: mini-memstick.img +mini-memstick.img: system + sh ${.CURDIR}/${TARGET}/make-memstick.sh bootonly ${.TARGET} + packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES} sh ${.CURDIR}/scripts/make-manifest.sh *.txz > MANIFEST touch ${.TARGET} diff --git a/release/release.sh b/release/release.sh index f31c87a..1389ce3 100755 --- a/release/release.sh +++ b/release/release.sh @@ -111,10 +111,10 @@ fi # instead of their values. DOCPORTS= if [ "x${NOPORTS}" != "x" ]; then - DOCPORTS="NOPORTS=yes " + DOCPORTS="NOPORTS=yes " fi if [ "x${NODOC}" != "x" ]; then - DOCPORTS="${DOCPORTS}NODOC=yes" + DOCPORTS="${DOCPORTS}NODOC=yes" fi # The aggregated build-time flags based upon variables defined within @@ -137,7 +137,7 @@ RELEASE_RMAKEFLAGS="${ARCH_FLAGS} KERNCONF=\"${KERNEL}\" ${CONF_FILES} \ # Force src checkout if configured FORCE_SRC_KEY= if [ "x${SRC_FORCE_CHECKOUT}" != "x" ]; then - FORCE_SRC_KEY="--force" + FORCE_SRC_KEY="--force" fi if [ ! ${CHROOTDIR} ]; then |
