summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2007-02-14 22:54:38 +0000
committerRod Whitby <rod@whitby.id.au>2007-02-14 22:54:38 +0000
commit1c4bf67a97a157e0d7cf5756f29f78bac1139a57 (patch)
tree47fbd76b4f175aef7e8cb3f2ed7088176ffd2f93
parent0214d7fa642106d75d5602aec73a41c8048aa463 (diff)
slugos-image: Keep MACHINE in arch.conf, cause MACHINE is endian-specific now for SlugOS
-rw-r--r--packages/images/slugos-image.bb7
1 files changed, 1 insertions, 6 deletions
diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb
index ce591f7e4e..5ec1187c94 100644
--- a/packages/images/slugos-image.bb
+++ b/packages/images/slugos-image.bb
@@ -6,7 +6,7 @@
DESCRIPTION = "Generic SlugOS image"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r45"
+PR = "r46"
COMPATIBLE_MACHINE = "nslu2"
@@ -31,11 +31,6 @@ SLUGOS_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device
IMAGE_PREPROCESS_COMMAND += "rm ${IMAGE_ROOTFS}/boot/zImage*;"
IMAGE_PREPROCESS_COMMAND += "install -c -m 644 ${SLUGOS_DEVICE_TABLE} ${IMAGE_ROOTFS}/etc/device_table;"
-# This hack removes '${MACHINE}' from the end of the arch.conf for ipk,
-# preventing _mach.ipk (with no byte sex) taking precedence over everything
-# else.
-ROOTFS_POSTPROCESS_COMMAND += "sed -i '$d' '${IMAGE_ROOTFS}/etc/ipkg/arch.conf';"
-
SLUGOS_EXTRA_INSTALL ?= ""
DEPENDS = "task-slugos"