[PATCH 1/2] images: move bash and udev-extraconf to base packagegroup

[PATCH 1/2] images: move bash and udev-extraconf to base packagegroup

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 meta-arago-distro/recipes-core/images/arago-image.inc                 | 2 --
 .../recipes-core/packagegroups/packagegroup-arago-base.bb             | 4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-arago-distro/recipes-core/images/arago-image.inc b/meta-arago-distro/recipes-core/images/arago-image.inc
index af28cd0..1c566ae 100644
--- a/meta-arago-distro/recipes-core/images/arago-image.inc
+++ b/meta-arago-distro/recipes-core/images/arago-image.inc
@@ -12,8 +12,6 @@ ARAGO_IMAGE_EXTRA_INSTALL ?= ""
 
 IMAGE_INSTALL += " \
 	packagegroup-core-boot \
-	bash \
-	udev-extraconf \
 	${ARAGO_IMAGE_EXTRA_INSTALL} \
 "
 
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base.bb
index 42f16b0..7832a89 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Basic task to get a device booting"
 LICENSE = "MIT"
-PR = "r8"
+PR = "r9"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -19,6 +19,8 @@ ARAGO_BASE = "\
     initscript-telnetd \
     ethtool \
     thermal-init \
+    bash \
+    udev-extraconf \
     "
 
 # these require meta-openembedded/meta-oe layer
-- 
2.7.4

[PATCH 2/2] images: unify and clean up image recipes a bit

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

Move common pieces to arago-image.inc and don't include base image from
tisdk-rootfs.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 .../recipes-core/images/arago-base-tisdk-image.bb        | 16 ++--------------
 meta-arago-distro/recipes-core/images/arago-image.inc    | 13 ++++++++++++-
 .../recipes-core/images/tisdk-rootfs-image.bb            | 12 ++++++++----
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/meta-arago-distro/recipes-core/images/arago-base-tisdk-image.bb b/meta-arago-distro/recipes-core/images/arago-base-tisdk-image.bb
index 59e55c3..6ce97ee 100644
--- a/meta-arago-distro/recipes-core/images/arago-base-tisdk-image.bb
+++ b/meta-arago-distro/recipes-core/images/arago-base-tisdk-image.bb
@@ -1,13 +1,10 @@
-# Arago TI SDK base image
-# gives you an image with Qt/E and other common packages shared by all TI SDKs.
+# Arago TI SDK base image with test tools
+# Suitable for initramfs
 
 require arago-image.inc
-inherit remove-net-rules
 
 IMAGE_FSTYPES += "cpio.xz"
 
-COMPATIBLE_MACHINE = "omap3|omapl138|ti33x|ti43x|omap4|omap-a15|keystone"
-
 IMAGE_INSTALL += "\
     packagegroup-arago-base \
     packagegroup-arago-console \
@@ -16,13 +13,4 @@ IMAGE_INSTALL += "\
     systemd-initramfs \
     "
 
-BAD_RECOMMENDATIONS += " \
-    ti-llvm3.6-dev \
-    opencl-monitor-dev \
-    libulm-dev \
-    gdbserver-c6x-dev \
-    coreutils \
-    coreutils-dev \
-"
-
 export IMAGE_BASENAME = "arago-base-tisdk-image"
diff --git a/meta-arago-distro/recipes-core/images/arago-image.inc b/meta-arago-distro/recipes-core/images/arago-image.inc
index 1c566ae..44d8f91 100644
--- a/meta-arago-distro/recipes-core/images/arago-image.inc
+++ b/meta-arago-distro/recipes-core/images/arago-image.inc
@@ -3,6 +3,8 @@
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 
+COMPATIBLE_MACHINE = "omap3|omapl138|ti33x|ti43x|omap4|omap-a15|keystone"
+
 IMAGE_FEATURES += "package-management splash"
 
 # 4KB per 1 inode should be enough
@@ -37,4 +39,13 @@ make_bootfiles_symlinks_relative() {
 
 ROOTFS_POSTPROCESS_COMMAND += "make_bootfiles_symlinks_relative;"
 
-inherit core-image
+BAD_RECOMMENDATIONS += " \
+    ti-llvm3.6-dev \
+    opencl-monitor-dev \
+    libulm-dev \
+    gdbserver-c6x-dev \
+    coreutils \
+    coreutils-dev \
+"
+
+inherit core-image remove-net-rules
diff --git a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb b/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
index 5667b0f..15ac703 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
@@ -1,11 +1,14 @@
-# Arago TI SDK filesystem image
+# Arago TI SDK full filesystem image
 
-require arago-base-tisdk-image.bb
+require arago-image.inc
 
 IMAGE_INSTALL += "\
+    packagegroup-arago-base \
+    packagegroup-arago-console \
+    packagegroup-arago-base-tisdk \
+    packagegroup-arago-test \
     ${@bb.utils.contains('MACHINE_FEATURES','sgx','packagegroup-arago-tisdk-graphics','',d)} \
     packagegroup-arago-tisdk-qte \
-    packagegroup-arago-tisdk-addons \
     ${@bb.utils.contains('MACHINE_FEATURES','opencl','packagegroup-arago-tisdk-opencl','',d)} \
     ${@bb.utils.contains('MACHINE_FEATURES','opencl','packagegroup-arago-tisdk-opencl-extra','',d)} \
     packagegroup-arago-tisdk-connectivity \
@@ -13,7 +16,8 @@ IMAGE_INSTALL += "\
     packagegroup-arago-tisdk-matrix \
     packagegroup-arago-tisdk-multimedia \
     packagegroup-arago-tisdk-amsdk \
+    packagegroup-arago-tisdk-addons \
     packagegroup-arago-tisdk-addons-extra \
-"
+    "
 
 export IMAGE_BASENAME = "tisdk-rootfs-image"
-- 
2.7.4