diff options
Diffstat (limited to 'meta-linaro')
| -rw-r--r-- | meta-linaro/recipes-linaro/images/linaro-image-common.inc | 8 | ||||
| -rw-r--r-- | meta-linaro/recipes-linaro/images/linaro-image-lamp.bb | 6 |
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 += "\ |