Module Name: src
Committed By: tsutsui
Date: Sun Feb 2 03:19:37 UTC 2025
Modified Files:
src/distrib/amd64/installimage: installimage.mk
src/distrib/amd64/liveimage: Makefile.liveimage
src/distrib/common/bootimage: Makefile.bootimage
Log Message:
Use FFSv2 for amd64 live-image and install-image via new $IMGFFSVERSION.
Fixes PR/59007.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/amd64/installimage/installimage.mk
cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/liveimage/Makefile.liveimage
cvs rdiff -u -r1.44 -r1.45 src/distrib/common/bootimage/Makefile.bootimage
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/installimage/installimage.mk
diff -u src/distrib/amd64/installimage/installimage.mk:1.4 src/distrib/amd64/installimage/installimage.mk:1.5
--- src/distrib/amd64/installimage/installimage.mk:1.4 Mon Aug 14 13:54:05 2023
+++ src/distrib/amd64/installimage/installimage.mk Sun Feb 2 03:19:37 2025
@@ -1,4 +1,4 @@
-# $NetBSD: installimage.mk,v 1.4 2023/08/14 13:54:05 gdt Exp $
+# $NetBSD: installimage.mk,v 1.5 2025/02/02 03:19:37 tsutsui Exp $
# common code between distrib/amd64/installimage/Makefile and
# distrib/amd64/installimage-bios/Makefile.
@@ -9,7 +9,8 @@ INSTIMAGEMB?= 2500 # for all installat
INSTIMAGEMB?= 3800 # for all installation binaries
.endif
-PRIMARY_BOOT= bootxx_ffsv1
+IMGFFSVERSION= 2
+PRIMARY_BOOT= bootxx_ffsv2
SECONDARY_BOOT= boot
SECONDARY_BOOT_ARG= # unnecessary
Index: src/distrib/amd64/liveimage/Makefile.liveimage
diff -u src/distrib/amd64/liveimage/Makefile.liveimage:1.3 src/distrib/amd64/liveimage/Makefile.liveimage:1.4
--- src/distrib/amd64/liveimage/Makefile.liveimage:1.3 Sat Apr 13 18:38:17 2024
+++ src/distrib/amd64/liveimage/Makefile.liveimage Sun Feb 2 03:19:37 2025
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile.liveimage,v 1.3 2024/04/13 18:38:17 maya Exp $
+# $NetBSD: Makefile.liveimage,v 1.4 2025/02/02 03:19:37 tsutsui Exp $
.include <bsd.own.mk>
KERN_SET= kern-GENERIC
-PRIMARY_BOOT= bootxx_ffsv1
+IMGFFSVERSION= 2
+PRIMARY_BOOT= bootxx_ffsv2
SECONDARY_BOOT= boot
SECONDARY_BOOT_ARG= # unnecessary
Index: src/distrib/common/bootimage/Makefile.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.44 src/distrib/common/bootimage/Makefile.bootimage:1.45
--- src/distrib/common/bootimage/Makefile.bootimage:1.44 Sat Jan 18 09:07:14 2025
+++ src/distrib/common/bootimage/Makefile.bootimage Sun Feb 2 03:19:37 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.44 2025/01/18 09:07:14 tsutsui Exp $
+# $NetBSD: Makefile.bootimage,v 1.45 2025/02/02 03:19:37 tsutsui Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -113,6 +113,9 @@
# IMGMAKEFSOPTIONS
# options passed to makefs(8) to create root file system
# (default: -o bsize=16384,fsize=2048,density=8192)
+# IMGFFSVERSION
+# version of FFS created by makefs(8)
+# (default: 1)
# INSTALLBOOTOPTIONS
# options passed to installboot(8), e.g., -o console=com0
# (default: empty)
@@ -271,6 +274,7 @@ FSTAB_IN?= ${DISTRIBDIR}/common/bootimag
SPEC_IN?= ${DISTRIBDIR}/common/bootimage/spec.in
IMGMAKEFSOPTIONS?= -o bsize=16384,fsize=2048,density=8192
+IMGFFSVERSION?= 1
FATMAKEFSOPTIONS?= -o fat_type=16
WORKDIR?= work
@@ -451,7 +455,9 @@ ${TARGETFS}: prepare_md_post ${WORKFSTAB
-B ${TARGET_ENDIANNESS} \
-xx -F ${WORKSPEC} -N ${WORKDIR}/etc \
${MAKEFS_TIMESTAMP} \
+ -t ffs \
${IMGMAKEFSOPTIONS} \
+ -o version=${IMGFFSVERSION} \
${WORKFS} ${WORKDIR}
.if !empty(PRIMARY_BOOT) && ${INSTALLBOOT_AFTER_DISKLABEL} == "no"
${TOOL_INSTALLBOOT} -v -m ${MACHINE} ${INSTALLBOOTOPTIONS} ${WORKFS} \
