Module Name: src
Committed By: martin
Date: Sat May 11 14:31:57 UTC 2024
Modified Files:
src/distrib/common [netbsd-10]: Makefile.bootcd
src/distrib/common/bootimage [netbsd-10]: Makefile.installimage
src/distrib/i386/cdroms/installcd [netbsd-10]: Makefile
src/share/mk [netbsd-10]: bsd.own.mk
src/sys/arch/i386/conf [netbsd-10]: LEGACY
Log Message:
Pull up following revision(s) (requested by nia in ticket #682):
sys/arch/i386/conf/LEGACY: revision 1.3
distrib/common/Makefile.bootcd: revision 1.48
share/mk/bsd.own.mk: revision 1.1373
distrib/i386/cdroms/installcd/Makefile: revision 1.12
distrib/common/bootimage/Makefile.installimage: revision 1.11
remove redundant kernels and floppies from the space-starved i386 ISO
Turn off MKAMDGPUFIRMWARE on i386
It's too big for the i386 install media and not useful on either
pre-2012 hardware or the kinds of embedded systems where i386 still
thrived after 2012.
(The build of the kernel parts of amdgpu on i386 is nevertheless useful
for finding obscure bugs.)
"go for it" riastradh
i386: disable DRMKMS drivers in LEGACY kernel (this is for ISA)
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.44.6.1 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.10 -r1.10.2.1 \
src/distrib/common/bootimage/Makefile.installimage
cvs rdiff -u -r1.10 -r1.10.8.1 src/distrib/i386/cdroms/installcd/Makefile
cvs rdiff -u -r1.1289.2.3 -r1.1289.2.4 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.1 -r1.1.54.1 src/sys/arch/i386/conf/LEGACY
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.44 src/distrib/common/Makefile.bootcd:1.44.6.1
--- src/distrib/common/Makefile.bootcd:1.44 Sun Oct 11 14:10:04 2020
+++ src/distrib/common/Makefile.bootcd Sat May 11 14:31:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.44 2020/10/11 14:10:04 jmcneill Exp $
+# $NetBSD: Makefile.bootcd,v 1.44.6.1 2024/05/11 14:31:56 martin Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -53,7 +53,7 @@ CDROMS_RELEASEDIR?= ${MACHINE}/installat
CDROMS_RELEASEDIR?= images
.endif
.if defined(CDRELEASE_NOISOS)
-CDRELEASE_EXCLUDE= -s ',./installation/cdrom.*,,gp'
+CDRELEASE_EXCLUDE+= -s ',./installation/cdrom.*,,gp'
.endif
.if defined(CDRELEASE_NODEBUG)
CDRELEASE_EXCLUDE+= -s ',./binary/sets/debug.tgz,,gp'
Index: src/distrib/common/bootimage/Makefile.installimage
diff -u src/distrib/common/bootimage/Makefile.installimage:1.10 src/distrib/common/bootimage/Makefile.installimage:1.10.2.1
--- src/distrib/common/bootimage/Makefile.installimage:1.10 Sat Sep 25 21:26:03 2021
+++ src/distrib/common/bootimage/Makefile.installimage Sat May 11 14:31:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.installimage,v 1.10 2021/09/25 21:26:03 maya Exp $
+# $NetBSD: Makefile.installimage,v 1.10.2.1 2024/05/11 14:31:57 martin Exp $
#
# Common Makefile to create a bootable installation image for USB flash etc.
#
@@ -46,7 +46,8 @@ DISKPROTO_IN?= ${NETBSDSRCDIR}/distrib/c
# XXX: no permission info for makefs(8)
IMGDIR_EXTRA= ${RELEASEDIR}/${RELEASEMACHINEDIR} ${RELEASEMACHINEDIR}
-IMGDIR_EXCLUDE= -s ',./installation/cdrom.*,,gp'
+IMGDIR_EXCLUDE+= -s ',./installation/floppy/.*,,gp'
+IMGDIR_EXCLUDE+= -s ',./installation/cdrom.*,,gp'
IMGDIR_EXCLUDE+= -s ',./installation/liveimage.*,,gp'
IMGDIR_EXCLUDE+= -s ',./installation/installimage.*,,gp'
.if defined(MD_IMGDIR_EXCLUDE)
Index: src/distrib/i386/cdroms/installcd/Makefile
diff -u src/distrib/i386/cdroms/installcd/Makefile:1.10 src/distrib/i386/cdroms/installcd/Makefile:1.10.8.1
--- src/distrib/i386/cdroms/installcd/Makefile:1.10 Mon Sep 23 13:42:33 2019
+++ src/distrib/i386/cdroms/installcd/Makefile Sat May 11 14:31:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/09/23 13:42:33 christos Exp $
+# $NetBSD: Makefile,v 1.10.8.1 2024/05/11 14:31:57 martin Exp $
#
# Install CD, to be made after 'build.sh release'
@@ -13,6 +13,21 @@ CDRELEASE_NODEBUG= true
CDBUILDEXTRA+= boot.cfg # Add boot.cfg file
CLEANFILES+= boot.cfg
+# already (probably) booting from CD if using this and the floppy images
+# are 20MB+ when combined
+CDRELEASE_EXCLUDE+= -s ',./installation/floppy/.*,,gp'
+
+# MONOLITHIC (i386-only) was originally added to the release build
+# for upgrades from netbsd-5, and now primarily exists so the no-modules
+# build can continue to be tested. this takes up 20MB+ space.
+. for sufx in tgz tar.xz
+CDRELEASE_EXCLUDE+= -s ',./binary/sets/kern-INSTALL.${sufx},,gp'
+CDRELEASE_EXCLUDE+= -s ',./binary/sets/kern-MONOLITHIC.${sufx},,gp'
+. endfor
+
+CDRELEASE_EXCLUDE+= -s ',./binary/kernel/netbsd-INSTALL.gz,,gp'
+CDRELEASE_EXCLUDE+= -s ',./binary/kernel/netbsd-MONOLITHIC.gz,,gp'
+
prepare_md_post:
${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" < ${.CURDIR}/boot.cfg.in > boot.cfg
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1289.2.3 src/share/mk/bsd.own.mk:1.1289.2.4
--- src/share/mk/bsd.own.mk:1.1289.2.3 Thu Apr 18 15:21:55 2024
+++ src/share/mk/bsd.own.mk Sat May 11 14:31:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1289.2.3 2024/04/18 15:21:55 martin Exp $
+# $NetBSD: bsd.own.mk,v 1.1289.2.4 2024/05/11 14:31:57 martin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1250,7 +1250,6 @@ MKRADEONFIRMWARE.x86_64= yes
MKRADEONFIRMWARE.i386= yes
MKRADEONFIRMWARE.aarch64= yes
MKAMDGPUFIRMWARE.x86_64= yes
-MKAMDGPUFIRMWARE.i386= yes
# Only install the tegra firmware on evbarm.
MKTEGRAFIRMWARE.evbarm= yes
Index: src/sys/arch/i386/conf/LEGACY
diff -u src/sys/arch/i386/conf/LEGACY:1.1 src/sys/arch/i386/conf/LEGACY:1.1.54.1
--- src/sys/arch/i386/conf/LEGACY:1.1 Sat Mar 7 07:28:37 2015
+++ src/sys/arch/i386/conf/LEGACY Sat May 11 14:31:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: LEGACY,v 1.1 2015/03/07 07:28:37 mrg Exp $
+# $NetBSD: LEGACY,v 1.1.54.1 2024/05/11 14:31:56 martin Exp $
# LEGACY kernel -- includes vga@isa and pcdisplay@isa for pre-PCI
# systems, due to significant pain making them fail to attach when
@@ -12,3 +12,12 @@ wsdisplay* at pcdisplay? console ?
# XXX we could turn off all sorts of other modern features in this
# configuration, but that is left for future work.
+
+no i915drmkms* at pci?
+no intelfb* at intelfbbus?
+
+no radeon* at pci?
+no radeondrmkmsfb* at radeonfbbus?
+
+no nouveau* at pci?
+no nouveaufb* at nouveaufbbus?
