[Glibc-bsd-commits] r2211 - in trunk/kfreebsd-7/debian: . arch/amd64 arch/i386

ps-guest at alioth.debian.org ps-guest at alioth.debian.org
Tue Jul 8 07:44:13 UTC 2008 

Author: ps-guest
Date: 2008-07-08 07:44:12 +0000 (Tue, 08 Jul 2008)
New Revision: 2211

Added:
   trunk/kfreebsd-7/debian/arch/amd64/amd64.config
   trunk/kfreebsd-7/debian/control.compat.in
Removed:
   trunk/kfreebsd-7/debian/arch/amd64/amd64-generic.config
   trunk/kfreebsd-7/debian/arch/amd64/amd64-k8-smp.config
   trunk/kfreebsd-7/debian/arch/amd64/amd64-k8.config
   trunk/kfreebsd-7/debian/arch/amd64/em64t-p4-smp.config
   trunk/kfreebsd-7/debian/arch/amd64/em64t-p4.config
   trunk/kfreebsd-7/debian/arch/i386/586-smp.config
   trunk/kfreebsd-7/debian/arch/i386/586.config
Modified:
   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/rules
Log:
* Reduce number of kernel-image flavours



Deleted: trunk/kfreebsd-7/debian/arch/amd64/amd64-generic.config
===================================================================
--- trunk/kfreebsd-7/debian/arch/amd64/amd64-generic.config	2008-07-07 17:00:49 UTC (rev 2210)
+++ trunk/kfreebsd-7/debian/arch/amd64/amd64-generic.config	2008-07-08 07:44:12 UTC (rev 2211)
@@ -1,5 +0,0 @@
-# Kernel for Debian GNU/kFreeBSD on all x86-64 machines
-
-include		GENERIC
-cpu		HAMMER
-ident		Debian-amd64-generic

Deleted: trunk/kfreebsd-7/debian/arch/amd64/amd64-k8-smp.config
===================================================================
--- trunk/kfreebsd-7/debian/arch/amd64/amd64-k8-smp.config	2008-07-07 17:00:49 UTC (rev 2210)
+++ trunk/kfreebsd-7/debian/arch/amd64/amd64-k8-smp.config	2008-07-08 07:44:12 UTC (rev 2211)
@@ -1,9 +0,0 @@
-# Kernel for Debian GNU/kFreeBSD on AMD64 K8 SMP machines
-
-include		GENERIC
-cpu		HAMMER
-makeoptions	COPTFLAGS="-O2 -frename-registers -pipe -march=k8"
-ident		Debian-amd64-k8-SMP
-
-options		SMP		# Symmetric MultiProcessor Kernel
-options		ALTQ_NOPCC	# Required for SMP build

Deleted: trunk/kfreebsd-7/debian/arch/amd64/amd64-k8.config
===================================================================
--- trunk/kfreebsd-7/debian/arch/amd64/amd64-k8.config	2008-07-07 17:00:49 UTC (rev 2210)
+++ trunk/kfreebsd-7/debian/arch/amd64/amd64-k8.config	2008-07-08 07:44:12 UTC (rev 2211)
@@ -1,6 +0,0 @@
-# Kernel for Debian GNU/kFreeBSD on AMD64 K8 machines
-
-include		GENERIC
-cpu		HAMMER
-makeoptions	COPTFLAGS="-O2 -frename-registers -pipe -march=k8"
-ident		Debian-amd64-k8

Added: trunk/kfreebsd-7/debian/arch/amd64/amd64.config
===================================================================
--- trunk/kfreebsd-7/debian/arch/amd64/amd64.config	                        (rev 0)
+++ trunk/kfreebsd-7/debian/arch/amd64/amd64.config	2008-07-08 07:44:12 UTC (rev 2211)
@@ -0,0 +1,8 @@
+# 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

