diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index ef1603b719..d4c0635dda 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -373,6 +373,7 @@ eclass/python-utils-r1.eclass eclass/readme.gentoo-r1.eclass eclass/ruby-single.eclass eclass/ruby-utils.eclass +eclass/rust-toolchain.eclass eclass/rpm.eclass eclass/savedconfig.eclass eclass/selinux-policy-2.eclass diff --git a/core_sign_update b/core_sign_update index fca2ca8191..808de93d9f 100755 --- a/core_sign_update +++ b/core_sign_update @@ -18,13 +18,9 @@ export GCLIENT_ROOT=$(readlink -f "${SCRIPT_ROOT}/../../") DEFINE_string image "" "The filesystem image of /usr" DEFINE_string kernel "" "The kernel image" DEFINE_string output "" "Output file" -DEFINE_string private_keys "" "Path, pkcs11 URI, or fero: for private keys." +DEFINE_string private_keys "" "Path or pkcs11 URI for private keys." DEFINE_string public_keys "" "Path to public keys in .pem format." DEFINE_string keys_separator ":" "Separator for the above keys" -DEFINE_string user_signatures "" \ - "Colon-separated paths to user signatures to provide to signing server" -DEFINE_string signing_server_address "" "Hostname of the signing server" -DEFINE_integer signing_server_port "50051" "Port of the signing server" # Parse command line FLAGS "$@" || exit 1 @@ -68,16 +64,6 @@ for key in "${private_keys[@]}"; do done signature_sizes="${signature_sizes:1:${#signature_sizes}}" -# We don't need to maintain backwards compatibility with old `sign.sh` scripts here, so we only -# allow colon-separated values for user signature files. -IFS=":" read -a user_signatures <<< "$FLAGS_user_signatures" - -user_signatures_arg="" -for user_signature in "${user_signatures[@]}"; do - user_signatures_arg="${user_signatures_arg} --signature ${user_signature}" -done -user_signatures_arg="${user_signatures_arg:1:${#user_signatures_arg}}" - delta_generator \ --signature_size ${signature_sizes} \ --in_file update \ @@ -137,15 +123,6 @@ signature_sizes="" for key in "${private_keys[@]}"; do if [[ "${key}" == pkcs11* ]]; then sudo OPENSSL_CONF=/etc/ssl/pkcs11.cnf openssl pkeyutl -engine pkcs11 -sign -keyform engine -inkey "${key}" -in update.pkcs11-padhash -out "update.sig.${i}" - elif [[ "${key}" == fero* ]]; then - fero-client \ - --address $FLAGS_signing_server_address \ - --port $FLAGS_signing_server_port \ - sign --pkcs1 \ - --file update.hash \ - --output update.sig.${i} \ - --secret-key ${key:5:${#key}} \ - ${user_signatures_arg} else openssl rsautl -raw -sign -inkey ${key} -in update.padhash -out update.sig.${i} fi diff --git a/sdk_container/.repo/manifests/version.txt b/sdk_container/.repo/manifests/version.txt index 7a7c1b3340..c7bbe23f36 100644 --- a/sdk_container/.repo/manifests/version.txt +++ b/sdk_container/.repo/manifests/version.txt @@ -1,4 +1,4 @@ -FLATCAR_VERSION=4000.0.0+nightly-20240613-2100 +FLATCAR_VERSION=4000.0.0+nightly-20240613-2100-10-ga2901d9a72 FLATCAR_VERSION_ID=4000.0.0 -FLATCAR_BUILD_ID="nightly-20240613-2100" +FLATCAR_BUILD_ID="nightly-20240613-2100-10-ga2901d9a72" FLATCAR_SDK_VERSION=4000.0.0+nightly-20240613-2100 diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/afterburn-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/afterburn-9999.ebuild index 0c85763b59..b5ff51addc 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/afterburn-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/afterburn-9999.ebuild @@ -16,297 +16,297 @@ fi # https://github.com/gentoo/cargo-ebuild CRATES=" - addr2line-0.21.0 - adler-1.0.2 - adler32-1.2.0 - aho-corasick-1.1.2 - anstyle-1.0.4 - anyhow-1.0.79 - arc-swap-1.6.0 - assert-json-diff-2.0.2 - async-broadcast-0.5.1 - async-channel-2.1.1 - async-executor-1.8.0 - async-fs-1.6.0 - async-io-1.13.0 - async-io-2.2.2 - async-lock-2.8.0 - async-lock-3.3.0 - async-process-1.8.1 - async-recursion-1.0.5 - async-signal-0.2.5 - async-task-4.7.0 - async-trait-0.1.77 - atomic-waker-1.1.2 - atty-0.2.14 - autocfg-1.1.0 - backtrace-0.3.69 - base64-0.13.1 - base64-0.21.7 - bitflags-1.3.2 - bitflags-2.4.1 - block-buffer-0.10.4 - blocking-1.5.1 - bumpalo-3.14.0 - byteorder-1.5.0 - bytes-1.5.0 - cc-1.0.83 - cfg-if-1.0.0 - charset-0.1.3 - clap-4.4.16 - clap_builder-4.4.16 - clap_derive-4.4.7 - clap_lex-0.6.0 - colored-2.1.0 - concurrent-queue-2.4.0 - core-foundation-0.9.4 - core-foundation-sys-0.8.6 - cpufeatures-0.2.12 - crc32fast-1.3.2 - crossbeam-channel-0.5.11 - crossbeam-utils-0.8.19 - crypto-common-0.1.6 - data-encoding-2.5.0 - deranged-0.3.11 - derivative-2.2.0 - digest-0.10.7 - dirs-next-2.0.0 - dirs-sys-next-0.1.2 - encoding_rs-0.8.33 - enumflags2-0.7.8 - enumflags2_derive-0.7.8 - equivalent-1.0.1 - errno-0.3.8 - event-listener-2.5.3 - event-listener-3.1.0 - event-listener-4.0.3 - event-listener-strategy-0.4.0 - fastrand-1.9.0 - fastrand-2.0.1 - fnv-1.0.7 - foreign-types-0.3.2 - foreign-types-shared-0.1.1 - form_urlencoded-1.2.1 - futures-0.3.30 - futures-channel-0.3.30 - futures-core-0.3.30 - futures-executor-0.3.30 - futures-io-0.3.30 - futures-lite-1.13.0 - futures-lite-2.2.0 - futures-macro-0.3.30 - futures-sink-0.3.30 - futures-task-0.3.30 - futures-util-0.3.30 - generic-array-0.14.7 - getrandom-0.2.12 - gimli-0.28.1 - h2-0.3.23 - hashbrown-0.14.3 - heck-0.4.1 - hermit-abi-0.1.19 - hermit-abi-0.3.3 - hex-0.4.3 - hmac-0.12.1 - hostname-0.3.1 - http-0.2.11 - http-body-0.4.6 - httparse-1.8.0 - httpdate-1.0.3 - hyper-0.14.28 - hyper-tls-0.5.0 - idna-0.5.0 - indexmap-2.1.0 - instant-0.1.12 - io-lifetimes-1.0.11 - ipnet-2.9.0 - ipnetwork-0.20.0 - itoa-1.0.10 - js-sys-0.3.66 - lazy_static-1.4.0 - libc-0.2.152 - libflate-1.4.0 - libflate_lz77-1.2.0 - libredox-0.0.1 - libsystemd-0.7.0 - linux-raw-sys-0.3.8 - linux-raw-sys-0.4.12 - lock_api-0.4.11 - log-0.4.20 - mailparse-0.14.0 - maplit-1.0.2 - match_cfg-0.1.0 - md-5-0.10.6 - memchr-2.7.1 - memoffset-0.7.1 - memoffset-0.9.0 - mime-0.3.17 - minimal-lexical-0.2.1 - miniz_oxide-0.7.1 - mio-0.8.10 - mockito-1.2.0 - native-tls-0.2.11 - nix-0.26.4 - nix-0.27.1 - no-std-net-0.6.0 - nom-7.1.3 - num_cpus-1.16.0 - num_threads-0.1.6 - object-0.32.2 - once_cell-1.19.0 - openssh-keys-0.6.2 - openssl-0.10.62 - openssl-macros-0.1.1 - openssl-probe-0.1.5 - openssl-sys-0.9.98 - ordered-stream-0.2.0 - parking-2.2.0 - parking_lot-0.12.1 - parking_lot_core-0.9.9 - percent-encoding-2.3.1 - pin-project-lite-0.2.13 - pin-utils-0.1.0 - piper-0.2.1 - pkg-config-0.3.28 - pnet_base-0.34.0 - pnet_datalink-0.34.0 - pnet_sys-0.34.0 - polling-2.8.0 - polling-3.3.1 - powerfmt-0.2.0 - ppv-lite86-0.2.17 - proc-macro-crate-1.3.1 - proc-macro2-1.0.76 - quote-1.0.35 - quoted_printable-0.4.8 - rand-0.8.5 - rand_chacha-0.3.1 - rand_core-0.6.4 - redox_syscall-0.4.1 - redox_users-0.4.4 - regex-1.10.2 - regex-automata-0.4.3 - regex-syntax-0.8.2 - reqwest-0.11.23 - rle-decode-fast-1.0.3 - rustc-demangle-0.1.23 - rustix-0.37.27 - rustix-0.38.28 - rustversion-1.0.14 - ryu-1.0.16 - schannel-0.1.23 - scopeguard-1.2.0 - security-framework-2.9.2 - security-framework-sys-2.9.1 - serde-1.0.195 - serde-xml-rs-0.6.0 - serde_derive-1.0.195 - serde_json-1.0.111 - serde_repr-0.1.18 - serde_urlencoded-0.7.1 - serde_yaml-0.9.30 - sha1-0.10.6 - sha2-0.10.8 - signal-hook-registry-1.4.1 - similar-2.4.0 - slab-0.4.9 - slog-2.7.0 - slog-async-2.8.0 - slog-scope-4.4.0 - slog-term-2.9.0 - smallvec-1.11.2 - socket2-0.4.10 - socket2-0.5.5 - static_assertions-1.1.0 - strsim-0.10.0 - subtle-2.5.0 - syn-1.0.109 - syn-2.0.48 - system-configuration-0.5.1 - system-configuration-sys-0.5.0 - take_mut-0.2.2 - tempfile-3.9.0 - term-0.7.0 - terminal_size-0.3.0 - thiserror-1.0.56 - thiserror-impl-1.0.56 - thread_local-1.1.7 - time-0.3.31 - time-core-0.1.2 - time-macros-0.2.16 - tinyvec-1.6.0 - tinyvec_macros-0.1.1 - tokio-1.35.1 - tokio-macros-2.2.0 - tokio-native-tls-0.3.1 - tokio-util-0.7.10 - toml_datetime-0.6.5 - toml_edit-0.19.15 - tower-service-0.3.2 - tracing-0.1.40 - tracing-attributes-0.1.27 - tracing-core-0.1.32 - try-lock-0.2.5 - typenum-1.17.0 - uds_windows-1.1.0 - unicode-bidi-0.3.14 - unicode-ident-1.0.12 - unicode-normalization-0.1.22 - unsafe-libyaml-0.2.10 - url-2.5.0 - uuid-1.6.1 - uzers-0.11.3 - vcpkg-0.2.15 - version_check-0.9.4 - vmw_backdoor-0.2.4 - waker-fn-1.1.1 - want-0.3.1 - wasi-0.11.0+wasi-snapshot-preview1 - wasm-bindgen-0.2.89 - wasm-bindgen-backend-0.2.89 - wasm-bindgen-futures-0.4.39 - wasm-bindgen-macro-0.2.89 - wasm-bindgen-macro-support-0.2.89 - wasm-bindgen-shared-0.2.89 - web-sys-0.3.66 - winapi-0.3.9 - winapi-i686-pc-windows-gnu-0.4.0 - winapi-x86_64-pc-windows-gnu-0.4.0 - windows-sys-0.48.0 - windows-sys-0.52.0 - windows-targets-0.48.5 - windows-targets-0.52.0 - windows_aarch64_gnullvm-0.48.5 - windows_aarch64_gnullvm-0.52.0 - windows_aarch64_msvc-0.48.5 - windows_aarch64_msvc-0.52.0 - windows_i686_gnu-0.48.5 - windows_i686_gnu-0.52.0 - windows_i686_msvc-0.48.5 - windows_i686_msvc-0.52.0 - windows_x86_64_gnu-0.48.5 - windows_x86_64_gnu-0.52.0 - windows_x86_64_gnullvm-0.48.5 - windows_x86_64_gnullvm-0.52.0 - windows_x86_64_msvc-0.48.5 - windows_x86_64_msvc-0.52.0 - winnow-0.5.34 - winreg-0.50.0 - xdg-home-1.0.0 - xml-rs-0.8.19 - zbus-3.14.1 - zbus_macros-3.14.1 - zbus_names-2.6.0 - zvariant-3.15.0 - zvariant_derive-3.15.0 - zvariant_utils-1.0.1 + addr2line@0.21.0 + adler@1.0.2 + adler32@1.2.0 + aho-corasick@1.1.2 + anstyle@1.0.4 + anyhow@1.0.79 + arc-swap@1.6.0 + assert-json-diff@2.0.2 + async-broadcast@0.5.1 + async-channel@2.1.1 + async-executor@1.8.0 + async-fs@1.6.0 + async-io@1.13.0 + async-io@2.2.2 + async-lock@2.8.0 + async-lock@3.3.0 + async-process@1.8.1 + async-recursion@1.0.5 + async-signal@0.2.5 + async-task@4.7.0 + async-trait@0.1.77 + atomic-waker@1.1.2 + atty@0.2.14 + autocfg@1.1.0 + backtrace@0.3.69 + base64@0.13.1 + base64@0.21.7 + bitflags@1.3.2 + bitflags@2.4.1 + block-buffer@0.10.4 + blocking@1.5.1 + bumpalo@3.14.0 + byteorder@1.5.0 + bytes@1.5.0 + cc@1.0.83 + cfg-if@1.0.0 + charset@0.1.3 + clap@4.4.16 + clap_builder@4.4.16 + clap_derive@4.4.7 + clap_lex@0.6.0 + colored@2.1.0 + concurrent-queue@2.4.0 + core-foundation@0.9.4 + core-foundation-sys@0.8.6 + cpufeatures@0.2.12 + crc32fast@1.3.2 + crossbeam-channel@0.5.11 + crossbeam-utils@0.8.19 + crypto-common@0.1.6 + data-encoding@2.5.0 + deranged@0.3.11 + derivative@2.2.0 + digest@0.10.7 + dirs-next@2.0.0 + dirs-sys-next@0.1.2 + encoding_rs@0.8.33 + enumflags2@0.7.8 + enumflags2_derive@0.7.8 + equivalent@1.0.1 + errno@0.3.8 + event-listener@2.5.3 + event-listener@3.1.0 + event-listener@4.0.3 + event-listener-strategy@0.4.0 + fastrand@1.9.0 + fastrand@2.0.1 + fnv@1.0.7 + foreign-types@0.3.2 + foreign-types-shared@0.1.1 + form_urlencoded@1.2.1 + futures@0.3.30 + futures-channel@0.3.30 + futures-core@0.3.30 + futures-executor@0.3.30 + futures-io@0.3.30 + futures-lite@1.13.0 + futures-lite@2.2.0 + futures-macro@0.3.30 + futures-sink@0.3.30 + futures-task@0.3.30 + futures-util@0.3.30 + generic-array@0.14.7 + getrandom@0.2.12 + gimli@0.28.1 + h2@0.3.23 + hashbrown@0.14.3 + heck@0.4.1 + hermit-abi@0.1.19 + hermit-abi@0.3.3 + hex@0.4.3 + hmac@0.12.1 + hostname@0.3.1 + http@0.2.11 + http-body@0.4.6 + httparse@1.8.0 + httpdate@1.0.3 + hyper@0.14.28 + hyper-tls@0.5.0 + idna@0.5.0 + indexmap@2.1.0 + instant@0.1.12 + io-lifetimes@1.0.11 + ipnet@2.9.0 + ipnetwork@0.20.0 + itoa@1.0.10 + js-sys@0.3.66 + lazy_static@1.4.0 + libc@0.2.152 + libflate@1.4.0 + libflate_lz77@1.2.0 + libredox@0.0.1 + libsystemd@0.7.0 + linux-raw-sys@0.3.8 + linux-raw-sys@0.4.12 + lock_api@0.4.11 + log@0.4.20 + mailparse@0.14.0 + maplit@1.0.2 + match_cfg@0.1.0 + md-5@0.10.6 + memchr@2.7.1 + memoffset@0.7.1 + memoffset@0.9.0 + mime@0.3.17 + minimal-lexical@0.2.1 + miniz_oxide@0.7.1 + mio@0.8.10 + mockito@1.2.0 + native-tls@0.2.11 + nix@0.26.4 + nix@0.27.1 + no-std-net@0.6.0 + nom@7.1.3 + num_cpus@1.16.0 + num_threads@0.1.6 + object@0.32.2 + once_cell@1.19.0 + openssh-keys@0.6.2 + openssl@0.10.62 + openssl-macros@0.1.1 + openssl-probe@0.1.5 + openssl-sys@0.9.98 + ordered-stream@0.2.0 + parking@2.2.0 + parking_lot@0.12.1 + parking_lot_core@0.9.9 + percent-encoding@2.3.1 + pin-project-lite@0.2.13 + pin-utils@0.1.0 + piper@0.2.1 + pkg-config@0.3.28 + pnet_base@0.34.0 + pnet_datalink@0.34.0 + pnet_sys@0.34.0 + polling@2.8.0 + polling@3.3.1 + powerfmt@0.2.0 + ppv-lite86@0.2.17 + proc-macro-crate@1.3.1 + proc-macro2@1.0.76 + quote@1.0.35 + quoted_printable@0.4.8 + rand@0.8.5 + rand_chacha@0.3.1 + rand_core@0.6.4 + redox_syscall@0.4.1 + redox_users@0.4.4 + regex@1.10.2 + regex-automata@0.4.3 + regex-syntax@0.8.2 + reqwest@0.11.23 + rle-decode-fast@1.0.3 + rustc-demangle@0.1.23 + rustix@0.37.27 + rustix@0.38.28 + rustversion@1.0.14 + ryu@1.0.16 + schannel@0.1.23 + scopeguard@1.2.0 + security-framework@2.9.2 + security-framework-sys@2.9.1 + serde@1.0.195 + serde-xml-rs@0.6.0 + serde_derive@1.0.195 + serde_json@1.0.111 + serde_repr@0.1.18 + serde_urlencoded@0.7.1 + serde_yaml@0.9.30 + sha1@0.10.6 + sha2@0.10.8 + signal-hook-registry@1.4.1 + similar@2.4.0 + slab@0.4.9 + slog@2.7.0 + slog-async@2.8.0 + slog-scope@4.4.0 + slog-term@2.9.0 + smallvec@1.11.2 + socket2@0.4.10 + socket2@0.5.5 + static_assertions@1.1.0 + strsim@0.10.0 + subtle@2.5.0 + syn@1.0.109 + syn@2.0.48 + system-configuration@0.5.1 + system-configuration-sys@0.5.0 + take_mut@0.2.2 + tempfile@3.9.0 + term@0.7.0 + terminal_size@0.3.0 + thiserror@1.0.56 + thiserror-impl@1.0.56 + thread_local@1.1.7 + time@0.3.31 + time-core@0.1.2 + time-macros@0.2.16 + tinyvec@1.6.0 + tinyvec_macros@0.1.1 + tokio@1.35.1 + tokio-macros@2.2.0 + tokio-native-tls@0.3.1 + tokio-util@0.7.10 + toml_datetime@0.6.5 + toml_edit@0.19.15 + tower-service@0.3.2 + tracing@0.1.40 + tracing-attributes@0.1.27 + tracing-core@0.1.32 + try-lock@0.2.5 + typenum@1.17.0 + uds_windows@1.1.0 + unicode-bidi@0.3.14 + unicode-ident@1.0.12 + unicode-normalization@0.1.22 + unsafe-libyaml@0.2.10 + url@2.5.0 + uuid@1.6.1 + uzers@0.11.3 + vcpkg@0.2.15 + version_check@0.9.4 + vmw_backdoor@0.2.4 + waker-fn@1.1.1 + want@0.3.1 + wasi@0.11.0+wasi-snapshot-preview1 + wasm-bindgen@0.2.89 + wasm-bindgen-backend@0.2.89 + wasm-bindgen-futures@0.4.39 + wasm-bindgen-macro@0.2.89 + wasm-bindgen-macro-support@0.2.89 + wasm-bindgen-shared@0.2.89 + web-sys@0.3.66 + winapi@0.3.9 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-x86_64-pc-windows-gnu@0.4.0 + windows-sys@0.48.0 + windows-sys@0.52.0 + windows-targets@0.48.5 + windows-targets@0.52.0 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_gnullvm@0.52.0 + windows_aarch64_msvc@0.48.5 + windows_aarch64_msvc@0.52.0 + windows_i686_gnu@0.48.5 + windows_i686_gnu@0.52.0 + windows_i686_msvc@0.48.5 + windows_i686_msvc@0.52.0 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnu@0.52.0 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_gnullvm@0.52.0 + windows_x86_64_msvc@0.48.5 + windows_x86_64_msvc@0.52.0 + winnow@0.5.34 + winreg@0.50.0 + xdg-home@1.0.0 + xml-rs@0.8.19 + zbus@3.14.1 + zbus_macros@3.14.1 + zbus_names@2.6.0 + zvariant@3.15.0 + zvariant_derive@3.15.0 + zvariant_utils@1.0.1 " -inherit coreos-cargo cros-workon systemd +inherit cargo cros-workon systemd DESCRIPTION="A tool for collecting instance metadata from various providers" HOMEPAGE="https://github.com/coreos/afterburn" -SRC_URI="$(cargo_crate_uris ${CRATES})" +SRC_URI="${CARGO_CRATE_URIS}" LICENSE="Apache-2.0" SLOT="0" @@ -325,8 +325,8 @@ PATCHES=( ) src_unpack() { - cros-workon_src_unpack "$@" - coreos-cargo_src_unpack "$@" + cros-workon_src_unpack + cargo_src_unpack } src_prepare() { @@ -339,11 +339,11 @@ src_prepare() { } src_compile() { - cargo_src_compile --features cl-legacy "$@" + cargo_src_compile --features cl-legacy } src_install() { - cargo_src_install --features cl-legacy "$@" + cargo_src_install --features cl-legacy mv "${D}/usr/bin/afterburn" "${D}/usr/bin/coreos-metadata" systemd_dounit "${FILESDIR}/coreos-metadata.service" @@ -351,5 +351,5 @@ src_install() { } src_test() { - cargo_src_test --features cl-legacy "$@" + cargo_src_test --features cl-legacy } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/metadata.xml b/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/metadata.xml index 097975e3ad..d29cfaf5b8 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/metadata.xml +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/metadata.xml @@ -1,4 +1,7 @@ + + coreos/afterburn + diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/metadata.xml b/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/metadata.xml similarity index 64% rename from sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/metadata.xml rename to sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/metadata.xml index 097975e3ad..e03c0d5933 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/metadata.xml +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/metadata.xml @@ -1,4 +1,7 @@ + + flatcar/ue-rs + diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/ue-rs-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/ue-rs-9999.ebuild index 13a49b5184..7a597e52c4 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/ue-rs-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/ue-rs-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Flatcar Maintainers +# Copyright (c) 2023-2024 Flatcar Maintainers # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,212 +16,212 @@ fi # https://github.com/gentoo/cargo-ebuild CRATES=" - addr2line-0.21.0 - adler-1.0.2 - aho-corasick-1.0.5 - anyhow-1.0.75 - argh-0.1.12 - argh_derive-0.1.12 - argh_shared-0.1.12 - autocfg-1.1.0 - backtrace-0.3.69 - base64-0.21.3 - base64ct-1.6.0 - bitflags-1.3.2 - bitflags-2.4.0 - block-buffer-0.10.4 - bstr-1.6.2 - bumpalo-3.13.0 - byteorder-1.4.3 - bytes-1.4.0 - bzip2-0.4.4 - bzip2-sys-0.1.11+1.0.8 - cc-1.0.83 - cfg-if-1.0.0 - const-oid-0.9.5 - core-foundation-0.9.3 - core-foundation-sys-0.8.4 - cpufeatures-0.2.9 - crypto-common-0.1.6 - ct-codecs-1.1.1 - der-0.7.8 - digest-0.10.7 - encoding_rs-0.8.33 - env_logger-0.10.0 - equivalent-1.0.1 - errno-0.3.3 - errno-dragonfly-0.1.2 - fastrand-2.0.0 - fnv-1.0.7 - foreign-types-0.3.2 - foreign-types-shared-0.1.1 - form_urlencoded-1.2.0 - futures-channel-0.3.28 - futures-core-0.3.28 - futures-io-0.3.29 - futures-sink-0.3.28 - futures-task-0.3.28 - futures-util-0.3.28 - generic-array-0.14.7 - getrandom-0.2.10 - gimli-0.28.0 - globset-0.4.13 - h2-0.3.26 - hashbrown-0.14.3 - hermit-abi-0.3.2 - http-0.2.9 - http-body-0.4.5 - httparse-1.8.0 - httpdate-1.0.3 - humantime-2.1.0 - hyper-0.14.28 - hyper-tls-0.5.0 - idna-0.4.0 - indexmap-2.2.1 - ipnet-2.8.0 - is-terminal-0.4.9 - itoa-1.0.9 - jetscii-0.5.3 - js-sys-0.3.64 - lazy_static-1.4.0 - libc-0.2.150 - libm-0.2.7 - linux-raw-sys-0.4.11 - log-0.4.20 - memchr-2.6.3 - mime-0.3.17 - miniz_oxide-0.7.1 - mio-0.8.11 - native-tls-0.2.11 - num-bigint-dig-0.8.4 - num-integer-0.1.45 - num-iter-0.1.43 - num-traits-0.2.16 - object-0.32.1 - once_cell-1.18.0 - openssl-0.10.60 - openssl-macros-0.1.1 - openssl-probe-0.1.5 - openssl-sys-0.9.96 - pem-rfc7468-0.7.0 - percent-encoding-2.3.0 - pin-project-lite-0.2.13 - pin-utils-0.1.0 - pkcs1-0.7.5 - pkcs8-0.10.2 - pkg-config-0.3.27 - ppv-lite86-0.2.17 - proc-macro2-1.0.66 - protobuf-3.2.0 - protobuf-support-3.2.0 - quote-1.0.33 - rand-0.8.5 - rand_chacha-0.3.1 - rand_core-0.6.4 - redox_syscall-0.4.1 - regex-1.9.5 - regex-automata-0.3.8 - regex-syntax-0.7.5 - reqwest-0.11.26 - rsa-0.9.2 - rustc-demangle-0.1.23 - rustix-0.38.23 - rustls-pemfile-1.0.4 - ryu-1.0.15 - schannel-0.1.22 - security-framework-2.9.2 - security-framework-sys-2.9.1 - serde-1.0.188 - serde_derive-1.0.188 - serde_json-1.0.105 - serde_urlencoded-0.7.1 - sha1-0.10.6 - sha2-0.10.8 - signature-2.1.0 - slab-0.4.9 - smallvec-1.11.0 - socket2-0.5.3 - spin-0.5.2 - spki-0.7.2 - subtle-2.5.0 - syn-1.0.109 - syn-2.0.31 - sync_wrapper-0.1.2 - system-configuration-0.5.1 - system-configuration-sys-0.5.0 - tempfile-3.8.1 - termcolor-1.2.0 - thiserror-1.0.48 - thiserror-impl-1.0.48 - tinyvec-1.6.0 - tinyvec_macros-0.1.1 - tokio-1.32.0 - tokio-native-tls-0.3.1 - tokio-util-0.7.8 - tower-service-0.3.2 - tracing-0.1.37 - tracing-core-0.1.31 - try-lock-0.2.4 - typenum-1.16.0 - unicode-bidi-0.3.13 - unicode-ident-1.0.11 - unicode-normalization-0.1.22 - url-2.4.1 - uuid-1.8.0 - vcpkg-0.2.15 - version_check-0.9.4 - want-0.3.1 - wasi-0.11.0+wasi-snapshot-preview1 - wasm-bindgen-0.2.87 - wasm-bindgen-backend-0.2.87 - wasm-bindgen-futures-0.4.37 - wasm-bindgen-macro-0.2.87 - wasm-bindgen-macro-support-0.2.87 - wasm-bindgen-shared-0.2.87 - web-sys-0.3.64 - winapi-0.3.9 - winapi-i686-pc-windows-gnu-0.4.0 - winapi-util-0.1.5 - winapi-x86_64-pc-windows-gnu-0.4.0 - windows-sys-0.48.0 - windows-targets-0.48.5 - windows_aarch64_gnullvm-0.48.5 - windows_aarch64_msvc-0.48.5 - windows_i686_gnu-0.48.5 - windows_i686_msvc-0.48.5 - windows_x86_64_gnu-0.48.5 - windows_x86_64_gnullvm-0.48.5 - windows_x86_64_msvc-0.48.5 - winreg-0.50.0 - xmlparser-0.13.5 - zeroize-1.6.0 + addr2line@0.21.0 + adler@1.0.2 + aho-corasick@1.0.5 + anyhow@1.0.75 + argh@0.1.12 + argh_derive@0.1.12 + argh_shared@0.1.12 + autocfg@1.1.0 + backtrace@0.3.69 + base64@0.21.3 + base64ct@1.6.0 + bitflags@1.3.2 + bitflags@2.4.0 + block-buffer@0.10.4 + bstr@1.6.2 + bumpalo@3.13.0 + byteorder@1.4.3 + bytes@1.4.0 + bzip2@0.4.4 + bzip2-sys@0.1.11+1.0.8 + cc@1.0.83 + cfg-if@1.0.0 + const-oid@0.9.5 + core-foundation@0.9.3 + core-foundation-sys@0.8.4 + cpufeatures@0.2.9 + crypto-common@0.1.6 + ct-codecs@1.1.1 + der@0.7.8 + digest@0.10.7 + encoding_rs@0.8.33 + env_logger@0.10.0 + equivalent@1.0.1 + errno@0.3.3 + errno-dragonfly@0.1.2 + fastrand@2.0.0 + fnv@1.0.7 + foreign-types@0.3.2 + foreign-types-shared@0.1.1 + form_urlencoded@1.2.0 + futures-channel@0.3.28 + futures-core@0.3.28 + futures-io@0.3.29 + futures-sink@0.3.28 + futures-task@0.3.28 + futures-util@0.3.28 + generic-array@0.14.7 + getrandom@0.2.10 + gimli@0.28.0 + globset@0.4.13 + h2@0.3.26 + hashbrown@0.14.3 + hermit-abi@0.3.2 + http@0.2.9 + http-body@0.4.5 + httparse@1.8.0 + httpdate@1.0.3 + humantime@2.1.0 + hyper@0.14.28 + hyper-tls@0.5.0 + idna@0.4.0 + indexmap@2.2.1 + ipnet@2.8.0 + is-terminal@0.4.9 + itoa@1.0.9 + jetscii@0.5.3 + js-sys@0.3.64 + lazy_static@1.4.0 + libc@0.2.150 + libm@0.2.7 + linux-raw-sys@0.4.11 + log@0.4.20 + memchr@2.6.3 + mime@0.3.17 + miniz_oxide@0.7.1 + mio@0.8.11 + native-tls@0.2.11 + num-bigint-dig@0.8.4 + num-integer@0.1.45 + num-iter@0.1.43 + num-traits@0.2.16 + object@0.32.1 + once_cell@1.18.0 + openssl@0.10.60 + openssl-macros@0.1.1 + openssl-probe@0.1.5 + openssl-sys@0.9.96 + pem-rfc7468@0.7.0 + percent-encoding@2.3.0 + pin-project-lite@0.2.13 + pin-utils@0.1.0 + pkcs1@0.7.5 + pkcs8@0.10.2 + pkg-config@0.3.27 + ppv-lite86@0.2.17 + proc-macro2@1.0.66 + protobuf@3.2.0 + protobuf-support@3.2.0 + quote@1.0.33 + rand@0.8.5 + rand_chacha@0.3.1 + rand_core@0.6.4 + redox_syscall@0.4.1 + regex@1.9.5 + regex-automata@0.3.8 + regex-syntax@0.7.5 + reqwest@0.11.26 + rsa@0.9.2 + rustc-demangle@0.1.23 + rustix@0.38.23 + rustls-pemfile@1.0.4 + ryu@1.0.15 + schannel@0.1.22 + security-framework@2.9.2 + security-framework-sys@2.9.1 + serde@1.0.188 + serde_derive@1.0.188 + serde_json@1.0.105 + serde_urlencoded@0.7.1 + sha1@0.10.6 + sha2@0.10.8 + signature@2.1.0 + slab@0.4.9 + smallvec@1.11.0 + socket2@0.5.3 + spin@0.5.2 + spki@0.7.2 + subtle@2.5.0 + syn@1.0.109 + syn@2.0.31 + sync_wrapper@0.1.2 + system-configuration@0.5.1 + system-configuration-sys@0.5.0 + tempfile@3.8.1 + termcolor@1.2.0 + thiserror@1.0.48 + thiserror-impl@1.0.48 + tinyvec@1.6.0 + tinyvec_macros@0.1.1 + tokio@1.32.0 + tokio-native-tls@0.3.1 + tokio-util@0.7.8 + tower-service@0.3.2 + tracing@0.1.37 + tracing-core@0.1.31 + try-lock@0.2.4 + typenum@1.16.0 + unicode-bidi@0.3.13 + unicode-ident@1.0.11 + unicode-normalization@0.1.22 + url@2.4.1 + uuid@1.8.0 + vcpkg@0.2.15 + version_check@0.9.4 + want@0.3.1 + wasi@0.11.0+wasi-snapshot-preview1 + wasm-bindgen@0.2.87 + wasm-bindgen-backend@0.2.87 + wasm-bindgen-futures@0.4.37 + wasm-bindgen-macro@0.2.87 + wasm-bindgen-macro-support@0.2.87 + wasm-bindgen-shared@0.2.87 + web-sys@0.3.64 + winapi@0.3.9 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-util@0.1.5 + winapi-x86_64-pc-windows-gnu@0.4.0 + windows-sys@0.48.0 + windows-targets@0.48.5 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_msvc@0.48.5 + windows_i686_gnu@0.48.5 + windows_i686_msvc@0.48.5 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_msvc@0.48.5 + winreg@0.50.0 + xmlparser@0.13.5 + zeroize@1.6.0 " -inherit coreos-cargo cros-workon systemd +inherit cargo cros-workon DESCRIPTION="Prototype Omaha Rust implementation" HOMEPAGE="https://github.com/flatcar/ue-rs" -SRC_URI="$(cargo_crate_uris)" +SRC_URI="${CARGO_CRATE_URIS}" LICENSE="Apache-2.0" SLOT="0" IUSE="test" +RESTRICT="!test? ( test )" DEPEND="dev-libs/openssl:0=" RDEPEND=" ${DEPEND} " -BDEPEND="" src_unpack() { - cros-workon_src_unpack "$@" - coreos-cargo_src_unpack "$@" + cros-workon_src_unpack + cargo_src_unpack } src_compile() { - cargo_src_compile $(usex test '' '--bin download_sysext') "$@" + cargo_src_compile $(usex test '' '--bin download_sysext') } src_install() { - cargo_src_install $(usex test '' '--bin download_sysext') "$@" + cargo_src_install $(usex test '' '--bin download_sysext') } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/metadata.xml b/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/metadata.xml index 097975e3ad..fa8ff64732 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/metadata.xml +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/metadata.xml @@ -1,4 +1,7 @@ + + flatcar/update-ssh-keys + diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-9999.ebuild index 6408833068..3643334865 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-9999.ebuild @@ -14,65 +14,63 @@ else KEYWORDS="amd64 arm64" fi -PATCHES=( -) - # generated by cargo ebuild CRATES=" -anstream-0.6.4 -anstyle-1.0.4 -anstyle-parse-0.2.2 -anstyle-query-1.0.0 -anstyle-wincon-3.0.1 -base64-0.21.5 -block-buffer-0.10.4 -byteorder-1.5.0 -cfg-if-1.0.0 -clap-4.4.6 -clap_builder-4.4.6 -clap_lex-0.5.1 -colorchoice-1.0.0 -cpufeatures-0.2.10 -crypto-common-0.1.6 -digest-0.10.7 -error-chain-0.12.4 -fs2-0.4.3 -generic-array-0.14.7 -libc-0.2.149 -log-0.4.20 -md-5-0.10.6 -openssh-keys-0.6.2 -proc-macro2-1.0.69 -quote-1.0.33 -sha2-0.10.8 -strsim-0.10.0 -syn-2.0.38 -thiserror-1.0.50 -thiserror-impl-1.0.50 -typenum-1.17.0 -unicode-ident-1.0.12 -utf8parse-0.2.1 -uzers-0.11.3 -version_check-0.9.4 -winapi-0.3.9 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-x86_64-pc-windows-gnu-0.4.0 -windows-sys-0.48.0 -windows-targets-0.48.5 -windows_aarch64_gnullvm-0.48.5 -windows_aarch64_msvc-0.48.5 -windows_i686_gnu-0.48.5 -windows_i686_msvc-0.48.5 -windows_x86_64_gnu-0.48.5 -windows_x86_64_gnullvm-0.48.5 -windows_x86_64_msvc-0.48.5 + anstream@0.6.4 + anstyle@1.0.4 + anstyle-parse@0.2.2 + anstyle-query@1.0.0 + anstyle-wincon@3.0.1 + base64@0.21.5 + block-buffer@0.10.4 + byteorder@1.5.0 + cfg-if@1.0.0 + clap@4.4.6 + clap_builder@4.4.6 + clap_lex@0.5.1 + colorchoice@1.0.0 + cpufeatures@0.2.10 + crypto-common@0.1.6 + digest@0.10.7 + error-chain@0.12.4 + fs2@0.4.3 + generic-array@0.14.7 + libc@0.2.149 + log@0.4.20 + md-5@0.10.6 + openssh-keys@0.6.2 + proc-macro2@1.0.69 + quote@1.0.33 + sha2@0.10.8 + strsim@0.10.0 + syn@2.0.38 + thiserror@1.0.50 + thiserror-impl@1.0.50 + typenum@1.17.0 + unicode-ident@1.0.12 + utf8parse@0.2.1 + uzers@0.11.3 + version_check@0.9.4 + winapi@0.3.9 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-x86_64-pc-windows-gnu@0.4.0 + windows-sys@0.48.0 + windows-targets@0.48.5 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_msvc@0.48.5 + windows_i686_gnu@0.48.5 + windows_i686_msvc@0.48.5 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_msvc@0.48.5 " -inherit coreos-cargo cros-workon +inherit cargo cros-workon DESCRIPTION="Utility for managing OpenSSH authorized public keys" HOMEPAGE="https://github.com/flatcar/update-ssh-keys" -SRC_URI="https://mirror.release.flatcar-linux.net/coreos/openssh-keys-0.5.1-alpha.0.crate -> openssh-keys-0.5.1-alpha.0.crate $(cargo_crate_uris ${CRATES})" +SRC_URI="https://mirror.release.flatcar-linux.net/coreos/openssh-keys-0.5.1-alpha.0.crate + ${CARGO_CRATE_URIS}" LICENSE="Apache-2.0" SLOT="0" @@ -82,6 +80,6 @@ SLOT="0" RDEPEND="!=glibc-2.30. - # The crates's sources are put in ECARGO_HOME so we need to change - # directories before applying the patch. - local cwd="$(pwd)" - cd "${ECARGO_HOME}" - eapply -p0 "${FILESDIR}/0001-gettid-glibc-2.30.patch" - eapply_user - cd "$cwd" -} - -src_compile() { - export CARGO_HOME="${ECARGO_HOME}" - cargo build -v -j $(makeopts_jobs) $(usex debug "" --release) -p ${PN} \ - || die "cargo build failed" -} - -src_install() { - cargo install -j $(makeopts_jobs) --root="${D}/usr" $(usex debug --debug "") --path fero-client \ - || die "cargo install failed" - rm -f "${D}/usr/.crates.toml" -} - -# sed -n 's/^"checksum \([^ ]*\) \([^ ]*\) .*/\1-\2/p' Cargo.lock -CRATES=" -aho-corasick-0.6.4 -ansi_term-0.11.0 -arrayref-0.3.4 -atty-0.2.10 -backtrace-0.3.6 -backtrace-sys-0.1.16 -base64-0.8.0 -bindgen-0.32.3 -bit-vec-0.4.4 -bitflags-1.0.3 -block-buffer-0.3.3 -byte-tools-0.2.0 -byteorder-1.2.2 -bzip2-0.3.2 -bzip2-sys-0.1.6 -cc-1.0.15 -cexpr-0.2.3 -cfg-if-0.1.2 -chrono-0.4.2 -clang-sys-0.21.2 -clap-2.31.2 -cmake-0.1.30 -conv-0.3.3 -cstr-argument-0.0.2 -custom_derive-0.1.7 -diesel-1.2.2 -diesel-derive-enum-0.4.4 -diesel_derives-1.2.0 -diesel_migrations-1.2.0 -digest-0.7.2 -env_logger-0.4.3 -error-chain-0.11.0 -failure-0.1.1 -failure_derive-0.1.1 -fake-simd-0.1.2 -flate2-1.0.1 -fuchsia-zircon-0.3.3 -fuchsia-zircon-sys-0.3.3 -futures-0.1.21 -gag-0.1.10 -generic-array-0.9.0 -glob-0.2.11 -gpg-error-0.3.2 -gpgme-0.7.2 -gpgme-sys-0.7.0 -grpcio-0.2.3 -grpcio-compiler-0.2.0 -grpcio-sys-0.2.3 -heck-0.3.0 -kernel32-sys-0.2.2 -lazy_static-1.0.0 -libc-0.2.40 -libgpg-error-sys-0.3.2 -libloading-0.4.3 -libsqlite3-sys-0.9.1 -libyubihsm-0.2.1 -log-0.3.9 -log-0.4.1 -loggerv-0.7.1 -md-5-0.7.0 -memchr-1.0.2 -memchr-2.0.1 -migrations_internals-1.2.0 -migrations_macros-1.2.0 -miniz-sys-0.1.10 -nom-3.2.1 -num-0.1.42 -num-bigint-0.1.43 -num-complex-0.1.43 -num-integer-0.1.36 -num-iter-0.1.35 -num-rational-0.1.42 -num-traits-0.2.2 -peeking_take_while-0.1.2 -pem-0.5.0 -pkg-config-0.3.11 -pretty-good-0.2.2 -proc-macro2-0.2.3 -proc-macro2-0.4.6 -protobuf-1.5.1 -protoc-1.5.1 -quote-0.3.15 -quote-0.4.2 -quote-0.6.3 -rand-0.4.2 -redox_syscall-0.1.37 -redox_termios-0.1.1 -regex-0.2.11 -regex-syntax-0.5.6 -remove_dir_all-0.5.1 -ripemd160-0.7.0 -rpassword-2.0.0 -rustc-demangle-0.1.7 -rustc-serialize-0.3.24 -safemem-0.2.0 -secstr-0.3.0 -semver-0.9.0 -semver-parser-0.7.0 -sha-1-0.7.0 -sha2-0.7.1 -smallvec-0.6.5 -strsim-0.7.0 -structopt-0.2.10 -structopt-derive-0.2.10 -syn-0.11.11 -syn-0.12.15 -syn-0.14.4 -synom-0.11.3 -synstructure-0.6.1 -tempdir-0.3.7 -tempfile-3.0.2 -termion-1.5.1 -textwrap-0.9.0 -thread_local-0.3.5 -time-0.1.39 -typenum-1.10.0 -ucd-util-0.1.1 -unicode-segmentation-1.2.1 -unicode-width-0.1.4 -unicode-xid-0.0.4 -unicode-xid-0.1.0 -unreachable-1.0.0 -utf8-ranges-1.0.0 -vcpkg-0.2.3 -vec_map-0.8.0 -void-1.0.2 -which-1.0.5 -winapi-0.2.8 -winapi-0.3.4 -winapi-build-0.1.1 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-x86_64-pc-windows-gnu-0.4.0 -yasna-0.1.3 -" - -SRC_URI="$(cargo_crate_uris ${CRATES})" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/files/0001-gettid-glibc-2.30.patch b/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/files/0001-gettid-glibc-2.30.patch deleted file mode 100644 index 8174587758..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/files/0001-gettid-glibc-2.30.patch +++ /dev/null @@ -1,34 +0,0 @@ -grpcio-sys-0.2.3 defines its own gettid() function which conflicts with gettid() -shipped with glibc-2.30 and above. So we only define that function if -glibc < 2.30. - -Fixes: -grpcio-sys-0.2.3/grpc/src/core/lib/support/log_linux.c:42:13: error: conflicting types for 'gettid' - 42 | static long gettid(void) { return syscall(__NR_gettid); } - | ^~~~~~ - In file included from /usr/include/unistd.h:1187, - from grpcio-sys-0.2.3/grpc/src/core/lib/support/log_linux.c:40: - /usr/include/bits/unistd_ext.h:34:16: note: previous declaration of 'gettid' was here - 34 | extern __pid_t gettid (void) __THROW; - | ^~~~~~ - ---- gentoo/grpcio-sys-0.2.3/grpc/src/core/lib/support/log_linux.c 2020-11-23 18:29:18.053038547 +0000 -+++ gentoo/grpcio-sys-0.2.3/grpc/src/core/lib/support/log_linux.c 2020-11-23 18:32:39.502926134 +0000 -@@ -39,7 +39,17 @@ - #include - #include - -+/* glibc-2.30 and above ship gettid */ -+#define NEED_GETTID 1 -+#if defined(__GLIBC_PREREQ) -+# if __GLIBC_PREREQ(2,30) -+# define NEED_GETTID 0 -+# endif -+#endif -+ -+#if NEED_GETTID - static long gettid(void) { return syscall(__NR_gettid); } -+#endif - - void gpr_log(const char *file, int line, gpr_log_severity severity, - const char *format, ...) { diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r48.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r49.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r48.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r49.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild index 3fa37ea36a..de9f637cca 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild @@ -26,7 +26,6 @@ DEPEND=" app-text/mandoc coreos-base/hard-host-depends coreos-base/coreos-sb-keys - coreos-devel/fero-client dev-libs/gobject-introspection dev-python/setuptools dev-python/six diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-apps/zram-generator b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-apps/zram-generator deleted file mode 100644 index 2ca892c2bf..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-apps/zram-generator +++ /dev/null @@ -1,8 +0,0 @@ -cros_pre_src_unpack_coreos_unpack() { - local _COREOS_CARGO_SKIP_INHERIT=1 - source "${CROS_ADDONS_TREE}"/../eclass/coreos-cargo.eclass - src_unpack() { - einfo "Running coreos-cargo_src_unpack" - coreos-cargo_src_unpack - } -} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-block/thin-provisioning-tools b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-block/thin-provisioning-tools deleted file mode 100644 index e2b17a5677..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-block/thin-provisioning-tools +++ /dev/null @@ -1,16 +0,0 @@ -cros_pre_src_unpack_coreos_unpack() { - local _COREOS_CARGO_SKIP_INHERIT=1 - source "${CROS_ADDONS_TREE}"/../eclass/coreos-cargo.eclass - src_unpack() { - einfo "Running coreos-cargo_src_unpack" - coreos-cargo_src_unpack - } -} - -cros_pre_src_install_rust_cross() { - pushd "${S}" - local rust_target="$(ls -d target/*-unknown-linux-gnu)" - rust_target="${rust_target#target/}" - ln -f target/{"${rust_target}",}/"$(usex debug debug release)/pdata_tools" || die - popd -} diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-cargo.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-cargo.eclass deleted file mode 100644 index 405696dc22..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-cargo.eclass +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 2017-2018 CoreOS, Inc. -# Distributed under the terms of the GNU General Public License v2 - -# @ECLASS: coreos-cargo.eclass -# @MAINTAINER: -# team-os@coreos.com -# @AUTHOR: -# David Michael -# @BLURB: cargo cross-compilation support for CoreOS/ChromeOS targets - -if [[ -z ${_COREOS_CARGO_ECLASS} ]]; then -_COREOS_CARGO_ECLASS=1 - -# XXX: Don't require host dependencies to also be in the sysroot. -if [[ -z ${_COREOS_CARGO_SKIP_INHERIT} ]]; then - CATEGORY=dev-util PN=cargo inherit cargo - inherit toolchain-funcs - - EXPORT_FUNCTIONS src_unpack -fi - -# @FUNCTION: coreos-cargo_src_unpack -# @DESCRIPTION: -# This amends the src_unpack from cargo.eclass to add support for Rust -# cross-compiling to the ChromeOS targets. It maps the host triplet to -# one built into rustc and uses the board root as its sysroot. -coreos-cargo_src_unpack() { - debug-print-function ${FUNCNAME} "$@" - cargo_src_unpack "$@" - - [[ ${CBUILD:-${CHOST}} != ${CHOST} ]] || return 0 - - # Map the SDK host triplet to one that is built into rustc. - function rust_builtin_target() case "$1" in - aarch64-*-linux-gnu) echo aarch64-unknown-linux-gnu ;; - x86_64-*-linux-gnu) echo x86_64-unknown-linux-gnu ;; - *) die "Unknown host triplet: $1" ;; - esac - - # Set the gcc-rs flags for cross-compiling. - export TARGET_CFLAGS="${CFLAGS}" - export TARGET_CXXFLAGS="${CXXFLAGS}" - - # Wrap ar for gcc-rs to work around rust-lang/cargo#4456. - export TARGET_AR="${T}/rustproof-ar" - cat <<- EOF > "${TARGET_AR}" && chmod 0755 "${TARGET_AR}" - #!/bin/sh - unset LD_LIBRARY_PATH - exec $(tc-getAR) "\$@" - EOF - - # Wrap gcc for gcc-rs to work around rust-lang/cargo#4456. - export TARGET_CC="${T}/rustproof-cc" - cat <<- EOF > "${TARGET_CC}" && chmod 0755 "${TARGET_CC}" - #!/bin/sh - unset LD_LIBRARY_PATH - exec $(tc-getCC) "\$@" - EOF - - # Wrap g++ for gcc-rs to work around rust-lang/cargo#4456. - export TARGET_CXX="${T}/rustproof-cxx" - cat <<- EOF > "${TARGET_CXX}" && chmod 0755 "${TARGET_CXX}" - #!/bin/sh - unset LD_LIBRARY_PATH - exec $(tc-getCXX) "\$@" - EOF - - # Create a compiler wrapper that uses a sysroot for cross-compiling. - export RUSTC_WRAPPER="${T}/wrustc" - cat <<- 'EOF' > "${RUSTC_WRAPPER}" && chmod 0755 "${RUSTC_WRAPPER}" - #!/bin/bash -e - rustc=${1:?Missing rustc command} - shift - xflags=() - # rustlib is part of host rustc now, so no: [ "x$*" = "x${*#--target}" ] || xflags=( --sysroot="${ROOT:-/}usr" ) - exec "${rustc}" "${xflags[@]}" "$@" - EOF - - # Compile for the built-in target, using the SDK cross-tools. - export RUST_TARGET=$(rust_builtin_target "${CHOST}") - local -a config_lines - local build_amended=0 - local target_rust_target_amended=0 - local REPLY - readonly b_header='[build]' - readonly t_header="[target.${RUST_TARGET}]" - readonly target_line="target = \"${RUST_TARGET}\"" - readonly ar_line="ar = \"${TARGET_AR}\"" - readonly linker_line="linker = \"${TARGET_CC}\"" - while read -r; do - config_lines+=("${REPLY}") - case "${REPLY}" in - "${b_header}") - config_lines+=("${target_line}") - build_amended=1 - ;; - "${t_header}") - config_lines+=("${ar_line}") - config_lines+=("${linker_line}") - target_rust_target_amended=1 - ;; - esac - done <"${ECARGO_HOME}/config" - if [[ "${build_amended}" -eq 0 ]]; then - config_lines+=('' "${b_header}" "${target_line}") - fi - if [[ "${target_rust_target_amended}" -eq 0 ]]; then - config_lines+=('' "${t_header}" "${ar_line}" "${linker_line}") - fi - printf '%s\n' "${config_lines[@]}" >"${ECARGO_HOME}/config" -} - -fi diff --git a/sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/Manifest b/sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/Manifest index 68a2265a90..131bc511f6 100644 --- a/sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/Manifest @@ -1,2 +1,6 @@ -DIST aardvark-dns-v1.10.0-vendor.tar.gz 6283889 BLAKE2B cb69144eabf876e418667782171273541bbc416b456193780b4d7f1d22ad03e18f06ec0d6b1e51e21eab912317bd61dd73266d717fa97a81b4314a3c7d14776a SHA512 68d0106b71f42ba789810020d62911d880debf90a35a086aabfd614403985025dc0c5934087a98943b53f6dfd8ede4add99465cec1ae9a098ff1de1082e1ef9c DIST aardvark-dns-1.10.0.crate 51028 BLAKE2B 81cdc4eb7eaff7359a1a12657b2bc42603383cf0f80a3a599ce9ce277e15ad83e9d5b36c3de3bef15b3201a1e60d86286ad61469d1d58ba2252b4c0174506ea2 SHA512 3d67f1b3c66aeaf4878c09e5e8fc34717cea6c348e0295bc0521c0c4144433656a3306731c24bb362a0e340e652b036b7544e544cca99b61590547bd7a6ce629 +DIST aardvark-dns-1.11.0.crate 8977859 BLAKE2B d37c2015d1a46308bea214682133d6364fb50c75e840b664c692c6f344d21a093acab5a93dbf1c7dd624a0adc7cdd38cedc35be8dfde0904a7a773b4f620e002 SHA512 0fb9f9cb20e6c548483778a1109ec315c6135dc1afa3736980754847b06a2e988f5704de7b52b2784b20297d370d47d034137d3899f519d2bb5818a5a68234d8 +DIST aardvark-dns-1.9.0.crate 50846 BLAKE2B bae46eae2ec2071b1a1a301f00dc3e3aac0b3a5f1247f1f5be4f2e4b1d9d906fc22c53e5d56967731fcf226a295e8b1d8868dcfae228b05674a5ddecb58a1455 SHA512 1f21b4c40567c0aff967d38ea224884d5c2cb4a85ddffe7bbc5badd237a1195943e4d76f3c65ceb0cab984aa0c2528d8486e78e1e53c5376792477a6a5f426e7 +DIST aardvark-dns-v1.10.0-vendor.tar.gz 6283889 BLAKE2B cb69144eabf876e418667782171273541bbc416b456193780b4d7f1d22ad03e18f06ec0d6b1e51e21eab912317bd61dd73266d717fa97a81b4314a3c7d14776a SHA512 68d0106b71f42ba789810020d62911d880debf90a35a086aabfd614403985025dc0c5934087a98943b53f6dfd8ede4add99465cec1ae9a098ff1de1082e1ef9c +DIST aardvark-dns-v1.11.0-vendor.tar.gz 6829221 BLAKE2B 42f7df29c407dd91e8e9ea1b43fc368b6795ea17169091d3900e59aea12be16174241c996b016e2f5de3e7a592ac3a1fa1c6b817f16ba282ebdda1ab65bfe61a SHA512 e49a6bb410238b90287a75adee481b8fe899ff680be48831c9b3cf36f9985d1fec1ba5bb858a095ffd520c05888651163d65f8b038e7512e975cfa522c0bee56 +DIST aardvark-dns-v1.9.0-vendor.tar.gz 8085548 BLAKE2B 487f69a9c34832d74783b66c565a7c2f67f101527e8a44c215f167e4ea80f069846b25decbb423972cd42cd9ee7717efc21c3d1b0885a7d87c0fbdb9cfb9d26f SHA512 f7174f1c4275991a6a2655046697f32511586f53fb343efa25f995cc07663091a634e8a82395840b022b6b3c8363863cdf8c9b6d4e38984fb841978eef0b1f22 diff --git a/sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/aardvark-dns-1.10.0.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/aardvark-dns-1.10.0.ebuild index e4edd4d987..3f6fb3a7a9 100644 --- a/sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/aardvark-dns-1.10.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/aardvark-dns-1.10.0.ebuild @@ -38,7 +38,7 @@ src_unpack() { src_prepare() { default - sed -i -e "s|m0755 bin|m0755 target/$(usex debug debug release)|g;" Makefile || die + sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die } src_install() { diff --git a/sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/aardvark-dns-1.11.0.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/aardvark-dns-1.11.0.ebuild new file mode 100644 index 0000000000..1e5d082427 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/aardvark-dns-1.11.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +[[ ${PV} == 9999* ]] || CRATES="${PN}@${PV}" +inherit cargo + +DESCRIPTION="A container-focused DNS server" +HOMEPAGE="https://github.com/containers/aardvark-dns" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/containers/aardvark-dns.git" +else + SRC_URI="${CARGO_CRATE_URIS}" + SRC_URI+="https://github.com/containers/aardvark-dns/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" +fi + +# main +LICENSE="Apache-2.0" +# deps +LICENSE+=" 0BSD Apache-2.0-with-LLVM-exceptions MIT Unlicense Unicode-DFS-2016 ZLIB" +SLOT="0" +QA_FLAGS_IGNORED="usr/libexec/podman/${PN}" +QA_PRESTRIPPED="usr/libexec/podman/${PN}" +ECARGO_VENDOR="${WORKDIR}/vendor" + +src_unpack() { + if [[ ${PV} == 9999* ]]; then + git-r3_src_unpack + cargo_live_src_unpack + else + cargo_src_unpack + fi +} + +src_prepare() { + default + sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die +} + +src_install() { + export PREFIX="${EPREFIX}"/usr + default +} diff --git a/sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/aardvark-dns-1.9.0.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/aardvark-dns-1.9.0.ebuild new file mode 100644 index 0000000000..3f6fb3a7a9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/aardvark-dns-1.9.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +[[ ${PV} == 9999* ]] || CRATES="${PN}@${PV}" +inherit cargo + +DESCRIPTION="A container-focused DNS server" +HOMEPAGE="https://github.com/containers/aardvark-dns" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/containers/aardvark-dns.git" +else + SRC_URI="${CARGO_CRATE_URIS}" + SRC_URI+="https://github.com/containers/aardvark-dns/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz" + KEYWORDS="amd64 arm64 ~ppc64 ~riscv" +fi + +# main +LICENSE="Apache-2.0" +# deps +LICENSE+=" 0BSD Apache-2.0-with-LLVM-exceptions MIT Unlicense Unicode-DFS-2016 ZLIB" +SLOT="0" +QA_FLAGS_IGNORED="usr/libexec/podman/${PN}" +QA_PRESTRIPPED="usr/libexec/podman/${PN}" +ECARGO_VENDOR="${WORKDIR}/vendor" + +src_unpack() { + if [[ ${PV} == 9999* ]]; then + git-r3_src_unpack + cargo_live_src_unpack + else + cargo_src_unpack + fi +} + +src_prepare() { + default + sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die +} + +src_install() { + export PREFIX="${EPREFIX}"/usr + default +} diff --git a/sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/aardvark-dns-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/aardvark-dns-9999.ebuild new file mode 100644 index 0000000000..1e5d082427 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-containers/aardvark-dns/aardvark-dns-9999.ebuild @@ -0,0 +1,47 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +[[ ${PV} == 9999* ]] || CRATES="${PN}@${PV}" +inherit cargo + +DESCRIPTION="A container-focused DNS server" +HOMEPAGE="https://github.com/containers/aardvark-dns" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/containers/aardvark-dns.git" +else + SRC_URI="${CARGO_CRATE_URIS}" + SRC_URI+="https://github.com/containers/aardvark-dns/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" +fi + +# main +LICENSE="Apache-2.0" +# deps +LICENSE+=" 0BSD Apache-2.0-with-LLVM-exceptions MIT Unlicense Unicode-DFS-2016 ZLIB" +SLOT="0" +QA_FLAGS_IGNORED="usr/libexec/podman/${PN}" +QA_PRESTRIPPED="usr/libexec/podman/${PN}" +ECARGO_VENDOR="${WORKDIR}/vendor" + +src_unpack() { + if [[ ${PV} == 9999* ]]; then + git-r3_src_unpack + cargo_live_src_unpack + else + cargo_src_unpack + fi +} + +src_prepare() { + default + sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die +} + +src_install() { + export PREFIX="${EPREFIX}"/usr + default +} diff --git a/sdk_container/src/third_party/portage-stable/app-containers/netavark/Manifest b/sdk_container/src/third_party/portage-stable/app-containers/netavark/Manifest index ee3ad3d2e8..e0fe74fbb9 100644 --- a/sdk_container/src/third_party/portage-stable/app-containers/netavark/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-containers/netavark/Manifest @@ -1,2 +1,8 @@ +DIST netavark-1.10.2.crate 154261 BLAKE2B 2da5b12917f5db01d82c47808f403e06d6abbcbad0b777d1871de73d52d25219e3d6f8db48feb862aff8a20ed2184c728e813871aa1acc1d02e3997987a932b6 SHA512 362dd2652b3a9d9d1dec99cd85bc6e74b323d86b79ded742e68472e0b58881a5306d7217218d88e27d5e1c4094f2d67c9cb766d4b4c1ee2185c8b4fcbd299e3d DIST netavark-1.10.3.crate 154416 BLAKE2B a7750304484ae820eb3bb1bc4de8c2ad22d95494fe10471014e0eb999fb7578c5e9c2ab352fe357d964d701206ee7016f87134a62afe0a03cd1b574cae1264ca SHA512 6ed9cd5a69a6eacc4ad839a82680c7b98d453564aadee41eb6ea632223fba7fbdb20f11e4146dc74b6c6d3695ac50624424b3260dbb7769a4100a918e4328dbf +DIST netavark-1.11.0.crate 155698 BLAKE2B df460f6a2e5ce82645dccf6ca487724da2abc6f3f2c90f56d935d691ddd9a4229b785177a4e6360f75aa13ee7cdb29a2794c0b7360ef9d40ea3f946771d3ab73 SHA512 e25b075f98cb2aa55cf0e8d8868aac3b6ff0b390f4f0632d6ee2f431cede144948ed98015576cf8a64fcc1a2c33c454415159951aacbdf0611613da867db9a13 +DIST netavark-1.9.0.crate 139321 BLAKE2B c0c40c5b109544c094bf83ba9c73f829472c7703a72e25ec3dcb9b62b926f404618b2cb143fcc944f2240db074de14e711115d6f51d722125e152eea0ac0a631 SHA512 7a5fb4a856b5815c141ad63abbe0f122d762a411b86189add76cfff99adfdb066e24a7b577683950efdc39f2b7955bbdfb31f2c1c41037702fb732916e8aeebe +DIST netavark-v1.10.2-vendor.tar.gz 16135498 BLAKE2B 607cad9d80067d579adaafdea22b238f5e2f6f92a3c6aed530c8e97bce2f7f869adeabbc7b7d1c04f7c517459112c42b5588aa3ccbf04d5205d2b8212c1e7a42 SHA512 a5079b724d25af60cc094dd5c0bc9e01d503f64bee7ef1c8e616e79793726d848a5e000d951f02d2516f10feea23e30ab637b37ae09da5580f4edb1e783240c0 DIST netavark-v1.10.3-vendor.tar.gz 16135507 BLAKE2B 114519b76d932c5918fd91cea73e8bc9f5aa3a63275f9218e667e400c3e2512e5db29ce806b5e5b509b043c04a3436344a27cf170e203d4360d00247e48b5ca9 SHA512 b8a99f45ba4ebb20414fe052ff08b1e7a7a86994c7dfa2f36d0500d52bcbd2d279aeff19fb0844a65e2375e86da33af735851f038f598771d2dac96ff7e032a5 +DIST netavark-v1.11.0-vendor.tar.gz 17751524 BLAKE2B b466b27674e6944b2de8a684ee3e14f26775b6065f0f1e82987a0c240725c01f88d2138641b768b5e03fce5b26908d0281b1983b8c1844af4999064bf24d8f15 SHA512 d858bddaaf41b284af9ede84a4d3aab5b5935ea83df5261dfa58e2b7d14962dd55983b1a95b2692e323ea40fc2dc4d9b1bdf2aed90644739e6333c794a7915cb +DIST netavark-v1.9.0-vendor.tar.gz 16032862 BLAKE2B 313bcde75f2355dab3fa4fdc82881109924c07408aa352e92b590356cf292cd60ad39d8ef31687935e3fed6f22ec8c3b8f26e6eae21fdf211c29c83b745c8a84 SHA512 a5c11dd47122490579a260b6ac3b1c8f01d1c2881e58dbcc5bece398c7d6ef01f376f8c342df4ef619b135cc92a95c48741c8098413c33ede696c87a9cdcc96c diff --git a/sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-1.10.2.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-1.10.2.ebuild new file mode 100644 index 0000000000..42ba29c833 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-1.10.2.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +[[ ${PV} == 9999* ]] || CRATES="${PN}@${PV}" + +inherit cargo systemd + +DESCRIPTION="A container network stack" +HOMEPAGE="https://github.com/containers/netavark" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/containers/netavark.git" +else + SRC_URI="${CARGO_CRATE_URIS} https://github.com/containers/netavark/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" +fi + +# main +LICENSE="Apache-2.0" +# deps +LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 MIT Unicode-DFS-2016 Unlicense ZLIB" +SLOT="0" +BDEPEND="dev-go/go-md2man + dev-libs/protobuf" + +QA_FLAGS_IGNORED=" + usr/libexec/podman/${PN}" +QA_PRESTRIPPED=" + usr/libexec/podman/${PN}" + +ECARGO_VENDOR="${WORKDIR}/vendor" + +src_unpack() { + if [[ ${PV} == 9999* ]]; then + git-r3_src_unpack + cargo_live_src_unpack + else + cargo_src_unpack + fi +} + +src_prepare() { + default + sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die +} + +src_compile() { + cargo_src_compile + export PREFIX="${EPREFIX}"/usr SYSTEMDDIR="$(systemd_get_systemunitdir)" + emake docs +} + +# Following is needed because we want to use `make install` instead of `cargo install` (exported by cargo.eclass) +src_install() { + default +} diff --git a/sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-1.10.3.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-1.10.3.ebuild index d157e0604a..499417f28d 100644 --- a/sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-1.10.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-1.10.3.ebuild @@ -44,7 +44,7 @@ src_unpack() { src_prepare() { default - sed -i -e "s|m0755 bin|m0755 target/$(usex debug debug release)|g;" Makefile || die + sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die } src_compile() { diff --git a/sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-1.11.0.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-1.11.0.ebuild new file mode 100644 index 0000000000..42ba29c833 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-1.11.0.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +[[ ${PV} == 9999* ]] || CRATES="${PN}@${PV}" + +inherit cargo systemd + +DESCRIPTION="A container network stack" +HOMEPAGE="https://github.com/containers/netavark" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/containers/netavark.git" +else + SRC_URI="${CARGO_CRATE_URIS} https://github.com/containers/netavark/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" +fi + +# main +LICENSE="Apache-2.0" +# deps +LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 MIT Unicode-DFS-2016 Unlicense ZLIB" +SLOT="0" +BDEPEND="dev-go/go-md2man + dev-libs/protobuf" + +QA_FLAGS_IGNORED=" + usr/libexec/podman/${PN}" +QA_PRESTRIPPED=" + usr/libexec/podman/${PN}" + +ECARGO_VENDOR="${WORKDIR}/vendor" + +src_unpack() { + if [[ ${PV} == 9999* ]]; then + git-r3_src_unpack + cargo_live_src_unpack + else + cargo_src_unpack + fi +} + +src_prepare() { + default + sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die +} + +src_compile() { + cargo_src_compile + export PREFIX="${EPREFIX}"/usr SYSTEMDDIR="$(systemd_get_systemunitdir)" + emake docs +} + +# Following is needed because we want to use `make install` instead of `cargo install` (exported by cargo.eclass) +src_install() { + default +} diff --git a/sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-1.9.0.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-1.9.0.ebuild new file mode 100644 index 0000000000..499417f28d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-1.9.0.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +[[ ${PV} == 9999* ]] || CRATES="${PN}@${PV}" + +inherit cargo systemd + +DESCRIPTION="A container network stack" +HOMEPAGE="https://github.com/containers/netavark" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/containers/netavark.git" +else + SRC_URI="${CARGO_CRATE_URIS} https://github.com/containers/netavark/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz" + KEYWORDS="amd64 arm64 ~ppc64 ~riscv" +fi + +# main +LICENSE="Apache-2.0" +# deps +LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 MIT Unicode-DFS-2016 Unlicense ZLIB" +SLOT="0" +BDEPEND="dev-go/go-md2man + dev-libs/protobuf" + +QA_FLAGS_IGNORED=" + usr/libexec/podman/${PN}" +QA_PRESTRIPPED=" + usr/libexec/podman/${PN}" + +ECARGO_VENDOR="${WORKDIR}/vendor" + +src_unpack() { + if [[ ${PV} == 9999* ]]; then + git-r3_src_unpack + cargo_live_src_unpack + else + cargo_src_unpack + fi +} + +src_prepare() { + default + sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die +} + +src_compile() { + cargo_src_compile + export PREFIX="${EPREFIX}"/usr SYSTEMDDIR="$(systemd_get_systemunitdir)" + emake docs +} + +# Following is needed because we want to use `make install` instead of `cargo install` (exported by cargo.eclass) +src_install() { + default +} diff --git a/sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-9999.ebuild new file mode 100644 index 0000000000..42ba29c833 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-containers/netavark/netavark-9999.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +[[ ${PV} == 9999* ]] || CRATES="${PN}@${PV}" + +inherit cargo systemd + +DESCRIPTION="A container network stack" +HOMEPAGE="https://github.com/containers/netavark" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/containers/netavark.git" +else + SRC_URI="${CARGO_CRATE_URIS} https://github.com/containers/netavark/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" +fi + +# main +LICENSE="Apache-2.0" +# deps +LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 MIT Unicode-DFS-2016 Unlicense ZLIB" +SLOT="0" +BDEPEND="dev-go/go-md2man + dev-libs/protobuf" + +QA_FLAGS_IGNORED=" + usr/libexec/podman/${PN}" +QA_PRESTRIPPED=" + usr/libexec/podman/${PN}" + +ECARGO_VENDOR="${WORKDIR}/vendor" + +src_unpack() { + if [[ ${PV} == 9999* ]]; then + git-r3_src_unpack + cargo_live_src_unpack + else + cargo_src_unpack + fi +} + +src_prepare() { + default + sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die +} + +src_compile() { + cargo_src_compile + export PREFIX="${EPREFIX}"/usr SYSTEMDDIR="$(systemd_get_systemunitdir)" + emake docs +} + +# Following is needed because we want to use `make install` instead of `cargo install` (exported by cargo.eclass) +src_install() { + default +} diff --git a/sdk_container/src/third_party/portage-stable/eclass/cargo.eclass b/sdk_container/src/third_party/portage-stable/eclass/cargo.eclass index 0f2da982f6..7db34efb4e 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/cargo.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/cargo.eclass @@ -7,11 +7,11 @@ # @AUTHOR: # Doug Goldstein # Georgy Yakovlev -# @SUPPORTED_EAPIS: 7 8 +# @SUPPORTED_EAPIS: 8 # @BLURB: common functions and variables for cargo builds case ${EAPI} in - 7|8) ;; + 8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -23,10 +23,6 @@ _CARGO_ECLASS=1 RUST_DEPEND="virtual/rust" case ${EAPI} in - 7) - # 1.37 added 'cargo vendor' subcommand and net.offline config knob - RUST_DEPEND=">=virtual/rust-1.37.0" - ;; 8) # 1.39 added --workspace # 1.46 added --target dir @@ -38,7 +34,7 @@ case ${EAPI} in ;; esac -inherit flag-o-matic multiprocessing toolchain-funcs +inherit flag-o-matic multiprocessing rust-toolchain toolchain-funcs [[ ! ${CARGO_OPTIONAL} ]] && BDEPEND="${RUST_DEPEND}" @@ -52,7 +48,7 @@ ECARGO_VENDOR="${ECARGO_HOME}/gentoo" # @PRE_INHERIT # @DESCRIPTION: # Bash string containing all crates that are to be downloaded. -# It is used by cargo_crate_uris. +# It is used by cargo_crate_uris. Typically generated by app-portage/pycargoebuild. # # Ideally, crate names and versions should be separated by a `@` # character. A legacy syntax using hyphen is also supported but it is @@ -323,46 +319,66 @@ _cargo_gen_git_config() { fi } +# @FUNCTION: cargo_target_dir +# @DESCRIPTION: +# Return the directory within target that contains the build, e.g. +# target/aarch64-unknown-linux-gnu/release. +cargo_target_dir() { + local abi + tc-is-cross-compiler && abi=/$(rust_abi) + echo "${CARGO_TARGET_DIR:-target}${abi}/$(usex debug debug release)" +} + # @FUNCTION: cargo_src_unpack # @DESCRIPTION: # Unpacks the package and the cargo registry. cargo_src_unpack() { debug-print-function ${FUNCNAME} "$@" - mkdir -p "${ECARGO_VENDOR}" || die - mkdir -p "${S}" || die + mkdir -p "${ECARGO_VENDOR}" "${S}" || die local archive shasum pkg + local crates=() for archive in ${A}; do case "${archive}" in *.crate) - # when called by pkgdiff-mg, do not unpack crates - [[ ${PKGBUMPING} == ${PVR} ]] && continue - - ebegin "Loading ${archive} into Cargo registry" - tar -xf "${DISTDIR}"/${archive} -C "${ECARGO_VENDOR}/" || die - # generate sha256sum of the crate itself as cargo needs this - shasum=$(sha256sum "${DISTDIR}"/${archive} | cut -d ' ' -f 1) - pkg=$(basename ${archive} .crate) - cat <<- EOF > ${ECARGO_VENDOR}/${pkg}/.cargo-checksum.json - { - "package": "${shasum}", - "files": {} - } - EOF - # if this is our target package we need it in ${WORKDIR} too - # to make ${S} (and handle any revisions too) - if [[ ${P} == ${pkg}* ]]; then - tar -xf "${DISTDIR}"/${archive} -C "${WORKDIR}" || die - fi - eend $? + crates+=( "${archive}" ) ;; *) - unpack ${archive} + unpack "${archive}" ;; esac done + if [[ ${PKGBUMPING} != ${PVR} && ${crates[@]} ]]; then + pushd "${DISTDIR}" >/dev/null || die + + ebegin "Unpacking crates" + printf '%s\0' "${crates[@]}" | + xargs -0 -P "$(makeopts_jobs)" -n 1 -t -- \ + tar -x -C "${ECARGO_VENDOR}" -f + assert + eend $? + + while read -d '' -r shasum archive; do + pkg=${archive%.crate} + cat <<- EOF > ${ECARGO_VENDOR}/${pkg}/.cargo-checksum.json || die + { + "package": "${shasum}", + "files": {} + } + EOF + + # if this is our target package we need it in ${WORKDIR} too + # to make ${S} (and handle any revisions too) + if [[ ${P} == ${pkg}* ]]; then + tar -xf "${archive}" -C "${WORKDIR}" || die + fi + done < <(sha256sum -z "${crates[@]}" || die) + + popd >/dev/null || die + fi + cargo_gen_config } @@ -519,6 +535,21 @@ cargo_src_compile() { filter-lto tc-export AR CC CXX PKG_CONFIG + if tc-is-cross-compiler; then + export CARGO_BUILD_TARGET=$(rust_abi) + local TRIPLE=${CARGO_BUILD_TARGET//-/_} + export CARGO_TARGET_"${TRIPLE^^}"_LINKER=$(tc-getCC) + + # Set vars for cc-rs crate. + tc-export_build_env + export \ + HOST_AR=$(tc-getBUILD_AR) + HOST_CC=$(tc-getBUILD_CC) + HOST_CXX=$(tc-getBUILD_CXX) + HOST_CFLAGS=${BUILD_CFLAGS} + HOST_CXXFLAGS=${BUILD_CXXFLAGS} + fi + set -- cargo build $(usex debug "" --release) ${ECARGO_ARGS[@]} "$@" einfo "${@}" "${@}" || die "cargo build failed" @@ -546,17 +577,6 @@ cargo_src_install() { rm -f "${ED}/usr/.crates.toml" || die rm -f "${ED}/usr/.crates2.json" || die - - # it turned out to be non-standard dir, so get rid of it future EAPI - # and only run for EAPI=7 - # https://bugs.gentoo.org/715890 - case ${EAPI:-0} in - 7) - if [ -d "${S}/man" ]; then - doman "${S}/man" || return 0 - fi - ;; - esac } # @FUNCTION: cargo_src_test diff --git a/sdk_container/src/third_party/portage-stable/eclass/rust-toolchain.eclass b/sdk_container/src/third_party/portage-stable/eclass/rust-toolchain.eclass index 5824a48734..111aece796 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/rust-toolchain.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/rust-toolchain.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: rust-toolchain.eclass @@ -7,17 +7,14 @@ # @SUPPORTED_EAPIS: 8 # @BLURB: helps map gentoo arches to rust ABIs # @DESCRIPTION: -# This eclass contains a src_unpack default phase function, and -# helper functions, to aid in proper rust-ABI handling for various -# gentoo arches. +# This eclass contains helper functions, to aid in proper rust-ABI handling for +# various gentoo arches. case ${EAPI} in 8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -inherit multilib-build - # @ECLASS_VARIABLE: RUST_TOOLCHAIN_BASEURL # @DESCRIPTION: # This variable specifies the base URL used by the @@ -48,7 +45,8 @@ rust_abi() { powerpc64le*) echo powerpc64le-unknown-linux-gnu;; powerpc64*) echo powerpc64-unknown-linux-gnu;; powerpc*) echo powerpc-unknown-linux-gnu;; - riscv64*) echo riscv64gc-unknown-linux-gnu;; + riscv64*gnu) echo riscv64gc-unknown-linux-gnu;; + riscv64*musl) echo riscv64gc-unknown-linux-musl;; s390x*) echo s390x-unknown-linux-gnu;; x86_64*gnu) echo x86_64-unknown-linux-gnu;; x86_64*musl) echo x86_64-unknown-linux-musl;; @@ -56,24 +54,6 @@ rust_abi() { esac } -# @FUNCTION: rust_all_abis -# @DESCRIPTION: -# Outputs a list of all the enabled Rust ABIs -rust_all_abis() { - if use multilib; then - local abi - local ALL_ABIS=() - for abi in $(multilib_get_enabled_abis); do - ALL_ABIS+=( $(rust_abi $(get_abi_CHOST ${abi})) ) - done - local abi_list - IFS=, eval 'abi_list=${ALL_ABIS[*]}' - echo ${abi_list} - else - rust_abi - fi -} - # @FUNCTION: rust_arch_uri # @USAGE: [alt-distfile-basename] # @DESCRIPTION: @@ -127,7 +107,9 @@ rust_all_arch_uris() big-endian? ( $(rust_arch_uri powerpc64-unknown-linux-gnu "$@") ) !big-endian? ( $(rust_arch_uri powerpc64le-unknown-linux-gnu "$@") ) ) - riscv? ( $(rust_arch_uri riscv64gc-unknown-linux-gnu "$@") ) + riscv? ( + elibc_glibc? ( $(rust_arch_uri riscv64gc-unknown-linux-gnu "$@") ) + ) s390? ( $(rust_arch_uri s390x-unknown-linux-gnu "$@") ) " diff --git a/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.0.10.ebuild b/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.0.10.ebuild index df14c87327..6907ab3f3b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.0.10.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.0.10.ebuild @@ -175,7 +175,7 @@ src_install() { emake \ DESTDIR="${D}" \ DATADIR="${ED}/usr/share" \ - PDATA_TOOLS="target/$(usex debug debug release)/pdata_tools" \ + PDATA_TOOLS="$(cargo_target_dir)/pdata_tools" \ install einstalldocs diff --git a/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild index 021c5e9a4b..d617bae938 100644 --- a/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild @@ -175,7 +175,7 @@ src_install() { emake \ DESTDIR="${D}" \ DATADIR="${ED}/usr/share" \ - PDATA_TOOLS="target/$(usex debug debug release)/pdata_tools" \ + PDATA_TOOLS="$(cargo_target_dir)/pdata_tools" \ install einstalldocs diff --git a/signing/sign.sh b/signing/sign.sh deleted file mode 100755 index fe852b7cbf..0000000000 --- a/signing/sign.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -if [[ $# -lt 2 ]]; then - echo "Usage: $0 DATA_DIR SIGS_DIR [SERVER_ADDR [SERVER_PORT]]" - exit 1 -fi - -DATA_DIR="$(readlink -f "$1")" -KEYS_DIR="$(readlink -f "$(dirname "$0")")" -SIGS_DIR="$(readlink -f "$2")" -SERVER_ADDR="${3:-10.7.68.102}" -SERVER_PORT="${4:-50051}" - -echo "=== Verifying update payload... ===" -gpg2 --verify "${DATA_DIR}/flatcar_production_update.bin.bz2.sig" -gpg2 --verify "${DATA_DIR}/flatcar_production_image.vmlinuz.sig" -gpg2 --verify "${DATA_DIR}/flatcar_production_update.zip.sig" -echo "=== Decompressing update payload... ===" -bunzip2 --keep "${DATA_DIR}/flatcar_production_update.bin.bz2" -unzip "${DATA_DIR}/flatcar_production_update.zip" -d "${DATA_DIR}" - -payload_signature_files="" -for i in ${SIGS_DIR}/update.sig.*; do - payload_signature_files=${payload_signature_files}:${i} -done -payload_signature_files="${payload_signature_files:1:${#payload_signature_files}}" - -pushd "${DATA_DIR}" -./core_sign_update \ - --image "${DATA_DIR}/flatcar_production_update.bin" \ - --kernel "${DATA_DIR}/flatcar_production_image.vmlinuz" \ - --output "${DATA_DIR}/flatcar_production_update.gz" \ - --private_keys "${KEYS_DIR}/devel.key.pem+fero:flatcar-image-signing-key" \ - --public_keys "${KEYS_DIR}/devel.pub.pem+${KEYS_DIR}/prod-2.pub.pem" \ - --keys_separator "+" \ - --signing_server_address "$SERVER_ADDR" \ - --signing_server_port "$SERVER_PORT" \ - --user_signatures "${payload_signature_files}" -popd - -echo "=== Signing torcx manifest... ===" -torcx_signature_arg="" -for torcx_signature in ${SIGS_DIR}/torcx_manifest.json.sig.*; do - torcx_signature_arg="${torcx_signature_arg} --signature ${torcx_signature}" -done -torcx_signature_arg="${torcx_signature_arg:1:${#torcx_signature_arg}}" - -fero-client \ - --address $SERVER_ADDR \ - --port $SERVER_PORT \ - sign \ - --file "${DATA_DIR}/torcx_manifest.json" \ - --output "${DATA_DIR}/torcx_manifest.json.sig-fero" \ - --secret-key flatcar-app-signing-key \ - ${torcx_signature_arg} -gpg2 --enarmor \ - --output - \ - "${DATA_DIR}/torcx_manifest.json.sig-fero" \ - | sed 's/ARMORED FILE/SIGNATURE/' \ - > "${DATA_DIR}/torcx_manifest.json.asc" - -echo "=== Torcx manifest signed successfully. ===" -rm -f "${DATA_DIR}/torcx_manifest.json.sig-fero" diff --git a/signing/transfer.sh b/signing/transfer.sh index c308fc48d4..c5a788a0ed 100755 --- a/signing/transfer.sh +++ b/signing/transfer.sh @@ -60,16 +60,6 @@ devsign() { git -C "${SIGDIR}" commit -m "Add sigs from ${USER} for ${channel} ${version}" } -sign() { - local channel="$1" - local version="$2" - local board="$3" - - "$(dirname $0)/sign.sh" \ - "${BASEDIR}/${board}/${version}" \ - "${SIGDIR}/${board}/${version}" -} - upload() { local channel="$1" local version="$2" @@ -181,7 +171,7 @@ roll() { usage() { echo "Usage: $0 {download|upload} [{-a|-b|-s} ]..." >&2 - echo "Usage: $0 {devsign|sign} [{-a|-b|-s} ]..." >&2 + echo "Usage: $0 devsign [{-a|-b|-s} ]..." >&2 echo "Usage: $0 ready [{-a|-b|-s} ]..." >&2 echo "Usage: $0 roll [{-a|-b|-s} ]..." >&2 exit 1 @@ -191,7 +181,7 @@ usage() { CMD="${1:-}" shift ||: case "${CMD}" in - download|devsign|sign) + download|devsign) ;; upload|ready|roll) if [[ -e "${HOME}/.config/roller.conf" ]]; then @@ -210,7 +200,7 @@ esac # Parse fixed args if necessary. case "${CMD}" in - download|devsign|sign|upload) + download|devsign|upload) BASEDIR="${1:-}" shift ||: if [[ -z "${BASEDIR}" ]]; then @@ -219,7 +209,7 @@ case "${CMD}" in ;; esac case "${CMD}" in - devsign|sign) + devsign) SIGDIR="${1:-}" shift ||: if [[ -z "${SIGDIR}" ]]; then @@ -230,7 +220,7 @@ esac # Sync SIGDIR exactly once. case "${CMD}" in - devsign|sign) + devsign) echo "Updating ${SIGDIR}..." git -C "${SIGDIR}" pull -r ;;