Skip to contentSkip to conversation

Raspberry Pi - bump kernel version to 967d45b (5.10.1)

PATCH New Peter Seiderer 5 participants 17 messages Dec 21, 2020 – Jan 16, 2022 Broadcom BCM2711/BCM2835 Arm architecture

lore
Share & tools
lore
#0 lore raw

cover Raspberry Pi - bump kernel version to 967d45b (5.10.1)

Raspberry Pi - bump kernel version to 967d45b (5.10.1).

Tested with the following defconfig on RPi 4 (with 'dtoverlay=vc4-kms-v3d-pi4' enabled):

  BR2_aarch64=y
  BR2_cortex_a72=y
  BR2_ARM_FPU_VFPV4=y
  BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
  BR2_PACKAGE_GLIBC_UTILS=y
  BR2_BINUTILS_VERSION_2_35_X=y
  BR2_GCC_VERSION_10_X=y
  BR2_TOOLCHAIN_BUILDROOT_CXX=y
  BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
  BR2_SYSTEM_DHCP="eth0"
  BR2_GENERATE_LOCALE="en_US"
  BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi4-64/post-build.sh"
  BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi4-64/post-image.sh"
  BR2_ROOTFS_POST_SCRIPT_ARGS="--add-miniuart-bt-overlay --aarch64"
  BR2_LINUX_KERNEL=y
  BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
  BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,967d45b29ca2902f031b867809d72e3b3d623e7a)/linux-967d45b29ca2902f031b867809d72e3b3d623e7a.tar.gz"
  BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
  BR2_LINUX_KERNEL_DTS_SUPPORT=y
  BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b"
  BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
  BR2_PACKAGE_STRACE=y
  BR2_PACKAGE_DEJAVU=y
  BR2_PACKAGE_MESA3D=y
  BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_KMSRO=y
  BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D=y
  BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4=y
  BR2_PACKAGE_MESA3D_OPENGL_ES=y
  BR2_PACKAGE_QT5=y
  BR2_PACKAGE_QT5BASE_EXAMPLES=y
  BR2_PACKAGE_QT5BASE_GUI=y
  BR2_PACKAGE_QT5BASE_OPENGL_LIB=y
  BR2_PACKAGE_QT5BASE_EGLFS=y
  BR2_PACKAGE_QT5BASE_FONTCONFIG=y
  BR2_PACKAGE_QT5BASE_HARFBUZZ=y
  BR2_PACKAGE_QT5BASE_GIF=y
  BR2_PACKAGE_QT5BASE_JPEG=y
  BR2_PACKAGE_QT5BASE_PNG=y
  BR2_PACKAGE_RPI_FIRMWARE=y
  BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y
  BR2_TARGET_ROOTFS_EXT2=y
  BR2_TARGET_ROOTFS_EXT2_4=y
  BR2_TARGET_ROOTFS_EXT2_SIZE="384M"
  # BR2_TARGET_ROOTFS_TAR is not set
  BR2_PACKAGE_HOST_DOSFSTOOLS=y
  BR2_PACKAGE_HOST_GENIMAGE=y
  BR2_PACKAGE_HOST_MTOOLS=y

Peter Seiderer (2):
configs/raspberrypi*: bump kernel version to 967d45b (5.10.1) package/rpi-firmware: bump version to d016a6e

 configs/raspberrypi0_defconfig         | 6 +++---
 configs/raspberrypi0w_defconfig        | 6 +++---
 configs/raspberrypi2_defconfig         | 6 +++---
 configs/raspberrypi3_64_defconfig      | 6 +++---
 configs/raspberrypi3_defconfig         | 6 +++---
 configs/raspberrypi3_qt5we_defconfig   | 6 +++---
 configs/raspberrypi4_64_defconfig      | 6 +++---
 configs/raspberrypi4_defconfig         | 6 +++---
 configs/raspberrypi_defconfig          | 6 +++---
 package/rpi-firmware/rpi-firmware.hash | 2 +-
 package/rpi-firmware/rpi-firmware.mk   | 2 +-
 11 files changed, 29 insertions(+), 29 deletions(-)
Signature · 1 line
2.29.2
#1 lore raw

PATCH 1/2 configs/raspberrypi*: bump kernel version to 967d45b (5.10.1)

Now based on 5.10.1 (from 5.4.80).

