diff options
| author | nwhitehorn <nwhitehorn@FreeBSD.org> | 2011-05-04 23:41:11 +0000 |
|---|---|---|
| committer | nwhitehorn <nwhitehorn@FreeBSD.org> | 2011-05-04 23:41:11 +0000 |
| commit | 3a0f89209ce8f063a162c5c44aa86271d49a17c9 (patch) | |
| tree | be36122c45b7bcd46fffada194de96a1a955efc4 /release/amd64 | |
| parent | fa658caf7f77301a0ec0b43f379ae4e01559ce9a (diff) | |
| download | FreeBSD-src-3a0f89209ce8f063a162c5c44aa86271d49a17c9.zip FreeBSD-src-3a0f89209ce8f063a162c5c44aa86271d49a17c9.tar.gz | |
Repair release CD generation on PC98 and sun4v after release building
changes, and backport the new logic (ISO images are TARGET dependant, not
TARGET_CPUARCH dependant) to Makefile.sysinstall. While modifying ISO
image scripts, change several archs to use makefs (from base) instead of
mkisofs (from ports) which makes release CD generation both faster and
self-hosting.
Diffstat (limited to 'release/amd64')
| -rw-r--r-- | release/amd64/mkisoimages.sh | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/release/amd64/mkisoimages.sh b/release/amd64/mkisoimages.sh index c8c1986..384f44f 100644 --- a/release/amd64/mkisoimages.sh +++ b/release/amd64/mkisoimages.sh @@ -26,7 +26,7 @@ publisher="The FreeBSD Project. http://www.freebsd.org/" if [ "x$1" = "x-b" ]; then # This is highly x86-centric and will be used directly below. - bootable="-b boot/cdboot -no-emul-boot" + bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot" shift else bootable="" @@ -37,24 +37,9 @@ if [ $# -lt 3 ]; then exit 1 fi -type mkisofs 2>&1 | grep " is " >/dev/null -if [ $? -ne 0 ]; then - echo The cdrtools port is not installed. Trying to get it now. - if [ -f /usr/ports/sysutils/cdrtools/Makefile ]; then - cd /usr/ports/sysutils/cdrtools && make install BATCH=yes && make clean - else - if ! pkg_add -r cdrtools; then - echo "Could not get it via pkg_add - please go install this" - echo "from the ports collection and run this script again." - exit 2 - fi - fi -fi - LABEL=$1; shift NAME=$1; shift -echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab -mkisofs $bootable -r -J -V $LABEL -publisher "$publisher" -o $NAME $* +echo "/dev/iso9660/`echo $LABEL | tr '[:lower:]' '[:upper:]'` / cd9660 ro 0 0" > $1/etc/fstab +makefs -t cd9660 $bootable -o rockridge -o label=$LABEL $NAME $* rm $1/etc/fstab - |
