CVS commit: src/distrib/evbarm/liveimage/armimage
Module Name:src
Committed By: jmcneill
Date: Sat Jul 24 14:00:08 UTC 2021
Modified Files:
src/distrib/evbarm/liveimage/armimage: Makefile spec.armimage
Added Files:
src/distrib/evbarm/liveimage/armimage: rc.conf.armimage
Removed Files:
src/distrib/evbarm/liveimage/armimage: dhcpcd ec2_init resize_gpt
resize_root sshd
Log Message:
evbarm: liveimage: use RC_CONF_EXTRA instead of rc.conf.d
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/evbarm/liveimage/armimage/Makefile \
src/distrib/evbarm/liveimage/armimage/spec.armimage
cvs rdiff -u -r1.1 -r0 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/sshd
cvs rdiff -u -r0 -r1.1 src/distrib/evbarm/liveimage/armimage/rc.conf.armimage
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/liveimage/armimage/Makefile
diff -u src/distrib/evbarm/liveimage/armimage/Makefile:1.1 src/distrib/evbarm/liveimage/armimage/Makefile:1.2
--- src/distrib/evbarm/liveimage/armimage/Makefile:1.1 Fri Jul 23 21:53:34 2021
+++ src/distrib/evbarm/liveimage/armimage/Makefile Sat Jul 24 14:00:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/07/23 21:53:34 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2021/07/24 14:00:08 jmcneill Exp $
LIVEIMGBASE= NetBSD-${DISTRIBVER}-${MACHINE_ARCH}-live # gives ${IMGBASE}.img
@@ -10,13 +10,9 @@ IMAGEHOSTNAME= netbsd
FILESDIR!= cd ${.CURDIR}/../../../utils/embedded/files ; pwd
SPEC_EXTRA= ${.CURDIR}/spec.armimage
+RC_CONF_EXTRA= ${.CURDIR}/rc.conf.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
+ ${FILESDIR}/resize_gpt etc/rc.d/resize_gpt
.include "${.CURDIR}/../Makefile.liveimage"
Index: src/distrib/evbarm/liveimage/armimage/spec.armimage
diff -u src/distrib/evbarm/liveimage/armimage/spec.armimage:1.1 src/distrib/evbarm/liveimage/armimage/spec.armimage:1.2
--- src/distrib/evbarm/liveimage/armimage/spec.armimage:1.1 Fri Jul 23 21:53:34 2021
+++ src/distrib/evbarm/liveimage/armimage/spec.armimage Sat Jul 24 14:00:08 2021
@@ -1,8 +1,3 @@
-# $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
+# $NetBSD: spec.armimage,v 1.2 2021/07/24 14:00:08 jmcneill Exp $
./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
Added files:
Index: src/distrib/evbarm/liveimage/armimage/rc.conf.armimage
diff -u /dev/null src/distrib/evbarm/liveimage/armimage/rc.conf.armimage:1.1
--- /dev/null Sat Jul 24 14:00:08 2021
+++ src/distrib/evbarm/liveimage/armimage/rc.conf.armimage Sat Jul 24 14:00:08 2021
@@ -0,0 +1,36 @@
+# $NetBSD: rc.conf.armimage,v 1.1 2021/07/24 14:00:08 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
+}
+
+resize_gpt=YES
+resize_root=YES
+resize_root_flags="-p"
+resize_root_postcmd="/sbin/reboot -n"
+dhcpcd=YES
+sshd=YES
+ec2_init=$(is_ec2)
+
+if checkyesno ec2_init; then
+ dhcpcd_flags="$dhcpcd_flags -w"
+fi
CVS commit: src/distrib/evbarm
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
.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
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
+
+.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 $
CVS commit: src/distrib/evbarm/instkernel/sshramdisk
Module Name:src Committed By: christos Date: Tue Mar 9 00:08:04 UTC 2021 Modified Files: src/distrib/evbarm/instkernel/sshramdisk: list Log Message: We don't need libwrap anymore; libhack replaces it. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/distrib/evbarm/instkernel/sshramdisk/list 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/instkernel/sshramdisk/list diff -u src/distrib/evbarm/instkernel/sshramdisk/list:1.4 src/distrib/evbarm/instkernel/sshramdisk/list:1.5 --- src/distrib/evbarm/instkernel/sshramdisk/list:1.4 Sun Mar 1 15:59:54 2020 +++ src/distrib/evbarm/instkernel/sshramdisk/list Mon Mar 8 19:08:04 2021 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.4 2020/03/01 20:59:54 christos Exp $ +# $NetBSD: list,v 1.5 2021/03/09 00:08:04 christos Exp $ SRCDIRS bin sbin external/bsd/less/bin crypto/external/bsd/openssh/bin/sshd usr.bin usr.sbin @@ -69,7 +69,7 @@ SPECIAL umount srcdir distrib/utils/x_u SPECIAL sshd srcdir crypto/external/bsd/openssh/bin/sshd SPECIAL sshd keepsymbols allow_severity deny_severity -LIBS libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop-lssh -lcrypto -lwrap +LIBS libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop-lssh -lcrypto # init invokes the shell as -sh ARGVLN sh -sh
CVS commit: src/distrib/evbarm/installimage
Module Name:src
Committed By: martin
Date: Mon Feb 8 19:11:41 UTC 2021
Modified Files:
src/distrib/evbarm/installimage: Makefile
Log Message:
Use the same naming scheme for install images as we use for the ISO images.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/distrib/evbarm/installimage/Makefile
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/installimage/Makefile
diff -u src/distrib/evbarm/installimage/Makefile:1.7 src/distrib/evbarm/installimage/Makefile:1.8
--- src/distrib/evbarm/installimage/Makefile:1.7 Mon Nov 16 11:38:29 2020
+++ src/distrib/evbarm/installimage/Makefile Mon Feb 8 19:11:41 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2020/11/16 11:38:29 rin Exp $
+# $NetBSD: Makefile,v 1.8 2021/02/08 19:11:41 martin Exp $
.include
-INSTIMGBASE= NetBSD-${DISTRIBVER}-${MACHINE_ARCH}-install # gives ${IMGBASE}.img
+INSTIMGBASE= NetBSD-${DISTRIBVER}-evbarm-${MACHINE_ARCH}-install # gives ${IMGBASE}.img
INSTIMAGEMB?= 1550 # for all installation binaries
CVS commit: src/distrib/evbarm
Module Name:src
Committed By: rin
Date: Mon Nov 16 11:38:30 UTC 2020
Modified Files:
src/distrib/evbarm: Makefile
src/distrib/evbarm/installimage: Makefile
src/distrib/evbarm/instkernel/ramdisk: Makefile
Log Message:
Correctly support aarch64eb and earmv7hfeb in a similar manner to
their little-endian counterparts.
Fix build failures for periodic binary snapshots.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/distrib/evbarm/Makefile
cvs rdiff -u -r1.6 -r1.7 src/distrib/evbarm/installimage/Makefile
cvs rdiff -u -r1.19 -r1.20 src/distrib/evbarm/instkernel/ramdisk/Makefile
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.14 src/distrib/evbarm/Makefile:1.15
--- src/distrib/evbarm/Makefile:1.14 Thu Oct 15 08:59:57 2020
+++ src/distrib/evbarm/Makefile Mon Nov 16 11:38:29 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2020/10/15 08:59:57 jmcneill Exp $
+# $NetBSD: Makefile,v 1.15 2020/11/16 11:38:29 rin Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -6,10 +6,10 @@
.include
SUBDIR= gzboot instkernel
-.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "earmv7hf"
+.if !empty(MACHINE_ARCH:Maarch64*) || !empty(MACHINE_ARCH:Mearmv7hf*)
SUBDIR+= installimage
.endif
-.if ${MACHINE_ARCH} == "aarch64"
+.if !empty(MACHINE_ARCH:Maarch64*)
SUBDIR+= isoimage
.endif
TARGETS+= release
@@ -22,7 +22,7 @@ release: check_RELEASEDIR .WAIT ${MDECBO
${RELEASE_INSTALL} ${MDECBOOT} ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation
.endif
-.if ${MACHINE_ARCH} == "aarch64"
+.if !empty(MACHINE_ARCH:Maarch64*)
iso_image:
${MAKEDIRTARGET} isoimage iso_image
.endif
Index: src/distrib/evbarm/installimage/Makefile
diff -u src/distrib/evbarm/installimage/Makefile:1.6 src/distrib/evbarm/installimage/Makefile:1.7
--- src/distrib/evbarm/installimage/Makefile:1.6 Tue Jun 2 14:27:32 2020
+++ src/distrib/evbarm/installimage/Makefile Mon Nov 16 11:38:29 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2020/06/02 14:27:32 jmcneill Exp $
+# $NetBSD: Makefile,v 1.7 2020/11/16 11:38:29 rin Exp $
.include
@@ -6,10 +6,10 @@ INSTIMGBASE= NetBSD-${DISTRIBVER}-${MACH
INSTIMAGEMB?= 1550 # for all installation binaries
-.if ${MACHINE_ARCH} == "aarch64"
+.if !empty(MACHINE_ARCH:Maarch64*)
EFIBOOT= ${WORKDIR}/usr/mdec/bootaa64.efi
KERN_SET= kern-GENERIC64
-.elif ${MACHINE_ARCH} == "earmv7hf"
+.elif !empty(MACHINE_ARCH:Mearmv7hf*)
EFIBOOT+= ${WORKDIR}/usr/mdec/bootarm.efi
KERN_SET= kern-GENERIC
.endif
Index: src/distrib/evbarm/instkernel/ramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/ramdisk/Makefile:1.19 src/distrib/evbarm/instkernel/ramdisk/Makefile:1.20
--- src/distrib/evbarm/instkernel/ramdisk/Makefile:1.19 Sun Apr 1 04:35:01 2018
+++ src/distrib/evbarm/instkernel/ramdisk/Makefile Mon Nov 16 11:38:29 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2018/04/01 04:35:01 ryo Exp $
+# $NetBSD: Makefile,v 1.20 2020/11/16 11:38:29 rin Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -28,7 +28,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \
${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
${DISTRIBDIR}/common/services
-.if !empty(MACHINE_ARCH:Maarch64)
+.if !empty(MACHINE_ARCH:Maarch64*)
UBOOT_IMAGE_ARCH= arm64
.else
UBOOT_IMAGE_ARCH= arm
CVS commit: src/distrib/evbarm/isoimage
Module Name:src
Committed By: jmcneill
Date: Sun Nov 15 00:19:17 UTC 2020
Modified Files:
src/distrib/evbarm/isoimage: Makefile.cdrom
Log Message:
Use "efi" boot image platform ID.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/evbarm/isoimage/Makefile.cdrom
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/isoimage/Makefile.cdrom
diff -u src/distrib/evbarm/isoimage/Makefile.cdrom:1.1 src/distrib/evbarm/isoimage/Makefile.cdrom:1.2
--- src/distrib/evbarm/isoimage/Makefile.cdrom:1.1 Sun Oct 11 14:24:50 2020
+++ src/distrib/evbarm/isoimage/Makefile.cdrom Sun Nov 15 00:19:17 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.1 2020/10/11 14:24:50 jmcneill Exp $
+# $NetBSD: Makefile.cdrom,v 1.2 2020/11/15 00:19:17 jmcneill Exp $
.include
.include
@@ -13,7 +13,7 @@ MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP
# Need multidot for the boot loader to read kernel modules as it doesn't
# understand rockridge.
-CDMAKEFSOPTIONS= bootimage=i386;${EFIBOOTIMG},platformid=efi,no-emul-boot
+CDMAKEFSOPTIONS= bootimage=efi;${EFIBOOTIMG},platformid=efi,no-emul-boot
CDRELEASE_NOISOS= true
CD_SETS=
CVS commit: src/distrib/evbarm
Module Name:src
Committed By: jmcneill
Date: Thu Oct 15 08:59:57 UTC 2020
Modified Files:
src/distrib/evbarm: Makefile
Log Message:
Only add iso_image target for aarch64
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/distrib/evbarm/Makefile
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.13 src/distrib/evbarm/Makefile:1.14
--- src/distrib/evbarm/Makefile:1.13 Sun Oct 11 14:24:50 2020
+++ src/distrib/evbarm/Makefile Thu Oct 15 08:59:57 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2020/10/11 14:24:50 jmcneill Exp $
+# $NetBSD: Makefile,v 1.14 2020/10/15 08:59:57 jmcneill Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -22,8 +22,10 @@ release: check_RELEASEDIR .WAIT ${MDECBO
${RELEASE_INSTALL} ${MDECBOOT} ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation
.endif
+.if ${MACHINE_ARCH} == "aarch64"
iso_image:
${MAKEDIRTARGET} isoimage iso_image
+.endif
install_image:
${MAKEDIRTARGET} installimage install_image
CVS commit: src/distrib/evbarm/isoimage
Module Name:src
Committed By: jmcneill
Date: Sun Oct 11 14:54:08 UTC 2020
Modified Files:
src/distrib/evbarm/isoimage: Makefile
Log Message:
Exclude live images from install media
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/evbarm/isoimage/Makefile
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/isoimage/Makefile
diff -u src/distrib/evbarm/isoimage/Makefile:1.1 src/distrib/evbarm/isoimage/Makefile:1.2
--- src/distrib/evbarm/isoimage/Makefile:1.1 Sun Oct 11 14:24:50 2020
+++ src/distrib/evbarm/isoimage/Makefile Sun Oct 11 14:54:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/10/11 14:24:50 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2020/10/11 14:54:08 jmcneill Exp $
.include
.include "${.CURDIR}/Makefile.cdrom"
@@ -13,3 +13,6 @@ prepare_md_post:
< ${.CURDIR}/boot.cfg.in > boot.cfg
.include "${.CURDIR}/../../common/Makefile.bootcd"
+
+# Exclude live images from installation media
+CDRELEASE_EXCLUDE+= -s ',./binary/gzimg.*,,gp'
CVS commit: src/distrib/evbarm/instkernel/ramdisk
Module Name:src
Committed By: jmcneill
Date: Sun Oct 11 14:24:31 UTC 2020
Modified Files:
src/distrib/evbarm/instkernel/ramdisk: dot.profile
Log Message:
Sync with amd64
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/evbarm/instkernel/ramdisk/dot.profile
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/instkernel/ramdisk/dot.profile
diff -u src/distrib/evbarm/instkernel/ramdisk/dot.profile:1.3 src/distrib/evbarm/instkernel/ramdisk/dot.profile:1.4
--- src/distrib/evbarm/instkernel/ramdisk/dot.profile:1.3 Thu Jan 9 19:17:41 2020
+++ src/distrib/evbarm/instkernel/ramdisk/dot.profile Sun Oct 11 14:24:31 2020
@@ -1,4 +1,4 @@
-# $NetBSD: dot.profile,v 1.3 2020/01/09 19:17:41 martin Exp $
+# $NetBSD: dot.profile,v 1.4 2020/10/11 14:24:31 jmcneill Exp $
#
# Copyright (c) 1997 Perry E. Metzger
# Copyright (c) 1994 Christopher G. Demetriou
@@ -35,10 +35,14 @@
PATH=/sbin:/bin:/usr/bin:/usr/sbin:/
export PATH
-TERM=vt100
+TERM=wsvt25
export TERM
HOME=/
export HOME
+BLOCKSIZE=1k
+export BLOCKSIZE
+EDITOR=ed
+export EDITOR
umask 022
@@ -51,14 +55,22 @@ if [ "X${DONEPROFILE}" = "X" ]; then
# set up some sane defaults
echo 'erase ^?, werase ^W, kill ^U, intr ^C'
stty newcrt werase ^W intr ^C kill ^U erase ^?
- echo ''
+ mount -t tmpfs tmpfs /tmp
+ mount -t tmpfs tmpfs /var
+ mount -t tmpfs -o union tmpfs /etc
+
+ mkdir -p /var/run /var/db
# mount the ramdisk read write
mount -u $ROOTDEV /
- # mount the kern_fs so that we can examine the dmesg state
- mount -t kernfs /kern /kern
+ grep() sed -n "/$1/p"
- # run the installation or upgrade script.
- sysinst || stty sane
+ if [ -x /sysinst ]; then
+ # run the installation or upgrade script.
+ sysinst || stty sane
+ else
+ echo "This image contains utilities which may be needed"
+ echo "to get you out of a pinch."
+ fi
fi
CVS commit: src/distrib/evbarm
Module Name:src
Committed By: jmcneill
Date: Sun Oct 11 14:24:50 UTC 2020
Modified Files:
src/distrib/evbarm: Makefile
Added Files:
src/distrib/evbarm/isoimage: Makefile Makefile.cdrom boot.cfg.in
Log Message:
Create a bootable El Torito installation ISO.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/distrib/evbarm/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/evbarm/isoimage/Makefile \
src/distrib/evbarm/isoimage/Makefile.cdrom \
src/distrib/evbarm/isoimage/boot.cfg.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/evbarm/Makefile
diff -u src/distrib/evbarm/Makefile:1.12 src/distrib/evbarm/Makefile:1.13
--- src/distrib/evbarm/Makefile:1.12 Thu May 28 15:27:59 2020
+++ src/distrib/evbarm/Makefile Sun Oct 11 14:24:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2020/05/28 15:27:59 jmcneill Exp $
+# $NetBSD: Makefile,v 1.13 2020/10/11 14:24:50 jmcneill Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -9,6 +9,9 @@ SUBDIR= gzboot instkernel
.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "earmv7hf"
SUBDIR+= installimage
.endif
+.if ${MACHINE_ARCH} == "aarch64"
+SUBDIR+= isoimage
+.endif
TARGETS+= release
.if ${MACHINE_CPU} == "arm"
@@ -19,6 +22,9 @@ release: check_RELEASEDIR .WAIT ${MDECBO
${RELEASE_INSTALL} ${MDECBOOT} ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation
.endif
+iso_image:
+ ${MAKEDIRTARGET} isoimage iso_image
+
install_image:
${MAKEDIRTARGET} installimage install_image
Added files:
Index: src/distrib/evbarm/isoimage/Makefile
diff -u /dev/null src/distrib/evbarm/isoimage/Makefile:1.1
--- /dev/null Sun Oct 11 14:24:50 2020
+++ src/distrib/evbarm/isoimage/Makefile Sun Oct 11 14:24:50 2020
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1 2020/10/11 14:24:50 jmcneill Exp $
+
+.include
+.include "${.CURDIR}/Makefile.cdrom"
+
+CDBASE= evbarm-${MACHINE_ARCH}cd # gives ${CDBASE}.iso
+CDRELEASE= true# include $RELEASEDIR/$RELEASEMACHINEDIR
+CDRELEASE_NODEBUG= true
+CLEANFILES+= boot.cfg
+
+prepare_md_post:
+ ${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" \
+ < ${.CURDIR}/boot.cfg.in > boot.cfg
+
+.include "${.CURDIR}/../../common/Makefile.bootcd"
Index: src/distrib/evbarm/isoimage/Makefile.cdrom
diff -u /dev/null src/distrib/evbarm/isoimage/Makefile.cdrom:1.1
--- /dev/null Sun Oct 11 14:24:50 2020
+++ src/distrib/evbarm/isoimage/Makefile.cdrom Sun Oct 11 14:24:50 2020
@@ -0,0 +1,33 @@
+# $NetBSD: Makefile.cdrom,v 1.1 2020/10/11 14:24:50 jmcneill Exp $
+
+.include
+.include
+
+SYSINSTDIR!= cd ${.CURDIR}/../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR}
+
+EFIBOOTIMG= efiboot.img
+CLEANFILES+= ${EFIBOOTIMG}
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP}"
+.endif
+
+# Need multidot for the boot loader to read kernel modules as it doesn't
+# understand rockridge.
+CDMAKEFSOPTIONS= bootimage=i386;${EFIBOOTIMG},platformid=efi,no-emul-boot
+CDRELEASE_NOISOS= true
+CD_SETS=
+
+${EFIBOOTIMG}: ${DESTDIR}/usr/mdec/bootaa64.efi
+ ${RM} -f ${EFIBOOTIMG}
+ ${RM} -rf efiboot/EFI/boot efiboot/netbsd efiboot/ramdisk.fs
+ ${MKDIR} ${MKDIRPERM} efiboot/EFI/boot
+ ${INSTALL} ${COPY} -m 0444 ${DESTDIR}/usr/mdec/bootaa64.efi efiboot/EFI/boot/
+ ${TOOL_MAKEFS} -M 1m -m 1m -B ${TARGET_ENDIANNESS} ${MAKEFS_TIMESTAMP} \
+ -t msdos -o F=12,c=1 ${EFIBOOTIMG} efiboot
+
+image_md_pre: ${EFIBOOTIMG}
+ ${RM} -f cdrom/netbsd
+ ${INSTALL} ${COPY} -m 0444 ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd-GENERIC64.gz cdrom/netbsd.gz
+ ${INSTALL} ${COPY} -m 0444 boot.cfg cdrom/boot.cfg
+ ${TOOL_GZIP_N} -d cdrom/netbsd.gz
+ ${INSTALL} ${COPY} -m 0444 ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/ramdisk/ramdisk.fs cdrom/ramdisk.fs
Index: src/distrib/evbarm/isoimage/boot.cfg.in
diff -u /dev/null src/distrib/evbarm/isoimage/boot.cfg.in:1.1
--- /dev/null Sun Oct 11 14:24:50 2020
+++ src/distrib/evbarm/isoimage/boot.cfg.in Sun Oct 11 14:24:50 2020
@@ -0,0 +1,8 @@
+banner=Welcome to the NetBSD @@VERSION@@ installation CD
+banner
+banner=
+banner=If you encounter a problem while booting, report a bug at
+banner=https://www.NetBSD.org/.
+menu=Install NetBSD:initrd ramdisk.fs;boot netbsd
+menu=Drop to boot prompt:prompt
+timeout=30
CVS commit: src/distrib/evbarm/instkernel/ramdisk
Module Name:src Committed By: jmcneill Date: Sun Oct 11 14:10:34 UTC 2020 Modified Files: src/distrib/evbarm/instkernel/ramdisk: list Log Message: Include newfs_msdos To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/distrib/evbarm/instkernel/ramdisk/list 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/instkernel/ramdisk/list diff -u src/distrib/evbarm/instkernel/ramdisk/list:1.28 src/distrib/evbarm/instkernel/ramdisk/list:1.29 --- src/distrib/evbarm/instkernel/ramdisk/list:1.28 Wed Jun 3 06:36:44 2020 +++ src/distrib/evbarm/instkernel/ramdisk/list Sun Oct 11 14:10:34 2020 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.28 2020/06/03 06:36:44 rin Exp $ +# $NetBSD: list,v 1.29 2020/10/11 14:10:34 jmcneill Exp $ SRCDIRS bin sbin external/bsd/less/bin usr.bin usr.sbin @@ -42,6 +42,7 @@ PROG sbin/mount_nfs PROG sbin/mount_tmpfs PROG sbin/newfs sbin/mount_mfs PROG sbin/newfs_ext2fs +PROG sbin/newfs_msdos PROG sbin/ping PROG sbin/reboot sbin/halt PROG sbin/restore sbin/rrestore
CVS commit: src/distrib/evbarm/instkernel/ramdisk
Module Name:src Committed By: rin Date: Wed Jun 3 06:36:44 UTC 2020 Modified Files: src/distrib/evbarm/instkernel/ramdisk: list Log Message: x_gzip need liblzma for xz support. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/distrib/evbarm/instkernel/ramdisk/list 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/instkernel/ramdisk/list diff -u src/distrib/evbarm/instkernel/ramdisk/list:1.27 src/distrib/evbarm/instkernel/ramdisk/list:1.28 --- src/distrib/evbarm/instkernel/ramdisk/list:1.27 Mon Nov 2 17:40:20 2015 +++ src/distrib/evbarm/instkernel/ramdisk/list Wed Jun 3 06:36:44 2020 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.27 2015/11/02 17:40:20 riz Exp $ +# $NetBSD: list,v 1.28 2020/06/03 06:36:44 rin Exp $ SRCDIRS bin sbin external/bsd/less/bin usr.bin usr.sbin @@ -68,7 +68,7 @@ SPECIAL ifconfig srcdir distrib/utils/x_ SPECIAL route srcdir distrib/utils/x_route SPECIAL umount srcdir distrib/utils/x_umount -LIBS libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop +LIBS libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -llzma -lprop # init invokes the shell as -sh ARGVLN sh -sh
CVS commit: src/distrib/evbarm/installimage
Module Name:src
Committed By: jmcneill
Date: Tue Jun 2 14:27:32 UTC 2020
Modified Files:
src/distrib/evbarm/installimage: Makefile
Log Message:
Revert previous; always use the same INSTIMAGEMB size regardless of
MKDEBUG. Should fit now that USE_XZ_SETS=yes on aarch64.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/evbarm/installimage/Makefile
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/installimage/Makefile
diff -u src/distrib/evbarm/installimage/Makefile:1.5 src/distrib/evbarm/installimage/Makefile:1.6
--- src/distrib/evbarm/installimage/Makefile:1.5 Tue Jun 2 10:41:30 2020
+++ src/distrib/evbarm/installimage/Makefile Tue Jun 2 14:27:32 2020
@@ -1,14 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2020/06/02 10:41:30 jmcneill Exp $
+# $NetBSD: Makefile,v 1.6 2020/06/02 14:27:32 jmcneill Exp $
.include
INSTIMGBASE= NetBSD-${DISTRIBVER}-${MACHINE_ARCH}-install # gives ${IMGBASE}.img
-.if ${MKDEBUG:Uno} != "no"
-INSTIMAGEMB?= 2000 # for all installation binaries w/ debug
-.else
INSTIMAGEMB?= 1550 # for all installation binaries
-.endif
.if ${MACHINE_ARCH} == "aarch64"
EFIBOOT= ${WORKDIR}/usr/mdec/bootaa64.efi
CVS commit: src/distrib/evbarm/installimage
Module Name:src
Committed By: jmcneill
Date: Tue Jun 2 10:41:30 UTC 2020
Modified Files:
src/distrib/evbarm/installimage: Makefile
Log Message:
Use a larger INSTIMAGEMB value for MKDEBUG builds
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/evbarm/installimage/Makefile
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/installimage/Makefile
diff -u src/distrib/evbarm/installimage/Makefile:1.4 src/distrib/evbarm/installimage/Makefile:1.5
--- src/distrib/evbarm/installimage/Makefile:1.4 Tue Jun 2 01:34:50 2020
+++ src/distrib/evbarm/installimage/Makefile Tue Jun 2 10:41:30 2020
@@ -1,10 +1,14 @@
-# $NetBSD: Makefile,v 1.4 2020/06/02 01:34:50 jmcneill Exp $
+# $NetBSD: Makefile,v 1.5 2020/06/02 10:41:30 jmcneill Exp $
.include
INSTIMGBASE= NetBSD-${DISTRIBVER}-${MACHINE_ARCH}-install # gives ${IMGBASE}.img
+.if ${MKDEBUG:Uno} != "no"
+INSTIMAGEMB?= 2000 # for all installation binaries w/ debug
+.else
INSTIMAGEMB?= 1550 # for all installation binaries
+.endif
.if ${MACHINE_ARCH} == "aarch64"
EFIBOOT= ${WORKDIR}/usr/mdec/bootaa64.efi
CVS commit: src/distrib/evbarm/installimage
Module Name:src
Committed By: jmcneill
Date: Tue Jun 2 01:34:50 UTC 2020
Modified Files:
src/distrib/evbarm/installimage: Makefile
Log Message:
Exclude ramdisk images and empty instkernel directory
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/evbarm/installimage/Makefile
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/installimage/Makefile
diff -u src/distrib/evbarm/installimage/Makefile:1.3 src/distrib/evbarm/installimage/Makefile:1.4
--- src/distrib/evbarm/installimage/Makefile:1.3 Sat May 30 12:36:37 2020
+++ src/distrib/evbarm/installimage/Makefile Tue Jun 2 01:34:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/05/30 12:36:37 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2020/06/02 01:34:50 jmcneill Exp $
.include
@@ -31,6 +31,7 @@ IMGFILE_EXTRA=\
${SYSINSTDIR}/sysinst .
MD_IMGDIR_EXCLUDE= -s ',./binary/gzimg.*,,gp'
-MD_IMGDIR_EXCLUDE+= -s ',./binary/instkernel.*,,gp'
+MD_IMGDIR_EXCLUDE+= -s ',./installation/instkernel.*,,gp'
+MD_IMGDIR_EXCLUDE+= -s ',./installation/ramdisk.*,,gp'
.include "${NETBSDSRCDIR}/distrib/common/bootimage/Makefile.installimage"
CVS commit: src/distrib/evbarm/installimage
Module Name:src
Committed By: jmcneill
Date: Sat May 30 12:36:37 UTC 2020
Modified Files:
src/distrib/evbarm/installimage: Makefile
Log Message:
Make room for debug sets
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/evbarm/installimage/Makefile
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/installimage/Makefile
diff -u src/distrib/evbarm/installimage/Makefile:1.2 src/distrib/evbarm/installimage/Makefile:1.3
--- src/distrib/evbarm/installimage/Makefile:1.2 Thu May 28 19:20:57 2020
+++ src/distrib/evbarm/installimage/Makefile Sat May 30 12:36:37 2020
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2020/05/28 19:20:57 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/30 12:36:37 jmcneill Exp $
.include
INSTIMGBASE= NetBSD-${DISTRIBVER}-${MACHINE_ARCH}-install # gives ${IMGBASE}.img
-INSTIMAGEMB?= 750 # for all installation binaries
+INSTIMAGEMB?= 1550 # for all installation binaries
.if ${MACHINE_ARCH} == "aarch64"
EFIBOOT= ${WORKDIR}/usr/mdec/bootaa64.efi
CVS commit: src/distrib/evbarm
Module Name:src
Committed By: jmcneill
Date: Thu May 28 15:27:59 UTC 2020
Modified Files:
src/distrib/evbarm: Makefile
Removed Files:
src/distrib/evbarm/cdroms: Makefile
src/distrib/evbarm/cdroms/installcd: Makefile
Log Message:
Remove support for evbarm cdrom images. Not sure that any of them can even
be used.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/distrib/evbarm/Makefile
cvs rdiff -u -r1.1 -r0 src/distrib/evbarm/cdroms/Makefile
cvs rdiff -u -r1.4 -r0 src/distrib/evbarm/cdroms/installcd/Makefile
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.11 src/distrib/evbarm/Makefile:1.12
--- src/distrib/evbarm/Makefile:1.11 Thu May 28 15:23:43 2020
+++ src/distrib/evbarm/Makefile Thu May 28 15:27:59 2020
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2020/05/28 15:23:43 jmcneill Exp $
+# $NetBSD: Makefile,v 1.12 2020/05/28 15:27:59 jmcneill Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
.include
-SUBDIR= gzboot instkernel cdroms
+SUBDIR= gzboot instkernel
.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "earmv7hf"
SUBDIR+= installimage
.endif
@@ -19,9 +19,6 @@ release: check_RELEASEDIR .WAIT ${MDECBO
${RELEASE_INSTALL} ${MDECBOOT} ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation
.endif
-iso_image:
- ${MAKEDIRTARGET} cdroms iso_image
-
install_image:
${MAKEDIRTARGET} installimage install_image
CVS commit: src/distrib/evbarm
Module Name:src
Committed By: jmcneill
Date: Thu May 28 15:23:43 UTC 2020
Modified Files:
src/distrib/evbarm: Makefile
Added Files:
src/distrib/evbarm/installimage: Makefile etc.rc etc.ttys install.sh
spec.inst
Log Message:
Build install images for aarch64 and earmv7hf.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/distrib/evbarm/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/evbarm/installimage/Makefile \
src/distrib/evbarm/installimage/etc.rc \
src/distrib/evbarm/installimage/etc.ttys \
src/distrib/evbarm/installimage/install.sh \
src/distrib/evbarm/installimage/spec.inst
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.10 src/distrib/evbarm/Makefile:1.11
--- src/distrib/evbarm/Makefile:1.10 Sun Apr 1 04:35:01 2018
+++ src/distrib/evbarm/Makefile Thu May 28 15:23:43 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2018/04/01 04:35:01 ryo Exp $
+# $NetBSD: Makefile,v 1.11 2020/05/28 15:23:43 jmcneill Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -6,6 +6,9 @@
.include
SUBDIR= gzboot instkernel cdroms
+.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "earmv7hf"
+SUBDIR+= installimage
+.endif
TARGETS+= release
.if ${MACHINE_CPU} == "arm"
@@ -19,4 +22,7 @@ release: check_RELEASEDIR .WAIT ${MDECBO
iso_image:
${MAKEDIRTARGET} cdroms iso_image
+install_image:
+ ${MAKEDIRTARGET} installimage install_image
+
.include
Added files:
Index: src/distrib/evbarm/installimage/Makefile
diff -u /dev/null src/distrib/evbarm/installimage/Makefile:1.1
--- /dev/null Thu May 28 15:23:43 2020
+++ src/distrib/evbarm/installimage/Makefile Thu May 28 15:23:43 2020
@@ -0,0 +1,33 @@
+# $NetBSD: Makefile,v 1.1 2020/05/28 15:23:43 jmcneill Exp $
+
+.include
+
+INSTIMGBASE= NetBSD-${DISTRIBVER}-${MACHINE_ARCH}-install # gives ${IMGBASE}.img
+
+INSTIMAGEMB?= 1550 # for all installation binaries
+
+.if ${MACHINE_ARCH} == "aarch64"
+EFIBOOT= ${WORKDIR}/usr/mdec/bootaa64.efi
+KERN_SET= kern-GENERIC64
+.elif ${MACHINE_ARCH} == "earmv7hf"
+EFIBOOT+= ${WORKDIR}/usr/mdec/bootarm.efi
+KERN_SET= kern-GENERIC
+.endif
+
+USE_GPT= yes
+
+DISTRIBDIR!= cd ${.CURDIR}/../.. ; pwd
+SYSINSTDIR!= cd ${.CURDIR}/../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR}
+
+SPEC_EXTRA= ${.CURDIR}/spec.inst
+IMGFILE_EXTRA=\
+ ${.CURDIR}/etc.ttys etc/ttys \
+ ${.CURDIR}/etc.rc etc/rc\
+ ${.CURDIR}/install.sh .\
+ ${SYSINSTDIR}/sysinstmsgs.de .\
+ ${SYSINSTDIR}/sysinstmsgs.es .\
+ ${SYSINSTDIR}/sysinstmsgs.fr .\
+ ${SYSINSTDIR}/sysinstmsgs.pl .\
+ ${SYSINSTDIR}/sysinst .
+
+.include "${NETBSDSRCDIR}/distrib/common/bootimage/Makefile.installimage"
Index: src/distrib/evbarm/installimage/etc.rc
diff -u /dev/null src/distrib/evbarm/installimage/etc.rc:1.1
--- /dev/null Thu May 28 15:23:43 2020
+++ src/distrib/evbarm/installimage/etc.rc Thu May 28 15:23:43 2020
@@ -0,0 +1,49 @@
+# $NetBSD: etc.rc,v 1.1 2020/05/28 15:23:43 jmcneill Exp $
+#
+# Copyright (c) 1997 Perry E. Metzger
+# Copyright (c) 1994 Christopher G. Demetriou
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#must display the following acknowledgement:
+# This product includes software developed for the
+# NetBSD Project. See http://www.NetBSD.org/ for
+# information about NetBSD.
+# 4. The name of the author may not be used to endorse or promote products
+#derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# <>
+
+PATH=/sbin:/b
CVS commit: src/distrib/evbarm/instkernel
Module Name:src Committed By: martin Date: Sat Mar 28 15:41:23 UTC 2020 Modified Files: src/distrib/evbarm/instkernel: Makefile Log Message: Try to fix previous: include etc.evbarm/Makefile.inc to get proper sub-arch settings and key the subdirs off KERENEL_SETS instead of ALL_KERNELS (which is not always defined) To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/distrib/evbarm/instkernel/Makefile 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/instkernel/Makefile diff -u src/distrib/evbarm/instkernel/Makefile:1.5 src/distrib/evbarm/instkernel/Makefile:1.6 --- src/distrib/evbarm/instkernel/Makefile:1.5 Thu Mar 26 08:02:55 2020 +++ src/distrib/evbarm/instkernel/Makefile Sat Mar 28 15:41:23 2020 @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.5 2020/03/26 08:02:55 skrll Exp $ +# $NetBSD: Makefile,v 1.6 2020/03/28 15:41:23 martin Exp $ SUBDIR= ramdisk -.if !empty(ALL_KERNELS:MRPI_INSTALL) +.include "../../etc/etc.evbarm/Makefile.inc" + +.if !empty(KERNEL_SETS:MRPI) SUBDIR+= sshramdisk .endif
CVS commit: src/distrib/evbarm/instkernel
Module Name:src Committed By: skrll Date: Thu Mar 26 08:02:55 UTC 2020 Modified Files: src/distrib/evbarm/instkernel: Makefile Log Message: Only build sshramdisk when building RPI_INSTALLx To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/distrib/evbarm/instkernel/Makefile 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/instkernel/Makefile diff -u src/distrib/evbarm/instkernel/Makefile:1.4 src/distrib/evbarm/instkernel/Makefile:1.5 --- src/distrib/evbarm/instkernel/Makefile:1.4 Tue Mar 19 22:16:52 2013 +++ src/distrib/evbarm/instkernel/Makefile Thu Mar 26 08:02:55 2020 @@ -1,6 +1,12 @@ -# $NetBSD: Makefile,v 1.4 2013/03/19 22:16:52 garbled Exp $ +# $NetBSD: Makefile,v 1.5 2020/03/26 08:02:55 skrll Exp $ -SUBDIR= ramdisk sshramdisk .WAIT instkernel +SUBDIR= ramdisk + +.if !empty(ALL_KERNELS:MRPI_INSTALL) +SUBDIR+= sshramdisk +.endif + +SUBDIR+= .WAIT instkernel TARGETS+= release .include
CVS commit: src/distrib/evbarm/instkernel/sshramdisk
Module Name:src
Committed By: skrll
Date: Thu Mar 26 07:44:43 UTC 2020
Modified Files:
src/distrib/evbarm/instkernel/sshramdisk: Makefile
Log Message:
Bump IMAGESIZE
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/distrib/evbarm/instkernel/sshramdisk/Makefile
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/instkernel/sshramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.24 src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.25
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.24 Mon Mar 23 11:45:00 2020
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile Thu Mar 26 07:44:43 2020
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.24 2020/03/23 11:45:00 martin Exp $
+# $NetBSD: Makefile,v 1.25 2020/03/26 07:44:43 skrll Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
IMAGE= sshramdisk.fs
-IMAGESIZE= 43000k
+IMAGESIZE= 45000k
MAKEFS_FLAGS+= -f 15
.if ${MKREPRO_TIMESTAMP:Uno} != "no"
CVS commit: src/distrib/evbarm/instkernel/sshramdisk
Module Name:src
Committed By: martin
Date: Mon Mar 23 11:45:00 UTC 2020
Modified Files:
src/distrib/evbarm/instkernel/sshramdisk: Makefile
Log Message:
Bump image size - new firmware files need more space
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/distrib/evbarm/instkernel/sshramdisk/Makefile
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/instkernel/sshramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.23 src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.24
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.23 Sun Mar 1 20:59:54 2020
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile Mon Mar 23 11:45:00 2020
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.23 2020/03/01 20:59:54 christos Exp $
+# $NetBSD: Makefile,v 1.24 2020/03/23 11:45:00 martin Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
IMAGE= sshramdisk.fs
-IMAGESIZE= 33000k
+IMAGESIZE= 43000k
MAKEFS_FLAGS+= -f 15
.if ${MKREPRO_TIMESTAMP:Uno} != "no"
CVS commit: src/distrib/evbarm/instkernel/sshramdisk
Module Name:src
Committed By: christos
Date: Fri Feb 28 13:00:51 UTC 2020
Modified Files:
src/distrib/evbarm/instkernel/sshramdisk: Makefile list
Log Message:
Deal with sshkey_sign. I am going to fix this properly at some point, but
it needs coordination from upstream (Patrick Welche)
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/distrib/evbarm/instkernel/sshramdisk/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/evbarm/instkernel/sshramdisk/list
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/instkernel/sshramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.21 src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.22
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.21 Tue Jan 21 09:58:58 2020
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile Fri Feb 28 08:00:51 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2020/01/21 14:58:58 mlelstv Exp $
+# $NetBSD: Makefile,v 1.22 2020/02/28 13:00:51 christos Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -31,10 +31,18 @@ IMAGEDEPENDS= ${CRUNCHBIN} \
${DISTRIBDIR}/common/services
IMAGEPREBUILD= ${TOOL_PAX} ${PAX_TIMESTAMP} -rw -pp ${DESTDIR}/libdata/firmware ${WORKDIR}
+.PATH: ${NETBSDSRCDIR}/crypto/external/bsd/openssh/dist
+liboverride.o: ssh-sk-client.o
+ ${_MKTARGET_LINK}
+ ${LD} -r -o ${.TARGET} ${.ALLSRC}
+
+CLEANFILES+= liboverride.o ssh-sk-client.o
+
+
# Use stubs to eliminate some large stuff from libc
HACKSRC= ${DISTRIBDIR}/utils/libhack
.include "${HACKSRC}/Makefile.inc"
-${CRUNCHBIN}: libhack.o
+${CRUNCHBIN}: libhack.o liboverride.o
USE_PAM := no
USE_YP := no
Index: src/distrib/evbarm/instkernel/sshramdisk/list
diff -u src/distrib/evbarm/instkernel/sshramdisk/list:1.2 src/distrib/evbarm/instkernel/sshramdisk/list:1.3
--- src/distrib/evbarm/instkernel/sshramdisk/list:1.2 Wed Aug 14 08:08:27 2019
+++ src/distrib/evbarm/instkernel/sshramdisk/list Fri Feb 28 08:00:51 2020
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.2 2019/08/14 12:08:27 martin Exp $
+# $NetBSD: list,v 1.3 2020/02/28 13:00:51 christos Exp $
SRCDIRS bin sbin external/bsd/less/bin crypto/external/bsd/openssh/bin/sshd usr.bin usr.sbin
@@ -69,7 +69,7 @@ SPECIAL umount srcdir distrib/utils/x_u
SPECIAL sshd srcdir crypto/external/bsd/openssh/bin/sshd
SPECIAL sshd keepsymbols allow_severity deny_severity
-LIBS libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop-lssh -lcrypto -lwrap
+LIBS libhack.o liboverride.o -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop-lssh -lcrypto -lwrap
# init invokes the shell as -sh
ARGVLN sh -sh
CVS commit: src/distrib/evbarm/instkernel/sshramdisk
Module Name:src
Committed By: mlelstv
Date: Tue Jan 21 14:58:58 UTC 2020
Modified Files:
src/distrib/evbarm/instkernel/sshramdisk: Makefile
Log Message:
Was too slight a bump.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/distrib/evbarm/instkernel/sshramdisk/Makefile
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/instkernel/sshramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.20 src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.21
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.20 Tue Jan 21 11:48:10 2020
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile Tue Jan 21 14:58:58 2020
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.20 2020/01/21 11:48:10 martin Exp $
+# $NetBSD: Makefile,v 1.21 2020/01/21 14:58:58 mlelstv Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
IMAGE= sshramdisk.fs
-IMAGESIZE= 32000k
+IMAGESIZE= 33000k
MAKEFS_FLAGS+= -f 15
.if ${MKREPRO_TIMESTAMP:Uno} != "no"
CVS commit: src/distrib/evbarm/instkernel/sshramdisk
Module Name:src
Committed By: martin
Date: Tue Jan 21 11:48:10 UTC 2020
Modified Files:
src/distrib/evbarm/instkernel/sshramdisk: Makefile
Log Message:
Bump image size slightly
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/distrib/evbarm/instkernel/sshramdisk/Makefile
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/instkernel/sshramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.19 src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.20
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.19 Thu Nov 21 13:01:51 2019
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile Tue Jan 21 11:48:10 2020
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2019/11/21 13:01:51 martin Exp $
+# $NetBSD: Makefile,v 1.20 2020/01/21 11:48:10 martin Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
IMAGE= sshramdisk.fs
-IMAGESIZE= 3k
+IMAGESIZE= 32000k
MAKEFS_FLAGS+= -f 15
.if ${MKREPRO_TIMESTAMP:Uno} != "no"
CVS commit: src/distrib/evbarm/instkernel/sshramdisk
Module Name:src
Committed By: mlelstv
Date: Sun Apr 8 15:48:40 UTC 2018
Modified Files:
src/distrib/evbarm/instkernel/sshramdisk: Makefile
Log Message:
increase sshramdisk from 24000k to 28000k.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/evbarm/instkernel/sshramdisk/Makefile
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/instkernel/sshramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.16 src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.17
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.16 Sun Oct 22 23:15:54 2017
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile Sun Apr 8 15:48:39 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2017/10/22 23:15:54 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2018/04/08 15:48:39 mlelstv Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
IMAGE= sshramdisk.fs
-IMAGESIZE= 24000k
+IMAGESIZE= 28000k
MAKEFS_FLAGS+= -f 15
.if ${MKREPRO_TIMESTAMP:Uno} != "no"
CVS commit: src/distrib/evbarm/instkernel/instkernel
Module Name:src
Committed By: skrll
Date: Wed Dec 13 11:37:37 UTC 2017
Modified Files:
src/distrib/evbarm/instkernel/instkernel: Makefile
Log Message:
Fix evbarm build - patch from Harold Gutch on port-arm
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/distrib/evbarm/instkernel/instkernel/Makefile
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/instkernel/instkernel/Makefile
diff -u src/distrib/evbarm/instkernel/instkernel/Makefile:1.28 src/distrib/evbarm/instkernel/instkernel/Makefile:1.29
--- src/distrib/evbarm/instkernel/instkernel/Makefile:1.28 Mon Dec 11 11:38:14 2017
+++ src/distrib/evbarm/instkernel/instkernel/Makefile Wed Dec 13 11:37:37 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2017/12/11 11:38:14 jmcneill Exp $
+# $NetBSD: Makefile,v 1.29 2017/12/13 11:37:37 skrll Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -11,10 +11,11 @@ SSHRAMDISK= ${SSHRAMDISKDIR}/sshramdisk.
.include "${NETBSDSRCDIR}/etc/etc.evbarm/Makefile.inc"
MDSETTARGETS=
+MDSET_SUFFIXES.-= srec create-srec bin create-bin
.for i in ${BUILD_KERNELS:M*_INSTALL}
.if ${i} == "RPI_INSTALL" || ${i} == "RPI2_INSTALL"
-MDSETTARGETS+= ${i} ${SSHRAMDISK} netbsd-${i}
-MDSET_SUFFIXES.${i}= bin create-bin img create-img
+MDSETTARGETS+= ${i} ${SSHRAMDISK} -
+MDSET_SUFFIXES.${i}= img create-img
.else
MDSETTARGETS+= ${i} ${RAMDISK} -
.endif
@@ -22,7 +23,6 @@ MDSETTARGETS+= ${i} ${RAMDISK} -
MDSET_RELEASEDIR= installation/instkernel
-MDSET_SUFFIXES.-= srec create-srec bin create-bin
create-srec= ${OBJCOPY} -O srec ${.TARGET:R} ${.TARGET}
create-bin= ${OBJCOPY} -O binary ${.TARGET:R} ${.TARGET}
create-img= \
CVS commit: src/distrib/evbarm/instkernel/sshramdisk
Module Name:src
Committed By: joerg
Date: Sun Oct 22 23:15:54 UTC 2017
Modified Files:
src/distrib/evbarm/instkernel/sshramdisk: Makefile
Log Message:
Bump image size to 24MB, won't fit for plain evbarm otherwise.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/distrib/evbarm/instkernel/sshramdisk/Makefile
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/instkernel/sshramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.15 src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.16
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.15 Sat Mar 18 17:07:04 2017
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile Sun Oct 22 23:15:54 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2017/03/18 17:07:04 sevan Exp $
+# $NetBSD: Makefile,v 1.16 2017/10/22 23:15:54 joerg Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
IMAGE= sshramdisk.fs
-IMAGESIZE= 22000k
+IMAGESIZE= 24000k
MAKEFS_FLAGS+= -f 15
.if ${MKREPRO_TIMESTAMP:Uno} != "no"
CVS commit: src/distrib/evbarm/instkernel/ramdisk
Module Name:src
Committed By: christos
Date: Sun Aug 20 15:38:22 UTC 2017
Modified Files:
src/distrib/evbarm/instkernel/ramdisk: Makefile
Log Message:
Create the ramdisk destination dir here.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/distrib/evbarm/instkernel/ramdisk/Makefile
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/instkernel/ramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/ramdisk/Makefile:1.17 src/distrib/evbarm/instkernel/ramdisk/Makefile:1.18
--- src/distrib/evbarm/instkernel/ramdisk/Makefile:1.17 Wed Jul 5 15:50:49 2017
+++ src/distrib/evbarm/instkernel/ramdisk/Makefile Sun Aug 20 11:38:22 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2017/07/05 19:50:49 jmcneill Exp $
+# $NetBSD: Makefile,v 1.18 2017/08/20 15:38:22 christos Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -38,11 +38,13 @@ ${CRUNCHBIN}: libhack.o
.include "${DISTRIBDIR}/common/Makefile.makedev"
.include "${DISTRIBDIR}/common/Makefile.image"
+RAMDISKDIR=${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/ramdisk
+
release: ${IMAGE}
- ${RELEASE_INSTALL} ${IMAGE} \
- ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/ramdisk/
+ ${INSTALL} -d -m 755 ${RAMDISKDIR}
+ ${RELEASE_INSTALL} ${IMAGE} ${RAMDISKDIR}
${TOOL_MKUBOOTIMAGE} -A arm -C none -O linux -T ramdisk \
-a 0 -n "NetBSD/${MACHINE_ARCH} ramdisk" ${IMAGE} \
- ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/ramdisk/${IMAGE:S/.fs/.ub/}
+ ${RAMDISKDIR}/${IMAGE:S/.fs/.ub/}
.include
CVS commit: src/distrib/evbarm/instkernel/sshramdisk
Module Name:src
Committed By: sevan
Date: Sat Mar 18 17:07:05 UTC 2017
Modified Files:
src/distrib/evbarm/instkernel/sshramdisk: Makefile
Log Message:
Bump image size to unbreak builds.
nbmakefs: `work' size of 21610496 is larger than the maxsize of 2048.
ok jakllsch
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/distrib/evbarm/instkernel/sshramdisk/Makefile
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/instkernel/sshramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.14 src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.15
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.14 Sat Feb 11 22:57:00 2017
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile Sat Mar 18 17:07:04 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2017/02/11 22:57:00 christos Exp $
+# $NetBSD: Makefile,v 1.15 2017/03/18 17:07:04 sevan Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
IMAGE= sshramdisk.fs
-IMAGESIZE= 2k
+IMAGESIZE= 22000k
MAKEFS_FLAGS+= -f 15
.if ${MKREPRO_TIMESTAMP:Uno} != "no"
CVS commit: src/distrib/evbarm/instkernel/sshramdisk
Module Name:src
Committed By: christos
Date: Sat Feb 11 22:57:01 UTC 2017
Modified Files:
src/distrib/evbarm/instkernel/sshramdisk: Makefile
Log Message:
fix typo.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/distrib/evbarm/instkernel/sshramdisk/Makefile
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/instkernel/sshramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.13 src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.14
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.13 Fri Feb 10 22:07:06 2017
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile Sat Feb 11 17:57:00 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2017/02/11 03:07:06 christos Exp $
+# $NetBSD: Makefile,v 1.14 2017/02/11 22:57:00 christos Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -29,7 +29,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \
${NETBSDSRCDIR}/etc/group \
${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
${DISTRIBDIR}/common/services
-IMAGEPREBUILD= ${TOOL_PAX} ${PAX_TIMESTAMP{ -rw -pp ${DESTDIR}/libdata/firmware ${WORKDIR}
+IMAGEPREBUILD= ${TOOL_PAX} ${PAX_TIMESTAMP} -rw -pp ${DESTDIR}/libdata/firmware ${WORKDIR}
# Use stubs to eliminate some large stuff from libc
HACKSRC= ${DISTRIBDIR}/utils/libhack
CVS commit: src/distrib/evbarm/instkernel/ramdisk
Module Name:src
Committed By: rin
Date: Fri Jan 27 15:20:31 UTC 2017
Modified Files:
src/distrib/evbarm/instkernel/ramdisk: Makefile
Log Message:
Fix build with LLVM, which does not support -mthumb-interwork.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/distrib/evbarm/instkernel/ramdisk/Makefile
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/instkernel/ramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/ramdisk/Makefile:1.15 src/distrib/evbarm/instkernel/ramdisk/Makefile:1.16
--- src/distrib/evbarm/instkernel/ramdisk/Makefile:1.15 Tue Jan 24 18:04:02 2017
+++ src/distrib/evbarm/instkernel/ramdisk/Makefile Fri Jan 27 15:20:31 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2017/01/24 18:04:02 christos Exp $
+# $NetBSD: Makefile,v 1.16 2017/01/27 15:20:31 rin Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -9,7 +9,7 @@ MAKEFS_FLAGS+= -f 15
WARNS= 1
DBG= -Os
-.if !empty(MACHINE_ARCH:Mearmv7*)
+.if !empty(MACHINE_ARCH:Mearmv7*) && ${ACTIVE_CC} == "gcc"
DBG+= -mthumb -mthumb-interwork
.endif
CVS commit: src/distrib/evbarm/instkernel/sshramdisk
Module Name:src
Committed By: christos
Date: Mon Dec 19 16:23:10 UTC 2016
Modified Files:
src/distrib/evbarm/instkernel/sshramdisk: Makefile
Log Message:
give it a bit more room.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/distrib/evbarm/instkernel/sshramdisk/Makefile
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/instkernel/sshramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.10 src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.11
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.10 Mon Dec 19 10:50:13 2016
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile Mon Dec 19 11:23:10 2016
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2016/12/19 15:50:13 christos Exp $
+# $NetBSD: Makefile,v 1.11 2016/12/19 16:23:10 christos Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
IMAGE= sshramdisk.fs
-IMAGESIZE= 19000k
+IMAGESIZE= 2k
MAKEFS_FLAGS= -f 15
WARNS= 1
CVS commit: src/distrib/evbarm/instkernel/sshramdisk
Module Name:src
Committed By: christos
Date: Mon Dec 19 15:50:13 UTC 2016
Modified Files:
src/distrib/evbarm/instkernel/sshramdisk: Makefile
Log Message:
grow so that new intel firmware fits.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/evbarm/instkernel/sshramdisk/Makefile
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/instkernel/sshramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.9 src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.10
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.9 Wed Jul 15 07:24:03 2015
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile Mon Dec 19 10:50:13 2016
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2015/07/15 11:24:03 martin Exp $
+# $NetBSD: Makefile,v 1.10 2016/12/19 15:50:13 christos Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
IMAGE= sshramdisk.fs
-IMAGESIZE= 14848k
+IMAGESIZE= 19000k
MAKEFS_FLAGS= -f 15
WARNS= 1
CVS commit: src/distrib/evbarm/instkernel/ramdisk
Module Name:src
Committed By: matt
Date: Thu Jul 7 06:28:20 UTC 2016
Modified Files:
src/distrib/evbarm/instkernel/ramdisk: Makefile
Log Message:
When building earmv7 ramdisks, compile with -mthumb -mthumb-interwork
to save space. Think of it as -Os on steriods.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/distrib/evbarm/instkernel/ramdisk/Makefile
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/instkernel/ramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/ramdisk/Makefile:1.13 src/distrib/evbarm/instkernel/ramdisk/Makefile:1.14
--- src/distrib/evbarm/instkernel/ramdisk/Makefile:1.13 Thu Jan 9 22:48:16 2014
+++ src/distrib/evbarm/instkernel/ramdisk/Makefile Thu Jul 7 06:28:20 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/01/09 22:48:16 matt Exp $
+# $NetBSD: Makefile,v 1.14 2016/07/07 06:28:20 matt Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -9,6 +9,9 @@ MAKEFS_FLAGS= -f 15
WARNS= 1
DBG= -Os
+.if !empty(MACHINE_ARCH:Mearmv7*)
+DBG+= -mthumb -mthumb-interwork
+.endif
CRUNCHBIN= ramdiskbin
LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
CVS commit: src/distrib/evbarm/instkernel/ramdisk
Module Name:src Committed By: riz Date: Mon Nov 2 17:40:20 UTC 2015 Modified Files: src/distrib/evbarm/instkernel/ramdisk: list Log Message: Add dkctl to evbarm ramdisk, so we can configure wedges. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/distrib/evbarm/instkernel/ramdisk/list 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/instkernel/ramdisk/list diff -u src/distrib/evbarm/instkernel/ramdisk/list:1.26 src/distrib/evbarm/instkernel/ramdisk/list:1.27 --- src/distrib/evbarm/instkernel/ramdisk/list:1.26 Sat Aug 3 21:35:59 2013 +++ src/distrib/evbarm/instkernel/ramdisk/list Mon Nov 2 17:40:20 2015 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.26 2013/08/03 21:35:59 matt Exp $ +# $NetBSD: list,v 1.27 2015/11/02 17:40:20 riz Exp $ SRCDIRS bin sbin external/bsd/less/bin usr.bin usr.sbin @@ -22,6 +22,7 @@ PROG bin/sync PROG sbin/chown bin/chgrp PROG sbin/disklabel +PROG sbin/dkctl PROG sbin/drvctl PROG sbin/fdisk PROG sbin/fsck
CVS commit: src/distrib/evbarm/instkernel/sshramdisk
Module Name:src
Committed By: martin
Date: Wed Jul 15 11:24:03 UTC 2015
Modified Files:
src/distrib/evbarm/instkernel/sshramdisk: Makefile
Log Message:
Set IMAGEENDIAN properly for big endian builds.
>From Rin Okuyama.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/distrib/evbarm/instkernel/sshramdisk/Makefile
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/instkernel/sshramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.8 src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.9
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.8 Mon Feb 23 23:21:47 2015
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile Wed Jul 15 11:24:03 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2015/02/23 23:21:47 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2015/07/15 11:24:03 martin Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -13,7 +13,11 @@ DBG= -Os
CRUNCHBIN= ramdiskbin
LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
MTREECONF= ${.CURDIR}/mtree.conf
+.if empty(MACHINE_ARCH:M*eb)
IMAGEENDIAN= le
+.else
+IMAGEENDIAN= be
+.endif
MAKEDEVTARGETS= ramdisk
IMAGEDEPENDS= ${CRUNCHBIN} \
dot.profile master.passwd sshd_config ssh_host_dsa_key \
CVS commit: src/distrib/evbarm/instkernel/instkernel
Module Name:src
Committed By: matt
Date: Fri May 15 06:50:41 UTC 2015
Modified Files:
src/distrib/evbarm/instkernel/instkernel: Makefile
Log Message:
Don't keep two list of build kernels. include etc/etc.evbarm/Makefile.inc
and use it to generate list of MDSETTARGETS.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/distrib/evbarm/instkernel/instkernel/Makefile
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/instkernel/instkernel/Makefile
diff -u src/distrib/evbarm/instkernel/instkernel/Makefile:1.26 src/distrib/evbarm/instkernel/instkernel/Makefile:1.27
--- src/distrib/evbarm/instkernel/instkernel/Makefile:1.26 Fri May 15 06:27:48 2015
+++ src/distrib/evbarm/instkernel/instkernel/Makefile Fri May 15 06:50:41 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2015/05/15 06:27:48 matt Exp $
+# $NetBSD: Makefile,v 1.27 2015/05/15 06:50:41 matt Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -8,63 +8,16 @@ RAMDISK= ${RAMDISKDIR}/ramdisk.fs
SSHRAMDISKDIR!= cd ${.CURDIR}/../sshramdisk && ${PRINTOBJDIR}
SSHRAMDISK= ${SSHRAMDISKDIR}/sshramdisk.fs
-.if ${MACHINE_ARCH} == "arm"
-# Little endian platforms.
-MDSETTARGETS= ADI_BRH_INSTALL ${RAMDISK} - \
- CP3100_INSTALL ${RAMDISK} - \
- GEMINI_INSTALL ${RAMDISK} - \
- GUMSTIX_INSTALL ${RAMDISK} - \
- INTEGRATOR_INSTALL ${RAMDISK} - \
- IQ80310_INSTALL ${RAMDISK} - \
- IQ80321_INSTALL ${RAMDISK} - \
- MINI2440_INSTALL ${RAMDISK} - \
- OPENRD_INSTALL ${RAMDISK} - \
- TS7200_INSTALL ${RAMDISK} - \
- TEAMASA_NPWR_INSTALL ${RAMDISK} - \
- KUROBOX_PRO_INSTALL ${RAMDISK} -
-.elif ${MACHINE_ARCH} == "armeb"
-# Big endian platforms.
-MDSETTARGETS= ADI_BRH_INSTALL ${RAMDISK} -
-.endif
-
-.if \
-${MACHINE_ARCH} == "arm" || \
-${MACHINE_ARCH} == "earm" || \
-${MACHINE_ARCH} == "earmhf" || \
-${MACHINE_ARCH} == "earmv6" || \
-${MACHINE_ARCH} == "earmv6hf"
-# Little endian (any ABI) ARMv6 platforms.
-MDSETTARGETS+= RPI_INSTALL ${SSHRAMDISK} -
-.endif
+.include "${NETBSDSRCDIR}/etc/etc.evbarm/Makefile.inc"
-.if \
-${MACHINE_ARCH} == "arm" || \
-${MACHINE_ARCH} == "earm" || \
-${MACHINE_ARCH} == "earmhf" || \
-${MACHINE_ARCH} == "earmv7" || \
-${MACHINE_ARCH} == "earmv7hf"
-# Little endian (any ABI) ARMv7 platforms.
-MDSETTARGETS+= \
- ALLWINNER_A80_INSTALL ${RAMDISK} - \
- ARMADAXP_INSTALL ${RAMDISK} - \
- BCM5301X_INSTALL ${RAMDISK} - \
- BEAGLEBONE_INSTALL ${RAMDISK} - \
- BEAGLEBOARD_INSTALL ${RAMDISK} - \
- BEAGLEBOARDXM_INSTALL ${RAMDISK} - \
- BPI_INSTALL ${RAMDISK} - \
- CUBIEBOARD_INSTALL ${RAMDISK} - \
- CUBIETRUCK_INSTALL ${RAMDISK} - \
- HUMMINGBIRD_A31_INSTALL ${RAMDISK} - \
- JETSONTK1_INSTALL ${RAMDISK} - \
- KOBO_INSTALL ${RAMDISK} - \
- MIRABOX_INSTALL ${RAMDISK} - \
- NETWALKER_INSTALL ${RAMDISK} - \
- ODROID-C1_INSTALL ${RAMDISK} - \
- OMAP5EVM_INSTALL ${RAMDISK} - \
- OVERO_INSTALL ${RAMDISK} - \
- PANDABOARD_INSTALL ${RAMDISK} - \
- RPI2_INSTALL ${SSHRAMDISK} -
+MDSETTARGETS=
+.for i in ${BUILD_KERNELS:M*_INSTALL}
+.if ${i} == "RPI_INSTALL" || ${i} == "RPI2_INSTALL"
+MDSETTARGETS+= ${i} ${SSHRAMDISK} -
+.else
+MDSETTARGETS+= ${i} ${RAMDISK} -
.endif
+.endfor
MDSET_RELEASEDIR= installation/instkernel
@@ -72,7 +25,6 @@ MDSET_SUFFIXES.-= srec create-srec bin
create-srec= ${OBJCOPY} -O srec ${.TARGET:R} ${.TARGET}
create-bin= ${OBJCOPY} -O binary ${.TARGET:R} ${.TARGET}
-
.include "${DISTRIBDIR}/common/Makefile.mdset"
.include
CVS commit: src/distrib/evbarm/instkernel/instkernel
Module Name:src
Committed By: matt
Date: Fri May 15 06:27:48 UTC 2015
Modified Files:
src/distrib/evbarm/instkernel/instkernel: Makefile
Log Message:
Update list of armv7 install kernels.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/distrib/evbarm/instkernel/instkernel/Makefile
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/instkernel/instkernel/Makefile
diff -u src/distrib/evbarm/instkernel/instkernel/Makefile:1.25 src/distrib/evbarm/instkernel/instkernel/Makefile:1.26
--- src/distrib/evbarm/instkernel/instkernel/Makefile:1.25 Wed Nov 5 13:53:22 2014
+++ src/distrib/evbarm/instkernel/instkernel/Makefile Fri May 15 06:27:48 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2014/11/05 13:53:22 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2015/05/15 06:27:48 matt Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -44,10 +44,26 @@ MDSETTARGETS+= RPI_INSTALL ${SSHRAMDIS
${MACHINE_ARCH} == "earmv7" || \
${MACHINE_ARCH} == "earmv7hf"
# Little endian (any ABI) ARMv7 platforms.
-MDSETTARGETS+= BCM5301X_INSTALL ${RAMDISK} - \
+MDSETTARGETS+= \
+ ALLWINNER_A80_INSTALL ${RAMDISK} - \
+ ARMADAXP_INSTALL ${RAMDISK} - \
+ BCM5301X_INSTALL ${RAMDISK} - \
BEAGLEBONE_INSTALL ${RAMDISK} - \
+ BEAGLEBOARD_INSTALL ${RAMDISK} - \
+ BEAGLEBOARDXM_INSTALL ${RAMDISK} - \
+ BPI_INSTALL ${RAMDISK} - \
CUBIEBOARD_INSTALL ${RAMDISK} - \
- CUBIETRUCK_INSTALL ${RAMDISK} -
+ CUBIETRUCK_INSTALL ${RAMDISK} - \
+ HUMMINGBIRD_A31_INSTALL ${RAMDISK} - \
+ JETSONTK1_INSTALL ${RAMDISK} - \
+ KOBO_INSTALL ${RAMDISK} - \
+ MIRABOX_INSTALL ${RAMDISK} - \
+ NETWALKER_INSTALL ${RAMDISK} - \
+ ODROID-C1_INSTALL ${RAMDISK} - \
+ OMAP5EVM_INSTALL ${RAMDISK} - \
+ OVERO_INSTALL ${RAMDISK} - \
+ PANDABOARD_INSTALL ${RAMDISK} - \
+ RPI2_INSTALL ${SSHRAMDISK} -
.endif
MDSET_RELEASEDIR= installation/instkernel
CVS commit: src/distrib/evbarm/instkernel/sshramdisk
Module Name:src
Committed By: skrll
Date: Mon Feb 16 21:48:48 UTC 2015
Modified Files:
src/distrib/evbarm/instkernel/sshramdisk: Makefile
Log Message:
Bump size to fix build.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/evbarm/instkernel/sshramdisk/Makefile
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/instkernel/sshramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.6 src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.7
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.6 Fri Oct 31 08:43:24 2014
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile Mon Feb 16 21:48:48 2015
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2014/10/31 08:43:24 uebayasi Exp $
+# $NetBSD: Makefile,v 1.7 2015/02/16 21:48:48 skrll Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
IMAGE= sshramdisk.fs
-IMAGESIZE= 13m
+IMAGESIZE= 14m
MAKEFS_FLAGS= -f 15
WARNS= 1
CVS commit: src/distrib/evbarm/instkernel/instkernel
Module Name:src
Committed By: joerg
Date: Wed Nov 5 13:53:22 UTC 2014
Modified Files:
src/distrib/evbarm/instkernel/instkernel: Makefile
Log Message:
Prepare CUBIETRUCK_INSTALL too.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/distrib/evbarm/instkernel/instkernel/Makefile
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/instkernel/instkernel/Makefile
diff -u src/distrib/evbarm/instkernel/instkernel/Makefile:1.24 src/distrib/evbarm/instkernel/instkernel/Makefile:1.25
--- src/distrib/evbarm/instkernel/instkernel/Makefile:1.24 Sat Mar 1 01:53:36 2014
+++ src/distrib/evbarm/instkernel/instkernel/Makefile Wed Nov 5 13:53:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2014/03/01 01:53:36 matt Exp $
+# $NetBSD: Makefile,v 1.25 2014/11/05 13:53:22 joerg Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -46,7 +46,8 @@ MDSETTARGETS+= RPI_INSTALL ${SSHRAMDIS
# Little endian (any ABI) ARMv7 platforms.
MDSETTARGETS+= BCM5301X_INSTALL ${RAMDISK} - \
BEAGLEBONE_INSTALL ${RAMDISK} - \
- CUBIEBOARD_INSTALL ${RAMDISK} -
+ CUBIEBOARD_INSTALL ${RAMDISK} - \
+ CUBIETRUCK_INSTALL ${RAMDISK} -
.endif
MDSET_RELEASEDIR= installation/instkernel
CVS commit: src/distrib/evbarm/instkernel/sshramdisk
Module Name:src
Committed By: uebayasi
Date: Fri Oct 31 08:43:24 UTC 2014
Modified Files:
src/distrib/evbarm/instkernel/sshramdisk: Makefile
Log Message:
Bump image size to compensate new iwn(4) firmwares.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/evbarm/instkernel/sshramdisk/Makefile
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/instkernel/sshramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.5 src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.6
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.5 Thu Aug 14 18:38:29 2014
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile Fri Oct 31 08:43:24 2014
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2014/08/14 18:38:29 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2014/10/31 08:43:24 uebayasi Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
IMAGE= sshramdisk.fs
-IMAGESIZE= 8900k
+IMAGESIZE= 13m
MAKEFS_FLAGS= -f 15
WARNS= 1
CVS commit: src/distrib/evbarm/instkernel/sshramdisk
Module Name:src
Committed By: martin
Date: Tue Aug 12 11:49:04 UTC 2014
Modified Files:
src/distrib/evbarm/instkernel/sshramdisk: Makefile
Log Message:
Add firmware images to this image, as discussed on port-arm.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/evbarm/instkernel/sshramdisk/Makefile
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/instkernel/sshramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.3 src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.4
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.3 Sun Mar 2 13:25:43 2014
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile Tue Aug 12 11:49:04 2014
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2014/03/02 13:25:43 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2014/08/12 11:49:04 martin Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
IMAGE= sshramdisk.fs
-IMAGESIZE= 3800k
+IMAGESIZE= 8600k
MAKEFS_FLAGS= -f 15
WARNS= 1
@@ -20,6 +20,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \
${NETBSDSRCDIR}/etc/group \
${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
${DISTRIBDIR}/common/services
+IMAGEPREBUILD= ${TOOL_PAX} -rw -pp ${DESTDIR}/libdata/firmware ${WORKDIR}
# Use stubs to eliminate some large stuff from libc
HACKSRC= ${DISTRIBDIR}/utils/libhack
CVS commit: src/distrib/evbarm/instkernel/instkernel
Module Name:src
Committed By: matt
Date: Sat Mar 1 01:53:36 UTC 2014
Modified Files:
src/distrib/evbarm/instkernel/instkernel: Makefile
Log Message:
Split ARMv6 and ARMv7 kernels.
Handle armeb properly.
Add CUBIEBOARD
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/distrib/evbarm/instkernel/instkernel/Makefile
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/instkernel/instkernel/Makefile
diff -u src/distrib/evbarm/instkernel/instkernel/Makefile:1.23 src/distrib/evbarm/instkernel/instkernel/Makefile:1.24
--- src/distrib/evbarm/instkernel/instkernel/Makefile:1.23 Fri Aug 30 10:13:39 2013
+++ src/distrib/evbarm/instkernel/instkernel/Makefile Sat Mar 1 01:53:36 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2013/08/30 10:13:39 skrll Exp $
+# $NetBSD: Makefile,v 1.24 2014/03/01 01:53:36 matt Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -11,7 +11,6 @@ SSHRAMDISK= ${SSHRAMDISKDIR}/sshramdisk.
.if ${MACHINE_ARCH} == "arm"
# Little endian platforms.
MDSETTARGETS= ADI_BRH_INSTALL ${RAMDISK} - \
- BCM5301X_INSTALL ${RAMDISK} - \
CP3100_INSTALL ${RAMDISK} - \
GEMINI_INSTALL ${RAMDISK} - \
GUMSTIX_INSTALL ${RAMDISK} - \
@@ -23,7 +22,7 @@ MDSETTARGETS= ADI_BRH_INSTALL ${RAMDIS
TS7200_INSTALL ${RAMDISK} - \
TEAMASA_NPWR_INSTALL ${RAMDISK} - \
KUROBOX_PRO_INSTALL ${RAMDISK} -
-.else
+.elif ${MACHINE_ARCH} == "armeb"
# Big endian platforms.
MDSETTARGETS= ADI_BRH_INSTALL ${RAMDISK} -
.endif
@@ -34,9 +33,20 @@ MDSETTARGETS= ADI_BRH_INSTALL ${RAMDIS
${MACHINE_ARCH} == "earmhf" || \
${MACHINE_ARCH} == "earmv6" || \
${MACHINE_ARCH} == "earmv6hf"
-# Little endian (any ABI) platforms.
-MDSETTARGETS+= RPI_INSTALL ${SSHRAMDISK} - \
- BEAGLEBONE_INSTALL ${RAMDISK} -
+# Little endian (any ABI) ARMv6 platforms.
+MDSETTARGETS+= RPI_INSTALL ${SSHRAMDISK} -
+.endif
+
+.if \
+${MACHINE_ARCH} == "arm" || \
+${MACHINE_ARCH} == "earm" || \
+${MACHINE_ARCH} == "earmhf" || \
+${MACHINE_ARCH} == "earmv7" || \
+${MACHINE_ARCH} == "earmv7hf"
+# Little endian (any ABI) ARMv7 platforms.
+MDSETTARGETS+= BCM5301X_INSTALL ${RAMDISK} - \
+ BEAGLEBONE_INSTALL ${RAMDISK} - \
+ CUBIEBOARD_INSTALL ${RAMDISK} -
.endif
MDSET_RELEASEDIR= installation/instkernel
CVS commit: src/distrib/evbarm/gzboot/gzimg
Module Name:src
Committed By: matt
Date: Sat Mar 1 01:52:13 UTC 2014
Modified Files:
src/distrib/evbarm/gzboot/gzimg: Makefile
Log Message:
TARGETS -> ARCH_TARGETS
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/distrib/evbarm/gzboot/gzimg/Makefile
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/gzboot/gzimg/Makefile
diff -u src/distrib/evbarm/gzboot/gzimg/Makefile:1.25 src/distrib/evbarm/gzboot/gzimg/Makefile:1.26
--- src/distrib/evbarm/gzboot/gzimg/Makefile:1.25 Mon Jan 27 08:18:07 2014
+++ src/distrib/evbarm/gzboot/gzimg/Makefile Sat Mar 1 01:52:13 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2014/01/27 08:18:07 apb Exp $
+# $NetBSD: Makefile,v 1.26 2014/03/01 01:52:13 matt Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -6,19 +6,19 @@
.include
#
-# `make' or `make all' builds all gzimg files defined in ${TARGETS}.
+# `make' or `make all' builds all gzimg files defined in ${ARCH_TARGETS}.
# `make _KERNELNAME_' builds all gzimg files for specified kernels.
#
-# TARGETS is a list of:
+# ARCH_TARGETS is a list of:
# KERNEL_name GZBOOT_name GZIMG_name
# RELOC_ADDR WHICH_kernel
#
.if ${MACHINE_ARCH} == "arm"
# Little endian platforms.
-TARGETS= ADI_BRH ADI_BRH ADI_BRH_sd0 \
+ARCH_TARGETS= ADI_BRH ADI_BRH ADI_BRH_sd0 \
0x0014 netbsd-sd0 \
\
ADI_BRH ADI_BRH ADI_BRH_wd0 \
@@ -53,19 +53,19 @@ TARGETS= ADI_BRH ADI_BRH ADI_BRH_sd0 \
\
SMDK2800 SMDK2800 SMDK2800 \
0x netbsd
-.else
+.elif ${MACHINE_ARCH} == "armeb"
# Big endian platforms.
-TARGETS= ADI_BRH ADI_BRH ADI_BRH_sd0 \
+ARCH_TARGETS= ADI_BRH ADI_BRH ADI_BRH_sd0 \
0x0014 netbsd-sd0 \
\
ADI_BRH ADI_BRH ADI_BRH_wd0 \
0x0014 netbsd-wd0
.endif
-# Default is to build for all TARGETS
+# Default is to build for all ARCH_TARGETS
ALL_KERNELS?= +
-.for K G I R W in ${TARGETS}# {
+.for K G I R W in ${ARCH_TARGETS} # {
.for configsel in ${ALL_KERNELS} # {
.if ${configsel} == "+" || ${configsel} == ${K}
CVS commit: src/distrib/evbarm/instkernel/ramdisk
Module Name:src
Committed By: matt
Date: Thu Jan 9 22:48:17 UTC 2014
Modified Files:
src/distrib/evbarm/instkernel/ramdisk: Makefile
Log Message:
Build BE ramdisks for BE MACHINE_ARCH's
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/distrib/evbarm/instkernel/ramdisk/Makefile
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/instkernel/ramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/ramdisk/Makefile:1.12 src/distrib/evbarm/instkernel/ramdisk/Makefile:1.13
--- src/distrib/evbarm/instkernel/ramdisk/Makefile:1.12 Thu Feb 11 09:06:48 2010
+++ src/distrib/evbarm/instkernel/ramdisk/Makefile Thu Jan 9 22:48:16 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2010/02/11 09:06:48 roy Exp $
+# $NetBSD: Makefile,v 1.13 2014/01/09 22:48:16 matt Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -13,7 +13,11 @@ DBG= -Os
CRUNCHBIN= ramdiskbin
LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
MTREECONF= ${DISTRIBDIR}/common/mtree.common
+.if empty(MACHINE_ARCH:M*eb)
IMAGEENDIAN= le
+.else
+IMAGEENDIAN= be
+.endif
MAKEDEVTARGETS= ramdisk
IMAGEDEPENDS= ${CRUNCHBIN} \
dot.profile \
CVS commit: src/distrib/evbarm/instkernel/instkernel
Module Name:src
Committed By: skrll
Date: Fri Aug 30 10:13:39 UTC 2013
Modified Files:
src/distrib/evbarm/instkernel/instkernel: Makefile
Log Message:
PR/48164: BEAGLEBONE_INSTALL kernel not built with preferred ABI for
platform
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/distrib/evbarm/instkernel/instkernel/Makefile
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/instkernel/instkernel/Makefile
diff -u src/distrib/evbarm/instkernel/instkernel/Makefile:1.22 src/distrib/evbarm/instkernel/instkernel/Makefile:1.23
--- src/distrib/evbarm/instkernel/instkernel/Makefile:1.22 Sun Aug 11 17:18:11 2013
+++ src/distrib/evbarm/instkernel/instkernel/Makefile Fri Aug 30 10:13:39 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2013/08/11 17:18:11 riz Exp $
+# $NetBSD: Makefile,v 1.23 2013/08/30 10:13:39 skrll Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -12,7 +12,6 @@ SSHRAMDISK= ${SSHRAMDISKDIR}/sshramdisk.
# Little endian platforms.
MDSETTARGETS= ADI_BRH_INSTALL ${RAMDISK} - \
BCM5301X_INSTALL ${RAMDISK} - \
- BEAGLEBONE_INSTALL ${RAMDISK} - \
CP3100_INSTALL ${RAMDISK} - \
GEMINI_INSTALL ${RAMDISK} - \
GUMSTIX_INSTALL ${RAMDISK} - \
@@ -36,7 +35,8 @@ MDSETTARGETS= ADI_BRH_INSTALL ${RAMDIS
${MACHINE_ARCH} == "earmv6" || \
${MACHINE_ARCH} == "earmv6hf"
# Little endian (any ABI) platforms.
-MDSETTARGETS+= RPI_INSTALL ${SSHRAMDISK} -
+MDSETTARGETS+= RPI_INSTALL ${SSHRAMDISK} - \
+ BEAGLEBONE_INSTALL ${RAMDISK} -
.endif
MDSET_RELEASEDIR= installation/instkernel
CVS commit: src/distrib/evbarm/instkernel/instkernel
Module Name:src
Committed By: riz
Date: Sun Aug 11 17:18:11 UTC 2013
Modified Files:
src/distrib/evbarm/instkernel/instkernel: Makefile
Log Message:
RPI has an ARMv6 processor, so handle RPI_INSTALL properly when
building for the earmv6* MACHINE_ARCHes.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/distrib/evbarm/instkernel/instkernel/Makefile
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/instkernel/instkernel/Makefile
diff -u src/distrib/evbarm/instkernel/instkernel/Makefile:1.21 src/distrib/evbarm/instkernel/instkernel/Makefile:1.22
--- src/distrib/evbarm/instkernel/instkernel/Makefile:1.21 Thu Aug 1 21:11:41 2013
+++ src/distrib/evbarm/instkernel/instkernel/Makefile Sun Aug 11 17:18:11 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2013/08/01 21:11:41 jklos Exp $
+# $NetBSD: Makefile,v 1.22 2013/08/11 17:18:11 riz Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -32,7 +32,9 @@ MDSETTARGETS= ADI_BRH_INSTALL ${RAMDIS
.if \
${MACHINE_ARCH} == "arm" || \
${MACHINE_ARCH} == "earm" || \
-${MACHINE_ARCH} == "earmhf"
+${MACHINE_ARCH} == "earmhf" || \
+${MACHINE_ARCH} == "earmv6" || \
+${MACHINE_ARCH} == "earmv6hf"
# Little endian (any ABI) platforms.
MDSETTARGETS+= RPI_INSTALL ${SSHRAMDISK} -
.endif
CVS commit: src/distrib/evbarm/instkernel/ramdisk
Module Name:src Committed By: matt Date: Sat Aug 3 21:35:59 UTC 2013 Modified Files: src/distrib/evbarm/instkernel/ramdisk: list Log Message: Add drvctl To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/distrib/evbarm/instkernel/ramdisk/list 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/instkernel/ramdisk/list diff -u src/distrib/evbarm/instkernel/ramdisk/list:1.25 src/distrib/evbarm/instkernel/ramdisk/list:1.26 --- src/distrib/evbarm/instkernel/ramdisk/list:1.25 Fri Jun 28 22:13:56 2013 +++ src/distrib/evbarm/instkernel/ramdisk/list Sat Aug 3 21:35:59 2013 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.25 2013/06/28 22:13:56 matt Exp $ +# $NetBSD: list,v 1.26 2013/08/03 21:35:59 matt Exp $ SRCDIRS bin sbin external/bsd/less/bin usr.bin usr.sbin @@ -22,6 +22,7 @@ PROG bin/sync PROG sbin/chown bin/chgrp PROG sbin/disklabel +PROG sbin/drvctl PROG sbin/fdisk PROG sbin/fsck PROG sbin/fsck_msdos
CVS commit: src/distrib/evbarm/instkernel/instkernel
Module Name:src
Committed By: jklos
Date: Thu Aug 1 21:11:41 UTC 2013
Modified Files:
src/distrib/evbarm/instkernel/instkernel: Makefile
Log Message:
Build BeagleBone installation kernel.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/distrib/evbarm/instkernel/instkernel/Makefile
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/instkernel/instkernel/Makefile
diff -u src/distrib/evbarm/instkernel/instkernel/Makefile:1.20 src/distrib/evbarm/instkernel/instkernel/Makefile:1.21
--- src/distrib/evbarm/instkernel/instkernel/Makefile:1.20 Mon May 6 17:42:30 2013
+++ src/distrib/evbarm/instkernel/instkernel/Makefile Thu Aug 1 21:11:41 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2013/05/06 17:42:30 skrll Exp $
+# $NetBSD: Makefile,v 1.21 2013/08/01 21:11:41 jklos Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -12,6 +12,7 @@ SSHRAMDISK= ${SSHRAMDISKDIR}/sshramdisk.
# Little endian platforms.
MDSETTARGETS= ADI_BRH_INSTALL ${RAMDISK} - \
BCM5301X_INSTALL ${RAMDISK} - \
+ BEAGLEBONE_INSTALL ${RAMDISK} - \
CP3100_INSTALL ${RAMDISK} - \
GEMINI_INSTALL ${RAMDISK} - \
GUMSTIX_INSTALL ${RAMDISK} - \
CVS commit: src/distrib/evbarm/instkernel/ramdisk
Module Name:src Committed By: matt Date: Fri Jun 28 22:13:56 UTC 2013 Modified Files: src/distrib/evbarm/instkernel/ramdisk: list Log Message: Add sysctl To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/distrib/evbarm/instkernel/ramdisk/list 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/instkernel/ramdisk/list diff -u src/distrib/evbarm/instkernel/ramdisk/list:1.24 src/distrib/evbarm/instkernel/ramdisk/list:1.25 --- src/distrib/evbarm/instkernel/ramdisk/list:1.24 Wed Jan 30 14:12:33 2013 +++ src/distrib/evbarm/instkernel/ramdisk/list Fri Jun 28 22:13:56 2013 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.24 2013/01/30 14:12:33 he Exp $ +# $NetBSD: list,v 1.25 2013/06/28 22:13:56 matt Exp $ SRCDIRS bin sbin external/bsd/less/bin usr.bin usr.sbin @@ -46,6 +46,7 @@ PROG sbin/restore sbin/rrestore PROG sbin/route PROG sbin/shutdown PROG sbin/slattach +PROG sbin/sysctl PROG sbin/swapctl PROG sbin/umount
CVS commit: src/distrib/evbarm/instkernel/sshramdisk
Module Name:src
Committed By: htodd
Date: Fri Jun 28 15:31:26 UTC 2013
Modified Files:
src/distrib/evbarm/instkernel/sshramdisk: Makefile
Log Message:
Bump imagesize to fix build.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/evbarm/instkernel/sshramdisk/Makefile
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/instkernel/sshramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.1 src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.2
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.1 Tue Mar 19 22:16:53 2013
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile Fri Jun 28 15:31:26 2013
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2013/03/19 22:16:53 garbled Exp $
+# $NetBSD: Makefile,v 1.2 2013/06/28 15:31:26 htodd Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
IMAGE= sshramdisk.fs
-IMAGESIZE= 3572k
+IMAGESIZE= 3684k
MAKEFS_FLAGS= -f 15
WARNS= 1
CVS commit: src/distrib/evbarm/instkernel/instkernel
Module Name:src
Committed By: skrll
Date: Mon May 6 17:42:31 UTC 2013
Modified Files:
src/distrib/evbarm/instkernel/instkernel: Makefile
Log Message:
Fix up evbearm* release builds.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/distrib/evbarm/instkernel/instkernel/Makefile
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/instkernel/instkernel/Makefile
diff -u src/distrib/evbarm/instkernel/instkernel/Makefile:1.19 src/distrib/evbarm/instkernel/instkernel/Makefile:1.20
--- src/distrib/evbarm/instkernel/instkernel/Makefile:1.19 Tue Mar 19 22:16:53 2013
+++ src/distrib/evbarm/instkernel/instkernel/Makefile Mon May 6 17:42:30 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2013/03/19 22:16:53 garbled Exp $
+# $NetBSD: Makefile,v 1.20 2013/05/06 17:42:30 skrll Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -22,12 +22,20 @@ MDSETTARGETS= ADI_BRH_INSTALL ${RAMDIS
OPENRD_INSTALL ${RAMDISK} - \
TS7200_INSTALL ${RAMDISK} - \
TEAMASA_NPWR_INSTALL ${RAMDISK} - \
- RPI_INSTALL ${SSHRAMDISK} - \
KUROBOX_PRO_INSTALL ${RAMDISK} -
.else
# Big endian platforms.
MDSETTARGETS= ADI_BRH_INSTALL ${RAMDISK} -
.endif
+
+.if \
+${MACHINE_ARCH} == "arm" || \
+${MACHINE_ARCH} == "earm" || \
+${MACHINE_ARCH} == "earmhf"
+# Little endian (any ABI) platforms.
+MDSETTARGETS+= RPI_INSTALL ${SSHRAMDISK} -
+.endif
+
MDSET_RELEASEDIR= installation/instkernel
MDSET_SUFFIXES.-= srec create-srec bin create-bin
CVS commit: src/distrib/evbarm/instkernel/ramdisk
Module Name:src Committed By: he Date: Wed Jan 30 14:12:33 UTC 2013 Modified Files: src/distrib/evbarm/instkernel/ramdisk: list Log Message: Add newfs_ext2fs and mount_ext2fs, useful for installing on a hard disk on KUROBOX_PRO. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/distrib/evbarm/instkernel/ramdisk/list 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/instkernel/ramdisk/list diff -u src/distrib/evbarm/instkernel/ramdisk/list:1.23 src/distrib/evbarm/instkernel/ramdisk/list:1.24 --- src/distrib/evbarm/instkernel/ramdisk/list:1.23 Fri Aug 10 20:17:09 2012 +++ src/distrib/evbarm/instkernel/ramdisk/list Wed Jan 30 14:12:33 2013 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.23 2012/08/10 20:17:09 matt Exp $ +# $NetBSD: list,v 1.24 2013/01/30 14:12:33 he Exp $ SRCDIRS bin sbin external/bsd/less/bin usr.bin usr.sbin @@ -32,12 +32,14 @@ PROG sbin/init PROG sbin/mknod PROG sbin/mount PROG sbin/mount_cd9660 +PROG sbin/mount_ext2fs PROG sbin/mount_ffs PROG sbin/mount_kernfs PROG sbin/mount_msdos PROG sbin/mount_nfs PROG sbin/mount_tmpfs PROG sbin/newfs sbin/mount_mfs +PROG sbin/newfs_ext2fs PROG sbin/ping PROG sbin/reboot sbin/halt PROG sbin/restore sbin/rrestore
CVS commit: src/distrib/evbarm/instkernel/instkernel
Module Name:src
Committed By: he
Date: Wed Jan 30 13:53:54 UTC 2013
Modified Files:
src/distrib/evbarm/instkernel/instkernel: Makefile
Log Message:
Also populate the INSTALL kernel for KUROBOX_PRO.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/distrib/evbarm/instkernel/instkernel/Makefile
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/instkernel/instkernel/Makefile
diff -u src/distrib/evbarm/instkernel/instkernel/Makefile:1.17 src/distrib/evbarm/instkernel/instkernel/Makefile:1.18
--- src/distrib/evbarm/instkernel/instkernel/Makefile:1.17 Fri Oct 26 19:13:56 2012
+++ src/distrib/evbarm/instkernel/instkernel/Makefile Wed Jan 30 13:53:54 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2012/10/26 19:13:56 msaitoh Exp $
+# $NetBSD: Makefile,v 1.18 2013/01/30 13:53:54 he Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -19,7 +19,8 @@ MDSETTARGETS= ADI_BRH_INSTALL ${RAMDIS
MINI2440_INSTALL ${RAMDISK} - \
OPENRD_INSTALL ${RAMDISK} - \
TS7200_INSTALL ${RAMDISK} - \
- TEAMASA_NPWR_INSTALL ${RAMDISK} -
+ TEAMASA_NPWR_INSTALL ${RAMDISK} - \
+ KUROBOX_PRO_INSTALL ${RAMDISK} -
.else
# Big endian platforms.
MDSETTARGETS= ADI_BRH_INSTALL ${RAMDISK} -
CVS commit: src/distrib/evbarm/instkernel/instkernel
Module Name:src
Committed By: msaitoh
Date: Fri Oct 26 19:13:56 UTC 2012
Modified Files:
src/distrib/evbarm/instkernel/instkernel: Makefile
Log Message:
Add OPENRD_INSTALL.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/evbarm/instkernel/instkernel/Makefile
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/instkernel/instkernel/Makefile
diff -u src/distrib/evbarm/instkernel/instkernel/Makefile:1.16 src/distrib/evbarm/instkernel/instkernel/Makefile:1.17
--- src/distrib/evbarm/instkernel/instkernel/Makefile:1.16 Sat Sep 1 02:05:02 2012
+++ src/distrib/evbarm/instkernel/instkernel/Makefile Fri Oct 26 19:13:56 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/09/01 02:05:02 matt Exp $
+# $NetBSD: Makefile,v 1.17 2012/10/26 19:13:56 msaitoh Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -17,6 +17,7 @@ MDSETTARGETS= ADI_BRH_INSTALL ${RAMDIS
IQ80310_INSTALL ${RAMDISK} - \
IQ80321_INSTALL ${RAMDISK} - \
MINI2440_INSTALL ${RAMDISK} - \
+ OPENRD_INSTALL ${RAMDISK} - \
TS7200_INSTALL ${RAMDISK} - \
TEAMASA_NPWR_INSTALL ${RAMDISK} -
.else
CVS commit: src/distrib/evbarm/instkernel/instkernel
Module Name:src
Committed By: matt
Date: Sat Sep 1 02:05:02 UTC 2012
Modified Files:
src/distrib/evbarm/instkernel/instkernel: Makefile
Log Message:
Add BCM5301X_INSTALL
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/distrib/evbarm/instkernel/instkernel/Makefile
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/instkernel/instkernel/Makefile
diff -u src/distrib/evbarm/instkernel/instkernel/Makefile:1.15 src/distrib/evbarm/instkernel/instkernel/Makefile:1.16
--- src/distrib/evbarm/instkernel/instkernel/Makefile:1.15 Wed Feb 1 03:35:14 2012
+++ src/distrib/evbarm/instkernel/instkernel/Makefile Sat Sep 1 02:05:02 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/02/01 03:35:14 nisimura Exp $
+# $NetBSD: Makefile,v 1.16 2012/09/01 02:05:02 matt Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -9,6 +9,7 @@ RAMDISK= ${RAMDISKDIR}/ramdisk.fs
.if ${MACHINE_ARCH} == "arm"
# Little endian platforms.
MDSETTARGETS= ADI_BRH_INSTALL ${RAMDISK} - \
+ BCM5301X_INSTALL ${RAMDISK} - \
CP3100_INSTALL ${RAMDISK} - \
GEMINI_INSTALL ${RAMDISK} - \
GUMSTIX_INSTALL ${RAMDISK} - \
CVS commit: src/distrib/evbarm/instkernel/ramdisk
Module Name:src Committed By: matt Date: Fri Aug 10 20:17:09 UTC 2012 Modified Files: src/distrib/evbarm/instkernel/ramdisk: list Log Message: Add mount_tmpfs To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/distrib/evbarm/instkernel/ramdisk/list 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/instkernel/ramdisk/list diff -u src/distrib/evbarm/instkernel/ramdisk/list:1.22 src/distrib/evbarm/instkernel/ramdisk/list:1.23 --- src/distrib/evbarm/instkernel/ramdisk/list:1.22 Fri Aug 10 05:21:14 2012 +++ src/distrib/evbarm/instkernel/ramdisk/list Fri Aug 10 20:17:09 2012 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.22 2012/08/10 05:21:14 matt Exp $ +# $NetBSD: list,v 1.23 2012/08/10 20:17:09 matt Exp $ SRCDIRS bin sbin external/bsd/less/bin usr.bin usr.sbin @@ -36,6 +36,7 @@ PROG sbin/mount_ffs PROG sbin/mount_kernfs PROG sbin/mount_msdos PROG sbin/mount_nfs +PROG sbin/mount_tmpfs PROG sbin/newfs sbin/mount_mfs PROG sbin/ping PROG sbin/reboot sbin/halt
CVS commit: src/distrib/evbarm/instkernel/ramdisk
Module Name:src Committed By: matt Date: Fri Aug 10 05:21:14 UTC 2012 Modified Files: src/distrib/evbarm/instkernel/ramdisk: list Log Message: Add fdisk/gpt/fsck_msdos To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/distrib/evbarm/instkernel/ramdisk/list 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/instkernel/ramdisk/list diff -u src/distrib/evbarm/instkernel/ramdisk/list:1.21 src/distrib/evbarm/instkernel/ramdisk/list:1.22 --- src/distrib/evbarm/instkernel/ramdisk/list:1.21 Sun Jul 3 23:11:32 2011 +++ src/distrib/evbarm/instkernel/ramdisk/list Fri Aug 10 05:21:14 2012 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.21 2011/07/03 23:11:32 tron Exp $ +# $NetBSD: list,v 1.22 2012/08/10 05:21:14 matt Exp $ SRCDIRS bin sbin external/bsd/less/bin usr.bin usr.sbin @@ -22,8 +22,11 @@ PROG bin/sync PROG sbin/chown bin/chgrp PROG sbin/disklabel +PROG sbin/fdisk PROG sbin/fsck +PROG sbin/fsck_msdos PROG sbin/fsck_ffs +PROG sbin/gpt PROG sbin/ifconfig PROG sbin/init PROG sbin/mknod
CVS commit: src/distrib/evbarm/gzboot/gzimg
Module Name:src
Committed By: bsh
Date: Wed Apr 4 07:32:29 UTC 2012
Modified Files:
src/distrib/evbarm/gzboot/gzimg: Makefile
Log Message:
add phony targets to build gzimg files for specified kernels, instead
of building all gzimg files in TARGETS.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/distrib/evbarm/gzboot/gzimg/Makefile
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/gzboot/gzimg/Makefile
diff -u src/distrib/evbarm/gzboot/gzimg/Makefile:1.21 src/distrib/evbarm/gzboot/gzimg/Makefile:1.22
--- src/distrib/evbarm/gzboot/gzimg/Makefile:1.21 Fri Apr 3 22:36:35 2009
+++ src/distrib/evbarm/gzboot/gzimg/Makefile Wed Apr 4 07:32:29 2012
@@ -1,10 +1,16 @@
-# $NetBSD: Makefile,v 1.21 2009/04/03 22:36:35 perry Exp $
+# $NetBSD: Makefile,v 1.22 2012/04/04 07:32:29 bsh Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
.include
+#
+# `make' or `make all' builds all gzimg files defined in ${TARGETS}.
+# `make _KERNELNAME_' builds all gzimg files for specified kernels.
+#
+
+
# TARGETS is a list of:
# KERNEL_name GZBOOT_name GZIMG_name
@@ -75,8 +81,17 @@ gzimg_${I}_flash_${R}.gz: .NOTMAIN gzimg
CLEANFILES+= gzimg_${I}_flash_${R}.kern gzimg_${I}_flash_${R}.kern.gz \
gzimg_${I}_flash_${R}
+.if empty(GZKERNELS:M${K})
+GZKERNELS+= $K
+.endif
+KZ${K}+= gzimg_${I}_flash_${R}.gz
+
.endfor # }
+.for K in ${GZKERNELS}
+${K}: .PHONY ${KZ${K}}
+.endfor
+
CLEANFILES+= ${GZIMGS}
CVS commit: src/distrib/evbarm/cdroms/installcd
Module Name:src
Committed By: nonaka
Date: Thu Feb 23 11:03:53 UTC 2012
Modified Files:
src/distrib/evbarm/cdroms/installcd: Makefile
Log Message:
Build evbarm-${MACHINE_ARCH}cd.iso instead of evbarmcd.iso.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/evbarm/cdroms/installcd/Makefile
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/cdroms/installcd/Makefile
diff -u src/distrib/evbarm/cdroms/installcd/Makefile:1.1 src/distrib/evbarm/cdroms/installcd/Makefile:1.2
--- src/distrib/evbarm/cdroms/installcd/Makefile:1.1 Tue Mar 6 21:56:58 2007
+++ src/distrib/evbarm/cdroms/installcd/Makefile Thu Feb 23 11:03:53 2012
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2007/03/06 21:56:58 bouyer Exp $
-CDBASE= evbarmcd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+# $NetBSD: Makefile,v 1.2 2012/02/23 11:03:53 nonaka Exp $
+
+CDBASE= evbarm-${MACHINE_ARCH}cd # gives ${CDBASE}.iso
+CDRELEASE= true# include $RELEASEDIR/$MACHINE
.include "${.CURDIR}/../../../common/Makefile.bootcd"
CVS commit: src/distrib/evbarm/instkernel/instkernel
Module Name:src
Committed By: nisimura
Date: Wed Feb 1 03:35:14 UTC 2012
Modified Files:
src/distrib/evbarm/instkernel/instkernel: Makefile
Log Message:
add MINI2440_INSTALL image to the distribution.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/distrib/evbarm/instkernel/instkernel/Makefile
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/instkernel/instkernel/Makefile
diff -u src/distrib/evbarm/instkernel/instkernel/Makefile:1.14 src/distrib/evbarm/instkernel/instkernel/Makefile:1.15
--- src/distrib/evbarm/instkernel/instkernel/Makefile:1.14 Fri Oct 31 02:04:04 2008
+++ src/distrib/evbarm/instkernel/instkernel/Makefile Wed Feb 1 03:35:14 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/10/31 02:04:04 cliff Exp $
+# $NetBSD: Makefile,v 1.15 2012/02/01 03:35:14 nisimura Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -15,6 +15,7 @@ MDSETTARGETS= ADI_BRH_INSTALL ${RAMDIS
INTEGRATOR_INSTALL ${RAMDISK} - \
IQ80310_INSTALL ${RAMDISK} - \
IQ80321_INSTALL ${RAMDISK} - \
+ MINI2440_INSTALL ${RAMDISK} - \
TS7200_INSTALL ${RAMDISK} - \
TEAMASA_NPWR_INSTALL ${RAMDISK} -
.else
