knot: update to 2.8.0 and build/install only kdig

This fix compile errors on small arm boards. (cc1 internal error)

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/rootfiles/common/knot b/config/rootfiles/common/knot
index 68d1e702e708c2e19b600e2b514a0fb98b134df1..c0d900e6b3a3e8abcf7f8b6896ae83731f0b404a 100644 (file)
--- a/config/rootfiles/common/knot
+++ b/config/rootfiles/common/knot
@@ -1,93 +1,15 @@
 usr/bin/kdig
-#usr/bin/khost
-#usr/bin/knsec3hash
-#usr/bin/knsupdate
-#usr/include/knot
-#usr/include/knot/module.h
-#usr/include/libdnssec
-#usr/include/libdnssec/binary.h
-#usr/include/libdnssec/crypto.h
-#usr/include/libdnssec/dnssec.h
-#usr/include/libdnssec/error.h
-#usr/include/libdnssec/key.h
-#usr/include/libdnssec/keyid.h
-#usr/include/libdnssec/keystore.h
-#usr/include/libdnssec/keytag.h
-#usr/include/libdnssec/list.h
-#usr/include/libdnssec/nsec.h
-#usr/include/libdnssec/random.h
-#usr/include/libdnssec/sign.h
-#usr/include/libdnssec/tsig.h
-#usr/include/libdnssec/version.h
-#usr/include/libknot
-#usr/include/libknot/attribute.h
-#usr/include/libknot/codes.h
-#usr/include/libknot/consts.h
-#usr/include/libknot/control
-#usr/include/libknot/control/control.h
-#usr/include/libknot/cookies.h
-#usr/include/libknot/db
-#usr/include/libknot/db/db.h
-#usr/include/libknot/db/db_lmdb.h
-#usr/include/libknot/db/db_trie.h
-#usr/include/libknot/descriptor.h
-#usr/include/libknot/dname.h
-#usr/include/libknot/endian.h
-#usr/include/libknot/errcode.h
-#usr/include/libknot/error.h
-#usr/include/libknot/libknot.h
-#usr/include/libknot/lookup.h
-#usr/include/libknot/mm_ctx.h
-#usr/include/libknot/packet
-#usr/include/libknot/packet/compr.h
-#usr/include/libknot/packet/pkt.h
-#usr/include/libknot/packet/rrset-wire.h
-#usr/include/libknot/packet/wire.h
-#usr/include/libknot/rdata.h
-#usr/include/libknot/rdataset.h
-#usr/include/libknot/rrset-dump.h
-#usr/include/libknot/rrset.h
-#usr/include/libknot/rrtype
-#usr/include/libknot/rrtype/dnskey.h
-#usr/include/libknot/rrtype/ds.h
-#usr/include/libknot/rrtype/naptr.h
-#usr/include/libknot/rrtype/nsec.h
-#usr/include/libknot/rrtype/nsec3.h
-#usr/include/libknot/rrtype/nsec3param.h
-#usr/include/libknot/rrtype/opt.h
-#usr/include/libknot/rrtype/rdname.h
-#usr/include/libknot/rrtype/rrsig.h
-#usr/include/libknot/rrtype/soa.h
-#usr/include/libknot/rrtype/tsig.h
-#usr/include/libknot/tsig-op.h
-#usr/include/libknot/tsig.h
-#usr/include/libknot/version.h
-#usr/include/libknot/wire.h
-#usr/include/libknot/yparser
-#usr/include/libknot/yparser/yparser.h
-#usr/include/libknot/yparser/ypformat.h
-#usr/include/libknot/yparser/ypschema.h
-#usr/include/libknot/yparser/yptrafo.h
-#usr/include/libzscanner
-#usr/include/libzscanner/error.h
-#usr/include/libzscanner/scanner.h
-#usr/include/libzscanner/version.h
+#usr/lib/libcontrib.a
+#usr/lib/libcontrib.la
 #usr/lib/libdnssec.la
+#usr/lib/libdnssec.lai
 #usr/lib/libdnssec.so
-usr/lib/libdnssec.so.6
-usr/lib/libdnssec.so.6.0.0
+usr/lib/libdnssec.so.7
+usr/lib/libdnssec.so.7.0.0
 #usr/lib/libknot.la
+#usr/lib/libknot.lai
 #usr/lib/libknot.so
-usr/lib/libknot.so.8
-usr/lib/libknot.so.8.0.0
-#usr/lib/libzscanner.la
-#usr/lib/libzscanner.so
-usr/lib/libzscanner.so.2
-usr/lib/libzscanner.so.2.0.0
-#usr/lib/pkgconfig/libdnssec.pc
-#usr/lib/pkgconfig/libknot.pc
-#usr/lib/pkgconfig/libzscanner.pc
-#usr/share/man/man1/kdig.1
-#usr/share/man/man1/khost.1
-#usr/share/man/man1/knsec3hash.1
-#usr/share/man/man1/knsupdate.1
+usr/lib/libknot.so.9
+usr/lib/libknot.so.9.0.0
+#usr/lib/libknotus.a
+#usr/lib/libknotus.la

diff --git a/config/rootfiles/core/129/filelists/knot b/config/rootfiles/core/129/filelists/knot
new file mode 120000 (symlink)
index 0000000..28e96f8
--- /dev/null
+++ b/config/rootfiles/core/129/filelists/knot
@@ -0,0 +1 @@
+../../../common/knot
\ No newline at end of file

diff --git a/lfs/knot b/lfs/knot
index 729db9147531d1b0af5b2e8e00595ba819ca3464..1a7fec0cbcf893b913142acbdee17ae525670690 100644 (file)
--- a/lfs/knot
+++ b/lfs/knot
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.7.6
+VER        = 2.8.0
 
 THISAPP    = knot-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6afbbaff4e9d93de8d6311958d86b323
+$(DL_FILE)_MD5 = 5b0d73e143b4c5a72faf4f1f1337ca08
 
 install : $(TARGET)
 
@@ -76,14 +76,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && ./configure    \
                --prefix=/usr           \
                --enable-static=no      \
+               --disable-fastparser    \
                --disable-daemon        \
                --disable-modules       \
                --enable-maxminddb=no   \
                --disable-documentation
 
-       cd $(DIR_APP) && make $(MAKETUNING)
-       cd $(DIR_APP) && make install
+       cd $(DIR_APP)/src && make $(MAKETUNING) kdig
+       cd $(DIR_APP)/src/.libs && cp -av kdig /usr/bin
+       cd $(DIR_APP)/src/.libs && cp -av lib* /usr/lib
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
-