diff options
| author | Fathi Boudra <fathi.boudra@linaro.org> | 2014-09-24 09:13:43 +0300 |
|---|---|---|
| committer | Fathi Boudra <fathi.boudra@linaro.org> | 2014-09-25 10:17:28 +0000 |
| commit | 26f69d73dcdf9b742e90105cc9779d359fd3adc5 (patch) | |
| tree | 98fc2d3c14a1d7fd8f32320e5ff8e7d3be1c73d6 /meta-linaro/recipes-linaro | |
| parent | 2e44ee2f579a770a28fffae2b5497c388b572041 (diff) | |
Revert "Add hugetlbfs support for all machines"
reverts commit 7345c6089b2afbf65baf64224c14bbb9d38e2241.
reverts commit 82fdd2f6ef2b6c54c729963d89787781acbd7441.
enable libhugetlbfs-tests on armv7a
Change-Id: Id1632d566775d7e6071138bb9776727fa16d7418
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Diffstat (limited to 'meta-linaro/recipes-linaro')
| -rw-r--r-- | meta-linaro/recipes-linaro/images/linaro-image-common.inc | 6 | ||||
| -rw-r--r-- | meta-linaro/recipes-linaro/images/linaro-image-lng.bb | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/meta-linaro/recipes-linaro/images/linaro-image-common.inc b/meta-linaro/recipes-linaro/images/linaro-image-common.inc index 50897b3f..57e545f3 100644 --- a/meta-linaro/recipes-linaro/images/linaro-image-common.inc +++ b/meta-linaro/recipes-linaro/images/linaro-image-common.inc @@ -2,6 +2,10 @@ inherit core-image IMAGE_FEATURES += "ssh-server-openssh nfs-server package-management" +HUGETLB_armv7a = "libhugetlbfs-tests" +HUGETLB_aarch64 = "libhugetlbfs-tests" +HUGETLB ?= "" + IMAGE_INSTALL += " \ bash \ e2fsprogs-e2fsck \ @@ -45,7 +49,6 @@ SDK_IMAGE_INSTALL += "\ libcap \ libdwarf-dev \ libevent-fb \ - libhugetlbfs-tests \ libmcrypt \ libmemcached \ libmysqlclient-r \ @@ -77,6 +80,7 @@ SDK_IMAGE_INSTALL += "\ xserver-xorg-xvfb \ xz \ zlib \ + ${HUGETLB} \ " IMAGE_PREPROCESS_COMMAND += "make_boot_verbose; " diff --git a/meta-linaro/recipes-linaro/images/linaro-image-lng.bb b/meta-linaro/recipes-linaro/images/linaro-image-lng.bb index 72655c87..7d46d68a 100644 --- a/meta-linaro/recipes-linaro/images/linaro-image-lng.bb +++ b/meta-linaro/recipes-linaro/images/linaro-image-lng.bb @@ -9,7 +9,6 @@ IMAGE_INSTALL += " \ daq-odp \ fping \ git \ - libhugetlbfs-tests \ lmbench \ lng-network-config \ ltp \ |