Current-Users archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: miniroot.kmod install fs + amd64cd.iso changes
On Thu, 13 Jan 2011 11:17:20 +0100, Jean-Yves Migeon
<jeanyves.migeon%free.fr@localhost> wrote:
Hi lists,
Here's a patch to bring amd64 closer (perhaps even "on par") with
i386 regarding INSTALL kernels, ISOs, and miniroot.kmod.
Any comment before commit?
Hmm, forgot the patch... sorry.
--
Jean-Yves Migeon
jeanyves.migeon%free.fr@localhost
Index: distrib/amd64/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/amd64/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- distrib/amd64/Makefile 6 Mar 2007 21:52:44 -0000 1.4
+++ distrib/amd64/Makefile 13 Jan 2011 10:04:49 -0000
@@ -4,6 +4,7 @@ SUBDIR=
SUBDIR+= ramdisks
SUBDIR+= .WAIT
SUBDIR+= instkernel
+SUBDIR+= kmod
SUBDIR+= .WAIT
SUBDIR+= cdroms
SUBDIR+= floppies
Index: distrib/amd64/cdroms/Makefile.cdrom
===================================================================
RCS file: /cvsroot/src/distrib/amd64/cdroms/Makefile.cdrom,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile.cdrom
--- distrib/amd64/cdroms/Makefile.cdrom 6 Mar 2007 21:52:44 -0000 1.1
+++ distrib/amd64/cdroms/Makefile.cdrom 13 Jan 2011 10:04:49 -0000
@@ -1,4 +1,70 @@
# $NetBSD: Makefile.cdrom,v 1.1 2007/03/06 21:52:44 bouyer Exp $
-CDMAKEFSOPTIONS= bootimage=i386;bootxx.${MACHINE},no-emul-boot
-CDINSTKERNEL= ../../instkernel
+.include <bsd.own.mk>
+
+SYSINSTDIR!= cd ${.CURDIR}/../../../utils/sysinst/arch/${MACHINE} &&
${PRINTOBJDIR}
+
+# Need multidot for the boot loader to read kernel modules as it doesn't
+# understand rockridge.
+CDMAKEFSOPTIONS= bootimage=i386;bootxx.${MACHINE},no-emul-boot,allow-multidot
+CDINSTKERNEL= ../../instkernel
+CDKERNELS= netbsd-GENERIC.gz netbsd
+CDRELEASE_NOISOS= true
+
+CDRUNTIME+= ./bin
+CDRUNTIME+= ./dev/MAKEDEV
+CDRUNTIME+= ./etc
+CDRUNTIME+= ./lib
+CDRUNTIME+= ./libdata
+CDRUNTIME+= ./libexec/ld.elf_so
+CDRUNTIME+= ./libexec/lfs_cleanerd
+CDRUNTIME+= ./libexec/dhcpcd-run-hooks
+CDRUNTIME+= ./libexec/resolvconf/
+CDRUNTIME+= ./mnt
+CDRUNTIME+= ./sbin
+CDRUNTIME+= ./stand
+CDRUNTIME+= ./tmp
+CDRUNTIME+= ./usr/bin/ftp
+CDRUNTIME+= ./usr/bin/grep
+CDRUNTIME+= ./usr/bin/gzip
+CDRUNTIME+= ./usr/bin/less
+CDRUNTIME+= ./usr/bin/more
+CDRUNTIME+= ./usr/bin/netstat
+CDRUNTIME+= ./usr/bin/progress
+CDRUNTIME+= ./usr/bin/sed
+CDRUNTIME+= ./usr/bin/sort
+CDRUNTIME+= ./usr/bin/tip
+CDRUNTIME+= ./usr/bin/vmstat
+CDRUNTIME+= ./usr/lib/libbz2.so*
+CDRUNTIME+= ./usr/lib/libc.so*
+CDRUNTIME+= ./usr/lib/libcurses.so*
+CDRUNTIME+= ./usr/lib/libedit.so*
+CDRUNTIME+= ./usr/lib/libintl.so*
+CDRUNTIME+= ./usr/lib/libkvm.so*
+CDRUNTIME+= ./usr/lib/libterminfo.so*
+CDRUNTIME+= ./usr/lib/libutil.so*
+CDRUNTIME+= ./usr/lib/libz.so*
+CDRUNTIME+= ./usr/libexec/ld.elf_so
+CDRUNTIME+= ./usr/libexec/getty
+CDRUNTIME+= ./usr/mdec
+CDRUNTIME+= ./usr/sbin/chown
+CDRUNTIME+= ./usr/sbin/chroot
+CDRUNTIME+= ./usr/sbin/installboot
+CDRUNTIME+= ./usr/sbin/wiconfig
+CDRUNTIME+= ./usr/share/misc/terminfo.db
+CDRUNTIME+= ./usr/share/locale
+
+image_md_pre:
+ ${MKDIR} cdrom/libexec/dhcpcd-hooks
+ ${CP} ${.CURDIR}/../../../common/10-resolv.conf
cdrom/libexec/dhcpcd-hooks
+ ${CP} ${.CURDIR}/../../../common/99-print-sysinst
cdrom/libexec/dhcpcd-hooks
+ ${MKDIR} cdrom/etc
+ ${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
+ ${INSTALL} ${COPY} ${.CURDIR}/../etc.ttys cdrom/etc/ttys
+ ${INSTALL} ${COPY} ${.CURDIR}/../etc.rc cdrom/etc/rc
+ ${INSTALL} ${COPY} -m 0555 ${.CURDIR}/../install.sh cdrom/install.sh
+ ${MKDIR} cdrom/mnt2 cdrom/targetroot
+ ${CP} ${SYSINSTDIR}/sysinst cdrom
+ ${CHMOD} ugo+rx cdrom/sysinst
+ ${CP} ${SYSINSTDIR}/sysinstmsgs.?? cdrom
+ ${MKDIR} cdrom/var
Index: distrib/amd64/cdroms/bootcd/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/amd64/cdroms/bootcd/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- distrib/amd64/cdroms/bootcd/Makefile 22 Oct 2008 11:59:24 -0000
1.3
+++ distrib/amd64/cdroms/bootcd/Makefile 13 Jan 2011 10:04:49 -0000
@@ -4,7 +4,6 @@
.include "${.CURDIR}/../Makefile.cdrom"
CDBASE= boot # gives ${CDBASE}.iso
-CDKERNELS= netbsd-INSTALL.gz netbsd # from ../instkernel
CDBUILDEXTRA+= boot.cfg # Add boot.cfg file
CLEANFILES+= boot.cfg
Index: distrib/amd64/cdroms/bootcd/boot.cfg.in
===================================================================
RCS file: /cvsroot/src/distrib/amd64/cdroms/bootcd/boot.cfg.in,v
retrieving revision 1.2
diff -u -p -r1.2 boot.cfg.in
--- distrib/amd64/cdroms/bootcd/boot.cfg.in 25 Oct 2008 18:18:01 -0000
1.2
+++ distrib/amd64/cdroms/bootcd/boot.cfg.in 13 Jan 2011 10:04:49 -0000
@@ -1,15 +1,13 @@
banner=Welcome to the NetBSD @@VERSION@@ boot-only install CD
banner================================================================================
banner=
-banner=This CD contains only the install kernels. Binary sets to complete the
-banner=installation must be downloaded separately.
+banner=This CD contains only the installation program. Binary sets to
complete the
+banner=installation must be downloaded separately. The installer can download
them
+banner=if this machine has a working internet connection.
banner=
-banner=ACPI should work on all modern and legacy hardware, however if you have
-banner=problems, please try disabling it.
-banner=
-banner=If you encounter problems on hardware manufactured after 1998 with ACPI
-banner=enabled, please file a problem report including output from the 'dmesg'
-banner=command.
+banner=ACPI (Advanced Configuration and Power Interface) should work on all
modern
+banner=and legacy hardware. However if you do encounter a problem while
booting,
+banner=try disabling it and report a bug at http://www.NetBSD.org/.
menu=Install NetBSD:boot netbsd
menu=Install NetBSD (no ACPI):boot netbsd -2
menu=Install NetBSD (no ACPI, no SMP):boot netbsd -12
Index: distrib/amd64/cdroms/bootcd-com/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/amd64/cdroms/bootcd-com/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- distrib/amd64/cdroms/bootcd-com/Makefile 21 Oct 2009 02:31:44 -0000
1.4
+++ distrib/amd64/cdroms/bootcd-com/Makefile 13 Jan 2011 10:04:49 -0000
@@ -4,7 +4,6 @@
.include "${.CURDIR}/../Makefile.cdrom"
CDBASE= boot-com # gives ${CDBASE}.iso
-CDKERNELS= netbsd-INSTALL.gz netbsd # from ../instkernel
CDBOOTOPTIONS= -o console=com0
CDBUILDEXTRA+= boot.cfg # Add boot.cfg file
Index: distrib/amd64/cdroms/installcd/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/amd64/cdroms/installcd/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- distrib/amd64/cdroms/installcd/Makefile 1 May 2008 21:59:07 -0000
1.3
+++ distrib/amd64/cdroms/installcd/Makefile 13 Jan 2011 10:04:49 -0000
@@ -1,10 +1,13 @@
# $NetBSD: Makefile,v 1.3 2008/05/01 21:59:07 xtraeme Exp $
#
+# Install CD, to be made after 'build.sh release'
+# Requires populated $RELEASEDIR/${MACHINE}
+
+.include <bsd.own.mk>
.include "${.CURDIR}/../Makefile.cdrom"
CDBASE= amd64cd # gives ${CDBASE}.iso
-CDKERNELS= netbsd-INSTALL.gz netbsd # from ../instkernel
CDRELEASE= true # include $RELEASEDIR/$MACHINE
CDBUILDEXTRA= boot.cfg # Add boot.cfg file
CLEANFILES+= boot.cfg
Index: distrib/amd64/cdroms/installcd/boot.cfg.in
===================================================================
RCS file: /cvsroot/src/distrib/amd64/cdroms/installcd/boot.cfg.in,v
retrieving revision 1.2
diff -u -p -r1.2 boot.cfg.in
--- distrib/amd64/cdroms/installcd/boot.cfg.in 22 Oct 2008 12:01:59 -0000
1.2
+++ distrib/amd64/cdroms/installcd/boot.cfg.in 13 Jan 2011 10:04:49 -0000
@@ -1,12 +1,9 @@
banner=Welcome to the NetBSD @@VERSION@@ installation CD
banner================================================================================
banner=
-banner=ACPI should work on all modern and legacy hardware, however if you have
-banner=problems, please try disabling it.
-banner=
-banner=If you encounter problems on hardware manufactured after 1998 with ACPI
-banner=enabled, please file a problem report including output from the 'dmesg'
-banner=command.
+banner=ACPI (Advanced Configuration and Power Interface) should work on all
modern
+banner=and legacy hardware. However if you do encounter a problem while
booting,
+banner=try disabling it and report a bug at http://www.NetBSD.org/.
menu=Install NetBSD:boot netbsd
menu=Install NetBSD (no ACPI):boot netbsd -2
menu=Install NetBSD (no ACPI, no SMP):boot netbsd -12
Index: distrib/amd64/instkernel/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/amd64/instkernel/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- distrib/amd64/instkernel/Makefile 22 Nov 2007 21:23:43 -0000 1.3
+++ distrib/amd64/instkernel/Makefile 13 Jan 2011 10:04:49 -0000
@@ -12,11 +12,14 @@ ${V}DIR!= cd ${.CURDIR}/../ramdisks/${F}
${V}= ${${V}DIR}/${F}.fs
.endfor
-MDSETTARGETS= INSTALL ${RAMDISK} -
+MDSETTARGETS= GENERIC ${RAMDISK} -
MDSETTARGETS+=INSTALL_XEN3_DOMU ${RAMDISK} -
MDSET_RELEASEDIR= binary/kernel
+# need symbols to load modules. don't actually want image inserted.
+MDSET_NOSTRIP.netbsd-GENERIC=
+MDSET_NOIMAGE.netbsd-GENERIC=
# do not strip Xen kernels, there's no space constraints here.
MDSET_NOSTRIP.netbsd-INSTALL_XEN3_DOMU=
MDSET_NOSYMBOLS.netbsd-INSTALL_XEN3_DOMU=
Index: etc/etc.amd64/Makefile.inc
===================================================================
RCS file: /cvsroot/src/etc/etc.amd64/Makefile.inc,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile.inc
--- etc/etc.amd64/Makefile.inc 18 Mar 2008 04:20:36 -0000 1.11
+++ etc/etc.amd64/Makefile.inc 13 Jan 2011 10:04:51 -0000
@@ -9,14 +9,16 @@
KERNEL_SETS= GENERIC
KERNEL_SETS+= XEN3_DOM0 XEN3_DOMU
-BUILD_KERNELS= INSTALL INSTALL_XEN3_DOMU
+BUILD_KERNELS= INSTALL_XEN3_DOMU
INSTALLATION_DIRS+= installation/cdrom
INSTALLATION_DIRS+= installation/floppy
INSTALLATION_DIRS+= installation/misc
+INSTALLATION_DIRS+= installation/miniroot
snap_md_post:
cd ${KERNSRCDIR}/arch/i386/stand/pxeboot && ${MAKE} release
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/cdrom
'*.iso'
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/floppy
'*.fs'
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/miniroot
'*.*'
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc
'*.*'
--- /dev/null 2011-01-13 10:55:51.000000000 +0100
+++ distrib/amd64/kmod/Makefile 2011-01-12 23:59:52.000000000 +0100
@@ -0,0 +1,27 @@
+# $NetBSD: Makefile,v 1.10 2009/04/03 22:36:35 perry Exp $
+
+.include <bsd.own.mk>
+.include "../../common/Makefile.distrib"
+
+MKMAN= no
+PROG= miniroot.kmod
+
+SRCMOD=
${DESTDIR}/stand/${MACHINE}/${DISTRIBVER}/modules/miniroot/miniroot.kmod
+DSTMOD= ${.OBJDIR}/miniroot.kmod
+RAMDISK= ramdisk
+RAMDISKDIR!= cd ${.CURDIR}/../ramdisks/${RAMDISK} && ${PRINTOBJDIR}
+RAMDISKFS= ${RAMDISKDIR}/${RAMDISK}.fs
+
+miniroot.kmod: ${RAMDISKFS} ${SRCMOD}
+ ${OBJCOPY} --add-section miniroot=${RAMDISKFS} \
+ --set-section-flags miniroot=alloc,contents,load,data \
+ ${SRCMOD} ${DSTMOD}.tmp
+ gzip -9nc < ${DSTMOD}.tmp > ${DSTMOD}
+ rm -f ${DSTMOD}.tmp
+
+.include <bsd.prog.mk>
+
+release: miniroot.kmod
+ ${HOST_INSTALL_FILE} -m ${BINMODE} ${PROG} \
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/miniroot/
+
Home |
Main Index |
Thread Index |
Old Index