diff options
54 files changed, 575 insertions, 330 deletions
@@ -1,7 +1,7 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -_UNLIMIT= ulimit -dS $$(ulimit -dH 2>/dev/null ) 2>/dev/null; +_UNLIMIT= ulimit -dS $(shell ulimit -dH >/dev/null 2>/dev/null ) >/dev/null 2>/dev/null; all: .prereq_done @${_UNLIMIT} ${GMAKE_INV} all @@ -161,6 +161,11 @@ NO_ERROR=0 @if ! mksh -c 'echo $$KSH_VERSION' 2>&1 | fgrep 'MIRBSD' >/dev/null 2>&1; then \ echo "MirBSD ksh (mksh) needs to be installed."; \ exit 1; \ + else \ + if [ $$(mksh -c 'echo $$KSH_VERSION' |cut -d ' ' -f 3|sed "s#R##") -le 38 ]; then \ + echo "MirBSD ksh is too old. R38 or higher needed."; \ + exit 1; \ + fi \ fi @if test x"$$(umask 2>/dev/null | sed 's/00*22/OK/')" != x"OK"; then \ echo >&2 Error: you must build with umask 022, sorry.; \ @@ -187,7 +192,7 @@ NO_ERROR=0 -e 's/i[3-9]86/i386/' \ )" >>prereq.mk @echo 'HOSTCC:=${CC}' >>prereq.mk - @echo 'HOSTCFLAGS:=-O2 -fwrapv' >>prereq.mk + @echo 'HOSTCFLAGS:=-O2' >>prereq.mk @echo 'LANGUAGE:=C' >>prereq.mk @echo 'LC_ALL:=C' >>prereq.mk @echo 'MAKE:=$${GMAKE}' >>prereq.mk @@ -1,6 +1,5 @@ - netbsd build - macos x build -- openbsd build - make rpm package backend working - network scripts for wireless client / ap - network scripts for pppoe diff --git a/mk/build.mk b/mk/build.mk index b8743089c..12baf5049 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -13,6 +13,7 @@ CONFIG = config DEFCONFIG= ADK_DEVELSYSTEM=n \ ADK_DEBUG=n \ ADK_STATIC=n \ + ADK_MAKE_PARALLEL=n \ ADK_FORCE_PARALLEL=n \ ADK_PACKAGE_GRUB=n \ ADK_PACKAGE_BASE_FILES=y \ diff --git a/mk/modules.mk b/mk/modules.mk index c36bdb21e..eaf14f6f6 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -32,11 +32,11 @@ $(eval $(call KMOD_template,NE2K_PCI,ne2k-pci,\ $(MODULES_DIR)/kernel/drivers/net/ne2k-pci \ ,20)) -$(eval $(call KMOD_template,8139CP,rtl8139cp,\ +$(eval $(call KMOD_template,8139CP,8139cp,\ $(MODULES_DIR)/kernel/drivers/net/8139cp \ ,20)) -$(eval $(call KMOD_template,8139TOO,rtl8139,\ +$(eval $(call KMOD_template,8139TOO,8139too,\ $(MODULES_DIR)/kernel/drivers/net/8139too \ ,20)) @@ -61,27 +61,27 @@ $(eval $(call KMOD_template,MAC80211,mac80211,\ $(MODULES_DIR)/kernel/net/mac80211/mac80211 \ ,15, kmod-crypto-aes kmod-crypto-arc4 kmod-crypto-ecb kmod-crc32)) -$(eval $(call KMOD_template,ATH5K,mac80211-ath5k,\ +$(eval $(call KMOD_template,ATH5K,ath5k,\ $(MODULES_DIR)/kernel/drivers/net/wireless/ath/ath \ $(MODULES_DIR)/kernel/drivers/net/wireless/ath/ath5k/ath5k \ ,20, kmod-led-class)) -$(eval $(call KMOD_template,RT2X00,mac80211-rt2x00,\ +$(eval $(call KMOD_template,RT2X00,rt2x00,\ $(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2x00lib \ $(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2x00pci \ ,17)) -$(eval $(call KMOD_template,RT2400PCI,mac80211-rt2400pci,\ +$(eval $(call KMOD_template,RT2400PCI,rt2400pci,\ $(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2400pci \ -,20, kmod-led-class kmod-mac80211-rt2x00)) +,20, kmod-led-class kmod-rt2x00)) -$(eval $(call KMOD_template,RT2500PCI,mac80211-rt2500pci,\ +$(eval $(call KMOD_template,RT2500PCI,rt2500pci,\ $(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2500pci \ -,20, kmod-led-class kmod-mac80211-rt2x00)) +,20, kmod-led-class kmod-rt2x00)) -$(eval $(call KMOD_template,RT61PCI,mac80211-rt61pci,\ +$(eval $(call KMOD_template,RT61PCI,rt61pci,\ $(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt61pci \ -,20, kmod-led-class kmod-mac80211-rt2x00)) +,20, kmod-led-class kmod-rt2x00)) # # Networking @@ -94,21 +94,25 @@ $(eval $(call KMOD_template,ATM_BR2684,atm-br2684,\ $(MODULES_DIR)/kernel/net/atm/br2684 \ ,51)) +$(eval $(call KMOD_template,VLAN_8021Q,vlan-8021q,\ + $(MODULES_DIR)/kernel/net/8021q/8021q \ +,5)) + $(eval $(call KMOD_template,BRIDGE,bridge,\ $(MODULES_DIR)/kernel/net/llc/llc \ $(MODULES_DIR)/kernel/net/802/stp \ $(MODULES_DIR)/kernel/net/bridge/bridge \ ,10)) -$(eval $(call KMOD_template,NET_IPGRE,gre,\ +$(eval $(call KMOD_template,NET_IPGRE,net-ipgre,\ $(MODULES_DIR)/kernel/net/ipv4/ip_gre \ ,50)) -$(eval $(call KMOD_template,INET_TUNNEL,tunnel,\ +$(eval $(call KMOD_template,INET_TUNNEL,inet-tunnel,\ $(MODULES_DIR)/kernel/net/ipv4/tunnel4 \ ,20)) -$(eval $(call KMOD_template,NET_IPIP,ipip,\ +$(eval $(call KMOD_template,NET_IPIP,net-ipip,\ $(MODULES_DIR)/kernel/net/ipv4/ipip \ ,60)) @@ -150,31 +154,31 @@ $(eval $(call KMOD_template,BONDING,bonding,\ # # Traffic scheduling # -$(eval $(call KMOD_template,NET_SCH_CBQ,net-sched-cbq,\ +$(eval $(call KMOD_template,NET_SCH_CBQ,net-sch-cbq,\ $(MODULES_DIR)/kernel/net/sched/sch_cbq \ ,40)) -$(eval $(call KMOD_template,NET_SCH_HTB,net-sched-htb,\ +$(eval $(call KMOD_template,NET_SCH_HTB,net-sch-htb,\ $(MODULES_DIR)/kernel/net/sched/sch_htb \ ,40)) -$(eval $(call KMOD_template,NET_SCH_HFSC,net-sched-hfsc,\ +$(eval $(call KMOD_template,NET_SCH_HFSC,net-sch-hfsc,\ $(MODULES_DIR)/kernel/net/sched/sch_hfsc \ ,40)) -$(eval $(call KMOD_template,NET_SCH_ATM,net-sched-atm,\ +$(eval $(call KMOD_template,NET_SCH_ATM,net-sch-atm,\ $(MODULES_DIR)/kernel/net/sched/sch_atm \ ,40)) -$(eval $(call KMOD_template,NET_SCH_PRIO,net-sched-prio,\ +$(eval $(call KMOD_template,NET_SCH_PRIO,net-sch-prio,\ $(MODULES_DIR)/kernel/net/sched/sch_prio \ ,40)) -$(eval $(call KMOD_template,NET_SCH_RED,net-sched-red,\ +$(eval $(call KMOD_template,NET_SCH_RED,net-sch-red,\ $(MODULES_DIR)/kernel/net/sched/sch_red \ ,40)) -$(eval $(call KMOD_template,NET_SCH_SFQ,net-sched-sfq,\ +$(eval $(call KMOD_template,NET_SCH_SFQ,net-sch-sfq,\ $(MODULES_DIR)/kernel/net/sched/sch_sfq \ ,40)) @@ -183,19 +187,19 @@ $(eval $(call KMOD_template,NET_SCH_SFQ,net-sched-sfq,\ # $(MODULES_DIR)/kernel/net/sched/sch_teql \ #,40)) -$(eval $(call KMOD_template,NET_SCH_TBF,net-sched-tbf,\ +$(eval $(call KMOD_template,NET_SCH_TBF,net-sch-tbf,\ $(MODULES_DIR)/kernel/net/sched/sch_tbf \ ,40)) -$(eval $(call KMOD_template,NET_SCH_GRED,net-sched-gred,\ +$(eval $(call KMOD_template,NET_SCH_GRED,net-sch-gred,\ $(MODULES_DIR)/kernel/net/sched/sch_gred \ ,40)) -$(eval $(call KMOD_template,NET_SCH_DSMARK,net-sched-dsmark,\ +$(eval $(call KMOD_template,NET_SCH_DSMARK,net-sch-dsmark,\ $(MODULES_DIR)/kernel/net/sched/sch_dsmark \ ,40)) -$(eval $(call KMOD_template,NET_SCH_INGRESS,net-sched-ingress,\ +$(eval $(call KMOD_template,NET_SCH_INGRESS,net-sch-ingress,\ $(MODULES_DIR)/kernel/net/sched/sch_ingress \ ,40)) @@ -210,7 +214,7 @@ $(eval $(call KMOD_template,NET_CLS_TCINDEX,net-cls-tcindex,\ $(MODULES_DIR)/kernel/net/sched/cls_tcindex \ ,40)) -$(eval $(call KMOD_template,NET_CLS_ROUTE4,net-cls-route,\ +$(eval $(call KMOD_template,NET_CLS_ROUTE4,net-cls-route4,\ $(MODULES_DIR)/kernel/net/sched/cls_route \ ,40)) @@ -248,32 +252,32 @@ $(eval $(call KMOD_template,NET_ACT_PEDIT,net-act-pedit,\ # # IPsec # -$(eval $(call KMOD_template,NET_KEY,net-ipsec-netkey,\ +$(eval $(call KMOD_template,NET_KEY,net-key,\ $(MODULES_DIR)/kernel/net/key/af_key \ ,60)) -$(eval $(call KMOD_template,INET_AH,net-ipsec-ah,\ +$(eval $(call KMOD_template,INET_AH,inet-ah,\ $(MODULES_DIR)/kernel/net/ipv4/ah4 \ ,65)) -$(eval $(call KMOD_template,INET_ESP,net-ipsec-esp,\ +$(eval $(call KMOD_template,INET_ESP,inet-esp,\ $(MODULES_DIR)/kernel/net/ipv4/esp4 \ ,65)) -$(eval $(call KMOD_template,INET_IPCOMP,net-ipsec-comp,\ +$(eval $(call KMOD_template,INET_IPCOMP,inet-ipcomp,\ $(MODULES_DIR)/kernel/net/xfrm/xfrm_ipcomp \ $(MODULES_DIR)/kernel/net/ipv4/ipcomp \ ,70)) -$(eval $(call KMOD_template,INET_XFRM_MODE_TRANSPORT,net-ipsec-transport,\ +$(eval $(call KMOD_template,INET_XFRM_MODE_TRANSPORT,inet-xfrm-mode-transport,\ $(MODULES_DIR)/kernel/net/ipv4/xfrm4_mode_transport \ ,75)) -$(eval $(call KMOD_template,INET_XFRM_MODE_TUNNEL,net-ipsec-tunnel,\ +$(eval $(call KMOD_template,INET_XFRM_MODE_TUNNEL,inet-xfrm-mode-tunnel,\ $(MODULES_DIR)/kernel/net/ipv4/xfrm4_mode_tunnel \ ,75)) -$(eval $(call KMOD_template,INET_XFRM_MODE_BEET,net-ipsec-beet,\ +$(eval $(call KMOD_template,INET_XFRM_MODE_BEET,inet-xfrm-mode-beet,\ $(MODULES_DIR)/kernel/net/ipv4/xfrm4_mode_beet \ ,75)) @@ -283,62 +287,62 @@ $(eval $(call KMOD_template,INET_XFRM_MODE_BEET,net-ipsec-beet,\ # # Ethernet Bridging firewall # -$(eval $(call KMOD_template,BRIDGE_NF_EBTABLES,nf-ebtables,\ +$(eval $(call KMOD_template,BRIDGE_NF_EBTABLES,bridge-nf-ebtables,\ $(MODULES_DIR)/kernel/net/bridge/netfilter/ebtables \ ,55)) -$(eval $(call KMOD_template,BRIDGE_EBT_BROUTE,nf-ebtables-broute,\ +$(eval $(call KMOD_template,BRIDGE_EBT_BROUTE,bridge-ebt-broute,\ $(MODULES_DIR)/kernel/net/bridge/netfilter/ebtable_broute \ ,60)) -$(eval $(call KMOD_template,BRIDGE_EBT_T_FILTER,nf-ebtables-filter,\ +$(eval $(call KMOD_template,BRIDGE_EBT_T_FILTER,bridge-ebt-t-filter,\ $(MODULES_DIR)/kernel/net/bridge/netfilter/ebtable_filter \ ,60)) -$(eval $(call KMOD_template,BRIDGE_EBT_T_NAT,nf-ebtables-nat,\ +$(eval $(call KMOD_template,BRIDGE_EBT_T_NAT,bridge-ebt-t-nat,\ $(MODULES_DIR)/kernel/net/bridge/netfilter/ebtable_nat \ ,60)) -$(eval $(call KMOD_template,BRIDGE_EBT_802_3,nf-ebtables-802-3,\ +$(eval $(call KMOD_template,BRIDGE_EBT_802_3,bridge-ebt-802-3,\ $(MODULES_DIR)/kernel/net/bridge/netfilter/ebt_802_3 \ ,65)) -$(eval $(call KMOD_template,BRIDGE_EBT_AMONG,nf-ebtables-among,\ +$(eval $(call KMOD_template,BRIDGE_EBT_AMONG,bridge-ebt-among,\ $(MODULES_DIR)/kernel/net/bridge/netfilter/ebt_among \ ,65)) -$(eval $(call KMOD_template,BRIDGE_EBT_ARP,nf-ebtables-arp,\ +$(eval $(call KMOD_template,BRIDGE_EBT_ARP,bridge-ebt-arp,\ $(MODULES_DIR)/kernel/net/bridge/netfilter/ebt_arpreply \ ,65)) -$(eval $(call KMOD_template,BRIDGE_EBT_IP,nf-ebtables-ip,\ +$(eval $(call KMOD_template,BRIDGE_EBT_IP,bridge-ebt-ip,\ $(MODULES_DIR)/kernel/net/bridge/netfilter/ebt_ip \ ,65)) -$(eval $(call KMOD_template,BRIDGE_EBT_REDIRECT,nf-ebtables-redirect,\ +$(eval $(call KMOD_template,BRIDGE_EBT_REDIRECT,bridge-ebt-redirect,\ $(MODULES_DIR)/kernel/net/bridge/netfilter/ebt_redirect \ ,65)) # # Netfilter Core # -$(eval $(call KMOD_template,NETFILTER_XT_TARGET_CLASSIFY,nf-classify,\ +$(eval $(call KMOD_template,NETFILTER_XT_TARGET_CLASSIFY,netfiler-xt-target-classify,\ $(MODULES_DIR)/kernel/net/netfilter/xt_CLASSIFY \ ,50)) -$(eval $(call KMOD_template,NETFILTER_XT_TARGET_CONNMARK,nf-connmark,\ +$(eval $(call KMOD_template,NETFILTER_XT_TARGET_CONNMARK,netfilter-xt-target-connmark,\ $(MODULES_DIR)/kernel/net/netfilter/xt_CONNMARK \ ,50)) -$(eval $(call KMOD_template,NETFILTER_XT_TARGET_MARK,nf-mark,\ +$(eval $(call KMOD_template,NETFILTER_XT_TARGET_MARK,netfilter-xt-target-mark,\ $(MODULES_DIR)/kernel/net/netfilter/xt_MARK \ ,50)) -$(eval $(call KMOD_template,NETFILTER_XT_TARGET_NFQUEUE,nf-queue,\ +$(eval $(call KMOD_template,NETFILTER_XT_TARGET_NFQUEUE,netfilter-xt-target-nfqueue,\ $(MODULES_DIR)/kernel/net/netfilter/xt_NFQUEUE \ ,50)) -$(eval $(call KMOD_template,NETFILTER_XT_TARGET_NOTRACK,nf-notrack,\ +$(eval $(call KMOD_template,NETFILTER_XT_TARGET_NOTRACK,netfilter-xt-target-notrack,\ $(MODULES_DIR)/kernel/net/netfilter/xt_NOTRACK \ ,50)) @@ -354,106 +358,106 @@ $(eval $(call KMOD_template,NF_CONNTRACK_IPV4,nf-conntrack-ipv4,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_conntrack_ipv4 \ ,50)) -$(eval $(call KMOD_template,IP_NF_FTP,nf-ip-conntrack-ftp,\ +$(eval $(call KMOD_template,IP_NF_FTP,ip-nf-ftp,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_conntrack_ftp \ ,55)) -$(eval $(call KMOD_template,IP_NF_IRC,nf-ip-conntrack-irc,\ +$(eval $(call KMOD_template,IP_NF_IRC,ip-nf-irc,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_conntrack_irc \ ,55)) -$(eval $(call KMOD_template,IP_NF_NETBIOS_NS,nf-ip-conntrack-netbios-ns,\ +$(eval $(call KMOD_template,IP_NF_NETBIOS_NS,ip-nf-netbios-ns,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_conntrack_netbios_ns \ ,55)) -$(eval $(call KMOD_template,IP_NF_TFTP,nf-ip-conntrack-tftp,\ +$(eval $(call KMOD_template,IP_NF_TFTP,ip-nf-tftp,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_conntrack_tftp \ ,55)) -$(eval $(call KMOD_template,IP_NF_AMANDA,nf-ip-conntrack-amanda,\ +$(eval $(call KMOD_template,IP_NF_AMANDA,ip-nf-amanda,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_conntrack_amanda \ ,55)) -$(eval $(call KMOD_template,IP_NF_PPTP,nf-ip-conntrack-pptp,\ +$(eval $(call KMOD_template,IP_NF_PPTP,ip-nf-pptp,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_conntrack_pptp \ ,55)) -$(eval $(call KMOD_template,IP_NF_H323,nf-ip-conntrack-h323,\ +$(eval $(call KMOD_template,IP_NF_H323,ip-nf-h323,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_conntrack_h323 \ ,55)) -$(eval $(call KMOD_template,IP_NF_SIP,nf-ip-conntrack-sip,\ +$(eval $(call KMOD_template,IP_NF_SIP,ip-nf-sip,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_conntrack_sip \ ,55)) -$(eval $(call KMOD_template,IP_NF_IPTABLES,nf-ip-iptables,\ +$(eval $(call KMOD_template,IP_NF_IPTABLES,ip-nf-iptables,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_tables \ ,50)) -$(eval $(call KMOD_template,IP_NF_MATCH_IPRANGE,nf-ip-match-iprange,\ +$(eval $(call KMOD_template,IP_NF_MATCH_IPRANGE,ip-nf-match-iprange,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_iprange \ ,55)) -$(eval $(call KMOD_template,IP_NF_MATCH_TOS,nf-ip-match-tos,\ +$(eval $(call KMOD_template,IP_NF_MATCH_TOS,ip-nf-match-tos,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_tos \ ,55)) -$(eval $(call KMOD_template,IP_NF_MATCH_RECENT,nf-ip-match-recent,\ +$(eval $(call KMOD_template,IP_NF_MATCH_RECENT,ip-nf-match-recent,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_recent \ ,55)) -$(eval $(call KMOD_template,IP_NF_MATCH_ECN,nf-ip-match-ecn,\ +$(eval $(call KMOD_template,IP_NF_MATCH_ECN,ip-nf-match-ecn,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_ecn \ ,55)) -$(eval $(call KMOD_template,IP_NF_MATCH_AH,nf-ip-match-ah,\ +$(eval $(call KMOD_template,IP_NF_MATCH_AH,ip-nf-match-ah,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_ah \ ,55)) -$(eval $(call KMOD_template,IP_NF_MATCH_TTL,nf-ip-match-ttl,\ +$(eval $(call KMOD_template,IP_NF_MATCH_TTL,ip-nf-match-ttl,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_ttl \ ,55)) -$(eval $(call KMOD_template,IP_NF_MATCH_OWNER,nf-ip-match-owner,\ +$(eval $(call KMOD_template,IP_NF_MATCH_OWNER,ip-nf-match-owner,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_owner \ ,55)) -$(eval $(call KMOD_template,IP_NF_MATCH_ADDRTYPE,nf-ip-match-addrtype,\ +$(eval $(call KMOD_template,IP_NF_MATCH_ADDRTYPE,ip-nf-match-addrtype,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_addrtype \ ,55)) -$(eval $(call KMOD_template,IP_NF_MATCH_HASHLIMIT,nf-ip-match-hashlimit,\ +$(eval $(call KMOD_template,IP_NF_MATCH_HASHLIMIT,ip-nf-match-hashlimit,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_hashlimit \ ,55)) -$(eval $(call KMOD_template,IP_NF_MATCH_STATE,nf-ip-match-state,\ +$(eval $(call KMOD_template,IP_NF_MATCH_STATE,ip-nf-match-state,\ $(MODULES_DIR)/kernel/net/netfilter/xt_state \ ,55)) -$(eval $(call KMOD_template,IP_NF_MATCH_MULTIPORT,nf-ip-match-multiport,\ +$(eval $(call KMOD_template,IP_NF_MATCH_MULTIPORT,ip-nf-match-multiport,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_multiport \ ,55)) # # Filtering # -$(eval $(call KMOD_template,IP_NF_FILTER,nf-ip-filter,\ +$(eval $(call KMOD_template,IP_NF_FILTER,ip-nf-filter,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/iptable_filter \ ,55)) -$(eval $(call KMOD_template,IP_NF_TARGET_REJECT,nf-ip-target-reject,\ +$(eval $(call KMOD_template,IP_NF_TARGET_REJECT,ip-nf-target-reject,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_REJECT \ ,60)) -$(eval $(call KMOD_template,IP_NF_TARGET_LOG,nf-ip-target-log,\ +$(eval $(call KMOD_template,IP_NF_TARGET_LOG,ip-nf-target-log,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_LOG \ ,60)) -$(eval $(call KMOD_template,IP_NF_TARGET_ULOG,nf-ip-target-ulog,\ +$(eval $(call KMOD_template,IP_NF_TARGET_ULOG,ip-nf-target-ulog,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_ULOG \ ,60)) -$(eval $(call KMOD_template,IP_NF_TARGET_TCPMSS,nf-ip-target-tcpmss,\ +$(eval $(call KMOD_template,IP_NF_TARGET_TCPMSS,ip-nf-target-tcpmss,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_TCPMSS \ ,60)) @@ -462,62 +466,34 @@ $(eval $(call KMOD_template,NF_NAT,nf-nat,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/iptable_nat \ ,60)) -$(eval $(call KMOD_template,IP_NF_PPTP,nf-ip-nat-pptp,\ - $(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_nat_pptp \ -,65)) - -$(eval $(call KMOD_template,IP_NF_TFTP,nf-ip-nat-tftp,\ - $(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_nat_tftp \ -,65)) - -$(eval $(call KMOD_template,IP_NF_FTP,nf-ip-nat-ftp,\ - $(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_nat_ftp \ -,65)) - -$(eval $(call KMOD_template,IP_NF_IRC,nf-ip-nat-irc,\ - $(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_nat_irc \ -,65)) - -$(eval $(call KMOD_template,IP_NF_AMANDA,nf-ip-nat-amanda,\ - $(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_nat_amanda \ -,65)) - -$(eval $(call KMOD_template,IP_NF_SIP,nf-ip-nat-sip,\ - $(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_nat_sip \ -,65)) - -$(eval $(call KMOD_template,IP_NF_H323,nf-ip-nat-h323,\ - $(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_nat_h323 \ -,65)) - -$(eval $(call KMOD_template,IP_NF_TARGET_MASQUERADE,nf-ip-target-masquerade,\ +$(eval $(call KMOD_template,IP_NF_TARGET_MASQUERADE,ip-nf-target-masquerade,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_MASQUERADE \ ,65)) -$(eval $(call KMOD_template,IP_NF_TARGET_REDIRECT,nf-ip-target-redirect,\ +$(eval $(call KMOD_template,IP_NF_TARGET_REDIRECT,ip-nf-target-redirect,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_REDIRECT \ ,65)) -$(eval $(call KMOD_template,IP_NF_TARGET_NETMAP,nf-ip-target-netmap,\ +$(eval $(call KMOD_template,IP_NF_TARGET_NETMAP,ip-nf-target-netmap,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_NETMAP \ ,65)) # # Mangle # -$(eval $(call KMOD_template,IP_NF_MANGLE,nf-ip-mangle,\ +$(eval $(call KMOD_template,IP_NF_MANGLE,ip-nf-mangle,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/iptable_mangle \ ,60)) -$(eval $(call KMOD_template,IP_NF_TARGET_TOS,nf-ip-target-tos,\ +$(eval $(call KMOD_template,IP_NF_TARGET_TOS,ip-nf-target-tos,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_TOS \ ,65)) -$(eval $(call KMOD_template,IP_NF_TARGET_ECN,nf-ip-target-ecn,\ +$(eval $(call KMOD_template,IP_NF_TARGET_ECN,ip-nf-target-ecn,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_ECN \ ,65)) -$(eval $(call KMOD_template,IP_NF_TARGET_TTL,nf-ip-target-ttl,\ +$(eval $(call KMOD_template,IP_NF_TARGET_TTL,ip-nf-target-ttl,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_TTL \ ,65)) @@ -578,11 +554,11 @@ $(eval $(call KMOD_template,IP_VS_FTP,ip-vs-ftp,\ # # Block devices # -$(eval $(call KMOD_template,BLK_DEV_LOOP,loop,\ +$(eval $(call KMOD_template,BLK_DEV_LOOP,blk-dev-loop,\ $(MODULES_DIR)/kernel/drivers/block/loop \ ,20)) -$(eval $(call KMOD_template,BLK_DEV_NBD,nbd,\ +$(eval $(call KMOD_template,BLK_DEV_NBD,blk-dev-nbd,\ $(MODULES_DIR)/kernel/drivers/block/nbd \ ,20)) @@ -590,11 +566,11 @@ $(eval $(call KMOD_template,SCSI,scsi,\ $(MODULES_DIR)/kernel/drivers/scsi/scsi_wait_scan \ ,20)) -$(eval $(call KMOD_template,BLK_DEV_SD,scsi-disk,\ +$(eval $(call KMOD_template,BLK_DEV_SD,blk-dev-sd,\ $(MODULES_DIR)/kernel/drivers/scsi/sd_mod \ ,25)) -$(eval $(call KMOD_template,BLK_DEV_SR,scsi-cdrom,\ +$(eval $(call KMOD_template,BLK_DEV_SR,blk-dev-sr,\ $(MODULES_DIR)/kernel/drivers/cdrom/cdrom \ $(MODULES_DIR)/kernel/drivers/scsi/sr_mod \ ,25)) @@ -602,7 +578,7 @@ $(eval $(call KMOD_template,BLK_DEV_SR,scsi-cdrom,\ # # RAID # -$(eval $(call KMOD_template,BLK_DEV_MD,md,\ +$(eval $(call KMOD_template,BLK_DEV_MD,blk-dev-md,\ $(MODULES_DIR)/kernel/drivers/md/md-mod \ ,30)) @@ -625,7 +601,7 @@ $(eval $(call KMOD_template,MD_RAID456,md-raid456,\ # # Device Mapper # -$(eval $(call KMOD_template,BLK_DEV_DM,dm-mod,\ +$(eval $(call KMOD_template,BLK_DEV_DM,blk-dev-dm,\ $(MODULES_DIR)/kernel/drivers/md/dm-mod \ ,35)) @@ -648,7 +624,7 @@ $(eval $(call KMOD_template,DM_SNAPSHOT,dm-snapshot,\ # Crypto # -$(eval $(call KMOD_template,CRYPTO_DEV_GEODE,crypto-hw-geode,\ +$(eval $(call KMOD_template,CRYPTO_DEV_GEODE,crypto-dev-geode,\ $(MODULES_DIR)/kernel/drivers/crypto/geode-aes \ ,10)) @@ -670,7 +646,7 @@ $(eval $(call KMOD_template,CRYPTO_BLKCIPHER,crypto-blkcipher,\ $(MODULES_DIR)/kernel/crypto/crypto_blkcipher \ ,05)) -$(eval $(call KMOD_template,CRYPTO_RNG2,crypto-rng,\ +$(eval $(call KMOD_template,CRYPTO_RNG2,crypto-rng2,\ $(MODULES_DIR)/kernel/crypto/rng \ $(MODULES_DIR)/kernel/crypto/krng \ ,06)) @@ -709,11 +685,11 @@ $(eval $(call KMOD_template,CRYPTO_SHA512,crypto-sha512,\ $(MODULES_DIR)/kernel/crypto/sha512_generic \ |