From 8b9a9895ec51b883acdcbd1f1fd2a4e92132e15f Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sat, 2 May 2015 14:15:35 +0200 Subject: [PATCH 1/2] [bsc/idu]: keep netfilter/ipsec as modules It seems like the kernel/package/upgrade/... proceess doesn't deal well with the fact that some options used to be modules, which are now built-in. Let's keep it as modules for the time being. --- .../linux/files/sysmocom-bsc/defconfig | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/recipes-bsp/linux/files/sysmocom-bsc/defconfig b/recipes-bsp/linux/files/sysmocom-bsc/defconfig index 9126ff81b2..f72427e527 100644 --- a/recipes-bsp/linux/files/sysmocom-bsc/defconfig +++ b/recipes-bsp/linux/files/sysmocom-bsc/defconfig @@ -560,13 +560,13 @@ CONFIG_PACKET_DIAG=m CONFIG_UNIX=y CONFIG_UNIX_DIAG=m CONFIG_XFRM=y -CONFIG_XFRM_ALGO=y -CONFIG_XFRM_USER=y +CONFIG_XFRM_ALGO=m +CONFIG_XFRM_USER=m CONFIG_XFRM_SUB_POLICY=y CONFIG_XFRM_MIGRATE=y CONFIG_XFRM_STATISTICS=y -CONFIG_XFRM_IPCOMP=y -CONFIG_NET_KEY=y +CONFIG_XFRM_IPCOMP=m +CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y CONFIG_INET=y CONFIG_IP_MULTICAST=y @@ -592,11 +592,11 @@ CONFIG_IP_PIMSM_V2=y # CONFIG_ARPD is not set CONFIG_SYN_COOKIES=y CONFIG_NET_IPVTI=m -CONFIG_INET_AH=y -CONFIG_INET_ESP=y -CONFIG_INET_IPCOMP=y -CONFIG_INET_XFRM_TUNNEL=y -CONFIG_INET_TUNNEL=y +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m CONFIG_INET_XFRM_MODE_TRANSPORT=y CONFIG_INET_XFRM_MODE_TUNNEL=y CONFIG_INET_XFRM_MODE_BEET=y @@ -658,8 +658,8 @@ CONFIG_BRIDGE_NETFILTER=y # # Core Netfilter Configuration # -CONFIG_NETFILTER_NETLINK=y -CONFIG_NETFILTER_NETLINK_ACCT=y +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_ACCT=m CONFIG_NETFILTER_NETLINK_QUEUE=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NF_CONNTRACK=m From 62856a3a9b246d714d60820582dfa03b34408d6a Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sat, 2 May 2015 14:18:56 +0200 Subject: [PATCH 2/2] [idu/bsc] bump PR of linux-sysmocom_git.bb --- recipes-bsp/linux/linux-sysmocom_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-bsp/linux/linux-sysmocom_git.bb b/recipes-bsp/linux/linux-sysmocom_git.bb index 9842ecfe54..d99da3c10d 100644 --- a/recipes-bsp/linux/linux-sysmocom_git.bb +++ b/recipes-bsp/linux/linux-sysmocom_git.bb @@ -15,7 +15,7 @@ BTS_FIRMWARE_NAME_sysmobts-v2 = "sysmobts-v2" SRCREV = "9610e792ffde7fb2599d19ca6d2a03230f2043c6" -PR = "r42" +PR = "r43" PV = "${LINUX_VERSION}+git${SRCPV}" SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=linux-3.10.76 \