[packages] replace @LINUX_2_6 with @!LINUX_2_4, fixes fallout after r23246
authorJo-Philipp Wich <jow@openwrt.org>
Tue, 5 Oct 2010 23:56:19 +0000 (23:56 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Tue, 5 Oct 2010 23:56:19 +0000 (23:56 +0000)
SVN-Revision: 23266

38 files changed:
devel/ksymoops/Makefile
devel/oprofile/Makefile
ipv6/dibbler/Makefile
libs/keynote/Makefile
libs/libaio/Makefile
libs/libnetfilter-conntrack/Makefile
libs/libnetfilter-log/Makefile
libs/libnetfilter-queue/Makefile
libs/libnfnetlink/Makefile
libs/liboping/Makefile
libs/libtorrent/Makefile
libs/libv4l/Makefile
libs/sysfsutils/Makefile
multimedia/mjpg-streamer/Makefile
net/batman-advanced/Makefile
net/et131x/Makefile
net/freeradius2/Makefile
net/ipsec-tools/Makefile
net/isakmpd/Makefile
net/linuxigd/Makefile
net/nbd/Makefile
net/openl2tp/Makefile
net/openswan/Makefile
net/speedtouch-usb-firmware/Makefile
net/squid/Makefile
net/usbip/Makefile
net/xtables-addons/Makefile
utils/btrfs-progs/Makefile
utils/cryptsetup/Makefile
utils/gadgetfs-test/Makefile
utils/i2c-tools/Makefile
utils/mdadm/Makefile
utils/pcmciautils/Makefile
utils/psplash/Makefile
utils/sierra-pcmcia/Makefile
utils/stress/Makefile
utils/testusb/Makefile
utils/ucmb/Makefile

index 31ac063..446fbc2 100644 (file)
@@ -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
index a16d244..0166363 100644 (file)
@@ -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
index 0112dcd..419f8ef 100644 (file)
@@ -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
index 7cac891..8e9a459 100644 (file)
@@ -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
index fa00449..147db8e 100644 (file)
@@ -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
index b6d1102..9b85aa4 100644 (file)
@@ -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
index fc60e49..21ab2d8 100644 (file)
@@ -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
index b7d9fdf..6efcd4f 100644 (file)
@@ -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
index 4b58911..d79cc36 100644 (file)
@@ -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
index d8022b3..588e73a 100644 (file)
@@ -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 \
index a64af19..46c865c 100644 (file)
@@ -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
index b1d90a7..368aff1 100644 (file)
@@ -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
index 70d3388..5a253b9 100644 (file)
@@ -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
index e9637db..175d258 100644 (file)
@@ -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
 
index 96952c7..9b20d21 100644 (file)
@@ -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)
index 10d793d..8b3f91d 100644 (file)
@@ -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
 
index 7a6d17a..cfaf431 100644 (file)
@@ -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
 
index 77c5d6a..9bbd2a5 100644 (file)
@@ -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
index ddc751c..6f0497b 100644 (file)
@@ -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
index 7109ee9..520dc85 100644 (file)
@@ -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
 
index 8ef0bfd..81d39ec 100644 (file)
@@ -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
index 9505668..bf89cf8 100644 (file)
@@ -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
index 0d270d3..8a9c245 100644 (file)
@@ -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
index c55b005..1f4544c 100644 (file)
@@ -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
index f25dca4..e7281ca 100644 (file)
@@ -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
 
index a0c4c0f..be48be0 100644 (file)
@@ -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
 
index f149546..53c4106 100644 (file)
@@ -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
index 1290c6e..8f9c672 100644 (file)
@@ -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
index 2452a8c..89f5dc7 100644 (file)
@@ -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
index ab4e877..ae6b021 100644 (file)
@@ -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
 
index 4fa23cc..e3f2394 100644 (file)
@@ -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
 
index bd91de4..418f9c9 100644 (file)
@@ -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
index 87dd324..99581fc 100644 (file)
@@ -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
index 0426cb8..2825603 100644 (file)
@@ -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
index d0251d1..e6c1e16 100644 (file)
@@ -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
 
index 4e5e30c..735b0a1 100644 (file)
@@ -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
index 0e0b045..0276a3d 100644 (file)
@@ -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
index 0e320f5..b3e8316 100644 (file)
@@ -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