Merge pull request #1106 from kinvolk/kai/bootengine-verity-hashoffset

Support BTRFS in OEM and /usr partitions
This commit is contained in:
Kai Lüke 2021-07-28 13:34:37 +02:00 committed by GitHub
commit beabd977e1
6 changed files with 5 additions and 6 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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