ソースを参照

knot: update to 1.5.0.

Signed-off-by: Daniel Salzman <daniel.salzman@nic.cz>
Daniel Salzman 10 年 前
コミット
cebfdc6992
共有1 個のファイルを変更した11 個の追加6 個の削除を含む
  1. 11
    6
      net/knot/Makefile

+ 11
- 6
net/knot/Makefile ファイルの表示

@@ -8,13 +8,13 @@
8 8
 include $(TOPDIR)/rules.mk
9 9
 
10 10
 PKG_NAME:=knot
11
-PKG_VERSION:=1.5.0-rc2
11
+PKG_VERSION:=1.5.0
12 12
 PKG_RELEASE:=1
13 13
 
14 14
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
15 15
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
16 16
 PKG_SOURCE_URL:=https://secure.nic.cz/files/knot-dns/
17
-PKG_MD5SUM:=9a93226c200813ee7bfe27dcf7b6cbc9
17
+PKG_MD5SUM:=d677de99c19afea3b1e8ef075a9d5a8b
18 18
 
19 19
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
20 20
 PKG_BUILD_PARALLEL:=1
@@ -73,9 +73,14 @@ define Package/knot-tests/description
73 73
 	Usage: /usr/share/knot/runtests.sh
74 74
 endef
75 75
 
76
+define Package/knot/conffiles
77
+/etc/knot/knot.conf
78
+endef
79
+
76 80
 CONFIGURE_ARGS += 			\
77 81
 	--enable-recvmmsg=no		\
78 82
 	--disable-fastparser		\
83
+	--without-libidn		\
79 84
 	--with-rundir=/var/run		\
80 85
 	--with-storage=/etc/knot
81 86
 
@@ -101,7 +106,7 @@ define Package/knot/install
101 106
 
102 107
 	$(INSTALL_DIR) 							$(1)/etc/knot
103 108
 	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/knot/knot.sample.conf	$(1)/etc/knot/knot.conf
104
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/knot/example.com.zone	$(1)/etc/knot/
109
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/knot/example.com.zone	$(1)/etc/knot/
105 110
 
106 111
 	$(INSTALL_DIR)				$(1)/etc/init.d
107 112
 	$(INSTALL_BIN) ./files/knotd.init	$(1)/etc/init.d/knotd
@@ -117,7 +122,7 @@ endef
117 122
 
118 123
 define Package/knot-tests/install
119 124
 	$(INSTALL_DIR) 						$(1)/usr/share/knot
120
-	$(INSTALL_BIN) ./files/runtests.sh			$(1)/usr/share/knot
125
+	$(INSTALL_BIN) ./files/runtests.sh			$(1)/usr/share/knot/
121 126
 
122 127
 	$(INSTALL_DIR) 						$(1)/usr/share/knot/tap
123 128
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libtap/runtests		$(1)/usr/share/knot/tap/
@@ -129,11 +134,11 @@ define Package/knot-tests/install
129 134
 		xargs -I{} $(INSTALL_BIN) -T $(PKG_BUILD_DIR)/tests/.libs/{}	$(1)/usr/share/knot/tests/test_{}
130 135
 
131 136
 	$(INSTALL_DIR)						$(1)/usr/share/knot/tests/data
132
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/tests/data/sample_conf	$(1)/usr/share/knot/tests/data/
137
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/tests/data/sample_conf	$(1)/usr/share/knot/tests/data/
133 138
 
134 139
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/zscanner/tests/.libs/zscanner-tool	$(1)/usr/share/knot/tests/
135 140
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/zscanner/tests/unittests		$(1)/usr/share/knot/tests/test_zscanner
136
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/src/zscanner/tests/TESTS		$(1)/usr/share/knot/tests/
141
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/zscanner/tests/TESTS		$(1)/usr/share/knot/tests/
137 142
 	cp -a $(PKG_BUILD_DIR)/src/zscanner/tests/data				$(1)/usr/share/knot/tests/
138 143
 endef
139 144