Deleted: trunk/kfreebsd-7/debian/arch/amd64/em64t-p4-smp.config
===================================================================
--- trunk/kfreebsd-7/debian/arch/amd64/em64t-p4-smp.config	2008-07-07 17:00:49 UTC (rev 2210)
+++ trunk/kfreebsd-7/debian/arch/amd64/em64t-p4-smp.config	2008-07-08 07:44:12 UTC (rev 2211)
@@ -1,9 +0,0 @@
-# Kernel for Debian GNU/kFreeBSD on Intel em64t P4 SMP machines
-
-include		GENERIC
-cpu		HAMMER
-makeoptions	COPTFLAGS="-O2 -frename-registers -pipe -march=nocona"
-ident		Debian-em64t-p4-SMP
-
-options		SMP		# Symmetric MultiProcessor Kernel
-options		ALTQ_NOPCC	# Required for SMP build

Deleted: trunk/kfreebsd-7/debian/arch/amd64/em64t-p4.config
===================================================================
--- trunk/kfreebsd-7/debian/arch/amd64/em64t-p4.config	2008-07-07 17:00:49 UTC (rev 2210)
+++ trunk/kfreebsd-7/debian/arch/amd64/em64t-p4.config	2008-07-08 07:44:12 UTC (rev 2211)
@@ -1,6 +0,0 @@
-# Kernel for Debian GNU/kFreeBSD on Intel em64t P4 machines
-
-include		GENERIC
-cpu		HAMMER
-makeoptions	COPTFLAGS="-O2 -frename-registers -pipe -march=nocona"
-ident		Debian-em64t-p4

Modified: trunk/kfreebsd-7/debian/arch/i386/486.config
===================================================================
--- trunk/kfreebsd-7/debian/arch/i386/486.config	2008-07-07 17:00:49 UTC (rev 2210)
+++ trunk/kfreebsd-7/debian/arch/i386/486.config	2008-07-08 07:44:12 UTC (rev 2211)
@@ -4,7 +4,7 @@
 cpu		I486_CPU
 cpu		I586_CPU
 cpu		I686_CPU
-makeoptions	COPTFLAGS="-Os -frename-registers -pipe -march=i486"
+makeoptions	COPTFLAGS="-Os -frename-registers -pipe -march=i486 -mtune=i486"
 ident		Debian-i486
 
 # Xbox support

Deleted: trunk/kfreebsd-7/debian/arch/i386/586-smp.config
===================================================================
--- trunk/kfreebsd-7/debian/arch/i386/586-smp.config	2008-07-07 17:00:49 UTC (rev 2210)
+++ trunk/kfreebsd-7/debian/arch/i386/586-smp.config	2008-07-08 07:44:12 UTC (rev 2211)
@@ -1,10 +0,0 @@
-# Kernel for Debian GNU/kFreeBSD on an i586 SMP machine
-
-include		GENERIC
-cpu		I586_CPU
-cpu		I686_CPU
-makeoptions	COPTFLAGS="-Os -frename-registers -pipe -march=i586"
-ident		Debian-i586-SMP
-
-options		SMP		# Symmetric MultiProcessor Kernel
-options		ALTQ_NOPCC	# Required for SMP build

Deleted: trunk/kfreebsd-7/debian/arch/i386/586.config
===================================================================
--- trunk/kfreebsd-7/debian/arch/i386/586.config	2008-07-07 17:00:49 UTC (rev 2210)
+++ trunk/kfreebsd-7/debian/arch/i386/586.config	2008-07-08 07:44:12 UTC (rev 2211)
@@ -1,7 +0,0 @@
-# Kernel for Debian GNU/kFreeBSD on an i586 machine
-
-include		GENERIC
-cpu		I586_CPU
-cpu		I686_CPU
-makeoptions	COPTFLAGS="-Os -frename-registers -pipe -march=i586"
-ident		Debian-i586

