coreos-base/update-ssh-keys: Drop CoreOS board handling for Rust

Since amd64 is the only supported board now, we can make use of
EAPI 7 and the host Rust compiler to drop our customizations.
This commit is contained in:
David Michael 2018-10-29 18:19:44 +00:00
parent 470c6ed789
commit 20bbdbfa49
4 changed files with 11 additions and 11 deletions

View File

@ -1,7 +1,7 @@
# Copyright (c) 2017 CoreOS, Inc.. All rights reserved. # Copyright (c) 2017 CoreOS, Inc.. All rights reserved.
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=6 EAPI=7
CROS_WORKON_PROJECT="coreos/update-ssh-keys" CROS_WORKON_PROJECT="coreos/update-ssh-keys"
CROS_WORKON_LOCALNAME="update-ssh-keys" CROS_WORKON_LOCALNAME="update-ssh-keys"
@ -14,7 +14,7 @@ else
KEYWORDS="amd64 arm64" KEYWORDS="amd64 arm64"
fi fi
inherit coreos-cargo cros-workon inherit cargo cros-workon
DESCRIPTION="Utility for managing OpenSSH authorized public keys" DESCRIPTION="Utility for managing OpenSSH authorized public keys"
HOMEPAGE="https://github.com/coreos/update-ssh-keys" HOMEPAGE="https://github.com/coreos/update-ssh-keys"
@ -64,5 +64,5 @@ SRC_URI="$(cargo_crate_uris ${CRATES})"
src_unpack() { src_unpack() {
cros-workon_src_unpack "$@" cros-workon_src_unpack "$@"
coreos-cargo_src_unpack "$@" cargo_src_unpack "$@"
} }

View File

