From: Nicolas Thill <nico@openwrt.org>
Date: Fri, 11 Nov 2011 18:07:06 +0000 (+0000)
Subject: packages: remove dependency on obsolete LINUX_2_4 symbol
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=69d768a4445822d3c8ffab695e8bace0809b155b;p=openwrt%2Fsvn-archive%2Farchive.git

packages: remove dependency on obsolete LINUX_2_4 symbol

SVN-Revision: 28960
---

diff --git a/devel/ksymoops/Makefile b/devel/ksymoops/Makefile
index 446fbc27fd..b883bed34c 100644
--- a/devel/ksymoops/Makefile
+++ b/devel/ksymoops/Makefile
@@ -23,7 +23,7 @@ include $(INCLUDE_DIR)/package.mk
 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
diff --git a/ipv6/dibbler/Makefile b/ipv6/dibbler/Makefile
index 6a2a4431ce..7241bfb6c8 100644
--- a/ipv6/dibbler/Makefile
+++ b/ipv6/dibbler/Makefile
@@ -24,7 +24,7 @@ include $(INCLUDE_DIR)/package.mk
 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
diff --git a/libs/avahi/Makefile b/libs/avahi/Makefile
index 5372492a36..a8d287dff2 100644
--- a/libs/avahi/Makefile
+++ b/libs/avahi/Makefile
@@ -57,7 +57,7 @@ define Package/libavahi-dbus
   $(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
diff --git a/libs/boost/Makefile b/libs/boost/Makefile
index 1d6c2fbb89..dff08a2d68 100644
--- a/libs/boost/Makefile
+++ b/libs/boost/Makefile
@@ -44,7 +44,7 @@ define Package/boost/Default
   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
diff --git a/libs/keynote/Makefile b/libs/keynote/Makefile
index e25f002273..fdca388194 100644
--- a/libs/keynote/Makefile
+++ b/libs/keynote/Makefile
@@ -22,7 +22,7 @@ include $(INCLUDE_DIR)/package.mk
 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
diff --git a/libs/libaio/Makefile b/libs/libaio/Makefile
index 147db8e4bc..dc467eaddf 100644
--- a/libs/libaio/Makefile
+++ b/libs/libaio/Makefile
@@ -20,7 +20,6 @@ include $(INCLUDE_DIR)/package.mk
 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
diff --git a/libs/libnetfilter-conntrack/Makefile b/libs/libnetfilter-conntrack/Makefile
index 690b9ac1a6..620d13fbdf 100644
--- a/libs/libnetfilter-conntrack/Makefile
+++ b/libs/libnetfilter-conntrack/Makefile
@@ -26,7 +26,7 @@ include $(INCLUDE_DIR)/package.mk
 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
diff --git a/libs/libnetfilter-log/Makefile b/libs/libnetfilter-log/Makefile
index 0936941205..75125c2541 100644
--- a/libs/libnetfilter-log/Makefile
+++ b/libs/libnetfilter-log/Makefile
@@ -27,7 +27,7 @@ include $(INCLUDE_DIR)/package.mk
 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
diff --git a/libs/libnetfilter-queue/Makefile b/libs/libnetfilter-queue/Makefile
index d10a799103..abe62d44f1 100644
--- a/libs/libnetfilter-queue/Makefile
+++ b/libs/libnetfilter-queue/Makefile
@@ -27,7 +27,7 @@ include $(INCLUDE_DIR)/package.mk
 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
diff --git a/libs/libnfnetlink/Makefile b/libs/libnfnetlink/Makefile
index 85d3c7c76e..3029b3749f 100644
--- a/libs/libnfnetlink/Makefile
+++ b/libs/libnfnetlink/Makefile
@@ -27,7 +27,6 @@ include $(INCLUDE_DIR)/package.mk
 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
diff --git a/libs/libtorrent/Makefile b/libs/libtorrent/Makefile
index 6a3d783c4b..40f0c392f4 100644
--- a/libs/libtorrent/Makefile
+++ b/libs/libtorrent/Makefile
@@ -26,7 +26,7 @@ define Package/libtorrent
   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
 
diff --git a/libs/serdisplib/Makefile b/libs/serdisplib/Makefile
index 4d9833e38d..f9a6b4480d 100644
--- a/libs/serdisplib/Makefile
+++ b/libs/serdisplib/Makefile
@@ -21,7 +21,6 @@ define Package/serdisplib
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=A display control library
-  DEPENDS:=@!LINUX_2_4
   URL:=http://serdisplib.sourceforge.net/
 endef
 
diff --git a/libs/sysfsutils/Makefile b/libs/sysfsutils/Makefile
index cfad23c0b2..4dc7dc1176 100644
--- a/libs/sysfsutils/Makefile
+++ b/libs/sysfsutils/Makefile
@@ -25,7 +25,6 @@ define Package/libsysfs
   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 @@ define Package/sysfsutils
   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
diff --git a/multimedia/fswebcam/Makefile b/multimedia/fswebcam/Makefile
index cfd92019b1..8c6167cce7 100644
--- a/multimedia/fswebcam/Makefile
+++ b/multimedia/fswebcam/Makefile
@@ -24,7 +24,7 @@ define Package/fswebcam
   CATEGORY:=Multimedia
   TITLE:=fswebcam
   URL:=http://www.sanslogic.co.uk/fswebcam/
-  DEPENDS:= @!LINUX_2_4 +libgd
+  DEPENDS:=+libgd
 endef
 
 define Package/fswebcam/description
diff --git a/multimedia/gst-plugins-bad/Makefile b/multimedia/gst-plugins-bad/Makefile
index 5cef2d9c7c..c792ff1090 100644
--- a/multimedia/gst-plugins-bad/Makefile
+++ b/multimedia/gst-plugins-bad/Makefile
@@ -28,7 +28,6 @@ define Package/gstreamer/Default
   SECTION:=multimedia
   TITLE:=GStreamer
   URL:=http://gstreamer.freedesktop.org/
-  DEPENDS:= @!LINUX_2_4
 endef
 
 define Package/gstreamer/description/Default
diff --git a/multimedia/gst-plugins-base/Makefile b/multimedia/gst-plugins-base/Makefile
index db2b3d3d52..7916c1c498 100644
--- a/multimedia/gst-plugins-base/Makefile
+++ b/multimedia/gst-plugins-base/Makefile
@@ -45,7 +45,6 @@ define Package/gstreamer/Default
   SECTION:=multimedia
   TITLE:=GStreamer
   URL:=http://gstreamer.freedesktop.org/
-  DEPENDS:= @!LINUX_2_4
 endef
 
 define Package/gstreamer/description/Default
diff --git a/multimedia/gst-plugins-good/Makefile b/multimedia/gst-plugins-good/Makefile
index f382dd7c6d..080dd80030 100644
--- a/multimedia/gst-plugins-good/Makefile
+++ b/multimedia/gst-plugins-good/Makefile
@@ -27,7 +27,6 @@ define Package/gstreamer/Default
   SECTION:=multimedia
   TITLE:=GStreamer
   URL:=http://gstreamer.freedesktop.org/
-  DEPENDS:= @!LINUX_2_4
 endef
 
 define Package/gstreamer/description/Default
diff --git a/multimedia/gst-plugins-ugly/Makefile b/multimedia/gst-plugins-ugly/Makefile
index 0fb8bdbb06..1ebdd7ea3b 100644
--- a/multimedia/gst-plugins-ugly/Makefile
+++ b/multimedia/gst-plugins-ugly/Makefile
@@ -33,7 +33,6 @@ define Package/gstreamer/Default
   SECTION:=multimedia
   TITLE:=GStreamer
   URL:=http://gstreamer.freedesktop.org/
-  DEPENDS:= @!LINUX_2_4
 endef
 
 define Package/gstreamer/description/Default
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index 6462e9e512..e7b0651a29 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -28,7 +28,6 @@ define Package/gstreamer/Default
   SECTION:=multimedia
   TITLE:=GStreamer
   URL:=http://gstreamer.freedesktop.org/
-  DEPENDS:= @!LINUX_2_4
 endef
 
 define Package/gstreamer/description/Default
diff --git a/multimedia/qc-usb/Makefile b/multimedia/qc-usb/Makefile
index 6f6f0bda08..07248dc425 100644
--- a/multimedia/qc-usb/Makefile
+++ b/multimedia/qc-usb/Makefile
@@ -38,7 +38,7 @@ define KernelPackage/video-quickcam
 $(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
diff --git a/net/batman-adv/Makefile b/net/batman-adv/Makefile
index 345f64e672..93fc391f9a 100644
--- a/net/batman-adv/Makefile
+++ b/net/batman-adv/Makefile
@@ -28,7 +28,7 @@ define KernelPackage/batman-adv
   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)
diff --git a/net/et131x/Makefile b/net/et131x/Makefile
index 8b3f91dafd..25b64144b3 100644
--- a/net/et131x/Makefile
+++ b/net/et131x/Makefile
@@ -29,7 +29,7 @@ define KernelPackage/et131x
   KCONFIG:= \
   	CONFIG_ET131X=m \
 	CONFIG_ET131X_DEBUG=n
-  DEPENDS:=@!LINUX_2_4 @PCI_SUPPORT
+  DEPENDS:=@PCI_SUPPORT
   AUTOLOAD:=$(call AutoLoad,70,et131x)
 endef
 
diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 3c717390a4..205d6d305f 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -37,7 +37,7 @@ define Package/haproxy/description
 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)" \
diff --git a/net/ipsec-tools/Makefile b/net/ipsec-tools/Makefile
index 34d0c0ae8f..50b3332069 100644
--- a/net/ipsec-tools/Makefile
+++ b/net/ipsec-tools/Makefile
@@ -25,7 +25,7 @@ define Package/ipsec-tools
   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
