Skip to content

Integrate meta-guf-machine/linux-guf-5.10.104-upgrade

Tobias Kahlki requested to merge integrate/meta-guf-machine/linux-guf-5.10.104-upgrade into dunfell

Commit: https://gitlab.com/SECO-Northern-Europe/yocto/layers/meta-guf-machine/-/commit/6c1b1ffd9436a409b3f5be0af34d46384c7a8e32

linux-guf: Upgrade kernel to 5.10.104

Update the kernel to 5.10.104. This should pull the latest security fixes, i.e. for CVE-2022-0847.

With this it seems to be necessary to disable CONFIG_STACKPROTECTOR_PER_TASK to build it inside Yocto dunfell. It seems to be a problem of missing headers inside gcc-plugin.

Remove the PREFERRED kernel variables from imx6ull, that are derived from guf.inc.

BCS 746-000735

--

Commit: https://gitlab.com/SECO-Northern-Europe/yocto/layers/meta-guf-machine/-/commit/de6592b6b65fb9b2e9d0fc647aca90386aa4fca0

linux-guf: Remove STACKPROTECTOR_PER_TASK

Remove CONFIG_STACKPROTECTOR_PER_TASK defconfig as it breaks the build.

With this enabled and with the jump from Linux 5.10.57 to 5.10.104 I see the following error:

  HOSTCXX scripts/gcc-plugins/arm_ssp_per_task_plugin.so
In file included from ../5.10.57-r0/recipe-sysroot-native/usr/bin/arm-guf-linux-gnueabi/../../lib/arm-guf-linux-gnueabi/gcc/arm-guf-linux-gnueabi/9.3.0/plugin/include/gcc-plugin.h:29,
                 from ../linux-guf/scripts/gcc-plugins/gcc-common.h:7,
                 from ../linux-guf/scripts/gcc-plugins/arm_ssp_per_task_plugin.c:3:
../linux-guf/5.10.57-r0/recipe-sysroot-native/usr/bin/arm-guf-linux-gnueabi/../../lib/arm-guf-linux-gnueabi/gcc/arm-guf-linux-gnueabi/9.3.0/plugin/include/coretypes.h:430:10: fatal error: poly-int.h: No such file or directory
  430 | #include "poly-int.h"
      |          ^~~~~~~~~~~~
compilation terminated.

Seems to be similar to https://lists.yoctoproject.org/g/poky/message/12619

Form my point of view this is a missing header inside the gcc-plugin
package, and should be fixed there. However, right now we just remove
the feature from the kernel.

Merge request reports