[packages] replace @LINUX_2_6 with @!LINUX_2_4, fixes fallout after r23246

git-svn-id: svn://svn.openwrt.org/openwrt/packages@23266 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-10-05 23:56:19 +00:00 · 2010-10-05 23:56:19 +00:00 · 0b8093e64b
commit 0b8093e64b
parent 31ba6ae15a
38 changed files with 45 additions and 41 deletions
--- 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_6 @mips||mipsel||m68k||i386
+  DEPENDS:=@!LINUX_2_4 @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/devel/oprofile/Makefile
+++ b/devel/oprofile/Makefile
@ -25,7 +25,7 @@ include $(INCLUDE_DIR)/kernel.mk
 define KernelPackage/oprofile
  SUBMENU:=Other modules
  TITLE:=OProfile profiling support
-  KCONFIG:=CONFIG_OPROFILE @LINUX_2_6
+  KCONFIG:=CONFIG_OPROFILE @!LINUX_2_4
  FILES:=$(LINUX_DIR)/arch/$(LINUX_KARCH)/oprofile/oprofile.$(LINUX_KMOD_SUFFIX)
  DEPENDS:=@KERNEL_PROFILING
 endef
--- 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_6 +libpthread
+  DEPENDS:=+libstdcpp @!LINUX_2_4 +libpthread
  TITLE:=Dibbler, a portable DHCPv6 implementation
  URL:=http://klub.com.pl/dhcpv6/
 endef
--- a/libs/keynote/Makefile
+++ b/libs/keynote/Makefile
@ -20,7 +20,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/keynote
  SECTION:=net
  CATEGORY:=Network
-  DEPENDS:=@LINUX_2_6 +libopenssl
+  DEPENDS:=@!LINUX_2_4 +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,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/libaio
  SECTION:=libs
  CATEGORY:=Libraries
-  DEPENDS:=@LINUX_2_6
+  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
@ -25,7 +25,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/libnetfilter-conntrack
  SECTION:=libs
  CATEGORY:=Libraries
-  DEPENDS:=@LINUX_2_6 +libnfnetlink +kmod-nf-conntrack-netlink
+  DEPENDS:=@!LINUX_2_4 +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
@ -26,7 +26,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/libnetfilter-log
  SECTION:=libs
  CATEGORY:=Libraries
-  DEPENDS:=@LINUX_2_6 +libnfnetlink +kmod-nfnetlink-log
+  DEPENDS:=@!LINUX_2_4 +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
@ -26,7 +26,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/libnetfilter-queue
  SECTION:=libs
  CATEGORY:=Libraries
-  DEPENDS:=@LINUX_2_6 +libnfnetlink +kmod-nfnetlink-queue
+  DEPENDS:=@!LINUX_2_4 +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
@ -26,7 +26,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/libnfnetlink
  SECTION:=libs
  CATEGORY:=Libraries
-  DEPENDS:=@LINUX_2_6
+  DEPENDS:=@!LINUX_2_4
  TITLE:=A low-level library for netfilter related kernel/userspace communication
  URL:=http://netfilter.org/projects/libnfnetlink/
 endef
--- a/libs/liboping/Makefile
+++ b/libs/liboping/Makefile
@ -48,7 +48,7 @@ $(call Package/liboping/Default)
  DEPENDS+= +liboping +libncurses
 endef

-TARGET_CFLAGS += $(FPIC)
+TARGET_CFLAGS += $(FPIC) -I$(STAGING_DIR)/usr/include

 CONFIGURE_ARGS += \
 	--without-perl-bindings \
--- a/libs/libtorrent/Makefile
+++ b/libs/libtorrent/Makefile
@ -28,7 +28,7 @@ define Package/libtorrent
  CATEGORY:=Libraries
  TITLE:=Rakshasa's BitTorrent library
  URL:=http://libtorrent.rakshasa.no/
-  DEPENDS:=+libopenssl +libsigcxx @LINUX_2_6
+  DEPENDS:=+libopenssl +libsigcxx @!LINUX_2_4
 endef

 define Package/libtorrent/description
--- a/libs/libv4l/Makefile
+++ b/libs/libv4l/Makefile
@ -23,7 +23,7 @@ define Package/libv4l
  CATEGORY:=Libraries
  TITLE:=Video 4 Linux wrapper libraries
  URL:=http://people.atrpms.net/~hdegoede/
-  DEPENDS:=+libpthread @LINUX_2_6
+  DEPENDS:=+libpthread @!LINUX_2_4
 endef

 define Package/libv4l/description
--- a/libs/sysfsutils/Makefile
+++ b/libs/sysfsutils/Makefile
@ -24,7 +24,7 @@ define Package/libsysfs
  SECTION:=libs
  CATEGORY:=Libraries
  SUBMENU:=Filesystem
-  DEPENDS:=@LINUX_2_6
+  DEPENDS:=@!LINUX_2_4
  TITLE:=Sysfs library
  URL:=http://linux-diag.sourceforge.net/Sysfsutils.html
 endef
