distro: update to latest apkg compat level 6

Modify scripts/make-archive.sh to output YAML only to stdout as required
by latest apkg compat level 6. All stdout was redirected to stderr.

diff --git a/distro/config/apkg.toml b/distro/config/apkg.toml
index 1d3cd72366cd3c07585ab8fe39ec1096bf4e736d..e08582906d5a3132372b76b3b4c1e88f79174f3e 100644 (file)
--- a/distro/config/apkg.toml
+++ b/distro/config/apkg.toml
@@ -9,7 +9,7 @@ archive_url = "https://secure.nic.cz/files/knot-dns/knot-{{ version }}.tar.xz"
 signature_url = "https://secure.nic.cz/files/knot-dns/knot-{{ version }}.tar.xz.asc"
 
 [apkg]
-compat = 3
+compat = 6
 
 [[distro.aliases]]
 name = "deb-nolibxdp"

diff --git a/scripts/make_dev_archive.sh b/scripts/make_dev_archive.sh
index b9929df42f7be1d5f4adb81961f05fa48b3ab34e..e37682a52c88e7c8e185a8a1281d6843b66e5052 100755 (executable)
--- a/scripts/make_dev_archive.sh
+++ b/scripts/make_dev_archive.sh
@@ -2,19 +2,21 @@
 # Copyright (C) CZ.NIC, z.s.p.o. and contributors
 # SPDX-License-Identifier: GPL-2.0-or-later
 # For more information, see <https://www.knot-dns.cz/>
-
 #
 # Create a development tarball
 #
+# This script is used by apkg to generate archive from current sources.
+# It must only output valid YAML to stdout!
 
 set -o errexit -o nounset -o xtrace
 
 cd "$(dirname ${0})/.."
 
 # configure Knot DNS in order to create archive
-autoreconf -if
-./configure
+autoreconf -if >&2
+./configure >&2
 # create archive and parse output for archive name
 TARDIR=$(make dist 2>&1 | sed -n 's/tardir=\([^ ]\+\).*/\1/p')
 # print created archive name
-ls -1 $TARDIR.tar.*
+archive=$(ls -1 $TARDIR.tar.*)
+echo "archive: '$archive'"