[oe-commits] org.oe.dev merge of '28f5b60141cb1b866dcc89f47a6599c6b64dfbc0'

koen commit openembedded-commits at lists.openembedded.org
Fri Dec 28 16:46:46 UTC 2007 

merge of '28f5b60141cb1b866dcc89f47a6599c6b64dfbc0'
     and 'd322189b0c434dffdfdb6b22847f6660c0e95ac6'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 2375d2fb670fe2ce998bde5533f4ef0498268ca5
ViewMTN: http://monotone.openembedded.org/revision/info/2375d2fb670fe2ce998bde5533f4ef0498268ca5
Files:
1
packages/altboot/altboot_1.1.1+wip-SVNR70.bb
packages/altboot/altboot_1.1.1+wip-SVNR73.bb
packages/uboot
packages/u-boot
packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb
packages/u-boot/u-boot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb
packages/uboot/uboot-openmoko_svn.bb
packages/u-boot/u-boot-openmoko_svn.bb
packages/u-boot/files/boot-menu-gfx-fix-openmoko-bug-1140.patch
conf/distro/include/moko-autorev.inc
packages/linux/linux-rp-2.6.23/defconfig-akita
packages/linux/linux-rp-2.6.23/defconfig-bootcdx86
packages/linux/linux-rp-2.6.23/defconfig-c7x0
packages/linux/linux-rp-2.6.23/defconfig-collie
packages/linux/linux-rp-2.6.23/defconfig-htcuniversal
packages/linux/linux-rp-2.6.23/defconfig-hx2000
packages/linux/linux-rp-2.6.23/defconfig-poodle
packages/linux/linux-rp-2.6.23/defconfig-qemuarm
packages/linux/linux-rp-2.6.23/defconfig-qemux86
packages/linux/linux-rp-2.6.23/defconfig-spitz
packages/linux/linux-rp-2.6.23/defconfig-tosa
packages/linux/linux-rp-2.6.23/defconfig-zylonite
packages/linux/linux-rp_2.6.23.bb
packages/settings-daemon/settings-daemon_svn.bb
packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb
conf/distro/angstrom-2007.1.conf
Diffs:

