[pkg-fso-commits] [SCM] linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko branch, debian, updated. debian/20081103.git7172ec57-2-4-g0a3dfbc

[Luca Capello]

The following commit has been merged in the debian branch:
commit 044dc183c48dd681740901b5e84ae2dd28f6d4fa
Author: Luca Capello <luca at pca.it>
Date:   Thu Feb 5 16:38:07 2009 +0100

    debian/config.gta02: new file

diff --git a/debian/changelog b/debian/changelog
index 8fb43ca..ecddef7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ linux-2.6-openmoko (20090105.git69b2aa26-1) UNRELEASED; urgency=low
       means that the Linux kernel is now at version 2.6.28.
   * debian/control:
     + s/2.6.24/2.6.28/ in binary package name and description.
+  * debian/config.gta02:
+    + new file from the /proc/config.gz of the FSO-MS5 image.
+  * debian/rules:
+    + adapt to the new location for the GTA02 config file.
 
  --
 
diff --git a/arch/arm/configs/gta02-packaging-defconfig b/debian/config.gta02
similarity index 99%
copy from arch/arm/configs/gta02-packaging-defconfig
copy to debian/config.gta02
index b44557d..88b2cff 100644
--- a/arch/arm/configs/gta02-packaging-defconfig
+++ b/debian/config.gta02
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.28-rc4
-# Wed Dec 10 11:09:39 2008
+# Mon Feb  2 17:20:13 2009
 #
 CONFIG_ARM=y
 CONFIG_HAVE_PWM=y
@@ -35,8 +35,8 @@ CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_LOCALVERSION="-mokodev"
-# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
@@ -295,7 +295,7 @@ CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_PREEMPT=y
 CONFIG_HZ=200
 CONFIG_AEABI=y
-CONFIG_OABI_COMPAT=y
+# CONFIG_OABI_COMPAT is not set
 CONFIG_ARCH_FLATMEM_HAS_HOLES=y
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
@@ -319,7 +319,7 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
+CONFIG_CMDLINE="unused -- bootloader passes ATAG list debug "
 # CONFIG_XIP_KERNEL is not set
 CONFIG_KEXEC=y
 CONFIG_ATAGS_PROC=y
@@ -337,9 +337,6 @@ CONFIG_CPU_IDLE_GOV_LADDER=y
 #
 # At least one emulation must be selected
 #
-CONFIG_FPE_NWFPE=y
-# CONFIG_FPE_NWFPE_XP is not set
-# CONFIG_FPE_FASTFPE is not set
 
 #
 # Userspace binary formats
@@ -1643,9 +1640,10 @@ CONFIG_LEDS_NEO1973_GTA02=y
 #
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=y
-# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 CONFIG_LEDS_TRIGGER_BACKLIGHT=y
 # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
+CONFIG_LEDS_TRIGGER_NETDEV=y
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
@@ -1831,7 +1829,10 @@ CONFIG_ROMFS_FS=y
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
-# CONFIG_NFS_FS is not set
+CONFIG_NFS_FS=m
+CONFIG_NFS_V3=y
+CONFIG_NFS_V3_ACL=y
+# CONFIG_NFS_V4 is not set
 CONFIG_NFSD=m
 CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
diff --git a/debian/rules b/debian/rules
index 804b936..5ab2c91 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 
 	# Configure the kernel for the Freerunner.
-	cp defconfig-gta02 .config
+	cp debian/config.gta02 .config
 	yes "" | $(MAKE) ARCH=arm oldconfig
 
 	$(MAKE) ARCH=arm EXTRAVERSION=-$(VERSION_EXTRA)

-- 
linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko