Module Name: src
Committed By: jmcneill
Date: Fri Jul 23 21:53:34 UTC 2021
Modified Files:
src/distrib/evbarm: Makefile
Added Files:
src/distrib/evbarm/liveimage: Makefile Makefile.liveimage
src/distrib/evbarm/liveimage/armimage: Makefile dhcpcd ec2_init
resize_gpt resize_root spec.armimage sshd
Log Message:
evbarm: Add build.sh live-image support for armv7/aarch64
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/distrib/evbarm/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/evbarm/liveimage/Makefile \
src/distrib/evbarm/liveimage/Makefile.liveimage
cvs rdiff -u -r0 -r1.1 src/distrib/evbarm/liveimage/armimage/Makefile \
src/distrib/evbarm/liveimage/armimage/dhcpcd \
src/distrib/evbarm/liveimage/armimage/ec2_init \
src/distrib/evbarm/liveimage/armimage/resize_gpt \
src/distrib/evbarm/liveimage/armimage/resize_root \
src/distrib/evbarm/liveimage/armimage/spec.armimage \
src/distrib/evbarm/liveimage/armimage/sshd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/evbarm/Makefile
diff -u src/distrib/evbarm/Makefile:1.15 src/distrib/evbarm/Makefile:1.16
--- src/distrib/evbarm/Makefile:1.15 Mon Nov 16 11:38:29 2020
+++ src/distrib/evbarm/Makefile Fri Jul 23 21:53:33 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2020/11/16 11:38:29 rin Exp $
+# $NetBSD: Makefile,v 1.16 2021/07/23 21:53:33 jmcneill Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -8,6 +8,7 @@
SUBDIR= gzboot instkernel
.if !empty(MACHINE_ARCH:Maarch64*) || !empty(MACHINE_ARCH:Mearmv7hf*)
SUBDIR+= installimage
+SUBDIR+= liveimage
.endif
.if !empty(MACHINE_ARCH:Maarch64*)
SUBDIR+= isoimage
@@ -27,6 +28,9 @@ iso_image:
${MAKEDIRTARGET} isoimage iso_image
.endif
+live_image:
+ ${MAKEDIRTARGET} liveimage live_image
+
install_image:
${MAKEDIRTARGET} installimage install_image
Added files:
Index: src/distrib/evbarm/liveimage/Makefile
diff -u /dev/null src/distrib/evbarm/liveimage/Makefile:1.1
--- /dev/null Fri Jul 23 21:53:34 2021
+++ src/distrib/evbarm/liveimage/Makefile Fri Jul 23 21:53:33 2021
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile,v 1.1 2021/07/23 21:53:33 jmcneill Exp $
+
+SUBDIR= armimage
+
+TARGETS+= release live_image
+
+.include <bsd.subdir.mk>
Index: src/distrib/evbarm/liveimage/Makefile.liveimage
diff -u /dev/null src/distrib/evbarm/liveimage/Makefile.liveimage:1.1
--- /dev/null Fri Jul 23 21:53:34 2021
+++ src/distrib/evbarm/liveimage/Makefile.liveimage Fri Jul 23 21:53:33 2021
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile.liveimage,v 1.1 2021/07/23 21:53:33 jmcneill Exp $
+
+.include <bsd.own.mk>
+
+.if !empty(MACHINE_ARCH:Maarch64*)
+KERN_SET= kern-GENERIC64
+EFIBOOT= ${WORKDIR}/usr/mdec/bootaa64.efi
+.else
+KERN_SET= kern-GENERIC
+EFIBOOT= ${WORKDIR}/usr/mdec/bootarm.efi
+.endif
+
+USE_MBR= yes
+USE_GPT= yes
+
+.include "${.CURDIR}/../../../common/bootimage/Makefile.liveimage"
Index: src/distrib/evbarm/liveimage/armimage/Makefile
diff -u /dev/null src/distrib/evbarm/liveimage/armimage/Makefile:1.1
--- /dev/null Fri Jul 23 21:53:34 2021
+++ src/distrib/evbarm/liveimage/armimage/Makefile Fri Jul 23 21:53:34 2021
@@ -0,0 +1,22 @@
+# $NetBSD: Makefile,v 1.1 2021/07/23 21:53:34 jmcneill Exp $
+
+LIVEIMGBASE= NetBSD-${DISTRIBVER}-${MACHINE_ARCH}-live # gives ${IMGBASE}.img
+
+EMUIMAGEMB?= 1907 # 2GB USB flash memories aren't 2GiB
+LIVEIMAGEMB= ${EMUIMAGEMB}
+SWAPMB= 0 # No swap
+IMAGEHOSTNAME= netbsd
+
+FILESDIR!= cd ${.CURDIR}/../../../utils/embedded/files ; pwd
+
+SPEC_EXTRA= ${.CURDIR}/spec.armimage
+IMGFILE_EXTRA= \
+ ${FILESDIR}/ec2_init etc/rc.d/ec2_init \
+ ${FILESDIR}/resize_gpt etc/rc.d/resize_gpt \
+ ${.CURDIR}/dhcpcd etc/rc.conf.d/dhcpcd \
+ ${.CURDIR}/ec2_init etc/rc.conf.d/ec2_init \
+ ${.CURDIR}/resize_gpt etc/rc.conf.d/resize_gpt \
+ ${.CURDIR}/resize_root etc/rc.conf.d/resize_root \
+ ${.CURDIR}/sshd etc/rc.conf.d/sshd
+
+.include "${.CURDIR}/../Makefile.liveimage"
Index: src/distrib/evbarm/liveimage/armimage/dhcpcd
diff -u /dev/null src/distrib/evbarm/liveimage/armimage/dhcpcd:1.1
--- /dev/null Fri Jul 23 21:53:34 2021
+++ src/distrib/evbarm/liveimage/armimage/dhcpcd Fri Jul 23 21:53:34 2021
@@ -0,0 +1,3 @@
+# $NetBSD: dhcpcd,v 1.1 2021/07/23 21:53:34 jmcneill Exp $
+
+dhcpcd=YES
Index: src/distrib/evbarm/liveimage/armimage/ec2_init
diff -u /dev/null src/distrib/evbarm/liveimage/armimage/ec2_init:1.1
--- /dev/null Fri Jul 23 21:53:34 2021
+++ src/distrib/evbarm/liveimage/armimage/ec2_init Fri Jul 23 21:53:34 2021
@@ -0,0 +1,31 @@
+# $NetBSD: ec2_init,v 1.1 2021/07/23 21:53:34 jmcneill Exp $
+
+is_ec2() {
+ val=NO
+ # Look for the string "amazon" in one of these sysctl nodes
+ for node in machdep.dmi.system-vendor \
+ machdep.dmi.system-version \
+ machdep.dmi.bios-version \
+ machdep.xen.version ; do
+ if /sbin/sysctl -q $node; then
+ nodeval="$(/sbin/sysctl -n $node | tr '[A-Z]' '[a-z]')"
+ case "$nodeval" in
+ *amazon*)
+ val=YES
+ ;;
+ # OpenStack is not EC2 but it does have a metadata service.
+ *openstack*)
+ val=YES
+ ;;
+ esac
+ fi
+ done
+ printf $val
+}
+
+# Don't override /etc/rc.conf
+if [ -z "$ec2_init" ]
+then
+ ec2_init=$(is_ec2)
+fi
+
Index: src/distrib/evbarm/liveimage/armimage/resize_gpt
diff -u /dev/null src/distrib/evbarm/liveimage/armimage/resize_gpt:1.1
--- /dev/null Fri Jul 23 21:53:34 2021
+++ src/distrib/evbarm/liveimage/armimage/resize_gpt Fri Jul 23 21:53:34 2021
@@ -0,0 +1,3 @@
+# $NetBSD: resize_gpt,v 1.1 2021/07/23 21:53:34 jmcneill Exp $
+
+resize_gpt=YES
Index: src/distrib/evbarm/liveimage/armimage/resize_root
diff -u /dev/null src/distrib/evbarm/liveimage/armimage/resize_root:1.1
--- /dev/null Fri Jul 23 21:53:34 2021
+++ src/distrib/evbarm/liveimage/armimage/resize_root Fri Jul 23 21:53:34 2021
@@ -0,0 +1,5 @@
+# $NetBSD: resize_root,v 1.1 2021/07/23 21:53:34 jmcneill Exp $
+
+resize_root=YES
+resize_root_flags="-p"
+resize_root_postcmd="/sbin/reboot -n"
Index: src/distrib/evbarm/liveimage/armimage/spec.armimage
diff -u /dev/null src/distrib/evbarm/liveimage/armimage/spec.armimage:1.1
--- /dev/null Fri Jul 23 21:53:34 2021
+++ src/distrib/evbarm/liveimage/armimage/spec.armimage Fri Jul 23 21:53:34 2021
@@ -0,0 +1,8 @@
+# $NetBSD: spec.armimage,v 1.1 2021/07/23 21:53:34 jmcneill Exp $
+./etc/rc.conf.d/dhcpcd type=file mode=0644 uname=root gname=wheel
+./etc/rc.conf.d/ec2_init type=file mode=0644 uname=root gname=wheel
+./etc/rc.conf.d/resize_gpt type=file mode=0644 uname=root gname=wheel
+./etc/rc.conf.d/resize_root type=file mode=0644 uname=root gname=wheel
+./etc/rc.conf.d/sshd type=file mode=0644 uname=root gname=wheel
+./etc/rc.d/ec2_init type=file mode=0555 uname=root gname=wheel
+./etc/rc.d/resize_gpt type=file mode=0555 uname=root gname=wheel
Index: src/distrib/evbarm/liveimage/armimage/sshd
diff -u /dev/null src/distrib/evbarm/liveimage/armimage/sshd:1.1
--- /dev/null Fri Jul 23 21:53:34 2021
+++ src/distrib/evbarm/liveimage/armimage/sshd Fri Jul 23 21:53:34 2021
@@ -0,0 +1,3 @@
+# $NetBSD: sshd,v 1.1 2021/07/23 21:53:34 jmcneill Exp $
+
+sshd=YES
