diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-01-04 23:22:23 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-01-04 23:22:23 +0100 |
commit | 49af3d669f8345ef3ca3e1e14cdd4030cbbbb6e0 (patch) | |
tree | 1f8f5b4cdb4265e5428a2a77f2762706ae1247ca | |
parent | e6d7923746537504a5e19b5c9aa050a1836048b6 (diff) | |
parent | 26d8c7c5138770572fc92bea028d9a8a067fe3c9 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
-rw-r--r-- | mk/modules.mk | 4 | ||||
-rw-r--r-- | package/Config.in | 10 | ||||
-rwxr-xr-x | package/base-files/extra/etc/network/if-pre-up.d/02-vlan | 1 | ||||
-rw-r--r-- | package/busybox/config/networking/Config.in | 1 | ||||
-rw-r--r-- | package/dansguardian/Makefile | 6 | ||||
-rw-r--r-- | package/ethtool/Makefile | 12 | ||||
-rw-r--r-- | package/iptables/Makefile | 2 | ||||
-rw-r--r-- | package/iptables/files/firewall.conf | 6 | ||||
-rw-r--r-- | package/iw/Makefile | 8 | ||||
-rw-r--r-- | package/iw/patches/patch-Makefile | 10 | ||||
-rw-r--r-- | package/libnl/Makefile | 2 | ||||
-rw-r--r-- | package/libpcap/Makefile | 2 | ||||
-rw-r--r-- | package/lighttpd/Makefile | 2 | ||||
-rw-r--r-- | package/nmap/Makefile | 6 | ||||
-rw-r--r-- | package/pcre/Makefile | 4 | ||||
-rw-r--r-- | package/snort/Makefile | 2 | ||||
-rw-r--r-- | target/Config.in | 33 | ||||
-rw-r--r-- | target/linux/config/Config.in.netfilter | 5 | ||||
-rw-r--r-- | target/wrap/Makefile | 2 | ||||
-rw-r--r-- | target/wrap/patches/fix-pata-sc1200.patch | 12 |
20 files changed, 79 insertions, 51 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index eaf14f6f6..948a68364 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -342,6 +342,10 @@ $(eval $(call KMOD_template,NETFILTER_XT_TARGET_NFQUEUE,netfilter-xt-target-nfqu $(MODULES_DIR)/kernel/net/netfilter/xt_NFQUEUE \ ,50)) +$(eval $(call KMOD_template,NETFILTER_XT_TARGET_TCPMSS,netfilter-xt-target-tcpmss,\ + $(MODULES_DIR)/kernel/net/netfilter/xt_TCPMSS \ +,50)) + $(eval $(call KMOD_template,NETFILTER_XT_TARGET_NOTRACK,netfilter-xt-target-notrack,\ $(MODULES_DIR)/kernel/net/netfilter/xt_NOTRACK \ ,50)) diff --git a/package/Config.in b/package/Config.in index 74d7c2696..80e1a84bb 100644 --- a/package/Config.in +++ b/package/Config.in @@ -395,18 +395,26 @@ source "package/glib/Config.in" source "package/gtk+/Config.in" source "package/id3lib/Config.in" source "package/libao/Config.in" +source "package/libao/Config.in.lib" source "package/libaudiofile/Config.in" source "package/libaudiofile/Config.in.lib" source "package/libart/Config.in" source "package/libart/Config.in.lib" source "package/linux-atm/Config.in.lib" source "package/libcli/Config.in" +source "package/libcli/Config.in.lib" source "package/libdaemon/Config.in" +source "package/libdaemon/Config.in.lib" source "package/libdb/Config.in" +source "package/libdb/Config.in.lib" source "package/libdnet/Config.in" +source "package/libdnet/Config.in.lib" source "package/libelf/Config.in" +source "package/libelf/Config.in.lib" source "package/libevent/Config.in" +source "package/libevent/Config.in.lib" source "package/libffi/Config.in" +source "package/libffi/Config.in.lib" source "package/freeradius-client/Config.in.lib" source "package/expat/Config.in" source "package/expat/Config.in.lib" @@ -459,6 +467,7 @@ source "package/libnet/Config.in.lib" source "package/libnfsidmap/Config.in" source "package/libnids/Config.in" source "package/libnl/Config.in" +source "package/libnl/Config.in.lib" source "package/libogg/Config.in" source "package/libogg/Config.in.lib" source "package/libol/Config.in" @@ -476,6 +485,7 @@ source "package/libpri/Config.in" source "package/libpri/Config.in.lib" source "package/pango/Config.in" source "package/pcre/Config.in" +source "package/pcre/Config.in.lib" source "package/libpng/Config.in" source "package/libpng/Config.in.lib" source "package/popt/Config.in" 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 index 09b9cf0da..35b7fca59 100755 --- 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 @@ -1,6 +1,7 @@ #!/bin/sh [ -x /sbin/vconfig ] || exit 0 +[ -d /proc/net/vlan ] || exit 0 case "$IFACE" in vlan*) diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in index 0db95b6d4..264beae90 100644 --- a/package/busybox/config/networking/Config.in +++ b/package/busybox/config/networking/Config.in @@ -884,6 +884,7 @@ config BUSYBOX_IFUPDOWN_UDHCPC_CMD_OPTIONS config BUSYBOX_VCONFIG bool "vconfig" + select ADK_KPACKAGE_KMOD_VLAN_8021Q default n help Creates, removes, and configures VLAN interfaces diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile index 7a96bda40..62e23fc53 100644 --- a/package/dansguardian/Makefile +++ b/package/dansguardian/Makefile @@ -6,12 +6,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= dansguardian PKG_VERSION:= 2.10.1.1 PKG_RELEASE:= 1 -PKG_BUILDDEP+= pcre zlib -PKG_CXX:= DANSGUARDIAN PKG_MD5SUM:= 0987a1c9bfbdf398118386f10279611a PKG_DESCR:= web content filter proxy PKG_SECTION:= net -PKG_DEPENDS:= pcre zlib +PKG_CXX:= DANSGUARDIAN +PKG_DEPENDS:= libpcre zlib +PKG_BUILDDEP+= pcre zlib PKG_URL:= http://dansguardian.org PKG_SITES:= http://dansguardian.org/downloads/2/Stable/ diff --git a/package/ethtool/Makefile b/package/ethtool/Makefile index 4f9d35e62..3172231da 100644 --- a/package/ethtool/Makefile +++ b/package/ethtool/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ethtool -PKG_VERSION:= 5 +PKG_VERSION:= 6 PKG_RELEASE:= 1 -PKG_MD5SUM:= 5df7f165974e096e2de890e099f87a12 +PKG_MD5SUM:= 3b721ec27f17ebf320ba8c505cf66d9c PKG_DESCR:= Display or change ethernet card settings PKG_SECTION:= net PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=gkernel/} @@ -15,12 +15,12 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,ETHTOOL,ethtool,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_ETHTOOL}/usr/sbin - ${CP} ${WRKINST}/usr/sbin/* ${IDIR_ETHTOOL}/usr/sbin + ${CP} ${WRKINST}/usr/sbin/ethtool ${IDIR_ETHTOOL}/usr/sbin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/iptables/Makefile b/package/iptables/Makefile index b7f98121e..f5f2d2392 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-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_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 kmod-ip-nf-match-state kmod-netfilter-xt-target-tcpmss 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/iptables/files/firewall.conf b/package/iptables/files/firewall.conf index bc9a39c41..2c8faaa34 100644 --- a/package/iptables/files/firewall.conf +++ b/package/iptables/files/firewall.conf @@ -1,13 +1,11 @@ #!/bin/sh - - echo "configure /etc/firewall.conf first." exit 1 ### Interfaces WAN=ppp0 LAN=br0 -WLAN= +WLAN=wlan0 ###################################################################### ### Default ruleset @@ -29,7 +27,7 @@ iptables -P FORWARD DROP # base case iptables -A INPUT -m state --state INVALID -j DROP iptables -A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT -iptables -A INPUT -p tcp --tcp-flags SYN SYN --tcp-option \! 2 -j DROP +iptables -A INPUT -p tcp --tcp-flags SYN SYN \! --tcp-option 2 -j DROP # custom rules iptables -A INPUT -j input_rule diff --git a/package/iw/Makefile b/package/iw/Makefile index 786dda0fb..106b702e4 100644 --- a/package/iw/Makefile +++ b/package/iw/Makefile @@ -4,13 +4,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= iw -PKG_VERSION:= 0.9.17 +PKG_VERSION:= 0.9.18 PKG_RELEASE:= 1 -PKG_BUILDDEP+= libnl -PKG_MD5SUM:= 427841093ac11c5cbc025a3e13aac139 +PKG_MD5SUM:= 9734080d8a5c4b768c5e0da665a48950 PKG_DESCR:= Tools for setting up WiFi cards via netlink (nl80211) PKG_SECTION:= net PKG_DEPENDS:= libnl +PKG_BUILDDEP+= libnl PKG_URL:= http://wireless.kernel.org/en/users/Documentation/iw PKG_SITES:= http://wireless.kernel.org/download/iw/ @@ -26,6 +26,6 @@ INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_IW}/usr/sbin - ${INSTALL_BIN} ${WRKINST}/usr/bin/iw ${IDIR_IW}/usr/sbin + ${INSTALL_BIN} ${WRKINST}/usr/sbin/iw ${IDIR_IW}/usr/sbin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/iw/patches/patch-Makefile b/package/iw/patches/patch-Makefile index ec12e1d38..4c95aee80 100644 --- a/package/iw/patches/patch-Makefile +++ b/package/iw/patches/patch-Makefile @@ -1,11 +1,11 @@ ---- iw-0.9.17.orig/Makefile 2009-08-26 11:41:41.000000000 +0200 -+++ iw-0.9.17/Makefile 2009-11-20 23:10:19.000000000 +0100 +--- iw-0.9.18.orig/Makefile 2009-11-20 17:35:56.000000000 +0100 ++++ iw-0.9.18/Makefile 2010-01-04 23:00:34.031210816 +0100 @@ -86,10 +86,10 @@ check: install: iw iw.8.gz @$(NQ) ' INST iw' - $(Q)$(MKDIR) $(DESTDIR)$(BINDIR) -- $(Q)$(INSTALL) -m 755 -t $(DESTDIR)$(BINDIR) iw -+ $(Q)$(INSTALL) -m 755 iw $(DESTDIR)$(BINDIR) + $(Q)$(MKDIR) $(DESTDIR)$(SBINDIR) +- $(Q)$(INSTALL) -m 755 -t $(DESTDIR)$(SBINDIR) iw ++ $(Q)$(INSTALL) -m 755 iw $(DESTDIR)$(SBINDIR) @$(NQ) ' INST iw.8' $(Q)$(MKDIR) $(DESTDIR)$(MANDIR)/man8/ - $(Q)$(INSTALL) -m 644 -t $(DESTDIR)$(MANDIR)/man8/ iw.8.gz diff --git a/package/libnl/Makefile b/package/libnl/Makefile index a1c4657f7..4f7372e47 100644 --- a/package/libnl/Makefile +++ b/package/libnl/Makefile @@ -17,7 +17,7 @@ $(eval $(call PKG_template,LIBNL,libnl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto -INSTALL_STYLE:= auto confprog +INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_LIBNL}/usr/lib diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 877b35a37..2eb2ac249 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -31,6 +31,6 @@ pre-install: post-install: ${INSTALL_DIR} ${IDIR_LIBPCAP}/usr/lib/ - ${CP} ${WRKINST}/usr/lib/libpcap.so.* ${IDIR_LIBPCAP}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libpcap.so* ${IDIR_LIBPCAP}/usr/lib/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile index 648d6cfd8..8a3e584c6 100644 --- a/package/lighttpd/Makefile +++ b/package/lighttpd/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 87e936ec272ddaba8a2fdfecd8c6b704 PKG_DESCR:= a flexible and lightweight web server PKG_SECTION:= net -PKG_DEPENDS:= libxml2 libsqlite pcre +PKG_DEPENDS:= libxml2 libsqlite libpcre PKG_BUILDDEP+= pcre libxml2 sqlite ifeq (${ADK_COMPILE_LIGHTTPD_WITH_OPENSSL},y) PKG_DEPENDS+= libopenssl diff --git a/package/nmap/Makefile b/package/nmap/Makefile index 587ad980f..8716879cd 100644 --- a/package/nmap/Makefile +++ b/package/nmap/Makefile @@ -6,12 +6,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= nmap PKG_VERSION:= 5.00 PKG_RELEASE:= 1 -PKG_BUILDDEP+= pcre libpcap -PKG_CXX:= NMAP PKG_MD5SUM:= 32d27de32166c02d670bb4a086185886 PKG_DESCR:= utility for network exploration or security auditing PKG_SECTION:= net -PKG_DEPENDS:= libdnet libpcap pcre +PKG_CXX:= NMAP +PKG_DEPENDS:= libdnet libpcap libpcre +PKG_BUILDDEP+= libdnet libpcap pcre PKG_URL:= http://nmap.org PKG_SITES:= http://download.insecure.org/nmap/dist/ diff --git a/package/pcre/Makefile b/package/pcre/Makefile index 22d510c6a..9a412090e 100644 --- a/package/pcre/Makefile +++ b/package/pcre/Makefile @@ -14,7 +14,7 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=pcre/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBPCRE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBPCRE,libpcre,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --disable-cpp @@ -24,6 +24,6 @@ XAKE_FLAGS+= ${TARGET_CONFIGURE_OPTS} CFLAGS='${TCFLAGS}' post-install: ${INSTALL_DIR} ${IDIR_LIBPCRE}/usr/lib - ${CP} ${WRKINST}/usr/lib/libpcre{,posix}.so.* ${IDIR_LIBPCRE}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libpcre{,posix}.so* ${IDIR_LIBPCRE}/usr/lib/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/snort/Makefile b/package/snort/Makefile index cc38c43cc..64dab93e8 100644 --- a/package/snort/Makefile +++ b/package/snort/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= b1abf3a9fa3486720c9a2b5eff920417 PKG_DESCR:= a flexible Network Intrusion Detection System (NIDS) PKG_SECTION:= net PKG_NOPARALLEL:= 1 -PKG_DEPENDS:= libnet libpcap pcre +PKG_DEPENDS:= libnet libpcap libpcre PKG_BUILDDEP+= libnet libpcap pcre PKG_URL:= http://www.snort.org/ PKG_SITES:= http://dl.snort.org/snort-current/ diff --git a/target/Config.in b/target/Config.in index 47bdd6541..e86554474 100644 --- a/target/Config.in +++ b/target/Config.in @@ -173,6 +173,7 @@ config ADK_LINUX_X86_ALIX1C help Support for ALIX1C boards. http://www.pcengines.ch/ + Status: stable config ADK_LINUX_X86_ALIX2D bool "PC Engines Alix2D" @@ -189,6 +190,7 @@ config ADK_LINUX_X86_ALIX2D help Support for ALIX2D boards. http://www.pcengines.ch/ + Status: stable config ADK_LINUX_X86_WRAP bool "PC Engines WRAP" @@ -205,6 +207,7 @@ config ADK_LINUX_X86_WRAP help End of life, but I still have one board. http://www.pcengines.ch/ + Status: stable config ADK_LINUX_CRIS_FOXBOARD bool "Foxboard (ETRAX LX100)" @@ -214,6 +217,7 @@ config ADK_LINUX_CRIS_FOXBOARD help Support for Foxboard targets. http://foxlx.acmesystems.it/ + Status: stable config ADK_LINUX_MIPS64_LEMOTE bool "Lemote Subnotebook Yeeloong" @@ -230,6 +234,7 @@ config ADK_LINUX_MIPS64_LEMOTE Lemote Subnotebook. http://www.lemote.com/english/index.html http://www.tekmote.nl/ + Status: testing config ADK_LINUX_MIKROTIK bool "Mikrotik Routerboards" @@ -262,6 +267,7 @@ config ADK_LINUX_MIPS_AG241 help Linksys AG241 DSL router. (Texas Instruments AR7 platform) + Status: stable config ADK_LINUX_ARM_TOMTOM bool "TomTom Applications" @@ -270,9 +276,10 @@ config ADK_LINUX_ARM_TOMTOM select ADK_EABI select ADK_TOOLCHAIN_ONLY help - Support for TomTom Rider 2 (or others). - Just toolchain support to cross-compile your own - applications. + Support for TomTom Rider 2 (or others). + Just toolchain support to cross-compile your own + applications. + Status: toolchain only config ADK_LINUX_ARM_G1 bool "Google G1 Applications" @@ -281,9 +288,10 @@ config ADK_LINUX_ARM_G1 select ADK_EABI select ADK_TOOLCHAIN_ONLY help - Support for Google G1. - Just toolchain support to cross-compile your own - applications. Use static linking for your packages. + Support for Google G1. + Just toolchain support to cross-compile your own + applications. Use static linking for your packages. + Status: toolchain only config ADK_LINUX_XSCALE_ZAURUS bool "Zaurus SL-C3200" @@ -291,12 +299,14 @@ config ADK_LINUX_XSCALE_ZAURUS select ADK_TARGET_NO_FPU help Support for Sharp Zaurus SL-C3200 (aka Terrier) + Status: development config ADK_LINUX_RESCUE bool "Minimal Linux Rescuesystem" select ADK_KERNEL_INPUT_KEYBOARD help Rescuesystem with can be used to Boot from Disk or USB stick. + Status: development config ADK_LINUX_QEMU bool "Qemu Emulator" @@ -323,6 +333,7 @@ config ADK_LINUX_X86_64_SHUTTLE select ADK_KPACKAGE_KMOD_MD_RAID1 if ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK help Support for a nice and fast shuttle xpc with AMD quad-core CPU. + Status: development endchoice @@ -367,18 +378,21 @@ config ADK_LINUX_ARM_QEMU help Qemu support for ARM architecture. Right now this is optimized for Zaurus PDA spitz. + Status: development config ADK_LINUX_MIPS_QEMU bool "mips (big endian)" select ADK_mips_qemu help Qemu support for MIPS BE architecture. + Status: stable config ADK_LINUX_MIPSEL_QEMU bool "mipsel (little endian)" select ADK_mipsel_qemu help Qemu support for MIPS LE architecture. + Status: stable config ADK_LINUX_MIPS64_QEMU bool "mips64 (big endian)" @@ -386,6 +400,7 @@ config ADK_LINUX_MIPS64_QEMU select ADK_LINUX_64 help Qemu support for MIPS64 BE architecture. + Status: development config ADK_LINUX_MIPS64EL_QEMU bool "mips64 (little endian)" @@ -393,6 +408,7 @@ config ADK_LINUX_MIPS64EL_QEMU select ADK_LINUX_64 help Qemu support for MIPS64 LE architecture. + Status: development config ADK_LINUX_CRIS_QEMU bool "cris" @@ -411,6 +427,7 @@ config ADK_LINUX_X86_QEMU select ADK_KERNEL_BLK_DEV_SD help Qemu support for x86 architecture. + Status: stable config ADK_LINUX_X86_64_QEMU bool "x86_64" @@ -422,6 +439,7 @@ config ADK_LINUX_X86_64_QEMU select ADK_KERNEL_BLK_DEV_SD help Qemu support for x86_64 architecture. + Status: stable endchoice @@ -439,6 +457,7 @@ config ADK_LINUX_MIPS_RB411 select ADK_KERNEL_NET_ETHERNET help Support for Mikrotik RB411. + Status: development config ADK_LINUX_MIPS_RB433 bool "Mikrotik Routerboard 433" @@ -449,6 +468,7 @@ config ADK_LINUX_MIPS_RB433 select ADK_KERNEL_NET_ETHERNET help Support for Mikrotik RB433. + Status: development config ADK_LINUX_MIPS_RB532 bool "Mikrotik Routerboard 532" @@ -460,6 +480,7 @@ config ADK_LINUX_MIPS_RB532 select ADK_KERNEL_BLK_DEV_SD help Support for Mikrotik RB532. + Status: stable endchoice diff --git a/target/linux/config/Config.in.netfilter b/target/linux/config/Config.in.netfilter index 79acfe564..8b818a695 100644 --- a/target/linux/config/Config.in.netfilter +++ b/target/linux/config/Config.in.netfilter @@ -189,6 +189,11 @@ config ADK_KPACKAGE_KMOD_NETFILTER_XT_TARGET_NFQUEUE As opposed to QUEUE, it supports 65535 different queues, not just one. +config ADK_KPACKAGE_KMOD_NETFILTER_XT_TARGET_TCPMSS + tristate 'TCPMSS target' + select ADK_KERNEL_NETFILTER_XTABLES + help + endmenu menu "IP: Netfilter Configuration" diff --git a/target/wrap/Makefile b/target/wrap/Makefile index b7eff383e..825b55175 100644 --- a/target/wrap/Makefile +++ b/target/wrap/Makefile @@ -13,7 +13,7 @@ kernel-install: ifeq ($(FS),ext2-cf) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo - @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)," + @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)" @echo "To install everything to CompactFlash use scripts/install.sh" @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/wrap/patches/fix-pata-sc1200.patch b/target/wrap/patches/fix-pata-sc1200.patch deleted file mode 100644 index c3d3ce527..000000000 --- a/target/wrap/patches/fix-pata-sc1200.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur linux-2.6.31.5.orig/drivers/ata/pata_sc1200.c linux-2.6.31.5/drivers/ata/pata_sc1200.c ---- linux-2.6.31.5.orig/drivers/ata/pata_sc1200.c 2009-10-23 00:57:56.000000000 +0200 -+++ linux-2.6.31.5/drivers/ata/pata_sc1200.c 2009-11-22 19:19:29.000000000 +0100 -@@ -236,7 +236,7 @@ - .port_ops = &sc1200_port_ops - }; - /* Can't enable port 2 yet, see top comments */ -- const struct ata_port_info *ppi[] = { &info, }; -+ const struct ata_port_info *ppi[] = { &info, &ata_dummy_port_info }; - - return ata_pci_sff_init_one(dev, ppi, &sc1200_sht, NULL); - } |