From 42b4f612caff53268d60fa71982fbb3354a99050 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20L=C3=BCke?= Date: Thu, 1 Jul 2021 21:10:17 +0200 Subject: [PATCH 1/6] sys-kernel/bootengine: support btrfs /usr filesystems Pulls in https://github.com/kinvolk/bootengine/pull/25 --- .../coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 574ec5c5cf..505d3a33bb 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="git://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="0e0592b7bedc5047b4cbd0705cef9ca62f812d36" # flatcar-master + CROS_WORKON_COMMIT="d5bd23827964cef28e3c1aa85b9fb48340a777d9" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi From c01560ba63547644cab4f2a5cf80a2536009782e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20L=C3=BCke?= Date: Fri, 2 Jul 2021 14:01:30 +0200 Subject: [PATCH 2/6] coreos-base/coreos-init: support btrfs on the OEM partition This pulls in https://github.com/kinvolk/init/pull/42 --- .../coreos-base/coreos-init/coreos-init-9999.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1ffef98b9a..861882390a 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 @@ -10,7 +10,7 @@ CROS_WORKON_REPO="git://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="6fc3acc21dd95a192fc5077082f1e84bd2a4102e" # flatcar-master + CROS_WORKON_COMMIT="3960a476a09a96ef8130052e144f9000d4d2f31e" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi From bdc7f36d4f4353e9a9e141a33f3111e775aace74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20L=C3=BCke?= Date: Tue, 6 Jul 2021 11:44:23 +0200 Subject: [PATCH 3/6] sys-kernel/coreos-modules: use 4k pages for arm64 Btrfs filesystems do not support a non-standard 64k page size on arm64 when the filesystem was created by a 4k page size system. Use the default page size for arm64 to ensure compatibility with btrfs filesystems created by amd64 systems. --- .../sys-kernel/coreos-modules/files/arm64_defconfig-5.10 | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-5.10 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-5.10 index 33b3aa6460..65b2052e56 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-5.10 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-5.10 @@ -10,7 +10,6 @@ CONFIG_ARCH_THUNDER=y CONFIG_ARCH_VEXPRESS=y CONFIG_ARCH_XGENE=y CONFIG_ARCH_ZYNQMP=y -CONFIG_ARM64_64K_PAGES=y CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y CONFIG_ARM64_CRYPTO=y CONFIG_ARM64_VA_BITS_48=y From e45a6140d05670e2a65f3e83178769c249aace3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20L=C3=BCke?= Date: Wed, 7 Jul 2021 18:42:10 +0200 Subject: [PATCH 4/6] sys-apps/ignition: support btrfs on the OEM partition This pulls in https://github.com/kinvolk/ignition/pull/21 --- .../coreos-overlay/sys-apps/ignition/ignition-9999.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild index 4a0424363a..bbd1420bc6 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild @@ -12,7 +12,7 @@ inherit coreos-go cros-workon systemd udev if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="032f6205611b2748aa3be924c215af6bd19a18b6" # flatcar-master + CROS_WORKON_COMMIT="b80f06d5616865c18ee7ff4d715f3341f2e54154" # flatcar-master KEYWORDS="amd64 arm64" fi From ab2467e5479f9fc49e8e453f1d8b4aac44a96e95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20L=C3=BCke?= Date: Wed, 14 Jul 2021 12:50:58 +0200 Subject: [PATCH 5/6] sys-apps/seismograph: support btrfs in rootdev This pulls in https://github.com/kinvolk/seismograph/pull/6 --- .../coreos-overlay/sys-apps/seismograph/seismograph-9999.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c999944e8e..69378cfdbe 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 @@ -9,7 +9,7 @@ AUTOTOOLS_AUTORECONF=1 if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="b800495b939d168543acf65461fc04ac4392c3a6" # flatcar-master + CROS_WORKON_COMMIT="0d57463de18df81741375d628852c521542b6836" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi From 622a99058c43d94148dfc9d392c435951ed72c33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20L=C3=BCke?= Date: Mon, 12 Jul 2021 18:38:43 +0200 Subject: [PATCH 6/6] coreos-base/update_engine: support btrfs as /usr filesystem This pulls in https://github.com/kinvolk/update_engine/pull/11 --- .../coreos-base/update_engine/update_engine-9999.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 eec91ee0ff..262b61bf7e 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 @@ -9,7 +9,7 @@ AUTOTOOLS_AUTORECONF=1 if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="c3c45a040306be554b4292c2d0194700ac3c40b0" # flatcar-master + CROS_WORKON_COMMIT="d21808a884736bec7e69db5ddd18e0e21fa6ab9e" # flatcar-master KEYWORDS="amd64 arm64" fi