Add the 'dvd1.iso' target. This mimics the 'release.iso' target,
with the additional step of fetching packages for inclusion on the dvd image. The 'pkg-stage' target is used to run 'scripts/pkg-stage.sh' if the '${TARGET}/pkg-stage.conf' configuration file exists (currently only amd64 and i386). Allow dvd1.iso to be skipped if NODVD=1. MFC after: 3 days X-MFC-With: r258305, r258307, r258308, r258309 Sponsored by: The FreeBSD Foundation
This commit is contained in:
parent
1d9e5a791b
commit
dc2445625a
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=258310
@ -72,6 +72,10 @@ IMAGES=
|
|||||||
.if exists(${.CURDIR}/${TARGET}/mkisoimages.sh)
|
.if exists(${.CURDIR}/${TARGET}/mkisoimages.sh)
|
||||||
RELEASE_TARGETS+= cdrom
|
RELEASE_TARGETS+= cdrom
|
||||||
IMAGES+= disc1.iso bootonly.iso
|
IMAGES+= disc1.iso bootonly.iso
|
||||||
|
. if(!defined(NODVD))
|
||||||
|
RELEASE_TARGETS+= dvdrom
|
||||||
|
IMAGES+= dvd1.iso
|
||||||
|
. endif
|
||||||
.endif
|
.endif
|
||||||
.if exists(${.CURDIR}/${TARGET}/make-memstick.sh)
|
.if exists(${.CURDIR}/${TARGET}/make-memstick.sh)
|
||||||
RELEASE_TARGETS+= memstick.img
|
RELEASE_TARGETS+= memstick.img
|
||||||
@ -164,10 +168,33 @@ bootonly: packagesystem
|
|||||||
echo hostid_enable=\"NO\" >> bootonly/etc/rc.conf
|
echo hostid_enable=\"NO\" >> bootonly/etc/rc.conf
|
||||||
cp ${.CURDIR}/rc.local bootonly/etc
|
cp ${.CURDIR}/rc.local bootonly/etc
|
||||||
|
|
||||||
|
dvd:
|
||||||
|
# Install system
|
||||||
|
mkdir -p ${.TARGET}
|
||||||
|
cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \
|
||||||
|
DESTDIR=${.OBJDIR}/${.TARGET} WITHOUT_RESCUE=1 WITHOUT_KERNEL_SYMBOLS=1 \
|
||||||
|
WITHOUT_PROFILE=1
|
||||||
|
# Copy distfiles
|
||||||
|
mkdir -p ${.TARGET}/usr/freebsd-dist
|
||||||
|
cp *.txz MANIFEST ${.TARGET}/usr/freebsd-dist
|
||||||
|
# Copy documentation, if generated
|
||||||
|
.if !defined(NODOC)
|
||||||
|
cp reldoc/* ${.TARGET}
|
||||||
|
.endif
|
||||||
|
# Set up installation environment
|
||||||
|
ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
|
||||||
|
echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
|
||||||
|
echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf
|
||||||
|
cp ${.CURDIR}/rc.local ${.TARGET}/etc
|
||||||
|
touch ${.TARGET}
|
||||||
|
|
||||||
release.iso: disc1.iso
|
release.iso: disc1.iso
|
||||||
disc1.iso: system
|
disc1.iso: system
|
||||||
sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${.TARGET} release
|
sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${.TARGET} release
|
||||||
|
|
||||||
|
dvd1.iso: dvd pkg-stage
|
||||||
|
sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${.TARGET} dvd
|
||||||
|
|
||||||
bootonly.iso: bootonly
|
bootonly.iso: bootonly
|
||||||
sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${.TARGET} bootonly
|
sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${.TARGET} bootonly
|
||||||
|
|
||||||
@ -183,7 +210,14 @@ packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES}
|
|||||||
sh ${.CURDIR}/scripts/make-manifest.sh *.txz > MANIFEST
|
sh ${.CURDIR}/scripts/make-manifest.sh *.txz > MANIFEST
|
||||||
touch ${.TARGET}
|
touch ${.TARGET}
|
||||||
|
|
||||||
|
pkg-stage:
|
||||||
|
.if(exists(${.CURDIR}/${TARGET}/pkg-stage.conf))
|
||||||
|
sh ${.CURDIR}/scripts/pkg-stage.sh ${.CURDIR}/${TARGET}/pkg-stage.conf \
|
||||||
|
${REVISION}
|
||||||
|
.endif
|
||||||
|
|
||||||
cdrom: disc1.iso bootonly.iso
|
cdrom: disc1.iso bootonly.iso
|
||||||
|
dvdrom: dvd1.iso
|
||||||
ftp: packagesystem
|
ftp: packagesystem
|
||||||
rm -rf ftp
|
rm -rf ftp
|
||||||
mkdir -p ftp
|
mkdir -p ftp
|
||||||
@ -199,7 +233,7 @@ clean:
|
|||||||
rm -f packagesystem
|
rm -f packagesystem
|
||||||
rm -f *.txz MANIFEST
|
rm -f *.txz MANIFEST
|
||||||
rm -f system
|
rm -f system
|
||||||
rm -rf release bootonly
|
rm -rf release bootonly dvd
|
||||||
rm -f ${IMAGES}
|
rm -f ${IMAGES}
|
||||||
|
|
||||||
install:
|
install:
|
||||||
|
Loading…
Reference in New Issue
Block a user