From 7f151af41ddf1a25b63939ef6e0cb40b351494b9 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Fri, 14 Jun 2024 15:08:43 +0100 Subject: [PATCH 1/6] Drop cros-debug eclass and USE flag The small eclass was not used anywhere. The USE flag was enabled profile-wide but was only used by the update_engine package. We can just add a regular "debug" USE flag to this package that is enabled by default instead. Signed-off-by: James Le Cuirot --- .../update_engine/update_engine-9999.ebuild | 4 ++-- .../coreos-overlay/eclass/cros-debug.eclass | 15 --------------- .../profiles/coreos/targets/generic/make.defaults | 2 +- 3 files changed, 3 insertions(+), 18 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/eclass/cros-debug.eclass diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild index cc6ed4c042..82ae968ebd 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild @@ -21,7 +21,7 @@ SRC_URI="" LICENSE="BSD" SLOT="0" -IUSE="cros-debug cros_host -delta_generator symlink-usr" +IUSE="cros_host +debug -delta_generator symlink-usr" RDEPEND="!coreos-base/coreos-installer app-arch/bzip2 @@ -62,7 +62,7 @@ src_configure() { append-flags -Wno-unused-function local myconf=( - $(use_enable cros-debug debug) + $(use_enable debug) $(use_enable delta_generator) ) diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/cros-debug.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/cros-debug.eclass deleted file mode 100644 index 04e48f1b9a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/eclass/cros-debug.eclass +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -# -# Original Author: The Chromium OS Authors -# Purpose: Set -DNDEBUG if the cros-debug USE flag is not defined. -# - -inherit flag-o-matic - -IUSE="cros-debug" - -cros-debug-add-NDEBUG() { - use cros-debug || append-flags -DNDEBUG -} diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults index 2dc7a037d2..b2e42a0e2f 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults @@ -1,7 +1,7 @@ # Copyright (c) 2012 The Chromium OS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -USE="cros-debug acpi usb symlink-usr cryptsetup policykit" +USE="acpi usb symlink-usr cryptsetup policykit" USE="${USE} -split-usr -cros_host -expat -cairo -X -man" USE="${USE} -acl -gpm -python" USE="${USE} -fortran -abiword -perl -cups -poppler-data" From 26c2e935c1b1fa05775e61f231bc4bfa6713960b Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Fri, 14 Jun 2024 16:49:03 +0100 Subject: [PATCH 2/6] Drop cros-workon.eclass and replace with git-r3.eclass The cros_workon tool has been replaced with a simpler flatcar_workon tool based around git-r3. Signed-off-by: James Le Cuirot --- bash_completion | 115 +---- build_library/build_image_util.sh | 9 +- build_packages | 16 +- cros_workon | 420 ------------------ flatcar_workon | 172 +++++++ .../app-admin/locksmith/locksmith-9999.ebuild | 8 +- .../app-admin/mayday/mayday-9999.ebuild | 8 +- .../sdnotify-proxy/sdnotify-proxy-9999.ebuild | 12 +- .../app-admin/toolbox/toolbox-9999.ebuild | 8 +- .../updateservicectl-9999.ebuild | 8 +- .../afterburn/afterburn-9999.ebuild | 10 +- .../coreos-cloudinit-9999.ebuild | 8 +- .../coreos-init/coreos-init-9999.ebuild | 8 +- .../emerge-gitclone-9999.ebuild | 9 +- .../nova-agent-watcher-9999.ebuild | 8 +- .../coreos-base/ue-rs/ue-rs-9999.ebuild | 10 +- .../update-ssh-keys-9999.ebuild | 10 +- .../update_engine/update_engine-9999.ebuild | 7 +- .../coreos/config/.bash_profile | 1 - .../coreos-overlay/eclass/cros-workon.eclass | 185 -------- .../profiles/coreos/base/make.defaults | 6 +- .../baselayout/baselayout-9999.ebuild | 8 +- .../sys-apps/ignition/ignition-9999.ebuild | 8 +- .../seismograph/seismograph-9999.ebuild | 7 +- .../bootengine/bootengine-9999.ebuild | 9 +- .../nss-usrfiles/nss-usrfiles-9999.ebuild | 8 +- setup_board | 9 +- update_chroot | 16 +- workon/.gitignore | 1 + 29 files changed, 269 insertions(+), 835 deletions(-) delete mode 100755 cros_workon create mode 100755 flatcar_workon delete mode 100644 sdk_container/src/third_party/coreos-overlay/eclass/cros-workon.eclass create mode 100644 workon/.gitignore diff --git a/bash_completion b/bash_completion index be99b65e68..cbfd8f723c 100644 --- a/bash_completion +++ b/bash_completion @@ -106,124 +106,28 @@ _autotest_complete() { _complete_board_sysroot_flag && return 0 } -# Complete cros_workon's argument. +# Complete flatcar_workon's argument. # # TODO(petkov): We should probably extract the list of commands from -# cros_workon --help, just like we do for flags (see _flag_complete). +# flatcar_workon --help, just like we do for flags (see _flag_complete). # # TODO(petkov): Currently, this assumes that the command is the first # argument. In practice, the command is the first non-flag # argument. I.e., this should be fixed to support something like -# "cros_workon --all list". -_complete_cros_workon_command() { +# "flatcar_workon --all list". +_complete_flatcar_workon_command() { [ ${COMP_CWORD} -eq 1 ] || return 1 local command="${COMP_WORDS[1]}" - COMPREPLY=($(compgen -W "start stop list iterate" -- "$command")) + COMPREPLY=($(compgen -W "start stop list" -- "$command")) return 0 } -# Prints the full path to the cros_workon executable, handling tilde -# expansion for the current user. -_cros_workon_executable() { - local cros_workon="${COMP_WORDS[0]}" - if [[ "$cros_workon" == '~/'* ]]; then - cros_workon="$HOME/${cros_workon#'~/'}" - fi - echo "$cros_workon" -} - -# Lists the workon (or live, if --all is passed in) ebuilds. Lists -# both the full names (e.g., chromeos-base/metrics) as well as just -# the ebuild names (e.g., metrics). -_cros_workon_list() { - local cros_workon=$(_cros_workon_executable) - ${cros_workon} list $1 | sed 's,\(.\+\)/\(.\+\),\1/\2 \2,' -} - -# Completes the current cros_workon argument assuming it's a -# package/ebuild name. -_complete_cros_workon_package() { - [ ${COMP_CWORD} -gt 1 ] || return 1 - local package="${COMP_WORDS[COMP_CWORD]}" - local command="${COMP_WORDS[1]}" - # If "start", complete based on all workon packages. - if [[ ${command} == "start" ]]; then - COMPREPLY=($(compgen -W "$(_cros_workon_list --all)" -- "$package")) - return 0 - fi - # If "stop" or "iterate", complete based on all live packages. - if [[ ${command} == "stop" ]] || [[ ${command} == "iterate" ]]; then - COMPREPLY=($(compgen -W "$(_cros_workon_list)" -- "$package")) - return 0 - fi - return 1 -} - -# Complete cros_workon arguments. -_cros_workon() { +# Complete flatcar_workon arguments. +_flatcar_workon() { COMPREPLY=() _flag_complete && return 0 _complete_board_sysroot_flag && return 0 - _complete_cros_workon_command && return 0 - _complete_cros_workon_package && return 0 - return 0 -} - -_list_repo_commands() { - local repo=${COMP_WORDS[0]} - "$repo" help --all | grep -E '^ ' | sed 's/ \([^ ]\+\) .\+/\1/' -} - -_list_repo_branches() { - local repo=${COMP_WORDS[0]} - "$repo" branches 2>&1 | grep \| | sed 's/[ *][Pp ] *\([^ ]\+\) .*/\1/' -} - -_list_repo_projects() { - local repo=${COMP_WORDS[0]} - "$repo" manifest -o /dev/stdout 2> /dev/null \ - | grep 'project name=' \ - | sed 's/.\+name="\([^"]\+\)".\+/\1/' -} - -# Complete repo's argument. -_complete_repo_command() { - [ ${COMP_CWORD} -eq 1 ] || return 1 - local command=${COMP_WORDS[1]} - COMPREPLY=($(compgen -W "$(_list_repo_commands)" -- "$command")) - return 0 -} - -_complete_repo_arg() { - [ ${COMP_CWORD} -gt 1 ] || return 1 - local command=${COMP_WORDS[1]} - local current=${COMP_WORDS[COMP_CWORD]} - if [[ ${command} == "abandon" ]]; then - if [[ ${COMP_CWORD} -eq 2 ]]; then - COMPREPLY=($(compgen -W "$(_list_repo_branches)" -- "$current")) - else - COMPREPLY=($(compgen -W "$(_list_repo_projects)" -- "$current")) - fi - return 0 - fi - if [[ ${command} == "help" ]]; then - [ ${COMP_CWORD} -eq 2 ] && \ - COMPREPLY=($(compgen -W "$(_list_repo_commands)" -- "$current")) - return 0 - fi - if [[ ${command} == "start" ]]; then - [ ${COMP_CWORD} -gt 2 ] && \ - COMPREPLY=($(compgen -W "$(_list_repo_projects)" -- "$current")) - return 0 - fi - return 1 -} - -# Complete repo arguments. -_complete_repo() { - COMPREPLY=() - _complete_repo_command && return 0 - _complete_repo_arg && return 0 + _complete_flatcar_workon_command && return 0 return 0 } @@ -234,8 +138,7 @@ complete -o bashdefault -o default -F _board_sysroot \ image_to_usb.sh \ mod_image_for_test.sh complete -o bashdefault -o default -o nospace -F _autotest_complete autotest -complete -F _cros_workon cros_workon -complete -F _complete_repo repo +complete -F _flatcar_workon flatcar_workon ### Local Variables: ### mode: shell-script diff --git a/build_library/build_image_util.sh b/build_library/build_image_util.sh index c2863b7bd1..4abef8f0ef 100755 --- a/build_library/build_image_util.sh +++ b/build_library/build_image_util.sh @@ -340,14 +340,13 @@ get_metadata() { if [ -z "${val}" ]; then # The grep invocation gives errors when the ebuild file is not present. # This can happen when the binary packages from ./build_packages are outdated. - val="$(grep "CROS_WORKON_PROJECT=" "${ebuild_path}" | cut -d '"' -f 2)" + val="$(grep "EGIT_REPO_URI=" "${ebuild_path}" | cut -d '"' -f 2)" if [ -n "${val}" ]; then - val="https://github.com/${val}" # All github.com/flatcar projects specify their commit local commit="" - commit="$(grep "CROS_WORKON_COMMIT=" "${ebuild_path}" | cut -d '"' -f 2)" + commit="$(grep "EGIT_COMMIT=" "${ebuild_path}" | cut -d '"' -f 2)" if [ -n "${commit}" ]; then - val="${val}/commit/${commit}" + val="${val%.git}/commit/${commit}" fi fi fi @@ -539,7 +538,7 @@ insert_extra_slsa() { # Add an entry to the image's package.provided package_provided() { - local p profile="${BUILD_DIR}/configroot/etc/portage/profile" + local p profile="${BUILD_DIR}/configroot/etc/portage/profile" for p in "$@"; do info "Writing $p to package.provided and soname.provided" echo "$p" >> "${profile}/package.provided" diff --git a/build_packages b/build_packages index a5d6d52f10..4ca38aec2f 100755 --- a/build_packages +++ b/build_packages @@ -27,7 +27,7 @@ DEFINE_string getbinpkgver "" \ DEFINE_boolean toolchainpkgonly "${FLAGS_FALSE}" \ "Use binary packages only for the board toolchain." DEFINE_boolean workon "${FLAGS_TRUE}" \ - "Automatically rebuild updated cros-workon packages." + "Automatically rebuild updated flatcar-workon packages." DEFINE_boolean fetchonly "${FLAGS_FALSE}" \ "Don't build anything, instead only fetch what is needed." DEFINE_boolean rebuild "${FLAGS_FALSE}" \ @@ -169,16 +169,16 @@ if [[ "${FLAGS_debug_emerge}" -eq "${FLAGS_TRUE}" ]]; then EMERGE_FLAGS+=( --debug ) fi -# Build cros_workon packages when they are changed. -CROS_WORKON_PKGS=() -if [ "${FLAGS_workon}" -eq "${FLAGS_TRUE}" ]; then - CROS_WORKON_PKGS+=( $("${SRC_ROOT}/scripts/cros_workon" list --board=${FLAGS_board}) ) +# Build flatcar_workon packages when they are changed. +WORKON_PKGS=() +if [[ ${FLAGS_workon} -eq "${FLAGS_TRUE}" ]]; then + mapfile -t WORKON_PKGS < <("${SRC_ROOT}"/scripts/flatcar_workon list --board="${FLAGS_board}") fi -if [[ ${#CROS_WORKON_PKGS[@]} -gt 0 ]]; then +if [[ ${#WORKON_PKGS[@]} -gt 0 ]]; then EMERGE_FLAGS+=( - --reinstall-atoms="${CROS_WORKON_PKGS[*]}" - --usepkg-exclude="${CROS_WORKON_PKGS[*]}" + --reinstall-atoms="${WORKON_PKGS[*]}" + --usepkg-exclude="${WORKON_PKGS[*]}" ) fi diff --git a/cros_workon b/cros_workon deleted file mode 100755 index 1d899c94eb..0000000000 --- a/cros_workon +++ /dev/null @@ -1,420 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# This script moves ebuilds between 'stable' and 'live' states. -# By default 'stable' ebuilds point at and build from source at the -# last known good commit. Moving an ebuild to 'live' (via cros_workon start) -# is intended to support development. The current source tip is fetched, -# source modified and built using the unstable 'live' (9999) ebuild. - -. "$(dirname "$0")/common.sh" || exit 1 - -assert_not_root_user - -# Script must be run inside the chroot - -DEFINE_string board "${DEFAULT_BOARD}" \ - "The board to set package keywords for." -DEFINE_boolean host "${FLAGS_FALSE}" \ - "Uses the host instead of board" -DEFINE_string remote "" \ - "For non-workon projects, the git remote to use." -DEFINE_string revision "" \ - "Use to override the manifest defined default revision used for a project" -DEFINE_string command "git status" \ - "The command to be run by forall." -DEFINE_boolean all "${FLAGS_FALSE}" \ - "Apply to all possible packages for the given command" - -FLAGS_HELP="usage: $0 [flags] [|.|--all] -commands: - start: Moves an ebuild to live (intended to support development) - stop: Moves an ebuild to stable (use last known good) - info: Print package name, repo name, and source directory. - list: List of live ebuilds (workon ebuilds if --all) - list-all: List all of the live ebuilds for all setup boards - iterate: For each ebuild, cd to the source dir and run a command" -FLAGS "$@" || { [ "${FLAGS_help}" = "${FLAGS_TRUE}" ] && exit 0; } || exit 1 -eval set -- "${FLAGS_ARGV}" - - -# eat the workon command keywords: start, stop or list. -WORKON_CMD=$1 -shift - -# Board dir config - -# If both are specified, just use host, because board does not -# have to be specified and may come from default, in which case -# there's no way to override. -[ -n "${FLAGS_board}" ] && [ "${FLAGS_host}" = ${FLAGS_TRUE} ] && \ - FLAGS_board="" # kill board -if [ -z "${FLAGS_board}" ] && \ - [ "${FLAGS_host}" = ${FLAGS_FALSE} ] && \ - [ "${WORKON_CMD}" != "list-all" ]; then - flags_help - die "You must specify either --host or --board=" -fi - -if [ -n "${FLAGS_board}" ]; then - BOARD_DIR=/build/"${FLAGS_board}" # --board specified - EQUERYCMD=equery-"${FLAGS_board}" - EBUILDCMD=ebuild-"${FLAGS_board}" - PORTAGEQCMD=portageq-"${FLAGS_board}" - BOARD_STR="${FLAGS_board}" -else - BOARD_DIR="" # --host specified - EQUERYCMD=equery - EBUILDCMD=ebuild - PORTAGEQCMD=portageq - BOARD_STR="host" -fi - -WORKON_DIR=${CHROOT_TRUNK_DIR}/.config/cros_workon -CONFIG_DIR=${BOARD_DIR}/etc/portage -KEYWORDS_DIR=${CONFIG_DIR}/package.keywords -MASK_DIR=${CONFIG_DIR}/package.mask -UNMASK_DIR=${CONFIG_DIR}/package.unmask -WORKON_FILE=${WORKON_DIR}/${FLAGS_board:-host} -MASK_WORKON_FILE=${WORKON_FILE}.mask -KEYWORDS_FILE=${KEYWORDS_DIR}/cros-workon -MASK_FILE=${MASK_DIR}/cros-workon -UNMASK_FILE=${UNMASK_DIR}/cros-workon -CHROME_ATOM=chromeos-base/chromeos-chrome - -mkdir -p "${WORKON_DIR}" || die "mkdir -p ${WORKON_DIR}" -touch "${WORKON_FILE}" "${MASK_WORKON_FILE}" || \ - die "touch ${WORKON_FILE} ${MASK_WORKON_FILE}" -cmds=( - "mkdir -p '${KEYWORDS_DIR}' '${MASK_DIR}' '${UNMASK_DIR}'" - - # Clobber and re-create the WORKON_FILE symlinks every time. This - # is a trivial operation and eliminates all kinds of corner cases - # as well as any possible future renames of WORKON_FILE. - # In particular, chroot is usually built as "amd64-host" but becomes - # just "host" after installation. crosbug.com/23096 - "ln -sf '${WORKON_FILE}' '${KEYWORDS_FILE}'" - "ln -sf '${MASK_WORKON_FILE}' '${MASK_FILE}'" - "ln -sf '${WORKON_FILE}' '${UNMASK_FILE}'" -) -# If the board dir doesn't exist yet, we don't want to create it as -# that'll screw up ./setup_board later on. -if [[ -d ${BOARD_DIR:-/} ]] ; then - sudo_multi "${cmds[@]}" -else - die "${BOARD_STR} has not been setup yet" -fi - - -find_keyword_workon_ebuilds() { - local keyword="${1}" - local overlay - - # NOTE: overlay may be a symlink, and we have to use ${overlay}/ - for overlay in ${PORTDIR_OVERLAY}; do - # only look up ebuilds named 9999 to eliminate duplicates - find ${overlay}/*-* -maxdepth 2 -type f -name '*9999.ebuild' \ - -exec grep -l 'inherit.*cros-workon' {} + 2>/dev/null | \ - xargs grep -l "KEYWORDS=.*${keyword}.*" - done -} - -ebuild_to_package() { - # This changes the absolute path to ebuilds into category/package. - sed -e 's/.*\/\([^/]*\)\/\([^/]*\)\/.*\.ebuild/\1\/\2/' -} - -show_project_ebuild_map() { - local keyword="$1" - - # Column 1: Repo name - # Column 2: Package name - for EBUILD in $(find_keyword_workon_ebuilds ${keyword}); do - ( - eval $(grep -E '^CROS_WORKON' "${EBUILD}") - CP=$(echo "$EBUILD" | ebuild_to_package) - echo "${CROS_WORKON_PROJECT}" "${CP}" - ) - done -} - -show_project_path_map() { - # Column 1: Repo name - # Column 2: Source directory - repo list | awk -F ' : ' '{ print $2, $1 }' -} - -show_workon_ebuilds() { - local keyword="$1" - find_keyword_workon_ebuilds "${keyword}" | ebuild_to_package | sort -u -} - -show_workon_info() { - local atoms="$1" - local keyword="$2" - local sort="sort -k1b,1" - # Column 1: Package name - # Column 2: Repo name - # Column 3: Source directory (if present locally) - join \ - <(echo "${atoms}" | sed -e 's/ /\n/g' | ${sort}) \ - <(join -a 1 -e - -o 1.2,1.1,2.2 \ - <(show_project_ebuild_map "${keyword}" | ${sort}) \ - <(show_project_path_map | ${sort}) \ - | ${sort}) -} - -# Canonicalize package name to category/package. -canonicalize_name () { - local pkgfile - local pkgname - - if grep -qx "=$1-9999" "${WORKON_FILE}" ; then - echo $1 - return 0 - fi - - if ! pkgfile=$(ACCEPT_KEYWORDS="~${ARCH}" ${EQUERYCMD} \ - which --include-masked $1); then - warn "error looking up package $1" 1>&2 - return 1 - fi - - pkgname=$(echo "${pkgfile}" |awk -F '/' '{ print $(NF-2) "/" $(NF-1) }') - - # TODO(rcui): remove special casing of chromeos-chrome here when we make it - # inherit from cros-workon class. Tracked in chromium-os:19259. - if [ "${pkgname}" != "${CHROME_ATOM}" ] && \ - ! grep -q "cros-workon" ${pkgfile}; then - warn "${pkgname} is not a cros-workon package" 1>&2 - return 1 - fi - echo "${pkgname}" - return 0 -} - -# Canonicalize a list of names. -canonicalize_names () { - local atoms=$1 - local names="" - local atom - - for atom in ${atoms}; do - local name=$(canonicalize_name "${atom}") - [ -n "${name}" ] || return 1 - names+=" ${name}" - done - - echo "${names}" -} - -# Locate the package name based on the current directory -locate_package () { - local projectname=$(git config --get remote.cros.projectname || - git config --get remote.cros-internal.projectname) - if [ -z "${projectname}" ]; then - die "No project in git config: Can not cros_workon . here" - fi - local reponame=$(show_project_ebuild_map | - grep "^${projectname} " | cut -d" " -f2) - if [ -z "${reponame}" ]; then - die "No matching package for ${projectname}: Can not cros_workon . here" - else - echo "${reponame}" - fi -} - -# Display ebuilds currently part of the live branch and open for development. -show_live_ebuilds () { - sed -n 's/^=\(.*\)-9999$/\1/p' "${WORKON_FILE}" -} - -# Display ebuilds currently part of the live branch and open for development -# for any board that currently has live ebuilds. -show_all_live_ebuilds () { - local workon_file - for workon_file in ${WORKON_DIR}/*; do - if [[ -s ${workon_file} && ${workon_file} != *.mask ]] ; then - echo -e "${V_BOLD_GREEN}$(basename ${workon_file}):${V_VIDOFF}" - sed -n 's/^=\(.*\)-9999$/ \1/p' "${workon_file}" - echo "" - fi - done -} - -# This is called only for "cros-workon start". We dont handle the -# "stop" case since the local changes are ignored anyway since the -# 9999.ebuild is masked and we dont want to deal with what to do with -# the user's local changes. -regen_manifest_and_sync() { - # Nothing to do unless you are working on the minilayout - local manifest=${CHROOT_TRUNK_DIR}/.repo/manifest.xml - if [ $(basename $(readlink -f ${manifest})) != "minilayout.xml" ]; then - if [ -z "$(git config -f "${CHROOT_TRUNK_DIR}/.repo/manifests.git/config" \ - --get manifest.groups)" ]; then - # Reaching here means that it's a full manifest w/out any groups set- - # literal full manifest. - return - fi - fi - - local need_repo_sync= - local pkgname - for pkgname in $(show_live_ebuilds); do - local pkgpath="$(${EQUERYCMD} which "${pkgname}")" - local pkginfo="$(${EBUILDCMD} "${pkgpath}" info | - grep -v 'pkg_info() is not defined')" - if [ -z "${pkginfo}" ]; then - continue # No package information available - fi - - eval "${pkginfo}" - local trunkdir=$(readlink -m "${CHROOT_TRUNK_DIR}") - - local i=0 - need_repo_sync='yes' - for S in "${CROS_WORKON_SRCDIR[@]}"; do - local srcdir=$(readlink -m "${S}") - local revision="${FLAGS_revision:+--revision=${FLAGS_revision}}" - if [ -z "${FLAGS_remote}" ]; then - loman add --workon "${CROS_WORKON_PROJECT[i]}" ${revision} - else - loman add --remote "${FLAGS_remote}" ${revision} \ - "${CROS_WORKON_PROJECT[i]}" "${srcdir#${trunkdir}/}" - fi - : $(( ++i )) - done - done - if [ -n "${need_repo_sync}" ]; then - echo "Please run \"repo sync\" now." - fi -} - -chrome_to_live () { - # Switch to using repo manifest checkout of chromium src. - # Run chrome_set_ver to set DEPS - - # No chromium/src.git project checked out, meaning user not using - # gerrit_source.xml - if [ ! -d "${CHROOT_TRUNK_DIR}/chromium/src/.git" ]; then - return - fi - - info "Setting Chrome dependencies to the correct revision." - chrome_set_ver - if [ -n "${CHROME_ORIGIN}" ] && [ "${CHROME_ORIGIN}" != GERRIT_SOURCE ]; then - warn "CHROME_ORIGIN is already set to ${CHROME_ORIGIN}" - warn "To use the new GERRIT_SOURCE workflow, please unset it." - warn "Run 'unset CHROME_ORIGIN' to reset to the default source location." - fi -} - -# Move a stable ebuild to the live development catgeory. The ebuild -# src_unpack step fetches the package source for local development. -ebuild_to_live () { - local atoms=$1 - local atoms_success=() - local atom - - for atom in ${atoms}; do - if ! grep -qx "=${atom}-9999" "${WORKON_FILE}" ; then - echo "=${atom}-9999" >> "${WORKON_FILE}" || \ - die "Could not update ${WORKON_FILE} with ${atom}" - echo "<${atom}-9999" >> "${MASK_WORKON_FILE}" || \ - die "Could not update ${MASK_WORKON_FILE} with ${atom}" - atoms_success+=( ${atom} ) - if [ "${atom}" = "${CHROME_ATOM}" ]; then - chrome_to_live - fi - else - warn "Already working on ${atom}" - fi - done - [ ${#atoms_success[@]} -gt 0 ] && regen_manifest_and_sync && \ - info "Started working on '${atoms_success[*]}' for '${BOARD_STR}'" -} - -# Move a live development ebuild back to stable. -ebuild_to_stable () { - local atoms=$1 - local atoms_success=() - local atom - - for atom in ${atoms}; do - if grep -qx "=${atom}-9999" "${WORKON_FILE}" "${MASK_WORKON_FILE}" ; then - sed -i -e "/^=${atom/\//\\/}-9999\$/d" "${WORKON_FILE}" || \ - die "Could not update ${WORKON_FILE} with ${atom}" - sed -i -e "/^<${atom/\//\\/}-9999\$/d" "${MASK_WORKON_FILE}" || \ - die "Could not update ${WORKON_FILE} with ${atom}" - atoms_success+=( ${atom} ) - else - warn "Not working on ${atom}" - fi - done - [ ${#atoms_success[@]} -gt 0 ] && \ - info "Stopped working on '${atoms_success[*]}' for '${BOARD_STR}'" -} - -# Run a command on all or a set of repos. -ebuild_iterate() { - local atoms=$1 - local atom - - for atom in ${atoms}; do - info "Running \"${FLAGS_command}\" on ${atom}" - eval $(${EBUILDCMD} $(${EQUERYCMD} which ${atom}) info) - for S in "${CROS_WORKON_SRCDIR[@]}"; do - (cd "${S}" && bash -c "${FLAGS_command}") - done - done -} - -# Only call portageq when absolutely required, and when we do, only run it -# once -- it's a slow beast and can easily take hundreds of milliseconds :(. -if [[ ${WORKON_CMD} != "list" || ${FLAGS_all} != ${FLAGS_FALSE} ]] ; then - portageq_vars="ARCH PORTDIR_OVERLAY" - unset ${portageq_vars} - eval $(${PORTAGEQCMD} envvar -v ${portageq_vars}) -fi - -# --all makes commands operate on different lists -if [ ${FLAGS_all} = "${FLAGS_TRUE}" ]; then - case ${WORKON_CMD} in - start|info) ATOM_LIST=$(show_workon_ebuilds ${ARCH});; - stop|iterate) ATOM_LIST=$(show_live_ebuilds);; - list) ;; - *) die "--all is invalid for the given command";; - esac -else # not selected --all - case ${WORKON_CMD} in - start|stop|info|iterate) - ATOM_LIST=$@ - if [ -z "${ATOM_LIST}" ]; then - die "${WORKON_CMD}: No packages specified" - fi - if [ "${ATOM_LIST}" = "." ]; then - ATOM_LIST=$(locate_package) - fi - if ! ATOM_LIST=$(canonicalize_names "${ATOM_LIST}"); then - die "Error parsing package list" - fi;; - *) ;; - esac -fi - -case ${WORKON_CMD} in - start) ebuild_to_live "${ATOM_LIST}" ;; - stop) ebuild_to_stable "${ATOM_LIST}" ;; - info) show_workon_info "${ATOM_LIST}" "${ARCH}" ;; - list) [ ${FLAGS_all} = "${FLAGS_FALSE}" ] && show_live_ebuilds || \ - show_workon_ebuilds ${ARCH} ;; - list-all) show_all_live_ebuilds ;; - iterate) ebuild_iterate "${ATOM_LIST}" ;; - *) - flags_help - die "$(basename $0): command '${WORKON_CMD}' not recognized" - ;; -esac diff --git a/flatcar_workon b/flatcar_workon new file mode 100755 index 0000000000..157c89d1c1 --- /dev/null +++ b/flatcar_workon @@ -0,0 +1,172 @@ +#!/bin/bash +# Copyright (c) 2024 The Flatcar Maintainers. +# Distributed under the terms of the GNU General Public License v2 + +. "${0%/*}"/common.sh || exit 1 + +DEFINE_string board "${DEFAULT_BOARD}" \ + "The board to set package keywords for." + +FLAGS_HELP="usage: $0 [flags] +commands: + start: Moves an ebuild to live (intended to support development) + stop: Moves an ebuild to stable (use last known good) + list: List of live ebuilds" +FLAGS "$@" || { [[ ${FLAGS_help} = "${FLAGS_TRUE}" ]] && exit 0; } || exit 1 +eval set -- "${FLAGS_ARGV}" + +set -euo pipefail + +# /etc/portage under either / or /build/. +ETC_PORTAGE=${FLAGS_board+/build/${FLAGS_board}}/etc/portage + +# If the board dir doesn't exist yet, we don't want to create it as that'll +# screw up ./setup_board later on. +[[ -d ${ETC_PORTAGE} ]] || + die "${FLAGS_board} has not been setup yet" + +find_ebuild() { + if [[ -z ${1-} ]]; then + flags_help + exit 1 + fi + + # Exact atom does not need to be given. Resolve to an ebuild with equery. + EBUILD=$(equery which --include-masked "$1") + + [[ -n ${EBUILD} ]] || + die "Package matching \"$1\" could not be found." + + PN=${EBUILD%/*} + PN=${PN##*/} + + CAT=${EBUILD%/*/*} + CAT=${CAT##*/} + + CP=${CAT}/${PN} +} + +add_if_needed() { + grep -Fxq "$1" "$2" 2>/dev/null || sudo tee -a "$2" >/dev/null <<< "$1" +} + +start() { + export PORTAGE_TMPDIR + PORTAGE_TMPDIR=$(mktemp -d) + trap 'rm -rf -- "${PORTAGE_TMPDIR}"' EXIT + + # Load the ebuild environment to reliably pull out variables. + "ebuild${FLAGS_board+-}${FLAGS_board-}" "${EBUILD}" setup + # shellcheck disable=SC1090 + . "${PORTAGE_TMPDIR}"/portage/*/*/temp/environment + + [[ -n ${EGIT_REPO_URI-} ]] || + die "${EBUILD} is not live because it does not set EGIT_REPO_URI." + + [[ -z ${EGIT_COMMIT-} ]] || + die "${EBUILD} is not live because it sets EGIT_COMMIT." + + ### v--- Taken from git-r3.eclass ---v + + if [[ $(declare -p EGIT_REPO_URI) == "declare -a"* ]]; then + repos=( "${EGIT_REPO_URI[@]}" ) + else + # shellcheck disable=SC2206 + repos=( ${EGIT_REPO_URI} ) + fi + + repo_name=${repos[0]#*://*/} + + # strip the trailing slash + repo_name=${repo_name%/} + + # strip common prefixes to make paths more likely to match + # e.g. git://X/Y.git vs https://X/git/Y.git + # (but just one of the prefixes) + case "${repo_name}" in + # gnome.org... who else? + browse/*) repo_name=${repo_name#browse/};; + # cgit can proxy requests to git + cgit/*) repo_name=${repo_name#cgit/};; + # pretty common + git/*) repo_name=${repo_name#git/};; + # gentoo.org + gitroot/*) repo_name=${repo_name#gitroot/};; + # sourceforge + p/*) repo_name=${repo_name#p/};; + # kernel.org + pub/scm/*) repo_name=${repo_name#pub/scm/};; + esac + # ensure a .git suffix, same reason + repo_name=${repo_name%.git}.git + # now replace all the slashes + repo_name=${repo_name//\//_} + + # get the name and do some more processing: + # 1) kill .git suffix, + # 2) underscore (remaining) non-variable characters, + # 3) add preceding underscore if it starts with a digit, + # 4) uppercase. + override_name=${repo_name##*/} + override_name=${override_name%.git} + override_name=${override_name//[^a-zA-Z0-9_]/_} + override_name=${override_name^^} + + ### ^--- Taken from git-r3.eclass ---^ + + GIT_WORKTREE=/home/sdk/trunk/src/scripts/workon/${repo_name} + sudo mkdir -p "${ETC_PORTAGE}"/{env,package.accept_keywords,package.env} + + add_if_needed \ + "EGIT_OVERRIDE_REPO_${override_name}=\"${GIT_WORKTREE}\" # ${CP}" \ + "${ETC_PORTAGE}"/env/workon.conf + + add_if_needed \ + "${CP} workon.conf" \ + "${ETC_PORTAGE}"/package.env/workon.conf + + add_if_needed \ + "${CP} **" \ + "${ETC_PORTAGE}"/package.accept_keywords/workon.conf + + if [[ ! -e ${GIT_WORKTREE} ]]; then + mkdir -p "${GIT_WORKTREE%/*}" + git clone "${repos[0]}" "${GIT_WORKTREE}" + fi + + return 0 +} + +stop() { + [[ -e ${ETC_PORTAGE}/env/workon.conf ]] && + sudo sed -i "/# ${CP//\//\\/}\$/d" "${ETC_PORTAGE}"/env/workon.conf + + [[ -e ${ETC_PORTAGE}/package.accept_keywords/workon.conf ]] && + sudo sed -i "/^${CP//\//\\/} /d" "${ETC_PORTAGE}"/package.accept_keywords/workon.conf + + [[ -e ${ETC_PORTAGE}/package.env/workon.conf ]] && + sudo sed -i "/^${CP//\//\\/} /d" "${ETC_PORTAGE}"/package.env/workon.conf + + return 0 +} + +list() { + [[ -e ${ETC_PORTAGE}/package.env/workon.conf ]] && + sed '/\bworkon\.conf\b/s:\s.*::' "${ETC_PORTAGE}"/package.env/workon.conf + + return 0 +} + +case "$1" in + start) + find_ebuild "${2-}" + start ;; + stop) + find_ebuild "${2-}" + stop ;; + list) + list ;; + *) + flags_help + die "$0: command \"$1\" not recognized" ;; +esac diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild index bf2a9993df..7d14a7af5a 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild @@ -2,16 +2,14 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -CROS_WORKON_PROJECT="flatcar/locksmith" -CROS_WORKON_LOCALNAME="locksmith" -CROS_WORKON_REPO="https://github.com" +EGIT_REPO_URI="https://github.com/flatcar/locksmith.git" COREOS_GO_PACKAGE="github.com/flatcar/locksmith" -inherit cros-workon systemd coreos-go +inherit git-r3 systemd coreos-go if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="439d44f24b24f679d08f309399f6bb2f82614637" # flatcar-master + EGIT_COMMIT="439d44f24b24f679d08f309399f6bb2f82614637" # flatcar-master KEYWORDS="amd64 arm64" fi diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/mayday/mayday-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/mayday/mayday-9999.ebuild index 7aaf9801c4..5165fa61bf 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/mayday/mayday-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/mayday/mayday-9999.ebuild @@ -2,16 +2,14 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -CROS_WORKON_PROJECT="flatcar/mayday" -CROS_WORKON_LOCALNAME="mayday" -CROS_WORKON_REPO="https://github.com" +EGIT_REPO_URI="https://github.com/flatcar/mayday.git" COREOS_GO_PACKAGE="github.com/flatcar/mayday" -inherit coreos-go cros-workon +inherit coreos-go git-r3 if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="9de08c8f9f4360fe52cb3a56a7fb8f4bc4e75dcc" # flatcar-master + EGIT_COMMIT="9de08c8f9f4360fe52cb3a56a7fb8f4bc4e75dcc" # flatcar-master KEYWORDS="amd64 arm64" fi diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/sdnotify-proxy/sdnotify-proxy-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/sdnotify-proxy/sdnotify-proxy-9999.ebuild index 09741cb18f..bcebaaea94 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/sdnotify-proxy/sdnotify-proxy-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/sdnotify-proxy/sdnotify-proxy-9999.ebuild @@ -2,22 +2,20 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -CROS_WORKON_PROJECT="kinvolk/sdnotify-proxy" -CROS_WORKON_LOCALNAME="sdnotify-proxy" -CROS_WORKON_REPO="https://github.com" -COREOS_GO_PACKAGE="github.com/coreos/sdnotify-proxy" +EGIT_REPO_URI="https://github.com/flatcar/sdnotify-proxy.git" +COREOS_GO_PACKAGE="github.com/flatcar/sdnotify-proxy" COREOS_GO_GO111MODULE="off" -inherit coreos-go cros-workon +inherit coreos-go git-r3 if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="0f8ef1aa86c59fc6d54eadaffb248feaccd1018b" # master + EGIT_COMMIT="0f8ef1aa86c59fc6d54eadaffb248feaccd1018b" # master KEYWORDS="amd64 arm64" fi DESCRIPTION="sdnotify-proxy" -HOMEPAGE="https://github.com/coreos/sdnotify-proxy" +HOMEPAGE="https://github.com/flatcar/sdnotify-proxy" SRC_URI="" LICENSE="Apache-2.0" diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-9999.ebuild index c8766101cb..7279599632 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-9999.ebuild @@ -2,18 +2,16 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -CROS_WORKON_PROJECT="flatcar/toolbox" -CROS_WORKON_LOCALNAME="toolbox" -CROS_WORKON_REPO="https://github.com" +EGIT_REPO_URI="https://github.com/flatcar/toolbox.git" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="fce9ba2bbd55e1835af72952bfbb7aed6be75606" # flatcar-master + EGIT_COMMIT="fce9ba2bbd55e1835af72952bfbb7aed6be75606" # flatcar-master KEYWORDS="amd64 arm64" fi -inherit cros-workon +inherit git-r3 DESCRIPTION="toolbox" HOMEPAGE="https://github.com/flatcar/toolbox" diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/updateservicectl/updateservicectl-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/updateservicectl/updateservicectl-9999.ebuild index 1b45eaafdf..27e8d85b36 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/updateservicectl/updateservicectl-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/updateservicectl/updateservicectl-9999.ebuild @@ -2,17 +2,15 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -CROS_WORKON_PROJECT="flatcar/updateservicectl" -CROS_WORKON_LOCALNAME="updateservicectl" -CROS_WORKON_REPO="https://github.com" +EGIT_REPO_URI="https://github.com/flatcar/updateservicectl.git" COREOS_GO_PACKAGE="github.com/flatcar/updateservicectl" COREOS_GO_GO111MODULE="on" -inherit cros-workon coreos-go +inherit git-r3 coreos-go if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="446f13594465503a3fdfc9106fd8a0c3123249c2" # main + EGIT_COMMIT="446f13594465503a3fdfc9106fd8a0c3123249c2" # main KEYWORDS="amd64 arm64" fi 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 23c8ecee23..7b71048f97 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 @@ -3,14 +3,12 @@ EAPI=8 -CROS_WORKON_PROJECT="coreos/afterburn" -CROS_WORKON_LOCALNAME="afterburn" -CROS_WORKON_REPO="https://github.com" +EGIT_REPO_URI="https://github.com/coreos/afterburn.git" if [[ ${PV} == 9999 ]]; then KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="aa1be7dba724403457dee0fabed16e15be3ef4e0" # v5.6.0 + EGIT_COMMIT="aa1be7dba724403457dee0fabed16e15be3ef4e0" # v5.6.0 KEYWORDS="amd64 arm64" fi @@ -349,7 +347,7 @@ CRATES=" zvariant_utils@1.0.1 " -inherit cargo cros-workon systemd +inherit cargo git-r3 systemd DESCRIPTION="A tool for collecting instance metadata from various providers" HOMEPAGE="https://github.com/coreos/afterburn" @@ -372,7 +370,7 @@ PATCHES=( ) src_unpack() { - cros-workon_src_unpack + git-r3_src_unpack cargo_src_unpack } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild index 2e0da6c532..5aaad9ccb5 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild @@ -2,17 +2,15 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -CROS_WORKON_PROJECT="flatcar/coreos-cloudinit" -CROS_WORKON_LOCALNAME="coreos-cloudinit" -CROS_WORKON_REPO="https://github.com" +EGIT_REPO_URI="https://github.com/flatcar/coreos-cloudinit.git" COREOS_GO_PACKAGE="github.com/flatcar/coreos-cloudinit" COREOS_GO_GO111MODULE="on" -inherit cros-workon systemd toolchain-funcs udev coreos-go +inherit git-r3 systemd toolchain-funcs udev coreos-go if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="f78b9f7b484497c610c8a159aa971234d384d215" # flatcar-master + EGIT_COMMIT="f78b9f7b484497c610c8a159aa971234d384d215" # flatcar-master KEYWORDS="amd64 arm64" fi diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild index dae32f390c..09fa0e8734 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild @@ -3,20 +3,18 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -CROS_WORKON_PROJECT="flatcar/init" -CROS_WORKON_LOCALNAME="init" -CROS_WORKON_REPO="https://github.com" +EGIT_REPO_URI="https://github.com/flatcar/init.git" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="05e3d8b9c0f8e95d5044db5133b3e75d205f6d91" # flatcar-master + EGIT_COMMIT="05e3d8b9c0f8e95d5044db5133b3e75d205f6d91" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi PYTHON_COMPAT=( python3_{9..11} ) -inherit cros-workon systemd python-any-r1 +inherit git-r3 systemd python-any-r1 DESCRIPTION="Init scripts for CoreOS" HOMEPAGE="http://www.coreos.com/" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild index b1a83e976a..113067d692 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild @@ -2,21 +2,18 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -CROS_WORKON_PROJECT="flatcar/flatcar-dev-util" -CROS_WORKON_REPO="https://github.com" -CROS_WORKON_LOCALNAME="dev" -CROS_WORKON_LOCALDIR="src/platform" +EGIT_REPO_URI="https://github.com/flatcar/flatcar-dev-util.git" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="00396595376d8d6a3c4b9251ba94e9de2d7a9e39" # flatcar-master + EGIT_COMMIT="00396595376d8d6a3c4b9251ba94e9de2d7a9e39" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi PYTHON_COMPAT=( python3_{6..11} ) -inherit cros-workon python-single-r1 +inherit git-r3 python-single-r1 DESCRIPTION="emerge utilities for Flatcar developer images" HOMEPAGE="https://github.com/flatcar/flatcar-dev-util/" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-9999.ebuild index c0b1218f0e..caf1b73e96 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-9999.ebuild @@ -2,17 +2,15 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -CROS_WORKON_PROJECT="coreos/nova-agent-watcher" -CROS_WORKON_LOCALNAME="nova-agent-watcher" -CROS_WORKON_REPO="https://github.com" +EGIT_REPO_URI="https://github.com/coreos/nova-agent-watcher.git" COREOS_GO_PACKAGE="github.com/coreos/nova-agent-watcher" COREOS_GO_GO111MODULE="off" -inherit cros-workon systemd coreos-go +inherit git-r3 systemd coreos-go if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="2262401fe363cfdcc4c6f02144622466d506de43" + EGIT_COMMIT="2262401fe363cfdcc4c6f02144622466d506de43" KEYWORDS="amd64 arm64" fi 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 7a597e52c4..69fe6c3817 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 @@ -3,14 +3,12 @@ EAPI=8 -CROS_WORKON_PROJECT="flatcar/ue-rs" -CROS_WORKON_LOCALNAME="ue-rs" -CROS_WORKON_REPO="https://github.com" +EGIT_REPO_URI="https://github.com/flatcar/ue-rs.git" if [[ ${PV} == 9999 ]]; then KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="9b6ddb0226208450bcef9da4ac5ba8bc2a47a87c" # trunk + EGIT_COMMIT="9b6ddb0226208450bcef9da4ac5ba8bc2a47a87c" # trunk KEYWORDS="amd64 arm64" fi @@ -197,7 +195,7 @@ CRATES=" zeroize@1.6.0 " -inherit cargo cros-workon +inherit cargo git-r3 DESCRIPTION="Prototype Omaha Rust implementation" HOMEPAGE="https://github.com/flatcar/ue-rs" @@ -214,7 +212,7 @@ RDEPEND=" " src_unpack() { - cros-workon_src_unpack + git-r3_src_unpack cargo_src_unpack } 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 3643334865..720b11ceeb 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 @@ -3,14 +3,12 @@ EAPI=8 -CROS_WORKON_PROJECT="flatcar/update-ssh-keys" -CROS_WORKON_LOCALNAME="update-ssh-keys" -CROS_WORKON_REPO="https://github.com" +EGIT_REPO_URI="https://github.com/flatcar/update-ssh-keys.git" if [[ ${PV} == 9999 ]]; then KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="2a2aa89cd6eda6202de62b8870ca50945c836c54" # flatcar-master + EGIT_COMMIT="2a2aa89cd6eda6202de62b8870ca50945c836c54" # flatcar-master KEYWORDS="amd64 arm64" fi @@ -65,7 +63,7 @@ CRATES=" windows_x86_64_msvc@0.48.5 " -inherit cargo cros-workon +inherit cargo git-r3 DESCRIPTION="Utility for managing OpenSSH authorized public keys" HOMEPAGE="https://github.com/flatcar/update-ssh-keys" @@ -80,6 +78,6 @@ SLOT="0" RDEPEND="! /dev/null - - if [[ "${PV}" == "9999" ]]; then - local_copy || die "Cannot create a local copy" - else - if [[ -z "${CROS_WORKON_COMMIT}" ]]; then - die "CROS_WORKON_COMMIT is unset" - fi - - # Try cloning from a local repo first - local_clone && return - - # There is no good way to ensure repo-maintained git trees - # always have exactly what ebuilds need so fall back gracefully - # to fetching remotely. Also, when ebuilds only specify a git - # hash there isn't a way to know which branch that is on. To be - # safe use git-r3's "mirror" mode to fetch all remote branches. - ewarn "Falling back to fetching from remote git repository..." - - EGIT_CLONE_TYPE=mirror - EGIT_REPO_URI="${CROS_WORKON_REPO}/${CROS_WORKON_PROJECT}.git" - EGIT_CHECKOUT_DIR="${S}" - EGIT_COMMIT="${CROS_WORKON_COMMIT}" - git-r3_src_unpack - fi -} - -# TODO(marineam): This is used by cros_workon to deal manage -# 'minilayout' manifests but we don't bother with that in CoreOS. -# Do a pass on the cros_workon tool to give it a freshening too... -cros-workon_pkg_info() { - echo "CROS_WORKON_SRCDIR=(\"$(get_path)\")" - echo "CROS_WORKON_PROJECT=(\"${CROS_WORKON_PROJECT}\")" -} - -# get the semver of the git repo that is being built -get_semver() { - # get git tag/sha - local v - v=$(git describe --long --dirty) || die - - # strip a leading v from the tag - v=${v#v} - - # replace first - with +, to attach git sha/dirty as semver metadata - v=${v/-/+} - - echo ${v} -} - -EXPORT_FUNCTIONS src_unpack pkg_info - diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults index eeded5e9ff..581f3a7b8d 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults @@ -1,10 +1,8 @@ # Copyright (c) 2011 The Chromium OS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -# ChromeOS-specific: CROS_WORKON_TREE for cros-workon -# TESTS USE_EXPAND for autotest -USE_EXPAND="${USE_EXPAND} CROS_WORKON_TREE TESTS" -USE_EXPAND_HIDDEN="${USE_EXPAND_HIDDEN} CROS_WORKON_TREE" +# ChromeOS-specific: TESTS USE_EXPAND for autotest +USE_EXPAND="${USE_EXPAND} TESTS" # Use go_version_* flags to indicate which major version was used. # For now this is only informational and set by coreos-go.eclass diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild index cb046dca95..ae7fca3965 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild @@ -2,19 +2,17 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -CROS_WORKON_PROJECT="flatcar/baselayout" -CROS_WORKON_LOCALNAME="baselayout" -CROS_WORKON_REPO="https://github.com" +EGIT_REPO_URI="https://github.com/flatcar/baselayout.git" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="937a45faef0f7fa88d3d2c3f7ba60a7f3e2e82f7" # flatcar-master + EGIT_COMMIT="937a45faef0f7fa88d3d2c3f7ba60a7f3e2e82f7" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi TMPFILES_OPTIONAL=1 -inherit cros-workon multilib systemd tmpfiles +inherit git-r3 multilib systemd tmpfiles DESCRIPTION="Filesystem baselayout for CoreOS" HOMEPAGE="http://www.coreos.com/" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild index ff5f321194..75e03703be 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild @@ -2,17 +2,15 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -CROS_WORKON_PROJECT="coreos/ignition" -CROS_WORKON_LOCALNAME="ignition" -CROS_WORKON_REPO="https://github.com" +EGIT_REPO_URI="https://github.com/coreos/ignition.git" COREOS_GO_PACKAGE="github.com/flatcar/ignition/v2" COREOS_GO_GO111MODULE="off" -inherit coreos-go cros-workon systemd udev +inherit coreos-go git-r3 systemd udev if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="09c99e0305adc1377b87964a39ad2d009aec9b12" # v2.19.0 + EGIT_COMMIT="09c99e0305adc1377b87964a39ad2d009aec9b12" # v2.19.0 KEYWORDS="amd64 arm64" fi diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-9999.ebuild index 9ee7de91bf..d3721e5f85 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-9999.ebuild @@ -2,17 +2,16 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -CROS_WORKON_PROJECT="flatcar/seismograph" -CROS_WORKON_REPO="https://github.com" +EGIT_REPO_URI="https://github.com/flatcar/seismograph.git" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="0d57463de18df81741375d628852c521542b6836" # flatcar-master + EGIT_COMMIT="0d57463de18df81741375d628852c521542b6836" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi -inherit autotools cros-workon +inherit autotools git-r3 DESCRIPTION="CoreOS Disk Utilities (e.g. cgpt)" LICENSE="BSD" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild index 75931c150b..cbe45f4791 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild @@ -2,19 +2,16 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -CROS_WORKON_PROJECT="flatcar/bootengine" -CROS_WORKON_LOCALNAME="bootengine" -CROS_WORKON_OUTOFTREE_BUILD=1 -CROS_WORKON_REPO="https://github.com" +EGIT_REPO_URI="https://github.com/flatcar/bootengine.git" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="fb2631ce5e6a21d044c8dca73f59db01f9d5abcf" # flatcar-master + EGIT_COMMIT="fb2631ce5e6a21d044c8dca73f59db01f9d5abcf" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi -inherit cros-workon +inherit git-r3 DESCRIPTION="CoreOS Bootengine" SRC_URI="" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/nss-usrfiles-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/nss-usrfiles-9999.ebuild index 2a307491c7..3a195878d2 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/nss-usrfiles-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/nss-usrfiles-9999.ebuild @@ -2,18 +2,16 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -CROS_WORKON_PROJECT="flatcar/nss-altfiles" -CROS_WORKON_LOCALNAME="nss-altfiles" -CROS_WORKON_REPO="https://github.com" +EGIT_REPO_URI="https://github.com/flatcar/nss-altfiles.git" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="c8e05a08a2e28eb48c6c788e3007d94f8d8de5cd" # flatcar-master + EGIT_COMMIT="c8e05a08a2e28eb48c6c788e3007d94f8d8de5cd" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi -inherit cros-workon toolchain-funcs +inherit git-r3 toolchain-funcs DESCRIPTION="NSS module for data sources under /usr on for CoreOS" HOMEPAGE="https://github.com/coreos/nss-altfiles" diff --git a/setup_board b/setup_board index dd9a006386..ecc689decf 100755 --- a/setup_board +++ b/setup_board @@ -97,10 +97,10 @@ generate_all_wrappers() { _generate_wrapper ${wrapper} done - wrapper="/usr/local/bin/cros_workon-${BOARD_VARIANT}" + wrapper="/usr/local/bin/flatcar_workon-${BOARD_VARIANT}" sudo_clobber "${wrapper}" < Date: Fri, 14 Jun 2024 17:31:51 +0100 Subject: [PATCH 3/6] Drop the dev-vcs/repo tool now that cros_workon no longer uses it Signed-off-by: James Le Cuirot --- .../workflows/portage-stable-packages-list | 1 - ...r85.ebuild => coreos-dev-0.1.0-r86.ebuild} | 0 .../coreos-dev/coreos-dev-0.1.0.ebuild | 1 - .../sdk-depends/sdk-depends-0.0.1.ebuild | 1 - .../src/third_party/portage-stable/README.md | 2 +- .../portage-stable/dev-vcs/repo/Manifest | 2 -- .../portage-stable/dev-vcs/repo/metadata.xml | 11 ------ .../dev-vcs/repo/repo-2.37.ebuild | 34 ------------------- .../dev-vcs/repo/repo-2.40.ebuild | 34 ------------------- 9 files changed, 1 insertion(+), 85 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/{coreos-dev-0.1.0-r85.ebuild => coreos-dev-0.1.0-r86.ebuild} (100%) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/repo/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/repo/metadata.xml delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.37.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.40.ebuild diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index 8f1f8a281e..8aff44662d 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -309,7 +309,6 @@ dev-util/pkgconf dev-util/re2c dev-vcs/git -dev-vcs/repo eclass/acct-group.eclass eclass/acct-user.eclass diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r85.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r86.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r85.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r86.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild index 3c16138144..889e44e3b0 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild @@ -23,7 +23,6 @@ RDEPEND=" dev-debug/strace dev-lang/python dev-util/pahole - dev-vcs/repo net-analyzer/netperf net-analyzer/traceroute net-dialup/minicom 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 de9f637cca..8056e13f26 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 @@ -33,7 +33,6 @@ DEPEND=" dev-util/checkbashisms dev-util/pahole dev-util/patchelf - dev-vcs/repo net-dns/bind-tools >=net-dns/dnsmasq-2.72[dhcp,ipv6] net-libs/rpcsvc-proto diff --git a/sdk_container/src/third_party/portage-stable/README.md b/sdk_container/src/third_party/portage-stable/README.md index 70d6f21243..2d42d1b212 100644 --- a/sdk_container/src/third_party/portage-stable/README.md +++ b/sdk_container/src/third_party/portage-stable/README.md @@ -8,7 +8,7 @@ of the Container Linux build and are exact copies of upstream Gentoo packages. Use `src/scripts/update_ebuilds` to fetch the latest copy from Gentoo: cd ~/trunk/src/scripts - repo start update-foo ../third-party/portage-stable + git checkout -b update-foo ./update_ebuilds --commit app-fun/foo Note: `update_ebuilds` can fetch from either Gentoo's Github mirror or diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/repo/Manifest b/sdk_container/src/third_party/portage-stable/dev-vcs/repo/Manifest deleted file mode 100644 index 72b8ad2f08..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/repo/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST repo-2.37.tar.gz 273445 BLAKE2B 7934581c5c55896d8ba58f5841a028f4676062197498ef601fa005f4e19428eee552e66d057a1e0d033eff8691df2de8e130ff96aec0e4537a462be81796e249 SHA512 6aa11e9fc9d899866dd89788c94ef188ea89dc6757a4e4fe0f1284898315723f72b3b97b60d39194f34e56332057545eb9c99b6483bc3e0513f747410226b9fa -DIST repo-2.40.tar.gz 277118 BLAKE2B 57ebd20e323a4c3d02885c71f599bf57d23e68b8199b136095ce77a479a815439c51844b11744e0c9555091e91821ba49715c57d985a3a30579497b4617b6361 SHA512 0cd9df29edf14acdaeb0e4d07dea13f6e3bfa77ac36ffe7c4042d050c5d3fb36a7ff9a249e521aef7d7e5fbff9fe1c4b94df02c0d435353e0c169a94254f78ba diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/repo/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-vcs/repo/metadata.xml deleted file mode 100644 index 0885b487b6..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/repo/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - Mike Frysinger - vapier@gentoo.org - - - GerritCodeReview/git-repo - - diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.37.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.37.ebuild deleted file mode 100644 index c51d27d5ee..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.37.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# NB: The ${PV} tracks the *repo launcher version*, not the last signed release -# of the repo project. The launcher only gets a new update when changes are -# made in it. - -EAPI="7" - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit bash-completion-r1 python-r1 - -DESCRIPTION="Google tool for managing git, particularly multiple repos" -HOMEPAGE="https://gerrit.googlesource.com/git-repo" -SRC_URI="https://github.com/GerritCodeReview/git-repo/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - !app-admin/radmind -" - -S="${WORKDIR}/git-${P}" - -src_install() { - python_foreach_impl python_doscript ${PN} - newbashcomp completion.bash ${PN} - doman man/*.[0-9] -} diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.40.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.40.ebuild deleted file mode 100644 index 3203603bb0..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.40.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# NB: The ${PV} tracks the *repo launcher version*, not the last signed release -# of the repo project. The launcher only gets a new update when changes are -# made in it. - -EAPI="7" - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit bash-completion-r1 python-r1 - -DESCRIPTION="Google tool for managing git, particularly multiple repos" -HOMEPAGE="https://gerrit.googlesource.com/git-repo" -SRC_URI="https://github.com/GerritCodeReview/git-repo/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - !app-admin/radmind -" - -S="${WORKDIR}/git-${P}" - -src_install() { - python_foreach_impl python_doscript ${PN} - newbashcomp completion.bash ${PN} - doman man/*.[0-9] -} From 3350770afe3e89cd0702809d75d7da0f164a2a6b Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Tue, 18 Jun 2024 16:58:05 +0100 Subject: [PATCH 4/6] coreos-base/afterburn: Fix crate handling in 9999 Signed-off-by: James Le Cuirot --- .../afterburn/afterburn-9999.ebuild | 684 +++++++++--------- 1 file changed, 340 insertions(+), 344 deletions(-) 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 7b71048f97..44ccd17170 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 @@ -7,345 +7,345 @@ EGIT_REPO_URI="https://github.com/coreos/afterburn.git" if [[ ${PV} == 9999 ]]; then KEYWORDS="~amd64 ~arm64" + CRATES="" else EGIT_COMMIT="aa1be7dba724403457dee0fabed16e15be3ef4e0" # v5.6.0 KEYWORDS="amd64 arm64" -fi -# https://github.com/gentoo/cargo-ebuild -CRATES=" - addr2line@0.22.0 - adler@1.0.2 - adler32@1.2.0 - ahash@0.8.11 - aho-corasick@1.1.3 - allocator-api2@0.2.18 - anstyle@1.0.7 - anyhow@1.0.86 - arc-swap@1.7.1 - assert-json-diff@2.0.2 - async-broadcast@0.5.1 - async-channel@2.3.1 - async-executor@1.12.0 - async-fs@1.6.0 - async-io@1.13.0 - async-io@2.3.3 - async-lock@2.8.0 - async-lock@3.4.0 - async-process@1.8.1 - async-recursion@1.1.1 - async-signal@0.2.8 - async-task@4.7.1 - async-trait@0.1.80 - atomic-waker@1.1.2 - autocfg@1.3.0 - backtrace@0.3.73 - base64@0.13.1 - base64@0.21.7 - base64@0.22.1 - bitflags@1.3.2 - bitflags@2.5.0 - block-buffer@0.10.4 - blocking@1.6.1 - bumpalo@3.16.0 - byteorder@1.5.0 - bytes@1.6.0 - cc@1.0.99 - cfg-if@1.0.0 - charset@0.1.3 - clap@4.5.7 - clap_builder@4.5.7 - clap_derive@4.5.5 - clap_lex@0.7.1 - colored@2.1.0 - concurrent-queue@2.5.0 - core-foundation@0.9.4 - core-foundation-sys@0.8.6 - core2@0.4.0 - cpufeatures@0.2.12 - crc32fast@1.4.2 - crossbeam-channel@0.5.13 - crossbeam-utils@0.8.20 - crypto-common@0.1.6 - dary_heap@0.3.6 - data-encoding@2.6.0 - deranged@0.3.11 - derivative@2.2.0 - digest@0.10.7 - dirs-next@2.0.0 - dirs-sys-next@0.1.2 - displaydoc@0.2.4 - encoding_rs@0.8.34 - enumflags2@0.7.10 - enumflags2_derive@0.7.10 - equivalent@1.0.1 - errno@0.3.9 - event-listener@2.5.3 - event-listener@3.1.0 - event-listener@5.3.1 - event-listener-strategy@0.5.2 - fastrand@1.9.0 - fastrand@2.1.0 - fnv@1.0.7 - foreign-types@0.3.2 - foreign-types-shared@0.1.1 - form_urlencoded@1.2.1 - futures-channel@0.3.30 - futures-core@0.3.30 - futures-io@0.3.30 - futures-lite@1.13.0 - futures-lite@2.3.0 - futures-sink@0.3.30 - futures-task@0.3.30 - futures-util@0.3.30 - generic-array@0.14.7 - getrandom@0.2.15 - gimli@0.29.0 - h2@0.3.26 - h2@0.4.5 - hashbrown@0.14.5 - heck@0.5.0 - hermit-abi@0.3.9 - hermit-abi@0.4.0 - hex@0.4.3 - hmac@0.12.1 - hostname@0.4.0 - http@0.2.12 - http@1.1.0 - http-body@0.4.6 - http-body@1.0.0 - http-body-util@0.1.2 - httparse@1.9.4 - httpdate@1.0.3 - hyper@0.14.29 - hyper@1.3.1 - hyper-rustls@0.27.2 - hyper-tls@0.6.0 - hyper-util@0.1.5 - icu_collections@1.5.0 - icu_locid@1.5.0 - icu_locid_transform@1.5.0 - icu_locid_transform_data@1.5.0 - icu_normalizer@1.5.0 - icu_normalizer_data@1.5.0 - icu_properties@1.5.0 - icu_properties_data@1.5.0 - icu_provider@1.5.0 - icu_provider_macros@1.5.0 - idna@1.0.0 - indexmap@2.2.6 - instant@0.1.13 - io-lifetimes@1.0.11 - ipnet@2.9.0 - ipnetwork@0.20.0 - is-terminal@0.4.12 - itoa@1.0.11 - js-sys@0.3.69 - lazy_static@1.4.0 - libc@0.2.155 - libflate@2.1.0 - libflate_lz77@2.1.0 - libredox@0.1.3 - libsystemd@0.7.0 - linux-raw-sys@0.3.8 - linux-raw-sys@0.4.14 - litemap@0.7.3 - lock_api@0.4.12 - log@0.4.21 - mailparse@0.15.0 - maplit@1.0.2 - md-5@0.10.6 - memchr@2.7.4 - memoffset@0.7.1 - memoffset@0.9.1 - mime@0.3.17 - minimal-lexical@0.2.1 - miniz_oxide@0.7.4 - mio@0.8.11 - mockito@1.4.0 - native-tls@0.2.12 - nix@0.26.4 - nix@0.27.1 - no-std-net@0.6.0 - nom@7.1.3 - num-conv@0.1.0 - object@0.36.0 - once_cell@1.19.0 - openssh-keys@0.6.3 - openssl@0.10.64 - openssl-macros@0.1.1 - openssl-probe@0.1.5 - openssl-sys@0.9.102 - ordered-stream@0.2.0 - parking@2.2.0 - parking_lot@0.12.3 - parking_lot_core@0.9.10 - percent-encoding@2.3.1 - pin-project@1.1.5 - pin-project-internal@1.1.5 - pin-project-lite@0.2.14 - pin-utils@0.1.0 - piper@0.2.3 - pkg-config@0.3.30 - pnet_base@0.34.0 - pnet_base@0.35.0 - pnet_datalink@0.35.0 - pnet_sys@0.35.0 - polling@2.8.0 - polling@3.7.2 - powerfmt@0.2.0 - ppv-lite86@0.2.17 - proc-macro-crate@1.3.1 - proc-macro2@1.0.85 - quote@1.0.36 - quoted_printable@0.5.0 - rand@0.8.5 - rand_chacha@0.3.1 - rand_core@0.6.4 - redox_syscall@0.5.2 - redox_users@0.4.5 - regex@1.10.5 - regex-automata@0.4.7 - regex-syntax@0.8.4 - reqwest@0.12.5 - ring@0.17.8 - rle-decode-fast@1.0.3 - rustc-demangle@0.1.24 - rustix@0.37.27 - rustix@0.38.34 - rustls@0.23.10 - rustls-pemfile@2.1.2 - rustls-pki-types@1.7.0 - rustls-webpki@0.102.4 - rustversion@1.0.17 - ryu@1.0.18 - schannel@0.1.23 - scopeguard@1.2.0 - security-framework@2.11.0 - security-framework-sys@2.11.0 - serde@1.0.203 - serde-xml-rs@0.6.0 - serde_derive@1.0.203 - serde_json@1.0.117 - serde_repr@0.1.19 - serde_urlencoded@0.7.1 - serde_yaml@0.9.34+deprecated - sha1@0.10.6 - sha2@0.10.8 - signal-hook-registry@1.4.2 - similar@2.5.0 - slab@0.4.9 - slog@2.7.0 - slog-async@2.8.0 - slog-scope@4.4.0 - slog-term@2.9.1 - smallvec@1.13.2 - socket2@0.4.10 - socket2@0.5.7 - spin@0.9.8 - stable_deref_trait@1.2.0 - static_assertions@1.1.0 - strsim@0.11.1 - subtle@2.5.0 - syn@1.0.109 - syn@2.0.66 - sync_wrapper@1.0.1 - synstructure@0.13.1 - system-configuration@0.5.1 - system-configuration-sys@0.5.0 - take_mut@0.2.2 - tempfile@3.10.1 - term@0.7.0 - terminal_size@0.3.0 - thiserror@1.0.61 - thiserror-impl@1.0.61 - thread_local@1.1.8 - time@0.3.36 - time-core@0.1.2 - time-macros@0.2.18 - tinystr@0.7.6 - tokio@1.38.0 - tokio-native-tls@0.3.1 - tokio-rustls@0.26.0 - tokio-util@0.7.11 - toml_datetime@0.6.6 - toml_edit@0.19.15 - tower@0.4.13 - tower-layer@0.3.2 - 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-ident@1.0.12 - unsafe-libyaml@0.2.11 - untrusted@0.9.0 - url@2.5.1 - utf16_iter@1.0.5 - utf8_iter@1.0.4 - uuid@1.8.0 - uzers@0.11.3 - vcpkg@0.2.15 - version_check@0.9.4 - vmw_backdoor@0.2.4 - waker-fn@1.2.0 - want@0.3.1 - wasi@0.11.0+wasi-snapshot-preview1 - wasm-bindgen@0.2.92 - wasm-bindgen-backend@0.2.92 - wasm-bindgen-futures@0.4.42 - wasm-bindgen-macro@0.2.92 - wasm-bindgen-macro-support@0.2.92 - wasm-bindgen-shared@0.2.92 - web-sys@0.3.69 - winapi@0.3.9 - winapi-i686-pc-windows-gnu@0.4.0 - winapi-x86_64-pc-windows-gnu@0.4.0 - windows@0.52.0 - windows-core@0.52.0 - windows-sys@0.48.0 - windows-sys@0.52.0 - windows-targets@0.48.5 - windows-targets@0.52.5 - windows_aarch64_gnullvm@0.48.5 - windows_aarch64_gnullvm@0.52.5 - windows_aarch64_msvc@0.48.5 - windows_aarch64_msvc@0.52.5 - windows_i686_gnu@0.48.5 - windows_i686_gnu@0.52.5 - windows_i686_gnullvm@0.52.5 - windows_i686_msvc@0.48.5 - windows_i686_msvc@0.52.5 - windows_x86_64_gnu@0.48.5 - windows_x86_64_gnu@0.52.5 - windows_x86_64_gnullvm@0.48.5 - windows_x86_64_gnullvm@0.52.5 - windows_x86_64_msvc@0.48.5 - windows_x86_64_msvc@0.52.5 - winnow@0.5.40 - winreg@0.52.0 - write16@1.0.0 - writeable@0.5.5 - xdg-home@1.2.0 - xml-rs@0.8.20 - yoke@0.7.4 - yoke-derive@0.7.4 - zbus@3.15.2 - zbus_macros@3.15.2 - zbus_names@2.6.1 - zerocopy@0.7.34 - zerocopy-derive@0.7.34 - zerofrom@0.1.4 - zerofrom-derive@0.1.4 - zeroize@1.8.1 - zerovec@0.10.2 - zerovec-derive@0.10.2 - zvariant@3.15.2 - zvariant_derive@3.15.2 - zvariant_utils@1.0.1 -" + CRATES=" + addr2line@0.22.0 + adler@1.0.2 + adler32@1.2.0 + ahash@0.8.11 + aho-corasick@1.1.3 + allocator-api2@0.2.18 + anstyle@1.0.7 + anyhow@1.0.86 + arc-swap@1.7.1 + assert-json-diff@2.0.2 + async-broadcast@0.5.1 + async-channel@2.3.1 + async-executor@1.12.0 + async-fs@1.6.0 + async-io@1.13.0 + async-io@2.3.3 + async-lock@2.8.0 + async-lock@3.4.0 + async-process@1.8.1 + async-recursion@1.1.1 + async-signal@0.2.8 + async-task@4.7.1 + async-trait@0.1.80 + atomic-waker@1.1.2 + autocfg@1.3.0 + backtrace@0.3.73 + base64@0.13.1 + base64@0.21.7 + base64@0.22.1 + bitflags@1.3.2 + bitflags@2.5.0 + block-buffer@0.10.4 + blocking@1.6.1 + bumpalo@3.16.0 + byteorder@1.5.0 + bytes@1.6.0 + cc@1.0.99 + cfg-if@1.0.0 + charset@0.1.3 + clap@4.5.7 + clap_builder@4.5.7 + clap_derive@4.5.5 + clap_lex@0.7.1 + colored@2.1.0 + concurrent-queue@2.5.0 + core-foundation@0.9.4 + core-foundation-sys@0.8.6 + core2@0.4.0 + cpufeatures@0.2.12 + crc32fast@1.4.2 + crossbeam-channel@0.5.13 + crossbeam-utils@0.8.20 + crypto-common@0.1.6 + dary_heap@0.3.6 + data-encoding@2.6.0 + deranged@0.3.11 + derivative@2.2.0 + digest@0.10.7 + dirs-next@2.0.0 + dirs-sys-next@0.1.2 + displaydoc@0.2.4 + encoding_rs@0.8.34 + enumflags2@0.7.10 + enumflags2_derive@0.7.10 + equivalent@1.0.1 + errno@0.3.9 + event-listener@2.5.3 + event-listener@3.1.0 + event-listener@5.3.1 + event-listener-strategy@0.5.2 + fastrand@1.9.0 + fastrand@2.1.0 + fnv@1.0.7 + foreign-types@0.3.2 + foreign-types-shared@0.1.1 + form_urlencoded@1.2.1 + futures-channel@0.3.30 + futures-core@0.3.30 + futures-io@0.3.30 + futures-lite@1.13.0 + futures-lite@2.3.0 + futures-sink@0.3.30 + futures-task@0.3.30 + futures-util@0.3.30 + generic-array@0.14.7 + getrandom@0.2.15 + gimli@0.29.0 + h2@0.3.26 + h2@0.4.5 + hashbrown@0.14.5 + heck@0.5.0 + hermit-abi@0.3.9 + hermit-abi@0.4.0 + hex@0.4.3 + hmac@0.12.1 + hostname@0.4.0 + http@0.2.12 + http@1.1.0 + http-body@0.4.6 + http-body@1.0.0 + http-body-util@0.1.2 + httparse@1.9.4 + httpdate@1.0.3 + hyper@0.14.29 + hyper@1.3.1 + hyper-rustls@0.27.2 + hyper-tls@0.6.0 + hyper-util@0.1.5 + icu_collections@1.5.0 + icu_locid@1.5.0 + icu_locid_transform@1.5.0 + icu_locid_transform_data@1.5.0 + icu_normalizer@1.5.0 + icu_normalizer_data@1.5.0 + icu_properties@1.5.0 + icu_properties_data@1.5.0 + icu_provider@1.5.0 + icu_provider_macros@1.5.0 + idna@1.0.0 + indexmap@2.2.6 + instant@0.1.13 + io-lifetimes@1.0.11 + ipnet@2.9.0 + ipnetwork@0.20.0 + is-terminal@0.4.12 + itoa@1.0.11 + js-sys@0.3.69 + lazy_static@1.4.0 + libc@0.2.155 + libflate@2.1.0 + libflate_lz77@2.1.0 + libredox@0.1.3 + libsystemd@0.7.0 + linux-raw-sys@0.3.8 + linux-raw-sys@0.4.14 + litemap@0.7.3 + lock_api@0.4.12 + log@0.4.21 + mailparse@0.15.0 + maplit@1.0.2 + md-5@0.10.6 + memchr@2.7.4 + memoffset@0.7.1 + memoffset@0.9.1 + mime@0.3.17 + minimal-lexical@0.2.1 + miniz_oxide@0.7.4 + mio@0.8.11 + mockito@1.4.0 + native-tls@0.2.12 + nix@0.26.4 + nix@0.27.1 + no-std-net@0.6.0 + nom@7.1.3 + num-conv@0.1.0 + object@0.36.0 + once_cell@1.19.0 + openssh-keys@0.6.3 + openssl@0.10.64 + openssl-macros@0.1.1 + openssl-probe@0.1.5 + openssl-sys@0.9.102 + ordered-stream@0.2.0 + parking@2.2.0 + parking_lot@0.12.3 + parking_lot_core@0.9.10 + percent-encoding@2.3.1 + pin-project@1.1.5 + pin-project-internal@1.1.5 + pin-project-lite@0.2.14 + pin-utils@0.1.0 + piper@0.2.3 + pkg-config@0.3.30 + pnet_base@0.34.0 + pnet_base@0.35.0 + pnet_datalink@0.35.0 + pnet_sys@0.35.0 + polling@2.8.0 + polling@3.7.2 + powerfmt@0.2.0 + ppv-lite86@0.2.17 + proc-macro-crate@1.3.1 + proc-macro2@1.0.85 + quote@1.0.36 + quoted_printable@0.5.0 + rand@0.8.5 + rand_chacha@0.3.1 + rand_core@0.6.4 + redox_syscall@0.5.2 + redox_users@0.4.5 + regex@1.10.5 + regex-automata@0.4.7 + regex-syntax@0.8.4 + reqwest@0.12.5 + ring@0.17.8 + rle-decode-fast@1.0.3 + rustc-demangle@0.1.24 + rustix@0.37.27 + rustix@0.38.34 + rustls@0.23.10 + rustls-pemfile@2.1.2 + rustls-pki-types@1.7.0 + rustls-webpki@0.102.4 + rustversion@1.0.17 + ryu@1.0.18 + schannel@0.1.23 + scopeguard@1.2.0 + security-framework@2.11.0 + security-framework-sys@2.11.0 + serde@1.0.203 + serde-xml-rs@0.6.0 + serde_derive@1.0.203 + serde_json@1.0.117 + serde_repr@0.1.19 + serde_urlencoded@0.7.1 + serde_yaml@0.9.34+deprecated + sha1@0.10.6 + sha2@0.10.8 + signal-hook-registry@1.4.2 + similar@2.5.0 + slab@0.4.9 + slog@2.7.0 + slog-async@2.8.0 + slog-scope@4.4.0 + slog-term@2.9.1 + smallvec@1.13.2 + socket2@0.4.10 + socket2@0.5.7 + spin@0.9.8 + stable_deref_trait@1.2.0 + static_assertions@1.1.0 + strsim@0.11.1 + subtle@2.5.0 + syn@1.0.109 + syn@2.0.66 + sync_wrapper@1.0.1 + synstructure@0.13.1 + system-configuration@0.5.1 + system-configuration-sys@0.5.0 + take_mut@0.2.2 + tempfile@3.10.1 + term@0.7.0 + terminal_size@0.3.0 + thiserror@1.0.61 + thiserror-impl@1.0.61 + thread_local@1.1.8 + time@0.3.36 + time-core@0.1.2 + time-macros@0.2.18 + tinystr@0.7.6 + tokio@1.38.0 + tokio-native-tls@0.3.1 + tokio-rustls@0.26.0 + tokio-util@0.7.11 + toml_datetime@0.6.6 + toml_edit@0.19.15 + tower@0.4.13 + tower-layer@0.3.2 + 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-ident@1.0.12 + unsafe-libyaml@0.2.11 + untrusted@0.9.0 + url@2.5.1 + utf16_iter@1.0.5 + utf8_iter@1.0.4 + uuid@1.8.0 + uzers@0.11.3 + vcpkg@0.2.15 + version_check@0.9.4 + vmw_backdoor@0.2.4 + waker-fn@1.2.0 + want@0.3.1 + wasi@0.11.0+wasi-snapshot-preview1 + wasm-bindgen@0.2.92 + wasm-bindgen-backend@0.2.92 + wasm-bindgen-futures@0.4.42 + wasm-bindgen-macro@0.2.92 + wasm-bindgen-macro-support@0.2.92 + wasm-bindgen-shared@0.2.92 + web-sys@0.3.69 + winapi@0.3.9 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-x86_64-pc-windows-gnu@0.4.0 + windows@0.52.0 + windows-core@0.52.0 + windows-sys@0.48.0 + windows-sys@0.52.0 + windows-targets@0.48.5 + windows-targets@0.52.5 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_gnullvm@0.52.5 + windows_aarch64_msvc@0.48.5 + windows_aarch64_msvc@0.52.5 + windows_i686_gnu@0.48.5 + windows_i686_gnu@0.52.5 + windows_i686_gnullvm@0.52.5 + windows_i686_msvc@0.48.5 + windows_i686_msvc@0.52.5 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnu@0.52.5 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_gnullvm@0.52.5 + windows_x86_64_msvc@0.48.5 + windows_x86_64_msvc@0.52.5 + winnow@0.5.40 + winreg@0.52.0 + write16@1.0.0 + writeable@0.5.5 + xdg-home@1.2.0 + xml-rs@0.8.20 + yoke@0.7.4 + yoke-derive@0.7.4 + zbus@3.15.2 + zbus_macros@3.15.2 + zbus_names@2.6.1 + zerocopy@0.7.34 + zerocopy-derive@0.7.34 + zerofrom@0.1.4 + zerofrom-derive@0.1.4 + zeroize@1.8.1 + zerovec@0.10.2 + zerovec-derive@0.10.2 + zvariant@3.15.2 + zvariant_derive@3.15.2 + zvariant_utils@1.0.1 + " +fi inherit cargo git-r3 systemd @@ -371,16 +371,12 @@ PATCHES=( src_unpack() { git-r3_src_unpack - cargo_src_unpack -} -src_prepare() { - default - - # tell the rust-openssl bindings where the openssl library and include dirs are - export PKG_CONFIG_ALLOW_CROSS=1 - export OPENSSL_LIB_DIR=/usr/lib64/ - export OPENSSL_INCLUDE_DIR=/usr/include/openssl/ + if [[ ${PV} == 9999 ]]; then + cargo_live_src_unpack + else + cargo_src_unpack + fi } src_compile() { From d6a4dab482efdd383052de9890adacbbe4dc6ea2 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Tue, 18 Jun 2024 16:58:27 +0100 Subject: [PATCH 5/6] coreos-base/ue-rs: Fix crate handling in 9999 Signed-off-by: James Le Cuirot --- .../coreos-base/ue-rs/ue-rs-9999.ebuild | 373 +++++++++--------- 1 file changed, 189 insertions(+), 184 deletions(-) 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 69fe6c3817..49388c8d13 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 @@ -7,193 +7,193 @@ EGIT_REPO_URI="https://github.com/flatcar/ue-rs.git" if [[ ${PV} == 9999 ]]; then KEYWORDS="~amd64 ~arm64" + CRATES="" else EGIT_COMMIT="9b6ddb0226208450bcef9da4ac5ba8bc2a47a87c" # trunk KEYWORDS="amd64 arm64" -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 -" + 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 + " +fi inherit cargo git-r3 @@ -213,7 +213,12 @@ RDEPEND=" src_unpack() { git-r3_src_unpack - cargo_src_unpack + + if [[ ${PV} == 9999 ]]; then + cargo_live_src_unpack + else + cargo_src_unpack + fi } src_compile() { From d36ff5fbe815b6976ed2593ad5293e6a2dba4b4a Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Tue, 18 Jun 2024 16:58:40 +0100 Subject: [PATCH 6/6] coreos-base/update-ssh-keys: Fix crate handling in 9999 Signed-off-by: James Le Cuirot --- .../update-ssh-keys-9999.ebuild | 114 +++++++++--------- 1 file changed, 60 insertions(+), 54 deletions(-) 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 720b11ceeb..24bcf4ab5e 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 @@ -7,68 +7,69 @@ EGIT_REPO_URI="https://github.com/flatcar/update-ssh-keys.git" if [[ ${PV} == 9999 ]]; then KEYWORDS="~amd64 ~arm64" + CRATES="" else EGIT_COMMIT="2a2aa89cd6eda6202de62b8870ca50945c836c54" # flatcar-master KEYWORDS="amd64 arm64" -fi -# 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 -" + 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 + " + + SRC_URI="https://mirror.release.flatcar-linux.net/coreos/openssh-keys-0.5.1-alpha.0.crate" +fi inherit cargo git-r3 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 - ${CARGO_CRATE_URIS}" +SRC_URI+=" ${CARGO_CRATE_URIS}" LICENSE="Apache-2.0" SLOT="0" @@ -79,5 +80,10 @@ RDEPEND="!