Modified: trunk/kfreebsd-7/debian/arch/i386/686-smp.config
===================================================================
--- trunk/kfreebsd-7/debian/arch/i386/686-smp.config	2008-07-07 17:00:49 UTC (rev 2210)
+++ trunk/kfreebsd-7/debian/arch/i386/686-smp.config	2008-07-08 07:44:12 UTC (rev 2211)
@@ -2,7 +2,7 @@
 
 include		GENERIC
 cpu		I686_CPU
-makeoptions	COPTFLAGS="-O2 -frename-registers -pipe -march=i686"
+makeoptions	COPTFLAGS="-O2 -frename-registers -pipe -march=i686 -mtune=default"
 ident		Debian-i686-SMP
 
 options		SMP		# Symmetric MultiProcessor Kernel

Modified: trunk/kfreebsd-7/debian/arch/i386/686.config
===================================================================
--- trunk/kfreebsd-7/debian/arch/i386/686.config	2008-07-07 17:00:49 UTC (rev 2210)
+++ trunk/kfreebsd-7/debian/arch/i386/686.config	2008-07-08 07:44:12 UTC (rev 2211)
@@ -2,7 +2,7 @@
 
 include		GENERIC
 cpu		I686_CPU
-makeoptions	COPTFLAGS="-O2 -frename-registers -pipe -march=i686"
+makeoptions	COPTFLAGS="-O2 -frename-registers -pipe -march=i686 -mtune=default"
 ident		Debian-i686
 
 # Xbox support

Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog	2008-07-07 17:00:49 UTC (rev 2210)
+++ trunk/kfreebsd-7/debian/changelog	2008-07-08 07:44:12 UTC (rev 2211)
@@ -5,6 +5,7 @@
      - update of some patches
      - refresh remaining patches
      - 030_abi_cld.diff and 000_tcp.diff applied upstream
+  * Reduce number of kernel-image flavours
 
   [ Aurelien Jarno ]
   * Build by gcc-4.3

Added: trunk/kfreebsd-7/debian/control.compat.in
===================================================================
--- trunk/kfreebsd-7/debian/control.compat.in	                        (rev 0)
+++ trunk/kfreebsd-7/debian/control.compat.in	2008-07-08 07:44:12 UTC (rev 2211)
@@ -0,0 +1,9 @@
+Package: kfreebsd-image- at major@- at flavor@
+Architecture: kfreebsd- at arch@
+Section: base
+Depends: kfreebsd-image- at major@- at compatflavor@
+Description: kernel of FreeBSD @major@ image (transitional package)
+ This package used to depend on the latest binary image for kernel 
+ of FreeBSD @major@ on @flavor at -class machines. Now it is only empty 
+ package to facilitate upgrades, can be safely removed.
+  

Modified: trunk/kfreebsd-7/debian/rules
===================================================================
--- trunk/kfreebsd-7/debian/rules	2008-07-07 17:00:49 UTC (rev 2210)
+++ trunk/kfreebsd-7/debian/rules	2008-07-08 07:44:12 UTC (rev 2211)
@@ -41,6 +41,15 @@
 				$(CURDIR)/debian/control.flavor.in >> $(CURDIR)/debian/control ; \
 		done ; \
 	done
+	# create compat for dropped images
+	for flavor in 586 586-smp ; do \
+		sed -e "s/@major@/$(major)/g" -e "s/@flavor@/$$flavor/g" -e "s/@arch@/i386/g" -e "s/@compatflavor@/486/g" \
+			$(CURDIR)/debian/control.compat.in >> $(CURDIR)/debian/control ; \
+	done
+	for flavor in amd64-generic amd64-k8-smp amd64-k8 em64t-p4-smp em64t-p4 ; do \
+		sed -e "s/@major@/$(major)/g" -e "s/@flavor@/$$flavor/g" -e "s/@arch@/amd64/g" -e "s/@compatflavor@/amd64/g" \
+			$(CURDIR)/debian/control.compat.in >> $(CURDIR)/debian/control ; \
+	done
 
 clean:
 	dh_testdir

More information about the Glibc-bsd-commits mailing list