[oe-commits] org.oe.dev slugos: Removed SLUGOS_IMAGESEX from throughout OE.
rwhitby commit
openembedded-commits at lists.openembedded.org
Sat Feb 10 07:14:19 UTC 2007
slugos: Removed SLUGOS_IMAGESEX from throughout OE.
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 0e24d38b9011c1e7581662d5be7170550f68b553
ViewMTN: http://monotone.openembedded.org/revision.psp?id=0e24d38b9011c1e7581662d5be7170550f68b553
Files:
1
conf/distro/debianslug.conf
conf/distro/include/slugos.inc
conf/distro/openslug.conf
conf/distro/slugos-bag.conf
conf/distro/slugos-bau.conf
conf/distro/slugos-btu.conf
conf/distro/slugos-lag.conf
conf/distro/slugos-lau.conf
conf/distro/slugos-ltu.conf
conf/distro/ucslugc.conf
packages/images/slugos-image.bb
Diffs:
#
# mt diff -r321479165e1f2e924a601111b7d8499cc9ffb21c -r0e24d38b9011c1e7581662d5be7170550f68b553
#
#
#
# patch "conf/distro/debianslug.conf"
# from [f4f30bf844d7a0813d41c970c7b39512312333c4]
# to [e1660e2028a0b188963536ad35b1d3912dd46574]
#
# patch "conf/distro/include/slugos.inc"
# from [07a39fe44f1f6da9336d25c8c6c02ef8a0456ee0]
# to [b3b4a108f2122557319bc86b8db1e7149f1f9ef8]
#
# patch "conf/distro/openslug.conf"
# from [3a7598c081f53efa5f5b901793a24c6421ecfbe0]
# to [1f1752f121c41c9671323bcc4b257cf675c1f55b]
#
# patch "conf/distro/slugos-bag.conf"
# from [b1cae4f34ebd3458531921646c97f97e71536557]
# to [824461c2480ff65f13f4abf90eaa74b660f59de6]
#
# patch "conf/distro/slugos-bau.conf"
# from [ded5625be92aceb5415ac85b0c9051665168997a]
# to [97f47a4d37fe29c6840cafc58d69d408355e029c]
#
# patch "conf/distro/slugos-btu.conf"
# from [66c9017c8c300480048099da1ff17cf465a821aa]
# to [3ac983cff54c16fcec1a01cb1bdf20b4ac5d7b72]
#
# patch "conf/distro/slugos-lag.conf"
# from [d9636daa430c0778e7f8bef652d54fb5b0da2c2c]
# to [b5983db4f9b4de00b3a1dc87c1dda77ffdd39a85]
#
# patch "conf/distro/slugos-lau.conf"
# from [cc5643763553fd36ff8f534fe1400faaf03aba4f]
# to [cb13adfc1a65b9979156f55056c8e91dbbcc5294]
#
# patch "conf/distro/slugos-ltu.conf"
# from [65d4138a81916c61ebf83441e3d1377fcee0bfd8]
# to [7a3f72ba60793ebb2eb879f0bd1941ce82899038]
#
# patch "conf/distro/ucslugc.conf"
# from [5b6ce47256280cbb05e262758319f4cf9e10db83]
# to [c6a8f0f2103720cec4c21f096052520134bee9ac]
#
# patch "packages/images/slugos-image.bb"
# from [6874aabb6f1eef6c77d9d9c2c4177e32a54bbf26]
# to [feb67be71a78e5d87e29a1a001ff134e032ff130]
#
============================================================
--- conf/distro/debianslug.conf f4f30bf844d7a0813d41c970c7b39512312333c4
+++ conf/distro/debianslug.conf e1660e2028a0b188963536ad35b1d3912dd46574
@@ -10,7 +10,6 @@ SLUGOS_IMAGENAME = "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"
============================================================
--- conf/distro/include/slugos.inc 07a39fe44f1f6da9336d25c8c6c02ef8a0456ee0
+++ conf/distro/include/slugos.inc b3b4a108f2122557319bc86b8db1e7149f1f9ef8
@@ -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"
============================================================
--- conf/distro/openslug.conf 3a7598c081f53efa5f5b901793a24c6421ecfbe0
+++ conf/distro/openslug.conf 1f1752f121c41c9671323bcc4b257cf675c1f55b
@@ -10,7 +10,6 @@ SLUGOS_IMAGENAME = "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"
============================================================
--- conf/distro/slugos-bag.conf b1cae4f34ebd3458531921646c97f97e71536557
+++ conf/distro/slugos-bag.conf 824461c2480ff65f13f4abf90eaa74b660f59de6
@@ -13,7 +13,6 @@ TARGET_OS = "linux"
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}"
============================================================
--- conf/distro/slugos-bau.conf ded5625be92aceb5415ac85b0c9051665168997a
+++ conf/distro/slugos-bau.conf 97f47a4d37fe29c6840cafc58d69d408355e029c
@@ -14,6 +14,5 @@ TARGET_OS = "linux-uclibc"
TARGET_ARCH = "armeb"
ARM_INSTRUCTION_SET = "arm"
TARGET_OS = "linux-uclibc"
-SLUGOS_IMAGESEX ?= "big-endian"
require conf/distro/include/slugos.inc
============================================================
--- conf/distro/slugos-btu.conf 66c9017c8c300480048099da1ff17cf465a821aa
+++ conf/distro/slugos-btu.conf 3ac983cff54c16fcec1a01cb1bdf20b4ac5d7b72
@@ -13,7 +13,6 @@ TARGET_OS = "linux-uclibc"
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}"
============================================================
--- conf/distro/slugos-lag.conf d9636daa430c0778e7f8bef652d54fb5b0da2c2c
+++ conf/distro/slugos-lag.conf b5983db4f9b4de00b3a1dc87c1dda77ffdd39a85
@@ -13,7 +13,6 @@ TARGET_OS = "linux"
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}"
============================================================
--- conf/distro/slugos-lau.conf cc5643763553fd36ff8f534fe1400faaf03aba4f
+++ conf/distro/slugos-lau.conf cb13adfc1a65b9979156f55056c8e91dbbcc5294
@@ -12,7 +12,6 @@ TARGET_OS = "linux-uclibc"
TARGET_ARCH = "arm"
ARM_INSTRUCTION_SET = "arm"
TARGET_OS = "linux-uclibc"
-SLUGOS_IMAGESEX ?= "big-endian"
# no feeds
============================================================
--- conf/distro/slugos-ltu.conf 65d4138a81916c61ebf83441e3d1377fcee0bfd8
+++ conf/distro/slugos-ltu.conf 7a3f72ba60793ebb2eb879f0bd1941ce82899038
@@ -12,7 +12,6 @@ TARGET_OS = "linux-uclibc"
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}"
============================================================
--- conf/distro/ucslugc.conf 5b6ce47256280cbb05e262758319f4cf9e10db83
+++ conf/distro/ucslugc.conf c6a8f0f2103720cec4c21f096052520134bee9ac
@@ -8,7 +8,6 @@ SLUGOS_IMAGENAME = "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"
============================================================
--- packages/images/slugos-image.bb 6874aabb6f1eef6c77d9d9c2c4177e32a54bbf26
+++ packages/images/slugos-image.bb feb67be71a78e5d87e29a1a001ff134e032ff130
@@ -15,7 +15,7 @@ IMAGE_FSTYPES = "jffs2"
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 @@ python () {
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")
}
More information about the Openembedded-commits
mailing list