From 44fc44f68efdf4b3597302b33028b88b24407cbf Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Wed, 3 Jan 2024 17:50:22 +0100 Subject: [PATCH 1/3] coreos-base/ue-rs: Update to latest fixes This pulls in the latest fixes as preparation for using ue-rs from bootengine and update-engine. --- .../third_party/coreos-overlay/coreos-base/ue-rs/Manifest | 5 +++-- .../ue-rs/{ue-rs-0.1.0-r4.ebuild => ue-rs-0.1.0-r5.ebuild} | 0 .../coreos-overlay/coreos-base/ue-rs/ue-rs-9999.ebuild | 7 ++++--- 3 files changed, 7 insertions(+), 5 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/{ue-rs-0.1.0-r4.ebuild => ue-rs-0.1.0-r5.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/Manifest b/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/Manifest index 03fd78f17d5..2b17d777e90 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/Manifest @@ -39,6 +39,7 @@ DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672 DIST form_urlencoded-1.2.0.crate 8923 BLAKE2B 2408d9bbca582be13febf041262f0e63a3d661dd8fd2a42e9203feb6ff02a94e3eade6b83179fab34448b9913c7924fdf53e0670ae97e550318229432978e33d SHA512 899ddd113a79bdeac12e499f581c5499d1a4b698c75cfc2d6aada5880cd802fc8537ff9ce68eca28374318d66fd70100962105c1e8962868a5732bb86326c104 DIST futures-channel-0.3.28.crate 32281 BLAKE2B 128709ed9c3f275ee9365135426b626dab7d34a706cb9435a6ee45e2a28f7d2e6702b7bcd8b0788f7171ccc75917f287834a18c8af58b73ec07f46425aecdd97 SHA512 21bcae42859687538a3bbd4a4328b1a176bf8eec3b03f9d341f8ec08e796ada1638c0c3011246995d742e392a3ecf4446ccd2e92ea5426fe658c5f5ad8303b99 DIST futures-core-0.3.28.crate 14780 BLAKE2B 551327876d54a6ccd97382679d61afb3e344f7c8e26813ac85779a57850cbb1f54041c82d71a7bfe4a30d1c8d9aeb560d8d4bf5babe7010fb7cf3c36c8ebf3cf SHA512 a21900a68f1a9232c245b160e95896b109315f10719147b4f104e11edb5b59c862555e07aee37a7d4fbedf0f09a02d4ed329f92fa1ad4679db1d7c78ae2865e0 +DIST futures-io-0.3.29.crate 8908 BLAKE2B 909bd5dadadbf726dba3943dcec930c7409e20d8d324a52444f4145f5972e30ee4b1e48b7c2d9982fbea62ed5f3288e68e8920e99cf83d7cb81b9de1e8d81246 SHA512 869862f8728d94f0f0e71f9b24d0bd26b8bcafe70a80dd1dde4cefce73d91dc0cca80fb22e891f66024a77dcf28e8858e815bd436eb17d4c3119a7e68fefbaec DIST futures-sink-0.3.28.crate 7852 BLAKE2B 752286cb15ff37e9bf4c6cc80c8ebfeb229dbaa4e8aea6fa505f1e145e5dec99c4818c8e7ba2bd8a03898350e05bc124a5ad83e28989e282dbc132ed13e7fbf3 SHA512 e3535aaffa42215448d78adcba72f1dc3131598169dbcc8b52b82fe3e74f4b0d5631ab3dd3ac5d4315be890b94d6fd8f53de274ee4815f9abb27d40982c96c07 DIST futures-task-0.3.28.crate 11848 BLAKE2B 79cd7b01d24a5274b0e564edf0f5d041414d9dee02c503f2303958e679db0db3c652c64352052d20bbad7bace078b553f77920e2ae21a948a1c884eeecc663ab SHA512 198f3efa51b1a8492a4151a6e4ef6e7abd09f2f537f5ffc2b8f2cf739718fb9714718226ee1cde7a58d41a2e623445ae64013f02e7f00489320c06292465fa82 DIST futures-util-0.3.28.crate 158510 BLAKE2B 0721356a4947b39cd066dc8a88afa7686b832be269295af3ebff8cd74b42dffe5484399f66e3e11e2b54c2b8e04ee002a9d507eeb5259fbdc00b226e0f94b175 SHA512 0c7dd3701b7ab0a443a56aa64e6d9b6ba7bb9ccba4c05dfe17608df3e2bed1c2fa460a0cb4abb9fb25289d3a776128ffcc4fced75ca73a65d40b18ee2e9a46e4 @@ -115,7 +116,8 @@ DIST serde-1.0.188.crate 76230 BLAKE2B 81e92adf17e3f2ce73c82e3069b8fd656211cfeb6 DIST serde_derive-1.0.188.crate 55563 BLAKE2B 3b24044915a704d9d8a2cae6e6547ecffea7ee3fd4260ddb2bf7fa38b23fd7fc597b61ac28bf65b9f0d45e18ffd6bc7596f5a3d602cc79835697fb3f5440242f SHA512 fa9132a319f7829e6afad65289031be99255466d76270875d9d81f82f63e53592eaef5452d0df38da92e9d0b6f2b37e91026635fff4bf597b0ae662b71b5eff0 DIST serde_json-1.0.105.crate 146316 BLAKE2B a40b99ac4b5e9aa31a61c4f49f9f4dd9fad94946267a47ac4ba7c1bf3af7122dc410c8984235281b19a917b1fea088615c8e95b4f1aead0957c9e31f2b222599 SHA512 d4203d93ee6e8ffa0d88c21d347196b8d1496d506841273e992c9996019175ed9a965e9401ba63d48589133b13ad9cac6246b7e0143545778b5a090a48a31452 DIST serde_urlencoded-0.7.1.crate 12822 BLAKE2B 38c74ea862f041828467dfa586bad9b8e1d1d64a9f82fb7f98727e3965377d00e59f2dbf20955a9dce976b6911c0a619d2a6e4cc9dfc73cf0f6c449d873fd072 SHA512 b209ad01b6565e95c1d5b431a3f4f8a0df3d11c2a06a44123048bfa4b34ebb6807eec593f0c1c89de3a06ac3786a14747df9c70b4f4d5e4b72b4feb53084eb60 -DIST sha2-0.10.7.crate 22541 BLAKE2B 918a8f4042c57e4f8931d645ba758f6e7da911d02482c78d6ef3a12e8068e7f3a08526580824ab548628fa7e75bc64f17bb12f1ceb167861a781ab9813eafbd4 SHA512 c33d6bdecaf49d0f60276531e845231425f62d2ec18c4d53c43e49f506a2dcb2548f5866c6642806b6b64f008a481c48920b7b4fc867df7443dc31b44f297fdc +DIST sha1-0.10.6.crate 13517 BLAKE2B 85ad8dcd237125945f6f9c2d7a48bc9802dfe8398a2bac86ddb96763486092fa18e80a2e69f89cfd6e95599d34d60ced33b26a68cbbe39bf158238a79433584b SHA512 fd37be7e3f1d4b6addd313a36b55215fb70abd21be7831b71de28bd3eb03b7352817d8a7b1a166df002c3a23eadc8224e49edd4a37556c0e5357565305d4128f +DIST sha2-0.10.8.crate 26357 BLAKE2B 1d01b381223a931dc631ad3a1191f5378b1d2f3f9f20474c5f020e366624c73b08330ce8dc4bdd3e63b15f647276f533de655b545b77f70fbedc1a1846f44f0a SHA512 3be73133a6b7690e14acaead47914dc92395dca4191fb657a2ea186fefd0ccd94d12a1121d63a26027d9a9c62b775c53202473edc461587b9dcd75472af77785 DIST signature-2.1.0.crate 15627 BLAKE2B 241847a73a3bfefb952b3e4e41a48b23803dbd949feddad06c02a20cc4aa8edf26c039108612faee896508c8bfe0defc99d3448680d8e46f2eca47fd4b5baeff SHA512 f903bd4d07bb954992f71a6f4579bbe935282a2b7154fb5090550894a32cc2981b7765f8b24f1a0ac9e41bbf7f32b99a91b8f22e6175323edac44ef43a66125d DIST slab-0.4.9.crate 17108 BLAKE2B 8e5288c4d00efa915e7be27b55f2204850968624f0d8101c091a357131106bceeea7a63c98007420c12f67893dd2228b15d3f23508108c3a0ceaa605474bc7a9 SHA512 b6b5423ae026472920f7c9a4abe0962314140a36dc562c0a9e3fa60725b2b8b7a8b343110d9d4c0e18fb318b0103e14c0ccbc9ae350d5563a5ac80c35f228c40 DIST smallvec-1.11.0.crate 34680 BLAKE2B e54d56f6bbffbfa7ce5fe5f04e325b2e5cf19d290e4be278bc00a136e26284625b9c18c7c2b10b7fb8fad0ea7e3770f3cdbcfbaa913f5ac08d0a2f8b4e0de188 SHA512 41bfbecbc2c244497568a41724d65791ec3fd6d8057813d521367cca316c09c2b28fb3973826236b01c1f5d2f905d8d22b0c3c47f957a9ff5d7685591f15ccd7 @@ -133,7 +135,6 @@ DIST thiserror-impl-1.0.48.crate 15096 BLAKE2B 6b5eed1102256f2c809c21201cf319cc8 DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e DIST tokio-1.32.0.crate 725004 BLAKE2B 80dde8073cdd361c8e05a8ef3b0fed0b4ee56c915ed6c0adde4bc2db487e0dd60a3adafa55aa9a763d37ec992a27208063aeee6a95b594b2e5b02e2bf65da9a0 SHA512 c7a64e08b4584b52c98118dd07316ee3bc0c2b405278f37bce58c512072c20268df66a8ab553e4d3bd3470753899ac3b1df4b9b5411743dc0e092fbc2d9b11a2 -DIST tokio-macros-2.1.0.crate 11472 BLAKE2B ae03d8812bc2b8f833e0ca77f1df8edeb8e0476c06f8f5104fa632ce77369ec54a80ff3da86439192971bf2e11147eade3765c447d76238b768732702004db95 SHA512 e2a24c1befd512d68b5d8b26a3f1d940dd10bfe0979b5d61a71052478d9fd19b28eb7bcbeaca4cf3c9736fd3da0386c899e3a619f47c2d9f7e6b497140586b9d DIST tokio-native-tls-0.3.1.crate 20676 BLAKE2B 4c752179aab8b4beaa6aa212dc8d9e4a2b7c12be0dbf80406f20f92fd12844a3390e88a1536875596ab44774a67ce35115ca4622f9faa977c80c4261ab4c06ea SHA512 bda2e77671e030a021f628ad760b3fbdc26e7483a5f9ef6c6892ae0fc38b538d52d527805c020d578079896d50fff0bbc036a87cc91604904840d5b7dc181914 DIST tokio-util-0.7.8.crate 101644 BLAKE2B bfd0b10b2ef7d1264262f78e406aaab07a1e060885dd7d9694b3cc34b6ae9f3d46946bbdc5aa3dbd0f6164973fc3305b20da04f37176250e874b3259860cfe51 SHA512 7b1501dd224b4a6749a5296751d83e6d57bae238a92430c32017813ab82c358086a555fd7d34537cc944c240ba73d4fb94864a5743dca05c138f834d45ee245e DIST tower-service-0.3.2.crate 6847 BLAKE2B d4571704eb4bf7f729f4535a04b7eb94f644d71ba8c5604297843351adf4bcce7ff64ec4e5435783ee6ada1b0a5c97726cfaade391525c6b2bca933cd5e8ec19 SHA512 f4578421603067fa708c4ad9eca5ca096b5262b6d51a404f37d9fbb6c64f027cec6114991e4b7f8324cb756c033971a384f1804add28e00d0cd6b2ee01d9e005 diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/ue-rs-0.1.0-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/ue-rs-0.1.0-r5.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/ue-rs-0.1.0-r4.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/ue-rs-0.1.0-r5.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/ue-rs-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/ue-rs-9999.ebuild index 8360a3f449b..dba1c236a86 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/ue-rs-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/ue-rs/ue-rs-9999.ebuild @@ -10,7 +10,7 @@ CROS_WORKON_REPO="https://github.com" if [[ ${PV} == 9999 ]]; then KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="2c58396dcb97cc91bb14873c242b75bb8ebce0ad" # trunk + CROS_WORKON_COMMIT="efc55818aace4fa34b3d9169f3c5c77e71356796" # trunk KEYWORDS="amd64 arm64" fi @@ -57,6 +57,7 @@ CRATES=" form_urlencoded-1.2.0 futures-channel-0.3.28 futures-core-0.3.28 + futures-io-0.3.29 futures-sink-0.3.28 futures-task-0.3.28 futures-util-0.3.28 @@ -133,7 +134,8 @@ CRATES=" serde_derive-1.0.188 serde_json-1.0.105 serde_urlencoded-0.7.1 - sha2-0.10.7 + sha1-0.10.6 + sha2-0.10.8 signature-2.1.0 slab-0.4.9 smallvec-1.11.0 @@ -151,7 +153,6 @@ CRATES=" tinyvec-1.6.0 tinyvec_macros-0.1.1 tokio-1.32.0 - tokio-macros-2.1.0 tokio-native-tls-0.3.1 tokio-util-0.7.8 tower-service-0.3.2 From 6fba6ae56ec2ac6b9b6d0a6c275bcc5f786e679b Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Wed, 3 Jan 2024 18:40:34 +0100 Subject: [PATCH 2/3] sys-kernel/bootengine: Make use of ue-rs download_sysext binary This pulls in https://github.com/flatcar/bootengine/pull/82 to switch from curl and decode_payload to the ue-rs download_sysext binary. --- ...ootengine-0.0.38-r26.ebuild => bootengine-0.0.38-r27.ebuild} | 0 .../coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/{bootengine-0.0.38-r26.ebuild => bootengine-0.0.38-r27.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r26.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r27.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r26.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r27.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 04bd3af608d..c54da9cf81b 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 @@ -10,7 +10,7 @@ CROS_WORKON_REPO="https://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="5295e877b6ebd2fb343e464ffda896534c22d4c3" # flatcar-master + CROS_WORKON_COMMIT="63f54970079d526551e1c28fe9527b12c0b977ed" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi From 9df6652509a9e6eeab537ddbd20c30dc185f4ea3 Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Wed, 3 Jan 2024 18:19:00 +0100 Subject: [PATCH 3/3] coreos-base/update_engine: Make use of ue-rs download_sysext binary This pulls in https://github.com/flatcar/update_engine/pull/34 to switch from bash with curl and decode_payload to the ue-rs download_sysext binary. --- ...engine-0.4.10-r19.ebuild => update_engine-0.4.10-r20.ebuild} | 0 .../coreos-base/update_engine/update_engine-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/{update_engine-0.4.10-r19.ebuild => update_engine-0.4.10-r20.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r19.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r20.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r19.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r20.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 25ac9a04f22..17282e3405c 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 @@ -8,7 +8,7 @@ CROS_WORKON_REPO="https://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="8fb11a4abfbf42941efdd73d06ee180bb26557f6" # flatcar-master + CROS_WORKON_COMMIT="43bb354c67c513ace66d414d9d4aec761eb24680" # flatcar-master KEYWORDS="amd64 arm64" fi