From 3e4863e5790266b3736041092f358636048f44cf Mon Sep 17 00:00:00 2001 From: Vasileios Anagnostopoulos Date: Mon, 17 Oct 2022 13:11:20 +0200 Subject: aardvark-dns: add the recipe The aardvark-dns is an optional runtime dependency of the netavark. This recipe introduces the aardvark-dns, so it can be integrated to netavark. Signed-off-by: Vasileios Anagnostopoulos Signed-off-by: Bruce Ashfield --- recipes-containers/aardvark-dns/aardvark-dns.inc | 6 + .../aardvark-dns/aardvark-dns_1.2.0.bb | 159 +++++++++++++++++++++ recipes-containers/netavark/netavark.inc | 9 ++ 3 files changed, 174 insertions(+) create mode 100644 recipes-containers/aardvark-dns/aardvark-dns.inc create mode 100644 recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb diff --git a/recipes-containers/aardvark-dns/aardvark-dns.inc b/recipes-containers/aardvark-dns/aardvark-dns.inc new file mode 100644 index 00000000..4123a2d6 --- /dev/null +++ b/recipes-containers/aardvark-dns/aardvark-dns.inc @@ -0,0 +1,6 @@ +# Cargo installs the binary to bin so move it to where podman expects it +do_install:append() { + install -d ${D}${libexecdir}/podman/ + mv ${D}${bindir}/* ${D}${libexecdir}/podman/ + rm -rf ${D}${bindir}/ +} diff --git a/recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb b/recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb new file mode 100644 index 00000000..6fb4a810 --- /dev/null +++ b/recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb @@ -0,0 +1,159 @@ +# Auto-Generated by cargo-bitbake 0.3.16 +# +inherit cargo + +# If this is git based prefer versioned ones if they exist +# DEFAULT_PREFERENCE = "-1" + +# how to get aardvark-dns could be as easy as but default to a git checkout: +# SRC_URI += "crate://crates.io/aardvark-dns/1.2.0" +SRC_URI += "git://github.com/containers/aardvark-dns;protocol=https;nobranch=1" +SRCREV = "cb1a462dd8427e33355f6907394a0646f5a26bf2" +S = "${WORKDIR}/git" +CARGO_SRC_DIR = "" + + +# please note if you have entries that do not begin with crate:// +# you must change them to how that package can be fetched +SRC_URI += " \ + crate://crates.io/anyhow/1.0.65 \ + crate://crates.io/async-broadcast/0.4.1 \ + crate://crates.io/async-trait/0.1.56 \ + crate://crates.io/atty/0.2.14 \ + crate://crates.io/autocfg/1.1.0 \ + crate://crates.io/bitflags/1.3.2 \ + crate://crates.io/bumpalo/3.10.0 \ + crate://crates.io/bytes/1.1.0 \ + crate://crates.io/cfg-if/1.0.0 \ + crate://crates.io/chrono/0.4.20 \ + crate://crates.io/clap/3.2.22 \ + crate://crates.io/clap_derive/3.2.18 \ + crate://crates.io/clap_lex/0.2.4 \ + crate://crates.io/data-encoding/2.3.2 \ + crate://crates.io/endian-type/0.1.2 \ + crate://crates.io/enum-as-inner/0.3.4 \ + crate://crates.io/enum-as-inner/0.5.1 \ + crate://crates.io/error-chain/0.12.4 \ + crate://crates.io/event-listener/2.5.2 \ + crate://crates.io/form_urlencoded/1.0.1 \ + crate://crates.io/futures-channel/0.3.21 \ + crate://crates.io/futures-core/0.3.24 \ + crate://crates.io/futures-executor/0.3.21 \ + crate://crates.io/futures-io/0.3.21 \ + crate://crates.io/futures-macro/0.3.24 \ + crate://crates.io/futures-task/0.3.24 \ + crate://crates.io/futures-util/0.3.24 \ + crate://crates.io/getrandom/0.2.7 \ + crate://crates.io/hashbrown/0.12.2 \ + crate://crates.io/heck/0.4.0 \ + crate://crates.io/hermit-abi/0.1.19 \ + crate://crates.io/hostname/0.3.1 \ + crate://crates.io/idna/0.2.3 \ + crate://crates.io/indexmap/1.9.1 \ + crate://crates.io/ipnet/2.5.0 \ + crate://crates.io/itoa/1.0.2 \ + crate://crates.io/js-sys/0.3.59 \ + crate://crates.io/lazy_static/1.4.0 \ + crate://crates.io/libc/0.2.133 \ + crate://crates.io/lock_api/0.4.7 \ + crate://crates.io/log/0.4.17 \ + crate://crates.io/match_cfg/0.1.0 \ + crate://crates.io/matches/0.1.9 \ + crate://crates.io/memchr/2.5.0 \ + crate://crates.io/memoffset/0.6.5 \ + crate://crates.io/mio/0.8.4 \ + crate://crates.io/nibble_vec/0.1.0 \ + crate://crates.io/nix/0.25.0 \ + crate://crates.io/num-integer/0.1.45 \ + crate://crates.io/num-traits/0.2.15 \ + crate://crates.io/num_cpus/1.13.1 \ + crate://crates.io/num_threads/0.1.6 \ + crate://crates.io/once_cell/1.13.0 \ + crate://crates.io/os_str_bytes/6.1.0 \ + crate://crates.io/parking_lot/0.12.1 \ + crate://crates.io/parking_lot_core/0.9.3 \ + crate://crates.io/percent-encoding/2.1.0 \ + crate://crates.io/pin-project-lite/0.2.9 \ + crate://crates.io/pin-utils/0.1.0 \ + crate://crates.io/ppv-lite86/0.2.16 \ + crate://crates.io/proc-macro-error-attr/1.0.4 \ + crate://crates.io/proc-macro-error/1.0.4 \ + crate://crates.io/proc-macro2/1.0.40 \ + crate://crates.io/quick-error/1.2.3 \ + crate://crates.io/quote/1.0.20 \ + crate://crates.io/radix_trie/0.2.1 \ + crate://crates.io/rand/0.8.5 \ + crate://crates.io/rand_chacha/0.3.1 \ + crate://crates.io/rand_core/0.6.3 \ + crate://crates.io/redox_syscall/0.2.13 \ + crate://crates.io/resolv-conf/0.7.0 \ + crate://crates.io/scopeguard/1.1.0 \ + crate://crates.io/serde/1.0.139 \ + crate://crates.io/serde_derive/1.0.139 \ + crate://crates.io/signal-hook-registry/1.4.0 \ + crate://crates.io/signal-hook/0.3.14 \ + crate://crates.io/slab/0.4.6 \ + crate://crates.io/smallvec/1.9.0 \ + crate://crates.io/socket2/0.4.4 \ + crate://crates.io/strsim/0.10.0 \ + crate://crates.io/syn/1.0.98 \ + crate://crates.io/syslog/6.0.1 \ + crate://crates.io/termcolor/1.1.3 \ + crate://crates.io/textwrap/0.15.1 \ + crate://crates.io/thiserror-impl/1.0.31 \ + crate://crates.io/thiserror/1.0.31 \ + crate://crates.io/time/0.1.44 \ + crate://crates.io/time/0.3.11 \ + crate://crates.io/tinyvec/1.6.0 \ + crate://crates.io/tinyvec_macros/0.1.0 \ + crate://crates.io/tokio-macros/1.8.0 \ + crate://crates.io/tokio/1.21.1 \ + crate://crates.io/toml/0.5.9 \ + crate://crates.io/tracing-attributes/0.1.22 \ + crate://crates.io/tracing-core/0.1.29 \ + crate://crates.io/tracing/0.1.36 \ + crate://crates.io/trust-dns-client/0.20.4 \ + crate://crates.io/trust-dns-client/0.22.0 \ + crate://crates.io/trust-dns-proto/0.20.4 \ + crate://crates.io/trust-dns-proto/0.22.0 \ + crate://crates.io/trust-dns-server/0.22.0 \ + crate://crates.io/unicode-bidi/0.3.8 \ + crate://crates.io/unicode-ident/1.0.1 \ + crate://crates.io/unicode-normalization/0.1.21 \ + crate://crates.io/url/2.2.2 \ + crate://crates.io/version_check/0.9.4 \ + crate://crates.io/wasi/0.10.0+wasi-snapshot-preview1 \ + crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ + crate://crates.io/wasm-bindgen-backend/0.2.82 \ + crate://crates.io/wasm-bindgen-macro-support/0.2.82 \ + crate://crates.io/wasm-bindgen-macro/0.2.82 \ + crate://crates.io/wasm-bindgen-shared/0.2.82 \ + crate://crates.io/wasm-bindgen/0.2.82 \ + crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ + crate://crates.io/winapi-util/0.1.5 \ + crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ + crate://crates.io/winapi/0.3.9 \ + crate://crates.io/windows-sys/0.36.1 \ + crate://crates.io/windows_aarch64_msvc/0.36.1 \ + crate://crates.io/windows_i686_gnu/0.36.1 \ + crate://crates.io/windows_i686_msvc/0.36.1 \ + crate://crates.io/windows_x86_64_gnu/0.36.1 \ + crate://crates.io/windows_x86_64_msvc/0.36.1 \ +" + + + +# FIXME: update generateme with the real MD5 of the license file +LIC_FILES_CHKSUM = " \ + file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ +" + +SUMMARY = "A container-focused DNS server" +HOMEPAGE = "https://github.com/containers/aardvark-dns" +LICENSE = "Apache-2.0" + +# includes this file if it exists but does not fail +# this is useful for anything you may want to override from +# what cargo-bitbake generates. +include aardvark-dns-${PV}.inc +include aardvark-dns.inc diff --git a/recipes-containers/netavark/netavark.inc b/recipes-containers/netavark/netavark.inc index 4123a2d6..ae3e8473 100644 --- a/recipes-containers/netavark/netavark.inc +++ b/recipes-containers/netavark/netavark.inc @@ -1,3 +1,12 @@ +PACKAGECONFIG ?= "aardvark-dns" + +# From the documentation of netavark +# https://github.com/containers/netavark/blob/v1.1.0/DISTRO_PACKAGE.md#dependency-on-aardvark-dns +# The aardvark-dns will be installed by default with netavark, but +# netavark will be functional without it. +PACKAGECONFIG[aardvark-dns]= " , , , aardvark-dns" + + # Cargo installs the binary to bin so move it to where podman expects it do_install:append() { install -d ${D}${libexecdir}/podman/ -- cgit v1.2.3-54-g00ecf