---
 configs/raspberrypi0_defconfig       | 6 +++---
 configs/raspberrypi0w_defconfig      | 6 +++---
 configs/raspberrypi2_defconfig       | 6 +++---
 configs/raspberrypi3_64_defconfig    | 6 +++---
 configs/raspberrypi3_defconfig       | 6 +++---
 configs/raspberrypi3_qt5we_defconfig | 6 +++---
 configs/raspberrypi4_64_defconfig    | 6 +++---
 configs/raspberrypi4_defconfig       | 6 +++---
 configs/raspberrypi_defconfig        | 6 +++---
 9 files changed, 27 insertions(+), 27 deletions(-)
configs/raspberrypi0_defconfig +3 -3
index 3b2178c3cb..c06d6dfcb5 100644
@@ -2,14 +2,14 @@ BR2_arm=y
 BR2_arm1176jzf_s=y
 BR2_ARM_EABIHF=y
 
-# Linux headers same as kernel, a 5.4 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+# Linux headers same as kernel, a 5.10 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,f4b5d0de4ffad239ed01ce08d49d4f7eeeccb1a6)/linux-f4b5d0de4ffad239ed01ce08d49d4f7eeeccb1a6.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,967d45b29ca2902f031b867809d72e3b3d623e7a)/linux-967d45b29ca2902f031b867809d72e3b3d623e7a.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 
 # Build the DTBs for A/B from the kernel sources: the zero is the same
configs/raspberrypi0w_defconfig +3 -3
index 2f2dafbedd..b54bb34ad9 100644
@@ -2,14 +2,14 @@ BR2_arm=y
 BR2_arm1176jzf_s=y
 BR2_ARM_EABIHF=y
 
-# Linux headers same as kernel, a 5.4 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+# Linux headers same as kernel, a 5.10 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,f4b5d0de4ffad239ed01ce08d49d4f7eeeccb1a6)/linux-f4b5d0de4ffad239ed01ce08d49d4f7eeeccb1a6.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,967d45b29ca2902f031b867809d72e3b3d623e7a)/linux-967d45b29ca2902f031b867809d72e3b3d623e7a.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero-w"
configs/raspberrypi2_defconfig +3 -3
index 431e194c02..5104422cb1 100644
@@ -7,12 +7,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
 BR2_SYSTEM_DHCP="eth0"
 
-# Linux headers same as kernel, a 5.4 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+# Linux headers same as kernel, a 5.10 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,f4b5d0de4ffad239ed01ce08d49d4f7eeeccb1a6)/linux-f4b5d0de4ffad239ed01ce08d49d4f7eeeccb1a6.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,967d45b29ca2902f031b867809d72e3b3d623e7a)/linux-967d45b29ca2902f031b867809d72e3b3d623e7a.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 
 # Build the DTB from the kernel sources
configs/raspberrypi3_64_defconfig +3 -3
index e71602f760..65c1291e6a 100644
@@ -6,12 +6,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
 BR2_SYSTEM_DHCP="eth0"
 
-# Linux headers same as kernel, a 5.4 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+# Linux headers same as kernel, a 5.10 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,f4b5d0de4ffad239ed01ce08d49d4f7eeeccb1a6)/linux-f4b5d0de4ffad239ed01ce08d49d4f7eeeccb1a6.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,967d45b29ca2902f031b867809d72e3b3d623e7a)/linux-967d45b29ca2902f031b867809d72e3b3d623e7a.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3"
 
 # Build the DTB from the kernel sources
configs/raspberrypi3_defconfig +3 -3
index faa93920e9..96eca54f0d 100644
@@ -6,12 +6,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
 BR2_SYSTEM_DHCP="eth0"
 
-# Linux headers same as kernel, a 5.4 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+# Linux headers same as kernel, a 5.10 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,f4b5d0de4ffad239ed01ce08d49d4f7eeeccb1a6)/linux-f4b5d0de4ffad239ed01ce08d49d4f7eeeccb1a6.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,967d45b29ca2902f031b867809d72e3b3d623e7a)/linux-967d45b29ca2902f031b867809d72e3b3d623e7a.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 
 # Build the DTB from the kernel sources
configs/raspberrypi3_qt5we_defconfig +3 -3
index 8c54e70bbd..8015288acb 100644
@@ -7,12 +7,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
 BR2_SYSTEM_DHCP="eth0"
 
-# Linux headers same as kernel, a 5.4 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+# Linux headers same as kernel, a 5.10 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,f4b5d0de4ffad239ed01ce08d49d4f7eeeccb1a6)/linux-f4b5d0de4ffad239ed01ce08d49d4f7eeeccb1a6.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,967d45b29ca2902f031b867809d72e3b3d623e7a)/linux-967d45b29ca2902f031b867809d72e3b3d623e7a.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 
 # Build the DTB from the kernel sources
