OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 6... Line 6...
6 # 6 #
Line 7... Line 7...
7   7  
Line 8... Line 8...
8 include $(TOPDIR)/rules.mk 8 include $(TOPDIR)/rules.mk
9   9  
10 PKG_NAME:=dnsmasq -  
11 PKG_UPSTREAM_VERSION:=2.80 10 PKG_NAME:=dnsmasq
12 PKG_VERSION:=$(subst test,~~test,$(subst rc,~rc,$(PKG_UPSTREAM_VERSION))) 11 PKG_VERSION:=2.80test3
13 PKG_RELEASE:=11 12 PKG_RELEASE:=1
14   13  
15 PKG_SOURCE:=$(PKG_NAME)-$(PKG_UPSTREAM_VERSION).tar.xz 14 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
Line 16... Line 15...
16 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq 15 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq/test-releases
17 PKG_HASH:=cdaba2785e92665cf090646cba6f94812760b9d7d8c8d0cfb07ac819377a63bb 16 PKG_HASH:=af9f6fd13e0d6c5a68059bcf8634c2784c0533017fd48fbaf59cd2955342d301
18   17  
Line 19... Line 18...
19 PKG_LICENSE:=GPL-2.0 18 PKG_LICENSE:=GPL-2.0
Line 20... Line 19...
20 PKG_LICENSE_FILES:=COPYING 19 PKG_LICENSE_FILES:=COPYING
21 PKG_CPE_ID:=cpe:/a:thekelleys:dnsmasq 20 PKG_CPE_ID:=cpe:/a:thekelleys:dnsmasq
22   21  
23 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_UPSTREAM_VERSION) 22 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
24   23  
25 PKG_INSTALL:=1 24 PKG_INSTALL:=1
26 PKG_BUILD_PARALLEL:=1 25 PKG_BUILD_PARALLEL:=1
27 PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_dhcp \ 26 PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_dhcp \
28 CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_dhcpv6 \ 27 CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_dhcpv6 \
29 CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_dnssec \ 28 CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_dnssec \
30 CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_auth \ -  
Line 31... Line 29...
31 CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_ipset \ 29 CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_auth \
Line 32... Line 30...
32 CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_conntrack \ 30 CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_ipset \
33 CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_noid \ 31 CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_conntrack \
Line 53... Line 51...
53 define Package/dnsmasq-dhcpv6 51 define Package/dnsmasq-dhcpv6
54 $(call Package/dnsmasq/Default) 52 $(call Package/dnsmasq/Default)
55 TITLE += (with DHCPv6 support) 53 TITLE += (with DHCPv6 support)
56 DEPENDS+=@IPV6 54 DEPENDS+=@IPV6
57 VARIANT:=dhcpv6 55 VARIANT:=dhcpv6
58 PROVIDES:=dnsmasq -  
59 endef 56 endef
Line 60... Line 57...
60   57  
61 define Package/dnsmasq-full 58 define Package/dnsmasq-full
62 $(call Package/dnsmasq/Default) 59 $(call Package/dnsmasq/Default)
63 TITLE += (with DNSSEC, DHCPv6, Auth DNS, IPset, Conntrack, NO_ID enabled by default) 60 TITLE += (with DNSSEC, DHCPv6, Auth DNS, IPset, Conntrack, NO_ID enabled by default)
64 DEPENDS+=+PACKAGE_dnsmasq_full_dnssec:libnettle \ 61 DEPENDS+=+PACKAGE_dnsmasq_full_dnssec:libnettle \
65 +PACKAGE_dnsmasq_full_ipset:kmod-ipt-ipset \ 62 +PACKAGE_dnsmasq_full_ipset:kmod-ipt-ipset \
66 +PACKAGE_dnsmasq_full_conntrack:libnetfilter-conntrack 63 +PACKAGE_dnsmasq_full_conntrack:libnetfilter-conntrack
67 VARIANT:=full -  
68 PROVIDES:=dnsmasq 64 VARIANT:=full
Line 69... Line 65...
69 endef 65 endef
70   66  
71 define Package/dnsmasq/description 67 define Package/dnsmasq/description
Line 115... Line 111...
115 bool "Build with NO_ID. (hide *.bind pseudo domain)" 111 bool "Build with NO_ID. (hide *.bind pseudo domain)"
116 default y 112 default y
117 config PACKAGE_dnsmasq_full_broken_rtc 113 config PACKAGE_dnsmasq_full_broken_rtc
118 bool "Build with HAVE_BROKEN_RTC." 114 bool "Build with HAVE_BROKEN_RTC."
119 default n 115 default n
120 config PACKAGE_dnsmasq_full_tftp -  
121 bool "Build with TFTP server support." -  
122 default y -  
123 endif 116 endif
124 endef 117 endef
Line 125... Line 118...
125   118  
126 Package/dnsmasq-dhcpv6/conffiles = $(Package/dnsmasq/conffiles) 119 Package/dnsmasq-dhcpv6/conffiles = $(Package/dnsmasq/conffiles)
Line 127... Line 120...
127 Package/dnsmasq-full/conffiles = $(Package/dnsmasq/conffiles) 120 Package/dnsmasq-full/conffiles = $(Package/dnsmasq/conffiles)
128   121  
Line 129... Line -...
129 TARGET_CFLAGS += -ffunction-sections -fdata-sections -  
130 TARGET_LDFLAGS += -Wl,--gc-sections 122 TARGET_CFLAGS += -ffunction-sections -fdata-sections
Line 131... Line 123...
131   123 TARGET_LDFLAGS += -Wl,--gc-sections
132 COPTS = -DHAVE_UBUS \ 124  
133 $(if $(CONFIG_IPV6),,-DNO_IPV6) 125 COPTS = $(if $(CONFIG_IPV6),,-DNO_IPV6)
Line 142... Line 134...
142 $(if $(CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_dnssec),-DHAVE_DNSSEC) \ 134 $(if $(CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_dnssec),-DHAVE_DNSSEC) \
143 $(if $(CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_auth),,-DNO_AUTH) \ 135 $(if $(CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_auth),,-DNO_AUTH) \
144 $(if $(CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_ipset),,-DNO_IPSET) \ 136 $(if $(CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_ipset),,-DNO_IPSET) \
145 $(if $(CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_conntrack),-DHAVE_CONNTRACK,) \ 137 $(if $(CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_conntrack),-DHAVE_CONNTRACK,) \
146 $(if $(CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_noid),-DNO_ID,) \ 138 $(if $(CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_noid),-DNO_ID,) \
147 $(if $(CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_broken_rtc),-DHAVE_BROKEN_RTC) \ 139 $(if $(CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_broken_rtc),-DHAVE_BROKEN_RTC)
148 $(if $(CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_tftp),,-DNO_TFTP) -  
149 COPTS += $(if $(CONFIG_LIBNETTLE_MINI),-DNO_GMP,) 140 COPTS += $(if $(CONFIG_LIBNETTLE_MINI),-DNO_GMP,)
150 else 141 else
151 COPTS += -DNO_AUTH -DNO_IPSET -DNO_ID 142 COPTS += -DNO_AUTH -DNO_IPSET -DNO_ID
152 endif 143 endif
Line 160... Line 151...
160   151  
161 define Package/dnsmasq/install 152 define Package/dnsmasq/install
162 $(INSTALL_DIR) $(1)/usr/sbin 153 $(INSTALL_DIR) $(1)/usr/sbin
163 $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnsmasq $(1)/usr/sbin/ 154 $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnsmasq $(1)/usr/sbin/
164 $(INSTALL_DIR) $(1)/etc/config 155 $(INSTALL_DIR) $(1)/etc/config
165 $(INSTALL_CONF) ./files/dhcp.conf $(1)/etc/config/dhcp 156 $(INSTALL_DATA) ./files/dhcp.conf $(1)/etc/config/dhcp
166 $(INSTALL_CONF) ./files/dnsmasq.conf $(1)/etc/dnsmasq.conf 157 $(INSTALL_DATA) ./files/dnsmasq.conf $(1)/etc/dnsmasq.conf
167 $(INSTALL_DIR) $(1)/etc/init.d 158 $(INSTALL_DIR) $(1)/etc/init.d
168 $(INSTALL_BIN) ./files/dnsmasq.init $(1)/etc/init.d/dnsmasq 159 $(INSTALL_BIN) ./files/dnsmasq.init $(1)/etc/init.d/dnsmasq
169 $(INSTALL_DIR) $(1)/etc/hotplug.d/dhcp 160 $(INSTALL_DIR) $(1)/etc/hotplug.d/dhcp
170 $(INSTALL_DIR) $(1)/etc/hotplug.d/neigh 161 $(INSTALL_DIR) $(1)/etc/hotplug.d/neigh
171 $(INSTALL_DIR) $(1)/etc/hotplug.d/ntp 162 $(INSTALL_DIR) $(1)/etc/hotplug.d/ntp
172 $(INSTALL_DIR) $(1)/etc/hotplug.d/tftp 163 $(INSTALL_DIR) $(1)/etc/hotplug.d/tftp
173 $(INSTALL_CONF) ./files/dnsmasqsec.hotplug $(1)/etc/hotplug.d/ntp/25-dnsmasqsec 164 $(INSTALL_DATA) ./files/dnsmasqsec.hotplug $(1)/etc/hotplug.d/ntp/25-dnsmasqsec
174 $(INSTALL_DIR) $(1)/usr/share/dnsmasq -  
175 $(INSTALL_CONF) ./files/dhcpbogushostname.conf $(1)/usr/share/dnsmasq/ 165 $(INSTALL_DIR) $(1)/usr/share/dnsmasq
176 $(INSTALL_CONF) ./files/rfc6761.conf $(1)/usr/share/dnsmasq/ 166 $(INSTALL_DATA) ./files/rfc6761.conf $(1)/usr/share/dnsmasq/
177 $(INSTALL_DIR) $(1)/usr/lib/dnsmasq 167 $(INSTALL_DIR) $(1)/usr/lib/dnsmasq
178 $(INSTALL_BIN) ./files/dhcp-script.sh $(1)/usr/lib/dnsmasq/dhcp-script.sh 168 $(INSTALL_BIN) ./files/dhcp-script.sh $(1)/usr/lib/dnsmasq/dhcp-script.sh
179 $(INSTALL_DIR) $(1)/usr/share/acl.d 169 $(INSTALL_DIR) $(1)/usr/share/acl.d
180 $(INSTALL_DATA) ./files/dnsmasq_acl.json $(1)/usr/share/acl.d/ 170 $(INSTALL_DATA) ./files/dnsmasq_acl.json $(1)/usr/share/acl.d/
Line 184... Line 174...
184   174  
185 define Package/dnsmasq-full/install 175 define Package/dnsmasq-full/install
186 $(call Package/dnsmasq/install,$(1)) 176 $(call Package/dnsmasq/install,$(1))
187 ifneq ($(CONFIG_PACKAGE_dnsmasq_full_dnssec),) 177 ifneq ($(CONFIG_PACKAGE_dnsmasq_full_dnssec),)
188 $(INSTALL_DIR) $(1)/usr/share/dnsmasq 178 $(INSTALL_DIR) $(1)/usr/share/dnsmasq
189 $(INSTALL_CONF) $(PKG_BUILD_DIR)/trust-anchors.conf $(1)/usr/share/dnsmasq 179 $(INSTALL_DATA) $(PKG_BUILD_DIR)/trust-anchors.conf $(1)/usr/share/dnsmasq
190 endif 180 endif
Line 191... Line 181...
191 endef 181 endef
192   182