[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c331896e29394556a9e620147212d52cf55e70d5 - IPFire-SCM

10 Nov 2010

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
       via  c331896e29394556a9e620147212d52cf55e70d5 (commit)
       via  fb1729a9cac8d5ffd92313fd2c2b35951626f04b (commit)
       via  78a51aafa5ec9aea289e5de908f77e6954c93894 (commit)
      from  89e7a0f529a1dba49084faa01ef06aeb9e9dc0ff (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c331896e29394556a9e620147212d52cf55e70d5
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Wed Nov 10 22:00:05 2010 +0100
Enabled build on x86_64 machines.
commit fb1729a9cac8d5ffd92313fd2c2b35951626f04b
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Wed Nov 10 21:44:46 2010 +0100
cdrtoos: rootfile update.
commit 78a51aafa5ec9aea289e5de908f77e6954c93894
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Mon Nov 8 12:18:08 2010 +0100
Kernel: Enabled IPV6 at build and disabled at runtime.
-----------------------------------------------------------------------
Summary of changes:
 config/kernel/kernel.config.i586-ipfire     |   78 +++++++++++++++++++-
 config/kernel/kernel.config.i586-ipfire-pae |   76 +++++++++++++++++++-
 config/kernel/kernel.config.i586-ipfire-xen |   76 +++++++++++++++++++-
 config/rootfiles/common/cdrtools            |    4 +
 config/rootfiles/common/linux               |  103 +++++++++------------------
 config/rootfiles/packages/linux-pae         |   34 +++++++++
 config/rootfiles/packages/linux-xen         |  101 +++++++++-----------------
 lfs/linux                                   |    4 +
 make.sh                                     |   14 +++-
 tools/make-functions                        |    6 +-
 10 files changed, 345 insertions(+), 151 deletions(-)
Difference in files:

diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index 9e27f08..3be9bc6 100644
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32.25
-# Sat Oct 30 11:06:16 2010
+# Thu Nov  4 13:33:56 2010
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -587,7 +587,26 @@ CONFIG_TCP_CONG_ILLINOIS=m
 CONFIG_DEFAULT_RENO=y
 CONFIG_DEFAULT_TCP_CONG="reno"
 # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IPV6 is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+# CONFIG_IPV6_SUBTREES is not set
+# CONFIG_IPV6_MROUTE is not set
 # CONFIG_NETWORK_SECMARK is not set
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
@@ -673,7 +692,36 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_TIME=m
 CONFIG_NETFILTER_XT_MATCH_U32=m
 CONFIG_NETFILTER_XT_MATCH_OSF=m
-# CONFIG_IP_VS is not set
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+# CONFIG_IP_VS_PROTO_TCP is not set
+# CONFIG_IP_VS_PROTO_UDP is not set
+# CONFIG_IP_VS_PROTO_ESP is not set
+# CONFIG_IP_VS_PROTO_AH is not set
+
+#
+# IPVS scheduler
+#
+# CONFIG_IP_VS_RR is not set
+# CONFIG_IP_VS_WRR is not set
+# CONFIG_IP_VS_LC is not set
+# CONFIG_IP_VS_WLC is not set
+# CONFIG_IP_VS_LBLC is not set
+# CONFIG_IP_VS_LBLCR is not set
+# CONFIG_IP_VS_DH is not set
+# CONFIG_IP_VS_SH is not set
+# CONFIG_IP_VS_SED is not set
+# CONFIG_IP_VS_NQ is not set
+
+#
+# IPVS application helper
+#
#
 # IP: Netfilter Configuration
@@ -717,6 +765,27 @@ CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_IP_NF_MATCH_IPP2P=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_QUEUE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -725,6 +794,7 @@ CONFIG_BRIDGE_EBT_802_3=m
 CONFIG_BRIDGE_EBT_AMONG=m
 CONFIG_BRIDGE_EBT_ARP=m
 CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
 CONFIG_BRIDGE_EBT_LIMIT=m
 CONFIG_BRIDGE_EBT_MARK=m
 CONFIG_BRIDGE_EBT_PKTTYPE=m
@@ -809,7 +879,7 @@ CONFIG_NET_CLS_U32=m
 CONFIG_CLS_U32_PERF=y
 CONFIG_CLS_U32_MARK=y
 CONFIG_NET_CLS_RSVP=m
-# CONFIG_NET_CLS_RSVP6 is not set
+CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_CLS_FLOW=m
 CONFIG_NET_EMATCH=y
 CONFIG_NET_EMATCH_STACK=32
diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae
index f0dee5a..741b73a 100644
--- a/config/kernel/kernel.config.i586-ipfire-pae
+++ b/config/kernel/kernel.config.i586-ipfire-pae
@@ -592,7 +592,26 @@ CONFIG_TCP_CONG_ILLINOIS=m
 CONFIG_DEFAULT_RENO=y
 CONFIG_DEFAULT_TCP_CONG="reno"
 # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IPV6 is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+# CONFIG_IPV6_SUBTREES is not set
+# CONFIG_IPV6_MROUTE is not set
 # CONFIG_NETWORK_SECMARK is not set
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
@@ -678,7 +697,36 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_TIME=m
 CONFIG_NETFILTER_XT_MATCH_U32=m
 CONFIG_NETFILTER_XT_MATCH_OSF=m
-# CONFIG_IP_VS is not set
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+# CONFIG_IP_VS_PROTO_TCP is not set
+# CONFIG_IP_VS_PROTO_UDP is not set
+# CONFIG_IP_VS_PROTO_ESP is not set
+# CONFIG_IP_VS_PROTO_AH is not set
+
+#
+# IPVS scheduler
+#
+# CONFIG_IP_VS_RR is not set
+# CONFIG_IP_VS_WRR is not set
+# CONFIG_IP_VS_LC is not set
+# CONFIG_IP_VS_WLC is not set
+# CONFIG_IP_VS_LBLC is not set
+# CONFIG_IP_VS_LBLCR is not set
+# CONFIG_IP_VS_DH is not set
+# CONFIG_IP_VS_SH is not set
+# CONFIG_IP_VS_SED is not set
+# CONFIG_IP_VS_NQ is not set
+
+#
+# IPVS application helper
+#
#
 # IP: Netfilter Configuration
@@ -722,6 +770,27 @@ CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_IP_NF_MATCH_IPP2P=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_QUEUE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -730,6 +799,7 @@ CONFIG_BRIDGE_EBT_802_3=m
 CONFIG_BRIDGE_EBT_AMONG=m
 CONFIG_BRIDGE_EBT_ARP=m
 CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
 CONFIG_BRIDGE_EBT_LIMIT=m
 CONFIG_BRIDGE_EBT_MARK=m
 CONFIG_BRIDGE_EBT_PKTTYPE=m
@@ -814,7 +884,7 @@ CONFIG_NET_CLS_U32=m
 CONFIG_CLS_U32_PERF=y
 CONFIG_CLS_U32_MARK=y
 CONFIG_NET_CLS_RSVP=m
-# CONFIG_NET_CLS_RSVP6 is not set
+CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_CLS_FLOW=m
 CONFIG_NET_EMATCH=y
 CONFIG_NET_EMATCH_STACK=32
diff --git a/config/kernel/kernel.config.i586-ipfire-xen b/config/kernel/kernel.config.i586-ipfire-xen
index 746d60c..7110200 100644
--- a/config/kernel/kernel.config.i586-ipfire-xen
+++ b/config/kernel/kernel.config.i586-ipfire-xen
@@ -466,7 +466,26 @@ CONFIG_TCP_CONG_ILLINOIS=m
 CONFIG_DEFAULT_RENO=y
 CONFIG_DEFAULT_TCP_CONG="reno"
 # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IPV6 is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+# CONFIG_IPV6_SUBTREES is not set
+# CONFIG_IPV6_MROUTE is not set
 # CONFIG_NETWORK_SECMARK is not set
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
@@ -552,7 +571,36 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_TIME=m
 CONFIG_NETFILTER_XT_MATCH_U32=m
 CONFIG_NETFILTER_XT_MATCH_OSF=m
-# CONFIG_IP_VS is not set
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+# CONFIG_IP_VS_PROTO_TCP is not set
+# CONFIG_IP_VS_PROTO_UDP is not set
+# CONFIG_IP_VS_PROTO_ESP is not set
+# CONFIG_IP_VS_PROTO_AH is not set
+
+#
+# IPVS scheduler
+#
+# CONFIG_IP_VS_RR is not set
+# CONFIG_IP_VS_WRR is not set
+# CONFIG_IP_VS_LC is not set
+# CONFIG_IP_VS_WLC is not set
+# CONFIG_IP_VS_LBLC is not set
+# CONFIG_IP_VS_LBLCR is not set
+# CONFIG_IP_VS_DH is not set
+# CONFIG_IP_VS_SH is not set
+# CONFIG_IP_VS_SED is not set
+# CONFIG_IP_VS_NQ is not set
+
+#
+# IPVS application helper
+#
#
 # IP: Netfilter Configuration
@@ -596,6 +644,27 @@ CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_IP_NF_MATCH_IPP2P=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_QUEUE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -604,6 +673,7 @@ CONFIG_BRIDGE_EBT_802_3=m
 CONFIG_BRIDGE_EBT_AMONG=m
 CONFIG_BRIDGE_EBT_ARP=m
 CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
 CONFIG_BRIDGE_EBT_LIMIT=m
 CONFIG_BRIDGE_EBT_MARK=m
 CONFIG_BRIDGE_EBT_PKTTYPE=m
@@ -688,7 +758,7 @@ CONFIG_NET_CLS_U32=m
 CONFIG_CLS_U32_PERF=y
 CONFIG_CLS_U32_MARK=y
 CONFIG_NET_CLS_RSVP=m
-# CONFIG_NET_CLS_RSVP6 is not set
+CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_CLS_FLOW=m
 CONFIG_NET_EMATCH=y
 CONFIG_NET_EMATCH_STACK=32
diff --git a/config/rootfiles/common/cdrtools b/config/rootfiles/common/cdrtools
index 18d19ee..806fb75 100644
--- a/config/rootfiles/common/cdrtools
+++ b/config/rootfiles/common/cdrtools
@@ -73,6 +73,10 @@ usr/bin/mkisofs
 #usr/include/schily/i586-linux-cc/align.h
 #usr/include/schily/i586-linux-cc/avoffset.h
 #usr/include/schily/i586-linux-cc/xconfig.h
+#usr/include/schily/pentium3-linux-cc
+#usr/include/schily/pentium3-linux-cc/align.h
+#usr/include/schily/pentium3-linux-cc/avoffset.h
+#usr/include/schily/pentium3-linux-cc/xconfig.h
 #usr/include/schily/iconv.h
 #usr/include/schily/idcache.h
 #usr/include/schily/intcvt.h
diff --git a/config/rootfiles/common/linux b/config/rootfiles/common/linux
index adc8316..7eeea9a 100644
--- a/config/rootfiles/common/linux
+++ b/config/rootfiles/common/linux
@@ -4,8 +4,8 @@ boot/config-KVER-ipfire
 boot/vmlinuz-KVER-ipfire
 boot/vmlinuz-ipfire
 etc/modprobe.d/framebuffer
+etc/modprobe.d/ipv6
 etc/modprobe.d/isdn
-#lib/firmware/keyspan/usa19qi.fw
 lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/build
 #lib/modules/KVER-ipfire/kernel
@@ -469,58 +469,6 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/i2c/chips/tsl2550.ko
 #lib/modules/KVER-ipfire/kernel/drivers/i2c/i2c-core.ko
 #lib/modules/KVER-ipfire/kernel/drivers/i2c/i2c-dev.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide
-#lib/modules/KVER-ipfire/kernel/drivers/ide/aec62xx.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/ali14xx.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/alim15x3.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/amd74xx.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/atiixp.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/cmd640.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/cmd64x.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/cs5520.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/cs5530.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/cs5535.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/cs5536.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/delkin_cb.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/dtc2278.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/hpt366.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/ht6560b.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/ide-cd.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/ide-cs.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/ide-disk.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/ide-generic.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/ide-pci-generic.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/ide-pnp.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/ide_platform.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/it8172.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/it8213.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/it821x.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/jmicron.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/ns87415.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/opti621.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pdc202xx_new.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pdc202xx_old.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/piix.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/qd65xx.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/rz1000.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/sc1200.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/serverworks.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/siimage.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/sis5513.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/slc90e66.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/tc86c001.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/triflex.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/trm290.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/umc8672.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/via82cxxx.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ieee1394
-#lib/modules/KVER-ipfire/kernel/drivers/ieee1394/eth1394.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ieee1394/ieee1394.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ieee1394/ohci1394.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ieee1394/pcilynx.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ieee1394/raw1394.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ieee1394/sbp2.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ieee1394/video1394.ko
 #lib/modules/KVER-ipfire/kernel/drivers/ieee802154
 #lib/modules/KVER-ipfire/kernel/drivers/ieee802154/fakehard.ko
 #lib/modules/KVER-ipfire/kernel/drivers/input
@@ -580,17 +528,6 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/eicon/divacapi.ko
 #lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/eicon/divadidd.ko
 #lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/eicon/divas.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/avmfritz.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/hfcmulti.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/hfcpci.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/hfcsusb.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/mISDNinfineon.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/mISDNipac.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/mISDNisar.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/netjet.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/speedfax.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/w6692.ko
 #lib/modules/KVER-ipfire/kernel/drivers/isdn/hisax
 #lib/modules/KVER-ipfire/kernel/drivers/isdn/hisax/avma1_cs.ko
 #lib/modules/KVER-ipfire/kernel/drivers/isdn/hisax/elsa_cs.ko
@@ -610,10 +547,6 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/isdn/i4l/isdnhdlc.ko
 #lib/modules/KVER-ipfire/kernel/drivers/isdn/icn
 #lib/modules/KVER-ipfire/kernel/drivers/isdn/icn/icn.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/mISDN
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/mISDN/l1oip.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/mISDN/mISDN_core.ko
-#lib/modules/KVER-ipfire/kernel/drivers/isdn/mISDN/mISDN_dsp.ko
 #lib/modules/KVER-ipfire/kernel/drivers/isdn/pcbit
 #lib/modules/KVER-ipfire/kernel/drivers/isdn/pcbit/pcbit.ko
 #lib/modules/KVER-ipfire/kernel/drivers/isdn/sc
@@ -1670,6 +1603,7 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/net/bridge/netfilter/ebt_arpreply.ko
 #lib/modules/KVER-ipfire/kernel/net/bridge/netfilter/ebt_dnat.ko
 #lib/modules/KVER-ipfire/kernel/net/bridge/netfilter/ebt_ip.ko
+#lib/modules/KVER-ipfire/kernel/net/bridge/netfilter/ebt_ip6.ko
 #lib/modules/KVER-ipfire/kernel/net/bridge/netfilter/ebt_limit.ko
 #lib/modules/KVER-ipfire/kernel/net/bridge/netfilter/ebt_log.ko
 #lib/modules/KVER-ipfire/kernel/net/bridge/netfilter/ebt_mark.ko
@@ -1748,6 +1682,36 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/net/ipv4/tcp_yeah.ko
 #lib/modules/KVER-ipfire/kernel/net/ipv4/tunnel4.ko
 #lib/modules/KVER-ipfire/kernel/net/ipv4/xfrm4_tunnel.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6
+#lib/modules/KVER-ipfire/kernel/net/ipv6/ah6.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/esp6.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/ip6_tunnel.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/ipcomp6.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/ipv6.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/mip6.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/netfilter
+#lib/modules/KVER-ipfire/kernel/net/ipv6/netfilter/ip6_queue.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/netfilter/ip6_tables.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/netfilter/ip6t_LOG.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/netfilter/ip6t_REJECT.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/netfilter/ip6t_ah.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/netfilter/ip6t_eui64.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/netfilter/ip6t_frag.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/netfilter/ip6t_hbh.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/netfilter/ip6t_ipv6header.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/netfilter/ip6t_mh.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/netfilter/ip6t_rt.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/netfilter/ip6table_filter.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/netfilter/ip6table_mangle.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/netfilter/ip6table_raw.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/netfilter/nf_conntrack_ipv6.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/sit.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/tunnel6.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/xfrm6_mode_beet.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/xfrm6_mode_ro.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/xfrm6_mode_transport.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/xfrm6_mode_tunnel.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv6/xfrm6_tunnel.ko
 #lib/modules/KVER-ipfire/kernel/net/irda
 #lib/modules/KVER-ipfire/kernel/net/irda/ircomm
 #lib/modules/KVER-ipfire/kernel/net/irda/ircomm/ircomm-tty.ko
@@ -1764,6 +1728,8 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/net/mac80211
 #lib/modules/KVER-ipfire/kernel/net/mac80211/mac80211.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter
+#lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs
+#lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs/ip_vs.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conntrack.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conntrack_amanda.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conntrack_ftp.ko
@@ -1860,6 +1826,7 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/net/sched/cls_fw.ko
 #lib/modules/KVER-ipfire/kernel/net/sched/cls_route.ko
 #lib/modules/KVER-ipfire/kernel/net/sched/cls_rsvp.ko
+#lib/modules/KVER-ipfire/kernel/net/sched/cls_rsvp6.ko
 #lib/modules/KVER-ipfire/kernel/net/sched/cls_tcindex.ko
 #lib/modules/KVER-ipfire/kernel/net/sched/cls_u32.ko
 #lib/modules/KVER-ipfire/kernel/net/sched/em_cmp.ko
diff --git a/config/rootfiles/packages/linux-pae b/config/rootfiles/packages/linux-pae
index 2df45f9..6119966 100644
--- a/config/rootfiles/packages/linux-pae
+++ b/config/rootfiles/packages/linux-pae
@@ -1607,6 +1607,7 @@ lib/modules/KVER-ipfire-pae
 #lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebt_arpreply.ko
 #lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebt_dnat.ko
 #lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebt_ip.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebt_ip6.ko
 #lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebt_limit.ko
 #lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebt_log.ko
 #lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebt_mark.ko
@@ -1685,6 +1686,36 @@ lib/modules/KVER-ipfire-pae
 #lib/modules/KVER-ipfire-pae/kernel/net/ipv4/tcp_yeah.ko
 #lib/modules/KVER-ipfire-pae/kernel/net/ipv4/tunnel4.ko
 #lib/modules/KVER-ipfire-pae/kernel/net/ipv4/xfrm4_tunnel.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/ah6.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/esp6.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/ip6_tunnel.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/ipcomp6.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/ipv6.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/mip6.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/netfilter
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/netfilter/ip6_queue.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/netfilter/ip6_tables.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/netfilter/ip6t_LOG.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/netfilter/ip6t_REJECT.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/netfilter/ip6t_ah.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/netfilter/ip6t_eui64.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/netfilter/ip6t_frag.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/netfilter/ip6t_hbh.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/netfilter/ip6t_ipv6header.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/netfilter/ip6t_mh.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/netfilter/ip6t_rt.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/netfilter/ip6table_filter.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/netfilter/ip6table_mangle.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/netfilter/ip6table_raw.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/netfilter/nf_conntrack_ipv6.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/sit.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/tunnel6.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/xfrm6_mode_beet.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/xfrm6_mode_ro.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/xfrm6_mode_transport.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/xfrm6_mode_tunnel.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv6/xfrm6_tunnel.ko
 #lib/modules/KVER-ipfire-pae/kernel/net/irda
 #lib/modules/KVER-ipfire-pae/kernel/net/irda/ircomm
 #lib/modules/KVER-ipfire-pae/kernel/net/irda/ircomm/ircomm-tty.ko
@@ -1701,6 +1732,8 @@ lib/modules/KVER-ipfire-pae
 #lib/modules/KVER-ipfire-pae/kernel/net/mac80211
 #lib/modules/KVER-ipfire-pae/kernel/net/mac80211/mac80211.ko
 #lib/modules/KVER-ipfire-pae/kernel/net/netfilter
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/ipvs
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/ipvs/ip_vs.ko
 #lib/modules/KVER-ipfire-pae/kernel/net/netfilter/nf_conntrack.ko
 #lib/modules/KVER-ipfire-pae/kernel/net/netfilter/nf_conntrack_amanda.ko
 #lib/modules/KVER-ipfire-pae/kernel/net/netfilter/nf_conntrack_ftp.ko
@@ -1797,6 +1830,7 @@ lib/modules/KVER-ipfire-pae
 #lib/modules/KVER-ipfire-pae/kernel/net/sched/cls_fw.ko
 #lib/modules/KVER-ipfire-pae/kernel/net/sched/cls_route.ko
 #lib/modules/KVER-ipfire-pae/kernel/net/sched/cls_rsvp.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/cls_rsvp6.ko
 #lib/modules/KVER-ipfire-pae/kernel/net/sched/cls_tcindex.ko
 #lib/modules/KVER-ipfire-pae/kernel/net/sched/cls_u32.ko
 #lib/modules/KVER-ipfire-pae/kernel/net/sched/em_cmp.ko
diff --git a/config/rootfiles/packages/linux-xen b/config/rootfiles/packages/linux-xen
index 20a6094..fd2bfe6 100644
--- a/config/rootfiles/packages/linux-xen
+++ b/config/rootfiles/packages/linux-xen
@@ -5,11 +5,6 @@ boot/vmlinuz-KVER-ipfire-xen
 boot/vmlinuz-ipfire-xen
 #lib/firmware/bnx2x-e1-5.0.21.0.fw
 #lib/firmware/bnx2x-e1h-5.0.21.0.fw
-#lib/firmware/keyspan/usa18x.fw
-#lib/firmware/keyspan/usa19.fw
-#lib/firmware/mts_cdma.fw
-#lib/firmware/radeon/RV610_me.bin
-#lib/firmware/ti_5052.fw
 #lib/modules
 lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/build
@@ -434,53 +429,6 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/chips/tsl2550.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/i2c-core.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/i2c-dev.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/aec62xx.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/alim15x3.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/amd74xx.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/atiixp.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/cmd640.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/cmd64x.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/cs5520.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/cs5530.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/cs5535.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/cs5536.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/delkin_cb.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/hpt366.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/ide-cd.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/ide-cs.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/ide-disk.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/ide-generic.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/ide-pci-generic.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/ide-pnp.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/ide_platform.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/it8172.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/it8213.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/it821x.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/jmicron.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/ns87415.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/opti621.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pdc202xx_new.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pdc202xx_old.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/piix.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/rz1000.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/sc1200.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/serverworks.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/siimage.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/sis5513.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/slc90e66.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/tc86c001.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/triflex.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/trm290.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/via82cxxx.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ieee1394
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ieee1394/eth1394.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ieee1394/ieee1394.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ieee1394/ohci1394.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ieee1394/pcilynx.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ieee1394/raw1394.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ieee1394/sbp2.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ieee1394/video1394.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/ieee802154
 #lib/modules/KVER-ipfire-xen/kernel/drivers/ieee802154/fakehard.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/input
@@ -535,17 +483,6 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/eicon/divacapi.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/eicon/divadidd.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/eicon/divas.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/mISDN
-#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/mISDN/avmfritz.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/mISDN/hfcmulti.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/mISDN/hfcpci.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/mISDN/hfcsusb.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/mISDN/mISDNinfineon.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/mISDN/mISDNipac.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/mISDN/mISDNisar.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/mISDN/netjet.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/mISDN/speedfax.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/mISDN/w6692.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hisax
 #lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hisax/avma1_cs.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hisax/elsa_cs.ko
@@ -563,10 +500,6 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/i4l/isdn.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/i4l/isdn_bsdcomp.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/i4l/isdnhdlc.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/mISDN
-#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/mISDN/l1oip.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/mISDN/mISDN_core.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/mISDN/mISDN_dsp.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/leds
 #lib/modules/KVER-ipfire-xen/kernel/drivers/leds/led-class.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/leds/leds-alix2.ko
@@ -1521,6 +1454,7 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebt_arpreply.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebt_dnat.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebt_ip.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebt_ip6.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebt_limit.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebt_log.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebt_mark.ko
@@ -1599,6 +1533,36 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/net/ipv4/tcp_yeah.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/ipv4/tunnel4.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/ipv4/xfrm4_tunnel.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/ah6.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/esp6.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/ip6_tunnel.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/ipcomp6.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/ipv6.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/mip6.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6_queue.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6_tables.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_LOG.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_REJECT.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_ah.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_eui64.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_frag.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_hbh.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_ipv6header.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_mh.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_rt.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6table_filter.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6table_mangle.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6table_raw.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/nf_conntrack_ipv6.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/sit.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/tunnel6.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/xfrm6_mode_beet.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/xfrm6_mode_ro.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/xfrm6_mode_transport.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/xfrm6_mode_tunnel.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/xfrm6_tunnel.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/irda
 #lib/modules/KVER-ipfire-xen/kernel/net/irda/ircomm
 #lib/modules/KVER-ipfire-xen/kernel/net/irda/ircomm/ircomm-tty.ko
@@ -1615,6 +1579,8 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/net/mac80211
 #lib/modules/KVER-ipfire-xen/kernel/net/mac80211/mac80211.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter
+#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/ipvs
+#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/ipvs/ip_vs.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_conntrack.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_conntrack_amanda.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_conntrack_ftp.ko
@@ -1711,6 +1677,7 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/net/sched/cls_fw.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/sched/cls_route.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/sched/cls_rsvp.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/sched/cls_rsvp6.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/sched/cls_tcindex.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/sched/cls_u32.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/sched/em_cmp.ko
diff --git a/lfs/linux b/lfs/linux
index 303d62c..0a4d3e6 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -189,6 +189,10 @@ ifneq "$(XEN)" "1"
    	echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/isdn ; \
    done
    sed -i -e "s|.ko||g" /etc/modprobe.d/isdn
+
+	# Disable ipv6 at runtime
+	echo "options ipv6 disable_ipv6=1" > /etc/modprobe.d/ipv6
+
 endif
 endif
diff --git a/make.sh b/make.sh
index 1592336..4c7be21 100755
--- a/make.sh
+++ b/make.sh
@@ -40,6 +40,13 @@ GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8)	# Last commit
 TOOLCHAINVER=1
 IPFVER="full"				# Which versions should be compiled? (full|devel)
+BUILDMACHINE=$MACHINE
+    if [ "$MACHINE" = "x86_64" ]; then
+        BUILDMACHINE="i686";
+        linux32="linux32";
+    fi
+
+
 # Debian specific settings
 if [ ! -e /etc/debian_version ]; then
    FULLPATH=`which $0`
@@ -227,6 +234,10 @@ prepareenv() {
 }
buildtoolchain() {
+    if [ "$MACHINE" = "x86_64" ]; then
+        exiterror "Cannot build toolchain on x86_64. Please use the download."
+    fi
+
     LOGFILE="$BASEDIR/log/_build.toolchain.log"
     export LOGFILE
     ORG_PATH=$PATH
@@ -783,7 +794,6 @@ ipfirepackages() {
 case "$1" in 
 build)
    clear
-	BUILDMACHINE=`uname -m`
    PACKAGE=`ls -v -r $BASEDIR/cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.tar.gz 2> /dev/null | head -n 1`
    #only restore on a clean disk
    if [ ! -f log/cleanup-toolchain-2-tools ]; then
@@ -911,7 +921,6 @@ toolchain)
    prepareenv
    beautify build_stage "Toolchain compilation - Native GCC: `gcc --version | grep GCC | awk {'print $3'}`"
    buildtoolchain
-	BUILDMACHINE=`uname -m`
    echo "`date -u '+%b %e %T'`: Create toolchain tar.gz for $BUILDMACHINE" | tee -a $LOGFILE
    test -d $BASEDIR/cache/toolchains || mkdir -p $BASEDIR/cache/toolchains
    cd $BASEDIR && tar -zc --exclude='log/_build.*.log' -f cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.tar.gz \
@@ -923,7 +932,6 @@ toolchain)
    stdumount
    ;;
 gettoolchain)
