aboutsummaryrefslogtreecommitdiff
path: root/meta-linaro
diff options
context:
space:
mode:
authorFathi Boudra <fathi.boudra@linaro.org>2013-07-23 17:46:21 +0300
committerFathi Boudra <fathi.boudra@linaro.org>2013-07-23 17:46:21 +0300
commit8f1b8691d4bd346a7c864cd95d1896ff6b65a963 (patch)
tree5a173daaabd8fd899e02bab703135d7b7837c8f8 /meta-linaro
parent9744d6e75237f1869e8618f35bcbab91c0f75e88 (diff)
downloadmeta-linaro-8f1b8691d4bd346a7c864cd95d1896ff6b65a963.tar.gz
lamp: remove LAMP_IMAGE_INSTALL (used in a lamp image only)
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Diffstat (limited to 'meta-linaro')
-rw-r--r--meta-linaro/recipes-linaro/images/linaro-image-common.inc8
-rw-r--r--meta-linaro/recipes-linaro/images/linaro-image-lamp.bb6
2 files changed, 5 insertions, 9 deletions
diff --git a/meta-linaro/recipes-linaro/images/linaro-image-common.inc b/meta-linaro/recipes-linaro/images/linaro-image-common.inc
index 5cb1d1a5..5aea9f2c 100644
--- a/meta-linaro/recipes-linaro/images/linaro-image-common.inc
+++ b/meta-linaro/recipes-linaro/images/linaro-image-common.inc
@@ -59,11 +59,3 @@ SDK_IMAGE_INSTALL += "\
sshfs-fuse \
xserver-xorg-xvfb \
"
-
-LAMP_IMAGE_INSTALL += "\
- apache2 \
- mysql5-server \
- mysql5-client \
- php-fpm \
- php-fpm-apache2 \
- "
diff --git a/meta-linaro/recipes-linaro/images/linaro-image-lamp.bb b/meta-linaro/recipes-linaro/images/linaro-image-lamp.bb
index d1d876c1..f03261ce 100644
--- a/meta-linaro/recipes-linaro/images/linaro-image-lamp.bb
+++ b/meta-linaro/recipes-linaro/images/linaro-image-lamp.bb
@@ -1,7 +1,11 @@
require linaro-image-common.inc
IMAGE_INSTALL += " \
- ${LAMP_IMAGE_INSTALL} \
+ apache2 \
+ mysql5-server \
+ mysql5-client \
+ php-fpm \
+ php-fpm-apache2 \
${SDK_IMAGE_INSTALL}"
IMAGE_FEATURES += "\