[Glibc-bsd-commits] r2662 - in trunk/kfreebsd-8/debian: . arch/amd64 arch/i386 patches

[Aurelien Jarno]

Author: aurel32
Date: 2009-07-22 14:19:54 +0000 (Wed, 22 Jul 2009)
New Revision: 2662

Modified:
   trunk/kfreebsd-8/debian/arch/amd64/amd64.config
   trunk/kfreebsd-8/debian/arch/i386/486.config
   trunk/kfreebsd-8/debian/arch/i386/686-smp.config
   trunk/kfreebsd-8/debian/arch/i386/686.config
   trunk/kfreebsd-8/debian/changelog
   trunk/kfreebsd-8/debian/patches/999_config.diff
Log:
Merge from kfreebsd-7


Modified: trunk/kfreebsd-8/debian/arch/amd64/amd64.config
===================================================================
--- trunk/kfreebsd-8/debian/arch/amd64/amd64.config	2009-07-22 14:17:58 UTC (rev 2661)
+++ trunk/kfreebsd-8/debian/arch/amd64/amd64.config	2009-07-22 14:19:54 UTC (rev 2662)
@@ -6,5 +6,9 @@
 options		SMP		# Symmetric MultiProcessor Kernel
 options		ALTQ_NOPCC	# Required for SMP build
 
+options		COMPAT_LINUX32
+options		LINPROCFS
+options         LINSYSFS
+options		FDESCFS
 
 #include         GENERIC

Modified: trunk/kfreebsd-8/debian/arch/i386/486.config
===================================================================
--- trunk/kfreebsd-8/debian/arch/i386/486.config	2009-07-22 14:17:58 UTC (rev 2661)
+++ trunk/kfreebsd-8/debian/arch/i386/486.config	2009-07-22 14:19:54 UTC (rev 2662)
@@ -6,6 +6,11 @@
 makeoptions	COPTFLAGS="-Os -frename-registers -pipe -march=i486 -mtune=i486"
 ident		Debian-i486
 
+options		COMPAT_LINUX
+options		LINPROCFS
+options         LINSYSFS
+options		FDESCFS
+
 # Xbox support
 options 	XBOX
 device		xboxfb

Modified: trunk/kfreebsd-8/debian/arch/i386/686-smp.config
===================================================================
--- trunk/kfreebsd-8/debian/arch/i386/686-smp.config	2009-07-22 14:17:58 UTC (rev 2661)
+++ trunk/kfreebsd-8/debian/arch/i386/686-smp.config	2009-07-22 14:19:54 UTC (rev 2662)
@@ -7,5 +7,9 @@
 options		SMP		# Symmetric MultiProcessor Kernel
 options		ALTQ_NOPCC	# Required for SMP build
 
+options		COMPAT_LINUX
+options		LINPROCFS
+options         LINSYSFS
+options		FDESCFS
 
 #include		GENERIC

Modified: trunk/kfreebsd-8/debian/arch/i386/686.config
===================================================================
--- trunk/kfreebsd-8/debian/arch/i386/686.config	2009-07-22 14:17:58 UTC (rev 2661)
+++ trunk/kfreebsd-8/debian/arch/i386/686.config	2009-07-22 14:19:54 UTC (rev 2662)
@@ -4,6 +4,11 @@
 makeoptions	COPTFLAGS="-O2 -frename-registers -pipe -march=i686 -mtune=generic"
 ident		Debian-i686
 
+options		COMPAT_LINUX
+options		LINPROCFS
+options         LINSYSFS
+options		FDESCFS
+
 # Xbox support
 options 	XBOX
 device		xboxfb

Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog	2009-07-22 14:17:58 UTC (rev 2661)
+++ trunk/kfreebsd-8/debian/changelog	2009-07-22 14:19:54 UTC (rev 2662)
@@ -13,6 +13,14 @@
 
  -- Aurelien Jarno <aurel32 at debian.org>  Sun, 19 Jul 2009 17:18:23 +0200
 
+kfreebsd-7 (7.2-4) unstable; urgency=low
+
+  [ Aurelien Jarno ]
+  * Move some changes from 999_config.diff into the configuration files.
+  * Enable FDESCFS and LINSYSFS as they are always mounted at boot.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Wed, 22 Jul 2009 16:10:10 +0200
+
 kfreebsd-7 (7.2-3) unstable; urgency=low
 
   [ Petr Salinger ]

Modified: trunk/kfreebsd-8/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/999_config.diff	2009-07-22 14:17:58 UTC (rev 2661)
+++ trunk/kfreebsd-8/debian/patches/999_config.diff	2009-07-22 14:19:54 UTC (rev 2662)
@@ -24,15 +24,6 @@
  
  options 	SCHED_ULE		# ULE scheduler
  options 	PREEMPTION		# Enable kernel thread preemption
-@@ -50,6 +50,8 @@
- options 	MSDOSFS			# MSDOS Filesystem
- options 	CD9660			# ISO 9660 Filesystem
- options 	PROCFS			# Process filesystem (requires PSEUDOFS)
-+options 	LINPROCFS
-+options 	COMPAT_LINUX32
- options 	PSEUDOFS		# Pseudo-filesystem framework
- options 	GEOM_PART_GPT		# GUID Partition Tables.
- options 	GEOM_LABEL		# Provides labelization
 @@ -59,7 +61,7 @@
  options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
  options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6