Message ID | 20230913164423.7867-1-anthony@ajmartinez.com |
---|---|
State | Accepted |
Delegated to: | Ryan Eatmon |
Headers | show |
Series | linux-bb.org: update to 5.10.168 for armv7a targets | expand |
Apologies - this is for kirkstone. Apparently my subject prefix on `git send-email` did not work.
On Wed, Sep 13, 2023 at 04:45:05PM +0000, Anthony Martinez via lists.yoctoproject.org wrote: > Updates SRCREV, PV, and BRANCH for armv7a targets and fixes > failure to mount /boot when using poky with systemd. The > kernel selected supports VFAT without initramfs as noted > here - https://lists.yoctoproject.org/g/meta-ti/message/16913 > > Removes defconfig patch setting LZMA, as the new kernel > already defaults to LZ4. > > Tested by running `bitbake core-image-base` with this patchset, > and then booting a pair of Beaglebone Black devices from the > resulting image. Prior to the change, systemd boots to a > maintenance mode having failed to mount /boot. After the change, > the system boots normally and /boot is mounted. > > Suggested-by: Robert Nelson <robertcnelson@gmail.com> > Signed-off-by: Anthony J. Martinez <anthony@ajmartinez.com> Thanks! Reviewed-by: Denys Dmytriyenko <denys@konsulko.com> > --- > ...h-default-kernel-compression-to-LZMA.patch | 29 ------------------- > .../recipes-kernel/linux/linux-bb.org_git.bb | 10 +++---- > 2 files changed, 4 insertions(+), 35 deletions(-) > delete mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-bb.org/0001-defconfig-switch-default-kernel-compression-to-LZMA.patch > > diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/0001-defconfig-switch-default-kernel-compression-to-LZMA.patch b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/0001-defconfig-switch-default-kernel-compression-to-LZMA.patch > deleted file mode 100644 > index 54dc8c91..00000000 > --- a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/0001-defconfig-switch-default-kernel-compression-to-LZMA.patch > +++ /dev/null > @@ -1,29 +0,0 @@ > -From 0ccadc7a676341bbd66eb176308c7c59931e9dd2 Mon Sep 17 00:00:00 2001 > -From: Denys Dmytriyenko <denys@konsulko.com> > -Date: Fri, 7 Apr 2023 01:44:56 +0000 > -Subject: [PATCH] defconfig: switch default kernel compression to LZMA > - > -LZO compression and lzop tool haven't been maintained for long time and have > -been removed in recent versions of OE-Core, even though Debian may still use > -them. Switch to LZMA compression that is used by default in TI kernel config. > - > -Upstream-Status: Inappropriate [OE-specific] > - > -Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> > ---- > - arch/arm/configs/bb.org_defconfig | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/arch/arm/configs/bb.org_defconfig b/arch/arm/configs/bb.org_defconfig > -index 6bf0fb860683..7c035735172d 100644 > ---- a/arch/arm/configs/bb.org_defconfig > -+++ b/arch/arm/configs/bb.org_defconfig > -@@ -1,5 +1,5 @@ > - # CONFIG_LOCALVERSION_AUTO is not set > --CONFIG_KERNEL_LZO=y > -+CONFIG_KERNEL_LZMA=y > - CONFIG_SYSVIPC=y > - CONFIG_POSIX_MQUEUE=y > - CONFIG_NO_HZ_IDLE=y > --- > -2.25.1 > diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb > index e134fb84..f4c1775d 100644 > --- a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb > +++ b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb > @@ -16,10 +16,10 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}" > > S = "${WORKDIR}/git" > > -# 5.10.162 version for 32-bit > -SRCREV:armv7a = "982fde4eb381f98ec8be946e8d33dd0c9f9416ab" > -PV:armv7a = "5.10.162+git${SRCPV}" > -BRANCH:armv7a = "v5.10.162-ti-r59" > +# 5.10.168 version for 32-bit > +SRCREV:armv7a = "a943fc1987e1b8057b0b5219ecd3c5a85285d62a" > +PV:armv7a = "5.10.168+git${SRCPV}" > +BRANCH:armv7a = "v5.10.168-ti-r70" > > # 5.10.162 version for 64-bit > SRCREV:aarch64 = "a2f5d5746b6c389e58d20fda0a0fa88403da428b" > @@ -30,5 +30,3 @@ SRC_URI = " \ > git://github.com/beagleboard/linux.git;protocol=https;branch=${BRANCH} \ > file://defconfig \ > " > - > -SRC_URI:append:armv7a = " file://0001-defconfig-switch-default-kernel-compression-to-LZMA.patch" > -- > 2.30.2
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/0001-defconfig-switch-default-kernel-compression-to-LZMA.patch b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/0001-defconfig-switch-default-kernel-compression-to-LZMA.patch deleted file mode 100644 index 54dc8c91..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/0001-defconfig-switch-default-kernel-compression-to-LZMA.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0ccadc7a676341bbd66eb176308c7c59931e9dd2 Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko <denys@konsulko.com> -Date: Fri, 7 Apr 2023 01:44:56 +0000 -Subject: [PATCH] defconfig: switch default kernel compression to LZMA - -LZO compression and lzop tool haven't been maintained for long time and have -been removed in recent versions of OE-Core, even though Debian may still use -them. Switch to LZMA compression that is used by default in TI kernel config. - -Upstream-Status: Inappropriate [OE-specific] - -Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> ---- - arch/arm/configs/bb.org_defconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/configs/bb.org_defconfig b/arch/arm/configs/bb.org_defconfig -index 6bf0fb860683..7c035735172d 100644 ---- a/arch/arm/configs/bb.org_defconfig -+++ b/arch/arm/configs/bb.org_defconfig -@@ -1,5 +1,5 @@ - # CONFIG_LOCALVERSION_AUTO is not set --CONFIG_KERNEL_LZO=y -+CONFIG_KERNEL_LZMA=y - CONFIG_SYSVIPC=y - CONFIG_POSIX_MQUEUE=y - CONFIG_NO_HZ_IDLE=y --- -2.25.1 diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb index e134fb84..f4c1775d 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb @@ -16,10 +16,10 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}" S = "${WORKDIR}/git" -# 5.10.162 version for 32-bit -SRCREV:armv7a = "982fde4eb381f98ec8be946e8d33dd0c9f9416ab" -PV:armv7a = "5.10.162+git${SRCPV}" -BRANCH:armv7a = "v5.10.162-ti-r59" +# 5.10.168 version for 32-bit +SRCREV:armv7a = "a943fc1987e1b8057b0b5219ecd3c5a85285d62a" +PV:armv7a = "5.10.168+git${SRCPV}" +BRANCH:armv7a = "v5.10.168-ti-r70" # 5.10.162 version for 64-bit SRCREV:aarch64 = "a2f5d5746b6c389e58d20fda0a0fa88403da428b" @@ -30,5 +30,3 @@ SRC_URI = " \ git://github.com/beagleboard/linux.git;protocol=https;branch=${BRANCH} \ file://defconfig \ " - -SRC_URI:append:armv7a = " file://0001-defconfig-switch-default-kernel-compression-to-LZMA.patch"
Updates SRCREV, PV, and BRANCH for armv7a targets and fixes failure to mount /boot when using poky with systemd. The kernel selected supports VFAT without initramfs as noted here - https://lists.yoctoproject.org/g/meta-ti/message/16913 Removes defconfig patch setting LZMA, as the new kernel already defaults to LZ4. Tested by running `bitbake core-image-base` with this patchset, and then booting a pair of Beaglebone Black devices from the resulting image. Prior to the change, systemd boots to a maintenance mode having failed to mount /boot. After the change, the system boots normally and /boot is mounted. Suggested-by: Robert Nelson <robertcnelson@gmail.com> Signed-off-by: Anthony J. Martinez <anthony@ajmartinez.com> --- ...h-default-kernel-compression-to-LZMA.patch | 29 ------------------- .../recipes-kernel/linux/linux-bb.org_git.bb | 10 +++---- 2 files changed, 4 insertions(+), 35 deletions(-) delete mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-bb.org/0001-defconfig-switch-default-kernel-compression-to-LZMA.patch