-	BUILDMACHINE=`uname -m`
    # arbitrary name to be updated in case of new toolchain package upload
    PACKAGE=$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE
    if [ ! -f $BASEDIR/cache/toolchains/$PACKAGE.tar.gz ]; then
diff --git a/tools/make-functions b/tools/make-functions
index 4bf4140..530cd47 100644
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -363,7 +363,7 @@ lfsmake2() {
    [ $? == 1 ] && return 0
local PKG_TIME_START=`date +%s`
-	chroot $LFS /tools/bin/env -i 	HOME=/root \
+	$linux32 chroot $LFS /tools/bin/env -i 	HOME=/root \
    					TERM=$TERM PS1='\u:\w$ ' \
    					PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \
    					VERSION=$VERSION \
@@ -394,7 +394,7 @@ ipfiremake() {
    [ $? == 1 ] && return 0
local PKG_TIME_START=`date +%s`
-	chroot $LFS /tools/bin/env -i 	HOME=/root \
+	$linux32 chroot $LFS /tools/bin/env -i 	HOME=/root \
    					TERM=$TERM PS1='\u:\w$ ' \
    					PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin \
    					VERSION=$VERSION \
@@ -456,7 +456,7 @@ installmake() {
    [ $? == 1 ] && return 0
local PKG_TIME_START=`date +%s`
-		chroot $LFS /tools/bin/env -i 	HOME=/root \
+	$linux32 chroot $LFS /tools/bin/env -i 	HOME=/root \
    					TERM=$TERM PS1='\u:\w$ ' \
    					PATH=/opt/i586-uClibc/i586-linux-uclibc/bin:/opt/i586-uClibc/bin:/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin \
    					VERSION=$VERSION \
hooks/post-receive
--
IPFire 2.x development tree

    