* [PATCH 1/8] aardvark-dns: Move the crate URIs to a separate .inc file
@ 2023-05-02 20:26 Peter Kjellerstedt
2023-05-02 20:26 ` [PATCH 2/8] aardvark-dns: Add checksums for the crate URIs Peter Kjellerstedt
` (6 more replies)
0 siblings, 7 replies; 15+ messages in thread
From: Peter Kjellerstedt @ 2023-05-02 20:26 UTC (permalink / raw)
To: meta-virtualization
As a preparation for switching to using the cargo-update-recipe-crates
bbclass to update the crate URIs, move the existing crate URIs to the
aardvark-dns-crates.inc file that it expects.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
.../aardvark-dns/aardvark-dns-crates.inc | 125 ++++++++++++++++
.../aardvark-dns/aardvark-dns_1.2.0.bb | 133 +-----------------
2 files changed, 127 insertions(+), 131 deletions(-)
create mode 100644 recipes-containers/aardvark-dns/aardvark-dns-crates.inc
diff --git a/recipes-containers/aardvark-dns/aardvark-dns-crates.inc b/recipes-containers/aardvark-dns/aardvark-dns-crates.inc
new file mode 100644
index 0000000..d39c364
--- /dev/null
+++ b/recipes-containers/aardvark-dns/aardvark-dns-crates.inc
@@ -0,0 +1,125 @@
+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 \
+"
diff --git a/recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb b/recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb
index 6fb4a81..ad03869 100644
--- a/recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb
+++ b/recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb
@@ -8,141 +8,12 @@ inherit cargo
# 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"
+require ${BPN}-crates.inc
+
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 \
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 2/8] aardvark-dns: Add checksums for the crate URIs
2023-05-02 20:26 [PATCH 1/8] aardvark-dns: Move the crate URIs to a separate .inc file Peter Kjellerstedt
@ 2023-05-02 20:26 ` Peter Kjellerstedt
2023-05-02 20:26 ` [PATCH 3/8] aardvark-dns: Rewrite the recipe Peter Kjellerstedt
` (5 subsequent siblings)
6 siblings, 0 replies; 15+ messages in thread
From: Peter Kjellerstedt @ 2023-05-02 20:26 UTC (permalink / raw)
To: meta-virtualization
Use the cargo-update-recipe-crates bbclass to update the crate URIs
including adding checksums for them, as they are now required by the
crate fetcher.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
.../aardvark-dns/aardvark-dns-crates.inc | 143 +++++++++++++++++-
.../aardvark-dns/aardvark-dns_1.2.0.bb | 2 +-
2 files changed, 136 insertions(+), 9 deletions(-)
diff --git a/recipes-containers/aardvark-dns/aardvark-dns-crates.inc b/recipes-containers/aardvark-dns/aardvark-dns-crates.inc
index d39c364..7e07d23 100644
--- a/recipes-containers/aardvark-dns/aardvark-dns-crates.inc
+++ b/recipes-containers/aardvark-dns/aardvark-dns-crates.inc
@@ -1,3 +1,6 @@
+# Autogenerated with 'bitbake -c update_crates aardvark-dns'
+
+# from Cargo.lock
SRC_URI += " \
crate://crates.io/anyhow/1.0.65 \
crate://crates.io/async-broadcast/0.4.1 \
@@ -59,8 +62,8 @@ SRC_URI += " \
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-macro-error-attr/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 \
@@ -73,8 +76,8 @@ SRC_URI += " \
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/signal-hook-registry/1.4.0 \
crate://crates.io/slab/0.4.6 \
crate://crates.io/smallvec/1.9.0 \
crate://crates.io/socket2/0.4.4 \
@@ -83,18 +86,18 @@ SRC_URI += " \
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/thiserror-impl/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/tokio-macros/1.8.0 \
crate://crates.io/toml/0.5.9 \
+ crate://crates.io/tracing/0.1.36 \
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 \
@@ -107,15 +110,15 @@ SRC_URI += " \
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/0.2.82 \
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-macro-support/0.2.82 \
crate://crates.io/wasm-bindgen-shared/0.2.82 \
- crate://crates.io/wasm-bindgen/0.2.82 \
+ crate://crates.io/winapi/0.3.9 \
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 \
@@ -123,3 +126,127 @@ SRC_URI += " \
crate://crates.io/windows_x86_64_gnu/0.36.1 \
crate://crates.io/windows_x86_64_msvc/0.36.1 \
"
+
+SRC_URI[anyhow-1.0.65.sha256sum] = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602"
+SRC_URI[async-broadcast-0.4.1.sha256sum] = "6d26004fe83b2d1cd3a97609b21e39f9a31535822210fe83205d2ce48866ea61"
+SRC_URI[async-trait-0.1.56.sha256sum] = "96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716"
+SRC_URI[atty-0.2.14.sha256sum] = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+SRC_URI[bumpalo-3.10.0.sha256sum] = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3"
+SRC_URI[bytes-1.1.0.sha256sum] = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
+SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+SRC_URI[chrono-0.4.20.sha256sum] = "6127248204b9aba09a362f6c930ef6a78f2c1b2215f8a7b398c06e1083f17af0"
+SRC_URI[clap-3.2.22.sha256sum] = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750"
+SRC_URI[clap_derive-3.2.18.sha256sum] = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65"
+SRC_URI[clap_lex-0.2.4.sha256sum] = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
+SRC_URI[data-encoding-2.3.2.sha256sum] = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57"
+SRC_URI[endian-type-0.1.2.sha256sum] = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
+SRC_URI[enum-as-inner-0.3.4.sha256sum] = "570d109b813e904becc80d8d5da38376818a143348413f7149f1340fe04754d4"
+SRC_URI[enum-as-inner-0.5.1.sha256sum] = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116"
+SRC_URI[error-chain-0.12.4.sha256sum] = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc"
+SRC_URI[event-listener-2.5.2.sha256sum] = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71"
+SRC_URI[form_urlencoded-1.0.1.sha256sum] = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
+SRC_URI[futures-channel-0.3.21.sha256sum] = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010"
+SRC_URI[futures-core-0.3.24.sha256sum] = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf"
+SRC_URI[futures-executor-0.3.21.sha256sum] = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6"
+SRC_URI[futures-io-0.3.21.sha256sum] = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b"
+SRC_URI[futures-macro-0.3.24.sha256sum] = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17"
+SRC_URI[futures-task-0.3.24.sha256sum] = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1"
+SRC_URI[futures-util-0.3.24.sha256sum] = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90"
+SRC_URI[getrandom-0.2.7.sha256sum] = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
+SRC_URI[hashbrown-0.12.2.sha256sum] = "607c8a29735385251a339424dd462993c0fed8fa09d378f259377df08c126022"
+SRC_URI[heck-0.4.0.sha256sum] = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
+SRC_URI[hermit-abi-0.1.19.sha256sum] = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+SRC_URI[hostname-0.3.1.sha256sum] = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867"
+SRC_URI[idna-0.2.3.sha256sum] = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
+SRC_URI[indexmap-1.9.1.sha256sum] = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
+SRC_URI[ipnet-2.5.0.sha256sum] = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b"
+SRC_URI[itoa-1.0.2.sha256sum] = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
+SRC_URI[js-sys-0.3.59.sha256sum] = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2"
+SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+SRC_URI[libc-0.2.133.sha256sum] = "c0f80d65747a3e43d1596c7c5492d95d5edddaabd45a7fcdb02b95f644164966"
+SRC_URI[lock_api-0.4.7.sha256sum] = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
+SRC_URI[log-0.4.17.sha256sum] = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
+SRC_URI[match_cfg-0.1.0.sha256sum] = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
+SRC_URI[matches-0.1.9.sha256sum] = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
+SRC_URI[memchr-2.5.0.sha256sum] = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+SRC_URI[memoffset-0.6.5.sha256sum] = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+SRC_URI[mio-0.8.4.sha256sum] = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf"
+SRC_URI[nibble_vec-0.1.0.sha256sum] = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43"
+SRC_URI[nix-0.25.0.sha256sum] = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb"
+SRC_URI[num-integer-0.1.45.sha256sum] = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+SRC_URI[num-traits-0.2.15.sha256sum] = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+SRC_URI[num_cpus-1.13.1.sha256sum] = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
+SRC_URI[num_threads-0.1.6.sha256sum] = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
+SRC_URI[once_cell-1.13.0.sha256sum] = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1"
+SRC_URI[os_str_bytes-6.1.0.sha256sum] = "21326818e99cfe6ce1e524c2a805c189a99b5ae555a35d19f9a284b427d86afa"
+SRC_URI[parking_lot-0.12.1.sha256sum] = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+SRC_URI[parking_lot_core-0.9.3.sha256sum] = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
+SRC_URI[percent-encoding-2.1.0.sha256sum] = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
+SRC_URI[pin-project-lite-0.2.9.sha256sum] = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+SRC_URI[pin-utils-0.1.0.sha256sum] = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+SRC_URI[ppv-lite86-0.2.16.sha256sum] = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
+SRC_URI[proc-macro-error-1.0.4.sha256sum] = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+SRC_URI[proc-macro-error-attr-1.0.4.sha256sum] = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+SRC_URI[proc-macro2-1.0.40.sha256sum] = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7"
+SRC_URI[quick-error-1.2.3.sha256sum] = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
+SRC_URI[quote-1.0.20.sha256sum] = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804"
+SRC_URI[radix_trie-0.2.1.sha256sum] = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd"
+SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+SRC_URI[rand_chacha-0.3.1.sha256sum] = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+SRC_URI[rand_core-0.6.3.sha256sum] = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
+SRC_URI[redox_syscall-0.2.13.sha256sum] = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
+SRC_URI[resolv-conf-0.7.0.sha256sum] = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00"
+SRC_URI[scopeguard-1.1.0.sha256sum] = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+SRC_URI[serde-1.0.139.sha256sum] = "0171ebb889e45aa68b44aee0859b3eede84c6f5f5c228e6f140c0b2a0a46cad6"
+SRC_URI[serde_derive-1.0.139.sha256sum] = "dc1d3230c1de7932af58ad8ffbe1d784bd55efd5a9d84ac24f69c72d83543dfb"
+SRC_URI[signal-hook-0.3.14.sha256sum] = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d"
+SRC_URI[signal-hook-registry-1.4.0.sha256sum] = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
+SRC_URI[slab-0.4.6.sha256sum] = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32"
+SRC_URI[smallvec-1.9.0.sha256sum] = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1"
+SRC_URI[socket2-0.4.4.sha256sum] = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
+SRC_URI[strsim-0.10.0.sha256sum] = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+SRC_URI[syn-1.0.98.sha256sum] = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd"
+SRC_URI[syslog-6.0.1.sha256sum] = "978044cc68150ad5e40083c9f6a725e6fd02d7ba1bcf691ec2ff0d66c0b41acc"
+SRC_URI[termcolor-1.1.3.sha256sum] = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
+SRC_URI[textwrap-0.15.1.sha256sum] = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16"
+SRC_URI[thiserror-1.0.31.sha256sum] = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"
+SRC_URI[thiserror-impl-1.0.31.sha256sum] = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
+SRC_URI[time-0.1.44.sha256sum] = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
+SRC_URI[time-0.3.11.sha256sum] = "72c91f41dcb2f096c05f0873d667dceec1087ce5bcf984ec8ffb19acddbb3217"
+SRC_URI[tinyvec-1.6.0.sha256sum] = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+SRC_URI[tinyvec_macros-0.1.0.sha256sum] = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
+SRC_URI[tokio-1.21.1.sha256sum] = "0020c875007ad96677dcc890298f4b942882c5d4eb7cc8f439fc3bf813dc9c95"
+SRC_URI[tokio-macros-1.8.0.sha256sum] = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484"
+SRC_URI[toml-0.5.9.sha256sum] = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
+SRC_URI[tracing-0.1.36.sha256sum] = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307"
+SRC_URI[tracing-attributes-0.1.22.sha256sum] = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2"
+SRC_URI[tracing-core-0.1.29.sha256sum] = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7"
+SRC_URI[trust-dns-client-0.20.4.sha256sum] = "5b4ef9b9bde0559b78a4abb00339143750085f05e5a453efb7b8bef1061f09dc"
+SRC_URI[trust-dns-client-0.22.0.sha256sum] = "6c408c32e6a9dbb38037cece35740f2cf23c875d8ca134d33631cec83f74d3fe"
+SRC_URI[trust-dns-proto-0.20.4.sha256sum] = "ca94d4e9feb6a181c690c4040d7a24ef34018d8313ac5044a61d21222ae24e31"
+SRC_URI[trust-dns-proto-0.22.0.sha256sum] = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26"
+SRC_URI[trust-dns-server-0.22.0.sha256sum] = "1583cf9f8a359c9f16fdf760b79cb2be3f261b98db8027f81959c7a4f6645e2c"
+SRC_URI[unicode-bidi-0.3.8.sha256sum] = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
+SRC_URI[unicode-ident-1.0.1.sha256sum] = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"
+SRC_URI[unicode-normalization-0.1.21.sha256sum] = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6"
+SRC_URI[url-2.2.2.sha256sum] = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
+SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+SRC_URI[wasi-0.10.0+wasi-snapshot-preview1.sha256sum] = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
+SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+SRC_URI[wasm-bindgen-0.2.82.sha256sum] = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d"
+SRC_URI[wasm-bindgen-backend-0.2.82.sha256sum] = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f"
+SRC_URI[wasm-bindgen-macro-0.2.82.sha256sum] = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602"
+SRC_URI[wasm-bindgen-macro-support-0.2.82.sha256sum] = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da"
+SRC_URI[wasm-bindgen-shared-0.2.82.sha256sum] = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a"
+SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+SRC_URI[winapi-util-0.1.5.sha256sum] = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+SRC_URI[windows-sys-0.36.1.sha256sum] = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
+SRC_URI[windows_aarch64_msvc-0.36.1.sha256sum] = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
+SRC_URI[windows_i686_gnu-0.36.1.sha256sum] = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
+SRC_URI[windows_i686_msvc-0.36.1.sha256sum] = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
+SRC_URI[windows_x86_64_gnu-0.36.1.sha256sum] = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
+SRC_URI[windows_x86_64_msvc-0.36.1.sha256sum] = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
diff --git a/recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb b/recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb
index ad03869..a379301 100644
--- a/recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb
+++ b/recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb
@@ -1,6 +1,6 @@
# Auto-Generated by cargo-bitbake 0.3.16
#
-inherit cargo
+inherit cargo cargo-update-recipe-crates
# If this is git based prefer versioned ones if they exist
# DEFAULT_PREFERENCE = "-1"
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 3/8] aardvark-dns: Rewrite the recipe
2023-05-02 20:26 [PATCH 1/8] aardvark-dns: Move the crate URIs to a separate .inc file Peter Kjellerstedt
2023-05-02 20:26 ` [PATCH 2/8] aardvark-dns: Add checksums for the crate URIs Peter Kjellerstedt
@ 2023-05-02 20:26 ` Peter Kjellerstedt
2023-05-02 20:26 ` [PATCH 4/8] aardvark-dns: Fetch the crate instead of the Git repository Peter Kjellerstedt
` (4 subsequent siblings)
6 siblings, 0 replies; 15+ messages in thread
From: Peter Kjellerstedt @ 2023-05-02 20:26 UTC (permalink / raw)
To: meta-virtualization
Since the recipe is no longer expected to be updated using
cargo-bitbake after switching to using cargo-update-recipe-crates to
update the crate URIs, rewrite it to better conform to common recipe
standards. Also fold aardvark-dns.inc into it as there is no longer any
need to keep it separate from the main recipe.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
.../aardvark-dns/aardvark-dns.inc | 34 ------------
.../aardvark-dns/aardvark-dns_1.2.0.bb | 53 ++++++++++++-------
2 files changed, 33 insertions(+), 54 deletions(-)
delete mode 100644 recipes-containers/aardvark-dns/aardvark-dns.inc
diff --git a/recipes-containers/aardvark-dns/aardvark-dns.inc b/recipes-containers/aardvark-dns/aardvark-dns.inc
deleted file mode 100644
index 8c74439..0000000
--- a/recipes-containers/aardvark-dns/aardvark-dns.inc
+++ /dev/null
@@ -1,34 +0,0 @@
-inherit ptest
-
-SRC_URI += " \
- file://run-ptest \
-"
-
-# 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}/
-}
-
-
-do_install_ptest () {
- cp -r ${S}/test ${D}${PTEST_PATH}
-}
-
-# Rdepends on slirp4netns
-inherit features_check
-REQUIRED_DISTRO_FEATURES ?= "seccomp"
-
-RDEPENDS:${PN}-ptest += " \
- bats \
- bash \
- coreutils \
- jq \
- iproute2 \
- slirp4netns \
- dbus-daemon-proxy \
- util-linux-unshare \
- bind-utils \
- ipcalc \
-"
diff --git a/recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb b/recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb
index a379301..10901eb 100644
--- a/recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb
+++ b/recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb
@@ -1,30 +1,43 @@
-# Auto-Generated by cargo-bitbake 0.3.16
-#
-inherit cargo cargo-update-recipe-crates
+SUMMARY = "A container-focused DNS server"
+HOMEPAGE = "https://github.com/containers/aardvark-dns"
-# If this is git based prefer versioned ones if they exist
-# DEFAULT_PREFERENCE = "-1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
+
+SRCREV = "cb1a462dd8427e33355f6907394a0646f5a26bf2"
# 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"
+SRC_URI = "git://github.com/containers/aardvark-dns;protocol=https;nobranch=1 \
+ file://run-ptest"
require ${BPN}-crates.inc
-SRCREV = "cb1a462dd8427e33355f6907394a0646f5a26bf2"
S = "${WORKDIR}/git"
-CARGO_SRC_DIR = ""
-# FIXME: update generateme with the real MD5 of the license file
-LIC_FILES_CHKSUM = " \
- file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
-"
+inherit cargo cargo-update-recipe-crates features_check ptest
-SUMMARY = "A container-focused DNS server"
-HOMEPAGE = "https://github.com/containers/aardvark-dns"
-LICENSE = "Apache-2.0"
+# Cargo installs the binary to bin so move it to where podman expects it
+do_install:append() {
+ install -d ${D}${libexecdir}
+ mv ${D}${bindir} ${D}${libexecdir}/podman
+}
-# 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
+do_install_ptest() {
+ cp -r ${S}/test ${D}${PTEST_PATH}
+}
+
+# rdepends on slirp4netns
+REQUIRED_DISTRO_FEATURES ?= "seccomp"
+
+RDEPENDS:${PN}-ptest += " \
+ bash \
+ bats \
+ bind-utils \
+ coreutils \
+ dbus-daemon-proxy \
+ ipcalc \
+ iproute2 \
+ jq \
+ slirp4netns \
+ util-linux-unshare \
+"
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 4/8] aardvark-dns: Fetch the crate instead of the Git repository
2023-05-02 20:26 [PATCH 1/8] aardvark-dns: Move the crate URIs to a separate .inc file Peter Kjellerstedt
2023-05-02 20:26 ` [PATCH 2/8] aardvark-dns: Add checksums for the crate URIs Peter Kjellerstedt
2023-05-02 20:26 ` [PATCH 3/8] aardvark-dns: Rewrite the recipe Peter Kjellerstedt
@ 2023-05-02 20:26 ` Peter Kjellerstedt
2023-05-02 20:41 ` [meta-virtualization] " Bruce Ashfield
2023-05-02 20:26 ` [PATCH 5/8] netavark: Move the crate URIs to a separate .inc file Peter Kjellerstedt
` (3 subsequent siblings)
6 siblings, 1 reply; 15+ messages in thread
From: Peter Kjellerstedt @ 2023-05-02 20:26 UTC (permalink / raw)
To: meta-virtualization
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb b/recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb
index 10901eb..ac2fc6d 100644
--- a/recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb
+++ b/recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb
@@ -4,15 +4,11 @@ HOMEPAGE = "https://github.com/containers/aardvark-dns"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
-SRCREV = "cb1a462dd8427e33355f6907394a0646f5a26bf2"
-
-# 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 \
+SRC_URI = "crate://crates.io/${BPN}/${PV} \
file://run-ptest"
require ${BPN}-crates.inc
-S = "${WORKDIR}/git"
+SRC_URI[aardvark-dns-1.2.0.sha256sum] = "1f9d011e5edaa6e0fa055e383bec03a46c9ef35dfa346883aeb5bf86b794a949"
inherit cargo cargo-update-recipe-crates features_check ptest
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 5/8] netavark: Move the crate URIs to a separate .inc file
2023-05-02 20:26 [PATCH 1/8] aardvark-dns: Move the crate URIs to a separate .inc file Peter Kjellerstedt
` (2 preceding siblings ...)
2023-05-02 20:26 ` [PATCH 4/8] aardvark-dns: Fetch the crate instead of the Git repository Peter Kjellerstedt
@ 2023-05-02 20:26 ` Peter Kjellerstedt
2023-05-02 20:26 ` [PATCH 6/8] netavark: Add checksums for the crate URIs Peter Kjellerstedt
` (2 subsequent siblings)
6 siblings, 0 replies; 15+ messages in thread
From: Peter Kjellerstedt @ 2023-05-02 20:26 UTC (permalink / raw)
To: meta-virtualization
As a preparation for switching to using the cargo-update-recipe-crates
bbclass to update the crate URIs, move the existing crate URIs to the
netavark-crates.inc file that it expects.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
.../netavark/netavark-crates.inc | 180 +++++++++++++++++
recipes-containers/netavark/netavark_1.2.0.bb | 188 +-----------------
2 files changed, 182 insertions(+), 186 deletions(-)
create mode 100644 recipes-containers/netavark/netavark-crates.inc
diff --git a/recipes-containers/netavark/netavark-crates.inc b/recipes-containers/netavark/netavark-crates.inc
new file mode 100644
index 0000000..26c8eec
--- /dev/null
+++ b/recipes-containers/netavark/netavark-crates.inc
@@ -0,0 +1,180 @@
+SRC_URI += " \
+ crate://crates.io/aho-corasick/0.7.18 \
+ crate://crates.io/android_system_properties/0.1.5 \
+ crate://crates.io/anyhow/1.0.65 \
+ crate://crates.io/async-broadcast/0.4.0 \
+ crate://crates.io/async-channel/1.6.1 \
+ crate://crates.io/async-executor/1.4.1 \
+ crate://crates.io/async-io/1.7.0 \
+ crate://crates.io/async-lock/2.5.0 \
+ crate://crates.io/async-recursion/0.3.2 \
+ crate://crates.io/async-task/4.3.0 \
+ 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/block-buffer/0.10.2 \
+ crate://crates.io/bumpalo/3.10.0 \
+ crate://crates.io/byteorder/1.4.3 \
+ crate://crates.io/bytes/1.1.0 \
+ crate://crates.io/cache-padded/1.2.0 \
+ crate://crates.io/cc/1.0.73 \
+ crate://crates.io/cfg-if/1.0.0 \
+ crate://crates.io/chrono/0.4.22 \
+ crate://crates.io/clap/3.2.8 \
+ crate://crates.io/clap_derive/3.2.7 \
+ crate://crates.io/clap_lex/0.2.4 \
+ crate://crates.io/concurrent-queue/1.2.2 \
+ crate://crates.io/core-foundation-sys/0.8.3 \
+ crate://crates.io/cpufeatures/0.2.2 \
+ crate://crates.io/crypto-common/0.1.5 \
+ crate://crates.io/derivative/2.2.0 \
+ crate://crates.io/digest/0.10.5 \
+ crate://crates.io/dirs-sys/0.3.7 \
+ crate://crates.io/dirs/4.0.0 \
+ crate://crates.io/easy-parallel/3.2.0 \
+ crate://crates.io/enumflags2/0.7.5 \
+ crate://crates.io/enumflags2_derive/0.7.4 \
+ crate://crates.io/env_logger/0.9.1 \
+ crate://crates.io/event-listener/2.5.2 \
+ crate://crates.io/fastrand/1.7.0 \
+ crate://crates.io/form_urlencoded/1.1.0 \
+ crate://crates.io/fs2/0.4.3 \
+ crate://crates.io/futures-channel/0.3.24 \
+ crate://crates.io/futures-core/0.3.24 \
+ crate://crates.io/futures-executor/0.3.24 \
+ crate://crates.io/futures-io/0.3.24 \
+ crate://crates.io/futures-lite/1.12.0 \
+ crate://crates.io/futures-macro/0.3.24 \
+ crate://crates.io/futures-sink/0.3.24 \
+ crate://crates.io/futures-task/0.3.24 \
+ crate://crates.io/futures-util/0.3.24 \
+ crate://crates.io/futures/0.3.24 \
+ crate://crates.io/generic-array/0.14.5 \
+ 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/hex/0.4.3 \
+ crate://crates.io/humantime/2.1.0 \
+ crate://crates.io/iana-time-zone/0.1.46 \
+ crate://crates.io/idna/0.3.0 \
+ crate://crates.io/indexmap/1.9.1 \
+ crate://crates.io/instant/0.1.12 \
+ crate://crates.io/ipnet/2.5.0 \
+ crate://crates.io/iptables/0.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/memchr/2.5.0 \
+ crate://crates.io/memoffset/0.6.5 \
+ crate://crates.io/mio/0.8.4 \
+ crate://crates.io/netlink-packet-core/0.4.2 \
+ crate://crates.io/netlink-packet-route/0.13.0 \
+ crate://crates.io/netlink-packet-utils/0.5.1 \
+ crate://crates.io/netlink-proto/0.10.0 \
+ crate://crates.io/netlink-sys/0.8.3 \
+ crate://crates.io/nix/0.23.1 \
+ crate://crates.io/nix/0.24.2 \
+ 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/once_cell/1.13.0 \
+ crate://crates.io/ordered-float/2.10.0 \
+ crate://crates.io/ordered-stream/0.0.1 \
+ crate://crates.io/os_str_bytes/6.1.0 \
+ crate://crates.io/parking/2.0.0 \
+ crate://crates.io/parking_lot/0.11.2 \
+ crate://crates.io/parking_lot/0.12.1 \
+ crate://crates.io/parking_lot_core/0.8.5 \
+ crate://crates.io/parking_lot_core/0.9.3 \
+ crate://crates.io/paste/1.0.7 \
+ crate://crates.io/percent-encoding/2.2.0 \
+ crate://crates.io/pin-project-lite/0.2.9 \
+ crate://crates.io/pin-utils/0.1.0 \
+ crate://crates.io/polling/2.2.0 \
+ crate://crates.io/ppv-lite86/0.2.16 \
+ crate://crates.io/proc-macro-crate/1.1.3 \
+ 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/quote/1.0.20 \
+ 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/redox_users/0.4.3 \
+ crate://crates.io/regex-syntax/0.6.27 \
+ crate://crates.io/regex/1.6.0 \
+ crate://crates.io/remove_dir_all/0.5.3 \
+ crate://crates.io/rtnetlink/0.11.0 \
+ crate://crates.io/ryu/1.0.10 \
+ crate://crates.io/same-file/1.0.6 \
+ crate://crates.io/scopeguard/1.1.0 \
+ crate://crates.io/serde-value/0.7.0 \
+ crate://crates.io/serde/1.0.144 \
+ crate://crates.io/serde_derive/1.0.144 \
+ crate://crates.io/serde_json/1.0.85 \
+ crate://crates.io/serde_repr/0.1.8 \
+ crate://crates.io/sha1/0.6.1 \
+ crate://crates.io/sha1_smol/1.0.0 \
+ crate://crates.io/sha2/0.10.6 \
+ crate://crates.io/signal-hook-registry/1.4.0 \
+ crate://crates.io/slab/0.4.6 \
+ crate://crates.io/smallvec/1.9.0 \
+ crate://crates.io/socket2/0.4.4 \
+ crate://crates.io/static_assertions/1.1.0 \
+ crate://crates.io/strsim/0.10.0 \
+ crate://crates.io/syn/1.0.98 \
+ crate://crates.io/sysctl/0.5.2 \
+ crate://crates.io/tempfile/3.3.0 \
+ crate://crates.io/termcolor/1.1.3 \
+ crate://crates.io/textwrap/0.15.0 \
+ crate://crates.io/thiserror-impl/1.0.34 \
+ crate://crates.io/thiserror/1.0.34 \
+ crate://crates.io/time/0.1.44 \
+ 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.28 \
+ crate://crates.io/tracing/0.1.35 \
+ crate://crates.io/typenum/1.15.0 \
+ crate://crates.io/uds_windows/1.0.2 \
+ 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.3.1 \
+ crate://crates.io/version_check/0.9.4 \
+ crate://crates.io/waker-fn/1.1.0 \
+ crate://crates.io/walkdir/2.3.2 \
+ 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/wepoll-ffi/0.1.2 \
+ 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 \
+ crate://crates.io/zbus/2.3.2 \
+ crate://crates.io/zbus_macros/2.3.2 \
+ crate://crates.io/zbus_names/2.1.0 \
+ crate://crates.io/zvariant/3.4.1 \
+ crate://crates.io/zvariant_derive/3.4.1 \
+"
diff --git a/recipes-containers/netavark/netavark_1.2.0.bb b/recipes-containers/netavark/netavark_1.2.0.bb
index 851bf73..8be24c4 100644
--- a/recipes-containers/netavark/netavark_1.2.0.bb
+++ b/recipes-containers/netavark/netavark_1.2.0.bb
@@ -8,196 +8,12 @@ inherit cargo
# how to get netavark could be as easy as but default to a git checkout:
# SRC_URI += "crate://crates.io/netavark/1.2.0"
SRC_URI += "git://github.com/containers/netavark.git;protocol=https;nobranch=1"
+require ${BPN}-crates.inc
+
SRCREV = "90cccc1c21f26fbc473a201ce3b30d77667c7635"
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/aho-corasick/0.7.18 \
- crate://crates.io/android_system_properties/0.1.5 \
- crate://crates.io/anyhow/1.0.65 \
- crate://crates.io/async-broadcast/0.4.0 \
- crate://crates.io/async-channel/1.6.1 \
- crate://crates.io/async-executor/1.4.1 \
- crate://crates.io/async-io/1.7.0 \
- crate://crates.io/async-lock/2.5.0 \
- crate://crates.io/async-recursion/0.3.2 \
- crate://crates.io/async-task/4.3.0 \
- 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/block-buffer/0.10.2 \
- crate://crates.io/bumpalo/3.10.0 \
- crate://crates.io/byteorder/1.4.3 \
- crate://crates.io/bytes/1.1.0 \
- crate://crates.io/cache-padded/1.2.0 \
- crate://crates.io/cc/1.0.73 \
- crate://crates.io/cfg-if/1.0.0 \
- crate://crates.io/chrono/0.4.22 \
- crate://crates.io/clap/3.2.8 \
- crate://crates.io/clap_derive/3.2.7 \
- crate://crates.io/clap_lex/0.2.4 \
- crate://crates.io/concurrent-queue/1.2.2 \
- crate://crates.io/core-foundation-sys/0.8.3 \
- crate://crates.io/cpufeatures/0.2.2 \
- crate://crates.io/crypto-common/0.1.5 \
- crate://crates.io/derivative/2.2.0 \
- crate://crates.io/digest/0.10.5 \
- crate://crates.io/dirs-sys/0.3.7 \
- crate://crates.io/dirs/4.0.0 \
- crate://crates.io/easy-parallel/3.2.0 \
- crate://crates.io/enumflags2/0.7.5 \
- crate://crates.io/enumflags2_derive/0.7.4 \
- crate://crates.io/env_logger/0.9.1 \
- crate://crates.io/event-listener/2.5.2 \
- crate://crates.io/fastrand/1.7.0 \
- crate://crates.io/form_urlencoded/1.1.0 \
- crate://crates.io/fs2/0.4.3 \
- crate://crates.io/futures-channel/0.3.24 \
- crate://crates.io/futures-core/0.3.24 \
- crate://crates.io/futures-executor/0.3.24 \
- crate://crates.io/futures-io/0.3.24 \
- crate://crates.io/futures-lite/1.12.0 \
- crate://crates.io/futures-macro/0.3.24 \
- crate://crates.io/futures-sink/0.3.24 \
- crate://crates.io/futures-task/0.3.24 \
- crate://crates.io/futures-util/0.3.24 \
- crate://crates.io/futures/0.3.24 \
- crate://crates.io/generic-array/0.14.5 \
- 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/hex/0.4.3 \
- crate://crates.io/humantime/2.1.0 \
- crate://crates.io/iana-time-zone/0.1.46 \
- crate://crates.io/idna/0.3.0 \
- crate://crates.io/indexmap/1.9.1 \
- crate://crates.io/instant/0.1.12 \
- crate://crates.io/ipnet/2.5.0 \
- crate://crates.io/iptables/0.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/memchr/2.5.0 \
- crate://crates.io/memoffset/0.6.5 \
- crate://crates.io/mio/0.8.4 \
- crate://crates.io/netlink-packet-core/0.4.2 \
- crate://crates.io/netlink-packet-route/0.13.0 \
- crate://crates.io/netlink-packet-utils/0.5.1 \
- crate://crates.io/netlink-proto/0.10.0 \
- crate://crates.io/netlink-sys/0.8.3 \
- crate://crates.io/nix/0.23.1 \
- crate://crates.io/nix/0.24.2 \
- 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/once_cell/1.13.0 \
- crate://crates.io/ordered-float/2.10.0 \
- crate://crates.io/ordered-stream/0.0.1 \
- crate://crates.io/os_str_bytes/6.1.0 \
- crate://crates.io/parking/2.0.0 \
- crate://crates.io/parking_lot/0.11.2 \
- crate://crates.io/parking_lot/0.12.1 \
- crate://crates.io/parking_lot_core/0.8.5 \
- crate://crates.io/parking_lot_core/0.9.3 \
- crate://crates.io/paste/1.0.7 \
- crate://crates.io/percent-encoding/2.2.0 \
- crate://crates.io/pin-project-lite/0.2.9 \
- crate://crates.io/pin-utils/0.1.0 \
- crate://crates.io/polling/2.2.0 \
- crate://crates.io/ppv-lite86/0.2.16 \
- crate://crates.io/proc-macro-crate/1.1.3 \
- 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/quote/1.0.20 \
- 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/redox_users/0.4.3 \
- crate://crates.io/regex-syntax/0.6.27 \
- crate://crates.io/regex/1.6.0 \
- crate://crates.io/remove_dir_all/0.5.3 \
- crate://crates.io/rtnetlink/0.11.0 \
- crate://crates.io/ryu/1.0.10 \
- crate://crates.io/same-file/1.0.6 \
- crate://crates.io/scopeguard/1.1.0 \
- crate://crates.io/serde-value/0.7.0 \
- crate://crates.io/serde/1.0.144 \
- crate://crates.io/serde_derive/1.0.144 \
- crate://crates.io/serde_json/1.0.85 \
- crate://crates.io/serde_repr/0.1.8 \
- crate://crates.io/sha1/0.6.1 \
- crate://crates.io/sha1_smol/1.0.0 \
- crate://crates.io/sha2/0.10.6 \
- crate://crates.io/signal-hook-registry/1.4.0 \
- crate://crates.io/slab/0.4.6 \
- crate://crates.io/smallvec/1.9.0 \
- crate://crates.io/socket2/0.4.4 \
- crate://crates.io/static_assertions/1.1.0 \
- crate://crates.io/strsim/0.10.0 \
- crate://crates.io/syn/1.0.98 \
- crate://crates.io/sysctl/0.5.2 \
- crate://crates.io/tempfile/3.3.0 \
- crate://crates.io/termcolor/1.1.3 \
- crate://crates.io/textwrap/0.15.0 \
- crate://crates.io/thiserror-impl/1.0.34 \
- crate://crates.io/thiserror/1.0.34 \
- crate://crates.io/time/0.1.44 \
- 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.28 \
- crate://crates.io/tracing/0.1.35 \
- crate://crates.io/typenum/1.15.0 \
- crate://crates.io/uds_windows/1.0.2 \
- 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.3.1 \
- crate://crates.io/version_check/0.9.4 \
- crate://crates.io/waker-fn/1.1.0 \
- crate://crates.io/walkdir/2.3.2 \
- 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/wepoll-ffi/0.1.2 \
- 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 \
- crate://crates.io/zbus/2.3.2 \
- crate://crates.io/zbus_macros/2.3.2 \
- crate://crates.io/zbus_names/2.1.0 \
- crate://crates.io/zvariant/3.4.1 \
- crate://crates.io/zvariant_derive/3.4.1 \
-"
-
-
-
# FIXME: update generateme with the real MD5 of the license file
LIC_FILES_CHKSUM = " \
file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 6/8] netavark: Add checksums for the crate URIs
2023-05-02 20:26 [PATCH 1/8] aardvark-dns: Move the crate URIs to a separate .inc file Peter Kjellerstedt
` (3 preceding siblings ...)
2023-05-02 20:26 ` [PATCH 5/8] netavark: Move the crate URIs to a separate .inc file Peter Kjellerstedt
@ 2023-05-02 20:26 ` Peter Kjellerstedt
2023-05-02 20:26 ` [PATCH 7/8] netavark: Rewrite the recipe Peter Kjellerstedt
2023-05-02 20:26 ` [PATCH 8/8] netavark: Fetch the crate instead of the Git repository Peter Kjellerstedt
6 siblings, 0 replies; 15+ messages in thread
From: Peter Kjellerstedt @ 2023-05-02 20:26 UTC (permalink / raw)
To: meta-virtualization
Use the cargo-update-recipe-crates bbclass to update the crate URIs
including adding checksums for them, as they are now required by the
crate fetcher.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
.../netavark/netavark-crates.inc | 204 +++++++++++++++++-
recipes-containers/netavark/netavark_1.2.0.bb | 2 +-
2 files changed, 194 insertions(+), 12 deletions(-)
diff --git a/recipes-containers/netavark/netavark-crates.inc b/recipes-containers/netavark/netavark-crates.inc
index 26c8eec..cc887eb 100644
--- a/recipes-containers/netavark/netavark-crates.inc
+++ b/recipes-containers/netavark/netavark-crates.inc
@@ -1,3 +1,6 @@
+# Autogenerated with 'bitbake -c update_crates netavark'
+
+# from Cargo.lock
SRC_URI += " \
crate://crates.io/aho-corasick/0.7.18 \
crate://crates.io/android_system_properties/0.1.5 \
@@ -30,8 +33,8 @@ SRC_URI += " \
crate://crates.io/crypto-common/0.1.5 \
crate://crates.io/derivative/2.2.0 \
crate://crates.io/digest/0.10.5 \
- crate://crates.io/dirs-sys/0.3.7 \
crate://crates.io/dirs/4.0.0 \
+ crate://crates.io/dirs-sys/0.3.7 \
crate://crates.io/easy-parallel/3.2.0 \
crate://crates.io/enumflags2/0.7.5 \
crate://crates.io/enumflags2_derive/0.7.4 \
@@ -40,6 +43,7 @@ SRC_URI += " \
crate://crates.io/fastrand/1.7.0 \
crate://crates.io/form_urlencoded/1.1.0 \
crate://crates.io/fs2/0.4.3 \
+ crate://crates.io/futures/0.3.24 \
crate://crates.io/futures-channel/0.3.24 \
crate://crates.io/futures-core/0.3.24 \
crate://crates.io/futures-executor/0.3.24 \
@@ -49,7 +53,6 @@ SRC_URI += " \
crate://crates.io/futures-sink/0.3.24 \
crate://crates.io/futures-task/0.3.24 \
crate://crates.io/futures-util/0.3.24 \
- crate://crates.io/futures/0.3.24 \
crate://crates.io/generic-array/0.14.5 \
crate://crates.io/getrandom/0.2.7 \
crate://crates.io/hashbrown/0.12.2 \
@@ -99,8 +102,8 @@ SRC_URI += " \
crate://crates.io/polling/2.2.0 \
crate://crates.io/ppv-lite86/0.2.16 \
crate://crates.io/proc-macro-crate/1.1.3 \
- crate://crates.io/proc-macro-error-attr/1.0.4 \
crate://crates.io/proc-macro-error/1.0.4 \
+ crate://crates.io/proc-macro-error-attr/1.0.4 \
crate://crates.io/proc-macro2/1.0.40 \
crate://crates.io/quote/1.0.20 \
crate://crates.io/rand/0.8.5 \
@@ -108,15 +111,15 @@ SRC_URI += " \
crate://crates.io/rand_core/0.6.3 \
crate://crates.io/redox_syscall/0.2.13 \
crate://crates.io/redox_users/0.4.3 \
- crate://crates.io/regex-syntax/0.6.27 \
crate://crates.io/regex/1.6.0 \
+ crate://crates.io/regex-syntax/0.6.27 \
crate://crates.io/remove_dir_all/0.5.3 \
crate://crates.io/rtnetlink/0.11.0 \
crate://crates.io/ryu/1.0.10 \
crate://crates.io/same-file/1.0.6 \
crate://crates.io/scopeguard/1.1.0 \
- crate://crates.io/serde-value/0.7.0 \
crate://crates.io/serde/1.0.144 \
+ crate://crates.io/serde-value/0.7.0 \
crate://crates.io/serde_derive/1.0.144 \
crate://crates.io/serde_json/1.0.85 \
crate://crates.io/serde_repr/0.1.8 \
@@ -134,17 +137,17 @@ SRC_URI += " \
crate://crates.io/tempfile/3.3.0 \
crate://crates.io/termcolor/1.1.3 \
crate://crates.io/textwrap/0.15.0 \
- crate://crates.io/thiserror-impl/1.0.34 \
crate://crates.io/thiserror/1.0.34 \
+ crate://crates.io/thiserror-impl/1.0.34 \
crate://crates.io/time/0.1.44 \
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/tokio-macros/1.8.0 \
crate://crates.io/toml/0.5.9 \
+ crate://crates.io/tracing/0.1.35 \
crate://crates.io/tracing-attributes/0.1.22 \
crate://crates.io/tracing-core/0.1.28 \
- crate://crates.io/tracing/0.1.35 \
crate://crates.io/typenum/1.15.0 \
crate://crates.io/uds_windows/1.0.2 \
crate://crates.io/unicode-bidi/0.3.8 \
@@ -156,16 +159,16 @@ SRC_URI += " \
crate://crates.io/walkdir/2.3.2 \
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/0.2.82 \
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-macro-support/0.2.82 \
crate://crates.io/wasm-bindgen-shared/0.2.82 \
- crate://crates.io/wasm-bindgen/0.2.82 \
crate://crates.io/wepoll-ffi/0.1.2 \
+ crate://crates.io/winapi/0.3.9 \
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 \
@@ -178,3 +181,182 @@ SRC_URI += " \
crate://crates.io/zvariant/3.4.1 \
crate://crates.io/zvariant_derive/3.4.1 \
"
+
+SRC_URI[aho-corasick-0.7.18.sha256sum] = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
+SRC_URI[android_system_properties-0.1.5.sha256sum] = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+SRC_URI[anyhow-1.0.65.sha256sum] = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602"
+SRC_URI[async-broadcast-0.4.0.sha256sum] = "1bbd92a9bd0e9c1298118ecf8a2f825e86b12c3ec9e411573e34aaf3a0c03cdd"
+SRC_URI[async-channel-1.6.1.sha256sum] = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319"
+SRC_URI[async-executor-1.4.1.sha256sum] = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965"
+SRC_URI[async-io-1.7.0.sha256sum] = "e5e18f61464ae81cde0a23e713ae8fd299580c54d697a35820cfd0625b8b0e07"
+SRC_URI[async-lock-2.5.0.sha256sum] = "e97a171d191782fba31bb902b14ad94e24a68145032b7eedf871ab0bc0d077b6"
+SRC_URI[async-recursion-0.3.2.sha256sum] = "d7d78656ba01f1b93024b7c3a0467f1608e4be67d725749fdcd7d2c7678fd7a2"
+SRC_URI[async-task-4.3.0.sha256sum] = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524"
+SRC_URI[async-trait-0.1.56.sha256sum] = "96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716"
+SRC_URI[atty-0.2.14.sha256sum] = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+SRC_URI[block-buffer-0.10.2.sha256sum] = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324"
+SRC_URI[bumpalo-3.10.0.sha256sum] = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3"
+SRC_URI[byteorder-1.4.3.sha256sum] = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+SRC_URI[bytes-1.1.0.sha256sum] = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
+SRC_URI[cache-padded-1.2.0.sha256sum] = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
+SRC_URI[cc-1.0.73.sha256sum] = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
+SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+SRC_URI[chrono-0.4.22.sha256sum] = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1"
+SRC_URI[clap-3.2.8.sha256sum] = "190814073e85d238f31ff738fcb0bf6910cedeb73376c87cd69291028966fd83"
+SRC_URI[clap_derive-3.2.7.sha256sum] = "759bf187376e1afa7b85b959e6a664a3e7a95203415dba952ad19139e798f902"
+SRC_URI[clap_lex-0.2.4.sha256sum] = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
+SRC_URI[concurrent-queue-1.2.2.sha256sum] = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3"
+SRC_URI[core-foundation-sys-0.8.3.sha256sum] = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+SRC_URI[cpufeatures-0.2.2.sha256sum] = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b"
+SRC_URI[crypto-common-0.1.5.sha256sum] = "2ccfd8c0ee4cce11e45b3fd6f9d5e69e0cc62912aa6a0cb1bf4617b0eba5a12f"
+SRC_URI[derivative-2.2.0.sha256sum] = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
+SRC_URI[digest-0.10.5.sha256sum] = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c"
+SRC_URI[dirs-4.0.0.sha256sum] = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
+SRC_URI[dirs-sys-0.3.7.sha256sum] = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
+SRC_URI[easy-parallel-3.2.0.sha256sum] = "6907e25393cdcc1f4f3f513d9aac1e840eb1cc341a0fccb01171f7d14d10b946"
+SRC_URI[enumflags2-0.7.5.sha256sum] = "e75d4cd21b95383444831539909fbb14b9dc3fdceb2a6f5d36577329a1f55ccb"
+SRC_URI[enumflags2_derive-0.7.4.sha256sum] = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae"
+SRC_URI[env_logger-0.9.1.sha256sum] = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272"
+SRC_URI[event-listener-2.5.2.sha256sum] = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71"
+SRC_URI[fastrand-1.7.0.sha256sum] = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
+SRC_URI[form_urlencoded-1.1.0.sha256sum] = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
+SRC_URI[fs2-0.4.3.sha256sum] = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
+SRC_URI[futures-0.3.24.sha256sum] = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c"
+SRC_URI[futures-channel-0.3.24.sha256sum] = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050"
+SRC_URI[futures-core-0.3.24.sha256sum] = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf"
+SRC_URI[futures-executor-0.3.24.sha256sum] = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab"
+SRC_URI[futures-io-0.3.24.sha256sum] = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68"
+SRC_URI[futures-lite-1.12.0.sha256sum] = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48"
+SRC_URI[futures-macro-0.3.24.sha256sum] = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17"
+SRC_URI[futures-sink-0.3.24.sha256sum] = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56"
+SRC_URI[futures-task-0.3.24.sha256sum] = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1"
+SRC_URI[futures-util-0.3.24.sha256sum] = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90"
+SRC_URI[generic-array-0.14.5.sha256sum] = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803"
+SRC_URI[getrandom-0.2.7.sha256sum] = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
+SRC_URI[hashbrown-0.12.2.sha256sum] = "607c8a29735385251a339424dd462993c0fed8fa09d378f259377df08c126022"
+SRC_URI[heck-0.4.0.sha256sum] = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
+SRC_URI[hermit-abi-0.1.19.sha256sum] = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+SRC_URI[hex-0.4.3.sha256sum] = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+SRC_URI[humantime-2.1.0.sha256sum] = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+SRC_URI[iana-time-zone-0.1.46.sha256sum] = "ad2bfd338099682614d3ee3fe0cd72e0b6a41ca6a87f6a74a3bd593c91650501"
+SRC_URI[idna-0.3.0.sha256sum] = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
+SRC_URI[indexmap-1.9.1.sha256sum] = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
+SRC_URI[instant-0.1.12.sha256sum] = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+SRC_URI[ipnet-2.5.0.sha256sum] = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b"
+SRC_URI[iptables-0.5.0.sha256sum] = "1c488ad8e743814579544d5a17bda107cd7a4009ade4d55ce94f4c3ec0281147"
+SRC_URI[itoa-1.0.2.sha256sum] = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
+SRC_URI[js-sys-0.3.59.sha256sum] = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2"
+SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+SRC_URI[libc-0.2.133.sha256sum] = "c0f80d65747a3e43d1596c7c5492d95d5edddaabd45a7fcdb02b95f644164966"
+SRC_URI[lock_api-0.4.7.sha256sum] = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
+SRC_URI[log-0.4.17.sha256sum] = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
+SRC_URI[memchr-2.5.0.sha256sum] = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+SRC_URI[memoffset-0.6.5.sha256sum] = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+SRC_URI[mio-0.8.4.sha256sum] = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf"
+SRC_URI[netlink-packet-core-0.4.2.sha256sum] = "345b8ab5bd4e71a2986663e88c56856699d060e78e152e6e9d7966fcd5491297"
+SRC_URI[netlink-packet-route-0.13.0.sha256sum] = "f5dee5ed749373c298237fe694eb0a51887f4cc1a27370c8464bac4382348f1a"
+SRC_URI[netlink-packet-utils-0.5.1.sha256sum] = "25af9cf0dc55498b7bd94a1508af7a78706aa0ab715a73c5169273e03c84845e"
+SRC_URI[netlink-proto-0.10.0.sha256sum] = "65b4b14489ab424703c092062176d52ba55485a89c076b4f9db05092b7223aa6"
+SRC_URI[netlink-sys-0.8.3.sha256sum] = "92b654097027250401127914afb37cb1f311df6610a9891ff07a757e94199027"
+SRC_URI[nix-0.23.1.sha256sum] = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6"
+SRC_URI[nix-0.24.2.sha256sum] = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc"
+SRC_URI[nix-0.25.0.sha256sum] = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb"
+SRC_URI[num-integer-0.1.45.sha256sum] = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+SRC_URI[num-traits-0.2.15.sha256sum] = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+SRC_URI[num_cpus-1.13.1.sha256sum] = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
+SRC_URI[once_cell-1.13.0.sha256sum] = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1"
+SRC_URI[ordered-float-2.10.0.sha256sum] = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87"
+SRC_URI[ordered-stream-0.0.1.sha256sum] = "44630c059eacfd6e08bdaa51b1db2ce33119caa4ddc1235e923109aa5f25ccb1"
+SRC_URI[os_str_bytes-6.1.0.sha256sum] = "21326818e99cfe6ce1e524c2a805c189a99b5ae555a35d19f9a284b427d86afa"
+SRC_URI[parking-2.0.0.sha256sum] = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
+SRC_URI[parking_lot-0.11.2.sha256sum] = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+SRC_URI[parking_lot-0.12.1.sha256sum] = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+SRC_URI[parking_lot_core-0.8.5.sha256sum] = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
+SRC_URI[parking_lot_core-0.9.3.sha256sum] = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
+SRC_URI[paste-1.0.7.sha256sum] = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc"
+SRC_URI[percent-encoding-2.2.0.sha256sum] = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
+SRC_URI[pin-project-lite-0.2.9.sha256sum] = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+SRC_URI[pin-utils-0.1.0.sha256sum] = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+SRC_URI[polling-2.2.0.sha256sum] = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259"
+SRC_URI[ppv-lite86-0.2.16.sha256sum] = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
+SRC_URI[proc-macro-crate-1.1.3.sha256sum] = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a"
+SRC_URI[proc-macro-error-1.0.4.sha256sum] = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+SRC_URI[proc-macro-error-attr-1.0.4.sha256sum] = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+SRC_URI[proc-macro2-1.0.40.sha256sum] = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7"
+SRC_URI[quote-1.0.20.sha256sum] = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804"
+SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+SRC_URI[rand_chacha-0.3.1.sha256sum] = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+SRC_URI[rand_core-0.6.3.sha256sum] = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
+SRC_URI[redox_syscall-0.2.13.sha256sum] = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
+SRC_URI[redox_users-0.4.3.sha256sum] = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+SRC_URI[regex-1.6.0.sha256sum] = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
+SRC_URI[regex-syntax-0.6.27.sha256sum] = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
+SRC_URI[remove_dir_all-0.5.3.sha256sum] = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
+SRC_URI[rtnetlink-0.11.0.sha256sum] = "46f1cfa18f8cebe685373a2697915d7e0db3b4554918bba118385e0f71f258a7"
+SRC_URI[ryu-1.0.10.sha256sum] = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695"
+SRC_URI[same-file-1.0.6.sha256sum] = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+SRC_URI[scopeguard-1.1.0.sha256sum] = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+SRC_URI[serde-1.0.144.sha256sum] = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860"
+SRC_URI[serde-value-0.7.0.sha256sum] = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c"
+SRC_URI[serde_derive-1.0.144.sha256sum] = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00"
+SRC_URI[serde_json-1.0.85.sha256sum] = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44"
+SRC_URI[serde_repr-0.1.8.sha256sum] = "a2ad84e47328a31223de7fed7a4f5087f2d6ddfe586cf3ca25b7a165bc0a5aed"
+SRC_URI[sha1-0.6.1.sha256sum] = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770"
+SRC_URI[sha1_smol-1.0.0.sha256sum] = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
+SRC_URI[sha2-0.10.6.sha256sum] = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
+SRC_URI[signal-hook-registry-1.4.0.sha256sum] = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
+SRC_URI[slab-0.4.6.sha256sum] = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32"
+SRC_URI[smallvec-1.9.0.sha256sum] = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1"
+SRC_URI[socket2-0.4.4.sha256sum] = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
+SRC_URI[static_assertions-1.1.0.sha256sum] = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+SRC_URI[strsim-0.10.0.sha256sum] = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+SRC_URI[syn-1.0.98.sha256sum] = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd"
+SRC_URI[sysctl-0.5.2.sha256sum] = "f99d037b2bef227ab8963f4b0acc33ecbb1f9a2e7365add7789372b387ec19e1"
+SRC_URI[tempfile-3.3.0.sha256sum] = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
+SRC_URI[termcolor-1.1.3.sha256sum] = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
+SRC_URI[textwrap-0.15.0.sha256sum] = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
+SRC_URI[thiserror-1.0.34.sha256sum] = "8c1b05ca9d106ba7d2e31a9dab4a64e7be2cce415321966ea3132c49a656e252"
+SRC_URI[thiserror-impl-1.0.34.sha256sum] = "e8f2591983642de85c921015f3f070c665a197ed69e417af436115e3a1407487"
+SRC_URI[time-0.1.44.sha256sum] = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
+SRC_URI[tinyvec-1.6.0.sha256sum] = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+SRC_URI[tinyvec_macros-0.1.0.sha256sum] = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
+SRC_URI[tokio-1.21.1.sha256sum] = "0020c875007ad96677dcc890298f4b942882c5d4eb7cc8f439fc3bf813dc9c95"
+SRC_URI[tokio-macros-1.8.0.sha256sum] = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484"
+SRC_URI[toml-0.5.9.sha256sum] = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
+SRC_URI[tracing-0.1.35.sha256sum] = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160"
+SRC_URI[tracing-attributes-0.1.22.sha256sum] = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2"
+SRC_URI[tracing-core-0.1.28.sha256sum] = "7b7358be39f2f274f322d2aaed611acc57f382e8eb1e5b48cb9ae30933495ce7"
+SRC_URI[typenum-1.15.0.sha256sum] = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
+SRC_URI[uds_windows-1.0.2.sha256sum] = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d"
+SRC_URI[unicode-bidi-0.3.8.sha256sum] = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
+SRC_URI[unicode-ident-1.0.1.sha256sum] = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"
+SRC_URI[unicode-normalization-0.1.21.sha256sum] = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6"
+SRC_URI[url-2.3.1.sha256sum] = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
+SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+SRC_URI[waker-fn-1.1.0.sha256sum] = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
+SRC_URI[walkdir-2.3.2.sha256sum] = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
+SRC_URI[wasi-0.10.0+wasi-snapshot-preview1.sha256sum] = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
+SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+SRC_URI[wasm-bindgen-0.2.82.sha256sum] = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d"
+SRC_URI[wasm-bindgen-backend-0.2.82.sha256sum] = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f"
+SRC_URI[wasm-bindgen-macro-0.2.82.sha256sum] = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602"
+SRC_URI[wasm-bindgen-macro-support-0.2.82.sha256sum] = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da"
+SRC_URI[wasm-bindgen-shared-0.2.82.sha256sum] = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a"
+SRC_URI[wepoll-ffi-0.1.2.sha256sum] = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb"
+SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+SRC_URI[winapi-util-0.1.5.sha256sum] = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+SRC_URI[windows-sys-0.36.1.sha256sum] = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
+SRC_URI[windows_aarch64_msvc-0.36.1.sha256sum] = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
+SRC_URI[windows_i686_gnu-0.36.1.sha256sum] = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
+SRC_URI[windows_i686_msvc-0.36.1.sha256sum] = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
+SRC_URI[windows_x86_64_gnu-0.36.1.sha256sum] = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
+SRC_URI[windows_x86_64_msvc-0.36.1.sha256sum] = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
+SRC_URI[zbus-2.3.2.sha256sum] = "2d8f1a037b2c4a67d9654dc7bdfa8ff2e80555bbefdd3c1833c1d1b27c963a6b"
+SRC_URI[zbus_macros-2.3.2.sha256sum] = "1f8fb5186d1c87ae88cf234974c240671238b4a679158ad3b94ec465237349a6"
+SRC_URI[zbus_names-2.1.0.sha256sum] = "45dfcdcf87b71dad505d30cc27b1b7b88a64b6d1c435648f48f9dbc1fdc4b7e1"
+SRC_URI[zvariant-3.4.1.sha256sum] = "cf2c71467724d4a77f0a1f0339dab10ca5d63f6a82411289cdcdfbfd47d2e407"
+SRC_URI[zvariant_derive-3.4.1.sha256sum] = "2c47f3630ce926a03abf21f5a8db90c60c81ed71599b5c86ad1a54fd3c7564c5"
diff --git a/recipes-containers/netavark/netavark_1.2.0.bb b/recipes-containers/netavark/netavark_1.2.0.bb
index 8be24c4..a3af083 100644
--- a/recipes-containers/netavark/netavark_1.2.0.bb
+++ b/recipes-containers/netavark/netavark_1.2.0.bb
@@ -1,6 +1,6 @@
# Auto-Generated by cargo-bitbake 0.3.16
#
-inherit cargo
+inherit cargo cargo-update-recipe-crates
# If this is git based prefer versioned ones if they exist
# DEFAULT_PREFERENCE = "-1"
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 7/8] netavark: Rewrite the recipe
2023-05-02 20:26 [PATCH 1/8] aardvark-dns: Move the crate URIs to a separate .inc file Peter Kjellerstedt
` (4 preceding siblings ...)
2023-05-02 20:26 ` [PATCH 6/8] netavark: Add checksums for the crate URIs Peter Kjellerstedt
@ 2023-05-02 20:26 ` Peter Kjellerstedt
2023-05-02 20:43 ` [meta-virtualization] " Bruce Ashfield
2023-05-02 20:26 ` [PATCH 8/8] netavark: Fetch the crate instead of the Git repository Peter Kjellerstedt
6 siblings, 1 reply; 15+ messages in thread
From: Peter Kjellerstedt @ 2023-05-02 20:26 UTC (permalink / raw)
To: meta-virtualization
Since the recipe is no longer expected to be updated using
cargo-bitbake after switching to using cargo-update-recipe-crates to
update the crate URIs, rewrite it to better conform to common recipe
standards. Also fold netavark.inc into it as there is no longer any need
to keep it separate from the main recipe.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
recipes-containers/netavark/netavark.inc | 49 --------------
recipes-containers/netavark/netavark_1.2.0.bb | 66 +++++++++++++------
2 files changed, 46 insertions(+), 69 deletions(-)
delete mode 100644 recipes-containers/netavark/netavark.inc
diff --git a/recipes-containers/netavark/netavark.inc b/recipes-containers/netavark/netavark.inc
deleted file mode 100644
index c15bbea..0000000
--- a/recipes-containers/netavark/netavark.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-inherit ptest
-
-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"
-
-# Rdepends on aardvark-dns which rdepends on slirp4netns
-inherit features_check
-REQUIRED_DISTRO_FEATURES ?= "seccomp"
-
-SRC_URI += " \
- file://run-ptest \
- file://tests.patch \
-"
-
-# 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}/
-}
-
-
-do_install_ptest () {
- cp -r ${S}/test ${D}${PTEST_PATH}
-}
-
-RDEPENDS:${PN}-ptest += " \
- bats \
- bash \
- coreutils \
- jq \
- iproute2 \
- dbus-daemon-proxy \
- util-linux-unshare \
- nmap \
- procps-ps \
- util-linux-nsenter \
- bind-utils \
-"
-
-
-# bind-utils is used to install dig
-# procps is necessary because the ps from busybox is
-# not having the same behavior
diff --git a/recipes-containers/netavark/netavark_1.2.0.bb b/recipes-containers/netavark/netavark_1.2.0.bb
index a3af083..be7cff5 100644
--- a/recipes-containers/netavark/netavark_1.2.0.bb
+++ b/recipes-containers/netavark/netavark_1.2.0.bb
@@ -1,30 +1,56 @@
-# Auto-Generated by cargo-bitbake 0.3.16
-#
-inherit cargo cargo-update-recipe-crates
+SUMMARY = "A container network stack"
+HOMEPAGE = "https://github.com/containers/netavark"
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
-# If this is git based prefer versioned ones if they exist
-# DEFAULT_PREFERENCE = "-1"
+SRCREV = "90cccc1c21f26fbc473a201ce3b30d77667c7635"
# how to get netavark could be as easy as but default to a git checkout:
# SRC_URI += "crate://crates.io/netavark/1.2.0"
-SRC_URI += "git://github.com/containers/netavark.git;protocol=https;nobranch=1"
+SRC_URI = "git://github.com/containers/netavark.git;protocol=https;nobranch=1 \
+ file://tests.patch \
+ file://run-ptest"
require ${BPN}-crates.inc
-SRCREV = "90cccc1c21f26fbc473a201ce3b30d77667c7635"
S = "${WORKDIR}/git"
-CARGO_SRC_DIR = ""
-# FIXME: update generateme with the real MD5 of the license file
-LIC_FILES_CHKSUM = " \
- file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
-"
+PACKAGECONFIG ?= "aardvark-dns"
-SUMMARY = "A container network stack"
-HOMEPAGE = "https://github.com/containers/netavark"
-LICENSE = "Apache-2.0"
+# 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"
+
+inherit cargo cargo-update-recipe-crates features_check ptest
+
+# Cargo installs the binary to bin so move it to where podman expects it
+do_install:append() {
+ install -d ${D}${libexecdir}
+ mv ${D}${bindir} ${D}${libexecdir}/podman
+}
-# 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 netavark-${PV}.inc
-include netavark.inc
+do_install_ptest() {
+ cp -r ${S}/test ${D}${PTEST_PATH}
+}
+
+# rdepends on aardvark-dns which rdepends on slirp4netns
+REQUIRED_DISTRO_FEATURES ?= "seccomp"
+
+# bind-utils is used to install dig
+# procps-ps is necessary because the ps from busybox is
+# not having the same behavior
+RDEPENDS:${PN}-ptest += " \
+ bash \
+ bats \
+ bind-utils \
+ coreutils \
+ dbus-daemon-proxy \
+ iproute2 \
+ jq \
+ nmap \
+ procps-ps \
+ util-linux-nsenter \
+ util-linux-unshare \
+"
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 8/8] netavark: Fetch the crate instead of the Git repository
2023-05-02 20:26 [PATCH 1/8] aardvark-dns: Move the crate URIs to a separate .inc file Peter Kjellerstedt
` (5 preceding siblings ...)
2023-05-02 20:26 ` [PATCH 7/8] netavark: Rewrite the recipe Peter Kjellerstedt
@ 2023-05-02 20:26 ` Peter Kjellerstedt
2023-05-02 20:43 ` [meta-virtualization] " Bruce Ashfield
6 siblings, 1 reply; 15+ messages in thread
From: Peter Kjellerstedt @ 2023-05-02 20:26 UTC (permalink / raw)
To: meta-virtualization
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
recipes-containers/netavark/netavark_1.2.0.bb | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/recipes-containers/netavark/netavark_1.2.0.bb b/recipes-containers/netavark/netavark_1.2.0.bb
index be7cff5..0b16d2b 100644
--- a/recipes-containers/netavark/netavark_1.2.0.bb
+++ b/recipes-containers/netavark/netavark_1.2.0.bb
@@ -4,16 +4,12 @@ HOMEPAGE = "https://github.com/containers/netavark"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
-SRCREV = "90cccc1c21f26fbc473a201ce3b30d77667c7635"
-
-# how to get netavark could be as easy as but default to a git checkout:
-# SRC_URI += "crate://crates.io/netavark/1.2.0"
-SRC_URI = "git://github.com/containers/netavark.git;protocol=https;nobranch=1 \
+SRC_URI = "crate://crates.io/${BPN}/${PV} \
file://tests.patch \
file://run-ptest"
require ${BPN}-crates.inc
-S = "${WORKDIR}/git"
+SRC_URI[netavark-1.2.0.sha256sum] = "8d636ecaab6dcbc7989cde720d290d8ff30d9eb69f3a2b3cb70d4135e721b936"
PACKAGECONFIG ?= "aardvark-dns"
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [meta-virtualization] [PATCH 4/8] aardvark-dns: Fetch the crate instead of the Git repository
2023-05-02 20:26 ` [PATCH 4/8] aardvark-dns: Fetch the crate instead of the Git repository Peter Kjellerstedt
@ 2023-05-02 20:41 ` Bruce Ashfield
2023-05-02 20:48 ` Peter Kjellerstedt
0 siblings, 1 reply; 15+ messages in thread
From: Bruce Ashfield @ 2023-05-02 20:41 UTC (permalink / raw)
To: Peter Kjellerstedt; +Cc: meta-virtualization
On Tue, May 2, 2023 at 4:26 PM Peter Kjellerstedt
<peter.kjellerstedt@axis.com> wrote:
>
> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> ---
> recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb b/recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb
> index 10901eb..ac2fc6d 100644
> --- a/recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb
> +++ b/recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb
> @@ -4,15 +4,11 @@ HOMEPAGE = "https://github.com/containers/aardvark-dns"
> LICENSE = "Apache-2.0"
> LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
>
> -SRCREV = "cb1a462dd8427e33355f6907394a0646f5a26bf2"
> -
> -# 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 \
I much prefer the git fetch, and am inclined to reject this part of the update.
Is something actually broken with the git fetch ? If we can't mix the
two, then I'm inclined to say the crates support is broken.
Bruce
> +SRC_URI = "crate://crates.io/${BPN}/${PV} \
> file://run-ptest"
> require ${BPN}-crates.inc
>
> -S = "${WORKDIR}/git"
> +SRC_URI[aardvark-dns-1.2.0.sha256sum] = "1f9d011e5edaa6e0fa055e383bec03a46c9ef35dfa346883aeb5bf86b794a949"
>
> inherit cargo cargo-update-recipe-crates features_check ptest
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#8022): https://lists.yoctoproject.org/g/meta-virtualization/message/8022
> Mute This Topic: https://lists.yoctoproject.org/mt/98647878/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [meta-virtualization] [PATCH 7/8] netavark: Rewrite the recipe
2023-05-02 20:26 ` [PATCH 7/8] netavark: Rewrite the recipe Peter Kjellerstedt
@ 2023-05-02 20:43 ` Bruce Ashfield
2023-05-02 20:55 ` Peter Kjellerstedt
0 siblings, 1 reply; 15+ messages in thread
From: Bruce Ashfield @ 2023-05-02 20:43 UTC (permalink / raw)
To: Peter Kjellerstedt; +Cc: meta-virtualization
On Tue, May 2, 2023 at 4:26 PM Peter Kjellerstedt
<peter.kjellerstedt@axis.com> wrote:
>
> Since the recipe is no longer expected to be updated using
The wording on this (and the other commits) isn't correct.
There is no compulsion to use any particular set of tools to update
and maintain recipes.
Perhaps just say "Switching to cargo-update-recipe-crates format, for the
following reasons ..."
Bruce
> cargo-bitbake after switching to using cargo-update-recipe-crates to
> update the crate URIs, rewrite it to better conform to common recipe
> standards. Also fold netavark.inc into it as there is no longer any need
> to keep it separate from the main recipe.
>
> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> ---
> recipes-containers/netavark/netavark.inc | 49 --------------
> recipes-containers/netavark/netavark_1.2.0.bb | 66 +++++++++++++------
> 2 files changed, 46 insertions(+), 69 deletions(-)
> delete mode 100644 recipes-containers/netavark/netavark.inc
>
> diff --git a/recipes-containers/netavark/netavark.inc b/recipes-containers/netavark/netavark.inc
> deleted file mode 100644
> index c15bbea..0000000
> --- a/recipes-containers/netavark/netavark.inc
> +++ /dev/null
> @@ -1,49 +0,0 @@
> -inherit ptest
> -
> -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"
> -
> -# Rdepends on aardvark-dns which rdepends on slirp4netns
> -inherit features_check
> -REQUIRED_DISTRO_FEATURES ?= "seccomp"
> -
> -SRC_URI += " \
> - file://run-ptest \
> - file://tests.patch \
> -"
> -
> -# 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}/
> -}
> -
> -
> -do_install_ptest () {
> - cp -r ${S}/test ${D}${PTEST_PATH}
> -}
> -
> -RDEPENDS:${PN}-ptest += " \
> - bats \
> - bash \
> - coreutils \
> - jq \
> - iproute2 \
> - dbus-daemon-proxy \
> - util-linux-unshare \
> - nmap \
> - procps-ps \
> - util-linux-nsenter \
> - bind-utils \
> -"
> -
> -
> -# bind-utils is used to install dig
> -# procps is necessary because the ps from busybox is
> -# not having the same behavior
> diff --git a/recipes-containers/netavark/netavark_1.2.0.bb b/recipes-containers/netavark/netavark_1.2.0.bb
> index a3af083..be7cff5 100644
> --- a/recipes-containers/netavark/netavark_1.2.0.bb
> +++ b/recipes-containers/netavark/netavark_1.2.0.bb
> @@ -1,30 +1,56 @@
> -# Auto-Generated by cargo-bitbake 0.3.16
> -#
> -inherit cargo cargo-update-recipe-crates
> +SUMMARY = "A container network stack"
> +HOMEPAGE = "https://github.com/containers/netavark"
> +
> +LICENSE = "Apache-2.0"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
>
> -# If this is git based prefer versioned ones if they exist
> -# DEFAULT_PREFERENCE = "-1"
> +SRCREV = "90cccc1c21f26fbc473a201ce3b30d77667c7635"
>
> # how to get netavark could be as easy as but default to a git checkout:
> # SRC_URI += "crate://crates.io/netavark/1.2.0"
> -SRC_URI += "git://github.com/containers/netavark.git;protocol=https;nobranch=1"
> +SRC_URI = "git://github.com/containers/netavark.git;protocol=https;nobranch=1 \
> + file://tests.patch \
> + file://run-ptest"
> require ${BPN}-crates.inc
>
> -SRCREV = "90cccc1c21f26fbc473a201ce3b30d77667c7635"
> S = "${WORKDIR}/git"
> -CARGO_SRC_DIR = ""
>
> -# FIXME: update generateme with the real MD5 of the license file
> -LIC_FILES_CHKSUM = " \
> - file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
> -"
> +PACKAGECONFIG ?= "aardvark-dns"
>
> -SUMMARY = "A container network stack"
> -HOMEPAGE = "https://github.com/containers/netavark"
> -LICENSE = "Apache-2.0"
> +# 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"
> +
> +inherit cargo cargo-update-recipe-crates features_check ptest
> +
> +# Cargo installs the binary to bin so move it to where podman expects it
> +do_install:append() {
> + install -d ${D}${libexecdir}
> + mv ${D}${bindir} ${D}${libexecdir}/podman
> +}
>
> -# 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 netavark-${PV}.inc
> -include netavark.inc
> +do_install_ptest() {
> + cp -r ${S}/test ${D}${PTEST_PATH}
> +}
> +
> +# rdepends on aardvark-dns which rdepends on slirp4netns
> +REQUIRED_DISTRO_FEATURES ?= "seccomp"
> +
> +# bind-utils is used to install dig
> +# procps-ps is necessary because the ps from busybox is
> +# not having the same behavior
> +RDEPENDS:${PN}-ptest += " \
> + bash \
> + bats \
> + bind-utils \
> + coreutils \
> + dbus-daemon-proxy \
> + iproute2 \
> + jq \
> + nmap \
> + procps-ps \
> + util-linux-nsenter \
> + util-linux-unshare \
> +"
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#8023): https://lists.yoctoproject.org/g/meta-virtualization/message/8023
> Mute This Topic: https://lists.yoctoproject.org/mt/98647879/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [meta-virtualization] [PATCH 8/8] netavark: Fetch the crate instead of the Git repository
2023-05-02 20:26 ` [PATCH 8/8] netavark: Fetch the crate instead of the Git repository Peter Kjellerstedt
@ 2023-05-02 20:43 ` Bruce Ashfield
0 siblings, 0 replies; 15+ messages in thread
From: Bruce Ashfield @ 2023-05-02 20:43 UTC (permalink / raw)
To: Peter Kjellerstedt; +Cc: meta-virtualization
Same comment as the other.
This should stay as a git fetch, versus a crate.
Bruce
On Tue, May 2, 2023 at 4:26 PM Peter Kjellerstedt
<peter.kjellerstedt@axis.com> wrote:
>
> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> ---
> recipes-containers/netavark/netavark_1.2.0.bb | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/recipes-containers/netavark/netavark_1.2.0.bb b/recipes-containers/netavark/netavark_1.2.0.bb
> index be7cff5..0b16d2b 100644
> --- a/recipes-containers/netavark/netavark_1.2.0.bb
> +++ b/recipes-containers/netavark/netavark_1.2.0.bb
> @@ -4,16 +4,12 @@ HOMEPAGE = "https://github.com/containers/netavark"
> LICENSE = "Apache-2.0"
> LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
>
> -SRCREV = "90cccc1c21f26fbc473a201ce3b30d77667c7635"
> -
> -# how to get netavark could be as easy as but default to a git checkout:
> -# SRC_URI += "crate://crates.io/netavark/1.2.0"
> -SRC_URI = "git://github.com/containers/netavark.git;protocol=https;nobranch=1 \
> +SRC_URI = "crate://crates.io/${BPN}/${PV} \
> file://tests.patch \
> file://run-ptest"
> require ${BPN}-crates.inc
>
> -S = "${WORKDIR}/git"
> +SRC_URI[netavark-1.2.0.sha256sum] = "8d636ecaab6dcbc7989cde720d290d8ff30d9eb69f3a2b3cb70d4135e721b936"
>
> PACKAGECONFIG ?= "aardvark-dns"
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#8025): https://lists.yoctoproject.org/g/meta-virtualization/message/8025
> Mute This Topic: https://lists.yoctoproject.org/mt/98647881/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
^ permalink raw reply [flat|nested] 15+ messages in thread
* RE: [meta-virtualization] [PATCH 4/8] aardvark-dns: Fetch the crate instead of the Git repository
2023-05-02 20:41 ` [meta-virtualization] " Bruce Ashfield
@ 2023-05-02 20:48 ` Peter Kjellerstedt
2023-05-02 20:55 ` Bruce Ashfield
0 siblings, 1 reply; 15+ messages in thread
From: Peter Kjellerstedt @ 2023-05-02 20:48 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: meta-virtualization
> -----Original Message-----
> From: Bruce Ashfield <bruce.ashfield@gmail.com>
> Sent: den 2 maj 2023 22:41
> To: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> Cc: meta-virtualization@lists.yoctoproject.org
> Subject: Re: [meta-virtualization] [PATCH 4/8] aardvark-dns: Fetch the crate instead of the Git repository
>
> On Tue, May 2, 2023 at 4:26 PM Peter Kjellerstedt <peter.kjellerstedt@axis.com> wrote:
> >
> > Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> > ---
> > recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb | 8 ++------
> > 1 file changed, 2 insertions(+), 6 deletions(-)
> >
> > diff --git a/recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb b/recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb
> > index 10901eb..ac2fc6d 100644
> > --- a/recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb
> > +++ b/recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb
> > @@ -4,15 +4,11 @@ HOMEPAGE = "https://github.com/containers/aardvark-dns"
> > LICENSE = "Apache-2.0"
> > LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
> >
> > -SRCREV = "cb1a462dd8427e33355f6907394a0646f5a26bf2"
> > -
> > -# 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 \
>
> I much prefer the git fetch, and am inclined to reject this part of the
> update.
>
> Is something actually broken with the git fetch ? If we can't mix the
> two, then I'm inclined to say the crates support is broken.
>
> Bruce
While this change is not strictly necessary, I was looking for
some recipe in the common layers to serve as example for how to
use the crate fetcher to fetch the source for the recipe's source,
and these two were the only ones I could find that fit the bill.
Be aware that this and the corresponding patch for netavark do
not work until the functionality in the crate fetcher has been
restored to support fetching the recipe's code using it (see my
patch to bitbake-devel from a couple of days ago).
//Peter
>
> > +SRC_URI = "crate://crates.io/${BPN}/${PV} \
> > file://run-ptest"
> > require ${BPN}-crates.inc
> >
> > -S = "${WORKDIR}/git"
> > +SRC_URI[aardvark-dns-1.2.0.sha256sum] = "1f9d011e5edaa6e0fa055e383bec03a46c9ef35dfa346883aeb5bf86b794a949"
> >
> > inherit cargo cargo-update-recipe-crates features_check ptest
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [meta-virtualization] [PATCH 4/8] aardvark-dns: Fetch the crate instead of the Git repository
2023-05-02 20:48 ` Peter Kjellerstedt
@ 2023-05-02 20:55 ` Bruce Ashfield
0 siblings, 0 replies; 15+ messages in thread
From: Bruce Ashfield @ 2023-05-02 20:55 UTC (permalink / raw)
To: Peter Kjellerstedt; +Cc: meta-virtualization
On Tue, May 2, 2023 at 4:48 PM Peter Kjellerstedt
<peter.kjellerstedt@axis.com> wrote:
>
> > -----Original Message-----
> > From: Bruce Ashfield <bruce.ashfield@gmail.com>
> > Sent: den 2 maj 2023 22:41
> > To: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> > Cc: meta-virtualization@lists.yoctoproject.org
> > Subject: Re: [meta-virtualization] [PATCH 4/8] aardvark-dns: Fetch the crate instead of the Git repository
> >
> > On Tue, May 2, 2023 at 4:26 PM Peter Kjellerstedt <peter.kjellerstedt@axis.com> wrote:
> > >
> > > Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> > > ---
> > > recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb | 8 ++------
> > > 1 file changed, 2 insertions(+), 6 deletions(-)
> > >
> > > diff --git a/recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb b/recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb
> > > index 10901eb..ac2fc6d 100644
> > > --- a/recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb
> > > +++ b/recipes-containers/aardvark-dns/aardvark-dns_1.2.0.bb
> > > @@ -4,15 +4,11 @@ HOMEPAGE = "https://github.com/containers/aardvark-dns"
> > > LICENSE = "Apache-2.0"
> > > LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
> > >
> > > -SRCREV = "cb1a462dd8427e33355f6907394a0646f5a26bf2"
> > > -
> > > -# 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 \
> >
> > I much prefer the git fetch, and am inclined to reject this part of the
> > update.
> >
> > Is something actually broken with the git fetch ? If we can't mix the
> > two, then I'm inclined to say the crates support is broken.
> >
> > Bruce
>
> While this change is not strictly necessary, I was looking for
> some recipe in the common layers to serve as example for how to
> use the crate fetcher to fetch the source for the recipe's source,
> and these two were the only ones I could find that fit the bill.
>
> Be aware that this and the corresponding patch for netavark do
> not work until the functionality in the crate fetcher has been
> restored to support fetching the recipe's code using it (see my
> patch to bitbake-devel from a couple of days ago).
I'm not following the rust and crates discussions too closely, but I
am always a supporter of the revision control history in the source.
As the one who ends up fixing, bumping and otherwise maintaining, I
need that granularity and insist on it when I can.
So in this case, let's leave it as git and from my reading of the
bitbake patches, we shouldn't see the issue as we have no crate
matching the recipe name.
I do appreciate the cleanups, but there are other things I'm putting
as a higher importance (the revision control history).
Perhaps leave the fetch-the-main-source-as-a-crate in the recipe as a comment ?
Bruce
>
> //Peter
>
> >
> > > +SRC_URI = "crate://crates.io/${BPN}/${PV} \
> > > file://run-ptest"
> > > require ${BPN}-crates.inc
> > >
> > > -S = "${WORKDIR}/git"
> > > +SRC_URI[aardvark-dns-1.2.0.sha256sum] = "1f9d011e5edaa6e0fa055e383bec03a46c9ef35dfa346883aeb5bf86b794a949"
> > >
> > > inherit cargo cargo-update-recipe-crates features_check ptest
>
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
^ permalink raw reply [flat|nested] 15+ messages in thread
* RE: [meta-virtualization] [PATCH 7/8] netavark: Rewrite the recipe
2023-05-02 20:43 ` [meta-virtualization] " Bruce Ashfield
@ 2023-05-02 20:55 ` Peter Kjellerstedt
2023-05-02 21:06 ` Bruce Ashfield
0 siblings, 1 reply; 15+ messages in thread
From: Peter Kjellerstedt @ 2023-05-02 20:55 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: meta-virtualization
> -----Original Message-----
> From: Bruce Ashfield <bruce.ashfield@gmail.com>
> Sent: den 2 maj 2023 22:43
> To: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> Cc: meta-virtualization@lists.yoctoproject.org
> Subject: Re: [meta-virtualization] [PATCH 7/8] netavark: Rewrite the
> recipe
>
> On Tue, May 2, 2023 at 4:26 PM Peter Kjellerstedt
> <peter.kjellerstedt@axis.com> wrote:
> >
> > Since the recipe is no longer expected to be updated using
>
> The wording on this (and the other commits) isn't correct.
>
> There is no compulsion to use any particular set of tools to update
> and maintain recipes.
No, of course, but the comments left in the recipe by cargo-bitbake,
"Auto-Generated by cargo-bitbake 0.3.16" at the top and
"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." at the end, at least to me indicated
that there previously was an expectation to use cargo-bitbake to
update the recipe.
>
> Perhaps just say "Switching to cargo-update-recipe-crates format, for the
> following reasons ..."
>
> Bruce
>
> > cargo-bitbake after switching to using cargo-update-recipe-crates to
> > update the crate URIs, rewrite it to better conform to common recipe
> > standards. Also fold netavark.inc into it as there is no longer any need
> > to keep it separate from the main recipe.
> >
> > Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> > ---
> > recipes-containers/netavark/netavark.inc | 49 --------------
> > recipes-containers/netavark/netavark_1.2.0.bb | 66 +++++++++++++------
> > 2 files changed, 46 insertions(+), 69 deletions(-)
> > delete mode 100644 recipes-containers/netavark/netavark.inc
> >
> > diff --git a/recipes-containers/netavark/netavark.inc b/recipes-containers/netavark/netavark.inc
> > deleted file mode 100644
> > index c15bbea..0000000
> > --- a/recipes-containers/netavark/netavark.inc
> > +++ /dev/null
> > @@ -1,49 +0,0 @@
> > -inherit ptest
> > -
> > -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"
> > -
> > -# Rdepends on aardvark-dns which rdepends on slirp4netns
> > -inherit features_check
> > -REQUIRED_DISTRO_FEATURES ?= "seccomp"
> > -
> > -SRC_URI += " \
> > - file://run-ptest \
> > - file://tests.patch \
> > -"
> > -
> > -# 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}/
> > -}
> > -
> > -
> > -do_install_ptest () {
> > - cp -r ${S}/test ${D}${PTEST_PATH}
> > -}
> > -
> > -RDEPENDS:${PN}-ptest += " \
> > - bats \
> > - bash \
> > - coreutils \
> > - jq \
> > - iproute2 \
> > - dbus-daemon-proxy \
> > - util-linux-unshare \
> > - nmap \
> > - procps-ps \
> > - util-linux-nsenter \
> > - bind-utils \
> > -"
> > -
> > -
> > -# bind-utils is used to install dig
> > -# procps is necessary because the ps from busybox is
> > -# not having the same behavior
> > diff --git a/recipes-containers/netavark/netavark_1.2.0.bb b/recipes-containers/netavark/netavark_1.2.0.bb
> > index a3af083..be7cff5 100644
> > --- a/recipes-containers/netavark/netavark_1.2.0.bb
> > +++ b/recipes-containers/netavark/netavark_1.2.0.bb
> > @@ -1,30 +1,56 @@
> > -# Auto-Generated by cargo-bitbake 0.3.16
> > -#
> > -inherit cargo cargo-update-recipe-crates
> > +SUMMARY = "A container network stack"
> > +HOMEPAGE = "https://github.com/containers/netavark"
> > +
> > +LICENSE = "Apache-2.0"
> > +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
> >
> > -# If this is git based prefer versioned ones if they exist
> > -# DEFAULT_PREFERENCE = "-1"
> > +SRCREV = "90cccc1c21f26fbc473a201ce3b30d77667c7635"
> >
> > # how to get netavark could be as easy as but default to a git checkout:
> > # SRC_URI += "crate://crates.io/netavark/1.2.0"
> > -SRC_URI += "git://github.com/containers/netavark.git;protocol=https;nobranch=1"
> > +SRC_URI = "git://github.com/containers/netavark.git;protocol=https;nobranch=1 \
> > + file://tests.patch \
> > + file://run-ptest"
> > require ${BPN}-crates.inc
> >
> > -SRCREV = "90cccc1c21f26fbc473a201ce3b30d77667c7635"
> > S = "${WORKDIR}/git"
> > -CARGO_SRC_DIR = ""
> >
> > -# FIXME: update generateme with the real MD5 of the license file
> > -LIC_FILES_CHKSUM = " \
> > - file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
> > -"
> > +PACKAGECONFIG ?= "aardvark-dns"
> >
> > -SUMMARY = "A container network stack"
> > -HOMEPAGE = "https://github.com/containers/netavark"
> > -LICENSE = "Apache-2.0"
> > +# 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"
> > +
> > +inherit cargo cargo-update-recipe-crates features_check ptest
> > +
> > +# Cargo installs the binary to bin so move it to where podman expects it
> > +do_install:append() {
> > + install -d ${D}${libexecdir}
> > + mv ${D}${bindir} ${D}${libexecdir}/podman
> > +}
> >
> > -# 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 netavark-${PV}.inc
> > -include netavark.inc
> > +do_install_ptest() {
> > + cp -r ${S}/test ${D}${PTEST_PATH}
> > +}
> > +
> > +# rdepends on aardvark-dns which rdepends on slirp4netns
> > +REQUIRED_DISTRO_FEATURES ?= "seccomp"
> > +
> > +# bind-utils is used to install dig
> > +# procps-ps is necessary because the ps from busybox is
> > +# not having the same behavior
> > +RDEPENDS:${PN}-ptest += " \
> > + bash \
> > + bats \
> > + bind-utils \
> > + coreutils \
> > + dbus-daemon-proxy \
> > + iproute2 \
> > + jq \
> > + nmap \
> > + procps-ps \
> > + util-linux-nsenter \
> > + util-linux-unshare \
> > +"
//Peter
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [meta-virtualization] [PATCH 7/8] netavark: Rewrite the recipe
2023-05-02 20:55 ` Peter Kjellerstedt
@ 2023-05-02 21:06 ` Bruce Ashfield
0 siblings, 0 replies; 15+ messages in thread
From: Bruce Ashfield @ 2023-05-02 21:06 UTC (permalink / raw)
To: Peter Kjellerstedt; +Cc: meta-virtualization
On Tue, May 2, 2023 at 4:56 PM Peter Kjellerstedt
<peter.kjellerstedt@axis.com> wrote:
>
> > -----Original Message-----
> > From: Bruce Ashfield <bruce.ashfield@gmail.com>
> > Sent: den 2 maj 2023 22:43
> > To: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> > Cc: meta-virtualization@lists.yoctoproject.org
> > Subject: Re: [meta-virtualization] [PATCH 7/8] netavark: Rewrite the
> > recipe
> >
> > On Tue, May 2, 2023 at 4:26 PM Peter Kjellerstedt
> > <peter.kjellerstedt@axis.com> wrote:
> > >
> > > Since the recipe is no longer expected to be updated using
> >
> > The wording on this (and the other commits) isn't correct.
> >
> > There is no compulsion to use any particular set of tools to update
> > and maintain recipes.
>
> No, of course, but the comments left in the recipe by cargo-bitbake,
> "Auto-Generated by cargo-bitbake 0.3.16" at the top and
> "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." at the end, at least to me indicated
> that there previously was an expectation to use cargo-bitbake to
> update the recipe.
Agreed.
I just meant to say that the commit message could say something
along the lines of:
"Rather than generating the crates via cargo-bitbake, we switch to the more
commonly used (and supported) cargo-update-recipe-crates."
Versus the old phrasing which read (to me) that the switch was mandatory
as opposed to something we are choosing.
Bruce
>
> >
> > Perhaps just say "Switching to cargo-update-recipe-crates format, for the
> > following reasons ..."
> >
> > Bruce
> >
> > > cargo-bitbake after switching to using cargo-update-recipe-crates to
> > > update the crate URIs, rewrite it to better conform to common recipe
> > > standards. Also fold netavark.inc into it as there is no longer any need
> > > to keep it separate from the main recipe.
> > >
> > > Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> > > ---
> > > recipes-containers/netavark/netavark.inc | 49 --------------
> > > recipes-containers/netavark/netavark_1.2.0.bb | 66 +++++++++++++------
> > > 2 files changed, 46 insertions(+), 69 deletions(-)
> > > delete mode 100644 recipes-containers/netavark/netavark.inc
> > >
> > > diff --git a/recipes-containers/netavark/netavark.inc b/recipes-containers/netavark/netavark.inc
> > > deleted file mode 100644
> > > index c15bbea..0000000
> > > --- a/recipes-containers/netavark/netavark.inc
> > > +++ /dev/null
> > > @@ -1,49 +0,0 @@
> > > -inherit ptest
> > > -
> > > -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"
> > > -
> > > -# Rdepends on aardvark-dns which rdepends on slirp4netns
> > > -inherit features_check
> > > -REQUIRED_DISTRO_FEATURES ?= "seccomp"
> > > -
> > > -SRC_URI += " \
> > > - file://run-ptest \
> > > - file://tests.patch \
> > > -"
> > > -
> > > -# 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}/
> > > -}
> > > -
> > > -
> > > -do_install_ptest () {
> > > - cp -r ${S}/test ${D}${PTEST_PATH}
> > > -}
> > > -
> > > -RDEPENDS:${PN}-ptest += " \
> > > - bats \
> > > - bash \
> > > - coreutils \
> > > - jq \
> > > - iproute2 \
> > > - dbus-daemon-proxy \
> > > - util-linux-unshare \
> > > - nmap \
> > > - procps-ps \
> > > - util-linux-nsenter \
> > > - bind-utils \
> > > -"
> > > -
> > > -
> > > -# bind-utils is used to install dig
> > > -# procps is necessary because the ps from busybox is
> > > -# not having the same behavior
> > > diff --git a/recipes-containers/netavark/netavark_1.2.0.bb b/recipes-containers/netavark/netavark_1.2.0.bb
> > > index a3af083..be7cff5 100644
> > > --- a/recipes-containers/netavark/netavark_1.2.0.bb
> > > +++ b/recipes-containers/netavark/netavark_1.2.0.bb
> > > @@ -1,30 +1,56 @@
> > > -# Auto-Generated by cargo-bitbake 0.3.16
> > > -#
> > > -inherit cargo cargo-update-recipe-crates
> > > +SUMMARY = "A container network stack"
> > > +HOMEPAGE = "https://github.com/containers/netavark"
> > > +
> > > +LICENSE = "Apache-2.0"
> > > +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
> > >
> > > -# If this is git based prefer versioned ones if they exist
> > > -# DEFAULT_PREFERENCE = "-1"
> > > +SRCREV = "90cccc1c21f26fbc473a201ce3b30d77667c7635"
> > >
> > > # how to get netavark could be as easy as but default to a git checkout:
> > > # SRC_URI += "crate://crates.io/netavark/1.2.0"
> > > -SRC_URI += "git://github.com/containers/netavark.git;protocol=https;nobranch=1"
> > > +SRC_URI = "git://github.com/containers/netavark.git;protocol=https;nobranch=1 \
> > > + file://tests.patch \
> > > + file://run-ptest"
> > > require ${BPN}-crates.inc
> > >
> > > -SRCREV = "90cccc1c21f26fbc473a201ce3b30d77667c7635"
> > > S = "${WORKDIR}/git"
> > > -CARGO_SRC_DIR = ""
> > >
> > > -# FIXME: update generateme with the real MD5 of the license file
> > > -LIC_FILES_CHKSUM = " \
> > > - file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
> > > -"
> > > +PACKAGECONFIG ?= "aardvark-dns"
> > >
> > > -SUMMARY = "A container network stack"
> > > -HOMEPAGE = "https://github.com/containers/netavark"
> > > -LICENSE = "Apache-2.0"
> > > +# 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"
> > > +
> > > +inherit cargo cargo-update-recipe-crates features_check ptest
> > > +
> > > +# Cargo installs the binary to bin so move it to where podman expects it
> > > +do_install:append() {
> > > + install -d ${D}${libexecdir}
> > > + mv ${D}${bindir} ${D}${libexecdir}/podman
> > > +}
> > >
> > > -# 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 netavark-${PV}.inc
> > > -include netavark.inc
> > > +do_install_ptest() {
> > > + cp -r ${S}/test ${D}${PTEST_PATH}
> > > +}
> > > +
> > > +# rdepends on aardvark-dns which rdepends on slirp4netns
> > > +REQUIRED_DISTRO_FEATURES ?= "seccomp"
> > > +
> > > +# bind-utils is used to install dig
> > > +# procps-ps is necessary because the ps from busybox is
> > > +# not having the same behavior
> > > +RDEPENDS:${PN}-ptest += " \
> > > + bash \
> > > + bats \
> > > + bind-utils \
> > > + coreutils \
> > > + dbus-daemon-proxy \
> > > + iproute2 \
> > > + jq \
> > > + nmap \
> > > + procps-ps \
> > > + util-linux-nsenter \
> > > + util-linux-unshare \
> > > +"
>
> //Peter
>
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2023-05-02 21:06 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-02 20:26 [PATCH 1/8] aardvark-dns: Move the crate URIs to a separate .inc file Peter Kjellerstedt
2023-05-02 20:26 ` [PATCH 2/8] aardvark-dns: Add checksums for the crate URIs Peter Kjellerstedt
2023-05-02 20:26 ` [PATCH 3/8] aardvark-dns: Rewrite the recipe Peter Kjellerstedt
2023-05-02 20:26 ` [PATCH 4/8] aardvark-dns: Fetch the crate instead of the Git repository Peter Kjellerstedt
2023-05-02 20:41 ` [meta-virtualization] " Bruce Ashfield
2023-05-02 20:48 ` Peter Kjellerstedt
2023-05-02 20:55 ` Bruce Ashfield
2023-05-02 20:26 ` [PATCH 5/8] netavark: Move the crate URIs to a separate .inc file Peter Kjellerstedt
2023-05-02 20:26 ` [PATCH 6/8] netavark: Add checksums for the crate URIs Peter Kjellerstedt
2023-05-02 20:26 ` [PATCH 7/8] netavark: Rewrite the recipe Peter Kjellerstedt
2023-05-02 20:43 ` [meta-virtualization] " Bruce Ashfield
2023-05-02 20:55 ` Peter Kjellerstedt
2023-05-02 21:06 ` Bruce Ashfield
2023-05-02 20:26 ` [PATCH 8/8] netavark: Fetch the crate instead of the Git repository Peter Kjellerstedt
2023-05-02 20:43 ` [meta-virtualization] " Bruce Ashfield
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.