From 7424dbe152295fb25b45d9f3a5066369279fe4cc Mon Sep 17 00:00:00 2001
From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Thu, 2 Jul 2015 11:54:47 +0200
Subject: images: use append operator

Cleanup: Use the append operator to add soc-arch/machine specific
packages to IMAGE_INSTALL.
No change in the image is intended.
---
 recipes/images/console-trdx-image.bb |  9 +++---
 recipes/images/trdx-extra.inc        | 54 ++++++++++--------------------------
 2 files changed, 18 insertions(+), 45 deletions(-)

diff --git a/recipes/images/console-trdx-image.bb b/recipes/images/console-trdx-image.bb
index 25a7d76..b3bc61a 100644
--- a/recipes/images/console-trdx-image.bb
+++ b/recipes/images/console-trdx-image.bb
@@ -43,9 +43,10 @@ CONMANPKGS_libc-uclibc = ""
 #don't install some id databases
 #BAD_RECOMMENDATIONS_append_colibri-vf += " udev-hwdb cpufrequtils "
 
-#this adds a few MB to the image
-IMAGE_INSTALL_X11_tegra = "${XSERVER} xterm xclock"
-IMAGE_INSTALL_X11 = ""
+#deploy the X server for the tegras
+#this adds a few MB to the image, but all graphical HW acceleration is
+#available only on top of X
+IMAGE_INSTALL_append_tegra = "${XSERVER} xterm xclock"
 
 IMAGE_INSTALL += " \
     angstrom-packagegroup-boot \
@@ -54,10 +55,8 @@ IMAGE_INSTALL += " \
     ${ROOTFS_PKGMANAGE_PKGS} \
     timestamp-service \
     packagegroup-base-extended \
-    ${IMAGE_INSTALL_X11} \
 "
 
-
 require recipes/images/trdx-extra.inc
 
 IMAGE_DEV_MANAGER   = "udev"
diff --git a/recipes/images/trdx-extra.inc b/recipes/images/trdx-extra.inc
index 1b0ef84..99573c3 100644
--- a/recipes/images/trdx-extra.inc
+++ b/recipes/images/trdx-extra.inc
@@ -14,7 +14,7 @@ DEPENDS += "gdb-cross-${TARGET_ARCH}"
 #create the file /etc/timestamp
 IMAGE_PREPROCESS_COMMAND = "rootfs_update_timestamp"
 
-IMAGE_INSTALL_T20_T30 = " \
+IMAGE_INSTALL_append_tegra = " \
     u-boot-toradex-fw-utils \
     tegrastats \
     trdx-nv-binaries \
@@ -30,42 +30,34 @@ IMAGE_INSTALL_T20_T30 = " \
     kernel-modules \
 "
 
-IMAGE_INSTALL_MACHINE_apalis-t30 = " \
-    ${IMAGE_INSTALL_T20_T30} \
-    pciutils \
-    ptpd \
-    iproute2 \
-    canutils \
-    lvds-ctrl \
+IMAGE_INSTALL_append_tegra3 = " \
     fs-init \
     e2fsprogs \
     e2fsprogs-mke2fs \
     e2fsprogs-tune2fs \
 "
 
-IMAGE_INSTALL_MACHINE_colibri-t20 = " \
-    ${IMAGE_INSTALL_T20_T30} \
-    mtd-utils-ubifs \
+IMAGE_INSTALL_append_apalis-t30 = " \
+    pciutils \
+    ptpd \
+    iproute2 \
+    canutils \
+    lvds-ctrl \
 "
 
-IMAGE_INSTALL_MACHINE_colibri-t30 = " \
-    ${IMAGE_INSTALL_T20_T30} \
-    fs-init \
-    e2fsprogs \
-    e2fsprogs-mke2fs \
-    e2fsprogs-tune2fs \
+IMAGE_INSTALL_append_colibri-t20 = " \
+    mtd-utils-ubifs \
 "
 
 #note that the kernel-modules meta package gets installed from
 #meta-fsl-arm/conf/machine/include/imx-base.inc
-IMAGE_INSTALL_MACHINE_apalis-imx6 = " \
+IMAGE_INSTALL_append_mx6 = " \
     u-boot-toradex-fsl-fw-utils \
     usb-rndis-systemd \
     gpio-export \
     curl \
     file \
     aspell \
-    pciutils \
     ptpd \
     iproute2 \
     canutils \
@@ -79,25 +71,11 @@ IMAGE_INSTALL_MACHINE_apalis-imx6 = " \
 
 #note that the kernel-modules meta package gets installed from
 #meta-fsl-arm/conf/machine/include/imx-base.inc
-IMAGE_INSTALL_MACHINE_colibri-imx6 = " \
-    u-boot-toradex-fsl-fw-utils \
-    usb-rndis-systemd \
-    gpio-export \
-    curl \
-    file \
-    aspell \
-    ptpd \
-    iproute2 \
-    canutils \
-    fs-init \
-    e2fsprogs \
-    e2fsprogs-mke2fs \
-    e2fsprogs-tune2fs \
-    mimetypes \
-    eglinfo-x11 \
+IMAGE_INSTALL_append_apalis-imx6 = " \
+    pciutils \
 "
 
-IMAGE_INSTALL_MACHINE_colibri-vf = " \
+IMAGE_INSTALL_append_colibri-vf = " \
     u-boot-toradex-fsl-fw-utils \
     libusbg \
     ptpd \
@@ -111,8 +89,6 @@ IMAGE_INSTALL_MACHINE_colibri-vf = " \
     kernel-modules \
 "
 
-IMAGE_INSTALL_MACHINE = ""
-
 IMAGE_INSTALL += " \
     max9526-i2c \
     linux-firmware-ralink \
@@ -150,8 +126,6 @@ IMAGE_INSTALL += " \
     nbench-byte \
     ethtool \
     \
-    ${IMAGE_INSTALL_MACHINE} \
-    \
     trdx-oak-sensors \
 "
 #    openssl-conf 
-- 
cgit v1.2.3