@ -1,7 +1,7 @@
BDEPEND=virtual/cargo >=dev-vcs/git-1.8.2.1[curl]
DEFINED_PHASES=compile info install unpack DEFINED_PHASES=compile info install unpack
DEPEND=|| ( dev-libs/rustlib:= dev-util/cargo ) >=dev-vcs/git-1.8.2.1[curl]
DESCRIPTION=Utility for managing OpenSSH authorized public keys DESCRIPTION=Utility for managing OpenSSH authorized public keys
EAPI=6 EAPI=7
HOMEPAGE=https://github.com/coreos/update-ssh-keys HOMEPAGE=https://github.com/coreos/update-ssh-keys
IUSE=debug cros_workon_tree_ profiling IUSE=debug cros_workon_tree_ profiling
KEYWORDS=amd64 arm64 KEYWORDS=amd64 arm64
@ -9,5 +9,5 @@ LICENSE=Apache-2.0
RDEPEND=!<coreos-base/coreos-init-0.0.1-r152 RDEPEND=!<coreos-base/coreos-init-0.0.1-r152
SLOT=0 SLOT=0
SRC_URI=https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/arrayref/0.3.5/download -> arrayref-0.3.5.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/base64/0.9.2/download -> base64-0.9.2.crate https://crates.io/api/v1/crates/bitflags/1.0.3/download -> bitflags-1.0.3.crate https://crates.io/api/v1/crates/block-buffer/0.3.3/download -> block-buffer-0.3.3.crate https://crates.io/api/v1/crates/byte-tools/0.2.0/download -> byte-tools-0.2.0.crate https://crates.io/api/v1/crates/byteorder/1.2.4/download -> byteorder-1.2.4.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/digest/0.7.5/download -> digest-0.7.5.crate https://crates.io/api/v1/crates/error-chain/0.12.0/download -> error-chain-0.12.0.crate https://crates.io/api/v1/crates/fake-simd/0.1.2/download -> fake-simd-0.1.2.crate https://crates.io/api/v1/crates/fs2/0.4.3/download -> fs2-0.4.3.crate https://crates.io/api/v1/crates/generic-array/0.9.0/download -> generic-array-0.9.0.crate https://crates.io/api/v1/crates/libc/0.2.43/download -> libc-0.2.43.crate https://crates.io/api/v1/crates/md-5/0.7.0/download -> md-5-0.7.0.crate https://crates.io/api/v1/crates/openssh-keys/0.3.0/download -> openssh-keys-0.3.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.40/download -> redox_syscall-0.1.40.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/safemem/0.2.0/download -> safemem-0.2.0.crate https://crates.io/api/v1/crates/sha2/0.7.1/download -> sha2-0.7.1.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/typenum/1.10.0/download -> typenum-1.10.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/users/0.7.0/download -> users-0.7.0.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/winapi/0.3.5/download -> winapi-0.3.5.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate SRC_URI=https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/arrayref/0.3.5/download -> arrayref-0.3.5.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/base64/0.9.2/download -> base64-0.9.2.crate https://crates.io/api/v1/crates/bitflags/1.0.3/download -> bitflags-1.0.3.crate https://crates.io/api/v1/crates/block-buffer/0.3.3/download -> block-buffer-0.3.3.crate https://crates.io/api/v1/crates/byte-tools/0.2.0/download -> byte-tools-0.2.0.crate https://crates.io/api/v1/crates/byteorder/1.2.4/download -> byteorder-1.2.4.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/digest/0.7.5/download -> digest-0.7.5.crate https://crates.io/api/v1/crates/error-chain/0.12.0/download -> error-chain-0.12.0.crate https://crates.io/api/v1/crates/fake-simd/0.1.2/download -> fake-simd-0.1.2.crate https://crates.io/api/v1/crates/fs2/0.4.3/download -> fs2-0.4.3.crate https://crates.io/api/v1/crates/generic-array/0.9.0/download -> generic-array-0.9.0.crate https://crates.io/api/v1/crates/libc/0.2.43/download -> libc-0.2.43.crate https://crates.io/api/v1/crates/md-5/0.7.0/download -> md-5-0.7.0.crate https://crates.io/api/v1/crates/openssh-keys/0.3.0/download -> openssh-keys-0.3.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.40/download -> redox_syscall-0.1.40.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/safemem/0.2.0/download -> safemem-0.2.0.crate https://crates.io/api/v1/crates/sha2/0.7.1/download -> sha2-0.7.1.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/typenum/1.10.0/download -> typenum-1.10.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/users/0.7.0/download -> users-0.7.0.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/winapi/0.3.5/download -> winapi-0.3.5.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
_eclasses_=cargo c11c4632a7a9d8e0b76e9f4412e76163 coreos-cargo ecc71b7f40f79def52bcee3f1dca6559 cros-workon 4ad6e6491a1010ad7c875302b3be18ba git-r3 0d4635eeb5a96cd5315597a47eba25c9 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs f164325a2cdb5b3ea39311d483988861 _eclasses_=cargo c11c4632a7a9d8e0b76e9f4412e76163 cros-workon 4ad6e6491a1010ad7c875302b3be18ba git-r3 0d4635eeb5a96cd5315597a47eba25c9 multiprocessing cac3169468f893670dac3e7cb940e045
_md5_=4a20d69991569c1fde1dcecf6a03a3f2 _md5_=fdcbfd1afab588ec661e4b21e0ae8dc3

View File

