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.

diff --git a/recipes/images/slugos-extd-image.bb b/recipes/images/slugos-extd-image.bb
index 6995b8f..153bace 100644 (file)
--- 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 aca665f..85c2d6a 100644 (file)
--- 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 = ""