Thu May 28 15:23:43 2020 UTC ()
Build install images for aarch64 and earmv7hf.
(jmcneill)
diff -r1.10 -r1.11 src/distrib/evbarm/Makefile
diff -r0 -r1.1 src/distrib/evbarm/installimage/Makefile
diff -r0 -r1.1 src/distrib/evbarm/installimage/etc.rc
diff -r0 -r1.1 src/distrib/evbarm/installimage/etc.ttys
diff -r0 -r1.1 src/distrib/evbarm/installimage/install.sh
diff -r0 -r1.1 src/distrib/evbarm/installimage/spec.inst
--- src/distrib/evbarm/Makefile 2018/04/01 04:35:01 1.10
+++ src/distrib/evbarm/Makefile 2020/05/28 15:23:43 1.11
| @@ -1,22 +1,28 @@ | | | @@ -1,22 +1,28 @@ |
1 | # $NetBSD: Makefile,v 1.10 2018/04/01 04:35:01 ryo Exp $ | | 1 | # $NetBSD: Makefile,v 1.11 2020/05/28 15:23:43 jmcneill Exp $ |
2 | | | 2 | |
3 | .include <bsd.own.mk> | | 3 | .include <bsd.own.mk> |
4 | .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" | | 4 | .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" |
5 | | | 5 | |
6 | .include <bsd.kernobj.mk> | | 6 | .include <bsd.kernobj.mk> |
7 | | | 7 | |
8 | SUBDIR= gzboot instkernel cdroms | | 8 | SUBDIR= gzboot instkernel cdroms |
| | | 9 | .if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "earmv7hf" |
| | | 10 | SUBDIR+= installimage |
| | | 11 | .endif |
9 | TARGETS+= release | | 12 | TARGETS+= release |
10 | | | 13 | |
11 | .if ${MACHINE_CPU} == "arm" | | 14 | .if ${MACHINE_CPU} == "arm" |
12 | BOOTOBJ!= cd ${KERNSRCDIR}/arch/evbarm/stand/boot2440 && ${PRINTOBJDIR} | | 15 | BOOTOBJ!= cd ${KERNSRCDIR}/arch/evbarm/stand/boot2440 && ${PRINTOBJDIR} |
13 | MDECBOOT= ${BOOTOBJ}/bootmini2440 | | 16 | MDECBOOT= ${BOOTOBJ}/bootmini2440 |
14 | | | 17 | |
15 | release: check_RELEASEDIR .WAIT ${MDECBOOT} | | 18 | release: check_RELEASEDIR .WAIT ${MDECBOOT} |
16 | ${RELEASE_INSTALL} ${MDECBOOT} ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation | | 19 | ${RELEASE_INSTALL} ${MDECBOOT} ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation |
17 | .endif | | 20 | .endif |
18 | | | 21 | |
19 | iso_image: | | 22 | iso_image: |
20 | ${MAKEDIRTARGET} cdroms iso_image | | 23 | ${MAKEDIRTARGET} cdroms iso_image |
21 | | | 24 | |
| | | 25 | install_image: |
| | | 26 | ${MAKEDIRTARGET} installimage install_image |
| | | 27 | |
22 | .include <bsd.subdir.mk> | | 28 | .include <bsd.subdir.mk> |
# $NetBSD: Makefile,v 1.1 2020/05/28 15:23:43 jmcneill Exp $
.include <bsd.own.mk>
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"
# $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.
#
# <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
PATH=/sbin:/bin:/usr/bin:/usr/sbin:/
export PATH
mount -u /
mount -t tmpfs tmpfs /tmp
# create a gettytab to autologin and run sysinst
echo "# Autostart sysinst" > /tmp/gettytab
echo -n "sysinst:al=root:lo=/install.sh:im=:sp#" >> /tmp/gettytab
stty speed >> /tmp/gettytab
cp /tmp/gettytab /etc
# done, move on to multiuser mode
exit 0
# $NetBSD: etc.ttys,v 1.1 2020/05/28 15:23:43 jmcneill Exp $
#
# re-launch the sysinst wrapper script on console
#
# name getty type status comments
#
console "/usr/libexec/getty sysinst" wsvt25 on secure
#! /bin/sh -m
# $NetBSD: install.sh,v 1.1 2020/05/28 15:23:43 jmcneill Exp $
#
# -
# Copyright (c) 2010 The NetBSD Foundation, Inc.
# All rights reserved.
#
# This code is derived from software contributed to The NetBSD Foundation
# by Martin Husemann <martin@NetBSD.org>.
#
# 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.
#
# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
# ``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 FOUNDATION OR CONTRIBUTORS
# 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.
# setup basic environment
PATH=/sbin:/bin:/usr/bin:/usr/sbin:/
export PATH
termfile=/tmp/sysinst.term
# Check if we are on a framebuffer or on serial console and default
# the terminal type accordingly.
# There is no /var/db/dev.cdb, so sysctl might not map the devicename properly;
# ttyE0 is 60,0 -> 0x3c00
case $(sysctl -nx kern.consdev) in
003c000000000000)
TERM=wsvt25
;;
*)
if [ -r ${termfile} ]; then
. ${termfile}
else
TERM=vt220
fi
;;
esac
export TERM
HOME=/
export HOME
BLOCKSIZE=1k
export BLOCKSIZE
EDITOR=ed
export EDITOR
SHELL=/bin/sh
export SHELL
umask 022
stty newcrt werase ^W intr ^C kill ^U erase ^?
if [ $TERM != "wsvt25" ]; then
cat << "EOM"
You are using a serial console, we do not know your terminal emulation.
Please select one, typical values are:
vt100
ansi
xterm
EOM
echo -n "Terminal type (just hit ENTER for '$TERM'): "
read ans
if [ -n "$ans" ];then
TERM=$ans
fi
fi
# run the installation or upgrade script.
cd /
cmd=./sysinst
while [ -n "${cmd}" ]
do
${cmd}
if [ $? = 4 ]; then
echo "Oops, something went wrong - we will try again"
exit
else
if [ -n "$(jobs)" ]; then
tput clear
echo "You have stopped sysinst, return to it by" \
"typing 'exit' or ^D."
${SHELL} -i
cmd="fg"
else
cmd=""
fi
fi
done
# remember terminal type, now that we know it for sure
echo "TERM=${TERM}" > ${termfile}
echo
echo "To return to the installer, quit this shell by typing 'exit' or ^D."
exec ${SHELL}
# $NetBSD: spec.inst,v 1.1 2020/05/28 15:23:43 jmcneill Exp $
./mnt2 type=dir mode=0755 uname=root gname=wheel
./targetroot type=dir mode=0755 uname=root gname=wheel
./install.sh type=file mode=0755 uname=root gname=wheel
./sysinst type=file mode=0755 uname=root gname=wheel
./sysinstmsgs.de type=file mode=0444 uname=root gname=wheel
./sysinstmsgs.es type=file mode=0444 uname=root gname=wheel
./sysinstmsgs.fr type=file mode=0444 uname=root gname=wheel
./sysinstmsgs.pl type=file mode=0444 uname=root gname=wheel
# for sysinst "install from local directory" default
./release type=link mode=0755 uname=root gname=wheel link=.
# XXX what to do for files in ${RELEASEMACHINEDIR}?