images: merge SDK into LAMP

All common parts move to linaro-image-common.inc as well.

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>

3 files changed, 61 insertions, 56 deletions

diff --git a/recipes-linaro/images/linaro-image-common.inc b/recipes-linaro/images/linaro-image-common.inc
index faf68076..67026591 100644
--- a/recipes-linaro/images/linaro-image-common.inc
+++ b/recipes-linaro/images/linaro-image-common.inc
@@ -1,11 +1,59 @@
 inherit core-image
 
-IMAGE_FEATURES += "ssh-server-openssh nfs-server"
+IMAGE_FEATURES += "ssh-server-openssh nfs-server package-management"
 
 IMAGE_INSTALL += " \
-	linaro-lava-tests \
-	sudo \
-	stress \
+    linaro-lava-tests \
+    sudo \
+    stress \
     "
 
 IMAGE_INSTALL_append_aarch64 += "perf"
+
+SDK_IMAGE_INSTALL += "\
+    ltp \
+    bison \
+    boost-date-time \
+    boost-filesystem \
+    boost-graph \
+    boost-iostreams \
+    boost-program-options \
+    boost-regex \
+    boost-signals \
+    boost-system \
+    boost-thread \
+    cmake \
+    curl \
+    elfutils-dev \
+    expat \
+    flex \
+    gd \
+    google-glog \
+    icu \
+    libbz2 \
+    libcap \
+    libc-client-dev \
+    libdwarf-dev \
+    libevent-fb \
+    libmcrypt \
+    libmemcached \
+    libmysqlclient-r \
+    libpam \
+    libpcre \
+    libxml2 \
+    ncurses \
+    onig \
+    openldap \
+    openssl \
+    readline \
+    tbb \
+    zlib \
+    "
+
+LAMP_IMAGE_INSTALL += "\
+    apache2 \
+    mysql5-server \
+    mysql5-client \
+    php-fpm \
+    php-fpm-apache2 \
+    "
diff --git a/recipes-linaro/images/linaro-image-lamp.bb b/recipes-linaro/images/linaro-image-lamp.bb
index e01e61f9..d1d876c1 100644
--- a/recipes-linaro/images/linaro-image-lamp.bb
+++ b/recipes-linaro/images/linaro-image-lamp.bb
@@ -1,13 +1,12 @@
 require linaro-image-common.inc
 
-PR = "r3"
+IMAGE_INSTALL += " \
+    ${LAMP_IMAGE_INSTALL} \
+    ${SDK_IMAGE_INSTALL}"
 
-IMAGE_INSTALL += "\
-	apache2 \
-	mysql5-server \
-	mysql5-client \
-	php-fpm \
-	php-fpm-apache2 \
+IMAGE_FEATURES += "\
+	dev-pkgs \
+	staticdev-pkgs \
+	tools-debug \
+	tools-sdk \
 	"
-
-IMAGE_FEATURES += "package-management"
diff --git a/recipes-linaro/images/linaro-image-sdk.bb b/recipes-linaro/images/linaro-image-sdk.bb
index ad23255b..560da602 100644
--- a/recipes-linaro/images/linaro-image-sdk.bb
+++ b/recipes-linaro/images/linaro-image-sdk.bb
@@ -2,53 +2,11 @@ require linaro-image-common.inc
 
 DESCRIPTION = "A small SDK based image for Linaro development work."
 
-PR = "r2"
-
-IMAGE_INSTALL += "\
-	ltp \
-	"
-
-# add hiphopvm dependencies
-
-IMAGE_INSTALL += " \
-	bison \
-	boost-date-time \
-	boost-filesystem \
-	boost-graph \
-	boost-iostreams \
-	boost-program-options \
-	boost-regex \
-	boost-signals \
-	boost-system \
-	boost-thread \
-	libbz2 \
-	cmake \
-	elfutils-dev \
-	expat \
-	flex \
-	gd \
-	google-glog \
-	icu \
-	libcap \
-	libevent-fb \
-	libmcrypt \
-	libmemcached \
-	libpam \
-	libxml2 \
-	libmysqlclient-r \
-	ncurses \
-	onig \
-	openldap \
-	openssl \
-	libpcre \
-	readline \
-	zlib \
-	"
+IMAGE_INSTALL += "${SDK_IMAGE_INSTALL}"
 
 IMAGE_FEATURES += "\
 	dev-pkgs \
 	staticdev-pkgs \
 	tools-debug \
 	tools-sdk \
-	package-management \
 	"