From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 3 May 2014 13:55:25 +0000 (+0200)
Subject: xen-kernel: compile nf_conntrack into kernel.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b6c72b947753d41a9d691462b7afc34852a8b4b2;p=ipfire-2.x.git

xen-kernel: compile nf_conntrack into kernel.
---

diff --git a/config/kernel/kernel.config.i586-ipfire-xen b/config/kernel/kernel.config.i586-ipfire-xen
index 55bf36faec..09b8b0fad4 100644
--- a/config/kernel/kernel.config.i586-ipfire-xen
+++ b/config/kernel/kernel.config.i586-ipfire-xen
@@ -502,7 +502,7 @@ CONFIG_BRIDGE_NETFILTER=y
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK=y
 CONFIG_NF_CT_ACCT=y
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_EVENTS=y
diff --git a/lfs/linux2 b/lfs/linux2
index 63ca9cfa97..76e31a9dd2 100644
--- a/lfs/linux2
+++ b/lfs/linux2
@@ -34,7 +34,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PAK_VER    = 28
+PAK_VER    = 29
 DEPS	   = ""
 
 # Normal build or XEN build.