packages: remove dependency on obsolete LINUX_2_4 symbol
packages: remove dependency on obsolete LINUX_2_4 symbol

git-svn-id: svn://svn.openwrt.org/openwrt/packages@28960 3c298f89-4303-0410-b956-a3cf2f4a3e73

--- a/devel/ksymoops/Makefile
+++ b/devel/ksymoops/Makefile
@@ -23,7 +23,7 @@
 define Package/ksymoops
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=@!LINUX_2_4 @mips||mipsel||m68k||i386
+  DEPENDS:=@mips||mipsel||m68k||i386
   TITLE:=Interpret oops of the kernel
   URL:=http://www.kernel.org/pub/linux/utils/kernel/ksymoops/v2.4/
   MENU:=1

--- a/ipv6/dibbler/Makefile
+++ b/ipv6/dibbler/Makefile
@@ -24,7 +24,7 @@
 define Package/dibbler/Default
   SECTION:=ipv6
   CATEGORY:=IPv6
-  DEPENDS:=+libstdcpp @!LINUX_2_4 +libpthread
+  DEPENDS:=+libstdcpp +libpthread
   TITLE:=Dibbler, a portable DHCPv6 implementation
   URL:=http://klub.com.pl/dhcpv6/
 endef

--- a/libs/avahi/Makefile
+++ b/libs/avahi/Makefile
@@ -57,7 +57,7 @@
   $(call Package/avahi/Default)
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+libdaemon +libpthread +libgdbm +dbus @!LINUX_2_4
+  DEPENDS:=+libdaemon +libpthread +libgdbm +dbus
   TITLE+= (library) (dbus)
   VARIANT:=dbus
 endef

--- a/libs/boost/Makefile
+++ b/libs/boost/Makefile
@@ -44,7 +44,7 @@
   CATEGORY:=Libraries
   TITLE:=Boost C++ source libraries
   URL:=http://www.boost.org
-  DEPENDS:=+libstdcpp @!LINUX_2_4
+  DEPENDS:=+libstdcpp
 endef
 
 define Package/boost/Default/description

--- a/libs/keynote/Makefile
+++ b/libs/keynote/Makefile
@@ -22,7 +22,7 @@
 define Package/keynote
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=@!LINUX_2_4 +libopenssl
+  DEPENDS:=+libopenssl
   TITLE:=Simple and flexible trust-management system
   URL:=http://www1.cs.columbia.edu/~angelos/keynote.html
 endef

--- a/libs/libaio/Makefile
+++ b/libs/libaio/Makefile
@@ -20,7 +20,6 @@
 define Package/libaio
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=@!LINUX_2_4
   TITLE:=Linux kernel AIO interface access library
   URL:=http://lse.sourceforge.net/io/aio.html
 endef

--- a/libs/libnetfilter-conntrack/Makefile
+++ b/libs/libnetfilter-conntrack/Makefile
@@ -26,7 +26,7 @@
 define Package/libnetfilter-conntrack
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=@!LINUX_2_4 +libnfnetlink +kmod-nf-conntrack-netlink
+  DEPENDS:=+libnfnetlink +kmod-nf-conntrack-netlink
   TITLE:=API to the in-kernel connection tracking state table
   URL:=http://www.netfilter.org/projects/libnetfilter_conntrack/
 endef

--- a/libs/libnetfilter-log/Makefile
+++ b/libs/libnetfilter-log/Makefile
@@ -27,7 +27,7 @@
 define Package/libnetfilter-log
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=@!LINUX_2_4 +libnfnetlink +kmod-nfnetlink-log
+  DEPENDS:=+libnfnetlink +kmod-nfnetlink-log
   TITLE:=API to packets logged by the kernel packet filter
   URL:=http://www.netfilter.org/projects/libnetfilter_log/
 endef

--- a/libs/libnetfilter-queue/Makefile
+++ b/libs/libnetfilter-queue/Makefile
@@ -27,7 +27,7 @@
 define Package/libnetfilter-queue
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=@!LINUX_2_4 +libnfnetlink +kmod-nfnetlink-queue
+  DEPENDS:=+libnfnetlink +kmod-nfnetlink-queue
   TITLE:=API to packets queued by the kernel packet filter
   URL:=http://www.netfilter.org/projects/libnetfilter_queue/
 endef

--- a/libs/libnfnetlink/Makefile
+++ b/libs/libnfnetlink/Makefile
@@ -27,7 +27,6 @@
 define Package/libnfnetlink
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=@!LINUX_2_4
   TITLE:=A low-level library for netfilter related kernel/userspace communication
   URL:=http://netfilter.org/projects/libnfnetlink/
 endef

