diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/coreos-sb-keys-0.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/coreos-sb-keys-0.0.3.ebuild similarity index 74% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/coreos-sb-keys-0.0.2.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/coreos-sb-keys-0.0.3.ebuild index f2933ee722..e4c528394f 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/coreos-sb-keys-0.0.2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/coreos-sb-keys-0.0.3.ebuild @@ -3,7 +3,7 @@ EAPI=7 -DESCRIPTION="Flatcar Secure Boot keys" +DESCRIPTION="Flatshimr Secure Boot keys" HOMEPAGE="" SRC_URI="" LICENSE="BSD" @@ -21,8 +21,7 @@ src_install() { newins "${FILESDIR}/KEK.crt" KEK.crt newins "${FILESDIR}/DB.key" DB.key newins "${FILESDIR}/DB.crt" DB.crt - newins "${FILESDIR}/ca.key" ca.key - newins "${FILESDIR}/ca.der" ca.der - newins "${FILESDIR}/ca.pem" ca.pem - newins " + 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/coreos-base/coreos-sb-keys/files/flatcar-stg-ca.der b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/files/shim.der similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/files/flatcar-stg-ca.der rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/files/shim.der diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/files/flatcar-stg-ca.key b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/files/shim.key similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/files/flatcar-stg-ca.key rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/files/shim.key diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/files/flatcar-stg-ca.pem b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/files/shim.pem similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/files/flatcar-stg-ca.pem rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/files/shim.pem 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 0b82ae152b..e00a6a19e9 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 @@ -45,10 +45,6 @@ src_compile() { # 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. - insinto /usr/share/sb_keys - newins "${FILESDIR}/shim.der" shim.der - newins "${FILESDIR}/shim.rsa" shim.rsa - newins "${FILESDIR}/shim.pem" shim.pem if use amd64; then emake_args+=( ARCH=x86_64 ) elif use arm64; then