@ -33,7 +33,7 @@ define Package/sysfsutils
  SECTION:=utils
  CATEGORY:=Utilities
  SUBMENU:=Filesystem
-  DEPENDS:=@LINUX_2_6 +libsysfs
+  DEPENDS:=@!LINUX_2_4 +libsysfs
  TITLE:=System Utilities Based on Sysfs
  URL:=http://linux-diag.sourceforge.net/Sysfsutils.html
 endef
--- a/multimedia/mjpg-streamer/Makefile
+++ b/multimedia/mjpg-streamer/Makefile
@ -24,7 +24,7 @@ define Package/mjpg-streamer
  SECTION:=multimedia
  CATEGORY:=Multimedia
  TITLE:=MJPG-streamer
-  DEPENDS:=@LINUX_2_6 +libpthread +libjpeg
+  DEPENDS:=@!LINUX_2_4 +libpthread +libjpeg
  URL:=http://mjpg-streamer.wiki.sourceforge.net/
 endef

--- a/net/batman-advanced/Makefile
+++ b/net/batman-advanced/Makefile
@ -27,7 +27,7 @@ define KernelPackage/batman-adv
  URL:=http://www.open-mesh.org/
  MAINTAINER:=Marek Lindner <lindner_marek@yahoo.de>
  SUBMENU:=Network Support
-  DEPENDS:=@LINUX_2_6
+  DEPENDS:=@!LINUX_2_4
  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 @@ define KernelPackage/et131x
  KCONFIG:= \
  	CONFIG_ET131X=m \
 	CONFIG_ET131X_DEBUG=n
-  DEPENDS:=@LINUX_2_6 @PCI_SUPPORT
+  DEPENDS:=@!LINUX_2_4 @PCI_SUPPORT
  AUTOLOAD:=$(call AutoLoad,70,et131x)
 endef

--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@ -254,13 +254,15 @@ endef

 define Package/freeradius2-mod-sql-mysql
  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2-mod-sql +libmysqlclient
+  DEPENDS:=freeradius2-mod-sql \
+  	+PACKAGE_freeradius2-mod-sql-mysql:libmysqlclient
  TITLE:=MySQL module
 endef

 define Package/freeradius2-mod-sql-pgsql
  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2-mod-sql +libpq
+  DEPENDS:=freeradius2-mod-sql \
+  	+PACKAGE_freeradius2-mod-sql-pgsql:libpq
  TITLE:=PostgreSQL module
 endef

--- a/net/ipsec-tools/Makefile
+++ b/net/ipsec-tools/Makefile
@ -23,7 +23,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/ipsec-tools
  SECTION:=net
  CATEGORY:=Network
-  DEPENDS:=@LINUX_2_6 +libopenssl +kmod-ipsec
+  DEPENDS:=@!LINUX_2_4 +libopenssl +kmod-ipsec
  TITLE:=IPsec management tools
  URL:=http://ipsec-tools.sourceforge.net/
 endef
--- a/net/isakmpd/Makefile
+++ b/net/isakmpd/Makefile
@ -23,7 +23,7 @@ include $(INCLUDE_DIR)/kernel.mk
 define Package/isakmpd
  SECTION:=net
  CATEGORY:=Network
-  DEPENDS:=@LINUX_2_6 +libopenssl +keynote +libgmp
+  DEPENDS:=@!LINUX_2_4 +libopenssl +keynote +libgmp
  TITLE:=IPsec management tools
  URL:=http://isakmpd.sourceforge.net/
 endef
--- a/net/linuxigd/Makefile
+++ b/net/linuxigd/Makefile
@ -24,7 +24,7 @@ define Package/linuxigd
  SECTION:=net
  CATEGORY:=Network
  TITLE:=UPnP daemon
-  DEPENDS:=+libiptc +libupnp +libpthread @LINUX_2_6
+  DEPENDS:=+libiptc +libupnp +libpthread @!LINUX_2_4
  URL:=http://linux-igd.sourceforge.net/
 endef

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

 define Package/nbd/description
--- a/net/openl2tp/Makefile
+++ b/net/openl2tp/Makefile
@ -24,7 +24,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/openl2tp
  SECTION:=net
  CATEGORY:=Network
-  DEPENDS:=+kmod-pppol2tp +ppp +portmap +libreadline +libncurses @LINUX_2_6
+  DEPENDS:=+kmod-pppol2tp +ppp +portmap +libreadline +libncurses @!LINUX_2_4
  TITLE:=An L2TP (Layer 2 Tunneling Protocol) daemon
  URL:=http://www.openl2tp.org/
  SUBMENU:=VPN
--- a/net/openswan/Makefile
+++ b/net/openswan/Makefile
@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/openswan/Default
  TITLE:=Openswan
  URL:=http://www.openswan.org/
-  DEPENDS:=@LINUX_2_6
+  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 @@ 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_6
+  DEPENDS:=+kmod-usb-atm +kmod-usb-atm-speedtouch @!LINUX_2_4
  PKGARCH:=all
 endef

