[Glibc-bsd-commits] r2255 - in trunk/kfreebsd-7/debian: . arch/amd64 arch/i386 patches
ps-guest at alioth.debian.org
ps-guest at alioth.debian.org
Thu Jul 17 08:13:05 UTC 2008
Author: ps-guest
Date: 2008-07-17 08:13:04 +0000 (Thu, 17 Jul 2008)
New Revision: 2255
Modified:
trunk/kfreebsd-7/debian/arch/amd64/amd64.config
trunk/kfreebsd-7/debian/arch/i386/486.config
trunk/kfreebsd-7/debian/arch/i386/686-smp.config
trunk/kfreebsd-7/debian/arch/i386/686.config
trunk/kfreebsd-7/debian/changelog
trunk/kfreebsd-7/debian/patches/999_config.diff
trunk/kfreebsd-7/debian/rules
Log:
* Ship config file used for building corresponding flavour
Modified: trunk/kfreebsd-7/debian/arch/amd64/amd64.config
===================================================================
--- trunk/kfreebsd-7/debian/arch/amd64/amd64.config 2008-07-17 07:34:15 UTC (rev 2254)
+++ trunk/kfreebsd-7/debian/arch/amd64/amd64.config 2008-07-17 08:13:04 UTC (rev 2255)
@@ -1,8 +1,10 @@
# Kernel for Debian GNU/kFreeBSD on all x86-64 machines
-include GENERIC
cpu HAMMER
ident Debian-amd64
options SMP # Symmetric MultiProcessor Kernel
options ALTQ_NOPCC # Required for SMP build
+
+
+#include GENERIC
Modified: trunk/kfreebsd-7/debian/arch/i386/486.config
===================================================================
--- trunk/kfreebsd-7/debian/arch/i386/486.config 2008-07-17 07:34:15 UTC (rev 2254)
+++ trunk/kfreebsd-7/debian/arch/i386/486.config 2008-07-17 08:13:04 UTC (rev 2255)
@@ -1,6 +1,5 @@
# Kernel for Debian GNU/kFreeBSD on an i486 machine
-include GENERIC
cpu I486_CPU
cpu I586_CPU
cpu I686_CPU
@@ -11,3 +10,6 @@
options XBOX
device xboxfb
device fb
+
+
+#include GENERIC
Modified: trunk/kfreebsd-7/debian/arch/i386/686-smp.config
===================================================================
--- trunk/kfreebsd-7/debian/arch/i386/686-smp.config 2008-07-17 07:34:15 UTC (rev 2254)
+++ trunk/kfreebsd-7/debian/arch/i386/686-smp.config 2008-07-17 08:13:04 UTC (rev 2255)
@@ -1,9 +1,11 @@
# Kernel for Debian GNU/kFreeBSD on an i686 SMP machine
-include GENERIC
cpu I686_CPU
makeoptions COPTFLAGS="-O2 -frename-registers -pipe -march=i686 -mtune=default"
ident Debian-i686-SMP
options SMP # Symmetric MultiProcessor Kernel
options ALTQ_NOPCC # Required for SMP build
+
+
+#include GENERIC
Modified: trunk/kfreebsd-7/debian/arch/i386/686.config
===================================================================
--- trunk/kfreebsd-7/debian/arch/i386/686.config 2008-07-17 07:34:15 UTC (rev 2254)
+++ trunk/kfreebsd-7/debian/arch/i386/686.config 2008-07-17 08:13:04 UTC (rev 2255)
@@ -1,6 +1,5 @@
# Kernel for Debian GNU/kFreeBSD on an i686 machine
-include GENERIC
cpu I686_CPU
makeoptions COPTFLAGS="-O2 -frename-registers -pipe -march=i686 -mtune=default"
ident Debian-i686
@@ -9,3 +8,6 @@
options XBOX
device xboxfb
device fb
+
+
+#include GENERIC
Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog 2008-07-17 07:34:15 UTC (rev 2254)
+++ trunk/kfreebsd-7/debian/changelog 2008-07-17 08:13:04 UTC (rev 2255)
@@ -8,6 +8,7 @@
* Reduce number of kernel-image flavours
* Reenable ums driver in GENERIC
* Do not specify SMP in GENERIC, it is enabled on per flavour basis
+ * Ship config file used for building corresponding flavour
* libdb-dev is now a real package, build-depend only on it.
-- Aurelien Jarno <aurel32 at debian.org> Thu, 17 Jul 2008 11:11:11 +0200
Modified: trunk/kfreebsd-7/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/999_config.diff 2008-07-17 07:34:15 UTC (rev 2254)
+++ trunk/kfreebsd-7/debian/patches/999_config.diff 2008-07-17 08:13:04 UTC (rev 2255)
@@ -2,22 +2,25 @@
===================================================================
--- sys/amd64/conf/GENERIC.orig
+++ sys/amd64/conf/GENERIC
-@@ -18,13 +18,8 @@
+@@ -18,13 +18,13 @@
#
# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.484.2.10 2008/07/16 02:05:40 yongari Exp $
-cpu HAMMER
-ident GENERIC
--
++#cpu HAMMER
++#dent GENERIC
+
# To statically compile in device wiring instead of /boot/device.hints
-#hints "GENERIC.hints" # Default places to look for devices.
--
--makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
+hints "GENERIC.hints" # Default places to look for devices.
+-makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
++#makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
+
options SCHED_ULE # ULE scheduler
options PREEMPTION # Enable kernel thread preemption
-@@ -45,6 +40,8 @@
+@@ -45,6 +45,8 @@
options MSDOSFS # MSDOS Filesystem
options CD9660 # ISO 9660 Filesystem
options PROCFS # Process filesystem (requires PSEUDOFS)
@@ -26,7 +29,7 @@
options PSEUDOFS # Pseudo-filesystem framework
options GEOM_PART_GPT # GUID Partition Tables.
options GEOM_LABEL # Provides labelization
-@@ -53,7 +50,7 @@
+@@ -53,7 +55,7 @@
options COMPAT_FREEBSD4 # Compatible with FreeBSD4
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
options COMPAT_FREEBSD6 # Compatible with FreeBSD6
@@ -35,7 +38,7 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
-@@ -72,7 +69,7 @@
+@@ -72,7 +74,7 @@
options AUDIT # Security event auditing
# Make an SMP-capable kernel by default
@@ -44,7 +47,7 @@
# CPU frequency control
device cpufreq
-@@ -81,9 +78,6 @@
+@@ -81,9 +83,6 @@
device acpi
device pci
@@ -54,7 +57,7 @@
# ATA and ATAPI devices
device ata
device atadisk # ATA disk drives
-@@ -91,6 +85,8 @@
+@@ -91,6 +90,8 @@
device atapicd # ATAPI CDROM drives
device atapifd # ATAPI floppy drives
device atapist # ATAPI tape drives
@@ -63,7 +66,7 @@
options ATA_STATIC_ID # Static device numbering
# SCSI Controllers
-@@ -173,10 +169,6 @@
+@@ -173,10 +174,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -74,7 +77,7 @@
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
-@@ -249,13 +241,8 @@
+@@ -249,13 +246,8 @@
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
@@ -88,7 +91,7 @@
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -272,12 +259,9 @@
+@@ -272,12 +264,9 @@
device ugen # Generic
device uhid # "Human Interface Devices"
device ukbd # Keyboard
@@ -101,7 +104,7 @@
# USB Serial devices
device ucom # Generic com ttys
device uark # Technologies ARK3116 based serial adapters
-@@ -304,3 +288,11 @@
+@@ -304,3 +293,11 @@
device fwip # IP over FireWire (RFC 2734,3146)
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
@@ -117,7 +120,7 @@
===================================================================
--- sys/i386/conf/GENERIC.orig
+++ sys/i386/conf/GENERIC
-@@ -18,15 +18,8 @@
+@@ -18,15 +18,15 @@
#
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.474.2.10 2008/07/16 02:05:40 yongari Exp $
@@ -125,16 +128,21 @@
-cpu I586_CPU
-cpu I686_CPU
-ident GENERIC
--
++#cpu I486_CPU
++#cpu I586_CPU
++#cpu I686_CPU
++#ident GENERIC
+
# To statically compile in device wiring instead of /boot/device.hints
-#hints "GENERIC.hints" # Default places to look for devices.
--
--makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
+hints "GENERIC.hints" # Default places to look for devices.
+-makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
++#makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
+
options SCHED_ULE # ULE scheduler
options PREEMPTION # Enable kernel thread preemption
-@@ -46,6 +39,8 @@
+@@ -46,6 +46,8 @@
options MSDOSFS # MSDOS Filesystem
options CD9660 # ISO 9660 Filesystem
options PROCFS # Process filesystem (requires PSEUDOFS)
@@ -143,7 +151,7 @@
options PSEUDOFS # Pseudo-filesystem framework
options GEOM_PART_GPT # GUID Partition Tables.
options GEOM_LABEL # Provides labelization
-@@ -53,7 +48,7 @@
+@@ -53,7 +55,7 @@
options COMPAT_FREEBSD4 # Compatible with FreeBSD4
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
options COMPAT_FREEBSD6 # Compatible with FreeBSD6
@@ -152,7 +160,7 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
-@@ -72,7 +67,7 @@
+@@ -72,7 +74,7 @@
options AUDIT # Security event auditing
# To make an SMP kernel, the next two lines are needed
@@ -161,7 +169,7 @@
device apic # I/O APIC
# CPU frequency control
-@@ -82,9 +77,6 @@
+@@ -82,9 +84,6 @@
device eisa
device pci
@@ -171,7 +179,7 @@
# ATA and ATAPI devices
device ata
device atadisk # ATA disk drives
-@@ -92,6 +84,8 @@
+@@ -92,6 +91,8 @@
device atapicd # ATAPI CDROM drives
device atapifd # ATAPI floppy drives
device atapist # ATAPI tape drives
@@ -180,7 +188,7 @@
options ATA_STATIC_ID # Static device numbering
# SCSI Controllers
-@@ -184,10 +178,6 @@
+@@ -184,10 +185,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -191,7 +199,7 @@
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
-@@ -263,13 +253,8 @@
+@@ -263,13 +260,8 @@
device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
@@ -205,7 +213,7 @@
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -286,13 +271,10 @@
+@@ -286,13 +278,10 @@
device ugen # Generic
device uhid # "Human Interface Devices"
device ukbd # Keyboard
@@ -219,7 +227,7 @@
# USB Serial devices
device ucom # Generic com ttys
device uark # Technologies ARK3116 based serial adapters
-@@ -319,3 +301,11 @@
+@@ -319,3 +308,11 @@
device fwip # IP over FireWire (RFC 2734,3146)
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
Modified: trunk/kfreebsd-7/debian/rules
===================================================================
--- trunk/kfreebsd-7/debian/rules 2008-07-17 07:34:15 UTC (rev 2254)
+++ trunk/kfreebsd-7/debian/rules 2008-07-17 08:13:04 UTC (rev 2255)
@@ -128,7 +128,8 @@
sed -i -e 's,^KODIR?=.*,KODIR="/lib/modules/$(version)-$(abiname)-$*",g' $(FLAVOR_DIR)-$*/sys/conf/kern.pre.mk
# Configure the kernel
- cp debian/arch/$(cpu)/*.config $(FLAVOR_DIR)-$*/sys/$(cpu)/conf/
+ cp debian/arch/$(cpu)/$*.config $(FLAVOR_DIR)-$*/sys/$(cpu)/conf/
+ cat $(FLAVOR_DIR)-$*/sys/$(cpu)/conf/GENERIC >> $(FLAVOR_DIR)-$*/sys/$(cpu)/conf/$*.config
ln -sf $*.config $(FLAVOR_DIR)-$*/sys/$(cpu)/conf/$(configfile)
cd $(FLAVOR_DIR)-$*/sys/$(cpu)/conf \
&& config $(configfile)
@@ -168,6 +169,11 @@
install -o root -g root -m 644 \
$(FLAVOR_DIR)-$*/sys/boot/forth/loader.conf \
$(IMAGE_PACKAGE)-$*/boot/defaults/loader.conf
+
+ # install the config file
+ install -o root -g root -m 644 \
+ $(FLAVOR_DIR)-$*/sys/$(cpu)/conf/$*.config \
+ $(IMAGE_PACKAGE)-$*/boot/config-$(version)-$(abiname)-$*
# now install the kernel
$(MAKE) -C $(FLAVOR_DIR)-$*/sys/$(cpu)/compile/$(configfile) DESTDIR=$(IMAGE_PACKAGE)-$* install
More information about the Glibc-bsd-commits
mailing list