#
# mt diff -r28f5b60141cb1b866dcc89f47a6599c6b64dfbc0 -r2375d2fb670fe2ce998bde5533f4ef0498268ca5
#
# 
# 
# rename "packages/altboot/altboot_1.1.1+wip-SVNR70.bb"
#     to "packages/altboot/altboot_1.1.1+wip-SVNR73.bb"
# 
# rename "packages/uboot"
#     to "packages/u-boot"
# 
# rename "packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb"
#     to "packages/u-boot/u-boot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb"
# 
# rename "packages/uboot/uboot-openmoko_svn.bb"
#     to "packages/u-boot/u-boot-openmoko_svn.bb"
# 
# add_file "packages/u-boot/files/boot-menu-gfx-fix-openmoko-bug-1140.patch"
#  content [f687bd2f045dfad3693848409d187f63acdfd151]
# 
# patch "conf/distro/include/moko-autorev.inc"
#  from [936fa5b0bafa49c816782957d4d6d7de12cee042]
#    to [bfb54642af40a5440c951be6f7f4845770a7fb31]
# 
# patch "packages/altboot/altboot_1.1.1+wip-SVNR73.bb"
#  from [d8549450283b67303bed9444e9ce7b672b4ef6b7]
#    to [96164c033b2c0fe28e30604b817aa4dfddcaae1d]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-akita"
#  from [ed35da5229e83c9d708876e35f815fd973a327b6]
#    to [e4ed8aa2e8093b76623a986e828f10bcc2ee9a67]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-bootcdx86"
#  from [fa2eb19850b6a1ebfd945edbc77af349a38f2833]
#    to [ad21acaef2a04655c65928c765b511e82a59ee04]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-c7x0"
#  from [1245c4d3084a0f248fe10f90a1ef8eb1c2866f91]
#    to [dc7dade2dad1f3057a7bb05ff620280d43d30cc2]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-collie"
#  from [9ffd9b1fadb6288179b7b23413e91d4eb9442460]
#    to [4b6d1891ba1feafa723b5a6a989e8a5180fd7fb0]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-htcuniversal"
#  from [e857690d16edf59ddfac6eb26161fe53e4ed9699]
#    to [e45c9a16da1338ba1c0c3729abb87c3bca1b6b28]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-hx2000"
#  from [bb743d9e1d64d7aabe5903f81e95963f04c5c72f]
#    to [1b13cda49ede5d8836faa57b966228223fb3aa26]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-poodle"
#  from [102b49ef0fabd205231bbb2cc1aa7c21d08b5000]
#    to [abff8906321b4af660f6c670ad4057da0a0f3e94]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-qemuarm"
#  from [91daad30a645e0041554eaa3129572f741f9363b]
#    to [564e3f07d9b3c03a7619acf54c7187f006914a14]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-qemux86"
#  from [9dc59c1b80636bf9fe0714da4db9b01f0129d2f4]
#    to [8ccc6e58e0e31b1ddedc5815a07efdb9b8275b77]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-spitz"
#  from [a19c44d5fdb2d5af547aa8ccaf27eec19de9371e]
#    to [8da33288c31edb805f711542d6475c386630f1f6]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-tosa"
#  from [2e5f481df13fba16a4eecee773c4d1fc587016d6]
#    to [1980d93e930a1fd5959d13384211a7f445751136]
# 
# patch "packages/linux/linux-rp-2.6.23/defconfig-zylonite"
#  from [b0d279ba0a0fa8b24c9626225ab8d48e1b615fb6]
#    to [e17aaae412fbee7e7d1ee5a63f6d5e9a14bb3cfa]
# 
# patch "packages/linux/linux-rp_2.6.23.bb"
#  from [2664bd077fcfc9c3ad9ebf64134d131fb4e95679]
#    to [8b22f93210932a77b77f1c73ea21fdfda97e9530]
# 
# patch "packages/settings-daemon/settings-daemon_svn.bb"
#  from [645f5cd35518ca1a4b650a7c494a2bed8154ac61]
#    to [f266cffda5f763fbd31050c83eb2c9e97bfcaaac]
# 
# patch "packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb"
#  from [8f9f753bc2c5c49521344050b8d6c56e4ec93404]
#    to [14ec8ad5c0ad1804acbd36d6ffacce6f3ffb4e34]
# 
# patch "packages/u-boot/u-boot-openmoko_svn.bb"
#  from [8a7b89b1fde79e94c6ddfbc706a42b171be5f547]
#    to [67ec27434d36f171aedd9fb4e06f390505792635]
# 
============================================================
--- packages/u-boot/files/boot-menu-gfx-fix-openmoko-bug-1140.patch	f687bd2f045dfad3693848409d187f63acdfd151
+++ packages/u-boot/files/boot-menu-gfx-fix-openmoko-bug-1140.patch	f687bd2f045dfad3693848409d187f63acdfd151
@@ -0,0 +1,29 @@
+--- git.orig/drivers/video/cfb_console.c	2007-12-27 00:59:35.000000000 -0800
++++ git/drivers/video/cfb_console.c	2007-12-27 08:23:42.000000000 -0800
+@@ -141,6 +141,14 @@
+ #endif
+ 
+ /*****************************************************************************/
++/* Defines for the S3C2410 driver					     */
++/*****************************************************************************/
++#ifdef CONFIG_VIDEO_S3C2410
++/* it actually is little-endian, but the host CPU, too ! */
++//#define VIDEO_FB_LITTLE_ENDIAN
++#endif
++
++/*****************************************************************************/
+ /* Include video_fb.h after definitions of VIDEO_HW_RECTFILL etc	     */
+ /*****************************************************************************/
+ #include <video_fb.h>
+@@ -309,6 +317,11 @@
+ #define SHORTSWAP32(x)	 (x)
+ #endif
+ 
++#ifdef CONFIG_VIDEO_S3C2410
++#undef SHORTSWAP32
++#define	SHORTSWAP32(x)	((((x) & 0xffff) << 16) | (((x) >> 16) & 0xffff))
++#endif
++
+ #if defined(DEBUG) || defined(DEBUG_CFB_CONSOLE)
+ #define PRINTD(x)	  printf(x)
+ #else
============================================================
--- conf/distro/include/moko-autorev.inc	936fa5b0bafa49c816782957d4d6d7de12cee042
+++ conf/distro/include/moko-autorev.inc	bfb54642af40a5440c951be6f7f4845770a7fb31
@@ -44,7 +44,7 @@ SRCREV_pn-openocd-native ?= "${AUTOREV}"
 SRCREV_pn-openocd ?= "${AUTOREV}"
 SRCREV_pn-openocd-native ?= "${AUTOREV}"
 
-SRCREV_pn-uboot-openmoko ?= "${AUTOREV}"
+SRCREV_pn-u-boot-openmoko ?= "${AUTOREV}"
 SRCREV_pn-dfu-util ?= "${AUTOREV}"
 SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
 SRCREV_pn-usbpath ?= "${AUTOREV}"
============================================================
--- packages/altboot/altboot_1.1.1+wip-SVNR70.bb	d8549450283b67303bed9444e9ce7b672b4ef6b7
+++ packages/altboot/altboot_1.1.1+wip-SVNR73.bb	96164c033b2c0fe28e30604b817aa4dfddcaae1d
@@ -1,8 +1,8 @@ PR = "r0"
 require altboot.inc
 
 PR = "r0"
 
-SVN_REV = "70"
+SVN_REV = "73"
 SRC_URI = "svn://hentges.net/public/altboot;module=trunk;rev=${SVN_REV} \
 	  "
 
============================================================
--- packages/linux/linux-rp-2.6.23/defconfig-akita	ed35da5229e83c9d708876e35f815fd973a327b6
+++ packages/linux/linux-rp-2.6.23/defconfig-akita	e4ed8aa2e8093b76623a986e828f10bcc2ee9a67
@@ -347,14 +347,59 @@ CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_NETLINK is not set
 # CONFIG_NF_CONNTRACK_ENABLED is not set
 # CONFIG_NF_CONNTRACK is not set
