aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2006-11-29 12:06:39 +0000
committerRod Whitby <rod@whitby.id.au>2006-11-29 12:06:39 +0000
commit45e84e1e16a4f6adae35c692665dc1edf9e3c729 (patch)
treec86ded6274d07d4b84f6f6efb07f45d137093a13
parent7ef9f09d281e0529f5ae2aa21cd1ba2494b2527e (diff)
parent7d0259ee22ec926260473a4d6ff82f8420cb946b (diff)
downloadopenembedded-45e84e1e16a4f6adae35c692665dc1edf9e3c729.tar.gz
merge of '0bb5f3998d4f44cc03385e6faf36b48a3e409038'
and 'bf81f1dd32251679f83fb6d65f199538128566aa'
-rw-r--r--conf/distro/ludeos.conf36
-rw-r--r--conf/machine/include/ixp4xx.conf2
-rw-r--r--packages/images/ludeos-image.bb2
-rw-r--r--packages/meta/ludeos-packages.bb2
-rw-r--r--packages/slugimage/slugimage.bb4
5 files changed, 3 insertions, 43 deletions
diff --git a/conf/distro/ludeos.conf b/conf/distro/ludeos.conf
deleted file mode 100644
index c6722619f8..0000000000
--- a/conf/distro/ludeos.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-#@TYPE: Distribution
-#@NAME: LudeOS
-#@DESCRIPTION: LudeOS Linux Distribution for the Iomega NAS 100d
-
-DISTRO_NAME = "LudeOS"
-DISTRO_VERSION = "0.1-alpha"
-DISTRO_FEED = "unstable"
-DISTRO_TYPE = "beta"
-SLUGOS_IMAGENAME = "ludeos"
-SLUGOS_IMAGESEX = "little-endian"
-
-ARCH_BYTE_SEX = "le"
-ARM_INSTRUCTION_SET = "arm"
-TARGET_OS = "linux"
-
-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}"
-
-# This removes the dependency on upslug2-native.
-SLUGOS_NATIVE_DEPENDS = ""
-
-SLUGOS_EXTRA_RDEPENDS = "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck \
-kernel-module-ext2 \
-kernel-module-jbd \
-kernel-module-ext3 \
-kernel-module-nfs \
-kernel-module-vfat \
-kernel-module-ntfs \
-kernel-module-isofs \
-kernel-module-udf \
-kernel-module-reiserfs \
-kernel-module-nls-cp437 \
-kernel-module-nls-utf8 \
-"
-
-require conf/distro/include/slugos.inc
diff --git a/conf/machine/include/ixp4xx.conf b/conf/machine/include/ixp4xx.conf
index 190ebe1c8c..0aba653201 100644
--- a/conf/machine/include/ixp4xx.conf
+++ b/conf/machine/include/ixp4xx.conf
@@ -15,7 +15,7 @@
# <possible values>
# description
-ARCH_BYTE_SEX = "be"
+ARCH_BYTE_SEX = "le"
# "be" "le"
# The memory byte sex and (on correctly implemented hardware - the IXP4XX is
# correct) the byte sex of the buses within the system. 'be' (big-endian)
diff --git a/packages/images/ludeos-image.bb b/packages/images/ludeos-image.bb
deleted file mode 100644
index 0d8443c3e2..0000000000
--- a/packages/images/ludeos-image.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-DEPENDS = "slugos-image"
-COMPATIBLE_MACHINE = "nslu2"
diff --git a/packages/meta/ludeos-packages.bb b/packages/meta/ludeos-packages.bb
deleted file mode 100644
index 8607e435b4..0000000000
--- a/packages/meta/ludeos-packages.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-DEPENDS = "slugos-packages"
-COMPATIBLE_MACHINE = "nslu2"
diff --git a/packages/slugimage/slugimage.bb b/packages/slugimage/slugimage.bb
index a28fe206d1..60f66b9460 100644
--- a/packages/slugimage/slugimage.bb
+++ b/packages/slugimage/slugimage.bb
@@ -3,11 +3,11 @@ SECTION = "console/utils"
LICENSE = "BSD"
DESCRIPTION = "Slugimage is a small app to disassemble and reassemble \
flash images for the Linksys NSLU2 device. It also has jffs2 support"
-PR = "r8"
+PR = "r9"
RDEPENDS = "perl"
-SLUGIMAGE_SVN_REV ?= "78"
+SLUGIMAGE_SVN_REV ?= "81"
SLUGIMAGE_SVN_REPO ?= "http://svn.nslu2-linux.org/svnroot/slugimage/trunk"
addtask svnfetch before do_configure after do_patch