From: Jakub Ružička <jakub.ruzicka@nic.cz>
Date: Tue, 16 Feb 2021 16:42:25 +0000 (+0100)
Subject: distro: add apkg support
X-Git-Tag: v5.4.0~16^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f4238f73fdb81b753742b0cf98fe7fa87118b89;p=thirdparty%2Fknot-resolver.git

distro: add apkg support
---

diff --git a/.gitignore b/.gitignore
index e28639f6e..fb776a6ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,6 +57,7 @@
 /ltmain.sh
 /missing
 /modules/dnstap/dnstap.pb-c.d
+/pkg
 /self.crt
 /self.key
 /stamp-h1
diff --git a/NEWS b/NEWS
index 45b010383..8924e548a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
 Knot Resolver 5.x.y (2021-0m-dd)
 ================================
 
+Improvements
+------------
+- support apkg tool for packaging workflow (!1178)
+
 Bugfixes
 --------
 - trust_anchors.set_insecure: improve precision (#673, !1177)
diff --git a/distro/config/apkg.toml b/distro/config/apkg.toml
new file mode 100644
index 000000000..1096c38b0
--- /dev/null
+++ b/distro/config/apkg.toml
@@ -0,0 +1,12 @@
+[project]
+name = "knot-resolver"
+# needed for make-archive
+make_archive_script = "scripts/make-dev-archive.sh"
+
+[upstream]
+# needed for get-archive
+archive_url = "https://secure.nic.cz/files/knot-resolver/knot-resolver-{{ version }}.tar.xz"
+signature_url = "https://secure.nic.cz/files/knot-resolver/knot-resolver-{{ version }}.tar.xz.asc"
+
+[apkg]
+compat = 1
diff --git a/distro/pkg/arch/PKGBUILD b/distro/pkg/arch/PKGBUILD
index 7b3cfe4f9..161e9dca9 100644
--- a/distro/pkg/arch/PKGBUILD
+++ b/distro/pkg/arch/PKGBUILD
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 pkgname=knot-resolver
-pkgver=__VERSION__
+pkgver={{ version }}
 pkgrel=1
 pkgdesc='Caching DNSSEC-validating DNS resolver'
 arch=('x86_64' 'armv7h')
@@ -34,7 +34,7 @@ optdepends=(
 )
 backup=('etc/knot-resolver/kresd.conf')
 options=(debug strip)
-source=("knot-resolver_${pkgver}.orig.tar.xz")
+source=("knot-resolver-${pkgver}.tar.xz")
 sha256sums=('SKIP')
 
 build() {
diff --git a/distro/pkg/deb/changelog b/distro/pkg/deb/changelog
index 4d6f28b94..8e51c43a9 100644
--- a/distro/pkg/deb/changelog
+++ b/distro/pkg/deb/changelog
@@ -1,4 +1,4 @@
-knot-resolver (__VERSION__-cznic.1) unstable; urgency=medium
+knot-resolver ({{ version }}-cznic.1) unstable; urgency=medium
 
   * move changelog to OBS
   * see NEWS or https://knot-resolver.cz
diff --git a/distro/pkg/rpm/knot-resolver.spec b/distro/pkg/rpm/knot-resolver.spec
index ef4c8677c..e8c95a334 100644
--- a/distro/pkg/rpm/knot-resolver.spec
+++ b/distro/pkg/rpm/knot-resolver.spec
@@ -4,18 +4,17 @@
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}}
 
 %define GPG_CHECK 0
-%define VERSION __VERSION__
 %define repodir %{_builddir}/%{name}-%{version}
 %define NINJA ninja-build
 
 Name:           knot-resolver
-Version:        %{VERSION}
+Version:        {{ version }}
 Release:        cznic.1%{?dist}
 Summary:        Caching full DNS Resolver
 
 License:        GPL-3.0-or-later
 URL:            https://www.knot-resolver.cz/
-Source0:        knot-resolver_%{version}.orig.tar.xz
+Source0:        knot-resolver-%{version}.tar.xz
 
 # LuaJIT only on these arches
 %if 0%{?rhel} == 7