From 1f61b80842470c18d8d208c0ce1521c516365396 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 16 Sep 2021 18:58:00 +0200 Subject: [PATCH 1/4] *: Get rid of EAPI 2 --- .../coreos-overlay/app-torcx/docker/docker-20.10.ebuild | 4 +++- ...oem-gce-0.0.1-r4.ebuild => coreos-oem-gce-0.0.1-r5.ebuild} | 0 .../coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1.ebuild | 2 +- .../{coreos-0.0.1-r300.ebuild => coreos-0.0.1-r301.ebuild} | 0 .../coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild | 2 +- ...-0.0.1-r198.ebuild => hard-host-depends-0.0.1-r199.ebuild} | 0 .../hard-host-depends/hard-host-depends-0.0.1.ebuild | 2 +- .../{linux-sources-2-r1.ebuild => linux-sources-2-r2.ebuild} | 2 +- 8 files changed, 7 insertions(+), 5 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/{coreos-oem-gce-0.0.1-r4.ebuild => coreos-oem-gce-0.0.1-r5.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/{coreos-0.0.1-r300.ebuild => coreos-0.0.1-r301.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/{hard-host-depends-0.0.1-r198.ebuild => hard-host-depends-0.0.1-r199.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/virtual/linux-sources/{linux-sources-2-r1.ebuild => linux-sources-2-r2.ebuild} (97%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild index 511ff65181..8b8c6ee877 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild @@ -1,7 +1,7 @@ # Copyright (c) 2017-2018 CoreOS, Inc.. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=2 +EAPI=7 DESCRIPTION="Packages to be installed in a torcx image for Docker" @@ -20,6 +20,8 @@ RDEPEND=" ~sys-process/tini-0.19.0 " +S="${WORKDIR}" + src_install() { insinto /.torcx newins "${FILESDIR}/${P}-manifest.json" manifest.json diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1-r5.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1-r4.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1-r5.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1.ebuild index 1cbb0129ab..e1ee050a08 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1.ebuild @@ -1,7 +1,7 @@ # Copyright (c) 2016 CoreOS, Inc.. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=2 +EAPI=7 DESCRIPTION="CoreOS OEM suite for Google Compute Engine (meta package)" HOMEPAGE="" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r300.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r301.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r300.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r301.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild index 9235e6d9ea..a5840d4435 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild @@ -1,7 +1,7 @@ # Copyright (c) 2011 The Chromium OS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=2 +EAPI=7 DESCRIPTION="CoreOS (meta package)" HOMEPAGE="http://coreos.com" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r198.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r199.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r198.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r199.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild index 5d280210e1..e0a7288e01 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild @@ -1,7 +1,7 @@ # Copyright (c) 2009 The Chromium OS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=2 +EAPI=7 DESCRIPTION="List of packages that are needed on the buildhost (meta package)" HOMEPAGE="http://src.chromium.org" diff --git a/sdk_container/src/third_party/coreos-overlay/virtual/linux-sources/linux-sources-2-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/virtual/linux-sources/linux-sources-2-r2.ebuild similarity index 97% rename from sdk_container/src/third_party/coreos-overlay/virtual/linux-sources/linux-sources-2-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/virtual/linux-sources/linux-sources-2-r2.ebuild index d8473fd1f6..b4fc6c411f 100644 --- a/sdk_container/src/third_party/coreos-overlay/virtual/linux-sources/linux-sources-2-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/virtual/linux-sources/linux-sources-2-r2.ebuild @@ -1,7 +1,7 @@ # Copyright (c) 2012 The CoreOS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=2 +EAPI=7 DESCRIPTION="CoreOS Kernel virtual package" HOMEPAGE="http://www.coreos.com" From 75ec7fbd42291e89689a86a88a351eafa9703326 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 16 Sep 2021 20:04:22 +0200 Subject: [PATCH 2/4] *: Get rid of EAPI 4 Only partially - I didn't touch app-shells/bash, since it's slated to be updated anyway. --- .../{toolbox-0.0.0-r14.ebuild => toolbox-0.0.0-r15.ebuild} | 0 .../coreos-overlay/app-admin/toolbox/toolbox-9999.ebuild | 2 +- .../app-crypt/tpmpolicy/tpmpolicy-20160404.ebuild | 2 +- ...{coreos-dev-0.1.0-r80.ebuild => coreos-dev-0.1.0-r81.ebuild} | 0 .../coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/{toolbox-0.0.0-r14.ebuild => toolbox-0.0.0-r15.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/{coreos-dev-0.1.0-r80.ebuild => coreos-dev-0.1.0-r81.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-0.0.0-r14.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-0.0.0-r15.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-0.0.0-r14.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-0.0.0-r15.ebuild 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 16abb4c25d..058620a460 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 @@ -1,7 +1,7 @@ # Copyright (c) 2014 CoreOS, Inc.. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=7 CROS_WORKON_PROJECT="kinvolk/toolbox" CROS_WORKON_LOCALNAME="toolbox" CROS_WORKON_REPO="git://github.com" diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/tpmpolicy/tpmpolicy-20160404.ebuild b/sdk_container/src/third_party/coreos-overlay/app-crypt/tpmpolicy/tpmpolicy-20160404.ebuild index e954127abd..4f085209f8 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-crypt/tpmpolicy/tpmpolicy-20160404.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-crypt/tpmpolicy/tpmpolicy-20160404.ebuild @@ -2,7 +2,7 @@ # Copyright 2016 CoreOS, Inc # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI=7 DESCRIPTION="Tools for generating TPM policy" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r80.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r81.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r80.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r81.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 74d5eed7f0..ceff6d2076 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 @@ -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 -EAPI="4" +EAPI=7 DESCRIPTION="CoreOS developer images and containers (meta package)" HOMEPAGE="http://coreos.com" From ac73ae991d1d4644ababbe3d70f01e9f2ba585c0 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 21 Sep 2021 17:04:41 +0200 Subject: [PATCH 3/4] *: Get rid of EAPI 5 Only partially - I didn't touch sys-auth/polkit, since it's slated to be updated anyway. --- .../open-vmdk/open-vmdk-1.0.ebuild | 2 +- .../xenserver-pv-version-6.2.0.ebuild | 7 ++++--- .../xenstore/xenstore-4.14.2.ebuild | 3 ++- .../ca-certificates-3.27.1-r3.ebuild | 2 +- .../coreos-au-key/coreos-au-key-0.0.2.ebuild | 2 +- ...70.ebuild => coreos-init-0.0.1-r171.ebuild} | 0 .../coreos-init/coreos-init-9999.ebuild | 2 +- .../coreos-sb-keys/coreos-sb-keys-0.0.1.ebuild | 2 +- .../nova-agent-container-0.0.1.ebuild | 2 +- .../oem-azure-pro/oem-azure-pro-2.3.1.1.ebuild | 3 ++- .../oem-azure/oem-azure-2.3.1.1.ebuild | 3 ++- .../oem-cloudsigma-0.0.3-r2.ebuild | 3 ++- .../oem-cloudstack/oem-cloudstack-0.0.4.ebuild | 3 ++- .../oem-digitalocean-0.1.1.ebuild | 3 ++- .../oem-ec2-compat/oem-ec2-compat-0.1.2.ebuild | 3 ++- .../oem-exoscale/oem-exoscale-0.0.5.ebuild | 3 ++- .../oem-gce/oem-gce-20180823-r2.ebuild | 3 ++- .../oem-hyperv/oem-hyperv-0.1.0.ebuild | 3 ++- .../oem-interoute-0.0.3-r1.ebuild | 3 ++- .../oem-niftycloud-0.0.3-r1.ebuild | 3 ++- .../oem-packet/oem-packet-0.2.2.ebuild | 3 ++- .../coreos-base/oem-qemu/oem-qemu-0.0.1.ebuild | 4 ++-- .../oem-rackspace-onmetal-0.0.8-r1.ebuild | 3 ++- .../oem-rackspace-0.0.4-r2.ebuild | 3 ++- .../oem-vagrant-key-0.0.3.ebuild | 2 +- .../oem-vagrant-virtualbox-0.0.2.ebuild | 2 +- .../oem-vagrant/oem-vagrant-0.0.3.ebuild | 3 ++- .../oem-virtualbox/oem-virtualbox-0.0.1.ebuild | 3 ++- .../oem-vmware/oem-vmware-11.3.0.ebuild | 3 ++- ...3.ebuild => update_engine-0.4.10-r4.ebuild} | 0 .../update_engine/update_engine-9999.ebuild | 18 +++++++++++------- .../board-packages/board-packages-0.0.1.ebuild | 2 +- .../sdk-depends/sdk-depends-0.0.1.ebuild | 2 +- .../coreos-overlay/eclass/coreos-kernel.eclass | 2 +- ....8-r1.ebuild => baselayout-3.6.8-r2.ebuild} | 0 .../sys-apps/baselayout/baselayout-9999.ebuild | 4 ++-- ...5-r2.ebuild => seismograph-2.2.5-r3.ebuild} | 0 .../seismograph/seismograph-9999.ebuild | 10 +++++++--- ...-r1.ebuild => shim-0.8_p20150423-r2.ebuild} | 0 .../sys-boot/shim/shim-9999.ebuild | 6 +++--- .../sysroot-wrappers-0.1.ebuild | 2 +- .../sysroot-wrappers-9999.ebuild | 5 +++-- ...-r9.ebuild => bootengine-0.0.38-r10.ebuild} | 0 .../bootengine/bootengine-9999.ebuild | 4 ++-- .../coreos-kernel/coreos-kernel-5.10.70.ebuild | 9 +++++---- .../coreos-modules-5.10.70.ebuild | 3 ++- .../coreos-sources-5.10.70.ebuild | 2 +- ...2.30.ebuild => nss-usrfiles-2.30-r1.ebuild} | 0 .../nss-usrfiles/nss-usrfiles-9999.ebuild | 2 +- 49 files changed, 91 insertions(+), 61 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/{coreos-init-0.0.1-r170.ebuild => coreos-init-0.0.1-r171.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/{update_engine-0.4.10-r3.ebuild => update_engine-0.4.10-r4.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/{baselayout-3.6.8-r1.ebuild => baselayout-3.6.8-r2.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/{seismograph-2.2.5-r2.ebuild => seismograph-2.2.5-r3.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-boot/shim/{shim-0.8_p20150423-r1.ebuild => shim-0.8_p20150423-r2.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/{bootengine-0.0.38-r9.ebuild => bootengine-0.0.38-r10.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/{nss-usrfiles-2.30.ebuild => nss-usrfiles-2.30-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vmdk/open-vmdk-1.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vmdk/open-vmdk-1.0.ebuild index 2c3ce7e7e3..44916caa32 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vmdk/open-vmdk-1.0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vmdk/open-vmdk-1.0.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=5 +EAPI=7 inherit git-r3 diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/xenserver-pv-version/xenserver-pv-version-6.2.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/xenserver-pv-version/xenserver-pv-version-6.2.0.ebuild index 1ef244081f..dca7ab0561 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/xenserver-pv-version/xenserver-pv-version-6.2.0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/xenserver-pv-version/xenserver-pv-version-6.2.0.ebuild @@ -2,9 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=5 +EAPI=7 -inherit systemd versionator +inherit systemd DESCRIPTION="Fake data for XenServer's PV driver version detection." HOMEPAGE="http://xenserver.org/" @@ -21,7 +21,8 @@ RDEPEND="app-emulation/xenstore" S="${WORKDIR}" src_prepare() { - local split=($(get_version_components)) + default + local split=($(ver_cut 1-3)) sed -e "s/@@MAJOR@@/${split[0]}/" \ -e "s/@@MINOR@@/${split[1]}/" \ -e "s/@@MICRO@@/${split[2]}/" \ diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/xenstore-4.14.2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/xenstore-4.14.2.ebuild index 186e62ca29..bf16b9e108 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/xenstore-4.14.2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/xenstore-4.14.2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.4.0.ebuild,v 1.3 2014/04/04 01:06:31 idella4 Exp $ -EAPI=5 +EAPI=7 PYTHON_COMPAT=( python3_6 ) @@ -47,6 +47,7 @@ pkg_setup() { } src_prepare() { + default cp "${FILESDIR}"/config.h tools/ || die cp "${FILESDIR}"/Tools.mk config/ || die } diff --git a/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-3.27.1-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-3.27.1-r3.ebuild index c6e528c7b4..c367c9526b 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-3.27.1-r3.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-3.27.1-r3.ebuild @@ -1,7 +1,7 @@ # Copyright 2014 The CoreOS Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 PYTHON_COMPAT=( python3_6 ) inherit python-any-r1 systemd diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/coreos-au-key-0.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/coreos-au-key-0.0.2.ebuild index 6c85bcb334..e933aa3efa 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/coreos-au-key-0.0.2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/coreos-au-key-0.0.2.ebuild @@ -1,7 +1,7 @@ # Copyright (c) 2013 CoreOS Inc. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 DESCRIPTION="CoreOS auto update signing keys." HOMEPAGE="http://github.com/coreos/" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r170.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r171.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r170.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r171.ebuild 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 b57f0dedac..57813346c6 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 @@ -2,7 +2,7 @@ # Copyright (c) 2011 The Chromium OS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 CROS_WORKON_PROJECT="flatcar-linux/init" CROS_WORKON_LOCALNAME="init" CROS_WORKON_REPO="git://github.com" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/coreos-sb-keys-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/coreos-sb-keys-0.0.1.ebuild index ac8c0c70d1..9ff15fdf5d 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/coreos-sb-keys-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/coreos-sb-keys-0.0.1.ebuild @@ -1,7 +1,7 @@ # Copyright (c) 2015 CoreOS Inc. # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 DESCRIPTION="CoreOS Secure Boot keys" HOMEPAGE="" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-container/nova-agent-container-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-container/nova-agent-container-0.0.1.ebuild index 66342e6c3d..5c38688da0 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-container/nova-agent-container-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-container/nova-agent-container-0.0.1.ebuild @@ -1,7 +1,7 @@ # Copyright (c) 2013 CoreOS, Inc.. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 DESCRIPTION="nova agent for rackspace images" HOMEPAGE="https://github.com/coreos/nova-agent-container" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/oem-azure-pro-2.3.1.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/oem-azure-pro-2.3.1.1.ebuild index 814422b60e..66586de476 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/oem-azure-pro-2.3.1.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/oem-azure-pro-2.3.1.1.ebuild @@ -1,7 +1,7 @@ # Copyright (c) 2013 CoreOS, Inc.. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 DESCRIPTION="OEM suite for Azure" HOMEPAGE="" @@ -24,6 +24,7 @@ RDEPEND=" " src_prepare() { + default sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ "${FILESDIR}/oem-release" > "${T}/oem-release" || die } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.3.1.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.3.1.1.ebuild index 1cb5cd1d94..b590cfed26 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.3.1.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.3.1.1.ebuild @@ -1,7 +1,7 @@ # Copyright (c) 2013 CoreOS, Inc.. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 DESCRIPTION="OEM suite for Azure" HOMEPAGE="" @@ -18,6 +18,7 @@ S="${WORKDIR}" RDEPEND="~app-emulation/wa-linux-agent-${PV}" src_prepare() { + default sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ "${FILESDIR}/oem-release" > "${T}/oem-release" || die } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.3-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.3-r2.ebuild index 4fcbd33c51..a847e20728 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.3-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.3-r2.ebuild @@ -1,7 +1,7 @@ # Copyright (c) 2015 CoreOS, Inc.. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 DESCRIPTION="OEM suite for CloudSigma images" HOMEPAGE="" @@ -15,6 +15,7 @@ KEYWORDS="amd64 x86" S="${WORKDIR}" src_prepare() { + default sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ "${FILESDIR}/cloud-config.yml" > "${T}/cloud-config.yml" || die } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/oem-cloudstack-0.0.4.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/oem-cloudstack-0.0.4.ebuild index 58ed44114c..2dc8b8e901 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/oem-cloudstack-0.0.4.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/oem-cloudstack-0.0.4.ebuild @@ -5,7 +5,7 @@ # $Header:$ # -EAPI=5 +EAPI=7 DESCRIPTION="OEM suite for CloudStack images" HOMEPAGE="" @@ -20,6 +20,7 @@ IUSE="" S="${WORKDIR}" src_prepare() { + default sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ "${FILESDIR}/cloud-config.yml" > "${T}/cloud-config.yml" || die } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.1.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.1.1.ebuild index 09875c4dab..ec4976d690 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.1.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.1.1.ebuild @@ -1,7 +1,7 @@ # Copyright (c) 2014 CoreOS, Inc.. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 DESCRIPTION="OEM suite for DigitalOcean images" HOMEPAGE="" @@ -15,6 +15,7 @@ KEYWORDS="amd64 x86" S="${WORKDIR}" src_prepare() { + default sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ "${FILESDIR}/oem-release" > "${T}/oem-release" || die } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2.ebuild index f02447c2fb..a4377abd31 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2.ebuild @@ -1,7 +1,7 @@ # Copyright (c) 2013 CoreOS, Inc.. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 DESCRIPTION="OEM suite for EC2 compatible images" HOMEPAGE="" @@ -25,6 +25,7 @@ RDEPEND=" S="${WORKDIR}" src_prepare() { + default if use ec2 || use aws_pro ; then ID="ami" if use ec2; then diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/oem-exoscale-0.0.5.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/oem-exoscale-0.0.5.ebuild index e04c0e2e30..51ef86022d 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/oem-exoscale-0.0.5.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/oem-exoscale-0.0.5.ebuild @@ -5,7 +5,7 @@ # $Header:$ # -EAPI=5 +EAPI=7 DESCRIPTION="OEM suite for Exoscale images" HOMEPAGE="" @@ -20,6 +20,7 @@ IUSE="" S="${WORKDIR}" src_prepare() { + default sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ "${FILESDIR}/cloud-config.yml" > "${T}/cloud-config.yml" || die } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-20180823-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-20180823-r2.ebuild index 51cbe03839..67dec02712 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-20180823-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-20180823-r2.ebuild @@ -1,7 +1,7 @@ # Copyright (c) 2013 CoreOS, Inc.. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 DESCRIPTION="OEM suite for Google Compute Engine images" HOMEPAGE="" @@ -16,6 +16,7 @@ IUSE="" S="${WORKDIR}" src_prepare() { + default sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ "${FILESDIR}/oem-release" > "${T}/oem-release" || die } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/oem-hyperv-0.1.0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/oem-hyperv-0.1.0.ebuild index e0df989086..30eb2ec8a0 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/oem-hyperv-0.1.0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/oem-hyperv-0.1.0.ebuild @@ -1,7 +1,7 @@ # Copyright (c) 2013 CoreOS, Inc.. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 DESCRIPTION="OEM suite for Hyper-V" HOMEPAGE="" @@ -16,6 +16,7 @@ IUSE="" S="${WORKDIR}" src_prepare() { + default sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ "${FILESDIR}/oem-release" > "${T}/oem-release" || die } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/oem-interoute-0.0.3-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/oem-interoute-0.0.3-r1.ebuild index fc0f4a6d08..b53f7aec86 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/oem-interoute-0.0.3-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/oem-interoute-0.0.3-r1.ebuild @@ -5,7 +5,7 @@ # $Header:$ # -EAPI=5 +EAPI=7 DESCRIPTION="OEM suite for Interoute images" HOMEPAGE="" @@ -25,6 +25,7 @@ RDEPEND="${DEPEND}" S="${WORKDIR}" src_prepare() { + default sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ "${FILESDIR}/cloud-config.yml" > "${T}/cloud-config.yml" || die } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/oem-niftycloud-0.0.3-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/oem-niftycloud-0.0.3-r1.ebuild index b95034f7ff..c9701bdd87 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/oem-niftycloud-0.0.3-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/oem-niftycloud-0.0.3-r1.ebuild @@ -1,7 +1,7 @@ # Copyright (c) 2014 NIFTY Corp.. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 DESCRIPTION="OEM suite for NIFTY Cloud images" HOMEPAGE="" @@ -21,6 +21,7 @@ DEPEND=" RDEPEND="${DEPEND}" src_prepare() { + default sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ "${FILESDIR}/cloud-config.yml" > "${T}/cloud-config.yml" || die } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.2.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.2.2.ebuild index 1fdc7b134c..4551e0bf8b 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.2.2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.2.2.ebuild @@ -1,7 +1,7 @@ # Copyright (c) 2014 CoreOS, Inc.. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 DESCRIPTION="OEM suite for Packet images" HOMEPAGE="" @@ -15,6 +15,7 @@ KEYWORDS="amd64 arm64 x86" S="${WORKDIR}" src_prepare() { + default sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ "${FILESDIR}/oem-release" > "${T}/oem-release" || die } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-qemu/oem-qemu-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-qemu/oem-qemu-0.0.1.ebuild index 2f23620656..22b47c2ef6 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-qemu/oem-qemu-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-qemu/oem-qemu-0.0.1.ebuild @@ -1,7 +1,7 @@ # Copyright (c) 2020 Kinvolk GmbH. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 DESCRIPTION="OEM suite for QEMU" HOMEPAGE="" @@ -16,6 +16,7 @@ IUSE="" S="${WORKDIR}" src_prepare() { + default sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ "${FILESDIR}/oem-release" > "${T}/oem-release" || die } @@ -25,4 +26,3 @@ src_install() { doins "${FILESDIR}/grub.cfg" doins "${T}/oem-release" } - diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/oem-rackspace-onmetal-0.0.8-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/oem-rackspace-onmetal-0.0.8-r1.ebuild index f78486240c..f896684cca 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/oem-rackspace-onmetal-0.0.8-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/oem-rackspace-onmetal-0.0.8-r1.ebuild @@ -1,7 +1,7 @@ # Copyright (c) 2013 CoreOS, Inc.. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 DESCRIPTION="OEM suite for Rackspace Teeth images" HOMEPAGE="" @@ -15,6 +15,7 @@ KEYWORDS="amd64 x86" S="${WORKDIR}" src_prepare() { + default sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ "${FILESDIR}/cloud-config.yml" > "${T}/cloud-config.yml" || die } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.4-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.4-r2.ebuild index da915ec43a..246c6c63bd 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.4-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.4-r2.ebuild @@ -5,7 +5,7 @@ # $Header:$ # -EAPI=5 +EAPI=7 DESCRIPTION="oem suite for rackspace images" HOMEPAGE="" @@ -24,6 +24,7 @@ RDEPEND=" S="${WORKDIR}" src_prepare() { + default sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ "${FILESDIR}/cloud-config.yml" > "${T}/cloud-config.yml" || die } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/oem-vagrant-key-0.0.3.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/oem-vagrant-key-0.0.3.ebuild index ef997f3477..82b074789d 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/oem-vagrant-key-0.0.3.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/oem-vagrant-key-0.0.3.ebuild @@ -1,7 +1,7 @@ # Copyright 2013 The CoreOS Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 DESCRIPTION="OEM suite for login access via Vagrant's ssh key." HOMEPAGE="" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-virtualbox/oem-vagrant-virtualbox-0.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-virtualbox/oem-vagrant-virtualbox-0.0.2.ebuild index e5b365c8c3..2bfcd7b39b 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-virtualbox/oem-vagrant-virtualbox-0.0.2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-virtualbox/oem-vagrant-virtualbox-0.0.2.ebuild @@ -1,7 +1,7 @@ # Copyright 2017 The CoreOS Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 DESCRIPTION="OEM suite for vagrant images (virtualbox)" HOMEPAGE="" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.3.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.3.ebuild index cb0851f4a9..97dbbee8c7 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.3.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.3.ebuild @@ -1,7 +1,7 @@ # Copyright 2013 The CoreOS Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 DESCRIPTION="OEM suite for vagrant images" HOMEPAGE="" @@ -16,6 +16,7 @@ IUSE="" S="${WORKDIR}" src_prepare() { + default sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ "${FILESDIR}/cloud-config.yml" > "${T}/cloud-config.yml" || die } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-virtualbox/oem-virtualbox-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-virtualbox/oem-virtualbox-0.0.1.ebuild index 4e132a52e3..5ed1442b9e 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-virtualbox/oem-virtualbox-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-virtualbox/oem-virtualbox-0.0.1.ebuild @@ -1,7 +1,7 @@ # Copyright (c) 2013 CoreOS, Inc.. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 DESCRIPTION="OEM suite for VirtualBox" HOMEPAGE="" @@ -16,6 +16,7 @@ IUSE="" S="${WORKDIR}" src_prepare() { + default sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ "${FILESDIR}/oem-release" > "${T}/oem-release" || die } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/oem-vmware-11.3.0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/oem-vmware-11.3.0.ebuild index d5ed791294..6b09b72c9f 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/oem-vmware-11.3.0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/oem-vmware-11.3.0.ebuild @@ -1,7 +1,7 @@ # Copyright (c) 2014 CoreOS, Inc.. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 DESCRIPTION="OEM suite for VMware" HOMEPAGE="https://github.com/flatcar-linux/coreos-overlay/tree/main/coreos-base" @@ -21,6 +21,7 @@ RDEPEND="${DEPEND}" S="${WORKDIR}" src_prepare() { + default sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \ "${FILESDIR}/oem-release" > "${T}/oem-release" || die } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r4.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r3.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r4.ebuild 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 23ed998c5a..2ee1c0ef3d 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 @@ -1,10 +1,9 @@ # Copyright (c) 2012 The Chromium OS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 CROS_WORKON_PROJECT="flatcar-linux/update_engine" CROS_WORKON_REPO="git://github.com" -AUTOTOOLS_AUTORECONF=1 if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" @@ -13,7 +12,7 @@ else KEYWORDS="amd64 arm64" fi -inherit autotools-utils flag-o-matic toolchain-funcs cros-workon systemd +inherit autotools flag-o-matic toolchain-funcs cros-workon systemd DESCRIPTION="CoreOS OS Update Engine" HOMEPAGE="https://github.com/coreos/update_engine" @@ -42,6 +41,11 @@ DEPEND="dev-cpp/gtest ${BDEPEND} ${RDEPEND}" +src_prepare() { + default + eautoreconf +} + src_configure() { # Disable PIE when building for the SDK, this works around a bug that # breaks using delta_generator from the update.zip bundle. @@ -55,24 +59,24 @@ src_configure() { # Work around new gdbus-codegen output. append-flags -Wno-unused-function - local myeconfargs=( + local myconf=( $(use_enable cros-debug debug) $(use_enable delta_generator) ) - autotools-utils_src_configure + econf "${myconf[@]}" } src_test() { if use cros_host; then - autotools-utils_src_test + default else ewarn "Skipping tests on cross-compiled target platform..." fi } src_install() { - autotools-utils_src_install + default if use symlink-usr; then dosym sbin/flatcar-postinst /usr/postinst diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild index 0864ce59f0..4721b05207 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=5 +EAPI=7 DESCRIPTION="Meta ebuild for building all binary packages." HOMEPAGE="http://coreos.com/docs/sdk/" 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 1e0c327f0a..4744a8d206 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 @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=5 +EAPI=7 DESCRIPTION="Meta ebuild for everything that needs to be in the SDK." HOMEPAGE="http://coreos.com/docs/sdk/" diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass index 82a9ce32b8..ca62377c96 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass +++ b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass @@ -25,7 +25,7 @@ COREOS_SOURCE_VERSION="${PV}${COREOS_SOURCE_REVISION}" COREOS_KERNEL_SOURCE_NAME="linux-${PV/_rc/-rc}-coreos${COREOS_SOURCE_REVISION}" COREOS_SOURCE_NAME="linux-${PV/_rc/-rc}-flatcar" -[[ ${EAPI} != "5" ]] && die "Only EAPI=5 is supported" +[[ ${EAPI} != "7" ]] && die "Only EAPI=7 is supported" inherit linux-info toolchain-funcs diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.8-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.8-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.8-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.8-r2.ebuild 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 ba4771c959..5de14d7d0d 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 @@ -1,7 +1,7 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 CROS_WORKON_PROJECT="flatcar-linux/baselayout" CROS_WORKON_LOCALNAME="baselayout" CROS_WORKON_REPO="git://github.com" @@ -13,7 +13,7 @@ else KEYWORDS="amd64 arm arm64 x86" fi -inherit cros-workon eutils multilib systemd +inherit cros-workon multilib systemd DESCRIPTION="Filesystem baselayout for CoreOS" HOMEPAGE="http://www.coreos.com/" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-2.2.5-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-2.2.5-r3.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-2.2.5-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-2.2.5-r3.ebuild 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 69378cfdbe..824f807123 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 @@ -1,10 +1,9 @@ # Copyright (c) 2015 The CoreOS OS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 CROS_WORKON_PROJECT="flatcar-linux/seismograph" CROS_WORKON_REPO="git://github.com" -AUTOTOOLS_AUTORECONF=1 if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" @@ -13,7 +12,7 @@ else KEYWORDS="amd64 arm arm64 x86" fi -inherit autotools-utils cros-workon +inherit autotools cros-workon DESCRIPTION="CoreOS Disk Utilities (e.g. cgpt)" LICENSE="BSD" @@ -25,3 +24,8 @@ RDEPEND="!coreos-base/vboot_reference sys-apps/util-linux sys-fs/e2fsprogs" DEPEND="${RDEPEND}" + +src_prepare() { + default + eautoreconf +} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/shim/shim-0.8_p20150423-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/shim/shim-0.8_p20150423-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-boot/shim/shim-0.8_p20150423-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-boot/shim/shim-0.8_p20150423-r2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/shim/shim-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/shim/shim-9999.ebuild index 8fe17d8c1f..03ccf06f14 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-boot/shim/shim-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/shim/shim-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 2015 CoreOS, Inc. # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 CROS_WORKON_PROJECT="flatcar-linux/shim" CROS_WORKON_REPO="git://github.com" @@ -32,8 +32,8 @@ src_unpack() { src_compile() { emake \ CROSS_COMPILE="${CHOST}-" \ - EFI_INCLUDE="${ROOT}"usr/include/efi \ - EFI_PATH="${ROOT}"usr/$(get_libdir) \ + EFI_INCLUDE="${SYSROOT%/}"/usr/include/efi \ + EFI_PATH="${SYSROOT%/}"/usr/$(get_libdir) \ shim.efi || die } diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/sysroot-wrappers/sysroot-wrappers-0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-devel/sysroot-wrappers/sysroot-wrappers-0.1.ebuild index 32a23b8d89..16f5b00d29 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-devel/sysroot-wrappers/sysroot-wrappers-0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/sysroot-wrappers/sysroot-wrappers-0.1.ebuild @@ -1,7 +1,7 @@ # Copyright (c) 2013 CoreOS Inc. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 DESCRIPTION="Build tool wrappers for using custom SYSROOTs" HOMEPAGE="https://github.com/coreos/sysroot-wrappers" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/sysroot-wrappers/sysroot-wrappers-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-devel/sysroot-wrappers/sysroot-wrappers-9999.ebuild index 1004150a7e..2d6741f5a1 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-devel/sysroot-wrappers/sysroot-wrappers-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-devel/sysroot-wrappers/sysroot-wrappers-9999.ebuild @@ -1,9 +1,9 @@ # Copyright (c) 2013 CoreOS Inc. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit autotools git-2 +inherit autotools git-r3 DESCRIPTION="Build tool wrappers for using custom SYSROOTs" HOMEPAGE="https://github.com/coreos/sysroot-wrappers" @@ -16,5 +16,6 @@ KEYWORDS="-*" IUSE="" src_prepare() { + default eautoreconf } diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r9.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r10.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r9.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r10.ebuild 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 f28794f03d..d4c41cd1cf 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 @@ -1,7 +1,7 @@ # Copyright (c) 2013 CoreOS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 CROS_WORKON_PROJECT="flatcar-linux/bootengine" CROS_WORKON_LOCALNAME="bootengine" CROS_WORKON_OUTOFTREE_BUILD=1 @@ -14,7 +14,7 @@ else KEYWORDS="amd64 arm arm64 x86" fi -inherit cros-workon cros-debug +inherit cros-workon DESCRIPTION="CoreOS Bootengine" SRC_URI="" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-5.10.70.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-5.10.70.ebuild index 175e1b2e3a..1217ba82cb 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-5.10.70.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-5.10.70.ebuild @@ -1,7 +1,7 @@ # Copyright 2014-2016 CoreOS, Inc. # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 COREOS_SOURCE_REVISION="" inherit coreos-kernel @@ -55,21 +55,22 @@ pkg_setup() { } src_prepare() { + default # KV_OUT_DIR points to the minimal build tree installed by coreos-modules # Pull in the config and public module signing key - KV_OUT_DIR="${ROOT%/}/lib/modules/${COREOS_SOURCE_NAME#linux-}/build" + KV_OUT_DIR="${SYSROOT%/}/lib/modules/${COREOS_SOURCE_NAME#linux-}/build" cp -v "${KV_OUT_DIR}/.config" build/ || die local sig_key="$(getconfig MODULE_SIG_KEY)" mkdir -p "build/${sig_key%/*}" || die cp -v "${KV_OUT_DIR}/${sig_key}" "build/${sig_key}" || die # Symlink to bootengine.cpio so we can stick with relative paths in .config - ln -sv "${ROOT}"/usr/share/bootengine/bootengine.cpio build/ || die + ln -sv "${SYSROOT%/}"/usr/share/bootengine/bootengine.cpio build/ || die config_update 'CONFIG_INITRAMFS_SOURCE="bootengine.cpio"' config_update 'CONFIG_INITRAMFS_COMPRESSION_ZSTD=y' # include all intel and amd microcode files, avoiding the signatures - local fw_dir="${ROOT}lib/firmware" + local fw_dir="${SYSROOT%/}/lib/firmware" use amd64 && config_update "CONFIG_EXTRA_FIRMWARE=\"$(find ${fw_dir} -type f \ \( -path ${fw_dir}'/intel-ucode/*' -o -path ${fw_dir}'/amd-ucode/*' \) -printf '%P ')\"" use amd64 && config_update "CONFIG_EXTRA_FIRMWARE_DIR=\"${fw_dir}\"" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-5.10.70.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-5.10.70.ebuild index 685aa802e6..f615087d2d 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-5.10.70.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-5.10.70.ebuild @@ -1,7 +1,7 @@ # Copyright 2014-2016 CoreOS, Inc. # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 COREOS_SOURCE_REVISION="" inherit coreos-kernel savedconfig @@ -10,6 +10,7 @@ KEYWORDS="amd64 arm64" RDEPEND="! Date: Fri, 24 Sep 2021 17:36:59 +0200 Subject: [PATCH 4/4] *: Do not use ROOT in src_ functions The ROOT variable in EAPI 7 is available only in pkg_ functions, so switch the uses of the ROOT variable in the src_ functions to SYSROOT. --- .../app-emulation/docker-cli/docker-cli-20.10.8.ebuild | 4 ++-- .../app-emulation/docker-runc/docker-runc-1.0.2.ebuild | 4 ++-- .../google-oslogin/google-oslogin-20200910.00.ebuild | 2 +- ...e-20210919.ebuild => coreos-firmware-20210919-r1.ebuild} | 0 .../coreos-firmware/coreos-firmware-99999999.ebuild | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/{coreos-firmware-20210919.ebuild => coreos-firmware-20210919-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.8.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.8.ebuild index 9d34949169..e285a64f4d 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.8.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.8.ebuild @@ -40,8 +40,8 @@ src_compile() { # setup CFLAGS and LDFLAGS for separate build target # see https://github.com/tianon/docker-overlay/pull/10 # FLatcar: inject our own CFLAGS/LDFLAGS for torcx - export CGO_CFLAGS="${CGO_CFLAGS} -I${ROOT}/usr/include" - export CGO_LDFLAGS="${CGO_LDFLAGS} -L${ROOT}/usr/$(get_libdir)" + export CGO_CFLAGS="${CGO_CFLAGS} -I${SYSROOT}/usr/include" + export CGO_LDFLAGS="${CGO_LDFLAGS} -L${SYSROOT}/usr/$(get_libdir)" emake \ LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \ VERSION="$(cat VERSION)" \ diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.2.ebuild index c1e1b24ea5..07e4f0e7bd 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.2.ebuild @@ -42,9 +42,9 @@ PATCHES=( src_compile() { # Taken from app-emulation/docker-1.7.0-r1 - export CGO_CFLAGS="-I${ROOT}/usr/include" + export CGO_CFLAGS="-I${SYSROOT}/usr/include" export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '') - -L${ROOT}/usr/$(get_libdir)" + -L${SYSROOT}/usr/$(get_libdir)" # build up optional flags local options=( diff --git a/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/google-oslogin-20200910.00.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/google-oslogin-20200910.00.ebuild index 2bd73aa310..922096ca2c 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/google-oslogin-20200910.00.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/google-oslogin-20200910.00.ebuild @@ -32,7 +32,7 @@ src_prepare() { src_compile() { emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" \ VERSION=${PV} \ - JSON_INCLUDE_PATH="${ROOT%/}/usr/include/json-c" + JSON_INCLUDE_PATH="${SYSROOT%/}/usr/include/json-c" } src_install() { diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-20210919.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-20210919-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-20210919.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-20210919-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-99999999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-99999999.ebuild index 31df6f197c..73b6ae4f30 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-99999999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-99999999.ebuild @@ -4,8 +4,8 @@ EAPI=7 # Tell linux-info where to find the kernel source/build -KERNEL_DIR="${SYSROOT}/usr/src/linux" -KBUILD_OUTPUT="${SYSROOT}/var/cache/portage/sys-kernel/coreos-kernel" +KERNEL_DIR="${SYSROOT%/}/usr/src/linux" +KBUILD_OUTPUT="${SYSROOT%/}/var/cache/portage/sys-kernel/coreos-kernel" inherit linux-info savedconfig # In case this is a real snapshot, fill in commit below. @@ -102,7 +102,7 @@ src_unpack() { } src_prepare() { - local kernel_mods="${ROOT}/lib/modules/${KV_FULL}" + local kernel_mods="${SYSROOT%/}/lib/modules/${KV_FULL}" # Fail if any firmware is missing. einfo "Scanning for files required by ${KV_FULL}"