[oe-commits] org.oe.dev Unslung: /usr/bin/mkfs.ext3 - strange script to workaround an mke2fs failure

[mwester commit]

Unslung: /usr/bin/mkfs.ext3 - strange script to workaround an mke2fs failure

Author: mwester at openembedded.org
Branch: org.openembedded.dev
Revision: e3ec97ab62819c73e0116db91b2b7b2cb5a52ce6
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e3ec97ab62819c73e0116db91b2b7b2cb5a52ce6
Files:
1
packages/nslu2-binary-only/unslung-rootfs/mkfs.ext3
packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
mtn:execute
true
Diffs:

#
# mt diff -r3c3d3447ecce8bc436c1b4464f4031690e9ca9a3 -re3ec97ab62819c73e0116db91b2b7b2cb5a52ce6
#
# 
# 
# add_file "packages/nslu2-binary-only/unslung-rootfs/mkfs.ext3"
#  content [9d1ede887b8f5fe2152c3aa8869cf2ce0ce5d0f2]
# 
# patch "packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb"
#  from [3fa65c52609c743a3902240d2cb6da9a98f8de52]
#    to [8cdeaf94b445c5f3282e0cceb2456339d0f03b41]
# 
#   set "packages/nslu2-binary-only/unslung-rootfs/mkfs.ext3"
#  attr "mtn:execute"
# value "true"
# 
============================================================
--- packages/nslu2-binary-only/unslung-rootfs/mkfs.ext3	9d1ede887b8f5fe2152c3aa8869cf2ce0ce5d0f2
+++ packages/nslu2-binary-only/unslung-rootfs/mkfs.ext3	9d1ede887b8f5fe2152c3aa8869cf2ce0ce5d0f2
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# Fix obscure problem - redirect stdout iff mkfs.ext3
+# is being invoked by the Linksys GUI format utility.
+#
+u=`/bin/pidof utility.cgi`
+if [ ! -f "/tmp/Preparing" -o "x${u}" = "x" -o \
+     "y${1}" != "y-m" -o "z${2}" != "z1" ]
+then
+  /usr/bin/mke2fs -j $@
+else
+  /usr/bin/mke2fs -j $@ >/tmp/mkfs.$$.log
+fi
============================================================
--- packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb	3fa65c52609c743a3902240d2cb6da9a98f8de52
+++ packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb	8cdeaf94b445c5f3282e0cceb2456339d0f03b41
@@ -1,7 +1,7 @@ COMPATIBLE_MACHINE = "nslu2"
 SECTION = "base"
 COMPATIBLE_MACHINE = "nslu2"
 
-PR = "r18"
+PR = "r19"
 
 DEPENDS = "nslu2-linksys-libs nslu2-linksys-sambacodepages"
 
@@ -55,6 +55,7 @@ SRC_URI = "http://nslu.sf.net/downloads/
 	   file://upgrade.htm \
 	   file://telnet.htm \
 	   file://rc.bootbin \
+	   file://mkfs.ext3 \
 	   "
 
 S = "${WORKDIR}/nslu2-linksys-ramdisk-2.3r63"
@@ -163,6 +164,10 @@ do_compile () {
 	rm -f ${S}/bin/busybox
 	ln -s slingbox ${S}/bin/busybox
 
+	# Add in the kludge to fix the strange Linksys GUI format problem.
+	rm -f ${S}/usr/bin/mkfs.ext3
+	install -m 755 ${WORKDIR}/mkfs.ext3 ${S}/usr/bin/mkfs.ext3
+
 	# No reason not to have a home directory for root...
 	mkdir -p ${S}/root
 	chmod 755 ${S}/root