configs/raspberrypi4_64_defconfig +3 -3
index c344d88e0d..94ac5cf5ec 100644
@@ -6,12 +6,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
 BR2_SYSTEM_DHCP="eth0"
 
-# Linux headers same as kernel, a 5.4 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+# Linux headers same as kernel, a 5.10 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,f4b5d0de4ffad239ed01ce08d49d4f7eeeccb1a6)/linux-f4b5d0de4ffad239ed01ce08d49d4f7eeeccb1a6.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,967d45b29ca2902f031b867809d72e3b3d623e7a)/linux-967d45b29ca2902f031b867809d72e3b3d623e7a.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
 
 # Build the DTB from the kernel sources
configs/raspberrypi4_defconfig +3 -3
index 76e4f99cb6..c2ed5e73c5 100644
@@ -6,12 +6,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
 BR2_SYSTEM_DHCP="eth0"
 
-# Linux headers same as kernel, a 5.4 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+# Linux headers same as kernel, a 5.10 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,f4b5d0de4ffad239ed01ce08d49d4f7eeeccb1a6)/linux-f4b5d0de4ffad239ed01ce08d49d4f7eeeccb1a6.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,967d45b29ca2902f031b867809d72e3b3d623e7a)/linux-967d45b29ca2902f031b867809d72e3b3d623e7a.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
 
 # Build the DTB from the kernel sources
configs/raspberrypi_defconfig +3 -3
index 59af19fa1d..2d3bb536bf 100644
@@ -4,14 +4,14 @@ BR2_ARM_EABIHF=y
 
 BR2_SYSTEM_DHCP="eth0"
 
-# Linux headers same as kernel, a 5.4 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+# Linux headers same as kernel, a 5.10 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,f4b5d0de4ffad239ed01ce08d49d4f7eeeccb1a6)/linux-f4b5d0de4ffad239ed01ce08d49d4f7eeeccb1a6.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,967d45b29ca2902f031b867809d72e3b3d623e7a)/linux-967d45b29ca2902f031b867809d72e3b3d623e7a.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 
 # Build the DTBs for A/B, A+/B+ and compute module from the kernel sources
Signature · 1 line
2.29.2
#2 lore raw

PATCH 1/2 configs/raspberrypi*: bump kernel version to 967d45b (5.10.1)

Quoted 15 lines · Peter Seiderer

Now based on 5.10.1 (from 5.4.80).

---
 configs/raspberrypi0_defconfig       | 6 +++---
 configs/raspberrypi0w_defconfig      | 6 +++---
 configs/raspberrypi2_defconfig       | 6 +++---
 configs/raspberrypi3_64_defconfig    | 6 +++---
 configs/raspberrypi3_defconfig       | 6 +++---
 configs/raspberrypi3_qt5we_defconfig | 6 +++---
 configs/raspberrypi4_64_defconfig    | 6 +++---
 configs/raspberrypi4_defconfig       | 6 +++---
 configs/raspberrypi_defconfig        | 6 +++---
 9 files changed, 27 insertions(+), 27 deletions(-)
Signature · 1 line
Marcin Niestr?j
#4 lore raw

PATCH 1/1 package/qt5webengine: add optional host-freetype/host-libjpeg dependency

In reply to Peter Seiderer

- add optional host-freetype dependency

Fixes:

Command: .../host/bin/python2 .../build/qt5webengine-5.15.2/src/3rdparty/chromium/build/config/linux/pkg-config.py -p .../build/qt5webengine-5.15.2/host-bin/host-pkg-config freetype2 Returned 1.
stderr:

