Merge pull request linux-automation#188 from hnez/cleanup

meta-lxatac-{bsp,software}: misc cleanups
hnez · Oct 7, 2024 · 4efcb33 · 4efcb33
2 parents 9678f46 + 3d725e0
commit 4efcb33
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 9 deletions.
diff --git 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"
 

diff --git 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"
 

diff --git a/meta-lxatac-bsp/recipes-core/rauc/rauc-native_%.bbappend b/meta-lxatac-bsp/recipes-core/rauc/rauc-native_%.bbappend
diff --git 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
@@ -7,8 +7,28 @@ MAINTAINER = "Linux Automation GmbH <[email protected]>"
 
 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 = "\
+    alsa \
+    argp \
+    bluetooth \
+    ext2 \
+    ipv6 \
+    minidebuginfo \
+    multiarch \
+    nfs \
+    polkit \
+    rauc \
+    seccomp \
+    security \
+    systemd \
+    usbgadget \
+    usbhost \
+    usrmerge \
+    virtualization \
+    wifi \
+    xattr \
+    zeroconf \
+"
 
 # Select systemd as init manager
 INIT_MANAGER ?= "systemd"

diff --git 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