slugos: Removed SLUGOS_IMAGESEX from throughout OE.

11 files changed, 2 insertions, 12 deletions

diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf
index 2a33ad4164..f85b175338 100644
--- a/conf/distro/debianslug.conf
+++ b/conf/distro/debianslug.conf
@@ -10,7 +10,6 @@ DISTRO_NAME = "DebianSlug"
 # DISTRO_FEED = "unstable"
 DISTRO_TYPE = "beta"
 SLUGOS_IMAGENAME = "debianslug"
-SLUGOS_IMAGESEX  = "little-endian"
 
 # debianslug builds a complete image (not just the parts)
 SLUGOS_FLASH_IMAGE = "1"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index c0401d93d3..13f6bad29c 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -46,7 +46,6 @@ DISTRO_FEED ?= "unstable"
 #
 #ARM_INSTRUCTION_SET "arm" or "thumb"
 #TARGET_OS "linux" or "linux-uclibc"
-#SLUGOS_IMAGESEX "big-endian" or "little-endian" (JFFS2 format)
 
 # The following need not be set, the defaults should be adequate
 #USE_NLS = "no" or "yes"
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 02becf3bae..616298ad52 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -10,7 +10,6 @@ DISTRO_NAME = "OpenSlug"
 # DISTRO_FEED = "unstable"
 DISTRO_TYPE = "beta"
 SLUGOS_IMAGENAME = "openslug"
-SLUGOS_IMAGESEX  = "big-endian"
 
 # openslug builds a complete image (not just the parts)
 SLUGOS_FLASH_IMAGE = "1"
diff --git a/conf/distro/slugos-bag.conf b/conf/distro/slugos-bag.conf
index 23e8690752..cca21bffc1 100644
--- a/conf/distro/slugos-bag.conf
+++ b/conf/distro/slugos-bag.conf
@@ -13,7 +13,6 @@ DISTRO_TYPE ?= "beta"
 TARGET_ARCH = "armeb"
 ARM_INSTRUCTION_SET = "arm"
 TARGET_OS = "linux"
-SLUGOS_IMAGESEX  ?= "big-endian"
 
 FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/slugos-bag/cross/${DISTRO_FEED}"
 FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/slugos-bag/native/${DISTRO_FEED}"
diff --git a/conf/distro/slugos-bau.conf b/conf/distro/slugos-bau.conf
index 5e461ff063..e204033c4f 100644
--- a/conf/distro/slugos-bau.conf
+++ b/conf/distro/slugos-bau.conf
@@ -14,6 +14,5 @@ DISTRO_TYPE ?= "alpha"
 TARGET_ARCH = "armeb"
 ARM_INSTRUCTION_SET = "arm"
 TARGET_OS = "linux-uclibc"
-SLUGOS_IMAGESEX  ?= "big-endian"
 
 require conf/distro/include/slugos.inc
diff --git a/conf/distro/slugos-btu.conf b/conf/distro/slugos-btu.conf
index 4fbdd9e37b..24228737bb 100644
--- a/conf/distro/slugos-btu.conf
+++ b/conf/distro/slugos-btu.conf
@@ -13,7 +13,6 @@ DISTRO_TYPE ?= "beta"
 TARGET_ARCH = "armeb"
 ARM_INSTRUCTION_SET = "thumb"
 TARGET_OS = "linux-uclibc"
-SLUGOS_IMAGESEX  ?= "big-endian"
 
 FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/slugos-btu/cross/${DISTRO_FEED}"
 FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/slugos-btu/native/${DISTRO_FEED}"
diff --git a/conf/distro/slugos-lag.conf b/conf/distro/slugos-lag.conf
index 838d6cf48b..b0c8d86041 100644
--- a/conf/distro/slugos-lag.conf
+++ b/conf/distro/slugos-lag.conf
@@ -13,7 +13,6 @@ DISTRO_TYPE ?= "beta"
 TARGET_ARCH = "arm"
 ARM_INSTRUCTION_SET = "arm"
 TARGET_OS = "linux"
-SLUGOS_IMAGESEX  ?= "big-endian"
 
 FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/slugos-lag/cross/${DISTRO_FEED}"
 FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/slugos-lag/native/${DISTRO_FEED}"
diff --git a/conf/distro/slugos-lau.conf b/conf/distro/slugos-lau.conf
index 7294c1dfd2..a35fbffcb6 100644
--- a/conf/distro/slugos-lau.conf
+++ b/conf/distro/slugos-lau.conf
@@ -12,7 +12,6 @@ DISTRO_TYPE ?= "alpha"
 TARGET_ARCH = "arm"
 ARM_INSTRUCTION_SET = "arm"
 TARGET_OS = "linux-uclibc"
-SLUGOS_IMAGESEX  ?= "big-endian"
 
 # no feeds
 
diff --git a/conf/distro/slugos-ltu.conf b/conf/distro/slugos-ltu.conf
index 53fbb407a7..6defe0dd02 100644
--- a/conf/distro/slugos-ltu.conf
+++ b/conf/distro/slugos-ltu.conf
@@ -12,7 +12,6 @@ DISTRO_TYPE ?= "beta"
 TARGET_ARCH = "arm"
 ARM_INSTRUCTION_SET = "thumb"
 TARGET_OS = "linux-uclibc"
-SLUGOS_IMAGESEX  ?= "big-endian"
 
 FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/slugos-ltu/cross/${DISTRO_FEED}"
 FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/slugos-ltu/native/${DISTRO_FEED}"
diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf
index 81d5ea7397..ba8a12346b 100644
--- a/conf/distro/ucslugc.conf
+++ b/conf/distro/ucslugc.conf
@@ -8,7 +8,6 @@ DISTRO_NAME = "UcSlugC"
 # DISTRO_FEED = "unstable"
 DISTRO_TYPE = "beta"
 SLUGOS_IMAGENAME = "ucslugc"
-SLUGOS_IMAGESEX  = "big-endian"
 
 PREFERRED_VERSION_gcc-cross-initial = "3.4.4"
 PREFERRED_VERSION_gcc-cross = "3.4.4"
diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb
index 5d7fed7cb5..3a3e5f49a8 100644
--- a/packages/images/slugos-image.bb
+++ b/packages/images/slugos-image.bb
@@ -15,7 +15,7 @@ COMPATIBLE_MACHINE = "nslu2"
 IMAGE_BASENAME = "${SLUGOS_IMAGENAME}"
 IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DISTRO_VERSION}"
 IMAGE_FSTYPES = "jffs2"
-EXTRA_IMAGECMD_jffs2 = "--pad --${SLUGOS_IMAGESEX} --eraseblock=0x20000 -D ${SLUGOS_DEVICE_TABLE}"
+EXTRA_IMAGECMD_jffs2 += " -D ${SLUGOS_DEVICE_TABLE}"
 IMAGE_LINGUAS = ""
 
 # Setting USE_DEVFS prevents *any* entries being created initially
@@ -98,7 +98,7 @@ inherit image
 python () {
     # Don't build slugos images unless the configuration is set up
     # for an image build!
-    if bb.data.getVar("SLUGOS_IMAGENAME", d, 1) == '' or bb.data.getVar("SLUGOS_IMAGESEX", d, 1) == '':
+    if bb.data.getVar("SLUGOS_IMAGENAME", d, 1) == '':
         raise bb.parse.SkipPackage("absent or broken SlugOS configuration")
 }