-# CONFIG_NETFILTER_XTABLES is not set
+CONFIG_NETFILTER_XTABLES=m
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
 
 #
 # IP: Netfilter Configuration
 #
 CONFIG_IP_NF_QUEUE=m
-# CONFIG_IP_NF_IPTABLES is not set
-# CONFIG_IP_NF_ARPTABLES is not set
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
 
 #
 # IPv6: Netfilter Configuration (EXPERIMENTAL)
@@ -1115,7 +1160,7 @@ CONFIG_HID_SUPPORT=y
 # CONFIG_SOUND_PRIME is not set
 CONFIG_AC97_BUS=m
 CONFIG_HID_SUPPORT=y
-CONFIG_HID=y
+CONFIG_HID=m
 # CONFIG_HID_DEBUG is not set
 
 #
============================================================
--- packages/linux/linux-rp-2.6.23/defconfig-bootcdx86	fa2eb19850b6a1ebfd945edbc77af349a38f2833
+++ packages/linux/linux-rp-2.6.23/defconfig-bootcdx86	ad21acaef2a04655c65928c765b511e82a59ee04
@@ -349,9 +349,71 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETFILTER is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
 
 #
+# Core Netfilter Configuration
+#
+# CONFIG_NETFILTER_NETLINK is not set
+# CONFIG_NF_CONNTRACK_ENABLED is not set
+# CONFIG_NF_CONNTRACK is not set
+CONFIG_NETFILTER_XTABLES=m
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+
+#
 # DCCP Configuration (EXPERIMENTAL)
 #
 # CONFIG_IP_DCCP is not set
@@ -1368,7 +1430,7 @@ CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_FS is not set
+CONFIG_EXT3_FS=m
 # CONFIG_EXT4DEV_FS is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
@@ -1436,7 +1498,7 @@ CONFIG_RAMFS=y
 #
 # Network File Systems
 #
-# CONFIG_NFS_FS is not set
+CONFIG_NFS_FS=y
 # CONFIG_NFSD is not set
 # CONFIG_SMB_FS is not set
 # CONFIG_CIFS is not set
============================================================
--- packages/linux/linux-rp-2.6.23/defconfig-c7x0	1245c4d3084a0f248fe10f90a1ef8eb1c2866f91
+++ packages/linux/linux-rp-2.6.23/defconfig-c7x0	dc7dade2dad1f3057a7bb05ff620280d43d30cc2
@@ -361,14 +361,59 @@ CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_NETLINK is not set
 # CONFIG_NF_CONNTRACK_ENABLED is not set
 # CONFIG_NF_CONNTRACK is not set
-# CONFIG_NETFILTER_XTABLES is not set
+CONFIG_NETFILTER_XTABLES=m
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
 
 #
 # IP: Netfilter Configuration
 #
 CONFIG_IP_NF_QUEUE=m
-# CONFIG_IP_NF_IPTABLES is not set
-# CONFIG_IP_NF_ARPTABLES is not set
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
 
 #
 # IPv6: Netfilter Configuration (EXPERIMENTAL)
@@ -1396,7 +1441,7 @@ CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_FS is not set
+CONFIG_EXT3_FS=m
 # CONFIG_EXT4DEV_FS is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
============================================================
--- packages/linux/linux-rp-2.6.23/defconfig-collie	9ffd9b1fadb6288179b7b23413e91d4eb9442460
+++ packages/linux/linux-rp-2.6.23/defconfig-collie	4b6d1891ba1feafa723b5a6a989e8a5180fd7fb0
@@ -326,12 +326,60 @@ CONFIG_NETFILTER=y
 #
 # CONFIG_NETFILTER_NETLINK is not set
 # CONFIG_NF_CONNTRACK_ENABLED is not set
-# CONFIG_NETFILTER_XTABLES is not set
+# CONFIG_NF_CONNTRACK is not set
+CONFIG_NETFILTER_XTABLES=m
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
 
 #
 # IP: Netfilter Configuration
 #
 CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_MANGLE=m
+%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -rd322189b0c434dffdfdb6b22847f6660c0e95ac6 -r2375d2fb670fe2ce998bde5533f4ef0498268ca5
#
# 
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [4db8dbf03e1191f658c8c81598c6299b3daa281b]
#    to [62c9fe4233d8ba12cb368d90400784630b8d4641]
# 
============================================================
--- conf/distro/angstrom-2007.1.conf	4db8dbf03e1191f658c8c81598c6299b3daa281b
+++ conf/distro/angstrom-2007.1.conf	62c9fe4233d8ba12cb368d90400784630b8d4641
@@ -6,7 +6,11 @@
 #@MAINTAINER: Michael 'Mickey' Lauer <mickey at Vanille.de>
 #@--------------------------------------------------------------------
 
-# The release will the 2007.12
+# If you want to use the angstrom 2007.12 release or if
+# you want to base you distro on angstrom 2007, switch to
+# the org.openembedded.angstrom-2007.12-stable branch
+# THIS FILE WILL GO AWAY IN JANUARY 2008!!
+
 DISTRO_VERSION = "2007.11RC3"
 DISTRO_REVISION = "51"

More information about the Openembedded-commits mailing list