From 2c4f71d70ba3b7a71e13d40ba406aa64c3354492 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 24 Sep 2021 17:36:59 +0200 Subject: [PATCH] *: 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}"