OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Only display areas with differences – Ignore whitespace
Rev 2 Rev 3
1   1  
2 # Copyright (C) 2009-2012 OpenWrt.org 2 # Copyright (C) 2009-2012 OpenWrt.org
3 # 3 #
4 # This is free software, licensed under the GNU General Public License v2. 4 # This is free software, licensed under the GNU General Public License v2.
5 # See /LICENSE for more information. 5 # See /LICENSE for more information.
6 # 6 #
7 # 7 #
8 include $(TOPDIR)/rules.mk 8 include $(TOPDIR)/rules.mk
9 include $(INCLUDE_DIR)/kernel.mk 9 include $(INCLUDE_DIR)/kernel.mk
10   10  
11 PKG_NAME:=ipset 11 PKG_NAME:=ipset
12 PKG_VERSION:=7.1 12 PKG_VERSION:=6.34
13 PKG_RELEASE:=2 13 PKG_RELEASE:=1
14   14  
15 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 15 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
16 PKG_SOURCE_URL:=http://ipset.netfilter.org 16 PKG_SOURCE_URL:=http://ipset.netfilter.org
17 PKG_HASH:=7b5eb3b93205c20cdc39e3fc8b6e5f7bb214bf79a7c0c00729dd4a31ce16adc4 17 PKG_HASH:=d70e831b670b7aa25dde81fd994d3a7ce0c0e801559a557105576df66cd8d680
18   18  
19 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io> 19 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
20 PKG_LICENSE:=GPL-2.0 20 PKG_LICENSE:=GPL-2.0
21   21  
22 PKG_FIXUP:=autoreconf 22 PKG_FIXUP:=autoreconf
23 PKG_INSTALL:=1 23 PKG_INSTALL:=1
24   24  
25 include $(INCLUDE_DIR)/package.mk 25 include $(INCLUDE_DIR)/package.mk
26   26  
27 define Package/ipset/Default 27 define Package/ipset/Default
28 SECTION:=net 28 SECTION:=net
29 CATEGORY:=Network 29 CATEGORY:=Network
30 DEPENDS+= +kmod-ipt-ipset +libmnl 30 DEPENDS+= +kmod-ipt-ipset +libmnl
31 TITLE:=IPset administration utility 31 TITLE:=IPset administration utility
32 URL:=http://ipset.netfilter.org/ 32 URL:=http://ipset.netfilter.org/
33 endef 33 endef
34   34  
35 define Package/ipset 35 define Package/ipset
36 $(call Package/ipset/Default) 36 $(call Package/ipset/Default)
37 DEPENDS+= +libipset 37 DEPENDS+= +libipset
38 endef 38 endef
39   39  
40 define Package/libipset 40 define Package/libipset
41 $(call Package/ipset/Default) 41 $(call Package/ipset/Default)
42 ABI_VERSION:=13 -  
43 endef 42 endef
44   43  
45 CONFIGURE_ARGS += \ 44 CONFIGURE_ARGS += \
46 --with-kbuild="$(LINUX_DIR)" 45 --with-kbuild="$(LINUX_DIR)"
47   46  
48 MAKE_FLAGS += \ 47 MAKE_FLAGS += \
49 ARCH="$(LINUX_KARCH)" \ 48 ARCH="$(LINUX_KARCH)" \
50 SHELL="$(BASH)" 49 SHELL="$(BASH)"
51   50  
52 define Build/InstallDev 51 define Build/InstallDev
53 $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig 52 $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig
54 $(CP) $(PKG_INSTALL_DIR)/usr/include/libipset $(1)/usr/include/ 53 $(CP) $(PKG_INSTALL_DIR)/usr/include/libipset $(1)/usr/include/
55 $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipset.{a,so*} $(1)/usr/lib/ 54 $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipset.{a,so*} $(1)/usr/lib/
56 $(CP) $(PKG_BUILD_DIR)/lib/libipset.pc $(1)/usr/lib/pkgconfig/ 55 $(CP) $(PKG_BUILD_DIR)/lib/libipset.pc $(1)/usr/lib/pkgconfig/
57 endef 56 endef
58   57  
59 define Package/ipset/install 58 define Package/ipset/install
60 $(INSTALL_DIR) $(1)/usr/sbin 59 $(INSTALL_DIR) $(1)/usr/sbin
61 $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ipset $(1)/usr/sbin/ 60 $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ipset $(1)/usr/sbin/
62 endef 61 endef
63   62  
64 define Package/libipset/install 63 define Package/libipset/install
65 $(INSTALL_DIR) $(1)/usr/lib 64 $(INSTALL_DIR) $(1)/usr/lib
66 $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipset*.so.* $(1)/usr/lib/ 65 $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipset*.so* $(1)/usr/lib/
67 endef 66 endef
68   67  
69 $(eval $(call BuildPackage,ipset)) 68 $(eval $(call BuildPackage,ipset))
70 $(eval $(call BuildPackage,libipset)) 69 $(eval $(call BuildPackage,libipset))
71   70