--- a/libs/libtorrent/Makefile
+++ b/libs/libtorrent/Makefile
@@ -26,7 +26,7 @@
   CATEGORY:=Libraries
   TITLE:=Rakshasa's BitTorrent library
   URL:=http://libtorrent.rakshasa.no/
-  DEPENDS:=+libopenssl +libsigcxx @!LINUX_2_4
+  DEPENDS:=+libopenssl +libsigcxx
   MAINTAINER:=Luka Perkov <openwrt@lukaperkov.net>
 endef
 

--- a/libs/serdisplib/Makefile
+++ b/libs/serdisplib/Makefile
@@ -21,7 +21,6 @@
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=A display control library
-  DEPENDS:=@!LINUX_2_4
   URL:=http://serdisplib.sourceforge.net/
 endef
 

--- a/libs/sysfsutils/Makefile
+++ b/libs/sysfsutils/Makefile
@@ -25,7 +25,6 @@
   SECTION:=libs
   CATEGORY:=Libraries
   SUBMENU:=Filesystem
-  DEPENDS:=@!LINUX_2_4
   TITLE:=Sysfs library
   URL:=http://linux-diag.sourceforge.net/Sysfsutils.html
 endef
@@ -34,7 +33,7 @@
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=Filesystem
-  DEPENDS:=@!LINUX_2_4 +libsysfs
+  DEPENDS:=+libsysfs
   TITLE:=System Utilities Based on Sysfs
   URL:=http://linux-diag.sourceforge.net/Sysfsutils.html
 endef

--- a/multimedia/fswebcam/Makefile
+++ b/multimedia/fswebcam/Makefile
@@ -24,7 +24,7 @@
   CATEGORY:=Multimedia
   TITLE:=fswebcam
   URL:=http://www.sanslogic.co.uk/fswebcam/
-  DEPENDS:= @!LINUX_2_4 +libgd
+  DEPENDS:=+libgd
 endef
 
 define Package/fswebcam/description

--- a/multimedia/gst-plugins-bad/Makefile
+++ b/multimedia/gst-plugins-bad/Makefile
@@ -28,7 +28,6 @@
   SECTION:=multimedia
   TITLE:=GStreamer
   URL:=http://gstreamer.freedesktop.org/
-  DEPENDS:= @!LINUX_2_4
 endef
 
 define Package/gstreamer/description/Default

--- a/multimedia/gst-plugins-base/Makefile
+++ b/multimedia/gst-plugins-base/Makefile
@@ -45,7 +45,6 @@
   SECTION:=multimedia
   TITLE:=GStreamer
   URL:=http://gstreamer.freedesktop.org/
-  DEPENDS:= @!LINUX_2_4
 endef
 
 define Package/gstreamer/description/Default

--- a/multimedia/gst-plugins-good/Makefile
+++ b/multimedia/gst-plugins-good/Makefile
@@ -27,7 +27,6 @@
   SECTION:=multimedia
   TITLE:=GStreamer
   URL:=http://gstreamer.freedesktop.org/
-  DEPENDS:= @!LINUX_2_4
 endef
 
 define Package/gstreamer/description/Default

--- a/multimedia/gst-plugins-ugly/Makefile
+++ b/multimedia/gst-plugins-ugly/Makefile
@@ -33,7 +33,6 @@
   SECTION:=multimedia
   TITLE:=GStreamer
   URL:=http://gstreamer.freedesktop.org/
-  DEPENDS:= @!LINUX_2_4
 endef
 
 define Package/gstreamer/description/Default

--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -28,7 +28,6 @@
   SECTION:=multimedia
   TITLE:=GStreamer
   URL:=http://gstreamer.freedesktop.org/
-  DEPENDS:= @!LINUX_2_4
 endef
 
 define Package/gstreamer/description/Default

--- a/multimedia/qc-usb/Makefile
+++ b/multimedia/qc-usb/Makefile
@@ -38,7 +38,7 @@
 $(call Package/qc-usb/Default)
   SUBMENU:=Video Support
   TITLE:=QuickCam Express USB webcam support
-  DEPENDS:=@USB_SUPPORT @LINUX_2_4||LINUX_2_6_25||LINUX_2_6_27||LINUX_2_6_28 +kmod-usb-core +kmod-video-core
+  DEPENDS:=@USB_SUPPORT @LINUX_2_6_25||LINUX_2_6_27||LINUX_2_6_28 +kmod-usb-core +kmod-video-core
   FILES:=$(PKG_BUILD_DIR)/quickcam.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,90,quickcam)
 endef

