From dd05ef685e0ab1f54d83bd529bf926d34aec3eec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 4 Oct 2024 11:23:41 +0200 Subject: [PATCH 01/61] meta-lxatac-bsp: machine: lxatac: remove IMAGE_FSTYPES += "tar" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We do not use the generated tar archives anywhere, so we can save some CPU cycles by not building them. Signed-off-by: Leonard Göhrs --- meta-lxatac-bsp/conf/machine/lxatac.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-lxatac-bsp/conf/machine/lxatac.conf b/meta-lxatac-bsp/conf/machine/lxatac.conf index ee00e32c..75f8b7f1 100644 --- a/meta-lxatac-bsp/conf/machine/lxatac.conf +++ b/meta-lxatac-bsp/conf/machine/lxatac.conf @@ -10,8 +10,6 @@ include conf/machine/include/arm/armv7a/tune-cortexa7.inc EXTRA_IMAGEDEPENDS += "virtual/bootloader" -IMAGE_FSTYPES += "tar" - # For better RAUC adaptive mode efficiency IMAGE_ROOTFS_ALIGNMENT = "4" From 415953fb17f9d635a2907f0fee68fd8b417c5972 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 4 Oct 2024 11:25:11 +0200 Subject: [PATCH 02/61] meta-lxatac-bsp: rauc: remove rauc-native_%.bbappend MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The `.bbappend` did once set the `SRCREV` but it no longer does. It only set the `FILESEXTRAPATHS` but none of the files were actually used by the `.bb`. Signed-off-by: Leonard Göhrs --- meta-lxatac-bsp/recipes-core/rauc/rauc-native_%.bbappend | 1 - 1 file changed, 1 deletion(-) delete mode 100644 meta-lxatac-bsp/recipes-core/rauc/rauc-native_%.bbappend diff --git a/meta-lxatac-bsp/recipes-core/rauc/rauc-native_%.bbappend b/meta-lxatac-bsp/recipes-core/rauc/rauc-native_%.bbappend deleted file mode 100644 index 8802adbb..00000000 --- a/meta-lxatac-bsp/recipes-core/rauc/rauc-native_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" From fe5014a4bdbdbd1bf7770224bd189a0aa12d235c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 4 Oct 2024 11:22:17 +0200 Subject: [PATCH 03/61] meta-lxatac-software: conf-notes.txt: remove section about qemu images MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since it is not true for meta-lxatac (currently). Signed-off-by: Leonard Göhrs --- meta-lxatac-software/conf/templates/default/conf-notes.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-lxatac-software/conf/templates/default/conf-notes.txt b/meta-lxatac-software/conf/templates/default/conf-notes.txt index 129327b3..052c66fa 100644 --- a/meta-lxatac-software/conf/templates/default/conf-notes.txt +++ b/meta-lxatac-software/conf/templates/default/conf-notes.txt @@ -12,8 +12,6 @@ Common targets are: Supported machines are: lxatac -You can also run generated qemu images with a command like 'runqemu qemux86' - Other commonly useful commands are: - 'devtool' and 'recipetool' handle common recipe tasks - 'bitbake-layers' handles common layer tasks From 45f4051594f59c2fb0d427424e8b51ddde59bd86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 4 Oct 2024 10:49:37 +0200 Subject: [PATCH 04/61] meta-lxatac-software: distro: tacos: one DISTRO_FEATURE per line MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes the list more readable - especially in diffs. Signed-off-by: Leonard Göhrs --- meta-lxatac-software/conf/distro/tacos.conf | 23 +++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/meta-lxatac-software/conf/distro/tacos.conf b/meta-lxatac-software/conf/distro/tacos.conf index f5f5429c..6bdb6233 100644 --- a/meta-lxatac-software/conf/distro/tacos.conf +++ b/meta-lxatac-software/conf/distro/tacos.conf @@ -7,8 +7,27 @@ MAINTAINER = "Linux Automation GmbH " LOCALCONF_VERSION = "2" -DISTRO_FEATURES = "argp ext2 usbgadget usbhost wifi bluetooth xattr nfs zeroconf multiarch systemd usrmerge" -DISTRO_FEATURES += " rauc virtualization ipv6 security seccomp alsa polkit" +DISTRO_FEATURES = "\ + argp \ + ext2 \ + usbgadget \ + usbhost \ + wifi \ + bluetooth \ + xattr \ + nfs \ + zeroconf \ + multiarch \ + systemd \ + usrmerge \ + rauc \ + virtualization \ + ipv6 \ + security \ + seccomp \ + alsa \ + polkit \ +" # Select systemd as init manager INIT_MANAGER ?= "systemd" From 0feb8f8e8c3b808f29ed48df55a0c108e3e9f998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 4 Oct 2024 10:51:31 +0200 Subject: [PATCH 05/61] meta-lxatac-software: distro: tacos: sort DISTRO_FEATURES MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes the list more readable - especially in diffs. Signed-off-by: Leonard Göhrs --- meta-lxatac-software/conf/distro/tacos.conf | 24 ++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/meta-lxatac-software/conf/distro/tacos.conf b/meta-lxatac-software/conf/distro/tacos.conf index 6bdb6233..b6f33c89 100644 --- a/meta-lxatac-software/conf/distro/tacos.conf +++ b/meta-lxatac-software/conf/distro/tacos.conf @@ -8,25 +8,25 @@ MAINTAINER = "Linux Automation GmbH " LOCALCONF_VERSION = "2" DISTRO_FEATURES = "\ + alsa \ argp \ + bluetooth \ ext2 \ + ipv6 \ + multiarch \ + nfs \ + polkit \ + rauc \ + seccomp \ + security \ + systemd \ usbgadget \ usbhost \ + usrmerge \ + virtualization \ wifi \ - bluetooth \ xattr \ - nfs \ zeroconf \ - multiarch \ - systemd \ - usrmerge \ - rauc \ - virtualization \ - ipv6 \ - security \ - seccomp \ - alsa \ - polkit \ " # Select systemd as init manager From 0d3610214ad6624adc89097531717a477f1c650c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 4 Oct 2024 10:52:54 +0200 Subject: [PATCH 06/61] meta-lxatac-software: distro: tacos: enable minidebuginfo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This adds a tiny amount of debug info to every binary that makes e.g. `coredump` far more useful. It also auto-enables the `coredump` and `elfutils` `PACKAGECONFIG`s in systemd, so setting them manually is no longer required. Signed-off-by: Leonard Göhrs --- meta-lxatac-bsp/recipes-core/systemd/systemd_%.bbappend | 2 +- meta-lxatac-software/conf/distro/tacos.conf | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-lxatac-bsp/recipes-core/systemd/systemd_%.bbappend b/meta-lxatac-bsp/recipes-core/systemd/systemd_%.bbappend index 67a9d185..3bd8feb6 100644 --- a/meta-lxatac-bsp/recipes-core/systemd/systemd_%.bbappend +++ b/meta-lxatac-bsp/recipes-core/systemd/systemd_%.bbappend @@ -1,6 +1,6 @@ RRECOMMENDS:${PN}:append = "less" # Enable lz4 and seccomp for systemd -PACKAGECONFIG:append = "lz4 coredump elfutils" +PACKAGECONFIG:append = "lz4" PACKAGECONFIG:remove = "networkd" # Re-enable LLMNR (but not mDNS, which is handled by avahi), diff --git a/meta-lxatac-software/conf/distro/tacos.conf b/meta-lxatac-software/conf/distro/tacos.conf index b6f33c89..4f1ee5a0 100644 --- a/meta-lxatac-software/conf/distro/tacos.conf +++ b/meta-lxatac-software/conf/distro/tacos.conf @@ -13,6 +13,7 @@ DISTRO_FEATURES = "\ bluetooth \ ext2 \ ipv6 \ + minidebuginfo \ multiarch \ nfs \ polkit \ From 3d725e043b3351361a2838a21a5b07cbaaafc877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 4 Oct 2024 12:00:40 +0200 Subject: [PATCH 07/61] meta-lxatac-bsp: emmc-image: do not DEPEND on genext2fs-native MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The `genimage` version in meta-ptx was updated to v18, which no longer uses `genext2fs` by default. Which is great because the project is not well maintained and the recipe for it was even removed in meta-ptx master. Signed-off-by: Leonard Göhrs --- meta-lxatac-bsp/recipes-core/images/emmc-image.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-lxatac-bsp/recipes-core/images/emmc-image.bb b/meta-lxatac-bsp/recipes-core/images/emmc-image.bb index b7fd6d70..eef9c4c0 100644 --- a/meta-lxatac-bsp/recipes-core/images/emmc-image.bb +++ b/meta-lxatac-bsp/recipes-core/images/emmc-image.bb @@ -3,7 +3,7 @@ SUMMARY = "eMMC image for the LXATAC Data Partitions" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -DEPENDS += "genext2fs-native e2fsprogs-native" +DEPENDS += "e2fsprogs-native" SRC_URI += "file://genimage.config" From f8107528d4056be3c98c87e53b001e525f979f7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 30 Aug 2024 08:18:12 +0200 Subject: [PATCH 08/61] meta-lxatac-bsp: linux-lxatac: upgrade to 6.11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit umpf tag is now: 6.11/customers/lxa/lxatac/20240917-1 The tag includes the following topic branches: - v6.11/topic/reproducible-build - v6.8/customers/lxa/lxatac Signed-off-by: Leonard Göhrs --- .../recipes-kernel/linux/files/defconfig | 76 ++++++++++++++----- ...a-tac-adjust-USB-gadget-fifo-sizes-f.patch | 4 +- ...a-tac-Add-support-for-generation-3-d.patch | 10 +-- ....11-customers-lxa-lxatac-20240917-1.patch} | 10 +-- .../linux/files/patches/series.inc | 24 +++--- .../recipes-kernel/linux/linux-lxatac.bb | 7 +- 6 files changed, 88 insertions(+), 43 deletions(-) rename meta-lxatac-bsp/recipes-kernel/linux/files/patches/{0201-Release-6.10-customers-lxa-lxatac-20240726-1.patch => 0201-Release-6.11-customers-lxa-lxatac-20240917-1.patch} (62%) diff --git a/meta-lxatac-bsp/recipes-kernel/linux/files/defconfig b/meta-lxatac-bsp/recipes-kernel/linux/files/defconfig index 63fc04fa..a3cfcf07 100644 --- a/meta-lxatac-bsp/recipes-kernel/linux/files/defconfig +++ b/meta-lxatac-bsp/recipes-kernel/linux/files/defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.10.0-20240715-1 Kernel Configuration +# Linux/arm 6.11.0-20240917-1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-oe-linux-gnueabi-gcc (GCC) 13.3.0" CONFIG_CC_IS_GCC=y @@ -169,7 +169,7 @@ CONFIG_CGROUPS=y CONFIG_PAGE_COUNTER=y # CONFIG_CGROUP_FAVOR_DYNMODS is not set CONFIG_MEMCG=y -CONFIG_MEMCG_KMEM=y +# CONFIG_MEMCG_V1 is not set CONFIG_BLK_CGROUP=y CONFIG_CGROUP_WRITEBACK=y CONFIG_CGROUP_SCHED=y @@ -203,6 +203,8 @@ CONFIG_NET_NS=y CONFIG_INITRAMFS_PRESERVE_MTIME=y CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y +# CONFIG_LD_DEAD_CODE_DATA_ELIMINATION is not set CONFIG_LD_ORPHAN_WARN=y CONFIG_LD_ORPHAN_WARN_LEVEL="warn" CONFIG_SYSCTL=y @@ -237,7 +239,6 @@ CONFIG_CACHESTAT_SYSCALL=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_SELFTEST is not set # CONFIG_KALLSYMS_ALL is not set -CONFIG_KALLSYMS_BASE_RELATIVE=y CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y CONFIG_HAVE_PERF_EVENTS=y CONFIG_PERF_USE_VMALLOC=y @@ -604,6 +605,7 @@ CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_SECCOMP=y CONFIG_SECCOMP_FILTER=y # CONFIG_SECCOMP_CACHE_DEBUG is not set +CONFIG_HAVE_ARCH_STACKLEAK=y CONFIG_HAVE_STACKPROTECTOR=y CONFIG_STACKPROTECTOR=y CONFIG_STACKPROTECTOR_STRONG=y @@ -680,7 +682,6 @@ CONFIG_BLK_CGROUP_PUNT_BIO=y CONFIG_BLK_DEV_BSG_COMMON=y # CONFIG_BLK_DEV_BSGLIB is not set CONFIG_BLK_DEV_INTEGRITY=y -CONFIG_BLK_DEV_INTEGRITY_T10=m CONFIG_BLK_DEV_WRITE_MOUNTED=y # CONFIG_BLK_DEV_ZONED is not set # CONFIG_BLK_DEV_THROTTLING is not set @@ -759,6 +760,7 @@ CONFIG_COREDUMP=y # Memory Management options # # CONFIG_SWAP is not set +CONFIG_HAVE_ZSMALLOC=y # # Slab allocator options @@ -768,6 +770,7 @@ CONFIG_SLUB=y CONFIG_SLAB_MERGE_DEFAULT=y CONFIG_SLAB_FREELIST_RANDOM=y # CONFIG_SLAB_FREELIST_HARDENED is not set +# CONFIG_SLAB_BUCKETS is not set # CONFIG_SLUB_STATS is not set CONFIG_SLUB_CPU_PARTIAL=y # CONFIG_RANDOM_KMALLOC_CACHES is not set @@ -1114,6 +1117,7 @@ CONFIG_NET_DSA_TAG_KSZ=y # CONFIG_NET_DSA_TAG_LAN9303 is not set # CONFIG_NET_DSA_TAG_SJA1105 is not set # CONFIG_NET_DSA_TAG_TRAILER is not set +# CONFIG_NET_DSA_TAG_VSC73XX_8021Q is not set # CONFIG_NET_DSA_TAG_XRS700X is not set CONFIG_VLAN_8021Q=y # CONFIG_VLAN_8021Q_GVRP is not set @@ -1783,6 +1787,7 @@ CONFIG_ETHERNET=y # CONFIG_NET_VENDOR_LITEX is not set # CONFIG_NET_VENDOR_MARVELL is not set # CONFIG_NET_VENDOR_MELLANOX is not set +# CONFIG_NET_VENDOR_META is not set # CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_MICROCHIP is not set # CONFIG_NET_VENDOR_MICROSEMI is not set @@ -2080,6 +2085,7 @@ CONFIG_WLAN_VENDOR_REALTEK=y CONFIG_RTL8187=m CONFIG_RTL_CARDS=m CONFIG_RTL8192CU=m +# CONFIG_RTL8192DU is not set CONFIG_RTLWIFI=m CONFIG_RTLWIFI_USB=m CONFIG_RTLWIFI_DEBUG=y @@ -2397,6 +2403,7 @@ CONFIG_SPI_MEM=y # CONFIG_SPI_CADENCE is not set # CONFIG_SPI_CADENCE_QUADSPI is not set # CONFIG_SPI_CADENCE_XSPI is not set +# CONFIG_SPI_CH341 is not set # CONFIG_SPI_DESIGNWARE is not set # CONFIG_SPI_GPIO is not set # CONFIG_SPI_FSL_SPI is not set @@ -2564,6 +2571,13 @@ CONFIG_GPIO_AGGREGATOR=m # CONFIG_GPIO_SIM is not set # end of Virtual GPIO drivers +# +# GPIO Debugging utilities +# +# CONFIG_GPIO_SLOPPY_LOGIC_ANALYZER is not set +# CONFIG_GPIO_VIRTUSER is not set +# end of GPIO Debugging utilities + # CONFIG_W1 is not set CONFIG_POWER_RESET=y # CONFIG_POWER_RESET_BRCMKONA is not set @@ -2578,6 +2592,7 @@ CONFIG_POWER_RESET_SYSCON_POWEROFF=y CONFIG_REBOOT_MODE=y CONFIG_SYSCON_REBOOT_MODE=y # CONFIG_NVMEM_REBOOT_MODE is not set +# CONFIG_POWER_SEQUENCING is not set CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set CONFIG_POWER_SUPPLY_HWMON=y @@ -2596,6 +2611,7 @@ CONFIG_POWER_SUPPLY_HWMON=y # CONFIG_BATTERY_BQ27XXX is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_MAX1720X is not set # CONFIG_CHARGER_ISP1704 is not set # CONFIG_CHARGER_MAX8903 is not set # CONFIG_CHARGER_LP8727 is not set @@ -2633,7 +2649,6 @@ CONFIG_HWMON=y # CONFIG_SENSORS_AD7314 is not set # CONFIG_SENSORS_AD7414 is not set # CONFIG_SENSORS_AD7418 is not set -# CONFIG_SENSORS_ADM1021 is not set # CONFIG_SENSORS_ADM1025 is not set # CONFIG_SENSORS_ADM1026 is not set # CONFIG_SENSORS_ADM1029 is not set @@ -2702,7 +2717,6 @@ CONFIG_SENSORS_IIO_HWMON=y # CONFIG_SENSORS_MAX6620 is not set # CONFIG_SENSORS_MAX6621 is not set # CONFIG_SENSORS_MAX6639 is not set -# CONFIG_SENSORS_MAX6642 is not set # CONFIG_SENSORS_MAX6650 is not set # CONFIG_SENSORS_MAX6697 is not set # CONFIG_SENSORS_MAX31790 is not set @@ -2770,6 +2784,7 @@ CONFIG_SENSORS_IIO_HWMON=y # CONFIG_SENSORS_INA2XX is not set # CONFIG_SENSORS_INA238 is not set # CONFIG_SENSORS_INA3221 is not set +# CONFIG_SENSORS_SPD5118 is not set # CONFIG_SENSORS_TC74 is not set # CONFIG_SENSORS_THMC50 is not set # CONFIG_SENSORS_TMP102 is not set @@ -2894,6 +2909,7 @@ CONFIG_MFD_CORE=y # CONFIG_MFD_88PM800 is not set # CONFIG_MFD_88PM805 is not set # CONFIG_MFD_88PM860X is not set +# CONFIG_MFD_88PM886_PMIC is not set # CONFIG_MFD_MAX14577 is not set # CONFIG_MFD_MAX77541 is not set # CONFIG_MFD_MAX77620 is not set @@ -2969,12 +2985,15 @@ CONFIG_MFD_SYSCON=y # CONFIG_MFD_ROHM_BD718XX is not set # CONFIG_MFD_ROHM_BD71828 is not set # CONFIG_MFD_ROHM_BD957XMUF is not set +# CONFIG_MFD_ROHM_BD96801 is not set CONFIG_MFD_STM32_LPTIMER=y CONFIG_MFD_STM32_TIMERS=y CONFIG_MFD_STPMIC1=y CONFIG_MFD_STMFX=y # CONFIG_MFD_ATC260X_I2C is not set # CONFIG_MFD_QCOM_PM8008 is not set +# CONFIG_MFD_CS40L50_I2C is not set +# CONFIG_MFD_CS40L50_SPI is not set # CONFIG_RAVE_SP_CORE is not set # CONFIG_MFD_INTEL_M10_BMC_SPI is not set # CONFIG_MFD_RSMU_I2C is not set @@ -3264,6 +3283,7 @@ CONFIG_V4L_PLATFORM_DRIVERS=y # # Chips&Media media platform drivers # +# CONFIG_VIDEO_E5010_JPEG_ENC is not set # # Intel media platform drivers @@ -3297,6 +3317,11 @@ CONFIG_V4L_PLATFORM_DRIVERS=y # Qualcomm media platform drivers # +# +# Raspberry Pi media platform drivers +# +# CONFIG_VIDEO_RASPBERRYPI_PISP_BE is not set + # # Renesas media platform drivers # @@ -3358,6 +3383,8 @@ CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_ALVIUM_CSI2 is not set # CONFIG_VIDEO_AR0521 is not set # CONFIG_VIDEO_GC0308 is not set +# CONFIG_VIDEO_GC05A2 is not set +# CONFIG_VIDEO_GC08A3 is not set # CONFIG_VIDEO_GC2145 is not set # CONFIG_VIDEO_HI556 is not set # CONFIG_VIDEO_HI846 is not set @@ -3367,6 +3394,7 @@ CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_IMX219 is not set # CONFIG_VIDEO_IMX258 is not set # CONFIG_VIDEO_IMX274 is not set +# CONFIG_VIDEO_IMX283 is not set # CONFIG_VIDEO_IMX290 is not set # CONFIG_VIDEO_IMX296 is not set # CONFIG_VIDEO_IMX319 is not set @@ -3422,7 +3450,7 @@ CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_S5C73M3 is not set # CONFIG_VIDEO_S5K5BAF is not set # CONFIG_VIDEO_S5K6A3 is not set -# CONFIG_VIDEO_ST_VGXY61 is not set +# CONFIG_VIDEO_VGXY61 is not set # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_ET8EK8 is not set @@ -3561,6 +3589,8 @@ CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_DS90UB913 is not set # CONFIG_VIDEO_DS90UB953 is not set # CONFIG_VIDEO_DS90UB960 is not set +# CONFIG_VIDEO_MAX96714 is not set +# CONFIG_VIDEO_MAX96717 is not set # end of Video serializers and deserializers # @@ -3977,6 +4007,7 @@ CONFIG_BACKLIGHT_PWM=y # CONFIG_BACKLIGHT_QCOM_WLED is not set # CONFIG_BACKLIGHT_ADP8860 is not set # CONFIG_BACKLIGHT_ADP8870 is not set +# CONFIG_BACKLIGHT_LM3509 is not set # CONFIG_BACKLIGHT_LM3630A is not set # CONFIG_BACKLIGHT_LM3639 is not set # CONFIG_BACKLIGHT_LP855X is not set @@ -4592,6 +4623,7 @@ CONFIG_LEDS_PWM=y # CONFIG_LEDS_RT4505 is not set # CONFIG_LEDS_RT8515 is not set # CONFIG_LEDS_SGM3140 is not set +# CONFIG_LEDS_SY7802 is not set # # RGB LED drivers @@ -4624,6 +4656,7 @@ CONFIG_LEDS_TRIGGER_CAMERA=y CONFIG_LEDS_TRIGGER_NETDEV=y CONFIG_LEDS_TRIGGER_PATTERN=y CONFIG_LEDS_TRIGGER_TTY=y +# CONFIG_LEDS_TRIGGER_INPUT_EVENTS is not set # # Simple LED drivers @@ -4764,9 +4797,6 @@ CONFIG_DMA_OF=y # CONFIG_INTEL_IDMA64 is not set # CONFIG_NBPFAXI_DMA is not set # CONFIG_PL330_DMA is not set -CONFIG_STM32_DMA=y -CONFIG_STM32_DMAMUX=y -CONFIG_STM32_MDMA=y # CONFIG_XILINX_DMA is not set # CONFIG_XILINX_XDMA is not set # CONFIG_XILINX_ZYNQMP_DPDMA is not set @@ -4774,6 +4804,10 @@ CONFIG_STM32_MDMA=y # CONFIG_QCOM_HIDMA is not set # CONFIG_DW_DMAC is not set # CONFIG_SF_PDMA is not set +CONFIG_STM32_DMA=y +CONFIG_STM32_DMAMUX=y +CONFIG_STM32_MDMA=y +# CONFIG_STM32_DMA3 is not set # # DMA Clients @@ -4813,6 +4847,7 @@ CONFIG_VIRTIO=y # CONFIG_STAGING is not set # CONFIG_GOLDFISH is not set # CONFIG_CHROME_PLATFORMS is not set +# CONFIG_CZNIC_PLATFORMS is not set # CONFIG_MELLANOX_PLATFORM is not set CONFIG_HAVE_CLK=y CONFIG_HAVE_CLK_PREPARE=y @@ -5081,6 +5116,7 @@ CONFIG_IIO_TRIGGERED_EVENT=y # CONFIG_AD7291 is not set # CONFIG_AD7292 is not set # CONFIG_AD7298 is not set +# CONFIG_AD7380 is not set # CONFIG_AD7476 is not set # CONFIG_AD7606_IFACE_PARALLEL is not set # CONFIG_AD7606_IFACE_SPI is not set @@ -5095,7 +5131,6 @@ CONFIG_IIO_TRIGGERED_EVENT=y # CONFIG_AD7949 is not set # CONFIG_AD799X is not set # CONFIG_AD9467 is not set -# CONFIG_ADI_AXI_ADC is not set # CONFIG_CC10001_ADC is not set # CONFIG_ENVELOPE_DETECTOR is not set # CONFIG_HI8435 is not set @@ -5135,6 +5170,7 @@ CONFIG_STM32_DFSDM_ADC=m # CONFIG_TI_ADC128S052 is not set # CONFIG_TI_ADC161S626 is not set # CONFIG_TI_ADS1015 is not set +# CONFIG_TI_ADS1119 is not set # CONFIG_TI_ADS7924 is not set # CONFIG_TI_ADS1100 is not set # CONFIG_TI_ADS1298 is not set @@ -5186,6 +5222,7 @@ CONFIG_IIO_RESCALE=y # CONFIG_ATLAS_EZO_SENSOR is not set # CONFIG_BME680 is not set # CONFIG_CCS811 is not set +# CONFIG_ENS160 is not set # CONFIG_IAQCORE is not set # CONFIG_PMS7003 is not set # CONFIG_SCD30_CORE is not set @@ -5229,7 +5266,6 @@ CONFIG_IIO_RESCALE=y # CONFIG_AD5504 is not set # CONFIG_AD5624R_SPI is not set # CONFIG_AD9739A is not set -# CONFIG_ADI_AXI_DAC is not set # CONFIG_LTC2688 is not set # CONFIG_AD5686_SPI is not set # CONFIG_AD5696_I2C is not set @@ -5420,6 +5456,7 @@ CONFIG_MPU3050_I2C=m # CONFIG_VCNL4000 is not set # CONFIG_VCNL4035 is not set # CONFIG_VEML6030 is not set +# CONFIG_VEML6040 is not set # CONFIG_VEML6070 is not set # CONFIG_VEML6075 is not set # CONFIG_VL6180 is not set @@ -5576,6 +5613,7 @@ CONFIG_PWM=y # CONFIG_PWM_ATMEL_TCB is not set # CONFIG_PWM_CLK is not set # CONFIG_PWM_FSL_FTM is not set +# CONFIG_PWM_GPIO is not set # CONFIG_PWM_PCA9685 is not set CONFIG_PWM_STM32=y CONFIG_PWM_STM32_LP=y @@ -5588,8 +5626,9 @@ CONFIG_IRQCHIP=y CONFIG_ARM_GIC=y CONFIG_ARM_GIC_MAX_NR=1 # CONFIG_AL_FIC is not set +# CONFIG_LAN966X_OIC is not set # CONFIG_XILINX_INTC is not set -CONFIG_STM32_EXTI=y +CONFIG_STM32MP_EXTI=y # end of IRQ chip support # CONFIG_IPACK_BUS is not set @@ -5639,6 +5678,7 @@ CONFIG_PHY_STM32_USBPHYC=y # CONFIG_ARM_CCI_PMU is not set # CONFIG_ARM_CCN is not set CONFIG_ARM_PMU=y +CONFIG_ARM_V7_PMU=y # CONFIG_ARM_PMUV3 is not set # end of Performance monitor support @@ -5776,6 +5816,7 @@ CONFIG_OVERLAY_FS=y # CONFIG_NETFS_SUPPORT=y CONFIG_NETFS_STATS=y +# CONFIG_NETFS_DEBUG is not set # CONFIG_FSCACHE is not set # end of Caches @@ -5994,6 +6035,7 @@ CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y CONFIG_INIT_STACK_NONE=y # CONFIG_INIT_STACK_ALL_PATTERN is not set # CONFIG_INIT_STACK_ALL_ZERO is not set +# CONFIG_GCC_PLUGIN_STACKLEAK is not set # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y @@ -6062,7 +6104,6 @@ CONFIG_CRYPTO_ECC=m CONFIG_CRYPTO_ECDH=m # CONFIG_CRYPTO_ECDSA is not set # CONFIG_CRYPTO_ECRDSA is not set -# CONFIG_CRYPTO_SM2 is not set # CONFIG_CRYPTO_CURVE25519 is not set # end of Public-key cryptography @@ -6142,7 +6183,7 @@ CONFIG_CRYPTO_XXHASH=m CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_CRC32=m CONFIG_CRYPTO_CRCT10DIF=y -CONFIG_CRYPTO_CRC64_ROCKSOFT=m +CONFIG_CRYPTO_CRC64_ROCKSOFT=y # end of CRCs (cyclic redundancy checks) # @@ -6281,7 +6322,7 @@ CONFIG_CRYPTO_LIB_SHA256=y CONFIG_CRC_CCITT=m CONFIG_CRC16=y CONFIG_CRC_T10DIF=y -CONFIG_CRC64_ROCKSOFT=m +CONFIG_CRC64_ROCKSOFT=y CONFIG_CRC_ITU_T=m CONFIG_CRC32=y # CONFIG_CRC32_SELFTEST is not set @@ -6289,7 +6330,7 @@ CONFIG_CRC32_SLICEBY8=y # CONFIG_CRC32_SLICEBY4 is not set # CONFIG_CRC32_SARWATE is not set # CONFIG_CRC32_BIT is not set -CONFIG_CRC64=m +CONFIG_CRC64=y CONFIG_CRC4=m # CONFIG_CRC7 is not set CONFIG_LIBCRC32C=y @@ -6361,6 +6402,7 @@ CONFIG_NLATTR=y CONFIG_CLZ_TAB=y # CONFIG_IRQ_POLL is not set CONFIG_MPILIB=y +CONFIG_DIMLIB=y CONFIG_LIBFDT=y CONFIG_OID_REGISTRY=y CONFIG_HAVE_GENERIC_VDSO=y diff --git a/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0101-ARM-dts-stm32-lxa-tac-adjust-USB-gadget-fifo-sizes-f.patch b/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0101-ARM-dts-stm32-lxa-tac-adjust-USB-gadget-fifo-sizes-f.patch index 38328fac..0f0673e0 100644 --- a/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0101-ARM-dts-stm32-lxa-tac-adjust-USB-gadget-fifo-sizes-f.patch +++ b/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0101-ARM-dts-stm32-lxa-tac-adjust-USB-gadget-fifo-sizes-f.patch @@ -15,10 +15,10 @@ Signed-off-by: Leonard Göhrs 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi b/arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi -index cfaf8adde319..236ecfca893a 100644 +index c87fd96cbd91..0c1ee3b33c30 100644 --- a/arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi +++ b/arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi -@@ -581,6 +581,10 @@ &usbotg_hs { +@@ -576,6 +576,10 @@ &usbotg_hs { vusb_d-supply = <&vdd_usb>; vusb_a-supply = <®18>; diff --git a/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0102-ARM-dts-stm32-lxa-tac-Add-support-for-generation-3-d.patch b/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0102-ARM-dts-stm32-lxa-tac-Add-support-for-generation-3-d.patch index 16ad662e..8c7d0cd0 100644 --- a/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0102-ARM-dts-stm32-lxa-tac-Add-support-for-generation-3-d.patch +++ b/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0102-ARM-dts-stm32-lxa-tac-Add-support-for-generation-3-d.patch @@ -19,10 +19,10 @@ Signed-off-by: Leonard Göhrs create mode 100644 arch/arm/boot/dts/st/stm32mp153c-lxa-tac-gen3.dts diff --git a/Documentation/devicetree/bindings/arm/stm32/stm32.yaml b/Documentation/devicetree/bindings/arm/stm32/stm32.yaml -index bc2f43330ae4..72fea0ef8f34 100644 +index 58099949e8f3..499ed9b5250c 100644 --- a/Documentation/devicetree/bindings/arm/stm32/stm32.yaml +++ b/Documentation/devicetree/bindings/arm/stm32/stm32.yaml -@@ -136,6 +136,7 @@ properties: +@@ -142,6 +142,7 @@ properties: - lxa,stm32mp157c-mc1 # Linux Automation MC-1 - lxa,stm32mp157c-tac-gen1 # Linux Automation TAC (Generation 1) - lxa,stm32mp157c-tac-gen2 # Linux Automation TAC (Generation 2) @@ -31,10 +31,10 @@ index bc2f43330ae4..72fea0ef8f34 100644 - const: oct,stm32mp15xx-osd32 - enum: diff --git a/arch/arm/boot/dts/st/Makefile b/arch/arm/boot/dts/st/Makefile -index 9fedd6776208..1867aa234c3d 100644 +index 015903d09323..3aa31a41167d 100644 --- a/arch/arm/boot/dts/st/Makefile +++ b/arch/arm/boot/dts/st/Makefile -@@ -59,6 +59,7 @@ dtb-$(CONFIG_ARCH_STM32) += \ +@@ -60,6 +60,7 @@ dtb-$(CONFIG_ARCH_STM32) += \ stm32mp157c-lxa-mc1.dtb \ stm32mp157c-lxa-tac-gen1.dtb \ stm32mp157c-lxa-tac-gen2.dtb \ @@ -510,7 +510,7 @@ index 4cc177031661..1fac9bb60cfb 100644 status = "disabled"; }; diff --git a/arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi b/arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi -index 236ecfca893a..0afbb1a1fa4f 100644 +index 0c1ee3b33c30..ca94a1e0ff66 100644 --- a/arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi +++ b/arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi @@ -142,75 +142,6 @@ output-vuart { diff --git a/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0201-Release-6.10-customers-lxa-lxatac-20240726-1.patch b/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0201-Release-6.11-customers-lxa-lxatac-20240917-1.patch similarity index 62% rename from meta-lxatac-bsp/recipes-kernel/linux/files/patches/0201-Release-6.10-customers-lxa-lxatac-20240726-1.patch rename to meta-lxatac-bsp/recipes-kernel/linux/files/patches/0201-Release-6.11-customers-lxa-lxatac-20240917-1.patch index 3f3a50a1..fb3c1335 100644 --- a/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0201-Release-6.10-customers-lxa-lxatac-20240726-1.patch +++ b/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0201-Release-6.11-customers-lxa-lxatac-20240917-1.patch @@ -1,21 +1,21 @@ From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= -Date: Fri, 26 Jul 2024 11:58:10 +0200 -Subject: [PATCH] Release 6.10/customers/lxa/lxatac/20240726-1 +Date: Tue, 17 Sep 2024 15:09:19 +0200 +Subject: [PATCH] Release 6.11/customers/lxa/lxatac/20240917-1 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 3d10e3aadeda..8136f5b03d5b 100644 +index 34bd1d5f9672..af51b53e437d 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ VERSION = 6 - PATCHLEVEL = 10 + PATCHLEVEL = 11 SUBLEVEL = 0 -EXTRAVERSION = -+EXTRAVERSION =-20240726-1 ++EXTRAVERSION =-20240917-1 NAME = Baby Opossum Posse # *DOCUMENTATION* diff --git a/meta-lxatac-bsp/recipes-kernel/linux/files/patches/series.inc b/meta-lxatac-bsp/recipes-kernel/linux/files/patches/series.inc index fc09eb5d..d7f773bf 100644 --- a/meta-lxatac-bsp/recipes-kernel/linux/files/patches/series.inc +++ b/meta-lxatac-bsp/recipes-kernel/linux/files/patches/series.inc @@ -1,26 +1,26 @@ -# umpf-base: v6.10 -# umpf-name: 6.10/customers/lxa/lxatac -# umpf-version: 6.10/customers/lxa/lxatac/20240726-1 -# umpf-topic: v6.8/topic/reproducible-build -# umpf-hashinfo: 80b65016ce3a5ee2d383964372f1a035206ca2d7 -# umpf-topic-range: 0c3836482481200ead7b416ca80c68a29cfdaabd..3e601acab42266f4e14d74d29c0938ffecea1709 +# umpf-base: v6.11 +# umpf-name: 6.11/customers/lxa/lxatac +# umpf-version: 6.11/customers/lxa/lxatac/20240917-1 +# umpf-topic: v6.11/topic/reproducible-build +# umpf-hashinfo: d6ed6f191343a77bfe41d7436b51dffe8bcac441 +# umpf-topic-range: 98f7e32f20d28ec452afb208f9cffc08448a2652..1b888dc7203b47ea21aacbf471cd762f82f36678 SRC_URI += "\ file://patches/0001-ARM-Don-t-mention-the-full-path-of-the-source-direct.patch \ " # umpf-topic: v6.8/customers/lxa/lxatac # umpf-hashinfo: b7d99b8a22130c95b0c6d25d6fb0d4f72bf8322e -# umpf-topic-range: 3e601acab42266f4e14d74d29c0938ffecea1709..789188fff1c5200656b345f88c468354e45ce037 +# umpf-topic-range: 1b888dc7203b47ea21aacbf471cd762f82f36678..bb492c850a1e92262b1eece4113fb09a92c0ff1d SRC_URI += "\ file://patches/0101-ARM-dts-stm32-lxa-tac-adjust-USB-gadget-fifo-sizes-f.patch \ file://patches/0102-ARM-dts-stm32-lxa-tac-Add-support-for-generation-3-d.patch \ " -# umpf-release: 6.10/customers/lxa/lxatac/20240726-1 -# umpf-topic-range: 789188fff1c5200656b345f88c468354e45ce037..9aaf0788e3b70b7f6690a2f7fe5dc7356e418069 +# umpf-release: 6.11/customers/lxa/lxatac/20240917-1 +# umpf-topic-range: bb492c850a1e92262b1eece4113fb09a92c0ff1d..0c61d3807b291bd09fc8550b4be0ba00a0c73321 SRC_URI += "\ - file://patches/0201-Release-6.10-customers-lxa-lxatac-20240726-1.patch \ + file://patches/0201-Release-6.11-customers-lxa-lxatac-20240917-1.patch \ " -UMPF_BASE = "6.10" -UMPF_VERSION = "20240726-1" +UMPF_BASE = "6.11" +UMPF_VERSION = "20240917-1" UMPF_PV = "${UMPF_BASE}-${UMPF_VERSION}" LINUX_VERSION = "${UMPF_BASE}" # umpf-end diff --git a/meta-lxatac-bsp/recipes-kernel/linux/linux-lxatac.bb b/meta-lxatac-bsp/recipes-kernel/linux/linux-lxatac.bb index ea2db3e2..605330d3 100644 --- a/meta-lxatac-bsp/recipes-kernel/linux/linux-lxatac.bb +++ b/meta-lxatac-bsp/recipes-kernel/linux/linux-lxatac.bb @@ -9,7 +9,7 @@ SRC_URI = "https://www.kernel.org/pub/linux/kernel/v6.x/linux-${LINUX_VERSION}.t file://defconfig \ " -SRC_URI[sha256sum] = "774698422ee54c5f1e704456f37c65c06b51b4e9a8b0866f34580d86fef8e226" +SRC_URI[sha256sum] = "55d2c6c025ebc27810c748d66325dd5bc601e8d32f8581d9e77673529bdacb2e" require files/patches/series.inc @@ -20,7 +20,10 @@ COMPATIBLE_MACHINE = "lxatac" RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" -DEPENDS:append = " panel-shineworld-lh133k" +# The coreutils-native dependency is required since kernel 6.11, +# which uses the `truncate` tool in a script. +# It can likely be removed again once the kernel.bbclass is updated. +DEPENDS:append = " panel-shineworld-lh133k coreutils-native" # Some options depend on CONFIG_PAHOLE_VERSION, so need to make pahole-native available before do_kernel_configme do_kernel_configme[depends] += "pahole-native:do_populate_sysroot" From 141b76cb8b512ca767a8550b33eb6786e4478682 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Tue, 17 Sep 2024 15:22:06 +0200 Subject: [PATCH 09/61] meta-lxatac-bsp: linux-lxatac: add workaround for broken fbdev emulation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Starting with commit 86634fa4e6aef ("Merge v6.10-rc6 into drm-next") the tacd fails to write to the /dev/fb0 device with a SIGBUS error. This merge commit is the first affected commit because it brings together these two commits for the first time: - commit 9317ff69170d3 ("drm/tiny/panel-mipi-dbi: Use fbdev-dma") - commit d92a7580392ad ("drm/fbdev-dma: Only set smem_start is enable per module option") The first one changes panel-mipi-dbi from being a `drm_fbdev_generic` device to being a `drm_fbdev_dma` device. The second one prevents `drm_fbdev_dma` devices from leaking the memory address of the framebuffer to userspace unless the `drm_kms_helper.drm_leak_fbdev_smem=1` kernel commandline option is set. This being an issue is likely a bug in the panel-mipi-dbi driver that should be fixed there, but this workaround makes sure we can use 6.11 until the driver is fixed. Signed-off-by: Leonard Göhrs --- .../recipes-core/images/lxatac-core-image-base.bbappend | 9 ++++++++- meta-lxatac-bsp/recipes-kernel/linux/files/defconfig | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/meta-lxatac-bsp/recipes-core/images/lxatac-core-image-base.bbappend b/meta-lxatac-bsp/recipes-core/images/lxatac-core-image-base.bbappend index af458bcd..432a2e0c 100644 --- a/meta-lxatac-bsp/recipes-core/images/lxatac-core-image-base.bbappend +++ b/meta-lxatac-bsp/recipes-core/images/lxatac-core-image-base.bbappend @@ -1,7 +1,14 @@ inherit bootspec BOOTSPEC_EXTRALINE = "linux-appendroot true\n" -BOOTSPEC_OPTIONS += "rootwait" + +# The drm_leak_fbdev_smem option is a workaround required since Linux 6.11 +# because without it the tacd will crash when attempting to write to the +# framebuffer. This is likely a bug in the panel-mipi-dbi driver or the tacd +# that should be fixed there. +# Once drm_leak_fbdev_smem is removed the kernel config option +# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM should be disabled as well. +BOOTSPEC_OPTIONS += "rootwait drm_kms_helper.drm_leak_fbdev_smem=1" IMAGE_INSTALL:append = "\ kernel-image \ diff --git a/meta-lxatac-bsp/recipes-kernel/linux/files/defconfig b/meta-lxatac-bsp/recipes-kernel/linux/files/defconfig index a3cfcf07..2be5b850 100644 --- a/meta-lxatac-bsp/recipes-kernel/linux/files/defconfig +++ b/meta-lxatac-bsp/recipes-kernel/linux/files/defconfig @@ -3826,7 +3826,7 @@ CONFIG_DRM_KMS_HELPER=y # CONFIG_DRM_DEBUG_MODESET_LOCK is not set CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 -# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set +CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM=y # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set CONFIG_DRM_GEM_DMA_HELPER=y From ce0159962dd1969024648ead4cf59327a63bba9e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Oct 2024 14:58:45 +0000 Subject: [PATCH 10/61] meta-*: bump meta-oe from `735ae03` to `72018ca` in the layers group Bumps the layers group with 1 update: [meta-oe](https://github.com/openembedded/meta-openembedded). Updates `meta-oe` from `735ae03` to `72018ca` - [Commits](https://github.com/openembedded/meta-openembedded/compare/735ae0310870ffce07ce0c55c4f87c20ac161ff9...72018ca1b1a471226917e8246e8bbf9a374ccf97) --- updated-dependencies: - dependency-name: meta-oe dependency-type: direct:production dependency-group: layers ... Signed-off-by: dependabot[bot] --- meta-oe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe b/meta-oe index 735ae031..72018ca1 160000 --- a/meta-oe +++ b/meta-oe @@ -1 +1 @@ -Subproject commit 735ae0310870ffce07ce0c55c4f87c20ac161ff9 +Subproject commit 72018ca1b1a471226917e8246e8bbf9a374ccf97 From 103672079e10bdfb3d4b5fb6a49194485192e9b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2024 14:09:18 +0000 Subject: [PATCH 11/61] meta-*: bump the layers group with 3 updates Bumps the layers group with 3 updates: [meta-virtualization](https://github.com/lgirdk/meta-virtualization), poky and meta-selinux. Updates `meta-virtualization` from `e5878c8` to `6f3c1d8` - [Commits](https://github.com/lgirdk/meta-virtualization/compare/e5878c864aacd24fe8f09ab7221f0ada13cd22d3...6f3c1d8f90947408a6587be222fec575a1ca5195) Updates `poky` from `c799f73` to `cd44e6b` Updates `meta-selinux` from `9f5a466` to `3aff015` --- updated-dependencies: - dependency-name: meta-virtualization dependency-type: direct:production dependency-group: layers - dependency-name: poky dependency-type: direct:production dependency-group: layers - dependency-name: meta-selinux dependency-type: direct:production dependency-group: layers ... Signed-off-by: dependabot[bot] --- meta-selinux | 2 +- meta-virtualization | 2 +- poky | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-selinux b/meta-selinux index 9f5a4662..3aff0156 160000 --- a/meta-selinux +++ b/meta-selinux @@ -1 +1 @@ -Subproject commit 9f5a46620a07d7b15722593a33e46a4d19392b75 +Subproject commit 3aff015697fa056b4af83b1c9ba44eca346a8a37 diff --git a/meta-virtualization b/meta-virtualization index e5878c86..6f3c1d8f 160000 --- a/meta-virtualization +++ b/meta-virtualization @@ -1 +1 @@ -Subproject commit e5878c864aacd24fe8f09ab7221f0ada13cd22d3 +Subproject commit 6f3c1d8f90947408a6587be222fec575a1ca5195 diff --git a/poky b/poky index c799f73a..cd44e6bd 160000 --- a/poky +++ b/poky @@ -1 +1 @@ -Subproject commit c799f73a47fa35d6059456291328f7ff10fdb273 +Subproject commit cd44e6bd40b0c1f498b3feaeb5e9b72f8bf32d41 From c29b2ccada1a680d8e6a864da7c498ff75180618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 18 Oct 2024 09:49:02 +0200 Subject: [PATCH 12/61] meta-lxatac-bsp: linux-lxatac: remove superflous RDEPENDS line MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is not clear what this line was supposed to achieve, but removing it did not change the bitbake -e linux-lxatac output, so it be safe to remove it. Signed-off-by: Leonard Göhrs --- meta-lxatac-bsp/recipes-kernel/linux/linux-lxatac.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-lxatac-bsp/recipes-kernel/linux/linux-lxatac.bb b/meta-lxatac-bsp/recipes-kernel/linux/linux-lxatac.bb index 605330d3..d643d328 100644 --- a/meta-lxatac-bsp/recipes-kernel/linux/linux-lxatac.bb +++ b/meta-lxatac-bsp/recipes-kernel/linux/linux-lxatac.bb @@ -18,8 +18,6 @@ S = "${WORKDIR}/linux-${LINUX_VERSION}" COMPATIBLE_MACHINE = "lxatac" -RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" - # The coreutils-native dependency is required since kernel 6.11, # which uses the `truncate` tool in a script. # It can likely be removed again once the kernel.bbclass is updated. From 68a17f4bfa60a36d70578bc2cdda41868bd048c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 18 Oct 2024 09:51:31 +0200 Subject: [PATCH 13/61] meta-lxatac-software: lxatac-image-full: remove rng-tools bad rule MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Yocto 4.2 (Mickledore) migration guide says the following about rng-tools: openssh no longer uses :term:`RRECOMMENDS` to pull in ``rng-tools`` I can not find any current recipe that recommends rng-tools, so we are safe to remove this line. Signed-off-by: Leonard Göhrs --- .../recipes-core/images/lxatac-core-image-base.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-lxatac-software/recipes-core/images/lxatac-core-image-base.bb b/meta-lxatac-software/recipes-core/images/lxatac-core-image-base.bb index 81a7ea4b..03e36ef8 100644 --- a/meta-lxatac-software/recipes-core/images/lxatac-core-image-base.bb +++ b/meta-lxatac-software/recipes-core/images/lxatac-core-image-base.bb @@ -1,7 +1,5 @@ SUMMARY = "LXA TAC image containing a selection of useful development tools" -BAD_RECOMMENDATIONS = "rng-tools" - IMAGE_FEATURES = "ssh-server-openssh empty-root-password tools-debug lic-pkgs" IMAGE_FSTYPES += "ext4" From e0c7587e33426a95033fc8132596e7162b935810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 18 Oct 2024 10:03:22 +0200 Subject: [PATCH 14/61] meta-lxatac-software: templates: bblayers: remove meta-perl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It looks like none of the packages we install comes from or depends on meta-perl, so we can safely remove it from our list of layers. Signed-off-by: Leonard Göhrs --- meta-lxatac-software/conf/templates/default/bblayers.conf.sample | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-lxatac-software/conf/templates/default/bblayers.conf.sample b/meta-lxatac-software/conf/templates/default/bblayers.conf.sample index fc22c67b..b2dc586e 100644 --- a/meta-lxatac-software/conf/templates/default/bblayers.conf.sample +++ b/meta-lxatac-software/conf/templates/default/bblayers.conf.sample @@ -11,7 +11,6 @@ BBLAYERS ?= " \ ##OEROOT##/../meta-ptx \ ##OEROOT##/../meta-oe/meta-oe \ ##OEROOT##/../meta-oe/meta-python \ - ##OEROOT##/../meta-oe/meta-perl \ ##OEROOT##/../meta-oe/meta-filesystems \ ##OEROOT##/../meta-oe/meta-networking \ ##OEROOT##/../meta-lxatac-bsp \ From 410aad7f6952862384aab734f1d4c8f7ef2ac4a2 Mon Sep 17 00:00:00 2001 From: Jan Luebbe Date: Fri, 18 Oct 2024 16:27:55 +0200 Subject: [PATCH 15/61] meta-lxatac-bsp: linux-lxatac: enable bluetooth via USB instead of via UART The UART support was still left over from the initial STM32 defconfig. Signed-off-by: Jan Luebbe --- .../recipes-kernel/linux/files/defconfig | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/meta-lxatac-bsp/recipes-kernel/linux/files/defconfig b/meta-lxatac-bsp/recipes-kernel/linux/files/defconfig index 2be5b850..186a7713 100644 --- a/meta-lxatac-bsp/recipes-kernel/linux/files/defconfig +++ b/meta-lxatac-bsp/recipes-kernel/linux/files/defconfig @@ -1254,9 +1254,12 @@ CONFIG_CAN_J1939=y CONFIG_CAN_ISOTP=y CONFIG_BT=m CONFIG_BT_BREDR=y -# CONFIG_BT_RFCOMM is not set -# CONFIG_BT_BNEP is not set -# CONFIG_BT_HIDP is not set +CONFIG_BT_RFCOMM=m +# CONFIG_BT_RFCOMM_TTY is not set +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m CONFIG_BT_LE=y CONFIG_BT_LE_L2CAP_ECRED=y # CONFIG_BT_LEDS is not set @@ -1268,29 +1271,25 @@ CONFIG_BT_DEBUGFS=y # # Bluetooth device drivers # +CONFIG_BT_INTEL=m CONFIG_BT_BCM=m -# CONFIG_BT_HCIBTUSB is not set +CONFIG_BT_RTL=m +CONFIG_BT_MTK=m +CONFIG_BT_HCIBTUSB=m +# CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set +CONFIG_BT_HCIBTUSB_POLL_SYNC=y +CONFIG_BT_HCIBTUSB_BCM=y +CONFIG_BT_HCIBTUSB_MTK=y +CONFIG_BT_HCIBTUSB_RTL=y # CONFIG_BT_HCIBTSDIO is not set -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_SERDEV=y -CONFIG_BT_HCIUART_H4=y -# CONFIG_BT_HCIUART_NOKIA is not set -# CONFIG_BT_HCIUART_BCSP is not set -# CONFIG_BT_HCIUART_ATH3K is not set -# CONFIG_BT_HCIUART_LL is not set -# CONFIG_BT_HCIUART_3WIRE is not set -# CONFIG_BT_HCIUART_INTEL is not set -CONFIG_BT_HCIUART_BCM=y -# CONFIG_BT_HCIUART_RTL is not set -# CONFIG_BT_HCIUART_QCA is not set -# CONFIG_BT_HCIUART_AG6XX is not set -# CONFIG_BT_HCIUART_MRVL is not set +# CONFIG_BT_HCIUART is not set # CONFIG_BT_HCIBCM203X is not set # CONFIG_BT_HCIBPA10X is not set # CONFIG_BT_HCIBFUSB is not set # CONFIG_BT_HCIVHCI is not set CONFIG_BT_MRVL=m -CONFIG_BT_MRVL_SDIO=m +# CONFIG_BT_MRVL_SDIO is not set +# CONFIG_BT_ATH3K is not set # CONFIG_BT_MTKSDIO is not set # CONFIG_BT_MTKUART is not set # CONFIG_BT_VIRTIO is not set @@ -4153,6 +4152,7 @@ CONFIG_HID_GENERIC=y # CONFIG_HID_NINTENDO is not set # CONFIG_HID_NTI is not set # CONFIG_HID_NTRIG is not set +# CONFIG_HID_NVIDIA_SHIELD is not set # CONFIG_HID_ORTEK is not set # CONFIG_HID_PANTHERLORD is not set # CONFIG_HID_PENMOUNT is not set From 5950d3739662bff5412fe2fdd10c4e82b4c84cb8 Mon Sep 17 00:00:00 2001 From: Jan Luebbe Date: Fri, 18 Oct 2024 16:53:19 +0200 Subject: [PATCH 16/61] meta-lxatac-bsp: linux-lxatac: enable more USB wifi drivers Signed-off-by: Jan Luebbe --- .../recipes-kernel/linux/files/defconfig | 65 ++++++++++++++----- 1 file changed, 50 insertions(+), 15 deletions(-) diff --git a/meta-lxatac-bsp/recipes-kernel/linux/files/defconfig b/meta-lxatac-bsp/recipes-kernel/linux/files/defconfig index 186a7713..95048360 100644 --- a/meta-lxatac-bsp/recipes-kernel/linux/files/defconfig +++ b/meta-lxatac-bsp/recipes-kernel/linux/files/defconfig @@ -197,7 +197,7 @@ CONFIG_PID_NS=y CONFIG_NET_NS=y # CONFIG_CHECKPOINT_RESTORE is not set # CONFIG_SCHED_AUTOGROUP is not set -# CONFIG_RELAY is not set +CONFIG_RELAY=y # CONFIG_BLK_DEV_INITRD is not set # CONFIG_BOOT_CONFIG is not set CONFIG_INITRAMFS_PRESERVE_MTIME=y @@ -1292,6 +1292,7 @@ CONFIG_BT_MRVL=m # CONFIG_BT_ATH3K is not set # CONFIG_BT_MTKSDIO is not set # CONFIG_BT_MTKUART is not set +CONFIG_BT_HCIRSI=m # CONFIG_BT_VIRTIO is not set # CONFIG_BT_NXPUART is not set # end of Bluetooth device drivers @@ -1317,7 +1318,7 @@ CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" # CONFIG_MAC80211_MESH is not set -# CONFIG_MAC80211_LEDS is not set +CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_MESSAGE_TRACING is not set # CONFIG_MAC80211_DEBUG_MENU is not set CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 @@ -2017,7 +2018,28 @@ CONFIG_USB_NET_INT51X1=m CONFIG_USB_RTL8153_ECM=m CONFIG_WLAN=y # CONFIG_WLAN_VENDOR_ADMTEK is not set -# CONFIG_WLAN_VENDOR_ATH is not set +CONFIG_ATH_COMMON=m +CONFIG_WLAN_VENDOR_ATH=y +# CONFIG_ATH_DEBUG is not set +CONFIG_ATH9K_HW=m +CONFIG_ATH9K_COMMON=m +CONFIG_ATH9K_BTCOEX_SUPPORT=y +# CONFIG_ATH9K is not set +CONFIG_ATH9K_HTC=m +# CONFIG_ATH9K_HTC_DEBUGFS is not set +# CONFIG_CARL9170 is not set +# CONFIG_ATH6KL is not set +# CONFIG_AR5523 is not set +CONFIG_ATH10K=m +CONFIG_ATH10K_CE=y +# CONFIG_ATH10K_SDIO is not set +CONFIG_ATH10K_USB=m +CONFIG_ATH10K_DEBUG=y +CONFIG_ATH10K_DEBUGFS=y +CONFIG_ATH10K_LEDS=y +CONFIG_ATH10K_SPECTRAL=y +# CONFIG_WCN36XX is not set +# CONFIG_ATH11K is not set # CONFIG_WLAN_VENDOR_ATMEL is not set CONFIG_WLAN_VENDOR_BROADCOM=y # CONFIG_B43 is not set @@ -2059,7 +2081,8 @@ CONFIG_MT7663U=m CONFIG_MT7921_COMMON=m # CONFIG_MT7921S is not set CONFIG_MT7921U=m -# CONFIG_MT7925U is not set +CONFIG_MT7925_COMMON=m +CONFIG_MT7925U=m # CONFIG_WLAN_VENDOR_MICROCHIP is not set # CONFIG_WLAN_VENDOR_PURELIFI is not set CONFIG_WLAN_VENDOR_RALINK=y @@ -2082,34 +2105,46 @@ CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set CONFIG_WLAN_VENDOR_REALTEK=y CONFIG_RTL8187=m +CONFIG_RTL8187_LEDS=y CONFIG_RTL_CARDS=m CONFIG_RTL8192CU=m -# CONFIG_RTL8192DU is not set +CONFIG_RTL8192DU=m CONFIG_RTLWIFI=m CONFIG_RTLWIFI_USB=m CONFIG_RTLWIFI_DEBUG=y CONFIG_RTL8192C_COMMON=m +CONFIG_RTL8192D_COMMON=m CONFIG_RTL8XXXU=m CONFIG_RTL8XXXU_UNTESTED=y CONFIG_RTW88=m +CONFIG_RTW88_CORE=m +CONFIG_RTW88_USB=m +CONFIG_RTW88_8822B=m +CONFIG_RTW88_8822C=m +CONFIG_RTW88_8723X=m +CONFIG_RTW88_8723D=m +CONFIG_RTW88_8821C=m # CONFIG_RTW88_8822BS is not set -# CONFIG_RTW88_8822BU is not set +CONFIG_RTW88_8822BU=m # CONFIG_RTW88_8822CS is not set -# CONFIG_RTW88_8822CU is not set +CONFIG_RTW88_8822CU=m # CONFIG_RTW88_8723DS is not set # CONFIG_RTW88_8723CS is not set -# CONFIG_RTW88_8723DU is not set +CONFIG_RTW88_8723DU=m # CONFIG_RTW88_8821CS is not set -# CONFIG_RTW88_8821CU is not set +CONFIG_RTW88_8821CU=m +CONFIG_RTW88_DEBUG=y +CONFIG_RTW88_DEBUGFS=y CONFIG_RTW89=m -# CONFIG_WLAN_VENDOR_RSI is not set +CONFIG_WLAN_VENDOR_RSI=y +CONFIG_RSI_91X=m +CONFIG_RSI_DEBUGFS=y +# CONFIG_RSI_SDIO is not set +CONFIG_RSI_USB=m +CONFIG_RSI_COEX=y # CONFIG_WLAN_VENDOR_SILABS is not set # CONFIG_WLAN_VENDOR_ST is not set -CONFIG_WLAN_VENDOR_TI=y -# CONFIG_WL1251 is not set -# CONFIG_WL12XX is not set -# CONFIG_WL18XX is not set -# CONFIG_WLCORE is not set +# CONFIG_WLAN_VENDOR_TI is not set CONFIG_WLAN_VENDOR_ZYDAS=y CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set From e3b9c267e6e39df5efd999bfd90ce67337b62295 Mon Sep 17 00:00:00 2001 From: Jan Luebbe Date: Thu, 20 Jun 2024 19:00:09 +0200 Subject: [PATCH 17/61] meta-labgrid: update to a version that adds grpc support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This marks a breaking change compared to the previous release version of labgrid, as this new development version now uses grpc instead of crossbar to communicate between the client, coordinator and exporters. This means all of these components need to be updated to the grpc-based versions at the same time. See https://github.com/labgrid-project/labgrid/pull/1469 for more information about this change. Signed-off-by: Leonard Göhrs --- meta-labgrid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-labgrid b/meta-labgrid index 95308c3d..e8bc5931 160000 --- a/meta-labgrid +++ b/meta-labgrid @@ -1 +1 @@ -Subproject commit 95308c3d2ac1b101481d3f3e4590a98f1fbeb2cb +Subproject commit e8bc5931d9bc45b5a63a2436f166008699829980 From ee221dc053bc75313923df06a2a30dc4bcbda29c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Wed, 23 Oct 2024 12:57:14 +0200 Subject: [PATCH 18/61] ci: build: enable artifact upload to the local Forrest runner MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes it so that artifacts are no longer uploaded via the internet to GitHub's cloud infrastructure but instead stay on the physical server the builds run on. Since the built images will mostly be consumed from within the building the server is located in this should reduce the upload bandwidth used, allowing us to also upload the eMMC image and not only the RAUC bundle. Since the uploaded files are served from a webserver as-is, instead of being packaged in a zip file like "normal" artifacts are, they can also be used in a `rauc install` call directly, making testing of a build much easier. The artifact file that _is_ uploaded to GitHub's infrastructure contains `.desktop` files with `Link=https://...` entries withing them that point to the location of the actual file. Signed-off-by: Leonard Göhrs --- .github/workflows/build.yml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 20cddb3f..2647a235 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -75,10 +75,18 @@ jobs: rsync -rvx --ignore-existing build/downloads yocto-cache: || true rsync -rvx --ignore-existing build/sstate-cache yocto-cache: || true - - name: Upload RAUC Bundle + - name: Upload Artifacts to the Forrest Runner + uses: forrest-runner/upload-artifact@main + with: + path: | + images/tf-a-stm32mp153c-lxa-tac.stm32 + images/emmc-boot-image-lxatac.fip + images/emmc-boot-image-lxatac.img + images/emmc-image-lxatac.simg + images/lxatac-core-bundle-base-lxatac.raucb + + - name: Upload Artifact links to GitHub uses: actions/upload-artifact@v4 with: - name: rauc-bundle - path: images/lxatac-core-bundle-base-lxatac-*.raucb - compression-level: 0 - retention-days: 30 + name: images + path: images/*.desktop From 6876eb8df82666fff91293d6b943ff764d13fbf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Wed, 23 Oct 2024 13:47:14 +0200 Subject: [PATCH 19/61] meta-lxatac-software: python3-labgrid: use SRCREV from meta-labgrid MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit e3b9c26 should have updated the labgrid version used to the one configured in meta-labgrid. Instead it only updated the recipe (and dropped the dependency for autobahn etc.), so we currently have a labgrid version installed that still depends on autobahn, but with dependencies for a grpc based labgrid version. This results in `labgrid-exporter.service` failing to start: Traceback (most recent call last): File "/usr/bin/labgrid-exporter", line 5, in from labgrid.remote.exporter import main File "/usr/lib/python3.12/site-packages/labgrid/remote/exporter.py", line 19, in from autobahn.asyncio.wamp import ApplicationRunner, ApplicationSession ModuleNotFoundError: No module named 'autobahn' Fix that by _actually_ using the SRCREV from meta-labgrid. Fixes: e3b9c26 ("meta-labgrid: update to a version that adds grpc support") Signed-off-by: Leonard Göhrs --- .../recipes-devtools/python/python3-labgrid_git.bbappend | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-lxatac-software/recipes-devtools/python/python3-labgrid_git.bbappend b/meta-lxatac-software/recipes-devtools/python/python3-labgrid_git.bbappend index f70acc8f..3e50c55a 100644 --- a/meta-lxatac-software/recipes-devtools/python/python3-labgrid_git.bbappend +++ b/meta-lxatac-software/recipes-devtools/python/python3-labgrid_git.bbappend @@ -4,8 +4,6 @@ SRC_URI += "file://userconfig.yaml \ file://labgrid.conf \ " -SRCREV = "e5ace1a36c4e552b950cf356ce0e34586f776432" - do_install:append() { # The userconfig.yaml is migrated via rauc hook between installs. # Deploy a copy of the file so that users can go back to a default config From c5b40dd3903a7ed2c1305fc10205abb7d32cc236 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 24 Oct 2024 14:50:15 +0000 Subject: [PATCH 20/61] meta-*: bump the layers group with 2 updates Bumps the layers group with 2 updates: [meta-oe](https://github.com/openembedded/meta-openembedded) and poky. Updates `meta-oe` from `72018ca` to `2e3126c` - [Commits](https://github.com/openembedded/meta-openembedded/compare/72018ca1b1a471226917e8246e8bbf9a374ccf97...2e3126c9c16bb3df0560f6b3896d01539a3bfad7) Updates `poky` from `cd44e6b` to `200d12b` --- updated-dependencies: - dependency-name: meta-oe dependency-type: direct:production dependency-group: layers - dependency-name: poky dependency-type: direct:production dependency-group: layers ... Signed-off-by: dependabot[bot] --- meta-oe | 2 +- poky | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe b/meta-oe index 72018ca1..2e3126c9 160000 --- a/meta-oe +++ b/meta-oe @@ -1 +1 @@ -Subproject commit 72018ca1b1a471226917e8246e8bbf9a374ccf97 +Subproject commit 2e3126c9c16bb3df0560f6b3896d01539a3bfad7 diff --git a/poky b/poky index cd44e6bd..200d12b6 160000 --- a/poky +++ b/poky @@ -1 +1 @@ -Subproject commit cd44e6bd40b0c1f498b3feaeb5e9b72f8bf32d41 +Subproject commit 200d12b6a58ad961d60a7774ca0f7a9d29498724 From 22e857ef84bd42518d3b353f3a6b5f04a42b40eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 18 Oct 2024 15:33:22 +0200 Subject: [PATCH 21/61] meta-lxatac-bsp: barebox: update to 2024.10.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From the LXA TAC's point of view this brings two improvements: - Barebox now interprets `GPIO_PULL_UP` / `GPIO_PULL_DOWN` flags in gpio configurations, just like Linux does. This allows us to drop the pinctrl configuration that manually configures pull-up resistors on the two button input lines. - The Fastboot improvements that make `getvar` calls not interrupt the boot process anymore are now mainline and we can drop our backport. Signed-off-by: Leonard Göhrs --- ...024.09.0.bb => barebox-tools_2024.10.0.bb} | 2 +- ...ebox_2024.09.0.bb => barebox_2024.10.0.bb} | 2 +- .../barebox/files/lxatac/defconfig | 8 ++- ...mon-boards-include-to-include-search.patch | 2 +- ...optional-systemd.hostname-generation.patch | 2 +- .../0009-common-add-barebox-TLV-support.patch | 6 +- ...0-commands-add-TLV-debugging-command.patch | 2 +- ...m32mp-add-Linux-Automation-TAC-board.patch | 55 +++----------- ...dd-Linux-Automation-TAC-Generation-3.patch | 2 +- ...4.10.0-customers-lxa-tac-20241018-1.patch} | 10 +-- ...ll-variables-only-on-getvar-all-and-.patch | 42 ----------- ...strcmp_l1-in-favor-of-str_has_prefix.patch | 72 ------------------- ...onsole_countdown_abort-for-getvar-re.patch | 57 --------------- .../barebox/files/patches/series.inc | 30 +++----- 14 files changed, 40 insertions(+), 252 deletions(-) rename meta-lxatac-bsp/recipes-bsp/barebox/{barebox-tools_2024.09.0.bb => barebox-tools_2024.10.0.bb} (95%) rename meta-lxatac-bsp/recipes-bsp/barebox/{barebox_2024.09.0.bb => barebox_2024.10.0.bb} (92%) rename meta-lxatac-bsp/recipes-bsp/barebox/files/patches/{0301-Release-2024.09.0-customers-lxa-tac-20240919-1.patch => 0201-Release-2024.10.0-customers-lxa-tac-20241018-1.patch} (61%) delete mode 100644 meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0201-fastboot-print-all-variables-only-on-getvar-all-and-.patch delete mode 100644 meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0202-fastboot-retire-strcmp_l1-in-favor-of-str_has_prefix.patch delete mode 100644 meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0203-fastboot-avoid-console_countdown_abort-for-getvar-re.patch diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/barebox-tools_2024.09.0.bb b/meta-lxatac-bsp/recipes-bsp/barebox/barebox-tools_2024.10.0.bb similarity index 95% rename from meta-lxatac-bsp/recipes-bsp/barebox/barebox-tools_2024.09.0.bb rename to meta-lxatac-bsp/recipes-bsp/barebox/barebox-tools_2024.10.0.bb index 000b2f86..986e831f 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/barebox-tools_2024.09.0.bb +++ b/meta-lxatac-bsp/recipes-bsp/barebox/barebox-tools_2024.10.0.bb @@ -8,7 +8,7 @@ DEPENDS = "libusb1 libusb1-native lzop-native bison-native flex-native pkgconfig BBCLASSEXTEND = "native" SRC_URI = "http://barebox.org/download/barebox-${PV}.tar.bz2" -SRC_URI[sha256sum] = "4d4ea7e232aeba2b3cb9ccf0dbf8cd8e01c65b6c615f64c3bd0c4f24f23a47da" +SRC_URI[sha256sum] = "955b20bfa7358732d2c0c09ccfd4c1a69087b7e2c610b16dee7442d71a5af88d" S = "${WORKDIR}/barebox-${PV}" diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.09.0.bb b/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.10.0.bb similarity index 92% rename from meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.09.0.bb rename to meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.10.0.bb index 3a401a27..cf9a0479 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.09.0.bb +++ b/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.10.0.bb @@ -12,7 +12,7 @@ SRC_URI += " \ " require files/patches/series.inc -SRC_URI[sha256sum] = "4d4ea7e232aeba2b3cb9ccf0dbf8cd8e01c65b6c615f64c3bd0c4f24f23a47da" +SRC_URI[sha256sum] = "955b20bfa7358732d2c0c09ccfd4c1a69087b7e2c610b16dee7442d71a5af88d" COMPATIBLE_MACHINE = "lxatac" diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/files/lxatac/defconfig b/meta-lxatac-bsp/recipes-bsp/barebox/files/lxatac/defconfig index 7632b243..773acb74 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/files/lxatac/defconfig +++ b/meta-lxatac-bsp/recipes-bsp/barebox/files/lxatac/defconfig @@ -1,8 +1,9 @@ # # Automatically generated file; DO NOT EDIT. -# Barebox/arm 2024.09.0-20240918-1 Configuration +# Barebox/arm 2024.10.0-20241018-1 Configuration # CONFIG_ARM=y +CONFIG_ARM32=y CONFIG_ARCH_TEXT_BASE=0x00000000 CONFIG_ARM_LINUX=y CONFIG_ARM_USE_COMPRESSED_DTB=y @@ -70,7 +71,6 @@ CONFIG_ARM_UNWIND=y # CONFIG_ARM_SEMIHOSTING is not set CONFIG_ARM_SMCCC=y CONFIG_ARM_PSCI_OF=y -# CONFIG_ARM_PSCI is not set CONFIG_ARM_PSCI_CLIENT=y # end of ARM specific settings @@ -494,6 +494,7 @@ CONFIG_DTC=y CONFIG_OF=y CONFIG_OFDEVICE=y CONFIG_OF_GPIO=y +CONFIG_OF_GPIO_PINCONF=y CONFIG_OF_BAREBOX_DRIVERS=y # CONFIG_OF_BAREBOX_ENV_IN_FS is not set CONFIG_OF_OVERLAY=y @@ -780,6 +781,8 @@ CONFIG_GPIOLIB=y # # GPIO # +CONFIG_HAVE_GPIO_PINCONF=y +CONFIG_GPIO_PINCONF=y # CONFIG_GPIO_74164 is not set # CONFIG_GPIO_74XX_MMIO is not set # CONFIG_GPIO_GENERIC_PLATFORM is not set @@ -1001,6 +1004,7 @@ CONFIG_FONT_8x16=y # CONFIG_FONT_7x14 is not set # CONFIG_FONT_MINI_4x6 is not set # CONFIG_FONT_CUSTOM_16X is not set +# CONFIG_FONT_TER16x32 is not set # CONFIG_FONT_6x8 is not set CONFIG_FONT_AUTOSELECT=y # CONFIG_BAREBOX_LOGO is not set diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0003-Makefile-add-common-boards-include-to-include-search.patch b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0003-Makefile-add-common-boards-include-to-include-search.patch index c9ef8d05..c9ae54f0 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0003-Makefile-add-common-boards-include-to-include-search.patch +++ b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0003-Makefile-add-common-boards-include-to-include-search.patch @@ -11,7 +11,7 @@ Signed-off-by: Ahmad Fatoum 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile -index 403ab3fd48dd..29d94792ffae 100644 +index 46707fb44f68..9ef8ea726d19 100644 --- a/Makefile +++ b/Makefile @@ -445,6 +445,7 @@ LINUXINCLUDE := -Iinclude \ diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0005-common-add-optional-systemd.hostname-generation.patch b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0005-common-add-optional-systemd.hostname-generation.patch index a66f756d..ca19049b 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0005-common-add-optional-systemd.hostname-generation.patch +++ b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0005-common-add-optional-systemd.hostname-generation.patch @@ -13,7 +13,7 @@ Signed-off-by: Ahmad Fatoum 2 files changed, 24 insertions(+) diff --git a/common/Kconfig b/common/Kconfig -index 4500feb66c92..06ff53e9dd95 100644 +index e505032e14d1..dcc88707bad9 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -1169,6 +1169,14 @@ config MACHINE_ID diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0009-common-add-barebox-TLV-support.patch b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0009-common-add-barebox-TLV-support.patch index 817fc631..f2e5afb8 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0009-common-add-barebox-TLV-support.patch +++ b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0009-common-add-barebox-TLV-support.patch @@ -31,7 +31,7 @@ Signed-off-by: Ahmad Fatoum create mode 100644 include/tlv/tlv.h diff --git a/common/Kconfig b/common/Kconfig -index 06ff53e9dd95..237109d57be0 100644 +index dcc88707bad9..43e62f94b73e 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -1094,6 +1094,30 @@ config BTHREAD @@ -66,7 +66,7 @@ index 06ff53e9dd95..237109d57be0 100644 bool "generic state infrastructure" select CRC32 diff --git a/common/Makefile b/common/Makefile -index e88f60b6d762..0e7c98ae9d3c 100644 +index e66dc04bd874..fc7ad83d95d7 100644 --- a/common/Makefile +++ b/common/Makefile @@ -67,6 +67,7 @@ obj-$(CONFIG_RESET_SOURCE) += reset_source.o @@ -76,7 +76,7 @@ index e88f60b6d762..0e7c98ae9d3c 100644 +obj-$(CONFIG_TLV) += tlv/ obj-$(CONFIG_RATP) += ratp/ obj-$(CONFIG_BOOTCHOOSER) += bootchooser.o - obj-$(CONFIG_UIMAGE) += image.o uimage.o + obj-$(CONFIG_UIMAGE) += uimage_types.o uimage.o diff --git a/common/tlv/Makefile b/common/tlv/Makefile new file mode 100644 index 000000000000..ea982f229a08 diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0010-commands-add-TLV-debugging-command.patch b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0010-commands-add-TLV-debugging-command.patch index 45ecf2d8..65dd9fd5 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0010-commands-add-TLV-debugging-command.patch +++ b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0010-commands-add-TLV-debugging-command.patch @@ -14,7 +14,7 @@ Signed-off-by: Ahmad Fatoum create mode 100644 commands/tlv.c diff --git a/commands/Kconfig b/commands/Kconfig -index 0c1de7606ea1..197b97042720 100644 +index 4a0486861186..cc3c95def257 100644 --- a/commands/Kconfig +++ b/commands/Kconfig @@ -2466,6 +2466,18 @@ config CMD_STATE diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0102-ARM-stm32mp-add-Linux-Automation-TAC-board.patch b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0102-ARM-stm32mp-add-Linux-Automation-TAC-board.patch index 4c3667f0..349490d5 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0102-ARM-stm32mp-add-Linux-Automation-TAC-board.patch +++ b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0102-ARM-stm32mp-add-Linux-Automation-TAC-board.patch @@ -14,15 +14,15 @@ Signed-off-by: Rouven Czerwinski --- arch/arm/boards/Makefile | 1 + arch/arm/boards/lxa-tac/Makefile | 2 + - arch/arm/boards/lxa-tac/board.c | 48 ++++++++ - arch/arm/boards/lxa-tac/lowlevel.c | 68 ++++++++++++ + arch/arm/boards/lxa-tac/board.c | 48 +++++++++++ + arch/arm/boards/lxa-tac/lowlevel.c | 68 +++++++++++++++ arch/arm/dts/Makefile | 1 + arch/arm/dts/stm32mp157c-lxa-tac-gen1.dts | 7 ++ - arch/arm/dts/stm32mp157c-lxa-tac-gen2.dts | 38 +++++++ - arch/arm/dts/stm32mp15xc-lxa-tac.dtsi | 175 ++++++++++++++++++++++++++++++ - arch/arm/mach-stm32mp/Kconfig | 5 + + arch/arm/dts/stm32mp157c-lxa-tac-gen2.dts | 38 ++++++++ + arch/arm/dts/stm32mp15xc-lxa-tac.dtsi | 138 ++++++++++++++++++++++++++++++ + arch/arm/mach-stm32mp/Kconfig | 5 ++ images/Makefile.stm32mp | 4 + - 10 files changed, 349 insertions(+) + 10 files changed, 312 insertions(+) create mode 100644 arch/arm/boards/lxa-tac/Makefile create mode 100644 arch/arm/boards/lxa-tac/board.c create mode 100644 arch/arm/boards/lxa-tac/lowlevel.c @@ -179,7 +179,7 @@ index 000000000000..bb0600b4d66c + select_fdt_and_start((void *)r2); +} diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile -index 68585e1e4b1d..9c9e211728e6 100644 +index 3b3236b4165f..1bac17112340 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -149,6 +149,7 @@ lwl-$(CONFIG_MACH_STM32MP15XX_DKX) += stm32mp157c-dk2.dtb.o stm32mp157a-dk1.dtb. @@ -249,10 +249,10 @@ index 000000000000..f5261203f8ef +}; diff --git a/arch/arm/dts/stm32mp15xc-lxa-tac.dtsi b/arch/arm/dts/stm32mp15xc-lxa-tac.dtsi new file mode 100644 -index 000000000000..5a07ad7996e6 +index 000000000000..33f83e035457 --- /dev/null +++ b/arch/arm/dts/stm32mp15xc-lxa-tac.dtsi -@@ -0,0 +1,175 @@ +@@ -0,0 +1,138 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +/* + * Copyright (C) 2020 Ahmad Fatoum, Pengutronix @@ -346,43 +346,6 @@ index 000000000000..5a07ad7996e6 + }; +}; + -+/* -+ * There are two bindings for pin bias: -+ -+ * - The pinctrl binding, which differs from controller to controller, -+ * but is capable of representing controller specific attributes like -+ * pull ups of varying strength. This is used via -+ * pinctrl-names/pinctrl-[0-9]+ DT properties -+ * -+ * - Or-ing GPIO_PULL_UP or GPIO_PULL_DOWN into the GPIO flags after the -+ * phandle, e.g. gpios = <&gpioe 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; -+ * Thix can expose a generic interface, but doesn't allow fine tuning. -+ * -+ * Not all Linux drivers support the second binding and barebox doesn't -+ * support it all; It requires pinctrl drivers to expose to the core -+ * a way to configure pull ups/pull downs, but we don't export this info. -+ * Instead drivers are called with the device tree node in action and -+ * instructed to apply it. -+ * -+ * We can add support for this binding for STM32 only as first step, but -+ * till then, let's just use the first binding instead to configure the -+ * GPIO pull-ups. -+ */ -+&{/gpio-keys} { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&lxatac_gpio_key_pins>; -+}; -+ -+&pinctrl { -+ lxatac_gpio_key_pins: lxatac-gpio-key-pins { -+ pins { -+ pinmux = , /* USER_BTN2 */ -+ ; /* USER_BTN */ -+ bias-pull-up; -+ }; -+ }; -+}; -+ +&baseboard_eeprom { + #address-cells = <1>; + #size-cells = <1>; diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0103-ARM-stm32mp-add-Linux-Automation-TAC-Generation-3.patch b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0103-ARM-stm32mp-add-Linux-Automation-TAC-Generation-3.patch index f8f42ce9..1f66c415 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0103-ARM-stm32mp-add-Linux-Automation-TAC-Generation-3.patch +++ b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0103-ARM-stm32mp-add-Linux-Automation-TAC-Generation-3.patch @@ -68,7 +68,7 @@ index bb0600b4d66c..bfb7aca29917 100644 stm32mp1_barebox_entry(fdt); diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile -index 9c9e211728e6..a260eb2ef34b 100644 +index 1bac17112340..bcdc8d607c35 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -149,7 +149,8 @@ lwl-$(CONFIG_MACH_STM32MP15XX_DKX) += stm32mp157c-dk2.dtb.o stm32mp157a-dk1.dtb. diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0301-Release-2024.09.0-customers-lxa-tac-20240919-1.patch b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0201-Release-2024.10.0-customers-lxa-tac-20241018-1.patch similarity index 61% rename from meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0301-Release-2024.09.0-customers-lxa-tac-20240919-1.patch rename to meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0201-Release-2024.10.0-customers-lxa-tac-20241018-1.patch index 4c6951e5..c6739609 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0301-Release-2024.09.0-customers-lxa-tac-20240919-1.patch +++ b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0201-Release-2024.10.0-customers-lxa-tac-20241018-1.patch @@ -1,21 +1,21 @@ From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= -Date: Thu, 19 Sep 2024 14:21:41 +0200 -Subject: [PATCH] Release 2024.09.0/customers/lxa/tac/20240919-1 +Date: Fri, 18 Oct 2024 15:31:31 +0200 +Subject: [PATCH] Release 2024.10.0/customers/lxa/tac/20241018-1 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 29d94792ffae..fb62e525f9c5 100644 +index 9ef8ea726d19..4c37ef4b2c58 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ VERSION = 2024 - PATCHLEVEL = 09 + PATCHLEVEL = 10 SUBLEVEL = 0 -EXTRAVERSION = -+EXTRAVERSION =-20240919-1 ++EXTRAVERSION =-20241018-1 NAME = None # *DOCUMENTATION* diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0201-fastboot-print-all-variables-only-on-getvar-all-and-.patch b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0201-fastboot-print-all-variables-only-on-getvar-all-and-.patch deleted file mode 100644 index cbb279ee..00000000 --- a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0201-fastboot-print-all-variables-only-on-getvar-all-and-.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: Ahmad Fatoum -Date: Fri, 9 Aug 2024 16:19:57 +0200 -Subject: [PATCH] fastboot: print all variables only on getvar:all and not its - prefixes - -strcmp_l1 compares up to the length of the first arguments, i.e. it does -a prefix check. For this, the prefix, which is usually a string literal, -needs to be the first argument. - -The check for getvar:all doesn't follow this with the result that all of - - fastboot getvar 'all' - fastboot getvar 'al' - fastboot getvar 'a' - fastboot getvar '' - -behave the same. This undocumented quirk is most likely unintended, so -let's replace this with an actual equality check. - -Note that strcmp_l1 also does a NULL-ness check. This is safe to remove, -as explained in the follow-up commit. - -Signed-off-by: Ahmad Fatoum -Link: https://lore.barebox.org/20240809141959.313914-1-a.fatoum@pengutronix.de -Signed-off-by: Sascha Hauer ---- - common/fastboot.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/common/fastboot.c b/common/fastboot.c -index 532286703089..e85cc6d8aaf8 100644 ---- a/common/fastboot.c -+++ b/common/fastboot.c -@@ -312,7 +312,7 @@ static void cb_getvar(struct fastboot *fb, const char *cmd) - - pr_debug("getvar: \"%s\"\n", cmd); - -- if (!strcmp_l1(cmd, "all")) { -+ if (!strcmp(cmd, "all")) { - list_for_each_entry(var, &fb->variables, list) - fastboot_tx_print(fb, FASTBOOT_MSG_INFO, "%s: %s", - var->name, var->value); diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0202-fastboot-retire-strcmp_l1-in-favor-of-str_has_prefix.patch b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0202-fastboot-retire-strcmp_l1-in-favor-of-str_has_prefix.patch deleted file mode 100644 index 1132cc82..00000000 --- a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0202-fastboot-retire-strcmp_l1-in-favor-of-str_has_prefix.patch +++ /dev/null @@ -1,72 +0,0 @@ -From: Ahmad Fatoum -Date: Fri, 9 Aug 2024 16:19:58 +0200 -Subject: [PATCH] fastboot: retire strcmp_l1 in favor of str_has_prefix - -strcmp_l1 is basically str_has_prefix with inverted arguments and a -NULL check. - -We don't need the NULL check as cmdbuf and cmd->cmd should always be -non-NULL: The former is the address of an array populated by fastboot -network or USB code and the latter is a pointer to a string literal. - -So let's codify the assumption that cmdbuf is not NULL into the -prototype and replace strcmp_l1 with str_has_prefix. This has the added -benefit that str_has_prefix returns the length of the prefix, which -saves us a repeated call to strlen(cmd->cmd); - -Signed-off-by: Ahmad Fatoum -Link: https://lore.barebox.org/20240809141959.313914-2-a.fatoum@pengutronix.de -Signed-off-by: Sascha Hauer ---- - common/fastboot.c | 14 +++++--------- - include/fastboot.h | 3 ++- - 2 files changed, 7 insertions(+), 10 deletions(-) - -diff --git a/common/fastboot.c b/common/fastboot.c -index e85cc6d8aaf8..dc66d7123b02 100644 ---- a/common/fastboot.c -+++ b/common/fastboot.c -@@ -287,13 +287,6 @@ static void cb_reboot(struct fastboot *fb, const char *cmd) - restart_machine(); - } - --static int strcmp_l1(const char *s1, const char *s2) --{ -- if (!s1 || !s2) -- return -1; -- return strncmp(s1, s2, strlen(s1)); --} -- - static void cb_getvar(struct fastboot *fb, const char *cmd) - { - struct fb_variable *var; -@@ -815,10 +808,13 @@ static void fb_run_command(struct fastboot *fb, const char *cmdbuf, - console_countdown_abort("fastboot"); - - for (i = 0; i < num_commands; i++) { -+ size_t cmdlen; -+ - cmd = &cmds[i]; - -- if (!strcmp_l1(cmd->cmd, cmdbuf)) { -- cmd->cb(fb, cmdbuf + strlen(cmd->cmd)); -+ cmdlen = str_has_prefix(cmdbuf, cmd->cmd); -+ if (cmdlen) { -+ cmd->cb(fb, cmdbuf + cmdlen); - - return; - } -diff --git a/include/fastboot.h b/include/fastboot.h -index cd415847e348..4b2fdf3190b2 100644 ---- a/include/fastboot.h -+++ b/include/fastboot.h -@@ -87,7 +87,8 @@ int fastboot_tx_print(struct fastboot *fb, enum fastboot_msg_type type, - const char *fmt, ...); - void fastboot_start_download_generic(struct fastboot *fb); - void fastboot_download_finished(struct fastboot *fb); --void fastboot_exec_cmd(struct fastboot *fb, const char *cmdbuf); -+void fastboot_exec_cmd(struct fastboot *fb, const char *cmdbuf) -+ __attribute__((nonnull)); - void fastboot_abort(struct fastboot *fb); - - #endif diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0203-fastboot-avoid-console_countdown_abort-for-getvar-re.patch b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0203-fastboot-avoid-console_countdown_abort-for-getvar-re.patch deleted file mode 100644 index a4479592..00000000 --- a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0203-fastboot-avoid-console_countdown_abort-for-getvar-re.patch +++ /dev/null @@ -1,57 +0,0 @@ -From: Ahmad Fatoum -Date: Fri, 9 Aug 2024 16:19:59 +0200 -Subject: [PATCH] fastboot: avoid console_countdown_abort for getvar request - -We currently abort boot countdown on any fastboot communication at all -as we have the expectation that this is what the user wants. - -This doesn't hold true on systems with fwupd: The fastboot plugin probes -connected devices: - - getvar:product - getvar:version - getvar:version-bootloader - getvar:serialno - getvar:secure - -to determine whether an update is in-order. The first getvar will -automatically abort barebox boot up, which is likely not what the user -intended. - -Therefore, let's abort console countdown only for non-getvar: requests. - -Reported-by: Jonas Martin -Signed-off-by: Marco Felsch -Signed-off-by: Ahmad Fatoum -Link: https://lore.barebox.org/20240809141959.313914-3-a.fatoum@pengutronix.de -Signed-off-by: Sascha Hauer ---- - common/fastboot.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/common/fastboot.c b/common/fastboot.c -index dc66d7123b02..66b59ab9b0d7 100644 ---- a/common/fastboot.c -+++ b/common/fastboot.c -@@ -794,6 +794,11 @@ static void cb_erase(struct fastboot *fb, const char *cmd) - fastboot_tx_print(fb, FASTBOOT_MSG_OKAY, ""); - } - -+static bool fastboot_cmd_should_abort(const char *cmdbuf) -+{ -+ return !strstarts(cmdbuf, "getvar:"); -+} -+ - struct cmd_dispatch_info { - char *cmd; - void (*cb)(struct fastboot *fb, const char *opt); -@@ -805,7 +810,8 @@ static void fb_run_command(struct fastboot *fb, const char *cmdbuf, - const struct cmd_dispatch_info *cmd; - int i; - -- console_countdown_abort("fastboot"); -+ if (fastboot_cmd_should_abort(cmdbuf)) -+ console_countdown_abort("fastboot"); - - for (i = 0; i < num_commands; i++) { - size_t cmdlen; diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/series.inc b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/series.inc index c92ba3fe..30b59256 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/series.inc +++ b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/series.inc @@ -1,9 +1,9 @@ -# umpf-base: v2024.09.0 -# umpf-name: 2024.09.0/customers/lxa/tac -# umpf-version: 2024.09.0/customers/lxa/tac/20240919-1 +# umpf-base: v2024.10.0 +# umpf-name: 2024.10.0/customers/lxa/tac +# umpf-version: 2024.10.0/customers/lxa/tac/20241018-1 # umpf-topic: v2024.09.0/topic/tlv # umpf-hashinfo: 328855e48bdb9912ed99b13d817f79a90347d494 -# umpf-topic-range: 7ae6bbdfa69855ee2f46fabda6622875f408fb1c..147c498e71cb5d60b4868c2f3eaf2d5e6ca12540 +# umpf-topic-range: 1f31cde526d4e251da6464cac42ee2252643b972..9a3e1ac02b877ae8383c77541c63c3f232566eec SRC_URI += "\ file://patches/0001-scripts-implement-slurp-a-read_file-with-fd-as-argum.patch \ file://patches/0002-of_path-support-phandles-in-of_find_path.patch \ @@ -18,27 +18,19 @@ SRC_URI += "\ file://patches/0011-scripts-add-bareboxtlv-host-target-tool.patch \ " # umpf-topic: v2024.09.0/customers/lxa/tac -# umpf-hashinfo: 716a5ca90640f5aecf0c96e7993d05c2ef885f33 -# umpf-topic-range: 147c498e71cb5d60b4868c2f3eaf2d5e6ca12540..430d11d834bc265f559d962a2d22b274791d3b51 +# umpf-hashinfo: 0400cb4b2d51a576d3fe663bbf74a1c3f5858dc3 +# umpf-topic-range: 9a3e1ac02b877ae8383c77541c63c3f232566eec..8f0fd668eb6c040651cffda27e8547108b0f23fe SRC_URI += "\ file://patches/0101-boards-add-decoder-for-LXA-TLV-v1-format.patch \ file://patches/0102-ARM-stm32mp-add-Linux-Automation-TAC-board.patch \ file://patches/0103-ARM-stm32mp-add-Linux-Automation-TAC-Generation-3.patch \ " -# umpf-topic: v2024.09.0/topic/fastboot -# umpf-hashinfo: 061a6052949159ef03e8d138707ec21d3fb342f8 -# umpf-topic-range: 430d11d834bc265f559d962a2d22b274791d3b51..fced5cf3f44adffde53ee59c3685352576181d44 +# umpf-release: 2024.10.0/customers/lxa/tac/20241018-1 +# umpf-topic-range: 8f0fd668eb6c040651cffda27e8547108b0f23fe..d34362cdd815c983aa6216d9c011627f03576180 SRC_URI += "\ - file://patches/0201-fastboot-print-all-variables-only-on-getvar-all-and-.patch \ - file://patches/0202-fastboot-retire-strcmp_l1-in-favor-of-str_has_prefix.patch \ - file://patches/0203-fastboot-avoid-console_countdown_abort-for-getvar-re.patch \ + file://patches/0201-Release-2024.10.0-customers-lxa-tac-20241018-1.patch \ " -# umpf-release: 2024.09.0/customers/lxa/tac/20240919-1 -# umpf-topic-range: fced5cf3f44adffde53ee59c3685352576181d44..fa8d7445ec861a2282579a096ea1d82c0672551d -SRC_URI += "\ - file://patches/0301-Release-2024.09.0-customers-lxa-tac-20240919-1.patch \ - " -UMPF_BASE = "2024.09.0" -UMPF_VERSION = "20240919-1" +UMPF_BASE = "2024.10.0" +UMPF_VERSION = "20241018-1" UMPF_PV = "${UMPF_BASE}-${UMPF_VERSION}" # umpf-end From 37af1ed222e549f458ab31660ed0aeb8f57afec2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Wed, 30 Oct 2024 10:38:08 +0100 Subject: [PATCH 22/61] meta-lxatac-software: imx-uuu: use meta-oe libtinyxml2 instead of local MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This allows us to drop our own tinyxml2 recipe in the next step and also aligns the recipe with the uuu recipe in meta-freescale. Signed-off-by: Leonard Göhrs --- meta-lxatac-software/recipes-support/imx-uuu/imx-uuu_1.5.182.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-lxatac-software/recipes-support/imx-uuu/imx-uuu_1.5.182.bb b/meta-lxatac-software/recipes-support/imx-uuu/imx-uuu_1.5.182.bb index 26c40282..9003ba03 100644 --- a/meta-lxatac-software/recipes-support/imx-uuu/imx-uuu_1.5.182.bb +++ b/meta-lxatac-software/recipes-support/imx-uuu/imx-uuu_1.5.182.bb @@ -12,6 +12,6 @@ inherit cmake pkgconfig S = "${WORKDIR}/uuu-uuu_${PV}" -DEPENDS = "libusb zlib bzip2 openssl tinyxml2" +DEPENDS = "libusb zlib bzip2 openssl libtinyxml2" BBCLASSEXTEND = "native nativesdk" From 062be67f7fa3c15f80a7f8809c56e3db6764eae5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Wed, 30 Oct 2024 10:43:15 +0100 Subject: [PATCH 23/61] meta-lxatac-software: tinyxml2: remove recipe MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The recipe was introduced under the false assumption that tinyxml2 has not been packaged. It is though and has been for quite some time as libtinyxml2 in meta-oe. This means there is no reason to keep our local recipe. Signed-off-by: Leonard Göhrs --- .../recipes-support/tinyxml2/tinyxml2_10.0.0.bb | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 meta-lxatac-software/recipes-support/tinyxml2/tinyxml2_10.0.0.bb diff --git a/meta-lxatac-software/recipes-support/tinyxml2/tinyxml2_10.0.0.bb b/meta-lxatac-software/recipes-support/tinyxml2/tinyxml2_10.0.0.bb deleted file mode 100644 index 235da984..00000000 --- a/meta-lxatac-software/recipes-support/tinyxml2/tinyxml2_10.0.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=135624eef03e1f1101b9ba9ac9b5fffd" - -SRC_URI += "git://github.com/leethomason/tinyxml2.git;protocol=https;branch=master" -SRCREV = "321ea883b7190d4e85cae5512a12e5eaa8f8731f" - -S = "${WORKDIR}/git" - -inherit cmake From eb2082af56f58c04074531d3a5746585507584ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Tue, 29 Oct 2024 13:04:38 +0100 Subject: [PATCH 24/61] meta-lxatac-software: panel-mipi-dbi-native: rename to ..._git.bb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The upstream project did not have a release yet (the SRCREV we use is indeed only the second commit in the repository). Indicate that with a `_git` version suffix. Signed-off-by: Leonard Göhrs --- .../{panel-mipi-dbi-native.bb => panel-mipi-dbi-native_git.bb} | 1 - 1 file changed, 1 deletion(-) rename meta-lxatac-software/recipes-graphics/panel-mipi-dbi/{panel-mipi-dbi-native.bb => panel-mipi-dbi-native_git.bb} (96%) diff --git a/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/panel-mipi-dbi-native.bb b/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/panel-mipi-dbi-native_git.bb similarity index 96% rename from meta-lxatac-software/recipes-graphics/panel-mipi-dbi/panel-mipi-dbi-native.bb rename to meta-lxatac-software/recipes-graphics/panel-mipi-dbi/panel-mipi-dbi-native_git.bb index 938fa550..33e09256 100644 --- a/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/panel-mipi-dbi-native.bb +++ b/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/panel-mipi-dbi-native_git.bb @@ -2,7 +2,6 @@ SUMMARY = "Tool to make firmware files for the Linux display driver panel-mipi-d LICENSE = "CC0-1.0" LIC_FILES_CHKSUM = "file://mipi-dbi-cmd;beginline=4;endline=13;md5=5e3d3f14cc87aa9e8976d728520cbcae" SRCREV = "374b15f78611c619c381c643c5b3a8b5d23f479b" -PV = "1.0+git${SRCPV}" SRC_URI = "git://github.com/notro/panel-mipi-dbi.git;protocol=https;branch=main \ file://0001-Use-python3-in-shebang.patch \ From af3fe8f2d626d5bb77f74b9e32137f4bab12c8c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Tue, 29 Oct 2024 13:08:17 +0100 Subject: [PATCH 25/61] meta-lxatac-software: panel-mipi-dbi-native: update to current HEAD MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The `python3` shebang has been mainlined, so there is no need to carry it locally anymore. This is the only change in this update. Signed-off-by: Leonard Göhrs --- .../files/0001-Use-python3-in-shebang.patch | 26 ------------------- .../panel-mipi-dbi-native_git.bb | 6 ++--- 2 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 meta-lxatac-software/recipes-graphics/panel-mipi-dbi/files/0001-Use-python3-in-shebang.patch diff --git a/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/files/0001-Use-python3-in-shebang.patch b/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/files/0001-Use-python3-in-shebang.patch deleted file mode 100644 index 1e420d49..00000000 --- a/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/files/0001-Use-python3-in-shebang.patch +++ /dev/null @@ -1,26 +0,0 @@ -From bde85515a85324282297e3ee291372934903b849 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= -Date: Mon, 27 Mar 2023 15:45:03 +0200 -Subject: [PATCH] Use python3 in shebang -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In yocto we do not have something like python-is-python3 so we have to -manually select a non-history python version. - -Signed-off-by: Leonard Göhrs ---- - mipi-dbi-cmd | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mipi-dbi-cmd b/mipi-dbi-cmd -index 7655530..9f15a50 100755 ---- a/mipi-dbi-cmd -+++ b/mipi-dbi-cmd -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - - # SPDX-License-Identifier: CC0-1.0 diff --git a/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/panel-mipi-dbi-native_git.bb b/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/panel-mipi-dbi-native_git.bb index 33e09256..87e83200 100644 --- a/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/panel-mipi-dbi-native_git.bb +++ b/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/panel-mipi-dbi-native_git.bb @@ -1,11 +1,9 @@ SUMMARY = "Tool to make firmware files for the Linux display driver panel-mipi-dbi." LICENSE = "CC0-1.0" LIC_FILES_CHKSUM = "file://mipi-dbi-cmd;beginline=4;endline=13;md5=5e3d3f14cc87aa9e8976d728520cbcae" -SRCREV = "374b15f78611c619c381c643c5b3a8b5d23f479b" +SRCREV = "1cbd40135a8c7f25d7b444a7fac77fd3c3ad471e" -SRC_URI = "git://github.com/notro/panel-mipi-dbi.git;protocol=https;branch=main \ - file://0001-Use-python3-in-shebang.patch \ - " +SRC_URI = "git://github.com/notro/panel-mipi-dbi.git;protocol=https;branch=main" S = "${WORKDIR}/git" From be8581f802eed8f46d7bb10b430c9fa172c3d871 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Tue, 29 Oct 2024 13:12:55 +0100 Subject: [PATCH 26/61] meta-lxatac-software: panel-mipi-dbi-native: improve package metadata MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update `SUMMARY`, `DESCRIPTION`, `HOMEPAGE` and `SECTION` in preparation to mainlining of the recipe to meta-openembedded. Signed-off-by: Leonard Göhrs --- .../panel-mipi-dbi/panel-mipi-dbi-native_git.bb | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/panel-mipi-dbi-native_git.bb b/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/panel-mipi-dbi-native_git.bb index 87e83200..0e88e84a 100644 --- a/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/panel-mipi-dbi-native_git.bb +++ b/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/panel-mipi-dbi-native_git.bb @@ -1,4 +1,14 @@ -SUMMARY = "Tool to make firmware files for the Linux display driver panel-mipi-dbi." +SUMMARY = "Firmware file compiler for the panel-mipi-dbi display driver" +DESCRIPTION = "The panel-mipi-dbi Linux display driver allows using the same \ + driver for most MIPI DBI based display panels. \ + This means many displays attached via SPI, even if the \ + datasheet does not explicitly mention DBI support. \ + To do so it uses tiny firmware files that contain \ + display/controller-specific initialization commands. \ + The mipi-dbi-cmd tool compiles these firmware files from a \ + text format to a firmware blob format." +HOMEPAGE = "https://github.com/notro/panel-mipi-dbi" +SECTION = "graphics" LICENSE = "CC0-1.0" LIC_FILES_CHKSUM = "file://mipi-dbi-cmd;beginline=4;endline=13;md5=5e3d3f14cc87aa9e8976d728520cbcae" SRCREV = "1cbd40135a8c7f25d7b444a7fac77fd3c3ad471e" From 0fd8f125600df41f8c33773cd14ff5785b700d00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Tue, 29 Oct 2024 13:15:43 +0100 Subject: [PATCH 27/61] meta-lxatac-software: classes: panel-mipi-dbi: add usage documentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make the class more usable to the general public in preparation to mainlining to meta-openembedded. Signed-off-by: Leonard Göhrs --- .../classes/panel-mipi-dbi.bbclass | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/meta-lxatac-software/classes/panel-mipi-dbi.bbclass b/meta-lxatac-software/classes/panel-mipi-dbi.bbclass index ed99fd9e..2e7e2a3b 100644 --- a/meta-lxatac-software/classes/panel-mipi-dbi.bbclass +++ b/meta-lxatac-software/classes/panel-mipi-dbi.bbclass @@ -1,3 +1,32 @@ +# SPDX-License-Identifier: MIT +# +# Copyright Pengutronix +# +# Class to generate firmware files for use with the `panel-mipi-dbi` Linux +# driver. +# +# The firmware source file contains a list of commands to send to the display +# controller in order to initialize it: +# +# $ cat shineworld,lh133k.txt +# command 0x11 # exit sleep mode +# delay 120 +# +# # Enable color inversion +# command 0x21 # INVON +# ... +# +# A recipe to compile such a command list into a firmware blob for use with +# the `panel-mipi-dbi` driver looks something like this: +# +# $ cat panel-shineworld-lh133k.bb +# inherit panel-mipi-dbi +# +# SRC_URI = "file://${PANEL_FIRMWARE}" +# +# PANEL_FIRMWARE = "shineworld,lh133k.txt" +# ... + DEPENDS = "panel-mipi-dbi-native" PANEL_FIRMWARE_BIN ?= "${@d.getVar('PANEL_FIRMWARE').removesuffix('.txt')}.bin" From 3c816d38fa55b5e790ddcec25dbbc09d0994a3ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Tue, 29 Oct 2024 13:03:29 +0100 Subject: [PATCH 28/61] meta-lxatac-software: panel-shineworld-lh133k: update to match bbclass doc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The `panel-mipi-dbi.bbclass` documentation has the `inherit` at the top of the file so we should do so as well. Signed-off-by: Leonard Göhrs --- .../recipes-graphics/panel-mipi-dbi/panel-shineworld-lh133k.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/panel-shineworld-lh133k.bb b/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/panel-shineworld-lh133k.bb index 36969331..e175fb34 100644 --- a/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/panel-shineworld-lh133k.bb +++ b/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/panel-shineworld-lh133k.bb @@ -1,3 +1,5 @@ +inherit panel-mipi-dbi + SUMMARY = "Shineworld Panel Configuration" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" @@ -5,4 +7,3 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda PANEL_FIRMWARE = "shineworld,lh133k.txt" SRC_URI = "file://${PANEL_FIRMWARE}" -inherit panel-mipi-dbi From e345f20fbe07d686e93f8640f872074ff98e9187 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2024 14:34:48 +0000 Subject: [PATCH 29/61] meta-*: bump poky from `200d12b` to `2f136ed` in the layers group Bumps the layers group with 1 update: poky. Updates `poky` from `200d12b` to `2f136ed` --- updated-dependencies: - dependency-name: poky dependency-type: direct:production dependency-group: layers ... Signed-off-by: dependabot[bot] --- poky | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/poky b/poky index 200d12b6..2f136ed7 160000 --- a/poky +++ b/poky @@ -1 +1 @@ -Subproject commit 200d12b6a58ad961d60a7774ca0f7a9d29498724 +Subproject commit 2f136ed7ed372a5eceb68cb6e1cdbc01c90b88d4 From 294afc726b67c25ffb0eb3154ad8300ae44f2dc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 1 Nov 2024 07:19:22 +0100 Subject: [PATCH 30/61] meta-lxatac-software: classes: panel-mipi-dbi: compile to B not WORKDIR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit According to the Variable glossary[1] `B` is: The directory within the Build Directory in which the OpenEmbedded build system places generated objects during a recipe’s build process. [1]: https://docs.yoctoproject.org/ref-manual/variables.html#term-B Signed-off-by: Leonard Göhrs --- meta-lxatac-software/classes/panel-mipi-dbi.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-lxatac-software/classes/panel-mipi-dbi.bbclass b/meta-lxatac-software/classes/panel-mipi-dbi.bbclass index 2e7e2a3b..06c90081 100644 --- a/meta-lxatac-software/classes/panel-mipi-dbi.bbclass +++ b/meta-lxatac-software/classes/panel-mipi-dbi.bbclass @@ -35,13 +35,13 @@ do_configure[noexec] = "1" do_compile () { mipi-dbi-cmd \ - "${WORKDIR}/${PANEL_FIRMWARE_BIN}" \ + "${B}/${PANEL_FIRMWARE_BIN}" \ "${WORKDIR}/${PANEL_FIRMWARE}" } do_install () { install -m 0644 -D \ - "${WORKDIR}/${PANEL_FIRMWARE_BIN}" \ + "${B}/${PANEL_FIRMWARE_BIN}" \ "${D}${nonarch_base_libdir}/firmware/${PANEL_FIRMWARE_BIN}" } From 5407a9d67f7090cc32e5e517a249f3279cbd2302 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2024 14:38:10 +0000 Subject: [PATCH 31/61] meta-*: bump the layers group with 2 updates Bumps the layers group with 2 updates: [meta-virtualization](https://github.com/lgirdk/meta-virtualization) and poky. Updates `meta-virtualization` from `6f3c1d8` to `ee27999` - [Commits](https://github.com/lgirdk/meta-virtualization/compare/6f3c1d8f90947408a6587be222fec575a1ca5195...ee27999aa1e0f863f140d079c2659ea15c895cd5) Updates `poky` from `2f136ed` to `3198afa` --- updated-dependencies: - dependency-name: meta-virtualization dependency-type: direct:production dependency-group: layers - dependency-name: poky dependency-type: direct:production dependency-group: layers ... Signed-off-by: dependabot[bot] --- meta-virtualization | 2 +- poky | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-virtualization b/meta-virtualization index 6f3c1d8f..ee27999a 160000 --- a/meta-virtualization +++ b/meta-virtualization @@ -1 +1 @@ -Subproject commit 6f3c1d8f90947408a6587be222fec575a1ca5195 +Subproject commit ee27999aa1e0f863f140d079c2659ea15c895cd5 diff --git a/poky b/poky index 2f136ed7..3198afac 160000 --- a/poky +++ b/poky @@ -1 +1 @@ -Subproject commit 2f136ed7ed372a5eceb68cb6e1cdbc01c90b88d4 +Subproject commit 3198afac8770abf3f9c4582aecb6bac2ab291718 From a9a9b1ab885bda114c96873c7c459d253ccea699 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Wed, 30 Oct 2024 10:58:56 +0100 Subject: [PATCH 32/61] meta-lxatac-software: bcu: update metadata in preparation for upstreaming MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Leonard Göhrs --- meta-lxatac-software/recipes-devtools/bcu/bcu_1.1.92.bb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/meta-lxatac-software/recipes-devtools/bcu/bcu_1.1.92.bb b/meta-lxatac-software/recipes-devtools/bcu/bcu_1.1.92.bb index 5c513e6c..ec133d80 100644 --- a/meta-lxatac-software/recipes-devtools/bcu/bcu_1.1.92.bb +++ b/meta-lxatac-software/recipes-devtools/bcu/bcu_1.1.92.bb @@ -1,4 +1,11 @@ -SUMMARY = "Board Remote Control Utilities" +SUMMARY = "NXP Board Control Utilities" +DESCRIPTION = "The NXP Board Control Utilities are able to control various \ + features of NXP i.MX evaluation boards (EVK) from a host \ + computer. \ + Features like resetting the board, selecting the boot mode, \ + monitoring power consumption, programming the EEPROM and others" +HOMEPAGE = "https://github.com/nxp-imx/bcu" +SECTION = "devel" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=884d48c2aa7b82e1ad4a33909fab24b6" From 4ccef57e521ca96ea4c28a84ec7658866490dc8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Wed, 30 Oct 2024 11:03:28 +0100 Subject: [PATCH 33/61] meta-lxatac-software: bcu: enable building bcu-native for use on host MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is not really relevant for the LXA TAC or meta-lxatac in general, because the LXA TAC is not an i.MX EVK board. But it makes sense in the context of upstreaming the recipe to some other layer, where users may want to use `oe-run-native bcu-native bcu` to control an EVK board. Signed-off-by: Leonard Göhrs --- meta-lxatac-software/recipes-devtools/bcu/bcu_1.1.92.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-lxatac-software/recipes-devtools/bcu/bcu_1.1.92.bb b/meta-lxatac-software/recipes-devtools/bcu/bcu_1.1.92.bb index ec133d80..7959be15 100644 --- a/meta-lxatac-software/recipes-devtools/bcu/bcu_1.1.92.bb +++ b/meta-lxatac-software/recipes-devtools/bcu/bcu_1.1.92.bb @@ -20,3 +20,4 @@ DEPENDS = "curl libyaml libusb1 openssl libftdi" inherit cmake pkgconfig +BBCLASSEXTEND = "native nativesdk" From dcfb572deefd4712f545f6cf3b55a1740a62e984 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Wed, 30 Oct 2024 11:07:59 +0100 Subject: [PATCH 34/61] meta-lxatac-software: bcu: update from 1.1.92 to 1.1.100 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Leonard Göhrs --- .../recipes-devtools/bcu/{bcu_1.1.92.bb => bcu_1.1.100.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-lxatac-software/recipes-devtools/bcu/{bcu_1.1.92.bb => bcu_1.1.100.bb} (94%) diff --git a/meta-lxatac-software/recipes-devtools/bcu/bcu_1.1.92.bb b/meta-lxatac-software/recipes-devtools/bcu/bcu_1.1.100.bb similarity index 94% rename from meta-lxatac-software/recipes-devtools/bcu/bcu_1.1.92.bb rename to meta-lxatac-software/recipes-devtools/bcu/bcu_1.1.100.bb index 7959be15..bf6e4f4b 100644 --- a/meta-lxatac-software/recipes-devtools/bcu/bcu_1.1.92.bb +++ b/meta-lxatac-software/recipes-devtools/bcu/bcu_1.1.100.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=884d48c2aa7b82e1ad4a33909fab24b6" SRC_URI = "git://github.com/nxp-imx/bcu;protocol=https;branch=master \ file://0001-CMakeLists-do-not-use-vendored-libcurl.patch \ " -SRCREV = "04fecca3706896820c0119538c7545cbe52e85ed" +SRCREV = "c34d89b29f3d0d12793cd78b194d2f1d11728baf" S = "${WORKDIR}/git" From 36866f463188b7d319eddcb38a889ffbf788aa2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Mon, 11 Nov 2024 09:37:39 +0100 Subject: [PATCH 35/61] meta-lxatac-bsp: linux-lxatac: add aliases for can/i2c/spi and disable rtc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The aliases ensure a stable numbering of the can / i2c / spi devices. This solves an issue we have started to observe with Linux 6.11, where the SPI bus numbers have changed/are no longer stable between boots. The other change is disabling the RTC node, since it could not be used anyways because the RTC is missing a 32.768 kHz clock crystal. Signed-off-by: Leonard Göhrs --- ...stm32-lxa-tac-extend-the-alias-table.patch | 43 +++++++++++++++++++ ...-lxa-tac-disable-the-real-time-clock.patch | 34 +++++++++++++++ ....11-customers-lxa-lxatac-20241111-1.patch} | 8 ++-- .../linux/files/patches/series.inc | 16 ++++--- 4 files changed, 90 insertions(+), 11 deletions(-) create mode 100644 meta-lxatac-bsp/recipes-kernel/linux/files/patches/0103-ARM-dts-stm32-lxa-tac-extend-the-alias-table.patch create mode 100644 meta-lxatac-bsp/recipes-kernel/linux/files/patches/0104-ARM-dts-stm32-lxa-tac-disable-the-real-time-clock.patch rename meta-lxatac-bsp/recipes-kernel/linux/files/patches/{0201-Release-6.11-customers-lxa-lxatac-20240917-1.patch => 0201-Release-6.11-customers-lxa-lxatac-20241111-1.patch} (65%) diff --git a/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0103-ARM-dts-stm32-lxa-tac-extend-the-alias-table.patch b/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0103-ARM-dts-stm32-lxa-tac-extend-the-alias-table.patch new file mode 100644 index 00000000..d09b3a92 --- /dev/null +++ b/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0103-ARM-dts-stm32-lxa-tac-extend-the-alias-table.patch @@ -0,0 +1,43 @@ +From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= +Date: Mon, 11 Nov 2024 09:03:11 +0100 +Subject: [PATCH] ARM: dts: stm32: lxa-tac: extend the alias table +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Some of the userspace software and tests depend on the can/i2c/spi devices +having the same name on every boot. +This may not always be the case based on e.g. parallel probe order. + +Assign static device numbers to all can/i2c/spi devices. + +Signed-off-by: Leonard Göhrs +--- + arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi b/arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi +index ca94a1e0ff66..a8d249bdeece 100644 +--- a/arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi ++++ b/arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi +@@ -16,12 +16,20 @@ + + / { + aliases { ++ can0 = &m_can1; ++ can1 = &m_can2; + ethernet0 = ðernet0; + ethernet1 = &port_uplink; + ethernet2 = &port_dut; ++ i2c0 = &i2c1; ++ i2c1 = &i2c4; ++ i2c2 = &i2c5; + mmc1 = &sdmmc2; + serial0 = &uart4; + serial1 = &usart3; ++ spi0 = &spi2; ++ spi1 = &spi4; ++ spi2 = &spi5; + }; + + chosen { diff --git a/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0104-ARM-dts-stm32-lxa-tac-disable-the-real-time-clock.patch b/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0104-ARM-dts-stm32-lxa-tac-disable-the-real-time-clock.patch new file mode 100644 index 00000000..13815222 --- /dev/null +++ b/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0104-ARM-dts-stm32-lxa-tac-disable-the-real-time-clock.patch @@ -0,0 +1,34 @@ +From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= +Date: Mon, 11 Nov 2024 09:08:49 +0100 +Subject: [PATCH] ARM: dts: stm32: lxa-tac: disable the real time clock +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The RTC was enabled under the false assumption that the SoM already +contains a suitable 32.768 kHz crystal. +It does however not contain such a crystal and since none is fitted +externally to the SoM the RTC can not be used on the hardware. + +Reflect that in the devicetree. + +Signed-off-by: Leonard Göhrs +--- + arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi b/arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi +index a8d249bdeece..055235d0838e 100644 +--- a/arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi ++++ b/arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi +@@ -311,10 +311,6 @@ regulators { + }; + }; + +-&rtc { +- status = "okay"; +-}; +- + &sdmmc2 { + pinctrl-names = "default", "opendrain", "sleep"; + pinctrl-0 = <&sdmmc2_b4_pins_a &sdmmc2_d47_pins_b>; diff --git a/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0201-Release-6.11-customers-lxa-lxatac-20240917-1.patch b/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0201-Release-6.11-customers-lxa-lxatac-20241111-1.patch similarity index 65% rename from meta-lxatac-bsp/recipes-kernel/linux/files/patches/0201-Release-6.11-customers-lxa-lxatac-20240917-1.patch rename to meta-lxatac-bsp/recipes-kernel/linux/files/patches/0201-Release-6.11-customers-lxa-lxatac-20241111-1.patch index fb3c1335..5f47b63a 100644 --- a/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0201-Release-6.11-customers-lxa-lxatac-20240917-1.patch +++ b/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0201-Release-6.11-customers-lxa-lxatac-20241111-1.patch @@ -1,13 +1,13 @@ From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= -Date: Tue, 17 Sep 2024 15:09:19 +0200 -Subject: [PATCH] Release 6.11/customers/lxa/lxatac/20240917-1 +Date: Mon, 11 Nov 2024 09:36:12 +0100 +Subject: [PATCH] Release 6.11/customers/lxa/lxatac/20241111-1 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 34bd1d5f9672..af51b53e437d 100644 +index 34bd1d5f9672..b4fe2250a874 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ @@ -15,7 +15,7 @@ index 34bd1d5f9672..af51b53e437d 100644 PATCHLEVEL = 11 SUBLEVEL = 0 -EXTRAVERSION = -+EXTRAVERSION =-20240917-1 ++EXTRAVERSION =-20241111-1 NAME = Baby Opossum Posse # *DOCUMENTATION* diff --git a/meta-lxatac-bsp/recipes-kernel/linux/files/patches/series.inc b/meta-lxatac-bsp/recipes-kernel/linux/files/patches/series.inc index d7f773bf..fdc209ec 100644 --- a/meta-lxatac-bsp/recipes-kernel/linux/files/patches/series.inc +++ b/meta-lxatac-bsp/recipes-kernel/linux/files/patches/series.inc @@ -1,6 +1,6 @@ # umpf-base: v6.11 # umpf-name: 6.11/customers/lxa/lxatac -# umpf-version: 6.11/customers/lxa/lxatac/20240917-1 +# umpf-version: 6.11/customers/lxa/lxatac/20241111-1 # umpf-topic: v6.11/topic/reproducible-build # umpf-hashinfo: d6ed6f191343a77bfe41d7436b51dffe8bcac441 # umpf-topic-range: 98f7e32f20d28ec452afb208f9cffc08448a2652..1b888dc7203b47ea21aacbf471cd762f82f36678 @@ -8,19 +8,21 @@ SRC_URI += "\ file://patches/0001-ARM-Don-t-mention-the-full-path-of-the-source-direct.patch \ " # umpf-topic: v6.8/customers/lxa/lxatac -# umpf-hashinfo: b7d99b8a22130c95b0c6d25d6fb0d4f72bf8322e -# umpf-topic-range: 1b888dc7203b47ea21aacbf471cd762f82f36678..bb492c850a1e92262b1eece4113fb09a92c0ff1d +# umpf-hashinfo: 41e4da0d7f6a4d2ddef615f2d69fc7d6298e737e +# umpf-topic-range: 1b888dc7203b47ea21aacbf471cd762f82f36678..e3e86afd5e87a3c0d3a0441c0243709432a15d67 SRC_URI += "\ file://patches/0101-ARM-dts-stm32-lxa-tac-adjust-USB-gadget-fifo-sizes-f.patch \ file://patches/0102-ARM-dts-stm32-lxa-tac-Add-support-for-generation-3-d.patch \ + file://patches/0103-ARM-dts-stm32-lxa-tac-extend-the-alias-table.patch \ + file://patches/0104-ARM-dts-stm32-lxa-tac-disable-the-real-time-clock.patch \ " -# umpf-release: 6.11/customers/lxa/lxatac/20240917-1 -# umpf-topic-range: bb492c850a1e92262b1eece4113fb09a92c0ff1d..0c61d3807b291bd09fc8550b4be0ba00a0c73321 +# umpf-release: 6.11/customers/lxa/lxatac/20241111-1 +# umpf-topic-range: e3e86afd5e87a3c0d3a0441c0243709432a15d67..2641aafd3302692a20766af9722f17503b9c9d2a SRC_URI += "\ - file://patches/0201-Release-6.11-customers-lxa-lxatac-20240917-1.patch \ + file://patches/0201-Release-6.11-customers-lxa-lxatac-20241111-1.patch \ " UMPF_BASE = "6.11" -UMPF_VERSION = "20240917-1" +UMPF_VERSION = "20241111-1" UMPF_PV = "${UMPF_BASE}-${UMPF_VERSION}" LINUX_VERSION = "${UMPF_BASE}" # umpf-end From 6c54f723853faf8d0005efe13de2c94dd0eb59bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Tue, 12 Nov 2024 07:27:48 +0100 Subject: [PATCH 36/61] meta-lxatac-software: distro: tacos: configure VOLATILE_LOG_DIR in distro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Our preference for storing log files in a persistent location is not really machine/hardware specific but more of a distribution/software decision. Signed-off-by: Leonard Göhrs --- meta-lxatac-bsp/conf/machine/lxatac.conf | 4 ---- meta-lxatac-software/conf/distro/tacos.conf | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-lxatac-bsp/conf/machine/lxatac.conf b/meta-lxatac-bsp/conf/machine/lxatac.conf index 75f8b7f1..41d550a6 100644 --- a/meta-lxatac-bsp/conf/machine/lxatac.conf +++ b/meta-lxatac-bsp/conf/machine/lxatac.conf @@ -35,8 +35,4 @@ KERNEL_DEVICETREE = "\ # The FIT image is stored in a separate partition MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-modules" -# Don't symlink /var/log to /var/log/volatile as we do actually want -# persistent logging. -VOLATILE_LOG_DIR = "no" - MACHINE_FEATURES = "serial ext2 rtc usbhost usbgadget" diff --git a/meta-lxatac-software/conf/distro/tacos.conf b/meta-lxatac-software/conf/distro/tacos.conf index 4f1ee5a0..cb311347 100644 --- a/meta-lxatac-software/conf/distro/tacos.conf +++ b/meta-lxatac-software/conf/distro/tacos.conf @@ -40,6 +40,10 @@ USERADD_ERROR_DYNAMIC = "error" USERADD_UID_TABLES = "files/passwd" USERADD_GID_TABLES = "files/group" +# Don't symlink /var/log to /var/log/volatile as we do actually want +# persistent logging. +VOLATILE_LOG_DIR = "no" + # do not include libc variant name in tmp directory TCLIBCAPPEND = "" From 9b4744701f46d02473bf3f6ee02bebe4bc276329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Tue, 12 Nov 2024 07:48:46 +0100 Subject: [PATCH 37/61] meta-lxatac-software: distro: tacos: make /srv on the rootfs read-only MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We do not want any service to write to /srv (in the root filesystem) before the /srv partition is set up and mounted. Make the directory read only to make sure of that. Signed-off-by: Leonard Göhrs --- meta-lxatac-software/conf/distro/tacos.conf | 4 ++++ meta-lxatac-software/files/fs-perms-srv-ro.txt | 5 +++++ 2 files changed, 9 insertions(+) create mode 100644 meta-lxatac-software/files/fs-perms-srv-ro.txt diff --git a/meta-lxatac-software/conf/distro/tacos.conf b/meta-lxatac-software/conf/distro/tacos.conf index 4f1ee5a0..5fdb7830 100644 --- a/meta-lxatac-software/conf/distro/tacos.conf +++ b/meta-lxatac-software/conf/distro/tacos.conf @@ -40,6 +40,10 @@ USERADD_ERROR_DYNAMIC = "error" USERADD_UID_TABLES = "files/passwd" USERADD_GID_TABLES = "files/group" +# Mark /srv in the root filesystem as read only to prevent anyone from writing +# to it before the /srv partition is mounted. +FILESYSTEM_PERMS_TABLES += "files/fs-perms-srv-ro.txt" + # do not include libc variant name in tmp directory TCLIBCAPPEND = "" diff --git a/meta-lxatac-software/files/fs-perms-srv-ro.txt b/meta-lxatac-software/files/fs-perms-srv-ro.txt new file mode 100644 index 00000000..e9763075 --- /dev/null +++ b/meta-lxatac-software/files/fs-perms-srv-ro.txt @@ -0,0 +1,5 @@ +# This matches the original fs-perms.txt. +# The only difference is that write permissions for the owner were removed +# (0755 -> 0555) to prevent anyone from writing to the rootfs /srv instead of +# the /srv partition. +/srv 0555 root root false - - - From 351f05e09a899e60d57f5f2687a10847ad6131f2 Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Tue, 12 Nov 2024 10:09:29 +0100 Subject: [PATCH 38/61] labgrid-exporter: add RKUSBLoader match to template RKUSBLoader is the resource associated with Rockchip SoCs that fall through to BootROM mode, when no other bootable media is found. Add it to the resource list, so the Labgrid exporter running on the LXA TAC can announce suitable resources when they exist. Note that this on its own is not sufficient: RKUSBDriver, which will operate on RKUSBLoader expects rkdeveloptool to be installed. This is available in the Debian repositories, but we don't have a bitbake recipe for that yet. What we do have is rk-usb-loader, which is the RK35xx-loader bundled with barebox. This supports only the SoCs supported by barebox, has different arguments than rkdeveloptool and is not supported by Labgrid at all. The fact that the default tool expected by RKUSBDriver is named rk-usb-loader is a quite unfortunate accident... Signed-off-by: Ahmad Fatoum --- .../recipes-devtools/python/python3-labgrid/configuration.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-lxatac-software/recipes-devtools/python/python3-labgrid/configuration.yaml b/meta-lxatac-software/recipes-devtools/python/python3-labgrid/configuration.yaml index 1c0799d2..e8752568 100644 --- a/meta-lxatac-software/recipes-devtools/python/python3-labgrid/configuration.yaml +++ b/meta-lxatac-software/recipes-devtools/python/python3-labgrid/configuration.yaml @@ -71,6 +71,9 @@ lxatac-usb-ports-p{{idx}}: IMXUSBLoader: match: 'ID_PATH': '{{sysfs}}' + RKUSBLoader: + match: + 'ID_PATH': '{{sysfs}}' LXAUSBMux: match: '@ID_PATH': '{{sysfs}}' From c0e533519bd5278ef8083cff927278c74cc4752f Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Tue, 12 Nov 2024 09:56:09 +0100 Subject: [PATCH 39/61] meta-lxatac-software: containers: pass through /var/cache/labgrid Labgrid's ManagedFile class handles synchronisation of files to remote hosts. When a path is not accessible on the TAC, it will be transferred into /var/cache/labgrid and then that path is passed to locally installed tools. To allow transparently using these paths from within a container, add it to the volumes passed through when running container-start. This was tested as follows: - On the development host, create rkdeveloptool-rk3399pro.yaml with: targets: main: resources: RemotePlace: name: !template '$LG_PLACE' drivers: RKUSBDriver: usb_loader: usb_loader tools: rk-usb-loader: /bin/rkdeveloptool images: usb_loader: /home/a3f/Downloads/rk3399pro_loader_v1.20.115.bin - On the TAC, install rkdeveloptool inside the Debian container - On the TAC, add /bin/rkdeveloptool with: #!/bin/sh podman start debian >/dev/null podman exec debian rkdeveloptool "$@" podman stop -i -t 0 debian >/dev/null - On the TAC, add into Labgrid System config for each USB port: RKUSBLoader: match: 'ID_PATH': '{{sysfs}}' This allowed using of labgrid-client bootstrap to call rkdeveloptool on the remote target without having to have a recipe for rkdeveloptool. Signed-off-by: Ahmad Fatoum --- .../recipes-devtools/containers/files/container-start.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-lxatac-software/recipes-devtools/containers/files/container-start.sh b/meta-lxatac-software/recipes-devtools/containers/files/container-start.sh index f6fd086d..0a3cbfa7 100644 --- a/meta-lxatac-software/recipes-devtools/containers/files/container-start.sh +++ b/meta-lxatac-software/recipes-devtools/containers/files/container-start.sh @@ -9,7 +9,9 @@ else echo "INFO: No Debian container present. Starting a new one using Podman." echo "ATTENTION: Container installation might require Internet access and correct system time!" hostname="$(hostname)" - podman run -it --name=debian --hostname "${hostname}-debian" --privileged --network=host --volume=/home/:/home/ --volume=/srv/:/srv/ debian + podman run -it --name=debian --hostname "${hostname}-debian" --privileged --network=host \ + --volume=/home/:/home/ --volume=/srv/:/srv/ --volume=/var/cache/labgrid/:/var/cache/labgrid/ \ + debian podmanerr=$? From fc61d3fd64e01d926ef3e5a1c82f207026454b3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Wed, 2 Oct 2024 08:05:40 +0200 Subject: [PATCH 40/61] poky/meta-*: update to styhead/master branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit styhead is the new/upcoming Yocto release. Update all layers that already have a styhead branch to use it and use master for all other layers. Signed-off-by: Leonard Göhrs --- .gitmodules | 14 +++++++------- meta-labgrid | 2 +- meta-lxatac-bsp/conf/layer.conf | 2 +- meta-lxatac-software/conf/layer.conf | 2 +- meta-oe | 2 +- meta-ptx | 2 +- meta-rauc | 2 +- meta-selinux | 2 +- meta-virtualization | 2 +- poky | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.gitmodules b/.gitmodules index 428a8011..534d00cf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,28 +1,28 @@ [submodule "meta-ptx"] path = meta-ptx url = https://github.com/pengutronix/meta-ptx.git - branch = scarthgap + branch = styhead [submodule "meta-oe"] path = meta-oe url = https://github.com/openembedded/meta-openembedded.git - branch = scarthgap + branch = styhead [submodule "meta-rauc"] path = meta-rauc url = https://github.com/rauc/meta-rauc.git - branch = scarthgap + branch = master [submodule "meta-labgrid"] path = meta-labgrid url = https://github.com/labgrid-project/meta-labgrid.git - branch = scarthgap + branch = master [submodule "meta-virtualization"] path = meta-virtualization url = https://github.com/lgirdk/meta-virtualization.git - branch = scarthgap + branch = master [submodule "poky"] path = poky url = https://git.yoctoproject.org/poky - branch = scarthgap + branch = styhead [submodule "meta-selinux"] path = meta-selinux url = https://git.yoctoproject.org/meta-selinux - branch = scarthgap + branch = master diff --git a/meta-labgrid b/meta-labgrid index e8bc5931..f0e8168b 160000 --- a/meta-labgrid +++ b/meta-labgrid @@ -1 +1 @@ -Subproject commit e8bc5931d9bc45b5a63a2436f166008699829980 +Subproject commit f0e8168bc134da95f3771683c7d02e1d3ae362b7 diff --git a/meta-lxatac-bsp/conf/layer.conf b/meta-lxatac-bsp/conf/layer.conf index eb4d07e6..d5735458 100644 --- a/meta-lxatac-bsp/conf/layer.conf +++ b/meta-lxatac-bsp/conf/layer.conf @@ -11,7 +11,7 @@ BBFILE_PATTERN_lxatac-bsp = "^${LAYERDIR}/" BBFILE_PRIORITY_lxatac-bsp = "11" LAYERDEPENDS_lxatac-bsp = "core ptx rauc lxatac-software" -LAYERSERIES_COMPAT_lxatac-bsp = "scarthgap" +LAYERSERIES_COMPAT_lxatac-bsp = "styhead" RAUC_KEY_FILE ?= "${LAYERDIR}/recipes-core/rauc/files/devel.key.pem" RAUC_CERT_FILE ?= "${LAYERDIR}/recipes-core/rauc/files/devel.cert.pem" diff --git a/meta-lxatac-software/conf/layer.conf b/meta-lxatac-software/conf/layer.conf index ecc48407..2379a55b 100644 --- a/meta-lxatac-software/conf/layer.conf +++ b/meta-lxatac-software/conf/layer.conf @@ -11,5 +11,5 @@ BBFILE_PATTERN_lxatac-software = "^${LAYERDIR}/" BBFILE_PRIORITY_lxatac-software = "7" LAYERDEPENDS_lxatac-software = "core openembedded-layer networking-layer ptx rauc" -LAYERSERIES_COMPAT_lxatac-software = "scarthgap" +LAYERSERIES_COMPAT_lxatac-software = "styhead" diff --git a/meta-oe b/meta-oe index 2e3126c9..461d85a1 160000 --- a/meta-oe +++ b/meta-oe @@ -1 +1 @@ -Subproject commit 2e3126c9c16bb3df0560f6b3896d01539a3bfad7 +Subproject commit 461d85a1831318747af5abe86da193bcde3fd9b4 diff --git a/meta-ptx b/meta-ptx index 5cfc28dd..9dc1624a 160000 --- a/meta-ptx +++ b/meta-ptx @@ -1 +1 @@ -Subproject commit 5cfc28dde3b58082703e5401203b9939a8e5da19 +Subproject commit 9dc1624a97a9d5e3a4ae3805fbb717c4e96eb1ca diff --git a/meta-rauc b/meta-rauc index 1e3e6b33..4b71b6f8 160000 --- a/meta-rauc +++ b/meta-rauc @@ -1 +1 @@ -Subproject commit 1e3e6b334defd7fbf95cb43d23975e7b3de4b520 +Subproject commit 4b71b6f8ea01af98bc2c504c3665f160ac9a4fd5 diff --git a/meta-selinux b/meta-selinux index 3aff0156..06289974 160000 --- a/meta-selinux +++ b/meta-selinux @@ -1 +1 @@ -Subproject commit 3aff015697fa056b4af83b1c9ba44eca346a8a37 +Subproject commit 06289974f8c856a0d1bf981779545d440655ac68 diff --git a/meta-virtualization b/meta-virtualization index ee27999a..2747f11e 160000 --- a/meta-virtualization +++ b/meta-virtualization @@ -1 +1 @@ -Subproject commit ee27999aa1e0f863f140d079c2659ea15c895cd5 +Subproject commit 2747f11e79c29ed4bced84e3b536ae9549aacc79 diff --git a/poky b/poky index 3198afac..8ce494b9 160000 --- a/poky +++ b/poky @@ -1 +1 @@ -Subproject commit 3198afac8770abf3f9c4582aecb6bac2ab291718 +Subproject commit 8ce494b9cf84e769ac72b201838c76fd2ff894c9 From cc6493268ef972385e96bf41600bae67622c0d01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 4 Oct 2024 11:41:11 +0200 Subject: [PATCH 41/61] ci: build: update for styhead branch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Leonard Göhrs --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2647a235..85f28604 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,10 +3,10 @@ name: build on: pull_request: branches: - - scarthgap + - styhead push: branches: - - scarthgap + - styhead schedule: - cron: '10 21 * * 4' From 29a6a50ae4df06d5e48a4ad62b2755385b1eae0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 4 Oct 2024 10:30:36 +0200 Subject: [PATCH 42/61] meta-lxatac-software: distro: tacos: change release name to styhead MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Leonard Göhrs --- meta-lxatac-software/conf/distro/tacos.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-lxatac-software/conf/distro/tacos.conf b/meta-lxatac-software/conf/distro/tacos.conf index 0798e6cb..3bae86b3 100644 --- a/meta-lxatac-software/conf/distro/tacos.conf +++ b/meta-lxatac-software/conf/distro/tacos.conf @@ -1,7 +1,7 @@ DISTRO = "tacos" DISTRO_NAME = "TAC OS - The LXA TAC operating system" DISTRO_VERSION = "24.09+dev" -DISTRO_CODENAME = "tacos-scarthgap" +DISTRO_CODENAME = "tacos-styhead" MAINTAINER = "Linux Automation GmbH " From 4bb762ad15b339916c91af5223586efd3ea7923a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 4 Oct 2024 10:16:29 +0200 Subject: [PATCH 43/61] meta-lxatac-software: distro: tacos: remove TCLIBCAPPEND MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The TCLIBCAPPEND was removed in oe-core commit ebcd355 and there is now a warning whenever it is used. Signed-off-by: Leonard Göhrs --- meta-lxatac-software/conf/distro/tacos.conf | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta-lxatac-software/conf/distro/tacos.conf b/meta-lxatac-software/conf/distro/tacos.conf index 3bae86b3..f28168db 100644 --- a/meta-lxatac-software/conf/distro/tacos.conf +++ b/meta-lxatac-software/conf/distro/tacos.conf @@ -48,9 +48,6 @@ FILESYSTEM_PERMS_TABLES += "files/fs-perms-srv-ro.txt" # persistent logging. VOLATILE_LOG_DIR = "no" -# do not include libc variant name in tmp directory -TCLIBCAPPEND = "" - # add build info file (/etc/build) to rootfs to ease traceability INHERIT += "image-buildinfo" From 2026a29c1831d04bda347bd3ecc81bc40cbec686 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 4 Oct 2024 10:19:34 +0200 Subject: [PATCH 44/61] meta-lxatac-software: distro: tacos: demote patch-status error to warn MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch-status QA check checks for `.patch` files without an Upstream-Status. We should likely get rid of those, but until then do not make the build fail because of them. Signed-off-by: Leonard Göhrs --- meta-lxatac-software/conf/distro/tacos.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-lxatac-software/conf/distro/tacos.conf b/meta-lxatac-software/conf/distro/tacos.conf index f28168db..d2535c6b 100644 --- a/meta-lxatac-software/conf/distro/tacos.conf +++ b/meta-lxatac-software/conf/distro/tacos.conf @@ -58,6 +58,8 @@ ICECC_DISABLED ??= "1" # add poky sanity bbclass INHERIT += "poky-sanity" +ERROR_QA:remove = "patch-status" +WARN_QA:append = "patch-status" require conf/distro/include/poky-world-exclude.inc require conf/distro/include/no-static-libs.inc From c33a59b940bbc4bceb72054054ad3e9e1db95084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 4 Oct 2024 10:22:58 +0200 Subject: [PATCH 45/61] meta-lxatac-software: distro: tacos: demote buildpaths error to warn MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The buildpaths QA check checks for reference to TMPDIR in build artifacts. We should likely get rid of those, but until then do not make the build fail because of them. Signed-off-by: Leonard Göhrs --- meta-lxatac-software/conf/distro/tacos.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-lxatac-software/conf/distro/tacos.conf b/meta-lxatac-software/conf/distro/tacos.conf index d2535c6b..ec2b2ff2 100644 --- a/meta-lxatac-software/conf/distro/tacos.conf +++ b/meta-lxatac-software/conf/distro/tacos.conf @@ -58,8 +58,8 @@ ICECC_DISABLED ??= "1" # add poky sanity bbclass INHERIT += "poky-sanity" -ERROR_QA:remove = "patch-status" -WARN_QA:append = "patch-status" +ERROR_QA:remove = "patch-status buildpaths" +WARN_QA:append = "patch-status buildpaths" require conf/distro/include/poky-world-exclude.inc require conf/distro/include/no-static-libs.inc From 2b9452428a8f0cf38f045e56f646db443f6a7f50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 1 Nov 2024 07:54:54 +0100 Subject: [PATCH 46/61] meta-lxatac-software: distro: tacos: VOLATILE_LOG_DIR is deprecated MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The migration guide in `migration-5.1.rst` suggests the following: Users can disable the volatile log by removing the value `files/fs-perms-volatile-log.txt` from `FILESYSTEM_PERMS_TABLES`. Signed-off-by: Leonard Göhrs --- meta-lxatac-software/conf/distro/tacos.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-lxatac-software/conf/distro/tacos.conf b/meta-lxatac-software/conf/distro/tacos.conf index ec2b2ff2..8fd2ed1f 100644 --- a/meta-lxatac-software/conf/distro/tacos.conf +++ b/meta-lxatac-software/conf/distro/tacos.conf @@ -46,7 +46,7 @@ FILESYSTEM_PERMS_TABLES += "files/fs-perms-srv-ro.txt" # Don't symlink /var/log to /var/log/volatile as we do actually want # persistent logging. -VOLATILE_LOG_DIR = "no" +FILESYSTEM_PERMS_TABLES:remove = "files/fs-perms-volatile-log.txt" # add build info file (/etc/build) to rootfs to ease traceability INHERIT += "image-buildinfo" From 07324de1fbbcdaa161c236e554d6034ccc136003 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 4 Oct 2024 11:21:31 +0200 Subject: [PATCH 47/61] meta-lxatac-software: sync local.conf.sample with poky MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since the duplication from poky, the original local.conf.sample changed a bit compared to our variant. This is just a sync with the current version from styhead. Signed-off-by: Leonard Göhrs --- .../conf/templates/default/local.conf.sample | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/meta-lxatac-software/conf/templates/default/local.conf.sample b/meta-lxatac-software/conf/templates/default/local.conf.sample index 70571d4a..33f5e8a7 100644 --- a/meta-lxatac-software/conf/templates/default/local.conf.sample +++ b/meta-lxatac-software/conf/templates/default/local.conf.sample @@ -212,7 +212,7 @@ BB_DISKMON_DIRS ??= "\ # (CDN) kindly provided by JSDelivr, uncomment one of the SSTATE_MIRRORS lines, not both. # Using the CDN rather than the yoctoproject.org address is suggested/preferred. # -#BB_HASHSERVE_UPSTREAM = "hashserv.yocto.io:8687" +#BB_HASHSERVE_UPSTREAM = 'wss://hashserv.yoctoproject.org/ws' #SSTATE_MIRRORS ?= "file://.* http://cdn.jsdelivr.net/yocto/sstate/all/PATH;downloadfilename=PATH" # ###SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/all/PATH;downloadfilename=PATH" @@ -246,6 +246,16 @@ PACKAGECONFIG:append:pn-qemu-system-native = " sdl" #BB_HASHSERVE = "auto" #BB_SIGNATURE_HANDLER = "OEEquivHash" +# +# Memory Resident Bitbake +# +# Bitbake's server component can stay in memory after the UI for the current command +# has completed. This means subsequent commands can run faster since there is no need +# for bitbake to reload cache files and so on. Number is in seconds, after which the +# server will shut down. +# +#BB_SERVER_TIMEOUT = "60" + # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to # track the version of this file when it was generated. This can safely be ignored if # this doesn't mean anything to you. From 445009c66e2b3c10ccc7ed64d0305f98a1ff9a3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 4 Oct 2024 10:28:13 +0200 Subject: [PATCH 48/61] meta-lxatac-{bsp,software}: UNPACKDIR transition for copy to fs recipes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All of the affected files are simple "take a file from SRC_URI and place it in the rootfs" recipes, so they all follow the same pattern. Signed-off-by: Leonard Göhrs --- .../lxatac-factory-data.bb | 7 +++-- .../lxatac-led-setup/lxatac-led-setup.bb | 7 +++-- .../lxatac-lldpd-config.bb | 5 +++- .../lxatac-nm-config/lxatac-nm-config.bb | 19 +++++++----- .../lxatac-persistent-journal.bb | 5 ++-- .../lxatac-persistent-labgrid-cache.bb | 7 +++-- .../lxatac-persistent-sysstat.bb | 7 +++-- .../lxatac-repart/lxatac-repart.bb | 7 +++-- .../systemd/systemd-conf-lxatac.bb | 5 +++- .../lxatac-profile/lxatac-profile.bb | 5 ++-- .../containers/container-control.bb | 7 +++-- .../recipes-devtools/tac-gadget/tac-gadget.bb | 29 ++++++++++--------- 12 files changed, 68 insertions(+), 42 deletions(-) diff --git a/meta-lxatac-bsp/recipes-core/lxatac-factory-data/lxatac-factory-data.bb b/meta-lxatac-bsp/recipes-core/lxatac-factory-data/lxatac-factory-data.bb index e9d6805f..105dc9df 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-factory-data/lxatac-factory-data.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-factory-data/lxatac-factory-data.bb @@ -14,7 +14,10 @@ SRC_URI += " \ file://lxatac-factory-data.sh \ " +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_install() { - install -m 0644 -D ${WORKDIR}/lxatac-factory-data.service ${D}${systemd_system_unitdir}/lxatac-factory-data.service - install -m 0755 -D ${WORKDIR}/lxatac-factory-data.sh ${D}${sbindir}/lxatac-factory-data + install -m 0644 -D ${UNPACKDIR}/lxatac-factory-data.service ${D}${systemd_system_unitdir}/lxatac-factory-data.service + install -m 0755 -D ${UNPACKDIR}/lxatac-factory-data.sh ${D}${sbindir}/lxatac-factory-data } diff --git a/meta-lxatac-bsp/recipes-core/lxatac-led-setup/lxatac-led-setup.bb b/meta-lxatac-bsp/recipes-core/lxatac-led-setup/lxatac-led-setup.bb index e0adeb4a..003402da 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-led-setup/lxatac-led-setup.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-led-setup/lxatac-led-setup.bb @@ -7,13 +7,16 @@ SRC_URI += " \ file://lxatac-led-setup.sh \ " +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + SYSTEMD_SERVICE:${PN} = "lxatac-led-setup.service" inherit allarch systemd do_install() { - install -m 0644 -D ${WORKDIR}/lxatac-led-setup.service ${D}${systemd_system_unitdir}/lxatac-led-setup.service - install -m 0755 -D ${WORKDIR}/lxatac-led-setup.sh ${D}${sbindir}/lxatac-led-setup + install -m 0644 -D ${UNPACKDIR}/lxatac-led-setup.service ${D}${systemd_system_unitdir}/lxatac-led-setup.service + install -m 0755 -D ${UNPACKDIR}/lxatac-led-setup.sh ${D}${sbindir}/lxatac-led-setup } RDEPENDS:${PN} = "bash" diff --git a/meta-lxatac-bsp/recipes-core/lxatac-lldpd-config/lxatac-lldpd-config.bb b/meta-lxatac-bsp/recipes-core/lxatac-lldpd-config/lxatac-lldpd-config.bb index 52f6722a..6f39c0e3 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-lldpd-config/lxatac-lldpd-config.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-lldpd-config/lxatac-lldpd-config.bb @@ -7,8 +7,11 @@ SRC_URI = " \ file://01-switch.conf \ " +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_install() { - install -D -m0644 ${WORKDIR}/01-switch.conf ${D}${sysconfdir}/lldpd.d/01-switch.conf + install -D -m0644 ${UNPACKDIR}/01-switch.conf ${D}${sysconfdir}/lldpd.d/01-switch.conf } FILES:${PN} = "${sysconfdir}/lldpd.d/" diff --git a/meta-lxatac-bsp/recipes-core/lxatac-nm-config/lxatac-nm-config.bb b/meta-lxatac-bsp/recipes-core/lxatac-nm-config/lxatac-nm-config.bb index 488e5697..536df0b6 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-nm-config/lxatac-nm-config.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-nm-config/lxatac-nm-config.bb @@ -14,18 +14,21 @@ SRC_URI += " \ file://52-switch.link \ " +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + N = "${libdir}/NetworkManager/system-connections" do_install() { - install -D -m0600 ${WORKDIR}/tac-bridge.nmconnection ${D}${N}/tac-bridge.nmconnection - install -D -m0600 ${WORKDIR}/port-dut.nmconnection ${D}${N}/port-dut.nmconnection - install -D -m0600 ${WORKDIR}/port-uplink.nmconnection ${D}${N}/port-uplink.nmconnection - install -D -m0600 ${WORKDIR}/switch.conf ${D}${libdir}/NetworkManager/conf.d/switch.conf - install -D -m0600 ${WORKDIR}/hostname.conf ${D}${libdir}/NetworkManager/conf.d/hostname.conf + install -D -m0600 ${UNPACKDIR}/tac-bridge.nmconnection ${D}${N}/tac-bridge.nmconnection + install -D -m0600 ${UNPACKDIR}/port-dut.nmconnection ${D}${N}/port-dut.nmconnection + install -D -m0600 ${UNPACKDIR}/port-uplink.nmconnection ${D}${N}/port-uplink.nmconnection + install -D -m0600 ${UNPACKDIR}/switch.conf ${D}${libdir}/NetworkManager/conf.d/switch.conf + install -D -m0600 ${UNPACKDIR}/hostname.conf ${D}${libdir}/NetworkManager/conf.d/hostname.conf - install -D -m0600 ${WORKDIR}/50-g-usb.link ${D}${libdir}/systemd/network/50-g-usb.link - install -D -m0600 ${WORKDIR}/52-switch.link ${D}${libdir}/systemd/network/52-switch.link - install -D -m0600 ${WORKDIR}/01-disable_switch_ipv6.conf ${D}${libdir}/sysctl.d/01-disable_switch_ipv6.conf + install -D -m0600 ${UNPACKDIR}/50-g-usb.link ${D}${libdir}/systemd/network/50-g-usb.link + install -D -m0600 ${UNPACKDIR}/52-switch.link ${D}${libdir}/systemd/network/52-switch.link + install -D -m0600 ${UNPACKDIR}/01-disable_switch_ipv6.conf ${D}${libdir}/sysctl.d/01-disable_switch_ipv6.conf } FILES:${PN} += "${libdir}/sysctl.d/" diff --git a/meta-lxatac-bsp/recipes-core/lxatac-persistent-journal/lxatac-persistent-journal.bb b/meta-lxatac-bsp/recipes-core/lxatac-persistent-journal/lxatac-persistent-journal.bb index 8d277d2c..cfcf9039 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-persistent-journal/lxatac-persistent-journal.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-persistent-journal/lxatac-persistent-journal.bb @@ -5,13 +5,14 @@ SRC_URI = " \ file://var-log-journal.mount \ " -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" inherit allarch do_install () { install -d ${D}${systemd_system_unitdir}/ - install -m 0644 -t ${D}${systemd_system_unitdir}/ ${S}/var-log-journal.mount + install -m 0644 -t ${D}${systemd_system_unitdir}/ ${UNPACKDIR}/var-log-journal.mount } FILES:${PN} = "${systemd_system_unitdir}" diff --git a/meta-lxatac-bsp/recipes-core/lxatac-persistent-labgrid-cache/lxatac-persistent-labgrid-cache.bb b/meta-lxatac-bsp/recipes-core/lxatac-persistent-labgrid-cache/lxatac-persistent-labgrid-cache.bb index 30a75ff6..a9312933 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-persistent-labgrid-cache/lxatac-persistent-labgrid-cache.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-persistent-labgrid-cache/lxatac-persistent-labgrid-cache.bb @@ -6,14 +6,15 @@ SRC_URI = " \ file://var-cache-labgrid.mount \ " -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" do_install () { install -d ${D}${systemd_system_unitdir}/ - install -m 0644 -t ${D}${systemd_system_unitdir}/ ${S}/var-cache-labgrid.mount + install -m 0644 -t ${D}${systemd_system_unitdir}/ ${UNPACKDIR}/var-cache-labgrid.mount install -d ${D}${systemd_system_unitdir}/labgrid-exporter.service.d/ install -m 0644 -t ${D}${systemd_system_unitdir}/labgrid-exporter.service.d/ \ - ${S}/use-var-cache-labgrid.conf + ${UNPACKDIR}/use-var-cache-labgrid.conf } FILES:${PN} = "${systemd_system_unitdir}" diff --git a/meta-lxatac-bsp/recipes-core/lxatac-persistent-sysstat/lxatac-persistent-sysstat.bb b/meta-lxatac-bsp/recipes-core/lxatac-persistent-sysstat/lxatac-persistent-sysstat.bb index 6b7c7136..28af398e 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-persistent-sysstat/lxatac-persistent-sysstat.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-persistent-sysstat/lxatac-persistent-sysstat.bb @@ -6,16 +6,17 @@ SRC_URI = " \ file://use-var-log-sa.conf \ " -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" inherit allarch do_install () { install -d ${D}${systemd_system_unitdir}/ - install -m 0644 -t ${D}${systemd_system_unitdir}/ ${S}/var-log-sa.mount + install -m 0644 -t ${D}${systemd_system_unitdir}/ ${UNPACKDIR}/var-log-sa.mount install -d ${D}${systemd_system_unitdir}/sysstat.service.d/ install -m 0644 -t ${D}${systemd_system_unitdir}/sysstat.service.d/ \ - ${S}/use-var-log-sa.conf + ${UNPACKDIR}/use-var-log-sa.conf } FILES:${PN} = "${systemd_system_unitdir}" diff --git a/meta-lxatac-bsp/recipes-core/lxatac-repart/lxatac-repart.bb b/meta-lxatac-bsp/recipes-core/lxatac-repart/lxatac-repart.bb index 436918a6..3032ca11 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-repart/lxatac-repart.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-repart/lxatac-repart.bb @@ -8,15 +8,16 @@ SRC_URI = " \ file://repart-before-tmpfiles.conf \ " -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" RDEPENDS:${PN} = "systemd" do_install () { install -d ${D}${libdir}/systemd/system/systemd-repart.service.d/ - install -m 0644 -t ${D}${libdir}/systemd/system/systemd-repart.service.d/ ${S}/*.conf + install -m 0644 -t ${D}${libdir}/systemd/system/systemd-repart.service.d/ ${UNPACKDIR}/*.conf install -d ${D}${libdir}/repart.d/ - install -m 0644 -t ${D}${libdir}/repart.d/ ${S}/repart.d/* + install -m 0644 -t ${D}${libdir}/repart.d/ ${UNPACKDIR}/repart.d/* # The presence of a /system-update file/symlink is checked by # systemd-system-update-generator. diff --git a/meta-lxatac-bsp/recipes-core/systemd/systemd-conf-lxatac.bb b/meta-lxatac-bsp/recipes-core/systemd/systemd-conf-lxatac.bb index 2d6f48a6..e844112f 100644 --- a/meta-lxatac-bsp/recipes-core/systemd/systemd-conf-lxatac.bb +++ b/meta-lxatac-bsp/recipes-core/systemd/systemd-conf-lxatac.bb @@ -7,8 +7,11 @@ SRC_URI += " \ file://01-watchdog.conf \ " +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_install () { - install -D -m0644 ${WORKDIR}/01-watchdog.conf ${D}${systemd_unitdir}/system.conf.d/01-watchdog.conf + install -D -m0644 ${UNPACKDIR}/01-watchdog.conf ${D}${systemd_unitdir}/system.conf.d/01-watchdog.conf } FILES:${PN} = "${systemd_unitdir}/system.conf.d/" diff --git a/meta-lxatac-software/recipes-core/lxatac-profile/lxatac-profile.bb b/meta-lxatac-software/recipes-core/lxatac-profile/lxatac-profile.bb index 6a806a52..053be63a 100644 --- a/meta-lxatac-software/recipes-core/lxatac-profile/lxatac-profile.bb +++ b/meta-lxatac-software/recipes-core/lxatac-profile/lxatac-profile.bb @@ -4,13 +4,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda SRC_URI = "file://01-labgrid.sh" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" RDEPENDS:${PN} = "bash" do_install () { install -d ${D}${sysconfdir}/profile.d/ - install -m 0755 ${S}/01-labgrid.sh ${D}${sysconfdir}/profile.d/ + install -m 0755 ${UNPACKDIR}/01-labgrid.sh ${D}${sysconfdir}/profile.d/ } FILES:${PN} = "${sysconfdir}/profile.d/01-labgrid.sh" diff --git a/meta-lxatac-software/recipes-devtools/containers/container-control.bb b/meta-lxatac-software/recipes-devtools/containers/container-control.bb index 013c64bd..3619b6a2 100644 --- a/meta-lxatac-software/recipes-devtools/containers/container-control.bb +++ b/meta-lxatac-software/recipes-devtools/containers/container-control.bb @@ -13,7 +13,10 @@ SRC_URI = " \ file://container-update.sh \ " +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_install() { - install -D -m0755 ${WORKDIR}/container-start.sh ${D}${bindir}/container-start - install -D -m0755 ${WORKDIR}/container-update.sh ${D}${bindir}/container-update + install -D -m0755 ${UNPACKDIR}/container-start.sh ${D}${bindir}/container-start + install -D -m0755 ${UNPACKDIR}/container-update.sh ${D}${bindir}/container-update } diff --git a/meta-lxatac-software/recipes-devtools/tac-gadget/tac-gadget.bb b/meta-lxatac-software/recipes-devtools/tac-gadget/tac-gadget.bb index 01af8034..8795f063 100644 --- a/meta-lxatac-software/recipes-devtools/tac-gadget/tac-gadget.bb +++ b/meta-lxatac-software/recipes-devtools/tac-gadget/tac-gadget.bb @@ -26,20 +26,23 @@ SRC_URI = " \ file://gadget-storage.sh \ " +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_install () { - install -D -m0644 ${WORKDIR}/gadget-common.sh ${D}${datadir}/gadget/gadget-common - install -D -m0644 ${WORKDIR}/gadget-reports.sh ${D}${datadir}/gadget/gadget-reports - - install -D -m0755 ${WORKDIR}/gadget-audio.sh ${D}${bindir}/tac-gadget-audio - install -D -m0755 ${WORKDIR}/gadget-ethernet-serial.sh ${D}${bindir}/tac-gadget-ethernet-serial - install -D -m0755 ${WORKDIR}/gadget-ethernet-storage.sh ${D}${bindir}/tac-gadget-ethernet-storage - install -D -m0755 ${WORKDIR}/gadget-ethernet.sh ${D}${bindir}/tac-gadget-ethernet - install -D -m0755 ${WORKDIR}/gadget-hid-storage.sh ${D}${bindir}/tac-gadget-hid-storage - install -D -m0755 ${WORKDIR}/gadget-hid.sh ${D}${bindir}/tac-gadget-hid - install -D -m0755 ${WORKDIR}/gadget-remove.sh ${D}${bindir}/tac-gadget-remove - install -D -m0755 ${WORKDIR}/gadget-serial-storage.sh ${D}${bindir}/tac-gadget-serial-storage - install -D -m0755 ${WORKDIR}/gadget-serial.sh ${D}${bindir}/tac-gadget-serial - install -D -m0755 ${WORKDIR}/gadget-storage.sh ${D}${bindir}/tac-gadget-storage + install -D -m0644 ${UNPACKDIR}/gadget-common.sh ${D}${datadir}/gadget/gadget-common + install -D -m0644 ${UNPACKDIR}/gadget-reports.sh ${D}${datadir}/gadget/gadget-reports + + install -D -m0755 ${UNPACKDIR}/gadget-audio.sh ${D}${bindir}/tac-gadget-audio + install -D -m0755 ${UNPACKDIR}/gadget-ethernet-serial.sh ${D}${bindir}/tac-gadget-ethernet-serial + install -D -m0755 ${UNPACKDIR}/gadget-ethernet-storage.sh ${D}${bindir}/tac-gadget-ethernet-storage + install -D -m0755 ${UNPACKDIR}/gadget-ethernet.sh ${D}${bindir}/tac-gadget-ethernet + install -D -m0755 ${UNPACKDIR}/gadget-hid-storage.sh ${D}${bindir}/tac-gadget-hid-storage + install -D -m0755 ${UNPACKDIR}/gadget-hid.sh ${D}${bindir}/tac-gadget-hid + install -D -m0755 ${UNPACKDIR}/gadget-remove.sh ${D}${bindir}/tac-gadget-remove + install -D -m0755 ${UNPACKDIR}/gadget-serial-storage.sh ${D}${bindir}/tac-gadget-serial-storage + install -D -m0755 ${UNPACKDIR}/gadget-serial.sh ${D}${bindir}/tac-gadget-serial + install -D -m0755 ${UNPACKDIR}/gadget-storage.sh ${D}${bindir}/tac-gadget-storage } FILES:${PN} = "${bindir} ${datadir}" From 5f86e69a9c266ffd27f8be80444c977e7691fde5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 4 Oct 2024 10:03:50 +0200 Subject: [PATCH 49/61] meta-lxatac-bsp: barebox: UNPACKDIR transition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Leonard Göhrs --- meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc | 6 +++--- meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.10.0.bb | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc b/meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc index 5609980a..47a37f0f 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc +++ b/meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc @@ -60,8 +60,8 @@ python () { } do_configure() { - if [ -e ${WORKDIR}/defconfig ]; then - cp ${WORKDIR}/defconfig ${B}/.config + if [ -e ${UNPACKDIR}/defconfig ]; then + cp ${UNPACKDIR}/defconfig ${B}/.config else if [ -n "${BAREBOX_CONFIG}" ]; then oe_runmake ${BAREBOX_CONFIG} @@ -75,7 +75,7 @@ do_configure() { } BAREBOX_ENV_DIR[doc] = "Overlay the barebox built-in environment with the environment provided by the BSP if specified." -BAREBOX_ENV_DIR ??= "${WORKDIR}/env/" +BAREBOX_ENV_DIR ??= "${UNPACKDIR}/env/" do_compile () { export userccflags="${TARGET_LDFLAGS}${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.10.0.bb b/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.10.0.bb index cf9a0479..64a74845 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.10.0.bb +++ b/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.10.0.bb @@ -31,8 +31,8 @@ do_deploy:append () { DEPENDS:append = " panel-shineworld-lh133k" do_copy_fw() { - mkdir -p ${WORKDIR}/env/firmware/ - cp ${RECIPE_SYSROOT}${nonarch_base_libdir}/firmware/shineworld,lh133k.bin ${WORKDIR}/env/firmware/ + mkdir -p ${UNPACKDIR}/env/firmware/ + cp ${RECIPE_SYSROOT}${nonarch_base_libdir}/firmware/shineworld,lh133k.bin ${UNPACKDIR}/env/firmware/ } addtask copy_fw after do_configure before do_compile From 0d53e2be719925ba69ae18facf247f37c2c7121e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 4 Oct 2024 10:04:39 +0200 Subject: [PATCH 50/61] meta-lxatac-bsp: rauc: UNPACKDIR transition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Leonard Göhrs --- meta-lxatac-bsp/recipes-core/rauc/rauc-conf.bbappend | 6 +++--- meta-lxatac-bsp/recipes-core/rauc/rauc_%.bbappend | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-lxatac-bsp/recipes-core/rauc/rauc-conf.bbappend b/meta-lxatac-bsp/recipes-core/rauc/rauc-conf.bbappend index da83f234..b6bba695 100644 --- a/meta-lxatac-bsp/recipes-core/rauc/rauc-conf.bbappend +++ b/meta-lxatac-bsp/recipes-core/rauc/rauc-conf.bbappend @@ -12,10 +12,10 @@ SRC_URI += " \ " do_install:append() { - install -D -m 0755 ${WORKDIR}/rauc-disable-cert.sh \ + install -D -m 0755 ${UNPACKDIR}/rauc-disable-cert.sh \ ${D}${bindir}/rauc-disable-cert - install -D -m 0755 ${WORKDIR}/rauc-enable-cert.sh \ + install -D -m 0755 ${UNPACKDIR}/rauc-enable-cert.sh \ ${D}${bindir}/rauc-enable-cert install -d ${D}${sysconfdir}/rauc/certificates-available @@ -27,7 +27,7 @@ do_install:append() { # The RAUC hook will activate the certificate matching the key the # bundle was signed with. for cert in devel stable testing; do - install -D -m 0644 ${WORKDIR}/${cert}.cert.pem \ + install -D -m 0644 ${UNPACKDIR}/${cert}.cert.pem \ ${D}${sysconfdir}/rauc/certificates-available/${cert}.cert.pem done diff --git a/meta-lxatac-bsp/recipes-core/rauc/rauc_%.bbappend b/meta-lxatac-bsp/recipes-core/rauc/rauc_%.bbappend index 87dae8a1..47bdd3e8 100644 --- a/meta-lxatac-bsp/recipes-core/rauc/rauc_%.bbappend +++ b/meta-lxatac-bsp/recipes-core/rauc/rauc_%.bbappend @@ -7,7 +7,7 @@ SRC_URI += " \ " do_install:append() { - install -D -m 0644 ${WORKDIR}/require-mount-srv.conf \ + install -D -m 0644 ${UNPACKDIR}/require-mount-srv.conf \ ${D}${systemd_system_unitdir}/rauc.service.d/require-mount-srv.conf } From d516622a6e245392b1d4fe641f84fffc6afbc9d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 4 Oct 2024 10:06:20 +0200 Subject: [PATCH 51/61] meta-lxatac-software: atftp: UNPACKDIR transition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Leonard Göhrs --- meta-lxatac-software/recipes-daemons/atftp/atftp_%.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-lxatac-software/recipes-daemons/atftp/atftp_%.bbappend b/meta-lxatac-software/recipes-daemons/atftp/atftp_%.bbappend index 84494705..279019aa 100644 --- a/meta-lxatac-software/recipes-daemons/atftp/atftp_%.bbappend +++ b/meta-lxatac-software/recipes-daemons/atftp/atftp_%.bbappend @@ -9,7 +9,7 @@ SRC_URI += "file://create-dir.conf" do_install:append() { rmdir ${D}/srv/tftp ${D}/srv - install -D -m 0644 ${S}/../create-dir.conf \ + install -D -m 0644 ${UNPACKDIR}/create-dir.conf \ ${D}${systemd_system_unitdir}/atftpd.service.d/create-dir.conf } From 0cffc212e9656ba5f7ff651908f056957d09c2be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 4 Oct 2024 10:07:26 +0200 Subject: [PATCH 52/61] meta-lxatac-software: python3-labgrid: UNPACKDIR transition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Leonard Göhrs --- .../recipes-devtools/python/python3-labgrid_git.bbappend | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-lxatac-software/recipes-devtools/python/python3-labgrid_git.bbappend b/meta-lxatac-software/recipes-devtools/python/python3-labgrid_git.bbappend index 3e50c55a..f77f661e 100644 --- a/meta-lxatac-software/recipes-devtools/python/python3-labgrid_git.bbappend +++ b/meta-lxatac-software/recipes-devtools/python/python3-labgrid_git.bbappend @@ -8,10 +8,10 @@ do_install:append() { # The userconfig.yaml is migrated via rauc hook between installs. # Deploy a copy of the file so that users can go back to a default config # or see what's new. - install -D -m 0644 ${WORKDIR}/userconfig.yaml ${D}${sysconfdir}/labgrid/userconfig.yaml - install -D -m 0644 ${WORKDIR}/userconfig.yaml ${D}${sysconfdir}/labgrid/userconfig.yaml.default + install -D -m 0644 ${UNPACKDIR}/userconfig.yaml ${D}${sysconfdir}/labgrid/userconfig.yaml + install -D -m 0644 ${UNPACKDIR}/userconfig.yaml ${D}${sysconfdir}/labgrid/userconfig.yaml.default - install -D -m 0644 ${WORKDIR}/labgrid.conf ${D}${libdir}/tmpfiles.d/labgrid.conf + install -D -m 0644 ${UNPACKDIR}/labgrid.conf ${D}${libdir}/tmpfiles.d/labgrid.conf } FILES:${PN} += "${libdir}/tmpfiles.d" From 9e8c836b31e7f0eb62f347b64259fe78701ee8b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 4 Oct 2024 10:08:28 +0200 Subject: [PATCH 53/61] meta-lxatac-software: python3-lxa-iobus: UNPACKDIR transition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Leonard Göhrs --- .../recipes-devtools/python/python3-lxa-iobus_%.bbappend | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-lxatac-software/recipes-devtools/python/python3-lxa-iobus_%.bbappend b/meta-lxatac-software/recipes-devtools/python/python3-lxa-iobus_%.bbappend index 6814f8f5..08458f9d 100644 --- a/meta-lxatac-software/recipes-devtools/python/python3-lxa-iobus_%.bbappend +++ b/meta-lxatac-software/recipes-devtools/python/python3-lxa-iobus_%.bbappend @@ -6,6 +6,6 @@ SRC_URI += " \ " do_install:append() { - install -D -m0644 ${WORKDIR}/80-can0-iobus.link ${D}${libdir}/systemd/network/80-can0-iobus.link - install -D -m0644 ${WORKDIR}/lxa-iobus.service ${D}${systemd_system_unitdir}/lxa-iobus.service + install -D -m0644 ${UNPACKDIR}/80-can0-iobus.link ${D}${libdir}/systemd/network/80-can0-iobus.link + install -D -m0644 ${UNPACKDIR}/lxa-iobus.service ${D}${systemd_system_unitdir}/lxa-iobus.service } From c3d1a2e2f60363c585d6765249c543597bad6077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 4 Oct 2024 10:09:39 +0200 Subject: [PATCH 54/61] meta-lxatac-software: sysstat: UNPACKDIR transition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Leonard Göhrs --- .../recipes-extended/sysstat/sysstat_%.bbappend | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-lxatac-software/recipes-extended/sysstat/sysstat_%.bbappend b/meta-lxatac-software/recipes-extended/sysstat/sysstat_%.bbappend index 43a70a3b..38ea3690 100644 --- a/meta-lxatac-software/recipes-extended/sysstat/sysstat_%.bbappend +++ b/meta-lxatac-software/recipes-extended/sysstat/sysstat_%.bbappend @@ -8,8 +8,8 @@ SRC_URI += "file://sysstat.conf file://sysstat-collect.timer" RDEPENDS:${PN} += "xz" do_install:append() { - install -m 0644 ${WORKDIR}/sysstat.conf ${D}/etc/sysconfig/sysstat - install -m 0644 ${WORKDIR}/sysstat-collect.timer -D -t ${D}${sysconfdir}/systemd/system + install -m 0644 ${UNPACKDIR}/sysstat.conf ${D}/etc/sysconfig/sysstat + install -m 0644 ${UNPACKDIR}/sysstat-collect.timer -D -t ${D}${sysconfdir}/systemd/system } SYSTEMD_SERVICE:${PN} = "sysstat.service sysstat-collect.timer sysstat-summary.timer" From c0643388f279e0958ea57f02f8034c71ee6e099a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 4 Oct 2024 10:10:16 +0200 Subject: [PATCH 55/61] meta-lxatac-software: htop: UNPACKDIR transition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Leonard Göhrs --- meta-lxatac-software/recipes-support/htop/htop_%.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-lxatac-software/recipes-support/htop/htop_%.bbappend b/meta-lxatac-software/recipes-support/htop/htop_%.bbappend index 39892492..48cfed3e 100644 --- a/meta-lxatac-software/recipes-support/htop/htop_%.bbappend +++ b/meta-lxatac-software/recipes-support/htop/htop_%.bbappend @@ -3,7 +3,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += "file://htoprc" do_install:append() { - install -D -m 0644 ${WORKDIR}/htoprc ${D}${sysconfdir}/htoprc + install -D -m 0644 ${UNPACKDIR}/htoprc ${D}${sysconfdir}/htoprc } FILES:${PN} += "${sysconfdir}/htoprc" From 5e1c223c3697d66bef9869e930a8c59cca9caf0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 4 Oct 2024 10:05:45 +0200 Subject: [PATCH 56/61] meta-lxatac-software: panel-mipi-dbi: UNPACKDIR transition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Leonard Göhrs --- meta-lxatac-software/classes/panel-mipi-dbi.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-lxatac-software/classes/panel-mipi-dbi.bbclass b/meta-lxatac-software/classes/panel-mipi-dbi.bbclass index 06c90081..7ceebc72 100644 --- a/meta-lxatac-software/classes/panel-mipi-dbi.bbclass +++ b/meta-lxatac-software/classes/panel-mipi-dbi.bbclass @@ -36,7 +36,7 @@ do_configure[noexec] = "1" do_compile () { mipi-dbi-cmd \ "${B}/${PANEL_FIRMWARE_BIN}" \ - "${WORKDIR}/${PANEL_FIRMWARE}" + "${UNPACKDIR}/${PANEL_FIRMWARE}" } do_install () { From f94f370776d9687b09437d3f9d30df020d6fc32c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 4 Oct 2024 10:10:43 +0200 Subject: [PATCH 57/61] meta-lxatac-software: panel-shineworld-lh133k: UNPACKDIR transition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Leonard Göhrs --- .../recipes-graphics/panel-mipi-dbi/panel-shineworld-lh133k.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/panel-shineworld-lh133k.bb b/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/panel-shineworld-lh133k.bb index e175fb34..dbcb2f12 100644 --- a/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/panel-shineworld-lh133k.bb +++ b/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/panel-shineworld-lh133k.bb @@ -7,3 +7,5 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda PANEL_FIRMWARE = "shineworld,lh133k.txt" SRC_URI = "file://${PANEL_FIRMWARE}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" From 35eb9985bb7e561beba0a6472d6656542885395b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 4 Oct 2024 10:11:59 +0200 Subject: [PATCH 58/61] meta-lxatac-software: tacd: UNPACKDIR transition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Leonard Göhrs --- meta-lxatac-software/recipes-rust/tacd/tacd.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-lxatac-software/recipes-rust/tacd/tacd.inc b/meta-lxatac-software/recipes-rust/tacd/tacd.inc index e5618d94..859f85a9 100644 --- a/meta-lxatac-software/recipes-rust/tacd/tacd.inc +++ b/meta-lxatac-software/recipes-rust/tacd/tacd.inc @@ -15,13 +15,13 @@ SYSTEMD_SERVICE:${PN} = "tacd.service" do_install:append() { install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/tacd.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${UNPACKDIR}/tacd.service ${D}${systemd_system_unitdir}/ - install -D -m 0755 ${WORKDIR}/tacd-failsafe.sh ${D}${bindir}/tacd-failsafe + install -D -m 0755 ${UNPACKDIR}/tacd-failsafe.sh ${D}${bindir}/tacd-failsafe - install -D -m 0644 ${WORKDIR}/01_stable.yaml ${D}${datadir}/tacd/update_channels/01_stable.yaml - install -D -m 0644 ${WORKDIR}/05_testing.yaml ${D}${datadir}/tacd/update_channels/05_testing.yaml + install -D -m 0644 ${UNPACKDIR}/01_stable.yaml ${D}${datadir}/tacd/update_channels/01_stable.yaml + install -D -m 0644 ${UNPACKDIR}/05_testing.yaml ${D}${datadir}/tacd/update_channels/05_testing.yaml install -d ${D}${sysconfdir}/dbus-1/system.d - install -m 0644 ${WORKDIR}/de.pengutronix.tacd.conf ${D}/${sysconfdir}/dbus-1/system.d/ + install -m 0644 ${UNPACKDIR}/de.pengutronix.tacd.conf ${D}/${sysconfdir}/dbus-1/system.d/ } From 51056afc7563bd609f9c3bd6ae4e749f4685ce59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 4 Oct 2024 10:13:18 +0200 Subject: [PATCH 59/61] meta-lxatac-software: gitlab-runner: UNPACKDIR transition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit TODO: some words about the destdir URL suffix Signed-off-by: Leonard Göhrs --- .../recipes-devtools/gitlab-runner/gitlab-runner.inc | 2 +- .../recipes-devtools/gitlab-runner/gitlab-runner_17.3.1.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-lxatac-software/recipes-devtools/gitlab-runner/gitlab-runner.inc b/meta-lxatac-software/recipes-devtools/gitlab-runner/gitlab-runner.inc index 4796c72c..ad12e141 100644 --- a/meta-lxatac-software/recipes-devtools/gitlab-runner/gitlab-runner.inc +++ b/meta-lxatac-software/recipes-devtools/gitlab-runner/gitlab-runner.inc @@ -26,5 +26,5 @@ GO_LINKSHARED = "" do_install:append() { install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/gitlab-runner.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${UNPACKDIR}/gitlab-runner.service ${D}${systemd_system_unitdir}/ } diff --git a/meta-lxatac-software/recipes-devtools/gitlab-runner/gitlab-runner_17.3.1.bb b/meta-lxatac-software/recipes-devtools/gitlab-runner/gitlab-runner_17.3.1.bb index 011d1d21..5cef9c3f 100644 --- a/meta-lxatac-software/recipes-devtools/gitlab-runner/gitlab-runner_17.3.1.bb +++ b/meta-lxatac-software/recipes-devtools/gitlab-runner/gitlab-runner_17.3.1.bb @@ -1,4 +1,4 @@ require gitlab-runner.inc -SRC_URI = "git://gitlab.com/gitlab-org/gitlab-runner.git;branch=17-3-stable;protocol=https" +SRC_URI = "git://${GO_IMPORT};branch=17-3-stable;protocol=https;destsuffix=${BPN}-${PV}/src/${GO_IMPORT}" SRCREV = "66269445606da32c52be605feba6d70fc1a8fb0d" From a66a39f1a171f1a55389bc8fa4c229bfcee7dd1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 4 Oct 2024 10:13:55 +0200 Subject: [PATCH 60/61] meta-lxatac-software: github-act-runner: UNPACKDIR transition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit TODO: some words about the destdir URL suffix Signed-off-by: Leonard Göhrs --- .../github-act-runner/github-act-runner.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-lxatac-software/recipes-devtools/github-act-runner/github-act-runner.inc b/meta-lxatac-software/recipes-devtools/github-act-runner/github-act-runner.inc index 9bee2e9f..e81d78e3 100644 --- a/meta-lxatac-software/recipes-devtools/github-act-runner/github-act-runner.inc +++ b/meta-lxatac-software/recipes-devtools/github-act-runner/github-act-runner.inc @@ -1,8 +1,10 @@ SUMMARY = "GitHub act Runner" DESCRIPTION = "Alternative implementation of the GitHub Action runner protocol written in Go" +GO_IMPORT = "github.com/ChristopherHX/github-act-runner" + SRC_URI = " \ - git://github.com/ChristopherHX/github-act-runner.git;branch=main;protocol=https \ + git://${GO_IMPORT};branch=main;protocol=https;destsuffix=${BPN}-${PV}/src/${GO_IMPORT} \ file://github-act-runner.service \ " @@ -12,8 +14,6 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit go-mod inherit systemd -GO_IMPORT = "github.com/ChristopherHX/github-act-runner" - RDEPENDS:${PN}:append = "nodejs" RDEPENDS:github-act-runner-dev:append = "make bash" @@ -25,5 +25,5 @@ do_compile[network] = "1" do_install:append() { install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/github-act-runner.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${UNPACKDIR}/github-act-runner.service ${D}${systemd_system_unitdir}/ } From 19c14eb7dcf652f0f36066dc09dd1bb13b7400dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 4 Oct 2024 10:14:46 +0200 Subject: [PATCH 61/61] meta-lxatac-software: tacd-webinterface: UNPACKDIR transition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit TODO: some words about the destdir URL suffix Signed-off-by: Leonard Göhrs --- .../tacd-webinterface/tacd-webinterface_git.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-lxatac-software/recipes-webadmin/tacd-webinterface/tacd-webinterface_git.bb b/meta-lxatac-software/recipes-webadmin/tacd-webinterface/tacd-webinterface_git.bb index c136599e..09392bc7 100644 --- a/meta-lxatac-software/recipes-webadmin/tacd-webinterface/tacd-webinterface_git.bb +++ b/meta-lxatac-software/recipes-webadmin/tacd-webinterface/tacd-webinterface_git.bb @@ -1,7 +1,7 @@ SUMMARY = "The LXA TAC System Daemon - Web Interface" SRC_URI = " \ git://github.com/linux-automation/tacd.git;protocol=https;branch=main \ - npmsw://${THISDIR}/${BPN}/npm-shrinkwrap.json \ + npmsw://${THISDIR}/${BPN}/npm-shrinkwrap.json;destsuffix=git/web \ " LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = " \ @@ -11,7 +11,8 @@ LIC_FILES_CHKSUM = " \ PV = "0.1.0+git${SRCPV}" SRCREV = "e79b017da65f4a084a8b24f1118e15b0c3f25ae8" -S = "${WORKDIR}/git/web" +S = "${WORKDIR}/sources/git/web" +UNPACKDIR = "${WORKDIR}/sources" inherit npm