diff --git a/distrib/amd64/Makefile b/distrib/amd64/Makefile index a8f2aaf8f528..ed6a34f2234f 100644 --- a/distrib/amd64/Makefile +++ b/distrib/amd64/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2017/05/21 15:28:37 riastradh Exp $ +# $NetBSD: Makefile,v 1.14 2020/05/27 22:27:58 maya Exp $ .include @@ -14,7 +14,6 @@ SUBDIR+= .WAIT SUBDIR+= cdroms SUBDIR+= liveimage SUBDIR+= installimage -SUBDIR+= uefi-installimage TARGETS+= release iso_image: @@ -25,6 +24,5 @@ live_image: install_image: ${MAKEDIRTARGET} installimage install_image - ${MAKEDIRTARGET} uefi-installimage install_image .include diff --git a/distrib/amd64/installimage/Makefile b/distrib/amd64/installimage/Makefile index 41267bf278f4..042d9739bfb0 100644 --- a/distrib/amd64/installimage/Makefile +++ b/distrib/amd64/installimage/Makefile @@ -1,16 +1,21 @@ -# $NetBSD: Makefile,v 1.10 2018/12/15 18:03:16 gson Exp $ +# $NetBSD: Makefile,v 1.11 2020/05/27 22:27:58 maya Exp $ .include INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-install # gives ${IMGBASE}.img -INSTIMAGEMB?= 1450 # for all installation binaries +INSTIMAGEMB?= 1550 # for all installation binaries PRIMARY_BOOT= bootxx_ffsv1 SECONDARY_BOOT= boot SECONDARY_BOOT_ARG= # unnecessary +EFIBOOT= ${WORKDIR}/usr/mdec/bootx64.efi +EFIBOOT+= ${WORKDIR}/usr/mdec/bootia32.efi +#EFIBOOT= ${.OBJDIR}/../../../sys/arch/i386/stand/efiboot/bootx64/bootx64.efi +#EFIBOOT+= ${.OBJDIR}/../../../sys/arch/i386/stand/efiboot/bootia32/bootia32.efi USE_MBR= yes +USE_GPT= yes CLEANFILES+= boot.cfg @@ -35,4 +40,4 @@ IMGFILE_EXTRA= \ ${SYSINSTDIR}/sysinstmsgs.pl . \ ${SYSINSTDIR}/sysinst . -.include "${DISTRIBDIR}/common/bootimage/Makefile.installimage" +.include "${NETBSDSRCDIR}/distrib/common/bootimage//Makefile.installimage" diff --git a/distrib/amd64/uefi-installimage/Makefile b/distrib/amd64/uefi-installimage/Makefile deleted file mode 100644 index 1f83e1bf54ce..000000000000 --- a/distrib/amd64/uefi-installimage/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# $NetBSD: Makefile,v 1.7 2019/11/21 22:29:03 joerg Exp $ - -.include - -INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-uefi-install # gives ${IMGBASE}.img - -INSTIMAGEMB?= 1550 # for all installation binaries - -PRIMARY_BOOT= bootxx_ffsv1 -SECONDARY_BOOT= boot -SECONDARY_BOOT_ARG= # unnecessary -EFIBOOT= ${WORKDIR}/usr/mdec/bootx64.efi -EFIBOOT+= ${WORKDIR}/usr/mdec/bootia32.efi -#EFIBOOT= ${.OBJDIR}/../../../sys/arch/i386/stand/efiboot/bootx64/bootx64.efi -#EFIBOOT+= ${.OBJDIR}/../../../sys/arch/i386/stand/efiboot/bootia32/bootia32.efi - -USE_MBR= yes -USE_GPT= yes - -CLEANFILES+= boot.cfg - -prepare_md_post: - ${TOOL_SED} \ - -e "s/@@MACHINE@@/${MACHINE}/" \ - -e "s/@@VERSION@@/${DISTRIBVER}/" \ - < ${.CURDIR}/boot.cfg.in > boot.cfg - -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 . \ - ${.OBJDIR}/boot.cfg . \ - ${SYSINSTDIR}/sysinstmsgs.de . \ - ${SYSINSTDIR}/sysinstmsgs.es . \ - ${SYSINSTDIR}/sysinstmsgs.fr . \ - ${SYSINSTDIR}/sysinstmsgs.pl . \ - ${SYSINSTDIR}/sysinst . - -.include "${NETBSDSRCDIR}/distrib/common/bootimage//Makefile.installimage" diff --git a/distrib/amd64/uefi-installimage/Makefile.bootimage b/distrib/amd64/uefi-installimage/Makefile.bootimage deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/distrib/amd64/uefi-installimage/Makefile.installimage b/distrib/amd64/uefi-installimage/Makefile.installimage deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/distrib/amd64/uefi-installimage/boot.cfg.in b/distrib/amd64/uefi-installimage/boot.cfg.in deleted file mode 100644 index a592569787c0..000000000000 --- a/distrib/amd64/uefi-installimage/boot.cfg.in +++ /dev/null @@ -1,9 +0,0 @@ -banner=Welcome to the NetBSD/@@MACHINE@@ @@VERSION@@ installation image -banner================================================================================ -banner= -banner=If you encounter a problem while booting, report a bug at -banner=https://www.NetBSD.org/. -menu=Install NetBSD:boot netbsd -menu=Drop to boot prompt:prompt -timeout=30 -clear=1 diff --git a/distrib/amd64/uefi-installimage/etc.rc b/distrib/amd64/uefi-installimage/etc.rc deleted file mode 100644 index d3bb36a8b51b..000000000000 --- a/distrib/amd64/uefi-installimage/etc.rc +++ /dev/null @@ -1,49 +0,0 @@ -# $NetBSD: etc.rc,v 1.2 2020/02/26 16:00:48 riastradh 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:/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 diff --git a/distrib/amd64/uefi-installimage/etc.ttys b/distrib/amd64/uefi-installimage/etc.ttys deleted file mode 100644 index aed04ceb2cb9..000000000000 --- a/distrib/amd64/uefi-installimage/etc.ttys +++ /dev/null @@ -1,7 +0,0 @@ -# $NetBSD: etc.ttys,v 1.1 2017/01/24 11:16:50 nonaka Exp $ -# -# re-launch the sysinst wrapper script on console -# -# name getty type status comments -# -console "/usr/libexec/getty sysinst" wsvt25 on secure diff --git a/distrib/amd64/uefi-installimage/install.sh b/distrib/amd64/uefi-installimage/install.sh deleted file mode 100644 index 28c6273372bd..000000000000 --- a/distrib/amd64/uefi-installimage/install.sh +++ /dev/null @@ -1,115 +0,0 @@ -#! /bin/sh -m -# $NetBSD: install.sh,v 1.1 2017/01/24 11:16:50 nonaka 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 . -# -# 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 90,0 -> 0x5a00 -case $(sysctl -nx kern.consdev) in - 002f000000000000) - 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} diff --git a/distrib/amd64/uefi-installimage/spec.inst b/distrib/amd64/uefi-installimage/spec.inst deleted file mode 100644 index 7ba3ad4f56ac..000000000000 --- a/distrib/amd64/uefi-installimage/spec.inst +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: spec.inst,v 1.1 2017/01/24 11:16:50 nonaka 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}?