@ -1,7 +1,7 @@
BDEPEND=virtual/cargo >=dev-vcs/git-1.8.2.1[curl]
DEFINED_PHASES=compile info install unpack DEFINED_PHASES=compile info install unpack
DEPEND=|| ( dev-libs/rustlib:= dev-util/cargo ) >=dev-vcs/git-1.8.2.1[curl]
DESCRIPTION=Utility for managing OpenSSH authorized public keys DESCRIPTION=Utility for managing OpenSSH authorized public keys
EAPI=6 EAPI=7
HOMEPAGE=https://github.com/coreos/update-ssh-keys HOMEPAGE=https://github.com/coreos/update-ssh-keys
IUSE=debug cros_workon_tree_ profiling IUSE=debug cros_workon_tree_ profiling
KEYWORDS=~amd64 ~arm64 KEYWORDS=~amd64 ~arm64
@ -9,5 +9,5 @@ LICENSE=Apache-2.0
RDEPEND=!<coreos-base/coreos-init-0.0.1-r152 RDEPEND=!<coreos-base/coreos-init-0.0.1-r152
SLOT=0 SLOT=0
SRC_URI=https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/arrayref/0.3.5/download -> arrayref-0.3.5.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/base64/0.9.2/download -> base64-0.9.2.crate https://crates.io/api/v1/crates/bitflags/1.0.3/download -> bitflags-1.0.3.crate https://crates.io/api/v1/crates/block-buffer/0.3.3/download -> block-buffer-0.3.3.crate https://crates.io/api/v1/crates/byte-tools/0.2.0/download -> byte-tools-0.2.0.crate https://crates.io/api/v1/crates/byteorder/1.2.4/download -> byteorder-1.2.4.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/digest/0.7.5/download -> digest-0.7.5.crate https://crates.io/api/v1/crates/error-chain/0.12.0/download -> error-chain-0.12.0.crate https://crates.io/api/v1/crates/fake-simd/0.1.2/download -> fake-simd-0.1.2.crate https://crates.io/api/v1/crates/fs2/0.4.3/download -> fs2-0.4.3.crate https://crates.io/api/v1/crates/generic-array/0.9.0/download -> generic-array-0.9.0.crate https://crates.io/api/v1/crates/libc/0.2.43/download -> libc-0.2.43.crate https://crates.io/api/v1/crates/md-5/0.7.0/download -> md-5-0.7.0.crate https://crates.io/api/v1/crates/openssh-keys/0.3.0/download -> openssh-keys-0.3.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.40/download -> redox_syscall-0.1.40.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/safemem/0.2.0/download -> safemem-0.2.0.crate https://crates.io/api/v1/crates/sha2/0.7.1/download -> sha2-0.7.1.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/typenum/1.10.0/download -> typenum-1.10.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/users/0.7.0/download -> users-0.7.0.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/winapi/0.3.5/download -> winapi-0.3.5.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate SRC_URI=https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/arrayref/0.3.5/download -> arrayref-0.3.5.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/base64/0.9.2/download -> base64-0.9.2.crate https://crates.io/api/v1/crates/bitflags/1.0.3/download -> bitflags-1.0.3.crate https://crates.io/api/v1/crates/block-buffer/0.3.3/download -> block-buffer-0.3.3.crate https://crates.io/api/v1/crates/byte-tools/0.2.0/download -> byte-tools-0.2.0.crate https://crates.io/api/v1/crates/byteorder/1.2.4/download -> byteorder-1.2.4.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/digest/0.7.5/download -> digest-0.7.5.crate https://crates.io/api/v1/crates/error-chain/0.12.0/download -> error-chain-0.12.0.crate https://crates.io/api/v1/crates/fake-simd/0.1.2/download -> fake-simd-0.1.2.crate https://crates.io/api/v1/crates/fs2/0.4.3/download -> fs2-0.4.3.crate https://crates.io/api/v1/crates/generic-array/0.9.0/download -> generic-array-0.9.0.crate https://crates.io/api/v1/crates/libc/0.2.43/download -> libc-0.2.43.crate https://crates.io/api/v1/crates/md-5/0.7.0/download -> md-5-0.7.0.crate https://crates.io/api/v1/crates/openssh-keys/0.3.0/download -> openssh-keys-0.3.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.40/download -> redox_syscall-0.1.40.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/safemem/0.2.0/download -> safemem-0.2.0.crate https://crates.io/api/v1/crates/sha2/0.7.1/download -> sha2-0.7.1.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/typenum/1.10.0/download -> typenum-1.10.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/users/0.7.0/download -> users-0.7.0.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/winapi/0.3.5/download -> winapi-0.3.5.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
_eclasses_=cargo c11c4632a7a9d8e0b76e9f4412e76163 coreos-cargo ecc71b7f40f79def52bcee3f1dca6559 cros-workon 4ad6e6491a1010ad7c875302b3be18ba git-r3 0d4635eeb5a96cd5315597a47eba25c9 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs f164325a2cdb5b3ea39311d483988861 _eclasses_=cargo c11c4632a7a9d8e0b76e9f4412e76163 cros-workon 4ad6e6491a1010ad7c875302b3be18ba git-r3 0d4635eeb5a96cd5315597a47eba25c9 multiprocessing cac3169468f893670dac3e7cb940e045
_md5_=4a20d69991569c1fde1dcecf6a03a3f2 _md5_=fdcbfd1afab588ec661e4b21e0ae8dc3