diff options
author | Mike Westerhof <mwester@dls.net> | 2011-01-22 18:17:28 -0600 |
---|---|---|
committer | Mike Westerhof <mwester@dls.net> | 2011-01-22 18:17:28 -0600 |
commit | 991070017a7dcc05875ba7640948666be7a577b9 (patch) | |
tree | d73c3e24911a1d026a83dd7aa4b6488b50324ded | |
parent | 62d11f2018928cccdd7a1c3917000120a7e0d356 (diff) | |
download | openembedded-991070017a7dcc05875ba7640948666be7a577b9.tar.gz |
SlugOS: slugos images - add machine name to the image name
This change is required to enable SlugOS to be built for multiple
machines in the same tmpdir.
-rw-r--r-- | recipes/images/slugos-extd-image.bb | 4 | ||||
-rw-r--r-- | recipes/images/slugos-image.inc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/recipes/images/slugos-extd-image.bb b/recipes/images/slugos-extd-image.bb index 6995b8f773..153bace29e 100644 --- a/recipes/images/slugos-extd-image.bb +++ b/recipes/images/slugos-extd-image.bb @@ -5,11 +5,11 @@ DESCRIPTION = "SlugOS Extended image" -PR = "r2" +PR = "r3" require slugos-image.inc -IMAGE_NAME = "${IMAGE_BASENAME}-extd-${DISTRO_VERSION}" +IMAGE_NAME = "${IMAGE_BASENAME}-extd-${DISTRO_VERSION}-${MACHINE}" IMAGE_LINK_NAME = "${IMAGE_BASENAME}-extd-${MACHINE}" DEPENDS += "task-slugos-extd" IMAGE_INSTALL += "task-slugos-extd" diff --git a/recipes/images/slugos-image.inc b/recipes/images/slugos-image.inc index aca665f8c7..85c2d6af46 100644 --- a/recipes/images/slugos-image.inc +++ b/recipes/images/slugos-image.inc @@ -17,9 +17,9 @@ IMAGE_INSTALL = "task-slugos" COMPATIBLE_MACHINE = "(nslu2|ixp4xx|sheevaplug|qemuarm)" -IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}" +IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}" IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}" -IMAGE_FSTYPES = "jffs2 tar.gz" +IMAGE_FSTYPES = "jffs2 tar.gz ext2.gz" IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt" IMAGE_LINGUAS = "" |