Module Name:    src
Committed By:   tsutsui
Date:           Sat Mar 21 14:24:12 UTC 2020

Modified Files:
        src/distrib/zaurus: Makefile
Added Files:
        src/distrib/zaurus/liveimage: Makefile fstab.in spec.in

Log Message:
Add "build.sh live-image" support for zaurus.

Tested on SL-C3000 and SL-C700.
See also PR/55075 for live-image with FAT partition support.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/zaurus/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/zaurus/liveimage/Makefile \
    src/distrib/zaurus/liveimage/fstab.in \
    src/distrib/zaurus/liveimage/spec.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/zaurus/Makefile
diff -u src/distrib/zaurus/Makefile:1.2 src/distrib/zaurus/Makefile:1.3
--- src/distrib/zaurus/Makefile:1.2	Sun May 29 17:19:31 2011
+++ src/distrib/zaurus/Makefile	Sat Mar 21 14:24:12 2020
@@ -1,12 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2011/05/29 17:19:31 tsutsui Exp $
+# $NetBSD: Makefile,v 1.3 2020/03/21 14:24:12 tsutsui Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
 
 SUBDIR=		ramdisk .WAIT instkernel cdroms
+SUBDIR+=	liveimage
 TARGETS+=	release
 
 iso_image:
 	${MAKEDIRTARGET} cdroms iso_image
 
+live_image:
+	${MAKEDIRTARGET} liveimage live_image
+
 .include <bsd.subdir.mk>

Added files:

Index: src/distrib/zaurus/liveimage/Makefile
diff -u /dev/null src/distrib/zaurus/liveimage/Makefile:1.1
--- /dev/null	Sat Mar 21 14:24:12 2020
+++ src/distrib/zaurus/liveimage/Makefile	Sat Mar 21 14:24:12 2020
@@ -0,0 +1,39 @@
+#	$NetBSD: Makefile,v 1.1 2020/03/21 14:24:12 tsutsui Exp $
+
+LIVEIMGBASE=	NetBSD-${DISTRIBVER}-zaurus-live	# gives ${IMGBASE}.img
+
+.include <bsd.own.mk>
+
+LIVEIMAGEMB?=	900		# for "1GB" SD due to Zaurus Linux restriction
+SWAPMB?=	64
+FATMB?=		32
+
+USE_MBR=	yes
+MBRFAT=		6		# 16-bit FAT, more than 32M
+
+# Omit comp etc. due to size restriction
+KERN_SET=	kern-GENERIC
+SETS=		base modules etc misc rescue text xbase xetc xfont xserver
+
+# prepare SL-C700 kernel as an independent name
+prepare_md_post:
+	echo Extracting kern-C700.${TAR_SUFF} ...
+	${TOOL_PAX} ${PAX_TIMESTAMP} -rn				\
+	    --use-compress-program=${COMPRESS_PROGRAM:Q}		\
+	    -f ${SETS_DIR}/kern-C700.${TAR_SUFF} .
+	mv netbsd netbsd.c700
+
+CLEANFILES+=	netbsd.c700
+
+IMGFILE_EXTRA=								\
+		${.OBJDIR}/netbsd.c700		.
+
+DISKPROTO_IN=	${.CURDIR}/../../common/bootimage/diskproto.mbrfat.in
+FSTAB_IN=	${.CURDIR}/fstab.in
+SPEC_EXTRA=	${.CURDIR}/spec.in
+
+FATFILES=	${WORKDIR}/usr/mdec/zbsdmod.o ${WORKDIR}/usr/mdec/zboot
+FATFILES+=	${WORKDIR}/netbsd
+FATFILES+=	${WORKDIR}/netbsd.c700
+
+.include "${.CURDIR}/../../common/bootimage/Makefile.liveimage"
Index: src/distrib/zaurus/liveimage/fstab.in
diff -u /dev/null src/distrib/zaurus/liveimage/fstab.in:1.1
--- /dev/null	Sat Mar 21 14:24:12 2020
+++ src/distrib/zaurus/liveimage/fstab.in	Sat Mar 21 14:24:12 2020
@@ -0,0 +1,7 @@
+ROOT.a		/		ffs	rw		1 1
+ROOT.b		none		none	sw		0 0
+ROOT.e		/dos		msdos	rw		0 0
+ptyfs		/dev/pts	ptyfs	rw		0 0
+kernfs		/kern		kernfs	rw,noauto	0 0
+procfs		/proc		procfs	rw,noauto	0 0
+tmpfs		/var/shm	tmpfs	rw,-m1777,-sram%25 0 0
Index: src/distrib/zaurus/liveimage/spec.in
diff -u /dev/null src/distrib/zaurus/liveimage/spec.in:1.1
--- /dev/null	Sat Mar 21 14:24:12 2020
+++ src/distrib/zaurus/liveimage/spec.in	Sat Mar 21 14:24:12 2020
@@ -0,0 +1,3 @@
+# $NetBSD: spec.in,v 1.1 2020/03/21 14:24:12 tsutsui Exp $
+./netbsd.c700	type=file mode=0755 uname=root gname=wheel
+./dos		type=dir mode=0755 uname=root gname=wheel

Reply via email to