diff --git a/net/iputils/Makefile b/net/iputils/Makefile
index 712076b0d1..331751d7a4 100644
--- a/net/iputils/Makefile
+++ b/net/iputils/Makefile
@@ -25,7 +25,6 @@ define Package/iputils/Default
   SECTION:=net
   CATEGORY:=Network
   URL:=http://www.skbuff.net/iputils
-  DEPENDS:= @!LINUX_2_4
 endef
 
 
diff --git a/net/isakmpd/Makefile b/net/isakmpd/Makefile
index af8f4cf0f1..9301e9a104 100644
--- a/net/isakmpd/Makefile
+++ b/net/isakmpd/Makefile
@@ -24,7 +24,7 @@ define Package/isakmpd
   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
diff --git a/net/linuxigd/Makefile b/net/linuxigd/Makefile
index 6fc5c153b0..745a7f4c1d 100644
--- a/net/linuxigd/Makefile
+++ b/net/linuxigd/Makefile
@@ -25,7 +25,7 @@ define Package/linuxigd
   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
 
diff --git a/net/lldpd/Makefile b/net/lldpd/Makefile
index a4e6241ce0..83103e5ee8 100644
--- a/net/lldpd/Makefile
+++ b/net/lldpd/Makefile
@@ -22,7 +22,6 @@ define Package/lldpd
   CATEGORY:=Network
   SUBMENU:=Routing and Redirection
   TITLE:=Link Layer Discovery Protocol damon
