From 17b55514a94f03e8c0f6ba2f5d14d21168c70272 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Wed, 5 Nov 2014 15:38:24 +0100 Subject: [PATCH] linux3.17: enable some forgotten/renamed modules. --- srcpkgs/linux3.17/files/i386-dotconfig | 40 ++++++++++++---------- srcpkgs/linux3.17/files/x86_64-dotconfig | 42 ++++++++++++++---------- srcpkgs/linux3.17/template | 2 +- 3 files changed, 48 insertions(+), 36 deletions(-) diff --git a/srcpkgs/linux3.17/files/i386-dotconfig b/srcpkgs/linux3.17/files/i386-dotconfig index 13273b2140..d4e86f337b 100644 --- a/srcpkgs/linux3.17/files/i386-dotconfig +++ b/srcpkgs/linux3.17/files/i386-dotconfig @@ -859,6 +859,7 @@ CONFIG_NETFILTER_NETLINK_ACCT=m CONFIG_NETFILTER_NETLINK_QUEUE=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NF_CONNTRACK=m +CONFIG_NF_LOG_COMMON=m CONFIG_NF_CONNTRACK_MARK=y CONFIG_NF_CONNTRACK_ZONES=y # CONFIG_NF_CONNTRACK_PROCFS is not set @@ -933,9 +934,9 @@ CONFIG_NETFILTER_XT_TARGET_HL=m CONFIG_NETFILTER_XT_TARGET_HMARK=m CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m CONFIG_NETFILTER_XT_TARGET_LED=m -# CONFIG_NETFILTER_XT_TARGET_LOG is not set +CONFIG_NETFILTER_XT_TARGET_LOG=m CONFIG_NETFILTER_XT_TARGET_MARK=m -# CONFIG_NETFILTER_XT_NAT is not set +CONFIG_NETFILTER_XT_NAT=m CONFIG_NETFILTER_XT_TARGET_NETMAP=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m @@ -1059,8 +1060,8 @@ CONFIG_IP_VS_PE_SIP=m # CONFIG_NF_DEFRAG_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m -# CONFIG_NF_LOG_ARP is not set -# CONFIG_NF_LOG_IPV4 is not set +CONFIG_NF_LOG_ARP=m +CONFIG_NF_LOG_IPV4=m CONFIG_NF_TABLES_IPV4=m CONFIG_NFT_CHAIN_ROUTE_IPV4=m CONFIG_NFT_CHAIN_NAT_IPV4=m @@ -1079,7 +1080,10 @@ CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_SYNPROXY=m -# CONFIG_IP_NF_NAT is not set +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_ECN=m @@ -1098,7 +1102,7 @@ CONFIG_NF_TABLES_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NFT_REJECT_IPV6=m -# CONFIG_NF_LOG_IPV6 is not set +CONFIG_NF_LOG_IPV6=m CONFIG_NF_NAT_IPV6=m CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_MATCH_AH=m @@ -1116,11 +1120,13 @@ CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_SYNPROXY=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=m -# CONFIG_IP6_NF_NAT is not set +CONFIG_IP6_NF_NAT=m +CONFIG_IP6_NF_TARGET_MASQUERADE=m +CONFIG_IP6_NF_TARGET_NPT=m CONFIG_NF_TABLES_BRIDGE=m -# CONFIG_NFT_BRIDGE_META is not set -# CONFIG_NFT_BRIDGE_REJECT is not set -# CONFIG_NF_LOG_BRIDGE is not set +CONFIG_NFT_BRIDGE_META=m +CONFIG_NFT_BRIDGE_REJECT=m +CONFIG_NF_LOG_BRIDGE=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -4801,7 +4807,7 @@ CONFIG_HID_ICADE=m CONFIG_HID_TWINHAN=m CONFIG_HID_KENSINGTON=m CONFIG_HID_LCPOWER=m -# CONFIG_HID_LENOVO is not set +CONFIG_HID_LENOVO=m CONFIG_HID_LOGITECH=m CONFIG_HID_LOGITECH_DJ=m CONFIG_LOGITECH_FF=y @@ -5378,7 +5384,7 @@ CONFIG_RTC_DRV_X1205=m CONFIG_RTC_DRV_PCF2127=m CONFIG_RTC_DRV_PCF8523=m CONFIG_RTC_DRV_PCF8563=m -# CONFIG_RTC_DRV_PCF85063 is not set +CONFIG_RTC_DRV_PCF85063=m CONFIG_RTC_DRV_PCF8583=m CONFIG_RTC_DRV_M41T80=m CONFIG_RTC_DRV_M41T80_WDT=y @@ -5396,7 +5402,7 @@ CONFIG_RTC_DRV_RV3029C2=m CONFIG_RTC_DRV_M41T93=m CONFIG_RTC_DRV_M41T94=m CONFIG_RTC_DRV_DS1305=m -# CONFIG_RTC_DRV_DS1343 is not set +CONFIG_RTC_DRV_DS1343=m CONFIG_RTC_DRV_DS1347=m CONFIG_RTC_DRV_DS1390=m CONFIG_RTC_DRV_MAX6902=m @@ -5405,7 +5411,7 @@ CONFIG_RTC_DRV_RS5C348=m CONFIG_RTC_DRV_DS3234=m CONFIG_RTC_DRV_PCF2123=m CONFIG_RTC_DRV_RX4581=m -# CONFIG_RTC_DRV_MCP795 is not set +CONFIG_RTC_DRV_MCP795=m # # Platform RTC drivers @@ -5417,7 +5423,7 @@ CONFIG_RTC_DRV_DS1553=m CONFIG_RTC_DRV_DS1742=m CONFIG_RTC_DRV_DS2404=m CONFIG_RTC_DRV_DA9052=m -# CONFIG_RTC_DRV_EFI is not set +CONFIG_RTC_DRV_EFI=m CONFIG_RTC_DRV_STK17TA8=m CONFIG_RTC_DRV_M48T86=m CONFIG_RTC_DRV_M48T35=m @@ -5434,7 +5440,7 @@ CONFIG_RTC_DRV_PCF50633=m # CONFIG_RTC_DRV_PCAP=m CONFIG_RTC_DRV_MC13XXX=m -# CONFIG_RTC_DRV_XGENE is not set +CONFIG_RTC_DRV_XGENE=m # # HID Sensor RTC drivers @@ -6129,7 +6135,7 @@ CONFIG_INTEL_RAPL=m CONFIG_MCB=m CONFIG_MCB_PCI=m CONFIG_RAS=y -# CONFIG_THUNDERBOLT is not set +CONFIG_THUNDERBOLT=m # # Firmware Drivers diff --git a/srcpkgs/linux3.17/files/x86_64-dotconfig b/srcpkgs/linux3.17/files/x86_64-dotconfig index 6602fd3272..2e80601aa4 100644 --- a/srcpkgs/linux3.17/files/x86_64-dotconfig +++ b/srcpkgs/linux3.17/files/x86_64-dotconfig @@ -864,6 +864,7 @@ CONFIG_NETFILTER_NETLINK_ACCT=m CONFIG_NETFILTER_NETLINK_QUEUE=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NF_CONNTRACK=m +CONFIG_NF_LOG_COMMON=m CONFIG_NF_CONNTRACK_MARK=y CONFIG_NF_CONNTRACK_ZONES=y # CONFIG_NF_CONNTRACK_PROCFS is not set @@ -938,9 +939,9 @@ CONFIG_NETFILTER_XT_TARGET_HL=m CONFIG_NETFILTER_XT_TARGET_HMARK=m CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m CONFIG_NETFILTER_XT_TARGET_LED=m -# CONFIG_NETFILTER_XT_TARGET_LOG is not set +CONFIG_NETFILTER_XT_TARGET_LOG=m CONFIG_NETFILTER_XT_TARGET_MARK=m -# CONFIG_NETFILTER_XT_NAT is not set +CONFIG_NETFILTER_XT_NAT=m CONFIG_NETFILTER_XT_TARGET_NETMAP=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m @@ -1064,8 +1065,8 @@ CONFIG_IP_VS_PE_SIP=m # CONFIG_NF_DEFRAG_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m -# CONFIG_NF_LOG_ARP is not set -# CONFIG_NF_LOG_IPV4 is not set +CONFIG_NF_LOG_ARP=m +CONFIG_NF_LOG_IPV4=m CONFIG_NF_TABLES_IPV4=m CONFIG_NFT_CHAIN_ROUTE_IPV4=m CONFIG_NFT_CHAIN_NAT_IPV4=m @@ -1084,7 +1085,10 @@ CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_SYNPROXY=m -# CONFIG_IP_NF_NAT is not set +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_ECN=m @@ -1103,7 +1107,7 @@ CONFIG_NF_TABLES_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NFT_REJECT_IPV6=m -# CONFIG_NF_LOG_IPV6 is not set +CONFIG_NF_LOG_IPV6=m CONFIG_NF_NAT_IPV6=m CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_MATCH_AH=m @@ -1121,11 +1125,13 @@ CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_TARGET_SYNPROXY=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=m -# CONFIG_IP6_NF_NAT is not set +CONFIG_IP6_NF_NAT=m +CONFIG_IP6_NF_TARGET_MASQUERADE=m +CONFIG_IP6_NF_TARGET_NPT=m CONFIG_NF_TABLES_BRIDGE=m -# CONFIG_NFT_BRIDGE_META is not set -# CONFIG_NFT_BRIDGE_REJECT is not set -# CONFIG_NF_LOG_BRIDGE is not set +CONFIG_NFT_BRIDGE_META=m +CONFIG_NFT_BRIDGE_REJECT=m +CONFIG_NF_LOG_BRIDGE=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -4782,7 +4788,7 @@ CONFIG_HID_ICADE=m CONFIG_HID_TWINHAN=m CONFIG_HID_KENSINGTON=m CONFIG_HID_LCPOWER=m -# CONFIG_HID_LENOVO is not set +CONFIG_HID_LENOVO=m CONFIG_HID_LOGITECH=m CONFIG_HID_LOGITECH_DJ=m CONFIG_LOGITECH_FF=y @@ -5361,7 +5367,7 @@ CONFIG_RTC_DRV_X1205=m CONFIG_RTC_DRV_PCF2127=m CONFIG_RTC_DRV_PCF8523=m CONFIG_RTC_DRV_PCF8563=m -# CONFIG_RTC_DRV_PCF85063 is not set +CONFIG_RTC_DRV_PCF85063=m CONFIG_RTC_DRV_PCF8583=m CONFIG_RTC_DRV_M41T80=m CONFIG_RTC_DRV_M41T80_WDT=y @@ -5379,7 +5385,7 @@ CONFIG_RTC_DRV_RV3029C2=m CONFIG_RTC_DRV_M41T93=m CONFIG_RTC_DRV_M41T94=m CONFIG_RTC_DRV_DS1305=m -# CONFIG_RTC_DRV_DS1343 is not set +CONFIG_RTC_DRV_DS1343=m CONFIG_RTC_DRV_DS1347=m CONFIG_RTC_DRV_DS1390=m CONFIG_RTC_DRV_MAX6902=m @@ -5388,7 +5394,7 @@ CONFIG_RTC_DRV_RS5C348=m CONFIG_RTC_DRV_DS3234=m CONFIG_RTC_DRV_PCF2123=m CONFIG_RTC_DRV_RX4581=m -# CONFIG_RTC_DRV_MCP795 is not set +CONFIG_RTC_DRV_MCP795=m # # Platform RTC drivers @@ -5400,7 +5406,7 @@ CONFIG_RTC_DRV_DS1553=m CONFIG_RTC_DRV_DS1742=m CONFIG_RTC_DRV_DS2404=m CONFIG_RTC_DRV_DA9052=m -# CONFIG_RTC_DRV_EFI is not set +CONFIG_RTC_DRV_EFI=m CONFIG_RTC_DRV_STK17TA8=m CONFIG_RTC_DRV_M48T86=m CONFIG_RTC_DRV_M48T35=m @@ -5417,7 +5423,7 @@ CONFIG_RTC_DRV_PCF50633=m # CONFIG_RTC_DRV_PCAP=m CONFIG_RTC_DRV_MC13XXX=m -# CONFIG_RTC_DRV_XGENE is not set +CONFIG_RTC_DRV_XGENE=m # # HID Sensor RTC drivers @@ -6116,7 +6122,7 @@ CONFIG_INTEL_RAPL=m CONFIG_MCB=m CONFIG_MCB_PCI=m CONFIG_RAS=y -# CONFIG_THUNDERBOLT is not set +CONFIG_THUNDERBOLT=m # # Firmware Drivers @@ -6772,7 +6778,7 @@ CONFIG_CRYPTO_CAST5_AVX_X86_64=m CONFIG_CRYPTO_CAST6=m CONFIG_CRYPTO_CAST6_AVX_X86_64=m CONFIG_CRYPTO_DES=m -# CONFIG_CRYPTO_DES3_EDE_X86_64 is not set +CONFIG_CRYPTO_DES3_EDE_X86_64=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_SALSA20=m diff --git a/srcpkgs/linux3.17/template b/srcpkgs/linux3.17/template index e1308cdaf4..8892f6bc75 100644 --- a/srcpkgs/linux3.17/template +++ b/srcpkgs/linux3.17/template @@ -2,7 +2,7 @@ # pkgname=linux3.17 version=3.17.2 -revision=1 +revision=2 wrksrc="linux-${version}" maintainer="John Galt " homepage="http://www.kernel.org"