diff options
| author | Ari Parkkila <ari.parkkila@qt.io> | 2022-10-14 10:40:40 +0300 |
|---|---|---|
| committer | Ari Parkkila <ari.parkkila@qt.io> | 2022-11-28 16:40:23 +0200 |
| commit | a0e8bd3a17b72b59365fb1fa45a0448c369be05d (patch) | |
| tree | 6035c176c77ee44261ed1253f695c9a0752bd0d2 | |
| parent | 92b9334713398aeae24b8dd2a4e393182f01ffb4 (diff) | |
dev: upgrade to yocto langdale
Changes:
* Update all meta-layers toward langdale and remove obsolete patches
* templates: Move to conf/templates/default for a new poky QA check
* toolchain: Add static libs to target SDK
* meta-raspberrypi: Accept synaptics-killswitch license
* meta-toradex-nxp: Currently support only for mx8, see #213caf39
* toradex-nxp-layer: Fix API break of kernel 5.4 perf module
* meta-tegra: Replace Jetson TX with AGX Xavier, enable KPROBES
Fixes: QTBUG-106806
Change-Id: I52c4f5d4a7a1aba783f4898de3853d0df9e34aeb
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
32 files changed, 226 insertions, 398 deletions
diff --git a/b2qt-init-build-env b/b2qt-init-build-env index 7f057fca..369dbdbf 100755 --- a/b2qt-init-build-env +++ b/b2qt-init-build-env @@ -125,7 +125,7 @@ init() { ln -s ${DIR}/scripts/setup-environment.sh setup-environment.sh fi - ln -sfn meta-boot2qt/meta-boot2qt-distro/conf sources/templates + ln -sfn meta-boot2qt/meta-boot2qt-distro/conf/templates/default sources/templates # handle lfs repos which need manual lfs pull LFS_REPOS=$(grep filter=lfs -l sources/*/.gitattributes 2>/dev/null || true) diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 602b5ec0..9a7e48c8 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -46,7 +46,7 @@ environment: &environment equals_value: TARGET4 - type: EnvironmentVariable variableName: MACHINE - variableValue: jetson-tx2-devkit + variableValue: jetson-agx-xavier-devkit enable_if: condition: property property: target.arch diff --git a/meta-boot2qt-distro/conf/distro/include/jetson.inc b/meta-boot2qt-distro/conf/distro/include/jetson.inc index f82a466f..926797ea 100644 --- a/meta-boot2qt-distro/conf/distro/include/jetson.inc +++ b/meta-boot2qt-distro/conf/distro/include/jetson.inc @@ -39,8 +39,6 @@ UBOOT_SUFFIX = "bin" IMAGE_FSTYPES += "wic.xz" WKS_FILE = "tegra-bootdisk.wks.in" -DEPLOY_CONF_NAME:jetson-tx1-devkit = "NVIDIA Jetson TX1 Development Kit" -DEPLOY_CONF_NAME:jetson-tx2-devkit = "NVIDIA Jetson TX2 Development Kit" DEPLOY_CONF_NAME:jetson-agx-xavier-devkit = "NVIDIA Jetson AGX Xavier Development Kit" DEPLOY_CONF_IMAGE_TYPE = "wic.xz" @@ -64,9 +62,3 @@ module_conf_tegra-udrm = "" NVIDIA_DEVNET_MIRROR ?= "file://${BSPDIR}/sources/nvidia-devnet-mirror" NVIDIA_DEVNET_MIRROR[vardepsexclude] = "BSPDIR" - -# cboot-t18x fails to build with: -# multiple definition of `sdmmc_context_t' -PREFERRED_PROVIDER_cboot = "cboot-prebuilt" - -require conf/include/gstreamer-1.14.conf diff --git a/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc b/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc index 8f0de33e..2e9254ba 100644 --- a/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc +++ b/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc @@ -75,8 +75,8 @@ MACHINE_GSTREAMER_1_0_PLUGIN += "gstreamer1.0-omx" RPI_KERNEL_DEVICETREE_OVERLAYS = "\ overlays/overlay_map.dtb \ overlays/act-led.dtbo \ - overlays/adafruit-st7735r.dtbo \ overlays/adafruit18.dtbo \ + overlays/adafruit-st7735r.dtbo \ overlays/adau1977-adc.dtbo \ overlays/adau7002-simple.dtbo \ overlays/ads1015.dtbo \ @@ -85,8 +85,8 @@ RPI_KERNEL_DEVICETREE_OVERLAYS = "\ overlays/adv7282m.dtbo \ overlays/adv728x-m.dtbo \ overlays/akkordion-iqdacplus.dtbo \ - overlays/allo-boss-dac-pcm512x-audio.dtbo \ overlays/allo-boss2-dac-audio.dtbo \ + overlays/allo-boss-dac-pcm512x-audio.dtbo \ overlays/allo-digione.dtbo \ overlays/allo-katana-dac-audio.dtbo \ overlays/allo-piano-dac-pcm512x-audio.dtbo \ @@ -94,6 +94,8 @@ RPI_KERNEL_DEVICETREE_OVERLAYS = "\ overlays/anyspi.dtbo \ overlays/apds9960.dtbo \ overlays/applepi-dac.dtbo \ + overlays/arducam-64mp.dtbo \ + overlays/arducam-pivariety.dtbo \ overlays/at86rf233.dtbo \ overlays/audioinjector-addons.dtbo \ overlays/audioinjector-bare-i2s.dtbo \ @@ -108,16 +110,17 @@ RPI_KERNEL_DEVICETREE_OVERLAYS = "\ overlays/cma.dtbo \ overlays/cutiepi-panel.dtbo \ overlays/dht11.dtbo \ + overlays/dionaudio-kiwi.dtbo \ overlays/dionaudio-loco.dtbo \ overlays/dionaudio-loco-v2.dtbo \ overlays/disable-bt.dtbo \ overlays/disable-wifi.dtbo \ - overlays/dpi18.dtbo \ overlays/dpi18cpadhi.dtbo \ + overlays/dpi18.dtbo \ overlays/dpi24.dtbo \ overlays/draws.dtbo \ - overlays/dwc-otg.dtbo \ overlays/dwc2.dtbo \ + overlays/dwc-otg.dtbo \ overlays/edt-ft5406.dtbo \ overlays/enc28j60.dtbo \ overlays/enc28j60-spi2.dtbo \ @@ -125,10 +128,12 @@ RPI_KERNEL_DEVICETREE_OVERLAYS = "\ overlays/fbtft.dtbo \ overlays/fe-pi-audio.dtbo \ overlays/fsm-demo.dtbo \ + overlays/gc9a01.dtbo \ overlays/ghost-amp.dtbo \ overlays/goodix.dtbo \ overlays/googlevoicehat-soundcard.dtbo \ overlays/gpio-fan.dtbo \ + overlays/gpio-hog.dtbo \ overlays/gpio-ir.dtbo \ overlays/gpio-ir-tx.dtbo \ overlays/gpio-key.dtbo \ @@ -139,39 +144,40 @@ RPI_KERNEL_DEVICETREE_OVERLAYS = "\ overlays/gpio-shutdown.dtbo \ overlays/hd44780-lcd.dtbo \ overlays/hdmi-backlight-hwhack-gpio.dtbo \ - overlays/hifiberry-amp.dtbo \ overlays/hifiberry-amp100.dtbo \ + overlays/hifiberry-amp.dtbo \ overlays/hifiberry-dac.dtbo \ - overlays/hifiberry-dacplus.dtbo \ overlays/hifiberry-dacplusadc.dtbo \ overlays/hifiberry-dacplusadcpro.dtbo \ overlays/hifiberry-dacplusdsp.dtbo \ overlays/hifiberry-dacplushd.dtbo \ + overlays/hifiberry-dacplus.dtbo \ overlays/hifiberry-digi.dtbo \ overlays/hifiberry-digi-pro.dtbo \ overlays/highperi.dtbo \ overlays/hy28a.dtbo \ overlays/hy28b-2017.dtbo \ overlays/hy28b.dtbo \ - overlays/i-sabre-q2m.dtbo \ + overlays/i2c0.dtbo \ + overlays/i2c1.dtbo \ + overlays/i2c3.dtbo \ + overlays/i2c4.dtbo \ + overlays/i2c5.dtbo \ + overlays/i2c6.dtbo \ overlays/i2c-bcm2708.dtbo \ + overlays/i2c-fan.dtbo \ overlays/i2c-gpio.dtbo \ overlays/i2c-mux.dtbo \ overlays/i2c-pwm-pca9685a.dtbo \ overlays/i2c-rtc-gpio.dtbo \ overlays/i2c-rtc.dtbo \ overlays/i2c-sensor.dtbo \ - overlays/i2c0.dtbo \ - overlays/i2c1.dtbo \ - overlays/i2c3.dtbo \ - overlays/i2c4.dtbo \ - overlays/i2c5.dtbo \ - overlays/i2c6.dtbo \ overlays/i2s-gpio28-31.dtbo \ overlays/ilitek251x.dtbo \ overlays/imx219.dtbo \ overlays/imx258.dtbo \ overlays/imx290.dtbo \ + overlays/imx296.dtbo \ overlays/imx378.dtbo \ overlays/imx477.dtbo \ overlays/imx519.dtbo \ @@ -181,6 +187,7 @@ RPI_KERNEL_DEVICETREE_OVERLAYS = "\ overlays/iqaudio-digi-wm8804-audio.dtbo \ overlays/iqs550.dtbo \ overlays/irs1125.dtbo \ + overlays/i-sabre-q2m.dtbo \ overlays/jedec-spi-nor.dtbo \ overlays/justboom-both.dtbo \ overlays/justboom-dac.dtbo \ @@ -227,8 +234,8 @@ RPI_KERNEL_DEVICETREE_OVERLAYS = "\ overlays/pifi-dac-zero.dtbo \ overlays/pifi-mini-210.dtbo \ overlays/piglow.dtbo \ - overlays/piscreen.dtbo \ overlays/piscreen2r.dtbo \ + overlays/piscreen.dtbo \ overlays/pisound.dtbo \ overlays/pitft22.dtbo \ overlays/pitft28-capacitive.dtbo \ @@ -240,6 +247,8 @@ RPI_KERNEL_DEVICETREE_OVERLAYS = "\ overlays/pwm.dtbo \ overlays/qca7000.dtbo \ overlays/qca7000-uart0.dtbo \ + overlays/ramoops.dtbo \ + overlays/ramoops-pi4.dtbo \ overlays/rotary-encoder.dtbo \ overlays/rpi-backlight.dtbo \ overlays/rpi-cirrus-wm5102.dtbo \ @@ -251,7 +260,6 @@ RPI_KERNEL_DEVICETREE_OVERLAYS = "\ overlays/rpi-proto.dtbo \ overlays/rpi-sense.dtbo \ overlays/rpi-tv.dtbo \ - overlays/rpivid-v4l2.dtbo \ overlays/rra-digidac1-wm8741-audio.dtbo \ overlays/sainsmart18.dtbo \ overlays/sc16is750-i2c.dtbo \ @@ -267,9 +275,6 @@ RPI_KERNEL_DEVICETREE_OVERLAYS = "\ overlays/smi-dev.dtbo \ overlays/smi-nand.dtbo \ overlays/smi.dtbo \ - overlays/spi-gpio35-39.dtbo \ - overlays/spi-gpio40-45.dtbo \ - overlays/spi-rtc.dtbo \ overlays/spi0-0cs.dtbo \ overlays/spi0-1cs.dtbo \ overlays/spi0-2cs.dtbo \ @@ -287,6 +292,9 @@ RPI_KERNEL_DEVICETREE_OVERLAYS = "\ overlays/spi5-2cs.dtbo \ overlays/spi6-1cs.dtbo \ overlays/spi6-2cs.dtbo \ + overlays/spi-gpio35-39.dtbo \ + overlays/spi-gpio40-45.dtbo \ + overlays/spi-rtc.dtbo \ overlays/ssd1306.dtbo \ overlays/ssd1306-spi.dtbo \ overlays/ssd1331-spi.dtbo \ diff --git a/meta-boot2qt-distro/conf/layer.conf b/meta-boot2qt-distro/conf/layer.conf index e2232c5f..fe0c58b3 100644 --- a/meta-boot2qt-distro/conf/layer.conf +++ b/meta-boot2qt-distro/conf/layer.conf @@ -39,7 +39,7 @@ BBFILE_COLLECTIONS += "b2qt-distro" BBFILE_PATTERN_b2qt-distro := "^${LAYERDIR}/" BBFILE_PRIORITY_b2qt-distro = "20" -LAYERSERIES_COMPAT_b2qt-distro = "kirkstone" +LAYERSERIES_COMPAT_b2qt-distro = "langdale" # recipe appends for machine specific BSP layers BBFILES_DYNAMIC += " \ diff --git a/meta-boot2qt-distro/conf/bblayers.conf.fsl.sample b/meta-boot2qt-distro/conf/templates/default/bblayers.conf.fsl.sample index fadd0cab..fadd0cab 100644 --- a/meta-boot2qt-distro/conf/bblayers.conf.fsl.sample +++ b/meta-boot2qt-distro/conf/templates/default/bblayers.conf.fsl.sample diff --git a/meta-boot2qt-distro/conf/bblayers.conf.intel.sample b/meta-boot2qt-distro/conf/templates/default/bblayers.conf.intel.sample index 4d81cc33..4d81cc33 100644 --- a/meta-boot2qt-distro/conf/bblayers.conf.intel.sample +++ b/meta-boot2qt-distro/conf/templates/default/bblayers.conf.intel.sample diff --git a/meta-boot2qt-distro/conf/bblayers.conf.jetson.sample b/meta-boot2qt-distro/conf/templates/default/bblayers.conf.jetson.sample index 9f097770..50d7d928 100644 --- a/meta-boot2qt-distro/conf/bblayers.conf.jetson.sample +++ b/meta-boot2qt-distro/conf/templates/default/bblayers.conf.jetson.sample @@ -39,7 +39,6 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ ${BSPDIR}/sources/poky/meta-poky \ ${BSPDIR}/sources/meta-tegra \ - ${BSPDIR}/sources/meta-tegra/contrib \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ ${BSPDIR}/sources/meta-openembedded/meta-python \ ${BSPDIR}/sources/meta-openembedded/meta-networking \ diff --git a/meta-boot2qt-distro/conf/bblayers.conf.rpi.sample b/meta-boot2qt-distro/conf/templates/default/bblayers.conf.rpi.sample index 07731e6b..07731e6b 100644 --- a/meta-boot2qt-distro/conf/bblayers.conf.rpi.sample +++ b/meta-boot2qt-distro/conf/templates/default/bblayers.conf.rpi.sample diff --git a/meta-boot2qt-distro/conf/bblayers.conf.sample b/meta-boot2qt-distro/conf/templates/default/bblayers.conf.sample index 6ceb29dd..6ceb29dd 100644 --- a/meta-boot2qt-distro/conf/bblayers.conf.sample +++ b/meta-boot2qt-distro/conf/templates/default/bblayers.conf.sample diff --git a/meta-boot2qt-distro/conf/bblayers.conf.toradex.sample b/meta-boot2qt-distro/conf/templates/default/bblayers.conf.toradex.sample index 4518b05b..4518b05b 100644 --- a/meta-boot2qt-distro/conf/bblayers.conf.toradex.sample +++ b/meta-boot2qt-distro/conf/templates/default/bblayers.conf.toradex.sample diff --git a/meta-boot2qt-distro/conf/conf-notes.txt b/meta-boot2qt-distro/conf/templates/default/conf-notes.txt index 62342ebc..62342ebc 100644 --- a/meta-boot2qt-distro/conf/conf-notes.txt +++ b/meta-boot2qt-distro/conf/templates/default/conf-notes.txt diff --git a/meta-boot2qt-distro/conf/local.conf.sample b/meta-boot2qt-distro/conf/templates/default/local.conf.sample index 462f06d8..01ebee7f 100644 --- a/meta-boot2qt-distro/conf/local.conf.sample +++ b/meta-boot2qt-distro/conf/templates/default/local.conf.sample @@ -326,6 +326,7 @@ INHERIT += "internal-build" ACCEPT_FSL_EULA = "1" LICENSE_FLAGS_ACCEPTED = "commercial" +LICENSE_FLAGS_ACCEPTED:append:rpi = " synaptics-killswitch" # Path to the Qt online SDK installation, used for sources that are available only from # the online installer. diff --git a/meta-boot2qt-distro/dynamic-layers/tegra/recipes-bsp/efivar/efivar/0001-LLD-fix-detection-and-remove-not-needed-workarounds.patch b/meta-boot2qt-distro/dynamic-layers/tegra/recipes-bsp/efivar/efivar/0001-LLD-fix-detection-and-remove-not-needed-workarounds.patch new file mode 100644 index 00000000..5439353b --- /dev/null +++ b/meta-boot2qt-distro/dynamic-layers/tegra/recipes-bsp/efivar/efivar/0001-LLD-fix-detection-and-remove-not-needed-workarounds.patch @@ -0,0 +1,49 @@ +From 408ae69e556dd9196ddccc92c2c8db740ba67974 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tomasz=20Pawe=C5=82=20Gajc?= <tpgxyz@gmail.com> +Date: Wed, 29 Jun 2022 21:44:29 +0200 +Subject: [PATCH] LLD: fix detection and remove not needed workarounds +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +(with b2qt edit for gold ld) + +Signed-off-by: Tomasz Paweł Gajc <tpgxyz@gmail.com> +--- + src/include/workarounds.mk | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/include/workarounds.mk b/src/include/workarounds.mk +index 3118834..f45d913 100644 +--- a/src/include/workarounds.mk ++++ b/src/include/workarounds.mk +@@ -2,20 +2,20 @@ + # + # workarounds.mk - workarounds for weird stuff behavior + +-LD_FLAVOR := $(shell $(LD) --version | grep -E '^(LLD|GNU ld)'|sed 's/ .*//g') +-LD_VERSION := $(shell $(LD) --version | grep -E '^(LLD|GNU ld)'|sed 's/.* //') +-# I haven't tested 2.36 here; 2.35 is definitely broken and 2.37 seems to work ++LD_FLAVOR := $(shell LC_ALL=C $(LD) --version | grep -E '^((.* )?LLD|GNU gold)'|sed 's/.* LLD/LLD/;s/ .*//g') ++LD_VERSION := $(shell LC_ALL=C $(LD) --version | grep -E '^((.* )?LLD|GNU gold)'|sed 's/.* LLD/LLD/;s/.* //') ++# 2.35 is definitely broken and 2.36 seems to work + LD_DASH_T := $(shell \ + if [ "x${LD_FLAVOR}" = xLLD ] ; then \ +- echo '-T' ; \ ++ echo "" ; \ + elif [ "x${LD_FLAVOR}" = xGNU ] ; then \ + if echo "${LD_VERSION}" | grep -q -E '^2\.3[789]|^2\.[456789]|^[3456789]|^[[:digit:]][[:digit:]]' ; then \ + echo '-T' ; \ + else \ +- echo "" ; \ ++ echo "-T" ; \ + fi ; \ + else \ +- echo "Your linker is not supported" ; \ ++ echo "Your linker ${LD_FLAVOR} version ${LD_VERSION} is not supported" ; \ + exit 1 ; \ + fi) + +-- +2.25.1 + diff --git a/meta-boot2qt-distro/dynamic-layers/tegra/recipes-core/initrdscripts/tegra-minimal-init_1.0.bbappend b/meta-boot2qt-distro/dynamic-layers/tegra/recipes-bsp/efivar/efivar_%.bbappend index 6dc1800f..613d9eba 100644 --- a/meta-boot2qt-distro/dynamic-layers/tegra/recipes-core/initrdscripts/tegra-minimal-init_1.0.bbappend +++ b/meta-boot2qt-distro/dynamic-layers/tegra/recipes-bsp/efivar/efivar_%.bbappend @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2019 The Qt Company Ltd. +## Copyright (C) 2022 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -28,6 +28,6 @@ ############################################################################ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI += "\ - file://init-boot.sh \ +SRC_URI += " \ + file://0001-LLD-fix-detection-and-remove-not-needed-workarounds.patch \ " diff --git a/meta-boot2qt-distro/dynamic-layers/tegra/recipes-bsp/u-boot/u-boot-tegra/0001-nvidia-Fix-sd-card-boot-for-jetson-tx2.patch b/meta-boot2qt-distro/dynamic-layers/tegra/recipes-bsp/u-boot/u-boot-tegra/0001-nvidia-Fix-sd-card-boot-for-jetson-tx2.patch deleted file mode 100644 index 63160301..00000000 --- a/meta-boot2qt-distro/dynamic-layers/tegra/recipes-bsp/u-boot/u-boot-tegra/0001-nvidia-Fix-sd-card-boot-for-jetson-tx2.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b9ba22e4c3a5baf2eabb56c8fc17c921bf2ec3cc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Pasi=20Pet=C3=A4j=C3=A4j=C3=A4rvi?= <pasi.petajajarvi@qt.io> -Date: Wed, 5 May 2021 18:34:23 +0300 -Subject: [PATCH] nvidia: Fix sd card boot for jetson tx2 - -If image is flashed to emmc and then same image is flashed for sd card, -it will not boot as mmc1 device is taken by mmc sdio wifi. ---- - include/configs/p2771-0000.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/configs/p2771-0000.h b/include/configs/p2771-0000.h -index eb85e4bc8e..dd87d30030 100644 ---- a/include/configs/p2771-0000.h -+++ b/include/configs/p2771-0000.h -@@ -17,7 +17,7 @@ - - /* SD, eMMC, USB, NVME, PXE, DHCP */ - #define BOOT_TARGET_DEVICES(func) \ -- func(MMC, mmc, 1) \ -+ func(MMC, mmc, 2) \ - func(MMC, mmc, 0) \ - func(USB, usb, 0) \ - func(NVME, nvme, 0) \ --- -2.25.1 - diff --git a/meta-boot2qt-distro/dynamic-layers/tegra/recipes-core/initrdscripts/tegra-minimal-init/init-boot.sh b/meta-boot2qt-distro/dynamic-layers/tegra/recipes-core/initrdscripts/tegra-minimal-init/init-boot.sh deleted file mode 100644 index 3e43b607..00000000 --- a/meta-boot2qt-distro/dynamic-layers/tegra/recipes-core/initrdscripts/tegra-minimal-init/init-boot.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -PATH=/sbin:/bin:/usr/sbin:/usr/bin -mount -t proc proc /proc -mount -t devtmpfs none /dev -mount -t sysfs sysfs /sys - -rootdev="" -opt="rw" -wait="" -nfsroot="" -nfsopts="" -for bootarg in `cat /proc/cmdline`; do - case "$bootarg" in - root=*) rootdev="${bootarg##root=}" ;; - nfsroot=*) - nfsroot=$(echo ${bootarg##nfsroot=} | cut -d ',' -f 1) - nfsopts=$(echo ${bootarg##nfsroot=} | cut -d ',' -f 2-) - nfsopts=${nfsopts##${nfsroot}} - ;; - ro) opt="ro" ;; - rootwait) wait="yes" ;; - esac -done -if [ -n "$wait" -a ! -b "${rootdev}" ]; then - echo "Waiting for ${rootdev}..." - count=0 - while [ $count -lt 25 ]; do - test -b "${rootdev}" && break - sleep 0.1 - count=`expr $count + 1` - done -fi -echo "Mounting ${rootdev}..." -if [ "$rootdev" = "/dev/nfs" ]; then - echo "Using NFS to boot..." - mount -t nfs -o "${opt},${nfsopts}" "${nfsroot}" /mnt || exec sh -else - mount -t ext4 -o "$opt" "${rootdev}" /mnt || exec sh -fi -echo "Switching to rootfs on ${rootdev}..." -mount --move /sys /mnt/sys -mount --move /proc /mnt/proc -mount --move /dev /mnt/dev -exec switch_root /mnt /sbin/init diff --git a/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend b/meta-boot2qt-distro/dynamic-layers/tegra/recipes-kernel/linux-firmware/linux-firmware_%.bbappend index 89531838..59e354b3 100644 --- a/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend +++ b/meta-boot2qt-distro/dynamic-layers/tegra/recipes-kernel/linux-firmware/linux-firmware_%.bbappend @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2021 The Qt Company Ltd. +## Copyright (C) 2022 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -27,4 +27,9 @@ ## ############################################################################ -LTTNGTOOLS = "" +# linux-firmware and tegra-firmware have these same files so +# remove an old version to make package-ipk and package-rpm success +do_install:append:tegra194() { + rm -f ${D}${nonarch_base_libdir}/firmware/nvidia/tegra194/vic.bin + rm -f ${D}${nonarch_base_libdir}/firmware/nvidia/tegra194/xusb.bin +} diff --git a/meta-boot2qt-distro/dynamic-layers/tegra/recipes-kernel/linux/linux-tegra/0001-Fix-API-break-in-init_disassemble_info.patch b/meta-boot2qt-distro/dynamic-layers/tegra/recipes-kernel/linux/linux-tegra/0001-Fix-API-break-in-init_disassemble_info.patch new file mode 100644 index 00000000..3d5b4167 --- /dev/null +++ b/meta-boot2qt-distro/dynamic-layers/tegra/recipes-kernel/linux/linux-tegra/0001-Fix-API-break-in-init_disassemble_info.patch @@ -0,0 +1,47 @@ +From cd42b475399c84767d2cc2940ce7964c07a2bac8 Mon Sep 17 00:00:00 2001 +From: Ari Parkkila <ari.parkkila@qt.io> +Date: Thu, 20 Oct 2022 08:37:47 +0300 +Subject: [PATCH] Fix API break in init_disassemble_info + +API break due to init_disassemble_info() got an extra parameter, +see http://trofi.github.io/posts/254-binutils-2.39.html +--- + tools/perf/util/annotate.c | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c +index e42bf572358c..779e9d5fdb16 100644 +--- a/tools/perf/util/annotate.c ++++ b/tools/perf/util/annotate.c +@@ -1708,6 +1708,18 @@ static int dso__disassemble_filename(struct dso *dso, char *filename, size_t fil + #include <bfd.h> + #include <dis-asm.h> + ++static int fprintf_styled(void *, enum disassembler_style, const char* fmt, ...) ++{ ++ va_list args; ++ int r; ++ ++ va_start(args, fmt); ++ r = vprintf(fmt, args); ++ va_end(args); ++ ++ return r; ++} ++ + static int symbol__disassemble_bpf(struct symbol *sym, + struct annotate_args *args) + { +@@ -1750,7 +1762,8 @@ static int symbol__disassemble_bpf(struct symbol *sym, + goto out; + } + init_disassemble_info(&info, s, +- (fprintf_ftype) fprintf); ++ (fprintf_ftype) fprintf, ++ fprintf_styled); + + info.arch = bfd_get_arch(bfdf); + info.mach = bfd_get_mach(bfdf); +-- +2.25.1 + diff --git a/meta-boot2qt-distro/dynamic-layers/tegra/recipes-kernel/linux/linux-tegra/0001-perf-bench-Share-some-global-variables-to-fix-build-.patch b/meta-boot2qt-distro/dynamic-layers/tegra/recipes-kernel/linux/linux-tegra/0001-perf-bench-Share-some-global-variables-to-fix-build-.patch deleted file mode 100644 index 5f90bbd5..00000000 --- a/meta-boot2qt-distro/dynamic-layers/tegra/recipes-kernel/linux/linux-tegra/0001-perf-bench-Share-some-global-variables-to-fix-build-.patch +++ /dev/null @@ -1,150 +0,0 @@ -From 7a967e92e9fc995ebfe29fcdf8f2f95e43f7ea70 Mon Sep 17 00:00:00 2001 -From: Arnaldo Carvalho de Melo <acme@redhat.com> -Date: Mon, 2 Mar 2020 12:09:38 -0300 -Subject: [PATCH] perf bench: Share some global variables to fix build with gcc - 10 - -Noticed with gcc 10 (fedora rawhide) that those variables were not being -declared as static, so end up with: - - ld: /tmp/build/perf/bench/epoll-wait.o:/git/perf/tools/perf/bench/epoll-wait.c:93: multiple definition of `end'; /tmp/build/perf/bench/futex-hash.o:/git/perf/tools/perf/bench/futex-hash.c:40: first defined here - ld: /tmp/build/perf/bench/epoll-wait.o:/git/perf/tools/perf/bench/epoll-wait.c:93: multiple definition of `start'; /tmp/build/perf/bench/futex-hash.o:/git/perf/tools/perf/bench/futex-hash.c:40: first defined here - ld: /tmp/build/perf/bench/epoll-wait.o:/git/perf/tools/perf/bench/epoll-wait.c:93: multiple definition of `runtime'; /tmp/build/perf/bench/futex-hash.o:/git/perf/tools/perf/bench/futex-hash.c:40: first defined here - ld: /tmp/build/perf/bench/epoll-ctl.o:/git/perf/tools/perf/bench/epoll-ctl.c:38: multiple definition of `end'; /tmp/build/perf/bench/futex-hash.o:/git/perf/tools/perf/bench/futex-hash.c:40: first defined here - ld: /tmp/build/perf/bench/epoll-ctl.o:/git/perf/tools/perf/bench/epoll-ctl.c:38: multiple definition of `start'; /tmp/build/perf/bench/futex-hash.o:/git/perf/tools/perf/bench/futex-hash.c:40: first defined here - ld: /tmp/build/perf/bench/epoll-ctl.o:/git/perf/tools/perf/bench/epoll-ctl.c:38: multiple definition of `runtime'; /tmp/build/perf/bench/futex-hash.o:/git/perf/tools/perf/bench/futex-hash.c:40: first defined here - make[4]: *** [/git/perf/tools/build/Makefile.build:145: /tmp/build/perf/bench/perf-in.o] Error 1 - -Prefix those with bench__ and add them to bench/bench.h, so that we can -share those on the tools needing to access those variables from signal -handlers. - -Acked-by: Thomas Gleixner <tglx@linutronix.de> -Cc: Adrian Hunter <adrian.hunter@intel.com> -Cc: Davidlohr Bueso <dave@stgolabs.net> -Cc: Jiri Olsa <jolsa@kernel.org> -Cc: Namhyung Kim <namhyung@kernel.org> -Link: http://lore.kernel.org/lkml/20200303155811.GD13702@kernel.org -Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> ---- - tools/perf/bench/bench.h | 4 ++++ - tools/perf/bench/futex-hash.c | 12 ++++++------ - tools/perf/bench/futex-lock-pi.c | 11 +++++------ - 3 files changed, 15 insertions(+), 12 deletions(-) - -diff --git a/tools/perf/bench/bench.h b/tools/perf/bench/bench.h -index 579a592990dd..d6d5745f43e4 100644 ---- a/tools/perf/bench/bench.h -+++ b/tools/perf/bench/bench.h -@@ -1,6 +1,10 @@ - #ifndef BENCH_H - #define BENCH_H - -+#include <sys/time.h> -+ -+extern struct timeval bench__start, bench__end, bench__runtime; -+ - /* - * The madvise transparent hugepage constants were added in glibc - * 2.13. For compatibility with older versions of glibc, define these -diff --git a/tools/perf/bench/futex-hash.c b/tools/perf/bench/futex-hash.c -index 8024cd5febd2..c88985be60f7 100644 ---- a/tools/perf/bench/futex-hash.c -+++ b/tools/perf/bench/futex-hash.c -@@ -33,7 +33,7 @@ static unsigned int nfutexes = 1024; - static bool fshared = false, done = false, silent = false; - static int futex_flag = 0; - --struct timeval start, end, runtime; -+struct timeval bench__start, bench__end, bench__runtime; - static pthread_mutex_t thread_lock; - static unsigned int threads_starting; - static struct stats throughput_stats; -@@ -97,8 +97,8 @@ static void toggle_done(int sig __maybe_unused, - { - /* inform all threads that we're done for the day */ - done = true; -- gettimeofday(&end, NULL); -- timersub(&end, &start, &runtime); -+ gettimeofday(&bench__end, NULL); -+ timersub(&bench__end, &bench__start, &bench__runtime); - } - - static void print_summary(void) -@@ -108,7 +108,7 @@ static void print_summary(void) - - printf("%sAveraged %ld operations/sec (+- %.2f%%), total secs = %d\n", - !silent ? "\n" : "", avg, rel_stddev_stats(stddev, avg), -- (int) runtime.tv_sec); -+ (int)bench__runtime.tv_sec); - } - - int bench_futex_hash(int argc, const char **argv, -@@ -153,7 +153,7 @@ int bench_futex_hash(int argc, const char **argv, - - threads_starting = nthreads; - pthread_attr_init(&thread_attr); -- gettimeofday(&start, NULL); -+ gettimeofday(&bench__start, NULL); - for (i = 0; i < nthreads; i++) { - worker[i].tid = i; - worker[i].futex = calloc(nfutexes, sizeof(*worker[i].futex)); -@@ -196,7 +196,7 @@ int bench_futex_hash(int argc, const char **argv, - pthread_mutex_destroy(&thread_lock); - - for (i = 0; i < nthreads; i++) { -- unsigned long t = worker[i].ops/runtime.tv_sec; -+ unsigned long t = worker[i].ops / bench__runtime.tv_sec; - update_stats(&throughput_stats, t); - if (!silent) { - if (nfutexes == 1) -diff --git a/tools/perf/bench/futex-lock-pi.c b/tools/perf/bench/futex-lock-pi.c -index 936d89d30483..4e7810051220 100644 ---- a/tools/perf/bench/futex-lock-pi.c -+++ b/tools/perf/bench/futex-lock-pi.c -@@ -32,7 +32,6 @@ static bool silent = false, multi = false; - static bool done = false, fshared = false; - static unsigned int ncpus, nthreads = 0; - static int futex_flag = 0; --struct timeval start, end, runtime; - static pthread_mutex_t thread_lock; - static unsigned int threads_starting; - static struct stats throughput_stats; -@@ -59,7 +58,7 @@ static void print_summary(void) - - printf("%sAveraged %ld operations/sec (+- %.2f%%), total secs = %d\n", - !silent ? "\n" : "", avg, rel_stddev_stats(stddev, avg), -- (int) runtime.tv_sec); -+ (int)bench__runtime.tv_sec); - } - - static void toggle_done(int sig __maybe_unused, -@@ -68,8 +67,8 @@ static void toggle_done(int sig __maybe_unused, - { - /* inform all threads that we're done for the day */ - done = true; -- gettimeofday(&end, NULL); -- timersub(&end, &start, &runtime); -+ gettimeofday(&bench__end, NULL); -+ timersub(&bench__end, &bench__start, &bench__runtime); - } - - static void *workerfn(void *arg) -@@ -175,7 +174,7 @@ int bench_futex_lock_pi(int argc, const char **argv, - - threads_starting = nthreads; - pthread_attr_init(&thread_attr); -- gettimeofday(&start, NULL); -+ gettimeofday(&bench__start, NULL); - - create_threads(worker, thread_attr); - pthread_attr_destroy(&thread_attr); -@@ -201,7 +200,7 @@ int bench_futex_lock_pi(int argc, const char **argv, - pthread_mutex_destroy(&thread_lock); - - for (i = 0; i < nthreads; i++) { -- unsigned long t = worker[i].ops/runtime.tv_sec; -+ unsigned long t = worker[i].ops / bench__runtime.tv_sec; - - update_stats(&throughput_stats, t); - if (!silent) diff --git a/meta-boot2qt-distro/dynamic-layers/tegra/recipes-kernel/linux/linux-tegra/enable-kprobes-for-lttng.cfg b/meta-boot2qt-distro/dynamic-layers/tegra/recipes-kernel/linux/linux-tegra/enable-kprobes-for-lttng.cfg new file mode 100644 index 00000000..a9ad471e --- /dev/null +++ b/meta-boot2qt-distro/dynamic-layers/tegra/recipes-kernel/linux/linux-tegra/enable-kprobes-for-lttng.cfg @@ -0,0 +1,10 @@ +# CONFIG_BPF_LSM is not set +CONFIG_KPROBES=y +CONFIG_KRETPROBES=y +CONFIG_KPROBE_EVENTS=y +CONFIG_BPF_EVENTS=y +CONFIG_DYNAMIC_EVENTS=y +CONFIG_PROBE_EVENTS=y +# CONFIG_BPF_KPROBE_OVERRIDE is not set +# CONFIG_KPROBE_EVENT_GEN_TEST is not set +CONFIG_FUNCTION_ERROR_INJECTION=y diff --git a/meta-boot2qt-distro/dynamic-layers/tegra/recipes-kernel/linux/linux-tegra_%.bbappend b/meta-boot2qt-distro/dynamic-layers/tegra/recipes-kernel/linux/linux-tegra_5.10.%.bbappend index 608fd8a8..e019fccc 100644 --- a/meta-boot2qt-distro/dynamic-layers/tegra/recipes-kernel/linux/linux-tegra_%.bbappend +++ b/meta-boot2qt-distro/dynamic-layers/tegra/recipes-kernel/linux/linux-tegra_5.10.%.bbappend @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2020 The Qt Company Ltd. +## Copyright (C) 2022 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -26,8 +26,10 @@ ## $QT_END_LICENSE$ ## ############################################################################ + FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI += "\ - file://0001-perf-bench-Share-some-global-variables-to-fix-build-.patch \ +SRC_URI:append = "\ + file://0001-Fix-API-break-in-init_disassemble_info.patch \ + file://enable-kprobes-for-lttng.cfg \ " diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-kernel/linux/linux-toradex/0001-Fix-API-break-in-init_disassemble_info.patch b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-kernel/linux/linux-toradex/0001-Fix-API-break-in-init_disassemble_info.patch new file mode 100644 index 00000000..3d5b4167 --- /dev/null +++ b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-kernel/linux/linux-toradex/0001-Fix-API-break-in-init_disassemble_info.patch @@ -0,0 +1,47 @@ +From cd42b475399c84767d2cc2940ce7964c07a2bac8 Mon Sep 17 00:00:00 2001 +From: Ari Parkkila <ari.parkkila@qt.io> +Date: Thu, 20 Oct 2022 08:37:47 +0300 +Subject: [PATCH] Fix API break in init_disassemble_info + +API break due to init_disassemble_info() got an extra parameter, +see http://trofi.github.io/posts/254-binutils-2.39.html +--- + tools/perf/util/annotate.c | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c +index e42bf572358c..779e9d5fdb16 100644 +--- a/tools/perf/util/annotate.c ++++ b/tools/perf/util/annotate.c +@@ -1708,6 +1708,18 @@ static int dso__disassemble_filename(struct dso *dso, char *filename, size_t fil + #include <bfd.h> + #include <dis-asm.h> + ++static int fprintf_styled(void *, enum disassembler_style, const char* fmt, ...) ++{ ++ va_list args; ++ int r; ++ ++ va_start(args, fmt); ++ r = vprintf(fmt, args); ++ va_end(args); ++ ++ return r; ++} ++ + static int symbol__disassemble_bpf(struct symbol *sym, + struct annotate_args *args) + { +@@ -1750,7 +1762,8 @@ static int symbol__disassemble_bpf(struct symbol *sym, + goto out; + } + init_disassemble_info(&info, s, +- (fprintf_ftype) fprintf); ++ (fprintf_ftype) fprintf, ++ fprintf_styled); + + info.arch = bfd_get_arch(bfdf); + info.mach = bfd_get_mach(bfdf); +-- +2.25.1 + diff --git a/meta-boot2qt-distro/dynamic-layers/tegra/recipes-bsp/u-boot/u-boot-tegra_%.bbappend b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-kernel/linux/linux-toradex_5.4%.bbappend index e5368061..baa1bc3f 100644 --- a/meta-boot2qt-distro/dynamic-layers/tegra/recipes-bsp/u-boot/u-boot-tegra_%.bbappend +++ b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-kernel/linux/linux-toradex_5.4%.bbappend @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2021 The Qt Company Ltd. +## Copyright (C) 2022 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -26,8 +26,9 @@ ## $QT_END_LICENSE$ ## ############################################################################ + FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI += "\ - file://0001-nvidia-Fix-sd-card-boot-for-jetson-tx2.patch \ +SRC_URI:append = "\ + file://0001-Fix-API-break-in-init_disassemble_info.patch \ " diff --git a/meta-boot2qt-distro/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend b/meta-boot2qt-distro/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend index 1f16b509..257f92db 100644 --- a/meta-boot2qt-distro/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend +++ b/meta-boot2qt-distro/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend @@ -29,11 +29,6 @@ EXTRA_OECONF += "--with-plugin-ld=ld" -do_install:append () { - # remove real-ld symlink - rm ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/real-ld${EXEEXT} -} - do_install:append:sdkmingw32() { ln -sf ../libwinpthread-1.dll ${D}${bindir} ln -sf ${BINRELPATH}/libwinpthread-1.dll $dest diff --git a/meta-boot2qt-distro/recipes-devtools/qemu/qemu/0001-linux-user-add-support-for-MADV_DONTNEED.patch b/meta-boot2qt-distro/recipes-devtools/qemu/qemu/0001-linux-user-add-support-for-MADV_DONTNEED.patch deleted file mode 100644 index 460cc34d..00000000 --- a/meta-boot2qt-distro/recipes-devtools/qemu/qemu/0001-linux-user-add-support-for-MADV_DONTNEED.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 875bad8cc58ece40ac1b5b38b77a72e3b86d529d Mon Sep 17 00:00:00 2001 -From: Simon Hausmann <simon.hausmann@qt.io> -Date: Fri, 24 Aug 2018 10:38:29 +0200 -Subject: [PATCH] linux-user: add support for MADV_DONTNEED - -Most flags to madvise() are just hints, so typically ignoring the -syscall and returning okay is fine. However applications exist that do -rely on MADV_DONTNEED behavior to guarantee that upon subsequent access -the mapping is refreshed from the backing file or zero for anonymous -mappings. ---- - linux-user/mmap.c | 13 +++++++++++++ - linux-user/syscall.c | 2 +- - linux-user/user-mmap.h | 1 + - 3 files changed, 15 insertions(+), 1 deletion(-) - -diff --git a/linux-user/mmap.c b/linux-user/mmap.c -index e651834..63efa1f 100644 ---- a/linux-user/mmap.c -+++ b/linux-user/mmap.c -@@ -834,3 +834,16 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size, - mmap_unlock(); - return new_addr; - } -+ -+int target_madvise(abi_ulong start, abi_ulong len, int flags) -+{ -+ /* A straight passthrough may not be safe because qemu sometimes -+ turns private file-backed mappings into anonymous mappings. -+ Most flags are hints, except for MADV_DONTNEED that applications -+ may rely on to zero out pages, so we pass that through. -+ Otherwise returning success is ok. */ -+ if (flags & MADV_DONTNEED) { -+ return madvise(g2h_untagged(start), len, MADV_DONTNEED); -+ } -+ return 0; -+} -diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 839fc76..e1b7d77 100644 ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -11780,7 +11780,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, - turns private file-backed mappings into anonymous mappings. - This will break MADV_DONTNEED. - This is a hint, so ignoring and returning success is ok. */ -- return 0; -+ return get_errno(target_madvise(arg1, arg2, arg3)); - #endif - #ifdef TARGET_NR_fcntl64 - case TARGET_NR_fcntl64: -diff --git a/linux-user/user-mmap.h b/linux-user/user-mmap.h -index d1dec99..ceb013d 100644 ---- a/linux-user/user-mmap.h -+++ b/linux-user/user-mmap.h -@@ -25,6 +25,7 @@ int target_munmap(abi_ulong start, abi_ulong len); - abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size, - abi_ulong new_size, unsigned long flags, - abi_ulong new_addr); -+int target_madvise(abi_ulong start, abi_ulong len, int flags); - extern unsigned long last_brk; - extern abi_ulong mmap_next_start; - abi_ulong mmap_find_vma(abi_ulong, abi_ulong, abi_ulong); diff --git a/meta-boot2qt-distro/recipes-devtools/qemu/qemu_%.bbappend b/meta-boot2qt-distro/recipes-devtools/qemu/qemu_%.bbappend deleted file mode 100644 index 878ed5a1..00000000 --- a/meta-boot2qt-distro/recipes-devtools/qemu/qemu_%.bbappend +++ /dev/null @@ -1,33 +0,0 @@ -############################################################################ -## -## Copyright (C) 2020 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -FILESEXTRAPATHS:append := "${THISDIR}/${PN}:" -SRC_URI += " \ - file://0001-linux-user-add-support-for-MADV_DONTNEED.patch \ -" diff --git a/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt6-sdk.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt6-sdk.bb index fb3b07c4..3c9a8a91 100644 --- a/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt6-sdk.bb +++ b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt6-sdk.bb @@ -42,3 +42,6 @@ TOOLCHAIN_TARGET_TASK += "\ PACKAGE_EXCLUDE_COMPLEMENTARY += "qtwebengine-dbg" PACKAGE_EXCLUDE += "sudo" + +# For static libs of target SDK +SDKIMAGE_FEATURES:append = " staticdev-pkgs" diff --git a/meta-boot2qt/classes/image_types_tegra_b2qt.bbclass b/meta-boot2qt/classes/image_types_tegra_b2qt.bbclass index 5a451cbb..2a739a3a 100644 --- a/meta-boot2qt/classes/image_types_tegra_b2qt.bbclass +++ b/meta-boot2qt/classes/image_types_tegra_b2qt.bbclass @@ -27,21 +27,6 @@ ## ############################################################################ -# create flash package that utilizes the SD card image -tegraflash_custom_post:tegra186() { - cat > prepare-image.sh <<END -#!/bin/sh -e -if [ ! -e "${IMAGE_BASENAME}.img" ]; then - xz -dc ../${IMAGE_LINK_NAME}.wic.xz | dd of=${IMAGE_LINK_NAME}.${IMAGE_TEGRAFLASH_FS_TYPE} iflag=fullblock skip=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) count=$(expr ${ROOTFS_SIZE} / 1024) - ./mksparse -v --fillpattern=0 ${IMAGE_LINK_NAME}.${IMAGE_TEGRAFLASH_FS_TYPE} ${IMAGE_BASENAME}.img - rm -f ${IMAGE_LINK_NAME}.${IMAGE_TEGRAFLASH_FS_TYPE} -fi -echo "Flash image ready" -END - chmod +x prepare-image.sh - rm ${IMAGE_BASENAME}.img -} - tegraflash_custom_post() { cat > prepare-image.sh <<END #!/bin/sh -e diff --git a/meta-boot2qt/conf/layer.conf b/meta-boot2qt/conf/layer.conf index 2eb1e0b1..7a489038 100644 --- a/meta-boot2qt/conf/layer.conf +++ b/meta-boot2qt/conf/layer.conf @@ -44,4 +44,4 @@ BB_BASEHASH_IGNORE_VARS:append = " BOOT2QTBASE" HOSTTOOLS += "git-lfs" -LAYERSERIES_COMPAT_b2qt = "kirkstone" +LAYERSERIES_COMPAT_b2qt = "kirkstone langdale" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 1d985fb3..5b32b9ab 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -5,13 +5,13 @@ fetch="git://git.yoctoproject.org"/> <project name="poky" remote="yocto" - revision="refs/tags/yocto-4.0.4" - upstream="kirkstone" + revision="3e5faccfaf50fee0ba8f6eef6c9bf458137d06d2" + upstream="langdale" path="sources/poky"/> <project name="meta-mingw" remote="yocto" - revision="refs/tags/yocto-4.0.4" - upstream="kirkstone" + revision="b0067202db8573df3d23d199f82987cebe1bee2c" + upstream="langdale" path="sources/meta-mingw"/> <!-- OpenEmbedded --> @@ -19,8 +19,8 @@ fetch="git://git.openembedded.org"/> <project name="meta-openembedded" remote="oe" - revision="05dcac98473402d87e0af73bbc2c5a6a840abe93" - upstream="kirkstone" + revision="c5668905a6d8a78fb72c2cbf8b20e91e686ceb86" + upstream="langdale" path="sources/meta-openembedded"/> <!-- Qt --> @@ -40,20 +40,20 @@ fetch="https://github.com/Freescale"/> <project name="meta-freescale" remote="freescale" - revision="5af267b681f48c14780f3a1a61c4df25796d4a51" - upstream="kirkstone" + revision="f69b2a53e0499684d11b827362c23a13d4ecb63d" + upstream="master" path="sources/meta-freescale"/> <project name="meta-freescale-3rdparty" remote="freescale" - revision="5977197340c7a7db17fe3e02a4e014ad997565ae" - upstream="kirkstone" + revision="07c9d8e205caa3a41844d7f9086bdc88cfdff7a7" + upstream="master" path="sources/meta-freescale-3rdparty"/> <!-- Raspberry Pi --> <project name="meta-raspberrypi" remote="yocto" - revision="dacad9302a92b0b7edf8546cdcad1f8ef753e462" - upstream="kirkstone" + revision="722c51647c75d63e8c6c53ee214c4e3f0a263ed2" + upstream="langdale" path="sources/meta-raspberrypi"/> <!-- Intel --> @@ -61,8 +61,8 @@ fetch="git://git.yoctoproject.org"/> <project name="meta-intel" remote="intel" - revision="f529e0594a784546926e89ce8e78385e00d0b0a9" - upstream="kirkstone" + revision="f70cf173dc40131e5ed3955a4a459fff3aa010ed" + upstream="langdale" path="sources/meta-intel"/> <!-- NVIDIA --> @@ -70,8 +70,8 @@ fetch="https://github.com/OE4T"/> <project name="meta-tegra" remote="OE4T" - revision="d60193750012074a5726e879eeca117dc26e6951" - upstream="kirkstone" + revision="8e2fc6b47c74b05de37528274dc61aac1a5035cf" + upstream="langdale" path="sources/meta-tegra"/> <!-- Toradex --> @@ -79,12 +79,12 @@ fetch="git://git.toradex.com"/> <project name="meta-toradex-bsp-common" remote="toradex" - revision="4744d2e28fab596554a57aaa888485c20b204d29" + revision="2555ba876dc5ed366e2f705601d770febeb6cfbb" upstream="master" path="sources/meta-toradex-bsp-common"/> <project name="meta-toradex-nxp" remote="toradex" - revision="97eebca39d33227e784020198908009f36f8cb93" + revision="8c8aafd57b9f8418d4ca30357e8a86676345038e" upstream="master" path="sources/meta-toradex-nxp"/> diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh index 8751effd..51f7854f 100755 --- a/scripts/setup-environment.sh +++ b/scripts/setup-environment.sh @@ -84,7 +84,7 @@ if [ ! -e ${PWD}/${BUILDDIRECTORY} ]; then mkdir -p ${PWD}/${BUILDDIRECTORY}/conf cp ${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf if [ ! -e "${PWD}/sources/templates/local.conf.sample" ]; then - cp ${PWD}/sources/meta-boot2qt/meta-boot2qt-distro/conf/local.conf.sample ${PWD}/${BUILDDIRECTORY}/conf/local.conf + cp ${PWD}/sources/meta-boot2qt/meta-boot2qt-distro/conf/templates/default/local.conf.sample ${PWD}/${BUILDDIRECTORY}/conf/local.conf fi if [ -e ${PWD}/sources/meta-boot2qt/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT ]; then @@ -92,7 +92,7 @@ if [ ! -e ${PWD}/${BUILDDIRECTORY} ]; then fi fi -export TEMPLATECONF="${PWD}/sources/templates" +export TEMPLATECONF=$(readlink -f "${PWD}/sources/templates") . sources/poky/oe-init-build-env ${BUILDDIRECTORY} # use sources from Qt SDK if that is available |