-  DEPENDS:=@!LINUX_2_4
   URL:=https://trac.luffy.cx/lldpd/
 endef
 
diff --git a/net/nbd/Makefile b/net/nbd/Makefile
index 15f005979a..ea63cc8bc6 100644
--- a/net/nbd/Makefile
+++ b/net/nbd/Makefile
@@ -29,7 +29,7 @@ define Package/nbd
   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
diff --git a/net/openswan/Makefile b/net/openswan/Makefile
index 1a33dd1318..222f2a8900 100644
--- a/net/openswan/Makefile
+++ b/net/openswan/Makefile
@@ -24,7 +24,6 @@ include $(INCLUDE_DIR)/package.mk
 define Package/openswan/Default
   TITLE:=Openswan
   URL:=http://www.openswan.org/
-  DEPENDS:=@!LINUX_2_4
 endef
 
 define Package/openswan/Default/description
diff --git a/net/speedtouch-usb-firmware/Makefile b/net/speedtouch-usb-firmware/Makefile
index b4e641fcb4..f2a4afde97 100644
--- a/net/speedtouch-usb-firmware/Makefile
+++ b/net/speedtouch-usb-firmware/Makefile
@@ -24,7 +24,7 @@ define Package/speedtouch-usb-firmware
   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
 
diff --git a/net/squid/Makefile b/net/squid/Makefile
index f0b2790765..f96b69627f 100644
--- a/net/squid/Makefile
+++ b/net/squid/Makefile
@@ -27,7 +27,7 @@ endef
 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
 
diff --git a/net/usbip/Makefile b/net/usbip/Makefile
index 7748ca7b60..b62a88e535 100644
--- a/net/usbip/Makefile
+++ b/net/usbip/Makefile
@@ -26,7 +26,7 @@ include $(INCLUDE_DIR)/nls.mk
 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
 
diff --git a/net/xtables-addons/Makefile b/net/xtables-addons/Makefile
index b9deedd1ad..512e4a25a9 100644
--- a/net/xtables-addons/Makefile
+++ b/net/xtables-addons/Makefile
@@ -71,7 +71,7 @@ define BuildTemplate
     $$(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 BuildTemplate
   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
diff --git a/utils/btrfs-progs/Makefile b/utils/btrfs-progs/Makefile
index 4e173d7567..4ee46c1368 100644
--- a/utils/btrfs-progs/Makefile
+++ b/utils/btrfs-progs/Makefile
@@ -24,7 +24,7 @@ define Package/btrfs-progs
   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
diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile
index 5390d88a22..de08a89fef 100644
--- a/utils/collectd/Makefile
+++ b/utils/collectd/Makefile
@@ -268,7 +268,7 @@ $(eval $(call BuildPlugin,exec,process exec input,exec,))
 $(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,madwifi,MadWifi status input,madwifi,))
 $(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,))