--- a/net/batman-adv/Makefile
+++ b/net/batman-adv/Makefile
@@ -28,7 +28,7 @@
   URL:=http://www.open-mesh.org/
   MAINTAINER:=Marek Lindner <lindner_marek@yahoo.de>
   SUBMENU:=Network Support
-  DEPENDS:=@!LINUX_2_4 +kmod-lib-crc16
+  DEPENDS:=+kmod-lib-crc16
   TITLE:=B.A.T.M.A.N. Adv
   FILES:=$(PKG_BUILD_DIR)/batman-adv.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,batman-adv)

--- a/net/et131x/Makefile
+++ b/net/et131x/Makefile
@@ -29,7 +29,7 @@
   KCONFIG:= \
   	CONFIG_ET131X=m \
 	CONFIG_ET131X_DEBUG=n
-  DEPENDS:=@!LINUX_2_4 @PCI_SUPPORT
+  DEPENDS:=@PCI_SUPPORT
   AUTOLOAD:=$(call AutoLoad,70,et131x)
 endef
 

--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -37,7 +37,7 @@
 endef
 
 define Build/Compile
-	$(MAKE) TARGET=$(if $(CONFIG_LINUX_2_4),linux24,linux26) -C $(PKG_BUILD_DIR) \
+	$(MAKE) TARGET=linux26 -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		CC="$(TARGET_CC)" \
 		CFLAGS="$(TARGET_CFLAGS)" \

--- a/net/ipsec-tools/Makefile
+++ b/net/ipsec-tools/Makefile
@@ -25,7 +25,7 @@
   SECTION:=net
   CATEGORY:=Network
   SUBMENU:=VPN
-  DEPENDS:=@!LINUX_2_4 +libopenssl +kmod-ipsec
+  DEPENDS:=+libopenssl +kmod-ipsec
   TITLE:=IPsec management tools
   URL:=http://ipsec-tools.sourceforge.net/
 endef

--- a/net/iputils/Makefile
+++ b/net/iputils/Makefile
@@ -25,7 +25,6 @@
   SECTION:=net
   CATEGORY:=Network
   URL:=http://www.skbuff.net/iputils
-  DEPENDS:= @!LINUX_2_4
 endef
 
 

--- a/net/isakmpd/Makefile
+++ b/net/isakmpd/Makefile
@@ -24,7 +24,7 @@
   SECTION:=net
   CATEGORY:=Network
   SUBMENU:=VPN
-  DEPENDS:=@!LINUX_2_4 +libopenssl +keynote +libgmp
+  DEPENDS:=+libopenssl +keynote +libgmp
   TITLE:=IPsec management tools
   URL:=http://isakmpd.sourceforge.net/
 endef

--- a/net/linuxigd/Makefile
+++ b/net/linuxigd/Makefile
@@ -25,7 +25,7 @@
   CATEGORY:=Network
   TITLE:=UPnP daemon
   SUBMENU:=Firewall
-  DEPENDS:=+libiptc +libupnp +libpthread @!LINUX_2_4
+  DEPENDS:=+libiptc +libupnp +libpthread
   URL:=http://linux-igd.sourceforge.net/
 endef
 

--- a/net/lldpd/Makefile
+++ b/net/lldpd/Makefile
@@ -22,7 +22,6 @@
   CATEGORY:=Network
   SUBMENU:=Routing and Redirection
   TITLE:=Link Layer Discovery Protocol damon
-  DEPENDS:=@!LINUX_2_4
   URL:=https://trac.luffy.cx/lldpd/
 endef
 

--- a/net/nbd/Makefile
+++ b/net/nbd/Makefile
@@ -29,7 +29,7 @@
   CATEGORY:=Network
   TITLE:=Network Block Device utilities
   URL:=http://nbd.sourceforge.net
-  DEPENDS:=@!LINUX_2_4 +kmod-nbd
+  DEPENDS:=+kmod-nbd
 endef
 
 define Package/nbd/description

--- a/net/openswan/Makefile
+++ b/net/openswan/Makefile
@@ -24,7 +24,6 @@
 define Package/openswan/Default
   TITLE:=Openswan
   URL:=http://www.openswan.org/
-  DEPENDS:=@!LINUX_2_4
 endef
 
 define Package/openswan/Default/description

--- a/net/speedtouch-usb-firmware/Makefile
+++ b/net/speedtouch-usb-firmware/Makefile
@@ -24,7 +24,7 @@
   SECTION:=net
   CATEGORY:=Network
   TITLE:=SpeedTouch 330 ADSL USB firmware