@ -57,6 +57,8 @@ define Package/speedtouch-usb-firmware/install
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/speedtch-1.bin.4 $(1)/lib/firmware
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/speedtch-2.bin.2 $(1)/lib/firmware
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/speedtch-2.bin.4 $(1)/lib/firmware
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/atm
+	$(INSTALL_DATA) ./files/atm.hotplug $(1)/etc/hotplug.d/atm/20-speedtouch
 endef

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

--- a/net/usbip/Makefile
+++ b/net/usbip/Makefile
@ -24,7 +24,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/usbip/Common
  TITLE:=USB-over-IP
  URL:=http://usbip.sourceforge.net/
-  DEPENDS:=@LINUX_2_6 @USB_SUPPORT
+  DEPENDS:=@!LINUX_2_4 @USB_SUPPORT
  MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com>
 endef

--- a/net/xtables-addons/Makefile
+++ b/net/xtables-addons/Makefile
@ -68,7 +68,7 @@ define BuildTemplate
    $$(call Package/xtables-addons)
    CATEGORY:=Network
    TITLE:=$(2) iptables extension
-    DEPENDS:= @LINUX_2_6 iptables $(if $(4),+kmod-ipt-$(1))
+    DEPENDS:= @!LINUX_2_4 iptables $(if $(4),+kmod-ipt-$(1))
  endef

  define Package/iptables-mod-$(1)/install
@ -87,7 +87,7 @@ define BuildTemplate
  define KernelPackage/ipt-$(1)
    SUBMENU:=Netfilter Extensions
    TITLE:=$(2) netfilter module
-    DEPENDS:= @LINUX_2_6 kmod-ipt-core $(6)
+    DEPENDS:= @!LINUX_2_4 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
@ -21,7 +21,7 @@ define Package/btrfs-progs
  SECTION:=utils
  CATEGORY:=Utilities
  SUBMENU:=Filesystem
-  DEPENDS:=@LINUX_2_6 +libuuid +zlib
+  DEPENDS:=@!LINUX_2_4 +libuuid +zlib
  TITLE:=Btrfs filesystems utilities
  URL:=http://btrfs.wiki.kernel.org/
 endef
--- 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_6 +libblkid +libuuid +libpopt +lvm2 +libgcrypt
+  DEPENDS:=@!LINUX_2_4 +libblkid +libuuid +libpopt +lvm2 +libgcrypt
 endef

 define Package/cryptsetup/description
--- 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_6 +libpthread
+  DEPENDS:=@DEVEL @!LINUX_2_4 +libpthread
  URL:=http://linux-usb.org/gadget
 endef

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

--- a/utils/mdadm/Makefile
+++ b/utils/mdadm/Makefile
@ -22,7 +22,7 @@ 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_6
+  DEPENDS:=@!LINUX_2_4
 endef

 define Build/Compile
--- 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:=+sysfsutils @LINUX_2_6 @PCMCIA_SUPPORT
+  DEPENDS:=+sysfsutils @!LINUX_2_4 @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,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/psplash
  SECTION:=utils
  CATEGORY:=Utilities
-  DEPENDS:=@LINUX_2_6
+  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 @@ include $(INCLUDE_DIR)/package.mk
 define KernelPackage/pcmcia-serial-sierra
  SUBMENU:=Other modules
  TITLE:=Sierra AirCard PCMCIA support
-  DEPENDS:=kmod-pcmcia-serial @LINUX_2_6
+  DEPENDS:=kmod-pcmcia-serial @!LINUX_2_4
  URL:=http://www.sierrawireless.com/faq/ShowFAQ.aspx?ID=118
 endef

--- a/utils/stress/Makefile
+++ b/utils/stress/Makefile
@ -22,7 +22,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/stress
  SECTION:=utils
  CATEGORY:=Utilities
-  DEPENDS:=@LINUX_2_6
+  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 @@ include $(INCLUDE_DIR)/package.mk
 define Package/testusb
  SECTION:=utils
  CATEGORY:=Utilities
-  DEPENDS:=@LINUX_2_6 @DEVEL +libpthread
+  DEPENDS:=@!LINUX_2_4 @DEVEL +libpthread
  TITLE:=USB testing utility
  URL:=http://www.linux-usb.org/usbtest/testusb.c
 endef
--- a/utils/ucmb/Makefile
+++ b/utils/ucmb/Makefile
@ -15,7 +15,7 @@ include $(INCLUDE_DIR)/package.mk

 define KernelPackage/ucmb
  SUBMENU:=Other modules
-  DEPENDS:=@LINUX_2_6 \
+  DEPENDS:=@!LINUX_2_4 \
          @!LINUX_2_6_21 @!LINUX_2_6_22 @!LINUX_2_6_23 @!LINUX_2_6_24 \
 	  @!LINUX_2_6_25 @!LINUX_2_6_26 @!LINUX_2_6_27 \
 	  +kmod-spi-gpio +kmod-crc16