From: Tomas Krizek Date: Mon, 18 May 2020 11:48:03 +0000 (+0200) Subject: tests/packaging: add ubuntu 20.04 X-Git-Tag: v5.1.2~6^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d933ffe34a520b861567a458a0e88b15af710ce;p=thirdparty%2Fknot-resolver.git tests/packaging: add ubuntu 20.04 --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d13c46c47..9ae346da6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -465,6 +465,11 @@ packaging:debian_9: variables: DISTRO: debian_9 +packaging:ubuntu_20.04: + <<: *packagingtest + variables: + DISTRO: ubuntu_20.04 + packaging:ubuntu_18.04: <<: *packagingtest variables: diff --git a/daemon/.packaging/ubuntu/20.04/builddeps b/daemon/.packaging/ubuntu/20.04/builddeps new file mode 100644 index 000000000..7b1d94319 --- /dev/null +++ b/daemon/.packaging/ubuntu/20.04/builddeps @@ -0,0 +1,16 @@ +debhelper +libcmocka-dev +libedit-dev +libgnutls28-dev +libknot-dev +liblmdb-dev +libluajit-5.1-dev +libsystemd-dev +libuv1-dev +luajit +pkg-config +meson +doxygen +python3-breathe +python3-sphinx +python3-sphinx-rtd-theme diff --git a/daemon/.packaging/ubuntu/20.04/pre-build.sh b/daemon/.packaging/ubuntu/20.04/pre-build.sh new file mode 100755 index 000000000..e55fba6a3 --- /dev/null +++ b/daemon/.packaging/ubuntu/20.04/pre-build.sh @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +# add build repository +apt-get update +apt-get install -y wget gnupg apt-utils + +echo 'deb http://download.opensuse.org/repositories/home:/CZ-NIC:/knot-resolver-build/xUbuntu_20.04/ /' > /etc/apt/sources.list.d/home:CZ-NIC:knot-resolver-build.list +wget -nv https://download.opensuse.org/repositories/home:CZ-NIC:knot-resolver-build/xUbuntu_20.04/Release.key -O Release.key +apt-key add - < Release.key + +apt-get update +apt-get upgrade -y diff --git a/daemon/.packaging/ubuntu/20.04/pre-run.sh b/daemon/.packaging/ubuntu/20.04/pre-run.sh new file mode 100755 index 000000000..75c32f8cb --- /dev/null +++ b/daemon/.packaging/ubuntu/20.04/pre-run.sh @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +# add build repository +apt-get update +apt-get install -y wget gnupg apt-utils + +echo 'deb http://download.opensuse.org/repositories/home:/CZ-NIC:/knot-resolver-latest/xUbuntu_20.04/ /' > /etc/apt/sources.list.d/home:CZ-NIC:knot-resolver-latest.list +wget -nv https://download.opensuse.org/repositories/home:CZ-NIC:knot-resolver-latest/xUbuntu_20.04/Release.key -O Release.key +apt-key add - < Release.key + +apt-get update +apt-get upgrade -y diff --git a/daemon/.packaging/ubuntu/20.04/rundeps b/daemon/.packaging/ubuntu/20.04/rundeps new file mode 100644 index 000000000..a0f40c1b1 --- /dev/null +++ b/daemon/.packaging/ubuntu/20.04/rundeps @@ -0,0 +1,15 @@ +adduser +dns-root-data +systemd +libc6 +libdnssec7 +libedit2 +libgcc1 +libgnutls30 +libknot10 +liblmdb0 +libluajit-5.1-2 +libstdc++6 +libsystemd0 +libuv1 +libzscanner3 diff --git a/doc/.packaging/ubuntu/20.04/build.sh b/doc/.packaging/ubuntu/20.04/build.sh new file mode 100755 index 000000000..e6084df48 --- /dev/null +++ b/doc/.packaging/ubuntu/20.04/build.sh @@ -0,0 +1,19 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-3.0-or-later +[ -d /root/kresd/build_packaging ] && rm -rf /root/kresd/build_packaging/; +CFLAGS="$CFLAGS -Wall -pedantic -fno-omit-frame-pointer" +LDFLAGS="$LDFLAGS -Wl,--as-needed" +meson build_packaging \ + --buildtype=plain \ + --prefix=/root/kresd/install_packaging \ + --libdir=lib \ + --default-library=static \ + -Ddoc=enabled \ + -Dsystemd_files=enabled \ + -Dclient=enabled \ + -Dkeyfile_default=/usr/share/dns/root.key \ + -Droot_hints=/usr/share/dns/root.hints \ + -Dinstall_kresd_conf=enabled \ + -Dunit_tests=enabled \ + -Dc_args="${CFLAGS}" \ + -Dc_link_args="${LDFLAGS}"; diff --git a/doc/.packaging/ubuntu/20.04/builddeps b/doc/.packaging/ubuntu/20.04/builddeps new file mode 100644 index 000000000..81b7a5b98 --- /dev/null +++ b/doc/.packaging/ubuntu/20.04/builddeps @@ -0,0 +1,4 @@ +doxygen +python3-sphinx +python3-breathe +python3-sphinx-rtd-theme diff --git a/doc/.packaging/ubuntu/20.04/install.sh b/doc/.packaging/ubuntu/20.04/install.sh new file mode 100755 index 000000000..3422d6846 --- /dev/null +++ b/doc/.packaging/ubuntu/20.04/install.sh @@ -0,0 +1,3 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-3.0-or-later +ninja -C build_packaging doc diff --git a/modules/dnstap/.packaging/ubuntu/20.04/builddeps b/modules/dnstap/.packaging/ubuntu/20.04/builddeps new file mode 100644 index 000000000..417dc04ae --- /dev/null +++ b/modules/dnstap/.packaging/ubuntu/20.04/builddeps @@ -0,0 +1,3 @@ +libfstrm-dev +libprotobuf-c-dev +protobuf-c-compiler diff --git a/modules/dnstap/.packaging/ubuntu/20.04/rundeps b/modules/dnstap/.packaging/ubuntu/20.04/rundeps new file mode 100644 index 000000000..a726e120d --- /dev/null +++ b/modules/dnstap/.packaging/ubuntu/20.04/rundeps @@ -0,0 +1,2 @@ +libfstrm0 +libprotobuf-c1 diff --git a/modules/etcd/.packaging/ubuntu/20.04/pre-test.sh b/modules/etcd/.packaging/ubuntu/20.04/pre-test.sh new file mode 100755 index 000000000..4df79d999 --- /dev/null +++ b/modules/etcd/.packaging/ubuntu/20.04/pre-test.sh @@ -0,0 +1 @@ +luarocks install etcd --from=https://mah0x211.github.io/rocks/ diff --git a/modules/etcd/.packaging/ubuntu/20.04/rundeps b/modules/etcd/.packaging/ubuntu/20.04/rundeps new file mode 100644 index 000000000..02d3fcf5c --- /dev/null +++ b/modules/etcd/.packaging/ubuntu/20.04/rundeps @@ -0,0 +1,4 @@ +libssl-dev +luarocks +git +make diff --git a/modules/experimental_dot_auth/.packaging/ubuntu/20.04/rundeps b/modules/experimental_dot_auth/.packaging/ubuntu/20.04/rundeps new file mode 100644 index 000000000..36b83e181 --- /dev/null +++ b/modules/experimental_dot_auth/.packaging/ubuntu/20.04/rundeps @@ -0,0 +1 @@ +lua-basexx diff --git a/modules/graphite/.packaging/ubuntu/20.04/rundeps b/modules/graphite/.packaging/ubuntu/20.04/rundeps new file mode 100644 index 000000000..3da806bd3 --- /dev/null +++ b/modules/graphite/.packaging/ubuntu/20.04/rundeps @@ -0,0 +1 @@ +lua-cqueues diff --git a/modules/http/.packaging/ubuntu/20.04/rundeps b/modules/http/.packaging/ubuntu/20.04/rundeps new file mode 100644 index 000000000..c557cb28e --- /dev/null +++ b/modules/http/.packaging/ubuntu/20.04/rundeps @@ -0,0 +1 @@ +lua-http