From 672285f19573ce0caa02a2953c871c04d53542fd Mon Sep 17 00:00:00 2001
From: Adrian Dudau <adrian.dudau@enea.com>
Date: Tue, 19 Apr 2016 13:28:48 +0200
Subject: Remove images recipes

Images are now defined in the profile release layers (meta-el-standard,
meta-el-networking). We are only keeping some common .inc files for the
minimal and extended images to be used in either release layers.

Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
Signed-off-by: Martin Borg <martin.borg@enea.com>
---
 images/enea-image-base.bb     |  5 ----
 images/enea-image-extra.inc   | 62 +++++++++++++++++++++++++++++++++++++++
 images/enea-image-featured.bb | 68 -------------------------------------------
 3 files changed, 62 insertions(+), 73 deletions(-)
 delete mode 100644 images/enea-image-base.bb
 create mode 100644 images/enea-image-extra.inc
 delete mode 100644 images/enea-image-featured.bb

diff --git a/images/enea-image-base.bb b/images/enea-image-base.bb
deleted file mode 100644
index 41eba70..0000000
--- a/images/enea-image-base.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-DESCRIPTION = "console only image that fully suport target HW"
-require enea-image-common.inc
-
-IMAGE_ROOTFS_EXTRA_SPACE = "131072"
-IMAGE_OVERHEAD_FACTOR = "2"
diff --git a/images/enea-image-extra.inc b/images/enea-image-extra.inc
new file mode 100644
index 0000000..d22a96e
--- /dev/null
+++ b/images/enea-image-extra.inc
@@ -0,0 +1,62 @@
+IMAGE_FEATURES[validitems] += "read-only-rootfs empty-root-password allow-empty-password post-install-logging "
+
+IMAGE_FEATURES += " \
+                   dbg-pkgs \
+                   debug-tweaks \
+                   dev-pkgs \
+                   doc-pkgs \
+                   splash \
+                   staticdev-pkgs \
+                   eclipse-debug \
+                   hwcodecs \
+                   nfs-server \
+                   ssh-server-openssh \
+                   tools-debug \
+                   tools-profile \
+                   tools-sdk \
+                   tools-testapps \
+                   x11 \
+                   x11-base"
+
+IMAGE_INSTALL += " \
+    packagegroup-base \
+    packagegroup-enea-rt-tools \
+    ${ROOTFS_PKGMANAGE_BOOTSTRAP} \
+    beecrypt \
+    binutils \
+    chkconfig \
+    cracklib \
+    curl \
+    dhcp-client \
+    eventlog \
+    file \
+    findutils \
+    freetype \
+    fuse \
+    gawk \
+    gcc \
+    gnutls \
+    grep \
+    gzip \
+    icu \
+    kbd \
+    kernel-dev \
+    kernel-modules \
+    libgcrypt \
+    libgpg-error \
+    libtasn1 \
+    lsb \
+    lsbinitscripts \
+    mingetty \
+    openssh \
+    ossp-uuid \
+    perf \
+    pkgconfig \
+    procps \
+    psmisc \
+    rpm \
+    tar \
+    tipcutils \
+    udev-extraconf \
+    zip \
+    "
diff --git a/images/enea-image-featured.bb b/images/enea-image-featured.bb
deleted file mode 100644
index deeac76..0000000
--- a/images/enea-image-featured.bb
+++ /dev/null
@@ -1,68 +0,0 @@
-DESCRIPTION = "Full featured image with full target support"
-require enea-image-common.inc
-
-IMAGE_FEATURES[validitems] += "read-only-rootfs empty-root-password allow-empty-password post-install-logging "
-
-IMAGE_FEATURES += " \
-                   dbg-pkgs \
-                   debug-tweaks \
-                   dev-pkgs \
-                   doc-pkgs \
-                   splash \
-                   staticdev-pkgs \
-                   eclipse-debug \
-                   hwcodecs \
-                   nfs-server \
-                   ssh-server-openssh \
-                   tools-debug \
-                   tools-profile \
-                   tools-sdk \
-                   tools-testapps \
-                   x11 \
-                   x11-base"
-
-IMAGE_INSTALL += " \
-    packagegroup-base \
-    packagegroup-enea-rt-tools \
-    ${ROOTFS_PKGMANAGE_BOOTSTRAP} \
-    beecrypt \
-    binutils \
-    chkconfig \
-    cracklib \
-    curl \
-    dhcp-client \
-    eventlog \
-    file \
-    findutils \
-    freetype \
-    fuse \
-    gawk \
-    gcc \
-    gnutls \
-    grep \
-    gzip \
-    icu \
-    kbd \
-    kernel-dev \
-    kernel-modules \
-    libgcrypt \
-    libgpg-error \
-    libtasn1 \
-    lsb \
-    lsbinitscripts \
-    mingetty \
-    openssh \
-    ossp-uuid \
-    perf \
-    pkgconfig \
-    procps \
-    psmisc \
-    rpm \
-    tar \
-    tipcutils \
-    udev-extraconf \
-    zip \
-    "
-
-IMAGE_ROOTFS_EXTRA_SPACE = "1048576"
-IMAGE_OVERHEAD_FACTOR = "1.5"
-- 
cgit v1.2.3-54-g00ecf