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 \ ,11)) -$(eval $(call KMOD_template,CRYPTO_WP512,crypto-whirlpool,\ +$(eval $(call KMOD_template,CRYPTO_WP512,crypto-wp512,\ $(MODULES_DIR)/kernel/crypto/wp512 \ ,11)) -$(eval $(call KMOD_template,CRYPTO_TGR192,crypto-tiger,\ +$(eval $(call KMOD_template,CRYPTO_TGR192,crypto-tgr192,\ $(MODULES_DIR)/kernel/crypto/tgr192 \ ,11)) @@ -738,7 +714,7 @@ $(eval $(call KMOD_template,CRYPTO_TWOFISH,crypto-twofish,\ $(MODULES_DIR)/kernel/crypto/twofish \ ,11)) -$(eval $(call KMOD_template,CRYPTO_TWOFISH_586,crypto-twofish-i586,\ +$(eval $(call KMOD_template,CRYPTO_TWOFISH_586,crypto-twofish-586,\ $(MODULES_DIR)/kernel/arch/x86/crypto/twofish-i586 \ ,12)) @@ -750,7 +726,7 @@ $(eval $(call KMOD_template,CRYPTO_AES,crypto-aes,\ $(MODULES_DIR)/kernel/crypto/aes_generic \ ,10)) -$(eval $(call KMOD_template,CRYPTO_AES_586,crypto-aes-i586,\ +$(eval $(call KMOD_template,CRYPTO_AES_586,crypto-aes-586,\ $(MODULES_DIR)/kernel/arch/x86/crypto/aes-i586 \ ,11)) @@ -806,156 +782,156 @@ $(eval $(call KMOD_template,CRYPTO_CRC32C,crypto-crc32c,\ $(MODULES_DIR)/kernel/crypto/crc32c \ ,11)) -$(eval $(call KMOD_template,OCF_CRYPTOSOFT,cryptodev-cryptosoft,\ +$(eval $(call KMOD_template,OCF_CRYPTOSOFT,ocf-cryptosoft,\ ${MODULES_DIR}/kernel/crypto/ocf/cryptosoft \ ,12)) -$(eval $(call KMOD_template,OCF_SAFE,cryptodev-safe,\ +$(eval $(call KMOD_template,OCF_SAFE,ocf-safe,\ ${MODULES_DIR}/kernel/crypto/ocf/safe/safe \ ,12)) -$(eval $(call KMOD_template,OCF_IXP4XX,cryptodev-ixp4xx,\ +$(eval $(call KMOD_template,OCF_IXP4XX,ocf-ixp4xx,\ ${MODULES_DIR}/kernel/crypto/ocf/ixp4xx/ixp4xx \ ,12)) -$(eval $(call KMOD_template,OCF_HIFN,cryptodev-hifn,\ +$(eval $(call KMOD_template,OCF_HIFN,ocf-hifn,\ ${MODULES_DIR}/kernel/crypto/ocf/hifn/hifn7751 \ ,12)) -$(eval $(call KMOD_template,OCF_TALITOS,cryptodev-talitos,\ +$(eval $(call KMOD_template,OCF_TALITOS,ocf-talitos,\ ${MODULES_DIR}/kernel/crypto/ocf/talitos/talitos \ ,12)) # # Filesystems # -$(eval $(call KMOD_template,AUFS_FS,fs-aufs,\ +$(eval $(call KMOD_template,AUFS_FS,aufs-fs,\ $(MODULES_DIR)/kernel/fs/aufs/aufs \ ,30)) -$(eval $(call KMOD_template,CIFS,fs-cifs,\ +$(eval $(call KMOD_template,CIFS,cifs,\ $(MODULES_DIR)/kernel/fs/cifs/cifs \ ,30)) -$(eval $(call KMOD_template,CODA_FS,fs-coda,\ +$(eval $(call KMOD_template,CODA_FS,coda-fs,\ $(MODULES_DIR)/kernel/fs/coda/coda \ ,30)) ifneq ($(ADK_KERNEL_EXT2_FS),y) -$(eval $(call KMOD_template,EXT2_FS,fs-ext2,\ +$(eval $(call KMOD_template,EXT2_FS,ext2-fs,\ $(MODULES_DIR)/kernel/fs/ext2/ext2 \ ,30)) endif -$(eval $(call KMOD_template,EXT3_FS,fs-ext3,\ +$(eval $(call KMOD_template,EXT3_FS,ext3-fs,\ $(MODULES_DIR)/kernel/fs/jbd/jbd \ $(MODULES_DIR)/kernel/fs/ext3/ext3 \ ,30)) -$(eval $(call KMOD_template,EXT4_FS,fs-ext4,\ +$(eval $(call KMOD_template,EXT4_FS,ext4-fs,\ $(MODULES_DIR)/kernel/fs/mbcache \ $(MODULES_DIR)/kernel/fs/jbd2/jbd2 \ $(MODULES_DIR)/kernel/fs/ext4/ext4 \ ,30)) -$(eval $(call KMOD_template,FUSE_FS,fs-fuse,\ +$(eval $(call KMOD_template,FUSE_FS,fuse-fs,\ $(MODULES_DIR)/kernel/fs/fuse/fuse \ ,30)) -$(eval $(call KMOD_template,HFSPLUS_FS,fs-hfsplus,\ +$(eval $(call KMOD_template,HFSPLUS_FS,hfsplus-fs,\ $(MODULES_DIR)/kernel/fs/hfsplus/hfsplus \ ,30)) -$(eval $(call KMOD_template,SUNRPC,fs-rpc,\ +$(eval $(call KMOD_template,SUNRPC,sunrpc,\ $(MODULES_DIR)/kernel/net/sunrpc/sunrpc \ ,24)) -$(eval $(call KMOD_template,SUNRPC_GSS,fs-rpcgss,\ +$(eval $(call KMOD_template,SUNRPC_GSS,sunrpc-gss,\ $(MODULES_DIR)/kernel/net/sunrpc/auth_gss/auth_rpcgss \ ,25)) -$(eval $(call KMOD_template,RPCSEC_GSS_KRB5,fs-rpcsec-krb5,\ +$(eval $(call KMOD_template,RPCSEC_GSS_KRB5,rpcsec-gss-krb5,\ $(MODULES_DIR)/kernel/net/sunrpc/auth_gss/rpcsec_gss_krb5 \ ,26)) ifneq ($(ADK_KERNEL_NFS_FS),y) -$(eval $(call KMOD_template,NFS_FS,fs-nfs,\ +$(eval $(call KMOD_template,NFS_FS,nfs-fs,\ $(MODULES_DIR)/kernel/fs/lockd/lockd \ $(MODULES_DIR)/kernel/fs/nfs/nfs \ ,30)) endif -$(eval $(call KMOD_template,EXPORTFS,fs-exportfs,\ +$(eval $(call KMOD_template,EXPORTFS,exportfs,\ $(MODULES_DIR)/kernel/fs/exportfs/exportfs \ ,20)) -$(eval $(call KMOD_template,NFSD,fs-nfsd,\ +$(eval $(call KMOD_template,NFSD,nfsd,\ $(MODULES_DIR)/kernel/fs/nfsd/nfsd \ ,30)) -$(eval $(call KMOD_template,NTFS_FS,fs-ntfs,\ +$(eval $(call KMOD_template,NTFS_FS,ntfs-fs,\ $(MODULES_DIR)/kernel/fs/ntfs/ntfs \ ,30)) -$(eval $(call KMOD_template,VFAT_FS,fs-vfat,\ +$(eval $(call KMOD_template,VFAT_FS,vfat-fs,\ $(MODULES_DIR)/kernel/fs/fat/fat \ $(MODULES_DIR)/kernel/fs/fat/vfat \ ,30)) -$(eval $(call KMOD_template,XFS_FS,fs-xfs,\ +$(eval $(call KMOD_template,XFS_FS,xfs-fs,\ $(MODULES_DIR)/kernel/fs/xfs/xfs \ ,30)) -$(eval $(call KMOD_template,YAFFS_FS,fs-yaffs,\ +$(eval $(call KMOD_template,YAFFS_FS,yaffs-fs,\ $(MODULES_DIR)/kernel/fs/yaffs2/yaffs \ ,30)) -$(eval $(call KMOD_template,REISERFS_FS,fs-reiserfs,\ +$(eval $(call KMOD_template,REISERFS_FS,reiserfs-fs,\ $(MODULES_DIR)/kernel/fs/reiserfs/reiserfs \ ,30)) -$(eval $(call KMOD_template,ISO9660_FS,fs-iso9660,\ +$(eval $(call KMOD_template,ISO9660_FS,iso9660-fs,\ $(MODULES_DIR)/kernel/fs/isofs/isofs \ ,30)) -$(eval $(call KMOD_template,UDF_FS,fs-udf,\ +$(eval $(call KMOD_template,UDF_FS,udf-fs,\ $(MODULES_DIR)/kernel/fs/udf/udf \ ,30)) # # Multimedia # -$(eval $(call KMOD_template,SOUND,soundcore,\ +$(eval $(call KMOD_template,SOUND,sound,\ $(MODULES_DIR)/kernel/sound/soundcore \ ,30)) -$(eval $(call KMOD_template,SND,sound-alsa,\ +$(eval $(call KMOD_template,SND,snd,\ $(MODULES_DIR)/kernel/sound/core/snd-page-alloc \ $(MODULES_DIR)/kernel/sound/core/snd \ $(MODULES_DIR)/kernel/sound/core/snd-timer \ $(MODULES_DIR)/kernel/sound/core/snd-pcm \ ,40)) -$(eval $(call KMOD_template,SND_OSSEMUL,sound-alsa-oss-emul,\ +$(eval $(call KMOD_template,SND_OSSEMUL,snd-ossemul,\ $(MODULES_DIR)/kernel/sound/core/oss/snd-mixer-oss \ $(MODULES_DIR)/kernel/sound/core/oss/snd-pcm-oss \ ,45)) -$(eval $(call KMOD_template,SND_AC97_CODEC,sound-alsa-ac97-codec,\ +$(eval $(call KMOD_template,SND_AC97_CODEC,snd-ac97-codec,\ $(MODULES_DIR)/kernel/sound/ac97_bus \ $(MODULES_DIR)/kernel/sound/pci/ac97/snd-ac97-codec \ ,50)) -$(eval $(call KMOD_template,SND_VIA82XX,sound-alsa-via82xx,\ +$(eval $(call KMOD_template,SND_VIA82XX,snd-via82xx,\ $(MODULES_DIR)/kernel/sound/drivers/mpu401/snd-mpu401-uart \ $(MODULES_DIR)/kernel/sound/pci/snd-via82xx \ ,55)) -$(eval $(call KMOD_template,SND_ENS1370,sound-alsa-ens1370,\ +$(eval $(call KMOD_template,SND_ENS1370,snd-ens1370,\ $(MODULES_DIR)/kernel/sound/pci/snd-ens1370 \ ,55)) -$(eval $(call KMOD_template,SND_CS5535AUDIO,sound-alsa-cs5535,\ +$(eval $(call KMOD_template,SND_CS5535AUDIO,sound-cs5535audio,\ $(MODULES_DIR)/kernel/sound/pci/cs5535audio/snd-cs5535audio \ ,55)) @@ -967,11 +943,9 @@ $(eval $(call KMOD_template,PWC,pwc,\ $(MODULES_DIR)/kernel/drivers/usb/pwc \ ,70)) - # # PCMCIA/CardBus # - $(eval $(call KMOD_template,PCCARD,pccard,\ $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia_core \ ,40)) @@ -985,7 +959,7 @@ $(eval $(call KMOD_template,CARDBUS,cardbus,\ $(MODULES_DIR)/kernel/drivers/pcmcia/yenta_socket \ ,50)) -$(eval $(call KMOD_template,PCMCIA_SERIAL_CS,pcmcia-serial,\ +$(eval $(call KMOD_template,PCMCIA_SERIAL_CS,pcmcia-serial-cs,\ $(MODULES_DIR)/kernel/drivers/serial/serial_cs \ ,55)) @@ -993,46 +967,38 @@ $(eval $(call KMOD_template,PCMCIA_SERIAL_CS,pcmcia-serial,\ # Input # -$(eval $(call KMOD_template,KEYBOARD_ATKBD,input-keyboard,\ +$(eval $(call KMOD_template,KEYBOARD_ATKBD,keyboard-atkbd,\ $(MODULES_DIR)/kernel/drivers/input/keyboard/atkbd \ ,45)) -$(eval $(call KMOD_template,INPUT_MOUSEDEV,input-mouse,\ +$(eval $(call KMOD_template,INPUT_MOUSEDEV,input-mousedev,\ $(MODULES_DIR)/kernel/drivers/input/mousedev \ ,45)) # # USB # -USB_CORE_MODULE = drivers/usb/core/usbcore -USB_OHCI_MODULE = drivers/usb/host/ohci-hcd -USB_UHCI_MODULE = drivers/usb/host/uhci-hcd -USB_OHCI_SYMBOL = USB_OHCI_HCD -USB_UHCI_SYMBOL = USB_UHCI_HCD ifeq ($(ADK_LINUX_CRIS_FOXBOARD),) -$(eval $(call KMOD_template,USB,usb-core,\ - $(MODULES_DIR)/kernel/$(USB_CORE_MODULE) \ +$(eval $(call KMOD_template,USB,usb,\ + $(MODULES_DIR)/kernel/drivers/usb/core/usbcore \ ,50)) endif -$(eval $(call KMOD_template,$(USB_OHCI_SYMBOL),usb-ohci,\ - $(MODULES_DIR)/kernel/$(USB_OHCI_MODULE) \ +$(eval $(call KMOD_template,USB_OHCI_HCD,usb-ohci-hcd,\ + $(MODULES_DIR)/kernel/drivers/usb/host/ohci-hcd \ ,60)) -$(eval $(call KMOD_template,$(USB_UHCI_SYMBOL),usb-uhci,\ - $(MODULES_DIR)/kernel/$(USB_UHCI_MODULE) \ +$(eval $(call KMOD_template,USB_UHCI_HCD,usb-uhci-hcd,\ + $(MODULES_DIR)/kernel/drivers/usb/host/uhci-hcd \ ,60)) -$(eval $(call KMOD_template,USB_EHCI_HCD,usb-ehci,\ +$(eval $(call KMOD_template,USB_EHCI_HCD,usb-ehci-hcd,\ $(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd \ ,60)) -USB_ACM_MODULES = drivers/usb/class/cdc-acm -USB_PRINTER_MODULES = drivers/usb/class/usblp - $(eval $(call KMOD_template,USB_ACM,usb-acm,\ - $(foreach mod,$(USB_ACM_MODULES),$(MODULES_DIR)/kernel/$(mod)) \ + $(MODULES_DIR)/kernel/drivers/usb/class/cdc-acm \ ,70)) $(eval $(call KMOD_template,USB_HID,usb-hid,\ @@ -1040,7 +1006,7 @@ $(eval $(call KMOD_template,USB_HID,usb-hid,\ ,70)) $(eval $(call KMOD_template,USB_PRINTER,usb-printer,\ - $(foreach mod,$(USB_PRINTER_MODULES),$(MODULES_DIR)/kernel/$(mod)) \ + $(MODULES_DIR)/kernel/drivers/usb/class/usblp \ ,70)) $(eval $(call KMOD_template,USB_SERIAL,usb-serial,\ @@ -1051,7 +1017,7 @@ $(eval $(call KMOD_template,USB_SERIAL_BELKIN,usb-serial-belkin,\ $(MODULES_DIR)/kernel/drivers/usb/serial/belkin_sa \ ,71)) -$(eval $(call KMOD_template,USB_SERIAL_FTDI_SIO,usb-serial-ftdi,\ +$(eval $(call KMOD_template,USB_SERIAL_FTDI_SIO,usb-serial-ftdi-sio,\ $(MODULES_DIR)/kernel/drivers/usb/serial/ftdi_sio \ ,71)) @@ -1078,48 +1044,45 @@ $(eval $(call KMOD_template,USB_PEGASUS,usb-pegasus,\ # # Bluetooth # -BLUETOOTH_PREFIX = BT -BLUETOOTH = bluetooth -$(eval $(call KMOD_template,$(BLUETOOTH_PREFIX),bluetooth,\ - $(MODULES_DIR)/kernel/net/bluetooth/$(BLUETOOTH) \ +$(eval $(call KMOD_template,BT,bt,\ + $(MODULES_DIR)/kernel/net/bluetooth/bluetooth \ ,70)) -$(eval $(call KMOD_template,$(BLUETOOTH_PREFIX)_HCIBCM203X,bluetooth-hci-bcm203x,\ +$(eval $(call KMOD_template,BT_HCIBCM203X,bt-hcibcm203x,\ $(MODULES_DIR)/kernel/drivers/bluetooth/bcm203x \ ,75)) -$(eval $(call KMOD_template,$(BLUETOOTH_PREFIX)_HCIBTUSB,bluetooth-hci-usb,\ +$(eval $(call KMOD_template,BT_HCIBTUSB,bt-hcibtusb,\ $(MODULES_DIR)/kernel/drivers/bluetooth/btusb \ ,76)) -$(eval $(call KMOD_template,$(BLUETOOTH_PREFIX)_HCIUART,bluetooth-hci-uart,\ +$(eval $(call KMOD_template,BT_HCIUART,bt-hciuart,\ $(MODULES_DIR)/kernel/drivers/bluetooth/hci_uart \ ,75)) -$(eval $(call KMOD_template,$(BLUETOOTH_PREFIX)_L2CAP,bluetooth-l2cap,\ +$(eval $(call KMOD_template,BT_L2CAP,bt-l2cap,\ $(MODULES_DIR)/kernel/net/bluetooth/l2cap \ ,80)) -$(eval $(call KMOD_template,$(BLUETOOTH_PREFIX)_SCO,bluetooth-sco,\ +$(eval $(call KMOD_template,BT_SCO,bt-sco,\ $(MODULES_DIR)/kernel/net/bluetooth/sco \ ,85)) -$(eval $(call KMOD_template,$(BLUETOOTH_PREFIX)_BNEP,bluetooth-bnep,\ +$(eval $(call KMOD_template,BT_BNEP,bt-bnep,\ $(MODULES_DIR)/kernel/net/bluetooth/bnep/bnep \ ,85)) -$(eval $(call KMOD_template,$(BLUETOOTH_PREFIX)_RFCOMM,bluetooth-rfcomm,\ +$(eval $(call KMOD_template,BT_RFCOMM,bt-rfcomm,\ $(MODULES_DIR)/kernel/net/bluetooth/rfcomm/rfcomm \ ,85)) # # Misc devices # -SOFTDOG_MODULES = drivers/char/watchdog/softdog $(eval $(call KMOD_template,SOFTDOG,softdog,\ - $(foreach mod,$(SOFTDOG_MODULES),$(MODULES_DIR)/kernel/$(mod)) \ + $(MODULES_DIR)/kernel/drivers/char/watchdog/softdog \ ,95)) $(eval $(call KMOD_template,FW_LOADER,fw-loader,\ @@ -1130,109 +1093,109 @@ $(eval $(call KMOD_template,EEPROM_93CX6,eeprom-93cx6,\ $(MODULES_DIR)/kernel/drivers/misc/eeprom/eeprom_93cx6 \ ,05)) -$(eval $(call KMOD_template,LEDS_CLASS,led-class,\ +$(eval $(call KMOD_template,LEDS_CLASS,leds-class,\ $(MODULES_DIR)/kernel/drivers/leds/led-class \ ,05)) # # NLS # -$(eval $(call KMOD_template,NLS,nls-base,\ +$(eval $(call KMOD_template,NLS,nls,\ $(MODULES_DIR)/kernel/fs/nls/nls_base \ ,10)) -$(eval $(call KMOD_template,NLS_CODEPAGE_437,nls-cp437,\ +$(eval $(call KMOD_template,NLS_CODEPAGE_437,nls-codepage-437,\ $(MODULES_DIR)/kernel/fs/nls/nls_cp437 \ ,20)) -$(eval $(call KMOD_template,NLS_CODEPAGE_737,nls-cp737,\ +$(eval $(call KMOD_template,NLS_CODEPAGE_737,nls-codepage-737,\ $(MODULES_DIR)/kernel/fs/nls/nls_cp737 \ ,20)) -$(eval $(call KMOD_template,NLS_CODEPAGE_775,nls-cp775,\ +$(eval $(call KMOD_template,NLS_CODEPAGE_775,nls-codepage-775,\ $(MODULES_DIR)/kernel/fs/nls/nls_cp775 \ ,20)) -$(eval $(call KMOD_template,NLS_CODEPAGE_850,nls-cp850,\ +$(eval $(call KMOD_template,NLS_CODEPAGE_850,nls-codepage-850,\ $(MODULES_DIR)/kernel/fs/nls/nls_cp850 \ ,20)) -$(eval $(call KMOD_template,NLS_CODEPAGE_852,nls-cp852,\ +$(eval $(call KMOD_template,NLS_CODEPAGE_852,nls-codepage-852,\ $(MODULES_DIR)/kernel/fs/nls/nls_cp852 \ ,20)) -$(eval $(call KMOD_template,NLS_CODEPAGE_857,nls-cp857,\ +$(eval $(call KMOD_template,NLS_CODEPAGE_857,nls-codepage-857,\ $(MODULES_DIR)/kernel/fs/nls/nls_cp857 \ ,20)) -$(eval $(call KMOD_template,NLS_CODEPAGE_860,nls-cp860,\ +$(eval $(call KMOD_template,NLS_CODEPAGE_860,nls-codepage-860,\ $(MODULES_DIR)/kernel/fs/nls/nls_cp860 \ ,20)) -$(eval $(call KMOD_template,NLS_CODEPAGE_861,nls-cp861,\ +$(eval $(call KMOD_template,NLS_CODEPAGE_861,nls-codepage-861,\ $(MODULES_DIR)/kernel/fs/nls/nls_cp861 \ ,20)) -$(eval $(call KMOD_template,NLS_CODEPAGE_862,nls-cp862,\ +$(eval $(call KMOD_template,NLS_CODEPAGE_862,nls-codepage-862,\ $(MODULES_DIR)/kernel/fs/nls/nls_cp862 \ ,20)) -$(eval $(call KMOD_template,NLS_CODEPAGE_863,nls-cp863,\ +$(eval $(call KMOD_template,NLS_CODEPAGE_863,nls-codepage-863,\ $(MODULES_DIR)/kernel/fs/nls/nls_cp863 \ ,20)) -$(eval $(call KMOD_template,NLS_CODEPAGE_864,nls-cp864,\ +$(eval $(call KMOD_template,NLS_CODEPAGE_864,nls-codepage-864,\ $(MODULES_DIR)/kernel/fs/nls/nls_cp864 \ ,20)) -$(eval $(call KMOD_template,NLS_CODEPAGE_865,nls-cp865,\ +$(eval $(call KMOD_template,NLS_CODEPAGE_865,nls-codepage-865,\ $(MODULES_DIR)/kernel/fs/nls/nls_cp865 \ ,20)) -$(eval $(call KMOD_template,NLS_CODEPAGE_866,nls-cp866,\ +$(eval $(call KMOD_template,NLS_CODEPAGE_866,nls-codepage-866,\ $(MODULES_DIR)/kernel/fs/nls/nls_cp866 \ ,20)) -$(eval $(call KMOD_template,NLS_CODEPAGE_869,nls-cp869,\ +$(eval $(call KMOD_template,NLS_CODEPAGE_869,nls-codepage-869,\ $(MODULES_DIR)/kernel/fs/nls/nls_cp869 \ ,20)) NLS_CODEPAGE_874_MODULES := fs/nls/nls_cp874 -$(eval $(call KMOD_template,NLS_CODEPAGE_874,nls-cp874,\ +$(eval $(call KMOD_template,NLS_CODEPAGE_874,nls-codepage-874,\ $(foreach mod,$(NLS_CODEPAGE_874_MODULES),$(MODULES_DIR)/kernel/$(mod)) \ ,20)) NLS_CODEPAGE_932_MODULES := fs/nls/nls_cp932 NLS_CODEPAGE_932_MODULES += fs/nls/nls_euc-jp -$(eval $(call KMOD_template,NLS_CODEPAGE_932,nls-cp932,\ +$(eval $(call KMOD_template,NLS_CODEPAGE_932,nls-codepage-932,\ $(foreach mod,$(NLS_CODEPAGE_932_MODULES),$(MODULES_DIR)/kernel/$(mod)) \ ,20)) NLS_CODEPAGE_936_MODULES := fs/nls/nls_cp936 -$(eval $(call KMOD_template,NLS_CODEPAGE_936,nls-cp936,\ +$(eval $(call KMOD_template,NLS_CODEPAGE_936,nls-codepage-936,\ $(foreach mod,$(NLS_CODEPAGE_936_MODULES),$(MODULES_DIR)/kernel/$(mod)) \ ,20)) NLS_CODEPAGE_949_MODULES := fs/nls/nls_cp949 -$(eval $(call KMOD_template,NLS_CODEPAGE_949,nls-cp949,\ +$(eval $(call KMOD_template,NLS_CODEPAGE_949,nls-codepage-949,\ $(foreach mod,$(NLS_CODEPAGE_949_MODULES),$(MODULES_DIR)/kernel/$(mod)) \ ,20)) NLS_CODEPAGE_950_MODULES := fs/nls/nls_cp950 -$(eval $(call KMOD_template,NLS_CODEPAGE_950,nls-cp950,\ +$(eval $(call KMOD_template,NLS_CODEPAGE_950,nls-codepage-950,\ $(foreach mod,$(NLS_CODEPAGE_950_MODULES),$(MODULES_DIR)/kernel/$(mod)) \ ,20)) -$(eval $(call KMOD_template,NLS_CODEPAGE_1250,nls-cp1250,\ +$(eval $(call KMOD_template,NLS_CODEPAGE_1250,nls-codepage-1250,\ $(MODULES_DIR)/kernel/fs/nls/nls_cp1250 \ ,20)) -$(eval $(call KMOD_template,NLS_CODEPAGE_1251,nls-cp1251,\ +$(eval $(call KMOD_template,NLS_CODEPAGE_1251,nls-codepage-1251,\ $(MODULES_DIR)/kernel/fs/nls/nls_cp1251 \ ,20)) @@ -1332,23 +1295,23 @@ MISDN_MODULES+=drivers/isdn/hardware/mISDN/mISDN_isac MISDN_MODULES+=drivers/isdn/hardware/mISDN/mISDN_x25dte MISDN_MODULES+=drivers/isdn/hardware/mISDN/l3udss1 -$(eval $(call KMOD_template,MISDN_DRV,misdn, \ +$(eval $(call KMOD_template,MISDN_DRV,misdn-drv, \ $(foreach mod, $(MISDN_MODULES),$(MODULES_DIR)/kernel/$(mod)) \ ,75)) -$(eval $(call KMOD_template,MISDN_AVM_FRITZ,misdn-avm, \ +$(eval $(call KMOD_template,MISDN_AVM_FRITZ,misdn-avm-fritz, \ $(MODULES_DIR)/kernel/drivers/isdn/hardware/mISDN/avmfritz \ ,80)) -$(eval $(call KMOD_template,MISDN_HFCPCI,misdn-hfc-pci, \ +$(eval $(call KMOD_template,MISDN_HFCPCI,misdn-hfcpci, \ $(MODULES_DIR)/kernel/drivers/isdn/hardware/mISDN/hfcpci \ ,80)) -$(eval $(call KMOD_template,MISDN_HFCMULTI,misdn-hfc-multi, \ +$(eval $(call KMOD_template,MISDN_HFCMULTI,misdn-hfcmulti, \ $(MODULES_DIR)/kernel/drivers/isdn/hardware/mISDN/hfcmulti \ ,80)) -$(eval $(call KMOD_template,MISDN_HFCMINI,misdn-hfc-minipci, \ +$(eval $(call KMOD_template,MISDN_HFCMINI,misdn-hfcmini, \ $(MODULES_DIR)/kernel/drivers/isdn/hardware/mISDN/hfcsmini \ ,80)) diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 3a7320d6e..a3ca4590c 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -20,11 +20,13 @@ ${_CONFIGURE_COOKIE}: ${_PATCH_COOKIE} ifneq ($(filter autotool,${CONFIGURE_STYLE}),) cd ${WRKBUILD}; \ - autoreconf -vif $(MAKE_TRACE) + env AUTOCONF_VERSION=2.62 \ + AUTOMAKE_VERSION=1.9 \ + autoreconf -vif $(MAKE_TRACE) endif ifneq ($(filter autoconf,${CONFIGURE_STYLE}),) cd ${WRKBUILD}; \ - autoconf $(MAKE_TRACE) + env AUTOCONF_VERSION=2.62 autoconf $(MAKE_TRACE) endif ifneq ($(filter gnu,${CONFIGURE_STYLE}),) @$(CMD_TRACE) "configuring... " diff --git a/mk/vars.mk b/mk/vars.mk index cfc1d2632..cba312e2d 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -14,10 +14,7 @@ TARGET_DEBUGGING:= -g3 -fno-omit-frame-pointer else TARGET_DEBUGGING:= -fomit-frame-pointer endif -ifeq ($(ADK_SSP),y) -TARGET_SSP:= -fstack-protector-all -endif -TARGET_CFLAGS:= $(TARGET_OPTIMIZATION) $(TARGET_CFLAGS_ARCH) $(TARGET_DEBUGGING) $(TARGET_SSP) +TARGET_CFLAGS:= $(TARGET_OPTIMIZATION) $(TARGET_CFLAGS_ARCH) $(TARGET_DEBUGGING) BASE_DIR:= $(TOPDIR) DISTDIR?= ${BASE_DIR}/dl diff --git a/package/Config.in b/package/Config.in index e76397d57..507497e0d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -467,10 +467,15 @@ source "package/opencdk/Config.in" source "package/obexftp/Config.in.lib" source "package/openobex/Config.in" source "package/libosip2/Config.in" +source "package/libosip2/Config.in.lib" source "package/libowfat/Config.in" +source "package/libowfat/Config.in.lib" source "package/libp11/Config.in" +source "package/libp11/Config.in.lib" source "package/libpcap/Config.in" +source "package/libpcap/Config.in.lib" source "package/libpri/Config.in" +source "package/libpri/Config.in.lib" source "package/pango/Config.in" source "package/pcre/Config.in" source "package/libpng/Config.in" diff --git a/package/atk/Makefile b/package/atk/Makefile index f7172b76b..0980de0cc 100644 --- a/package/atk/Makefile +++ b/package/atk/Makefile @@ -6,10 +6,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= atk PKG_VERSION:= 1.29.3 PKG_RELEASE:= 1 -PKG_BUILDDEP+= glib PKG_MD5SUM:= f587d9285b2d0ac35ea95acef673517c PKG_DESCR:= atk library PKG_SECTION:= libs +PKG_BUILDDEP+= glib PKG_URL:= http://www.gnome.org PKG_SITES:= ${MASTER_SITE_GNOME:=/atk/1.29/} diff --git a/package/aufs2-util/Makefile b/package/aufs2-util/Makefile index 3d100010d..36b1b7bba 100644 --- a/package/aufs2-util/Makefile +++ b/package/aufs2-util/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_DESCR:= aufs2 utilities PKG_SECTION:= admin PKG_URL:= http://aufs.sf.net/ -PKG_HOST_DEPENDS:= !cygwin !freebsd +PKG_HOST_DEPENDS:= !cygwin !freebsd !openbsd NO_DISTFILES:= 1 diff --git a/package/base-files/extra/etc/network/if-post-down.d/01-bridge b/package/base-files/extra/etc/network/if-post-down.d/01-bridge index eda1fe3bf..47f3c976b 100755 --- a/package/base-files/extra/etc/network/if-post-down.d/01-bridge +++ b/package/base-files/extra/etc/network/if-post-down.d/01-bridge @@ -22,3 +22,5 @@ for IF in $INTERFACES; do done ip link set down dev $IFACE || exit 1 +brctl delbr $IFACE +exit 0 diff --git a/package/base-files/extra/etc/network/if-post-down.d/02-vlan b/package/base-files/extra/etc/network/if-post-down.d/02-vlan new file mode 100755 index 000000000..e448a7641 --- /dev/null +++ b/package/base-files/extra/etc/network/if-post-down.d/02-vlan @@ -0,0 +1,10 @@ +#!/bin/sh + +[ -x /sbin/vconfig ] || exit 0 + +[ -e /proc/net/vlan/$IFACE ] && ( + ip link set down dev $IFACE + vconfig rem $IFACE +) + +exit 0 diff --git a/package/base-files/extra/etc/network/if-pre-up.d/01-atm b/package/base-files/extra/etc/network/if-pre-up.d/01-atm index 08baf73c7..5c168c001 100644..100755 --- a/package/base-files/extra/etc/network/if-pre-up.d/01-atm +++ b/package/base-files/extra/etc/network/if-pre-up.d/01-atm @@ -1,18 +1,15 @@ #!/bin/sh -if [ ! -x /usr/sbin/br2684ctl ] -then - exit 0 -fi +[ -x /usr/sbin/br2684ctl ] || exit 0 -[ "$METHOD" == "atm" ] || exit 0 +[ "${IFACE%%[0-9]*}" = "nas" ] || exit 0 [ "$IF_ATM_ENCAPS" ] || encap=0 [ "$IF_ATM_PAYLOAD" ] || payload=1 -[ "$IF_ATM_VPI" ] || $IF_ATM_VPI=1 -[ "$IF_ATM_VCI" ] || $IF_ATM_VCI=32 +[ "$IF_ATM_VPI" ] || IF_ATM_VPI=1 +[ "$IF_ATM_VCI" ] || IF_ATM_VCI=32 -case "$IF_ATM_PAYLOAD" in +[ "$IF_ATM_PAYLOAD" ] && case "$IF_ATM_PAYLOAD" in bridged) payload=1 ;; @@ -25,7 +22,7 @@ routed) ;; esac -case "$IF_ATM_ENCAPS" in +[ "$IF_ATM_ENCAPS" ] && case "$IF_ATM_ENCAPS" in llc) encap=0 ;; @@ -38,6 +35,7 @@ vc) ;; esac -br2684ctl -b -c 0 -e $encap -p $payload -a $IF_ATM_VPI.$IF_ATM_VCI -ifconfig nas0 up +br2684ctl -b -c ${IFACE##*[a-z]} -e $encap -p $payload -a $IF_ATM_VPI.$IF_ATM_VCI +ifconfig nas${IFACE##*[a-z]} up + exit 0 diff --git a/package/base-files/extra/etc/network/if-pre-up.d/02-vlan b/package/base-files/extra/etc/network/if-pre-up.d/02-vlan new file mode 100755 index 000000000..09b9cf0da --- /dev/null +++ b/package/base-files/extra/etc/network/if-pre-up.d/02-vlan @@ -0,0 +1,35 @@ +#!/bin/sh + +[ -x /sbin/vconfig ] || exit 0 + +case "$IFACE" in + vlan*) + vconfig set_name_type VLAN_PLUS_VID_NO_PAD + VLANID=`echo $IFACE|sed "s/vlan*//"` + ;; + eth*.*) + vconfig set_name_type DEV_PLUS_VID_NO_PAD + VLANID=`echo $IFACE|sed "s/eth[0-9][0-9]*\.*//g"` + IF_VLAN_RAW_DEVICE=`echo $IFACE|sed "s/\(eth[0-9][0-9]*\)\..*/\1/"` + ;; + *) + exit 0 + ;; +esac + +if [ "$IF_VLAN_RAW_DEVICE" != "" ]; then + if ! grep -q "$IF_VLAN_RAW_DEVICE" /proc/net/dev + then + echo "$IF_VLAN_RAW_DEVICE does not exist, unable to create $IFACE" + exit 1 + fi + ip link set up dev $IF_VLAN_RAW_DEVICE + vconfig add $IF_VLAN_RAW_DEVICE $VLANID + if [ "$IF_MAC_ADDRESS" != "" ] + then + ip link set $IF_VLAN_RAW_DEVICE.$VLANID address $IF_MAC_ADDRESS + fi + ip link set up dev $IF_VLAN_RAW_DEVICE.$VLANID +fi + +exit 0 diff --git a/package/base-files/extra/etc/network/if-pre-up.d/02-bridge b/package/base-files/extra/etc/network/if-pre-up.d/03-bridge index 766084de1..41ddb2b58 100755 --- a/package/base-files/extra/etc/network/if-pre-up.d/02-bridge +++ b/package/base-files/extra/etc/network/if-pre-up.d/03-bridge @@ -1,9 +1,6 @@ #!/bin/sh -if [ ! -x /usr/sbin/brctl ] -then - exit 0 -fi +[ -x /usr/sbin/brctl ] || exit 0 case "$IF_BRIDGE_PORTS" in "") diff --git a/package/base-files/extra/etc/network/if-up.d/01-bridge b/package/base-files/extra/etc/network/if-up.d/01-bridge new file mode 100755 index 000000000..e5962f12f --- /dev/null +++ b/package/base-files/extra/etc/network/if-up.d/01-bridge @@ -0,0 +1,4 @@ +#!/bin/sh + +[ "${IFACE%%[0-9]*}" = "br" ] && ip link set up dev $IFACE +exit 0 diff --git a/package/bluez-firmware/Makefile b/package/bluez-firmware/Makefile index c84bb0625..038e04d45 100644 --- a/package/bluez-firmware/Makefile +++ b/package/bluez-firmware/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 1cc3cefad872e937e05de5a0a2b390dd PKG_DESCR:= Bluez firmware for BCM2033 PKG_SECTION:= bluetooth -PKG_DEPENDS:= kmod-bluetooth bluez +PKG_DEPENDS:= kmod-bt bluez PKG_URL:= http://www.bluez.org PKG_SITES:= http://bluez.sourceforge.net/download/ diff --git a/package/bluez/Makefile b/package/bluez/Makefile index 2d8c14735..de238080f 100644 --- a/package/bluez/Makefile +++ b/package/bluez/Makefile @@ -4,12 +4,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= bluez -PKG_VERSION:= 4.57 -PKG_RELEASE:= 2 -PKG_MD5SUM:= dc29e54f1204ac4215caeeee062b26f6 +PKG_VERSION:= 4.59 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 1c7cee215bc84656b1edee019cee78f5 PKG_DESCR:= bluetooth libraries and applications PKG_SECTION:= bluetooth -PKG_DEPENDS:= kmod-bluetooth libusb glib dbus +PKG_DEPENDS:= kmod-bt libusb glib dbus PKG_BUILDDEP+= libusb dbus glib PKG_URL:= http://www.bluez.org PKG_SITES:= ${MASTER_SITE_KERNEL:=bluetooth/} diff --git a/package/bluez/patches/patch-Makefile_in b/package/bluez/patches/patch-Makefile_in new file mode 100644 index 000000000..4334402d7 --- /dev/null +++ b/package/bluez/patches/patch-Makefile_in @@ -0,0 +1,27 @@ +--- bluez-4.59.orig/Makefile.in Thu Dec 24 17:42:48 2009 ++++ bluez-4.59/Makefile.in Tue Dec 29 01:31:12 2009 +@@ -48,7 +48,6 @@ noinst_PROGRAMS = $(am__EXEEXT_7) $(am__EXEEXT_8) $(am + $(am__EXEEXT_10) $(am__EXEEXT_11) + @SBC_TRUE@am__append_1 = sbc/libsbc.la + @SBC_TRUE@am__append_2 = sbc/sbcinfo sbc/sbcdec sbc/sbcenc +-@SBC_TRUE@@SNDFILE_TRUE@am__append_3 = sbc/sbctester + @NETLINK_TRUE@am__append_4 = plugins/netlink.la + @ECHOPLUGIN_TRUE@am__append_5 = echo + @ECHOPLUGIN_TRUE@am__append_6 = plugins/echo.c +@@ -318,7 +317,6 @@ sbc_libsbc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $( + @DUND_TRUE@am__EXEEXT_6 = compat/dund$(EXEEXT) + @SBC_TRUE@am__EXEEXT_7 = sbc/sbcinfo$(EXEEXT) sbc/sbcdec$(EXEEXT) \ + @SBC_TRUE@ sbc/sbcenc$(EXEEXT) +-@SBC_TRUE@@SNDFILE_TRUE@am__EXEEXT_8 = sbc/sbctester$(EXEEXT) + @TOOLS_TRUE@am__EXEEXT_9 = tools/avinfo$(EXEEXT) tools/ppporc$(EXEEXT) \ + @TOOLS_TRUE@ tools/hcieventmask$(EXEEXT) \ + @TOOLS_TRUE@ tools/hcisecfilter$(EXEEXT) +@@ -918,8 +916,6 @@ lib_libbluetooth_la_DEPENDENCIES = $(local_headers) + @SBC_TRUE@sbc_sbcdec_LDADD = sbc/libsbc.la + @SBC_TRUE@sbc_sbcenc_SOURCES = sbc/sbcenc.c sbc/formats.h + @SBC_TRUE@sbc_sbcenc_LDADD = sbc/libsbc.la +-@SBC_TRUE@@SNDFILE_TRUE@sbc_sbctester_LDADD = @SNDFILE_LIBS@ +-@SBC_TRUE@@SNDFILE_TRUE@sbc_sbctest_CFLAGS = @SNDFILE_CFLAGS@ + @NETLINK_TRUE@plugins_netlink_la_LIBADD = @NETLINK_LIBS@ + @NETLINK_TRUE@plugins_netlink_la_LDFLAGS = -module -avoid-version -no-undefined + @NETLINK_TRUE@plugins_netlink_la_CFLAGS = -fvisibility=hidden @DBUS_CFLAGS@ \ diff --git a/package/bluez/patches/patch-scripts_bluetooth_rules b/package/bluez/patches/patch-scripts_bluetooth_rules new file mode 100644 index 000000000..0ff2c0ef3 --- /dev/null +++ b/package/bluez/patches/patch-scripts_bluetooth_rules @@ -0,0 +1,7 @@ +--- bluez-4.59.orig/scripts/bluetooth.rules Thu Dec 24 17:43:09 2009 ++++ bluez-4.59/scripts/bluetooth.rules Tue Dec 29 01:26:46 2009 +@@ -1,3 +1,3 @@ + # Run helper every time a Bluetooth device appears + # On remove actions, bluetoothd should go away by itself +-ACTION=="add", SUBSYSTEM=="bluetooth", RUN+="/usr/local/sbin/bluetoothd --udev" ++ACTION=="add", SUBSYSTEM=="bluetooth", RUN+="/usr/sbin/bluetoothd --udev" diff --git a/package/bluez/patches/patch-tools_hciattach_c b/package/bluez/patches/patch-tools_hciattach_c index ae8f70f57..e5a84de4f 100644 --- a/package/bluez/patches/patch-tools_hciattach_c +++ b/package/bluez/patches/patch-tools_hciattach_c @@ -1,7 +1,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- bluez-4.12.orig/tools/hciattach.c 2008-08-05 23:14:56.000000000 +0200 -+++ bluez-4.12/tools/hciattach.c 2009-05-12 18:14:29.000000000 +0200 -@@ -107,6 +107,7 @@ static int uart_speed(int s) +--- bluez-4.59.orig/tools/hciattach.c Tue May 19 11:04:10 2009 ++++ bluez-4.59/tools/hciattach.c Tue Dec 29 01:26:35 2009 +@@ -100,6 +100,7 @@ static int uart_speed(int s) return B57600; case 115200: return B115200; @@ -9,7 +9,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ case 230400: return B230400; case 460800: -@@ -125,6 +126,7 @@ static int uart_speed(int s) +@@ -118,6 +119,7 @@ static int uart_speed(int s) return B1500000; case 2000000: return B2000000; diff --git a/package/bogofilter/patches/patch-configure_ac b/package/bogofilter/patches/patch-configure_ac index 8d79ed50f..c3c254400 100644 --- a/package/bogofilter/patches/patch-configure_ac +++ b/package/bogofilter/patches/patch-configure_ac @@ -1,7 +1,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- bogofilter-1.2.0.orig/configure.ac 2009-02-21 21:41:43.000000000 +0100 -+++ bogofilter-1.2.0/configure.ac 2009-05-28 19:47:00.466710794 +0200 -@@ -550,49 +550,6 @@ Cannot link against libdb? Try these ste +--- bogofilter-1.2.0.orig/configure.ac Sat Feb 21 21:41:43 2009 ++++ bogofilter-1.2.0/configure.ac Tue Dec 29 01:38:12 2009 +@@ -550,49 +550,6 @@ Cannot link against libdb? Try these steps to solve th AH_TEMPLATE([HAVE_DB_H], [Have suitable db.h header]) AC_SUBST(LIBDB) diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile index ea81a3630..3a51fdf54 100644 --- a/package/cryptsetup/Makefile +++ b/package/cryptsetup/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 5eea2a77391a8a1a651b31cbaef59e22 PKG_DESCR:= LUKS cryptsetup tools PKG_SECTION:= crypto -PKG_DEPENDS:= libgcrypt device-mapper libuuid libpopt kmod-dm-crypt kmod-crypto-aes kmod-crypto-cbc kmod-crypto-sha256 kmod-dm-mod +PKG_DEPENDS:= libgcrypt device-mapper libuuid libpopt kmod-dm-crypt kmod-crypto-aes kmod-crypto-cbc kmod-crypto-sha256 kmod-blk-dev-dm PKG_BUILDDEP+= libgcrypt popt e2fsprogs lvm PKG_URL:= http://cryptsetup.googlecode.com PKG_SITES:= http://cryptsetup.googlecode.com/files/ diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile index 55bd4eddc..b664183c1 100644 --- a/package/davfs2/Makefile +++ b/package/davfs2/Makefile @@ -6,24 +6,24 @@ include ${TOPDIR}/rules.mk PKG_NAME= davfs2 PKG_VERSION= 1.3.3 PKG_RELEASE= 1 +PKG_MD5SUM= 57def26e4d6d63527e01612d10fd0515 +PKG_DESCR:= WebDAV filesystem +PKG_SECTION:= admin PKG_BUILDDEP+= libiconv neon ifneq (${ADK_PACKAGE_DAVFS2_FUSE}${ADK_PACKAGE_DAVFS2_BOTH},) PKG_BUILDDEP+= fuse endif -PKG_MD5SUM= 57def26e4d6d63527e01612d10fd0515 -PKG_DESCR:= WebDAV filesystem -PKG_SECTION:= admin PKG_URL:= http://savannah.nongnu.org/projects/davfs2 PKG_SITES= ${MASTER_SITE_SOURCEFORGE:=dav/} include ${TOPDIR}/mk/package.mk ifeq (${ADK_PACKAGE_DAVFS2_FUSE},y) -PKG_DEPENDS:= fuse-utils kmod-fuse libiconv neon +PKG_DEPENDS:= fuse-utils kmod-fuse-fs libiconv neon else ifeq (${ADK_PACKAGE_DAVFS2_CODA},y) -PKG_DEPENDS:= kmod-fs-coda libiconv neon +PKG_DEPENDS:= kmod-coda-fs libiconv neon else -PKG_DEPENDS:= kmod-fs-coda fuse-utils kmod-fuse libiconv neon +PKG_DEPENDS:= kmod-coda-fs fuse-utils kmod-fuse-fs libiconv neon endif $(eval $(call PKG_template,DAVFS2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/fuse/Makefile b/package/fuse/Makefile index 95e3580e6..692427867 100644 --- a/package/fuse/Makefile +++ b/package/fuse/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 4879f06570d2225667534c37fea04213 PKG_DESCR:= Filesystem in Userspace (utilities) PKG_SECTION:= admin -PKG_DEPENDS:= kmod-fuse +PKG_DEPENDS:= kmod-fuse-fs PKG_URL:= http://fuse.sourceforge.net PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/} diff --git a/package/igmpproxy/Makefile b/package/igmpproxy/Makefile index b26be8b8d..90a61257a 100644 --- a/package/igmpproxy/Makefile +++ b/package/igmpproxy/Makefile @@ -4,12 +4,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= igmpproxy -PKG_VERSION:= 0.1_beta4 +PKG_VERSION:= 0.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 0a16178aeca5d1bf54c129cec9597f85 -PKG_DESCR:= IGMPproxy is a simple dynamic Multicast Routing Daemon +PKG_MD5SUM:= c56f41ec195bc1fe016369bf74efc5a1 +PKG_DESCR:= a simple dynamic Multicast Routing Daemon PKG_SECTION:= net -PKG_URL:= http://sourceforge.net/projects/igmpproxy +PKG_URL:= http://sourceforge.net/projects/igmpproxy/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=igmpproxy/} include ${TOPDIR}/mk/package.mk diff --git a/package/iptables/Makefile b/package/iptables/Makefile index ae82b7fcf..b7f98121e 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= c67cf30e281a924def6426be0973df56 PKG_DESCR:= The netfilter firewalling software PKG_SECTION:= net -PKG_DEPENDS:= kmod-nf-ip-iptables kmod-nf-conntrack kmod-nf-conntrack-ipv4 kmod-nf-nat kmod-nf-ip-target-masquerade kmod-nf-ip-target-reject kmod-nf-ip-filter +PKG_DEPENDS:= kmod-ip-nf-iptables kmod-nf-conntrack kmod-nf-conntrack-ipv4 kmod-nf-nat kmod-ip-nf-target-masquerade kmod-ip-nf-target-reject kmod-ip-nf-filter PKG_URL:= http://www.netfilter.org PKG_SITES:= http://www.netfilter.org/projects/iptables/files/ \ ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \ diff --git a/package/krb5/Makefile b/package/krb5/Makefile index 9de7e2127..089197773 100644 --- a/package/krb5/Makefile +++ b/package/krb5/Makefile @@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:= krb5 PKG_VERSION:= 1.7 PKG_RELEASE:= 2 -PKG_BUILDDEP+= ncurses e2fsprogs PKG_MD5SUM:= 9f7b3402b4731a7fa543db193bf1b564 PKG_DESCR:= MIT kerberos server PKG_SECTION:= net PKG_DEPENDS:= krb5-libs libncurses libss libcom-err +PKG_BUILDDEP+= ncurses e2fsprogs PKG_URL:= http://web.mit.edu/kerberos PKG_SITES:= http://web.mit.edu/kerberos/dist/krb5/1.7/ @@ -28,6 +28,7 @@ $(eval $(call PKG_template,KRB5_LIBS,krb5-libs,$(PKG_VERSION)-${PKG_RELEASE},,${ TCFLAGS+= -I${STAGING_DIR}/usr/include/et CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --disable-static \ + --disable-profiled \ --with-system-ss \ --with-system-et \ --without-tcl diff --git a/package/krb5/patches/patch-src_Makefile_in b/package/krb5/patches/patch-src_Makefile_in index ba9aff1f1..ef48b68ed 100644 --- a/package/krb5/patches/patch-src_Makefile_in +++ b/package/krb5/patches/patch-src_Makefile_in @@ -1,6 +1,6 @@ ---- krb5-1.7.orig/src/Makefile.in 2009-04-15 22:07:03.000000000 +0200 -+++ krb5-1.7/src/Makefile.in 2009-11-11 19:45:39.281234175 +0100 -@@ -13,7 +13,6 @@ SUBDIRS=util include lib kdc kadmin @lda +--- krb5-1.7.orig/src/Makefile.in Wed Apr 15 22:07:03 2009 ++++ krb5-1.7/src/Makefile.in Mon Dec 28 16:13:47 2009 +@@ -13,7 +13,6 @@ SUBDIRS=util include lib kdc kadmin @ldap_plugin_dir@ plugins/kdb/db2 \ plugins/preauth/pkinit \ plugins/preauth/encrypted_challenge \ diff --git a/package/libX11/Makefile b/package/libX11/Makefile index 3e76da9eb..e1a990ada 100644 --- a/package/libX11/Makefile +++ b/package/libX11/Makefile @@ -23,6 +23,7 @@ $(eval $(call PKG_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEP XAKE_FLAGS+= HOSTCPPFLAGS=-I${STAGING_DIR}/usr/include/xproto CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --enable-xlocale \ + --disable-specs \ --disable-xf86bigfont \ --disable-malloc0returnsnull \ --without-xcb diff --git a/package/miax/Makefile b/package/miax/Makefile index 9e815a0a1..0975cf3f3 100644 --- a/package/miax/Makefile +++ b/package/miax/Makefile @@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= miax PKG_VERSION:= 1.4 PKG_RELEASE:= 1 -PKG_BUILDDEP+= bluez PKG_MD5SUM:= 44f0d2ef46ee2697d890b7b96846adc7 PKG_DESCR:= A console iax (asterisk) client PKG_SECTION:= bluetooth -PKG_DEPENDS:= kmod-bluetooth bluez libpthread +PKG_DEPENDS:= kmod-bt bluez libpthread +PKG_BUILDDEP+= bluez PKG_URL:= http://sourceforge.net/projects/miax PKG_SITES:= http://mesh.dl.sourceforge.net/sourceforge/miax/ diff --git a/package/mtd/src/mtd.c b/package/mtd/src/mtd.c index 1230688b1..bd5b50dab 100644 --- a/package/mtd/src/mtd.c +++ b/package/mtd/src/mtd.c @@ -277,7 +277,7 @@ main(int argc, char **argv) buflen = 0; quiet = 0; - while ((ch = getopt(argc, argv, "Fqe:")) != -1) + while ((ch = getopt(argc, argv, "Fqre:")) != -1) switch (ch) { case 'F': quiet = 1; diff --git a/package/mysql/patches/patch-configure b/package/mysql/patches/patch-configure index cf3239b22..0ce1eac1e 100644 --- a/package/mysql/patches/patch-configure +++ b/package/mysql/patches/patch-configure @@ -1,6 +1,6 @@ ---- mysql-5.1.41.orig/configure 2009-11-04 19:37:28.000000000 +0100 -+++ mysql-5.1.41/configure 2009-12-25 12:18:01.000000000 +0100 -@@ -46976,197 +46976,14 @@ $as_echo "$as_me: error: unknown endiann +--- mysql-5.1.41.orig/configure Wed Nov 4 19:37:28 2009 ++++ mysql-5.1.41/configure Tue Dec 29 13:28:43 2009 +@@ -46976,198 +46976,15 @@ $as_echo "$as_me: error: unknown endianness esac @@ -177,7 +177,7 @@ - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -- + -else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 @@ -195,13 +195,15 @@ -fi - - - +- { $as_echo "$as_me:$LINENO: checking whether Solaris libc atomic functions are available" >&5 $as_echo_n "checking whether Solaris libc atomic functions are available... " >&6; } -@@ -47284,101 +47101,6 @@ fi + # either define HAVE_IB_SOLARIS_ATOMICS or not +@@ -47283,101 +47100,6 @@ _ACEOF + fi done - +- - { $as_echo "$as_me:$LINENO: checking whether pthread_t can be used by Solaris libc atomic functions" >&5 -$as_echo_n "checking whether pthread_t can be used by Solaris libc atomic functions... " >&6; } - # either define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS or not @@ -296,7 +298,6 @@ -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -- - # this is needed to know which one of atomic_cas_32() or atomic_cas_64() + diff --git a/package/mysql/patches/patch-include_my_global_h b/package/mysql/patches/patch-include_my_global_h new file mode 100644 index 000000000..2b262bbb4 --- /dev/null +++ b/package/mysql/patches/patch-include_my_global_h @@ -0,0 +1,54 @@ +--- mysql-5.1.41.orig/include/my_global.h Wed Nov 4 19:28:15 2009 ++++ mysql-5.1.41/include/my_global.h Tue Dec 29 13:39:20 2009 +@@ -18,6 +18,8 @@ + #ifndef _global_h + #define _global_h + ++#include <sys/param.h> ++ + /* + InnoDB depends on some MySQL internals which other plugins should not + need. This is because of InnoDB's foreign key support, "safe" binlog +@@ -424,7 +426,7 @@ C_MODE_END + #ifdef HAVE_FLOAT_H + #include <float.h> + #endif +-#ifdef HAVE_FENV_H ++#if defined(HAVE_FENV_H) && !defined(BSD) + #include <fenv.h> /* For fesetround() */ + #endif + +@@ -454,15 +456,20 @@ C_MODE_END + #undef HAVE_ALLOCA + #undef HAVE_ALLOCA_H + #endif +-#ifdef HAVE_ALLOCA_H ++#if defined(HAVE_ALLOCA_H) && !defined(BSD) + #include <alloca.h> + #endif + + #include <errno.h> /* Recommended by debian */ + /* We need the following to go around a problem with openssl on solaris */ ++#ifdef BSD ++#include <pwd.h> ++#include <unistd.h> ++#else + #if defined(HAVE_CRYPT_H) + #include <crypt.h> + #endif ++#endif + + /* + A lot of our programs uses asserts, so better to always include it +@@ -879,9 +886,11 @@ typedef SOCKET_SIZE_TYPE size_socket; + #endif /* HAVE_FINITE */ + #endif /* isfinite */ + ++/* + #ifndef HAVE_ISNAN + #define isnan(x) ((x) != (x)) + #endif ++*/ + + #ifdef HAVE_ISINF + /* Check if C compiler is affected by GCC bug #39228 */ diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index 9dd44d4cc..cd41f0f92 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -24,6 +24,7 @@ CONFIGURE_ARGS+= --without-cxx \ --with-build-cc=${HOSTCC} \ --without-progs \ --with-fallbacks \ + --disable-termcap \ --without-ada \ --with-shared \ --with-normal \ @@ -69,8 +70,9 @@ post-install: ${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share/terminfo/ for f in ansi dumb linux rxvt screen vt100 vt102 \ vt220 wsvt25 xterm xterm-color xterm-xfree86; do \ + ${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share/terminfo/$${f:0:1}; \ ${INSTALL_DATA} ${WRKINST}/usr/share/terminfo/*/$$f \ - ${IDIR_LIBNCURSES}/usr/share/terminfo/$$f; \ + ${IDIR_LIBNCURSES}/usr/share/terminfo/$${f:0:1}/$$f; \ done ${INSTALL_DIR} ${IDIR_LIBNCURSES_DEV}/usr/include ${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBNCURSES_DEV}/usr/include diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 17de862f3..587abbd6e 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -33,10 +33,10 @@ INSTALL_STYLE:= auto INSTALL_TARGET:= install_sw FAKE_FLAGS+= INSTALL_PREFIX=${WRKINST} -OPENSSL_OPTIONS = shared no-ec no-err no-hw no-krb5 no-threads zlib-dynamic no-engines no-camellia no-idea no-rc5 no-mdc2 no-sha0 no-smime no-aes192 no-ripemd no-cast +OPENSSL_OPTIONS = shared no-ec no-err no-krb5 no-threads zlib-dynamic no-engines no-camellia no-idea no-rc5 no-mdc2 no-sha0 no-smime no-aes192 no-ripemd no-cast post-extract: - @find ${WRKBUILD} -name *.rej -delete + @find ${WRKBUILD} -name *.rej -exec rm {} \; do-configure: (cd $(WRKBUILD); \ diff --git a/package/pptp/Makefile b/package/pptp/Makefile index 18de2b04e..523711887 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 3 PKG_MD5SUM:= 9a706327fb9827541d7c86d48ceb9631 PKG_DESCR:= a Point-to-Point Tunneling Protocol (PPTP) client PKG_SECTION:= net -PKG_DEPENDS:= ppp kmod-gre +PKG_DEPENDS:= ppp kmod-net-ipgre PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=pptpclient/} include ${TOPDIR}/mk/package.mk diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile index 0a5a10b87..463c2ac5c 100644 --- a/package/pptpd/Makefile +++ b/package/pptpd/Makefile @@ -24,7 +24,6 @@ TCFLAGS+= -DSBINDIR=\\\"/usr/sbin\\\" FAKE_FLAGS+= INSTALL="install" post-install: - ${INSTALL_DIR} ${IDIR_PPTPD}/etc ${INSTALL_DIR} ${IDIR_PPTPD}/etc/ppp ${INSTALL_DIR} ${IDIR_PPTPD}/usr/sbin ${INSTALL_DATA} ./files/pptpd.conf ${IDIR_PPTPD}/etc/ diff --git a/package/sangam-atm/Makefile b/package/sangam-atm/Makefile index ed1377642..52cb218fe 100644 --- a/package/sangam-atm/Makefile +++ b/package/sangam-atm/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 3843f3e670967fe81561770ac960c1cd PKG_DESCR:= sangam-atm DSL modem driver for TI AR7 boards PKG_SECTION:= kernel +PKG_DEPENDS:= kmod-fw-loader kmod-atm PKG_SITES:= http://openadk.org/distfiles/ PKG_TARGET_DEPENDS:= ag241 @@ -16,7 +17,7 @@ PKG_TARGET_DEPENDS:= ag241 include ${TOPDIR}/mk/package.mk include ${TOPDIR}/mk/kernel-vars.mk -$(eval $(call PKG_template,KMOD_SANGAM_ATM,kmod-sangam-atm,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,KMOD_SANGAM_ATM,kmod-sangam-atm,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) BUILD_STYLE:= manual INSTALL_STYLE:= manual diff --git a/package/tcpdump/Makefile b/package/tcpdump/Makefile index 7e92a9fa4..c704097e1 100644 --- a/package/tcpdump/Makefile +++ b/package/tcpdump/Makefile @@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= tcpdump PKG_VERSION:= 4.0.0 PKG_RELEASE:= 1 -PKG_BUILDDEP+= libpcap PKG_MD5SUM:= b22ca72890df2301d922c9f2d17867f9 PKG_DESCR:= A tool for network monitoring and data acquisition. PKG_SECTION:= net PKG_DEPENDS:= libpcap +PKG_BUILDDEP+= libpcap PKG_URL:= http://www.tcpdump.org PKG_SITES:= http://www.tcpdump.org/release/ \ http://www.sfr-fresh.com/unix/misc/ \ diff --git a/package/util-linux-ng/Makefile b/package/util-linux-ng/Makefile index b3343b8a7..4de64d7b0 100644 --- a/package/util-linux-ng/Makefile +++ b/package/util-linux-ng/Makefile @@ -6,10 +6,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= util-linux-ng PKG_VERSION:= 2.16.1 PKG_RELEASE:= 2 -PKG_BUILDDEP+= e2fsprogs ncurses PKG_MD5SUM:= fc57e5fd5be9e569b026b5077fafe84f PKG_DESCR:= Linux utilities PKG_SECTION:= admin +PKG_BUILDDEP+= e2fsprogs ncurses PKG_URL:= http://userweb.kernel.org/~kzak/util-linux-ng PKG_SITES:= ${MASTER_SITE_KERNEL:=utils/util-linux-ng/v2.16/} @@ -18,7 +18,7 @@ PKG_DESCR_SFDISK:= Scriptable Partition table manipulation utility PKG_DESCR_SWAP:= Swap space management utilities PKG_DEPENDS_SWAP:= libblkid PKG_DESCR_LOOP:= Loop devices setup and control utility -PKG_DEPENDS_LOOP:= kmod-loop +PKG_DEPENDS_LOOP:= kmod-blk-dev-loop include ${TOPDIR}/mk/package.mk diff --git a/package/wdfs/Makefile b/package/wdfs/Makefile index 71951046c..a9abb551b 100644 --- a/package/wdfs/Makefile +++ b/package/wdfs/Makefile @@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk PKG_NAME= wdfs PKG_VERSION= 1.4.2 PKG_RELEASE= 2 -PKG_BUILDDEP+= openssl fuse neon glib PKG_MD5SUM= 628bb44194d04c1cf8aacc446ed0a230 PKG_DESCR:= WebDAV filesystem PKG_SECTION:= net -PKG_DEPENDS:= libopenssl fuse-utils kmod-fuse neon glib +PKG_DEPENDS:= libopenssl fuse-utils kmod-fuse-fs neon glib +PKG_BUILDDEP+= openssl fuse neon glib PKG_SITES= http://noedler.de/projekte/wdfs/ include ${TOPDIR}/mk/package.mk diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 4380f3663..790a01d7e 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 913a672cbd6da516de15965d594e20b9 PKG_DESCR:= Xorg server PKG_SECTION:= x11 -PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile libfontenc +PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile libfontenc xkeyboard-config xkbcomp PKG_BUILDDEP+= libX11 randrproto renderproto fixesproto damageproto scrnsaverproto resourceproto fontsproto videoproto compositeproto evieext libxkbfile libXfont pixman libpciaccess openssl xf86dgaproto PKG_URL:= http://www.x.org PKG_SITES:= ${MASTER_SITE_XORG} @@ -40,7 +40,7 @@ export BASH HOSTCC HOSTCFLAGS MAKE LANGUAGE LC_ALL OStype PATH HOSTCPPFLAGS?= HOSTLDFLAGS?= -TARGET_CFLAGS:= $(strip -fwrapv -fno-ident ${TARGET_CFLAGS}) +TARGET_CFLAGS:= $(strip -fno-ident ${TARGET_CFLAGS}) TARGET_CC:= $(strip ${TARGET_CC}) TARGET_CXX:= $(strip ${TARGET_CXX}) diff --git a/scripts/awk b/scripts/awk new file mode 100755 index 000000000..ff6f9b002 --- /dev/null +++ b/scripts/awk @@ -0,0 +1,9 @@ +#!/usr/bin/env bash +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +if [ -z "$(which gawk 2>/dev/null)" ];then + /bin/awk "$@" +else + gawk "$@" +fi diff --git a/target/ag241/Makefile b/target/ag241/Makefile index e87a55d0d..9848205cc 100644 --- a/target/ag241/Makefile +++ b/target/ag241/Makefile @@ -15,7 +15,7 @@ $(TOOLS_BUILD_DIR): tools-compile: $(TOOLS_BUILD_DIR) $(MAKE) -C tools/addpattern $(MAKE) -C tools/srec2bin - $(MAKE) -C tools/squashfs prepare compile install + $(MAKE) -C ../tools/squashfs prepare compile install kernel-install: tools-compile PATH='${TARGET_PATH}' \ diff --git a/target/ag241/files/etc/network/interfaces b/target/ag241/files/etc/network/interfaces index 5d2e025d7..519928df9 100644 --- a/target/ag241/files/etc/network/interfaces +++ b/target/ag241/files/etc/network/interfaces @@ -2,7 +2,7 @@ auto lo iface lo inet loopback auto nas0 -iface nas0 inet atm +iface nas0 inet manual auto br0 iface br0 inet manual diff --git a/target/ag241/tools/squashfs/Makefile b/target/ag241/tools/squashfs/Makefile deleted file mode 100644 index 0887afc22..000000000 --- a/target/ag241/tools/squashfs/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# $Id$ -#- -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include $(TOPDIR)/rules.mk - -PKG_NAME:= squashfs -PKG_VERSION:= 4.0 -PKG_RELEASE:= 1 -PKG_MD5SUM:= a3c23391da4ebab0ac4a75021ddabf96 -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=squashfs/} -DISTFILES:= ${PKG_NAME}${PKG_VERSION}.tar.gz -WRKDIST= ${WRKDIR}/$(PKG_NAME)${PKG_VERSION} - -include ../rules.mk - -$(WRKBUILD)/.compiled: ${WRKDIST}/.prepared - $(MAKE) -C $(WRKBUILD)/squashfs-tools - touch $@ - -$(WRKBUILD)/.installed: - $(INSTALL_BIN) $(WRKBUILD)/squashfs-tools/mksquashfs \ - ${STAGING_TOOLS}/bin - touch $@ - -include $(TOPDIR)/mk/tools.mk diff --git a/target/foxboard/Makefile b/target/foxboard/Makefile index f33dc813a..c4a64c26b 100644 --- a/target/foxboard/Makefile +++ b/target/foxboard/Makefile @@ -12,8 +12,8 @@ $(TOOLS_BUILD_DIR): tools-compile: $(TOOLS_BUILD_DIR) $(MAKE) -C tools/mkfimage - $(MAKE) -C tools/e100boot prepare compile install $(MAKE_TRACE) - $(MAKE) -C tools/squashfs prepare compile install + #$(MAKE) -C tools/e100boot prepare compile install $(MAKE_TRACE) + $(MAKE) -C ../tools/squashfs prepare compile install $(INSTALL_BIN) tools/boot_linux $(BIN_DIR)/ kernel-install: tools-compile diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc index bed0ac451..f48866460 100644 --- a/target/linux/config/Config.in.misc +++ b/target/linux/config/Config.in.misc @@ -68,7 +68,7 @@ config ADK_KPACKAGE_KMOD_PPDEV Kernel module for userland parallel port access config ADK_KPACKAGE_KMOD_FW_LOADER - prompt "kmod-fw-loader.................. userspace firmware loading support" + prompt "kmod-fw-loader.................... userspace firmware loading support" tristate default n help @@ -76,7 +76,7 @@ config ADK_KPACKAGE_KMOD_FW_LOADER loading of external firmware files. config ADK_KPACKAGE_KMOD_EEPROM_93CX6 - prompt "kmod-eeprom-93cx6................ 93cx6 eeprom support" + prompt "kmod-eeprom-93cx6................. 93cx6 eeprom support" tristate default n help diff --git a/target/linux/config/Config.in.netfilter b/target/linux/config/Config.in.netfilter index ef2e1285a..79acfe564 100644 --- a/target/linux/config/Config.in.netfilter +++ b/target/linux/config/Config.in.netfilter @@ -352,7 +352,7 @@ config ADK_KPACKAGE_KMOD_IP_NF_FILTER config ADK_KPACKAGE_KMOD_NF_NAT tristate 'Full NAT' - depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES + depends on ADK_KPACKAGE_KMOD_NF_IP_IPTABLES help The Full NAT option allows masquerading, port forwarding and other forms of full Network Address Port Translation. It is controlled by diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network index bbee048e7..0f38986d5 100644 --- a/target/linux/config/Config.in.network +++ b/target/linux/config/Config.in.network @@ -66,7 +66,7 @@ config ADK_KPACKAGE_KMOD_ATM_BR2684 help config ADK_KPACKAGE_KMOD_BRIDGE - prompt "kmod-net-bridge................... 802.1d Ethernet Bridging" + prompt "kmod-bridge....................... 802.1d Ethernet Bridging" tristate select ADK_KERNEL_LLC default n @@ -91,6 +91,19 @@ config ADK_KPACKAGE_KMOD_BRIDGE Enabling arptables support when bridging will let arptables see bridged ARP traffic in the arptables FORWARD chain. +config ADK_KPACKAGE_KMOD_VLAN_8021Q + prompt "kmod-vlan......................... 802.1q VLAN support" + tristate + default n + help + Select this and you will be able to create 802.1Q VLAN interfaces + on your ethernet interfaces. 802.1Q VLAN supports almost + everything a regular ethernet interface does, including + firewalling, bridging, and of course IP traffic. You will need + the 'vconfig' tool from the VLAN project in order to effectively + use VLANs. See the VLAN web page for more information: + <http://www.candelatech.com/~greear/vlan.html> + config ADK_KPACKAGE_KMOD_INET_TUNNEL tristate default n diff --git a/target/tools/rules.mk b/target/tools/rules.mk new file mode 100644 index 000000000..a6a3684ac --- /dev/null +++ b/target/tools/rules.mk @@ -0,0 +1,7 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +WRKDIR_BASE= ${TOOLS_BUILD_DIR} +WRKDIR= ${WRKDIR_BASE} + +include ${TOPDIR}/mk/buildhlp.mk diff --git a/target/foxboard/tools/squashfs/Makefile b/target/tools/squashfs/Makefile index a55181f88..a55181f88 100644 --- a/target/foxboard/tools/squashfs/Makefile +++ b/target/tools/squashfs/Makefile diff --git a/target/tools/squashfs/patches/squashfs-bsd.patch b/target/tools/squashfs/patches/squashfs-bsd.patch new file mode 100644 index 000000000..6e23ed8d6 --- /dev/null +++ b/target/tools/squashfs/patches/squashfs-bsd.patch @@ -0,0 +1,132 @@ +diff -Nur squashfs4.0.orig/squashfs-tools/mksquashfs.c squashfs4.0/squashfs-tools/mksquashfs.c +--- squashfs4.0.orig/squashfs-tools/mksquashfs.c Sun Apr 5 23:22:48 2009 ++++ squashfs4.0/squashfs-tools/mksquashfs.c Tue Dec 29 18:23:15 2009 +@@ -48,16 +48,9 @@ + #include <regex.h> + #include <fnmatch.h> + +-#ifndef linux +-#define __BYTE_ORDER BYTE_ORDER +-#define __BIG_ENDIAN BIG_ENDIAN +-#define __LITTLE_ENDIAN LITTLE_ENDIAN +-#include <sys/sysctl.h> +-#else +-#include <endian.h> +-#include <sys/sysinfo.h> +-#endif ++#include <sys/param.h> + ++ + #include "squashfs_fs.h" + #include "squashfs_swap.h" + #include "mksquashfs.h" +@@ -3688,23 +3681,9 @@ + signal(SIGUSR1, sigusr1_handler); + + if(processors == -1) { +-#ifndef linux +- int mib[2]; +- size_t len = sizeof(processors); +- +- mib[0] = CTL_HW; +-#ifdef HW_AVAILCPU +- mib[1] = HW_AVAILCPU; ++#if defined(BSD) ++ processors = 1; + #else +- mib[1] = HW_NCPU; +-#endif +- +- if(sysctl(mib, 2, &processors, &len, NULL, 0) == -1) { +- ERROR("Failed to get number of available processors. " +- "Defaulting to 1\n"); +- processors = 1; +- } +-#else + processors = get_nprocs(); + #endif + } +@@ -3974,9 +3953,15 @@ + int match = use_regex ? + regexec(path->name[i].preg, name, (size_t) 0, + NULL, 0) == 0 : ++#if defined(BSD) + fnmatch(path->name[i].name, name, ++ FNM_PATHNAME|FNM_PERIOD) == ++ 0; ++#else ++ fnmatch(path->name[i].name, name, + FNM_PATHNAME|FNM_PERIOD|FNM_EXTMATCH) == + 0; ++#endif + + if(match && path->name[i].paths == NULL) { + /* match on a leaf component, any subdirectories +diff -Nur squashfs4.0.orig/squashfs-tools/pseudo.c squashfs4.0/squashfs-tools/pseudo.c +--- squashfs4.0.orig/squashfs-tools/pseudo.c Sun Apr 5 04:01:58 2009 ++++ squashfs4.0/squashfs-tools/pseudo.c Tue Dec 29 18:07:33 2009 +@@ -30,6 +30,11 @@ + #include <string.h> + #include <stdlib.h> + #include <sys/types.h> ++#include <sys/param.h> ++ ++#if defined(BSD) ++#include <sys/stat.h> ++#endif + + #include "pseudo.h" + +diff -Nur squashfs4.0.orig/squashfs-tools/unsquashfs.c squashfs4.0/squashfs-tools/unsquashfs.c +--- squashfs4.0.orig/squashfs-tools/unsquashfs.c Sun Apr 5 23:23:06 2009 ++++ squashfs4.0/squashfs-tools/unsquashfs.c Tue Dec 29 18:25:56 2009 +@@ -21,6 +21,8 @@ + * unsquashfs.c + */ + ++#include <sys/param.h> ++ + #include "unsquashfs.h" + #include "squashfs_swap.h" + #include "squashfs_compat.h" +@@ -1193,10 +1195,17 @@ + struct pathname *path = paths->path[n]; + for(i = 0; i < path->names; i++) { + int match = use_regex ? ++#if defined(BSD) + regexec(path->name[i].preg, name, (size_t) 0, + NULL, 0) == 0 : fnmatch(path->name[i].name, ++ name, FNM_PATHNAME|FNM_PERIOD) == ++ 0; ++#else ++ regexec(path->name[i].preg, name, (size_t) 0, ++ NULL, 0) == 0 : fnmatch(path->name[i].name, + name, FNM_PATHNAME|FNM_PERIOD|FNM_EXTMATCH) == + 0; ++#endif + if(match && path->name[i].paths == NULL) + /* + * match on a leaf component, any subdirectories +@@ -1795,21 +1804,7 @@ + + if(processors == -1) { + #ifndef linux +- int mib[2]; +- size_t len = sizeof(processors); +- +- mib[0] = CTL_HW; +-#ifdef HW_AVAILCPU +- mib[1] = HW_AVAILCPU; +-#else +- mib[1] = HW_NCPU; +-#endif +- +- if(sysctl(mib, 2, &processors, &len, NULL, 0) == -1) { +- ERROR("Failed to get number of available processors. " +- "Defaulting to 1\n"); +- processors = 1; +- } ++ processors = 1; + #else + processors = get_nprocs(); + #endif |