-  DEPENDS:=+kmod-usb-atm +kmod-usb-atm-speedtouch @!LINUX_2_4
+  DEPENDS:=+kmod-usb-atm +kmod-usb-atm-speedtouch
   PKGARCH:=all
 endef
 

--- a/net/squid/Makefile
+++ b/net/squid/Makefile
@@ -27,7 +27,7 @@
 define Package/squid
   $(call Package/squid/Default)
   MENU:=1
-  DEPENDS:=+libopenssl +libpthread @!LINUX_2_4
+  DEPENDS:=+libopenssl +libpthread
   TITLE:=full-featured Web proxy cache
 endef
 

--- a/net/usbip/Makefile
+++ b/net/usbip/Makefile
@@ -26,7 +26,7 @@
 define Package/usbip/Common
   TITLE:=USB-over-IP
   URL:=http://usbip.sourceforge.net/
-  DEPENDS:=@!LINUX_2_4 @USB_SUPPORT
+  DEPENDS:=@USB_SUPPORT
   MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com>
 endef
 

--- a/net/xtables-addons/Makefile
+++ b/net/xtables-addons/Makefile
@@ -71,7 +71,7 @@
     $$(call Package/xtables-addons)
     CATEGORY:=Network
     TITLE:=$(2) iptables extension
-    DEPENDS:= @!LINUX_2_4 iptables $(if $(4),+kmod-ipt-$(1))
+    DEPENDS:=iptables $(if $(4),+kmod-ipt-$(1))
   endef
 
   define Package/iptables-mod-$(1)/install
@@ -90,7 +90,7 @@
   define KernelPackage/ipt-$(1)
     SUBMENU:=Netfilter Extensions
     TITLE:=$(2) netfilter module
-    DEPENDS:= @!LINUX_2_4 kmod-ipt-core $(6)
+    DEPENDS:=kmod-ipt-core $(6)
     FILES:=$(foreach mod,$(4),$(PKG_BUILD_DIR)/extensions/$(mod).$(LINUX_KMOD_SUFFIX))
     AUTOLOAD:=$(call AutoLoad,$(5),$(notdir $(4)))
   endef

--- a/utils/btrfs-progs/Makefile
+++ b/utils/btrfs-progs/Makefile
@@ -24,7 +24,7 @@
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=Filesystem
-  DEPENDS:=@!LINUX_2_4 +libuuid +zlib
+  DEPENDS:=+libuuid +zlib
   TITLE:=Btrfs filesystems utilities
   URL:=http://btrfs.wiki.kernel.org/
 endef

--- a/utils/collectd/Makefile
+++ b/utils/collectd/Makefile
@@ -268,7 +268,7 @@
 $(eval $(call BuildPlugin,filecount,file count input,filecount,))
 $(eval $(call BuildPlugin,fscache,file-system based caching framework input,fscache,))
 $(eval $(call BuildPlugin,interface,network interfaces input,interface,))
-$(eval $(call BuildPlugin,iptables,iptables status input,iptables,+PACKAGE_collectd-mod-iptables:iptables @(!LINUX_2_4||BROKEN)))
+$(eval $(call BuildPlugin,iptables,iptables status input,iptables,+PACKAGE_collectd-mod-iptables:iptables))
 $(eval $(call BuildPlugin,irq,interrupt usage input,irq,))
 $(eval $(call BuildPlugin,load,system load input,load,))
 $(eval $(call BuildPlugin,logfile,log files output,logfile,))
@@ -276,7 +276,7 @@
 $(eval $(call BuildPlugin,mysql,MySQL status input,mysql,+PACKAGE_collectd-mod-mysql:libmysqlclient))
 $(eval $(call BuildPlugin,memory,physical memory usage input,memory,))
 $(eval $(call BuildPlugin,modbus,read variables through libmodbus,modbus,+PACKAGE_collectd-mod-modbus:libmodbus))
-$(eval $(call BuildPlugin,netlink,netlink input,netlink,+PACKAGE_collectd-mod-netlink:ip @(!LINUX_2_4||BROKEN)))
+$(eval $(call BuildPlugin,netlink,netlink input,netlink,+PACKAGE_collectd-mod-netlink:ip))
 $(eval $(call BuildPlugin,network,network input/output,network))
 $(eval $(call BuildPlugin,nginx,nginx status input,nginx,+PACKAGE_collectd-mod-nginx:libcurl))
 $(eval $(call BuildPlugin,ntpd,NTP daemon status input,ntpd,))