Package freetype2 was not found in the pkg-config search path. Perhaps you should add the directory containing `freetype2.pc' to the PKG_CONFIG_PATH environment variable
Package 'freetype2', required by 'virtual:world', not found Could not run pkg-config.

See //build/linux/BUILD.gn:24:3: whence it was called.

    pkg_config("freetype_from_pkgconfig") {
    ^--------------------------------------

See //build/config/freetype/BUILD.gn:10:24: which caused the file to be included.
public_configs = [ "//build/linux:freetype_from_pkgconfig" ]
^--------------------------------------
Project ERROR: GN run error!
make[4]: *** [Makefile:82: sub-gn_run-pro-make_first] Error 3 make[3]: *** [Makefile:79: sub-core-make_first] Error 2
make[2]: *** [Makefile:49: sub-src-make_first] Error 2

- add optiobal hist-libjpeg dependency

Fixes:

https://gitlab.com/buildroot.org/buildroot/-/jobs/917539230

Command: .../host/bin/python2 .../build/qt5webengine-5.15.2/src/3rdparty/chromium/build/config/linux/pkg-config.py -p .../build/qt5webengine-5.15.2/host-bin/host-pkg-config libjpeg Returned 1.
stderr:
Package libjpeg was not found in the pkg-config search path.
Perhaps you should add the directory containing `libjpeg.pc'
to the PKG_CONFIG_PATH environment variable
Package 'libjpeg', required by 'virtual:world', not found
Could not run pkg-config.
See //third_party/BUILD.gn:17:3: whence it was called.

    pkg_config("system_libjpeg") {
    ^-----------------------------
  See //third_party/blink/renderer/platform/BUILD.gn:159:5: which caused the file to be included.
      "//third_party:jpeg",
      ^-------------------

Project ERROR: GN run error!

---
 package/qt5/qt5webengine/qt5webengine.mk | 8 ++++++++
 1 file changed, 8 insertions(+)
package/qt5/qt5webengine/qt5webengine.mk +8 -0
index 64c9c96cc2..8ab50a0fbf 100644
@@ -29,6 +29,14 @@ endif
 
 QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss
 
+ifeq ($(BR2_PACKAGE_QT5BASE_FONTCONFIG),y)
+QT5WEBENGINE_DEPENDENCIES += host-freetype
+endif
+
+ifeq ($(BR2_PACKAGE_QT5BASE_JPEG),y)
+QT5WEBENGINE_DEPENDENCIES += host-libjpeg
+endif
+
 QT5WEBENGINE_CONF_OPTS += WEBENGINE_CONFIG+=use_system_ffmpeg
 
 ifeq ($(BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS),y)
Signature · 1 line
2.29.2
#5 lore raw

PATCH 1/1 package/qt5webengine: add optional host-freetype/host-libjpeg dependency

Hello Peter,

Quoted 57 lines · On Mon, 21 Dec 2020 21:39:51 +0100 Peter Seiderer <[email protected]> wrote:

- add optional host-freetype dependency

Fixes:

Command: .../host/bin/python2 .../build/qt5webengine-5.15.2/src/3rdparty/chromium/build/config/linux/pkg-config.py -p .../build/qt5webengine-5.15.2/host-bin/host-pkg-config freetype2 Returned 1.
stderr:

Package freetype2 was not found in the pkg-config search path. Perhaps you should add the directory containing `freetype2.pc' to the PKG_CONFIG_PATH environment variable
Package 'freetype2', required by 'virtual:world', not found Could not run pkg-config.

See //build/linux/BUILD.gn:24:3: whence it was called.

    pkg_config("freetype_from_pkgconfig") {
    ^--------------------------------------

See //build/config/freetype/BUILD.gn:10:24: which caused the file to be included.
public_configs = [ "//build/linux:freetype_from_pkgconfig" ]
^--------------------------------------
Project ERROR: GN run error!
make[4]: *** [Makefile:82: sub-gn_run-pro-make_first] Error 3 make[3]: *** [Makefile:79: sub-core-make_first] Error 2
make[2]: *** [Makefile:49: sub-src-make_first] Error 2

- add optiobal hist-libjpeg dependency

Fixes:

https://gitlab.com/buildroot.org/buildroot/-/jobs/917539230

Command: .../host/bin/python2 .../build/qt5webengine-5.15.2/src/3rdparty/chromium/build/config/linux/pkg-config.py -p .../build/qt5webengine-5.15.2/host-bin/host-pkg-config libjpeg Returned 1.
stderr:
Package libjpeg was not found in the pkg-config search path.
Perhaps you should add the directory containing `libjpeg.pc'
to the PKG_CONFIG_PATH environment variable
Package 'libjpeg', required by 'virtual:world', not found
Could not run pkg-config.
See //third_party/BUILD.gn:17:3: whence it was called.

    pkg_config("system_libjpeg") {
    ^-----------------------------
  See //third_party/blink/renderer/platform/BUILD.gn:159:5: which caused the file to be included.
      "//third_party:jpeg",
      ^-------------------

Project ERROR: GN run error!

---
 package/qt5/qt5webengine/qt5webengine.mk | 8 ++++++++
 1 file changed, 8 insertions(+)
package/qt5/qt5webengine/qt5webengine.mk +0 -0
index 64c9c96cc2..8ab50a0fbf 100644

package/qt5/qt5webengine/qt5webengine.mk endif · line 38

Quoted 10 lines
package/qt5/qt5webengine/qt5webengine.mk +7 -0
@@ -29,6 +29,14 @@ endif
 
 QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss
 
+ifeq ($(BR2_PACKAGE_QT5BASE_FONTCONFIG),y)
+QT5WEBENGINE_DEPENDENCIES += host-freetype
+endif
+
+ifeq ($(BR2_PACKAGE_QT5BASE_JPEG),y)
+QT5WEBENGINE_DEPENDENCIES += host-libjpeg
+endif

This looks really odd. Why would these target-related features require host-freetype and host-libjpeg ? Aren't we instead seeing some pkg-config issue where it's trying to find freetype/libjpeg for the target, but it for some reason doesn't work, and tries to find them for the host ?

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#6 lore raw

PATCH 1/1 package/qt5webengine: add optional host-freetype/host-libjpeg dependency

Hello Peter,

Quoted 5 lines · On Wed, 30 Dec 2020 11:18:23 +0100 Thomas Petazzoni…
Quoted 5 lines
package/qt5/qt5webengine/qt5webengine.mk +5 -0
+ifeq ($(BR2_PACKAGE_QT5BASE_FONTCONFIG),y)
+QT5WEBENGINE_DEPENDENCIES += host-freetype
+endif
+
+ifeq ($(BR2_PACKAGE_QT5BASE_JPEG),y)
Quoted 8 lines

package/qt5/qt5webengine/qt5webengine.mk endif · line 38

Quoted 2 lines
package/qt5/qt5webengine/qt5webengine.mk +2 -0
+QT5WEBENGINE_DEPENDENCIES += host-libjpeg
+endif  

This looks really odd. Why would these target-related features require host-freetype and host-libjpeg ? Aren't we instead seeing some pkg-config issue where it's trying to find freetype/libjpeg for the target, but it for some reason doesn't work, and tries to find them for the host ?

Do you have some further feedback on this issue ?

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#7 lore raw

PATCH 1/1 package/qt5webengine: add optional host-freetype/host-libjpeg dependency

Hello Thomas,

Quoted 19 lines · Thomas Petazzoni

Hello Peter,

Quoted 5 lines · On Wed, 30 Dec 2020 11:18:23 +0100 Thomas Petazzoni…
Quoted 5 lines
(quoted diff) +5 -0
+ifeq ($(BR2_PACKAGE_QT5BASE_FONTCONFIG),y)
+QT5WEBENGINE_DEPENDENCIES += host-freetype
+endif
+
+ifeq ($(BR2_PACKAGE_QT5BASE_JPEG),y)
Quoted 8 lines

Review

Quoted 2 lines
(quoted diff) +2 -0
+QT5WEBENGINE_DEPENDENCIES += host-libjpeg
+endif

This looks really odd. Why would these target-related features require host-freetype and host-libjpeg ? Aren't we instead seeing some pkg-config issue where it's trying to find freetype/libjpeg for the target, but it for some reason doesn't work, and tries to find them for the host ?

Quoted 1 line

Do you have some further feedback on this issue ?

Did try to find out where the mismatch comes from...., but without success...

The best solution/hack so far is:

package/qt5/qt5webengine/host-pkg-config.in +1 -1
@@ -2,5 +2,5 @@
 PKG_CONFIG_SYSROOT_DIR="/" \
 PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
 PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
-PKG_CONFIG_LIBDIR="@HOST_DIR@/lib/pkgconfig:@HOST_DIR@/share/pkgconfig" \
+PKG_CONFIG_LIBDIR="@HOST_DIR@/lib/pkgconfig:@HOST_DIR@/share/pkgconfig:@SYSROOT@/usr/lib/pkgconfig" \
 exec @HOST_DIR@/bin/pkgconf "$@"
package/qt5/qt5webengine/qt5webengine.mk +1 -1
@@ -54,7 +54,7 @@ QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_PYTHON2_SYMLINK
 QT5WEBENGINE_ENV += NINJAFLAGS="-j$(PARALLEL_JOBS)"
 
 define QT5WEBENGINE_CREATE_HOST_PKG_CONFIG
-	sed s%@HOST_DIR@%$(HOST_DIR)%g $(QT5WEBENGINE_PKGDIR)/host-pkg-config.in > $(@D)/host-bin/host-pkg-config
+	sed s%@HOST_DIR@%$(HOST_DIR)%g $(QT5WEBENGINE_PKGDIR)/host-pkg-config.in | sed s%@SYSROOT@%$(STAGING_DIR)%g > $(@D)/host-bin/host-pkg-config
 	chmod +x $(@D)/host-bin/host-pkg-config
 endef
 QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_CREATE_HOST_PKG_CONFIG

Regards,
Peter

Quoted 4 lines

Thanks!

Thomas

#8 lore raw

PATCH 1/1 package/qt5webengine: add optional host-freetype/host-libjpeg dependency

Hello Peter,

Quoted 18 lines · On Thu, 21 Jan 2021 22:03:00 +0100 Peter Seiderer <[email protected]> wrote:

Did try to find out where the mismatch comes from...., but without success...

The best solution/hack so far is:

package/qt5/qt5webengine/host-pkg-config.in +1 -1
@@ -2,5 +2,5 @@
 PKG_CONFIG_SYSROOT_DIR="/" \
 PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
 PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
-PKG_CONFIG_LIBDIR="@HOST_DIR@/lib/pkgconfig:@HOST_DIR@/share/pkgconfig" \
+PKG_CONFIG_LIBDIR="@HOST_DIR@/lib/pkgconfig:@HOST_DIR@/share/pkgconfig:@SYSROOT@/usr/lib/pkgconfig" \
 exec @HOST_DIR@/bin/pkgconf "$@"

package/qt5/qt5webengine/qt5webengine.mk QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_PYTHON2_SYMLINK · line 58

Quoted 6 lines
package/qt5/qt5webengine/qt5webengine.mk +1 -1
@@ -54,7 +54,7 @@ QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_PYTHON2_SYMLINK
 QT5WEBENGINE_ENV += NINJAFLAGS="-j$(PARALLEL_JOBS)"
 
 define QT5WEBENGINE_CREATE_HOST_PKG_CONFIG
-	sed s%@HOST_DIR@%$(HOST_DIR)%g $(QT5WEBENGINE_PKGDIR)/host-pkg-config.in > $(@D)/host-bin/host-pkg-config
+	sed s%@HOST_DIR@%$(HOST_DIR)%g $(QT5WEBENGINE_PKGDIR)/host-pkg-config.in | sed s%@SYSROOT@%$(STAGING_DIR)%g > $(@D)/host-bin/host-pkg-config
 	chmod +x $(@D)/host-bin/host-pkg-config

Ouch, but this is also very wrong, it makes host-pkg-config (which is there to query results about native libraries), return results for cross-compiled libraries :-/

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#9 lore raw

Re: [Buildroot] [PATCH v1] package/qt5webengine: add optional host-freetype/host-libjpeg dependency

In reply to Peter Seiderer
Quoted 17 lines · On Mon, 21 Dec 2020 21:39:51 +0100 Peter Seiderer <[email protected]> wrote:

- add optional host-freetype dependency

Fixes:

Command: .../host/bin/python2 .../build/qt5webengine-5.15.2/src/3rdparty/chromium/build/config/linux/pkg-config.py -p .../build/qt5webengine-5.15.2/host-bin/host-pkg-config freetype2 Returned 1.
stderr:

Package freetype2 was not found in the pkg-config search path. Perhaps you should add the directory containing `freetype2.pc' to the PKG_CONFIG_PATH environment variable
Package 'freetype2', required by 'virtual:world', not found Could not run pkg-config.

See //build/linux/BUILD.gn:24:3: whence it was called.

    pkg_config("freetype_from_pkgconfig") {
    ^--------------------------------------
Quoted 7 lines

See //build/config/freetype/BUILD.gn:10:24: which caused the file to be included.
public_configs = [ "//build/linux:freetype_from_pkgconfig" ]
^--------------------------------------
Project ERROR: GN run error!
make[4]: *** [Makefile:82: sub-gn_run-pro-make_first] Error 3 make[3]: *** [Makefile:79: sub-core-make_first] Error 2
make[2]: *** [Makefile:49: sub-src-make_first] Error 2

I am falling into this issue while building the following defconfig:

BR2_arm=y
BR2_arm1176jzf_s=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
BR2_PACKAGE_QT5=y
BR2_PACKAGE_QT5WEBENGINE=y
BR2_PACKAGE_RPI_USERLAND=y

Did you had the chance to investigate more deeply why having fontconfig support in Qt leads qt5webengine wanting to find freetype2 on the host?

Thomas

Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#10 lore raw

Re: [Buildroot] [PATCH v1] package/qt5webengine: add optional host-freetype/host-libjpeg dependency

Quoted 10 lines · On Sun, 9 Jan 2022 14:27:48 +0100 Thomas Petazzoni…

I am falling into this issue while building the following defconfig:

BR2_arm=y
BR2_arm1176jzf_s=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
BR2_PACKAGE_QT5=y
BR2_PACKAGE_QT5WEBENGINE=y
BR2_PACKAGE_RPI_USERLAND=y

Quoted 2 lines

Did you had the chance to investigate more deeply why having fontconfig support in Qt leads qt5webengine wanting to find freetype2 on the host?

Interestingly, in commit
https://github.com/meta-qt5/meta-qt5/commit/280487f20bca829527a597d6263b0344a01917ac#diff-f0ffde666f6ff0282f8400203b3ba20968494d3c7245106eca761bd79baa1c78R26
the meta-qt5 layer, when upgrading Qt to 5.15.2 added jpeg-native and freetype-native as new unconditional dependencies.

But there are no explanations. Is it really because the Chromium stuff is building a host tool with freetype/jpeg, or is it just a workaround for some incorrect behavior of the Chromium build process that needs freetype/jpeg on the target, but checks for them on the host?

Thomas

Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#11 lore raw

Re: [Buildroot] [PATCH v1] package/qt5webengine: add optional host-freetype/host-libjpeg dependency

Hello Thomas,

Quoted 21 lines · Thomas Petazzoni
Quoted 10 lines · On Sun, 9 Jan 2022 14:27:48 +0100 Thomas Petazzoni…

I am falling into this issue while building the following defconfig:

BR2_arm=y
BR2_arm1176jzf_s=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
BR2_PACKAGE_QT5=y
BR2_PACKAGE_QT5WEBENGINE=y
BR2_PACKAGE_RPI_USERLAND=y

Quoted 2 lines

Did you had the chance to investigate more deeply why having fontconfig support in Qt leads qt5webengine wanting to find freetype2 on the host?

Interestingly, in commit
https://github.com/meta-qt5/meta-qt5/commit/280487f20bca829527a597d6263b0344a01917ac#diff-f0ffde666f6ff0282f8400203b3ba20968494d3c7245106eca761bd79baa1c78R26
the meta-qt5 layer, when upgrading Qt to 5.15.2 added jpeg-native and freetype-native as new unconditional dependencies.

Quoted 4 lines

But there are no explanations. Is it really because the Chromium stuff is building a host tool with freetype/jpeg, or is it just a workaround for some incorrect behavior of the Chromium build process that needs freetype/jpeg on the target, but checks for them on the host?

Would say yes...

Regards,
Peter

Quoted 2 lines

Thomas

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#12 lore raw

Re: [Buildroot] [PATCH v1] package/qt5webengine: add optional host-freetype/host-libjpeg dependency

In reply to Thomas Petazzoni

Hello Thomas,

Quoted 38 lines · Thomas Petazzoni
Quoted 17 lines · On Mon, 21 Dec 2020 21:39:51 +0100 Peter Seiderer <[email protected]> wrote:

- add optional host-freetype dependency

Fixes:

Command: .../host/bin/python2 .../build/qt5webengine-5.15.2/src/3rdparty/chromium/build/config/linux/pkg-config.py -p .../build/qt5webengine-5.15.2/host-bin/host-pkg-config freetype2 Returned 1.
stderr:

Package freetype2 was not found in the pkg-config search path. Perhaps you should add the directory containing `freetype2.pc' to the PKG_CONFIG_PATH environment variable
Package 'freetype2', required by 'virtual:world', not found Could not run pkg-config.

See //build/linux/BUILD.gn:24:3: whence it was called.

    pkg_config("freetype_from_pkgconfig") {
    ^--------------------------------------
Quoted 7 lines

See //build/config/freetype/BUILD.gn:10:24: which caused the file to be included.
public_configs = [ "//build/linux:freetype_from_pkgconfig" ]
^--------------------------------------
Project ERROR: GN run error!
make[4]: *** [Makefile:82: sub-gn_run-pro-make_first] Error 3 make[3]: *** [Makefile:79: sub-core-make_first] Error 2
make[2]: *** [Makefile:49: sub-src-make_first] Error 2

I am falling into this issue while building the following defconfig:

BR2_arm=y
BR2_arm1176jzf_s=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
BR2_PACKAGE_QT5=y
BR2_PACKAGE_QT5WEBENGINE=y
BR2_PACKAGE_RPI_USERLAND=y

Quoted 2 lines

Did you had the chance to investigate more deeply why having fontconfig support in Qt leads qt5webengine wanting to find freetype2 on the host?

The observation is that all (optional) qt target options are requested by qtwebengine for the host (and buildroot package fontconfig selects freetype)...

Regards,
Peter

Quoted 2 lines

Thomas

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Tested-by on v1 1/1
#13 lore raw

Re: [Buildroot] [PATCH v1] package/qt5webengine: add optional host-freetype/host-libjpeg dependency

In reply to Peter Seiderer
Quoted 41 lines · Peter Seiderer

- add optional host-freetype dependency

Fixes:

Command: .../host/bin/python2 .../build/qt5webengine-5.15.2/src/3rdparty/chromium/build/config/linux/pkg-config.py -p .../build/qt5webengine-5.15.2/host-bin/host-pkg-config freetype2 Returned 1.
stderr:

Package freetype2 was not found in the pkg-config search path. Perhaps you should add the directory containing `freetype2.pc' to the PKG_CONFIG_PATH environment variable
Package 'freetype2', required by 'virtual:world', not found Could not run pkg-config.

See //build/linux/BUILD.gn:24:3: whence it was called.

    pkg_config("freetype_from_pkgconfig") {
    ^--------------------------------------

See //build/config/freetype/BUILD.gn:10:24: which caused the file to be included.
public_configs = [ "//build/linux:freetype_from_pkgconfig" ]
^--------------------------------------
Project ERROR: GN run error!
make[4]: *** [Makefile:82: sub-gn_run-pro-make_first] Error 3 make[3]: *** [Makefile:79: sub-core-make_first] Error 2
make[2]: *** [Makefile:49: sub-src-make_first] Error 2

- add optiobal hist-libjpeg dependency

Fixes:

https://gitlab.com/buildroot.org/buildroot/-/jobs/917539230

Command: .../host/bin/python2 .../build/qt5webengine-5.15.2/src/3rdparty/chromium/build/config/linux/pkg-config.py -p .../build/qt5webengine-5.15.2/host-bin/host-pkg-config libjpeg Returned 1.
stderr:
Package libjpeg was not found in the pkg-config search path.
Perhaps you should add the directory containing `libjpeg.pc'
to the PKG_CONFIG_PATH environment variable
Package 'libjpeg', required by 'virtual:world', not found
Could not run pkg-config.
See //third_party/BUILD.gn:17:3: whence it was called.

Quoted 8 lines
    pkg_config("system_libjpeg") {
    ^-----------------------------
  See //third_party/blink/renderer/platform/BUILD.gn:159:5: which caused the file to be included.
      "//third_party:jpeg",
      ^-------------------

Project ERROR: GN run error!

Quoted 26 lines
---
 package/qt5/qt5webengine/qt5webengine.mk | 8 ++++++++
 1 file changed, 8 insertions(+)
package/qt5/qt5webengine/qt5webengine.mk +8 -1
index 64c9c96cc2..8ab50a0fbf 100644
@@ -29,6 +29,14 @@ endif
 
 QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss
 
+ifeq ($(BR2_PACKAGE_QT5BASE_FONTCONFIG),y)
+QT5WEBENGINE_DEPENDENCIES += host-freetype
+endif
+
+ifeq ($(BR2_PACKAGE_QT5BASE_JPEG),y)
+QT5WEBENGINE_DEPENDENCIES += host-libjpeg
+endif
+
 QT5WEBENGINE_CONF_OPTS += WEBENGINE_CONFIG+=use_system_ffmpeg
 
 ifeq ($(BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS),y)
--

2.29.2

Quoted 4 lines

_______________________________________________
buildroot mailing list
[email protected]
http://lists.busybox.net/mailman/listinfo/buildroot

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#14 lore raw

PATCH 2/2 package/rpi-firmware: bump version to d016a6e

In reply to Peter Seiderer

Keep rpi-firmware up-to-date with the kernel
version bump (5.10.1).

---
 package/rpi-firmware/rpi-firmware.hash | 2 +-
 package/rpi-firmware/rpi-firmware.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/rpi-firmware/rpi-firmware.hash +1 -1
index 7767479daf..691b200259 100644
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  fdf199b1af35d8ba874c1e963344f8e6edf21a7f37a9633fa4bddaea19aad84a  rpi-firmware-08ed7a0c9ad4d9db559aaec462520ab435c7ce1c.tar.gz
+sha256  ae4e317681995e0f7becd7900ae667cba394e3a0b7ca93a267f3303df7284697  rpi-firmware-d016a6eb01c8c7326a89cb42809fed2a21525de5.tar.gz
 sha256  c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b  boot/LICENCE.broadcom
package/rpi-firmware/rpi-firmware.mk +1 -1
index 0255a5bff5..f3d28ef825 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_FIRMWARE_VERSION = 08ed7a0c9ad4d9db559aaec462520ab435c7ce1c
+RPI_FIRMWARE_VERSION = d016a6eb01c8c7326a89cb42809fed2a21525de5
 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
 RPI_FIRMWARE_LICENSE = BSD-3-Clause
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
Signature · 1 line
2.29.2