diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/coreos-sb-keys-0.0.3.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/coreos-sb-keys-0.0.3.ebuild index 2ef76a058f3..9e645e50b7d 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/coreos-sb-keys-0.0.3.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/coreos-sb-keys-0.0.3.ebuild @@ -14,16 +14,16 @@ IUSE="" S="${WORKDIR}" src_install() { - insinto /usr/share/sb_keys - newins "${FILESDIR}/PK.key" PK.key - newins "${FILESDIR}/PK.crt" PK.crt - newins "${FILESDIR}/KEK.key" KEK.key - newins "${FILESDIR}/KEK.crt" KEK.crt - newins "${FILESDIR}/DB.key" DB.key - newins "${FILESDIR}/DB.crt" DB.crt + insinto /usr/share/sb_keys + newins "${FILESDIR}/PK.key" PK.key + newins "${FILESDIR}/PK.crt" PK.crt + newins "${FILESDIR}/KEK.key" KEK.key + newins "${FILESDIR}/KEK.crt" KEK.crt + newins "${FILESDIR}/DB.key" DB.key + newins "${FILESDIR}/DB.crt" DB.crt - # shim keys - newins "${FILESDIR}/shim.key" shim.key + # shim keys + newins "${FILESDIR}/shim.key" shim.key newins "${FILESDIR}/shim.der" shim.der newins "${FILESDIR}/shim.pem" shim.pem } diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/shim/shim-15.7.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/shim/shim-15.7.ebuild index 40fadb89a7b..af215598e1f 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-boot/shim/shim-15.7.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/shim/shim-15.7.ebuild @@ -19,37 +19,37 @@ RDEPEND="" # to be addressed by patching this check out after making sure that # our copy of gnu-efi is as usable as the bundled one. DEPEND=" - dev-libs/openssl - coreos-base/coreos-sb-keys + dev-libs/openssl + coreos-base/coreos-sb-keys " src_compile() { - local emake_args=( - CROSS_COMPILE="${CHOST}-" - ) - # Apparently our environment already has the ARCH variable in - # it, and Makefile picks it up instead of figuring it out - # itself with the compiler -dumpmachine flag. But also it - # expects a different format of the values. It wants x86_64 - # instead of amd64, and aarch64 instead of arm64. - if use amd64; then - emake_args+=( ARCH=x86_64 ) - elif use arm64; then - emake_args+=( ARCH=aarch64 ) - fi - emake_args+=( ENABLE_SBSIGN=1 ) - emake_args+=( VENDOR_CERT_FILE="/usr/share/sb_keys/shim.der" ) - emake "${emake_args[@]}" || die + local emake_args=( + CROSS_COMPILE="${CHOST}-" + ) + # Apparently our environment already has the ARCH variable in + # it, and Makefile picks it up instead of figuring it out + # itself with the compiler -dumpmachine flag. But also it + # expects a different format of the values. It wants x86_64 + # instead of amd64, and aarch64 instead of arm64. + if use amd64; then + emake_args+=( ARCH=x86_64 ) + elif use arm64; then + emake_args+=( ARCH=aarch64 ) + fi + emake_args+=( ENABLE_SBSIGN=1 ) + emake_args+=( VENDOR_CERT_FILE="/usr/share/sb_keys/shim.der" ) + emake "${emake_args[@]}" || die } src_install() { - local suffix - suffix='' - if use amd64; then - suffix=x64 - elif use arm64; then - suffix=aa64 - fi - insinto /usr/lib/shim - newins "shim${suffix}.efi" 'shim.efi' - newins "mm${suffix}.efi" "mm${suffix}.efi" + local suffix + suffix='' + if use amd64; then + suffix=x64 + elif use arm64; then + suffix=aa64 + fi + insinto /usr/lib/shim + newins "shim${suffix}.efi" 'shim.efi' + newins "mm${suffix}.efi" "mm${suffix}.efi" }