--- a/utils/cryptsetup/Makefile
+++ b/utils/cryptsetup/Makefile
@@ -28,7 +28,7 @@
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Cryptsetup
-  DEPENDS:=@!LINUX_2_4 +libblkid +libuuid +libpopt +lvm2 +libgcrypt
+  DEPENDS:=+libblkid +libuuid +libpopt +lvm2 +libgcrypt
 endef
 
 define Package/cryptsetup/description

--- a/utils/cwiid/Makefile
+++ b/utils/cwiid/Makefile
@@ -23,7 +23,6 @@
 define Package/cwiid/Default
   TITLE:=Linux Nintendo Wiimote interface
   URL:=http://abstrakraft.org/cwiid/
-  DEPENDS:= @!LINUX_2_4
 endef
 
 define Package/libcwiid

--- a/utils/gadgetfs-test/Makefile
+++ b/utils/gadgetfs-test/Makefile
@@ -24,7 +24,7 @@
   CATEGORY:=Utilities
   SUBMENU:=Filesystem
   TITLE:=Test program for gadgetfs
-  DEPENDS:=@DEVEL @!LINUX_2_4 +libpthread
+  DEPENDS:=@DEVEL +libpthread
   URL:=http://linux-usb.org/gadget
 endef
 

--- a/utils/i2c-tools/Makefile
+++ b/utils/i2c-tools/Makefile
@@ -25,7 +25,6 @@
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=I2C tools for Linux
-  DEPENDS:=@!LINUX_2_4
   URL:=http://www.lm-sensors.org/wiki/I2CTools
 endef
 

--- a/utils/lirc/Makefile
+++ b/utils/lirc/Makefile
@@ -30,7 +30,6 @@
 define  Package/lirc
     $(call Package/lirc/Default)
     TITLE:=LIRC - Linux Infrared Remote Control
-    DEPENDS:=@!LINUX_2_4
     MENU:=1
 endef
 

--- a/utils/mdadm/Makefile
+++ b/utils/mdadm/Makefile
@@ -24,7 +24,6 @@
   CATEGORY:=Utilities
   TITLE:=A tool for managing Soft RAID under Linux
   URL:=http://www.kernel.org/pub/linux/utils/raid/mdadm/
-  DEPENDS:=@!LINUX_2_4
   MAINTAINER:=Luka Perkov <openwrt@lukaperkov.net>
 endef
 

--- a/utils/mtd-utils/Makefile
+++ b/utils/mtd-utils/Makefile
@@ -103,11 +103,6 @@
 	LDLIBS+="$(LIBGCC_S)" \
 	WITHOUT_XATTR=1
 
-ifeq ($(CONFIG_LINUX_2_4),y)
-MAKE_FLAGS += \
-	SUBDIRS=""
-endif
-
 define PartInstall
 define Package/mtd-utils-$(subst _,-,$(1))/install
 	$(INSTALL_DIR) \

--- a/utils/pcmciautils/Makefile
+++ b/utils/pcmciautils/Makefile
@@ -20,7 +20,7 @@
 define Package/pcmciautils
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=+libsysfs @!LINUX_2_4 @PCMCIA_SUPPORT
+  DEPENDS:=+libsysfs @PCMCIA_SUPPORT
   TITLE:=PCMCIA Utilities
   URL:=http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html
 endef

--- a/utils/psplash/Makefile
+++ b/utils/psplash/Makefile
@@ -27,7 +27,6 @@
 define Package/psplash
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=@!LINUX_2_4
   TITLE:=A boot splash screen
   URL:=http://projects.o-hand.com/psplash
 endef

--- a/utils/sierra-pcmcia/Makefile
+++ b/utils/sierra-pcmcia/Makefile
@@ -20,7 +20,7 @@
 define KernelPackage/pcmcia-serial-sierra
   SUBMENU:=Other modules
   TITLE:=Sierra AirCard PCMCIA support
-  DEPENDS:=kmod-pcmcia-serial @!LINUX_2_4
+  DEPENDS:=kmod-pcmcia-serial
   URL:=http://www.sierrawireless.com/faq/ShowFAQ.aspx?ID=118
 endef
 

--- a/utils/stress/Makefile
+++ b/utils/stress/Makefile
@@ -22,7 +22,6 @@
 define Package/stress
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=@!LINUX_2_4
   TITLE:=stress is a simple stress utility
   URL:=http://weather.ou.edu/~apw/projects/stress/
 endef

--- a/utils/testusb/Makefile
+++ b/utils/testusb/Makefile
@@ -18,7 +18,7 @@
 define Package/testusb
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=@!LINUX_2_4 @DEVEL +libpthread
+  DEPENDS:=@DEVEL +libpthread
   TITLE:=USB testing utility
   URL:=http://www.linux-usb.org/usbtest/testusb.c
 endef

comments