diff --git a/utils/cryptsetup/Makefile b/utils/cryptsetup/Makefile
index cf7c002a9d..1973af5561 100644
--- a/utils/cryptsetup/Makefile
+++ b/utils/cryptsetup/Makefile
@@ -28,7 +28,7 @@ $(call Package/cryptsetup/Default)
   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
diff --git a/utils/cwiid/Makefile b/utils/cwiid/Makefile
index 370d4f35ed..195b58b7b6 100644
--- a/utils/cwiid/Makefile
+++ b/utils/cwiid/Makefile
@@ -23,7 +23,6 @@ $(call include_mk, python-package.mk)
 define Package/cwiid/Default
   TITLE:=Linux Nintendo Wiimote interface
   URL:=http://abstrakraft.org/cwiid/
-  DEPENDS:= @!LINUX_2_4
 endef
 
 define Package/libcwiid
diff --git a/utils/gadgetfs-test/Makefile b/utils/gadgetfs-test/Makefile
index ae6b0217b7..3dfc29855d 100644
--- a/utils/gadgetfs-test/Makefile
+++ b/utils/gadgetfs-test/Makefile
@@ -24,7 +24,7 @@ define Package/gadgetfs-test
   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
 
diff --git a/utils/i2c-tools/Makefile b/utils/i2c-tools/Makefile
index d2119a52eb..d67d8bb4df 100644
--- a/utils/i2c-tools/Makefile
+++ b/utils/i2c-tools/Makefile
@@ -25,7 +25,6 @@ define Package/i2c-tools
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=I2C tools for Linux
-  DEPENDS:=@!LINUX_2_4
   URL:=http://www.lm-sensors.org/wiki/I2CTools
 endef
 
diff --git a/utils/lirc/Makefile b/utils/lirc/Makefile
index 5b71d15268..6afe4a4215 100644
--- a/utils/lirc/Makefile
+++ b/utils/lirc/Makefile
@@ -30,7 +30,6 @@ endef
 define  Package/lirc
     $(call Package/lirc/Default)
     TITLE:=LIRC - Linux Infrared Remote Control
-    DEPENDS:=@!LINUX_2_4
     MENU:=1
 endef
 
diff --git a/utils/mdadm/Makefile b/utils/mdadm/Makefile
index 1488f7abd9..c33c8cdf58 100644
--- a/utils/mdadm/Makefile
+++ b/utils/mdadm/Makefile
@@ -24,7 +24,6 @@ define Package/mdadm
   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
 
diff --git a/utils/mtd-utils/Makefile b/utils/mtd-utils/Makefile
index f61c4bb1e0..9c72046715 100644
--- a/utils/mtd-utils/Makefile
+++ b/utils/mtd-utils/Makefile
@@ -103,11 +103,6 @@ MAKE_FLAGS += \
 	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) \
diff --git a/utils/pcmciautils/Makefile b/utils/pcmciautils/Makefile
index d2e272051c..e0bfacff78 100644
--- a/utils/pcmciautils/Makefile
+++ b/utils/pcmciautils/Makefile
@@ -20,7 +20,7 @@ include $(INCLUDE_DIR)/package.mk
 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
diff --git a/utils/psplash/Makefile b/utils/psplash/Makefile
index 282560377d..de8228d378 100644
--- a/utils/psplash/Makefile
+++ b/utils/psplash/Makefile
@@ -27,7 +27,6 @@ include $(INCLUDE_DIR)/package.mk
 define Package/psplash
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=@!LINUX_2_4
   TITLE:=A boot splash screen
   URL:=http://projects.o-hand.com/psplash
 endef
diff --git a/utils/sierra-pcmcia/Makefile b/utils/sierra-pcmcia/Makefile
index e6c1e16d31..3b25b18873 100644
--- a/utils/sierra-pcmcia/Makefile
+++ b/utils/sierra-pcmcia/Makefile
@@ -20,7 +20,7 @@ include $(INCLUDE_DIR)/package.mk
 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
 
diff --git a/utils/stress/Makefile b/utils/stress/Makefile
index 735b0a1b63..12203fadcf 100644
--- a/utils/stress/Makefile
+++ b/utils/stress/Makefile
@@ -22,7 +22,6 @@ include $(INCLUDE_DIR)/package.mk
 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
diff --git a/utils/testusb/Makefile b/utils/testusb/Makefile
index 0276a3db2d..4364799581 100644
--- a/utils/testusb/Makefile
+++ b/utils/testusb/Makefile
@@ -18,7 +18,7 @@ include $(INCLUDE_DIR)/package.mk
 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