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 1/7] 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 2/7] 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 3/7] 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 4/7] 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 5/7] 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 6/7] 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 7/7] 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"