[oe-commits] org.oe.dev slugos-init: reflash - added support for the DSM-G600 flash image format
mwester commit
openembedded-commits at lists.openembedded.org
Sun Dec 24 08:04:18 UTC 2006
slugos-init: reflash - added support for the DSM-G600 flash image format
Author: mwester at openembedded.org
Branch: org.openembedded.dev
Revision: 99ee044261525e1f0b08f49f73d9a39028c8dcc7
ViewMTN: http://monotone.openembedded.org/revision.psp?id=99ee044261525e1f0b08f49f73d9a39028c8dcc7
Files:
1
packages/slugos-init/files/reflash
packages/slugos-init/slugos-init_0.10.bb
Diffs:
#
# mt diff -r49f9287272ddf4c93c47c0d79762d5a118ea468f -r99ee044261525e1f0b08f49f73d9a39028c8dcc7
#
#
#
# patch "packages/slugos-init/files/reflash"
# from [b9e8ddd30e342bf31afb7bfe9941617f44914c41]
# to [3a39f5ea29b40145eba2c41f11429645a3e26d9f]
#
# patch "packages/slugos-init/slugos-init_0.10.bb"
# from [df6d80351d45ed8cdfe76a4fbb744cf1a5a25db5]
# to [7a48adabeaeb691db278d11f7dc5f773425eed4a]
#
============================================================
--- packages/slugos-init/files/reflash b9e8ddd30e342bf31afb7bfe9941617f44914c41
+++ packages/slugos-init/files/reflash 3a39f5ea29b40145eba2c41f11429645a3e26d9f
@@ -16,10 +16,23 @@ nslu2)
case "$(machine)" in
nslu2)
isnslu2=1
+ isdsmg600=
+ imageok=1
+ usrpart=
kpart="Kernel"
ffspart="Flashdisk";;
+dsmg600)
+ isnslu2=
+ isdsmg600=1
+ imageok=1
+ usrpart="usr"
+ kpart="kernel"
+ ffspart="filesystem";;
*)
isnslu2=
+ isdsmg600=
+ imageok=
+ usrpart=
kpart="kernel"
ffspart="filesystem";;
esac
@@ -32,9 +45,12 @@ imgfile=
ffsfile=
kfile=
imgfile=
+preserve_config=1
while test $# -gt 0
do
case "$1" in
+ -n) preserve_config=
+ shift;;
-k) shift
test $# -gt 0 || {
echo "reflash: -k: give the file containing the kernel image" >&2
@@ -50,9 +66,10 @@ do
ffsfile="$1"
shift;;
-i) shift
- test -n "$isnslu2" || {
- echo "reflash: -i: only supported on the LinkSys NSLU2" >&2
- echo " use -k and -j to specify the kernel and root file system" >&2
+ test -n "$imageok" || {
+ echo "reflash: -i: only supported on the LinkSys NSLU2" >&2
+ echo " and the D-Link DSM-G600 systems; use -k and -j" >&2
+ echo " to specify the kernel and root file system instead." >&2
exit 1
}
test $# -gt 0 || {
@@ -61,15 +78,16 @@ do
}
imgfile="$1"
shift;;
- *) if test -n "$isnslu2"
+ *) if test -n "$imageok"
then
- echo "reflash: usage: $0 [-k kernel] [-j rootfs] [-i image]" >&2
+ echo "reflash: usage: $0 [-n] [-k kernel] [-j rootfs] [-i image]" >&2
else
- echo "reflash: usage: $0 [-k kernel] [-j rootfs]" >&2
+ echo "reflash: usage: $0 [-n] [-k kernel] [-j rootfs]" >&2
fi
+ echo " -n: do not attempt to preserve the configuration" >&2
echo " -k file: the new compressed kernel image ('zImage')" >&2
echo " -j file: the new root file system (jffs2)" >&2
- test -n "$isnslu2" &&
+ test -n "$imageok" &&
echo " -i file: a complete flash image (gives both kernel and jffs2)" >&2
echo " The current jffs2 will be umounted if mounted." >&2
exit 1;;
@@ -77,7 +95,7 @@ done
done
#
# Sanity check on the arguments (note that the first case can only fire
-# on NSLU2 because of the check for -i above.)
+# on NSLU2 or DSM-G600 because of the check for -i above.)
if test -n "$imgfile" -a -n "$ffsfile" -a -n "$kfile"
then
echo "reflash: specify at most two files" >&2
@@ -93,7 +111,7 @@ then
# Perform basic checks on the input (must exist, size must be ok).
if test -n "$imgfile"
then
- if test -r "$imgfile"
+ if test -r "$imgfile" -a -n "$isnslu2"
then
# read the partition table and from this find the offset
# and size of $kpart and $ffspart partitions. The following
@@ -162,6 +180,53 @@ EOI
echo "reflash: $imgfile: failed to find $ffspart" >&2
exit 1
}
+ elif test -r "$imgfile" -a -n "$isdsmg600"
+ then
+ #
+ # For the DSM-G600, this is really easy - the image is just
+ # a tar file. So, extract the contents of the tar file, and
+ # set the kernel and filesystem variables (if not already set)
+ # to point to the extracted content. Content will look like:
+ #
+ # drwxr-xr-x 500/500 0 2006-11-25 23:47:59 firmupgrade
+ # -rw-r--r-- 500/500 4718592 2006-12-02 16:32:51 firmupgrade/rootfs.gz
+ # -rw-r--r-- 500/500 40 2006-11-25 22:15:41 firmupgrade/version.msg
+ # -rw-r--r-- 500/500 0 2006-11-25 23:47:59 firmupgrade/usr.cramfs
+ # -rw-rw-r-- 500/500 1306872 2006-12-02 16:33:37 firmupgrade/ip-ramdisk
+ #
+ # Heuristic: if the size of usr.cramfs is zero, the firmware
+ # is not a D-Link firmware for the device. (The version.msg
+ # file is not useful for this purpose; it describes the hardware,
+ # not the firmware version in the image!)
+ #
+ # TODO: If usr.cramfs is non-zero, we should flash that, too, just
+ # to make sure that it matches the native firmware's kernel
+ # and rootfs that we're now flashing back onto the device.
+
+ echo "reflash: unpacking DSM-G600 image file" >&2
+ tar -x -f "$imgfile" -C /var/tmp || {
+ echo "reflash: unable to unpack image file to be flashed" >&2
+ exit 1
+ }
+
+ if test -z "$kfile"
+ then
+ kfile="/var/tmp/firmupgrade/ip-ramdisk"
+ fi
+
+ if test -z "$ffsfile"
+ then
+ ffsfile="/var/tmp/firmupgrade/rootfs.gz"
+ fi
+
+ if test -s "/var/tmp/firmupgrade/usr.cramfs"
+ then
+ echo "reflash: Native flash being restored" >&2
+ usrfile="/var/tmp/firmupgrade/usr.cramfs"
+ preserve_config=
+ dsmg600_native_flash=1
+ fi
+
else
echo "reflash: $imgfile: image file not found" >&2
exit 1
@@ -193,6 +258,19 @@ fi
else
ffsfile="$imgfile"
fi
+if test -n "$usrfile"
+then
+ if test ! -r "$usrfile"
+ then
+ echo "reflash: $usrfile: usr file system image file not found" >&2
+ exit 1
+ fi
+ # values override those from the image
+ imgusrsize="$(devio "<<$usrfile" 'pr$')"
+ imgusroffset=0
+else
+ usrfile=
+fi
#
# INPUTS OK, CHECKING THE ENVIRONMENT
# -----------------------------------
@@ -238,6 +316,26 @@ fi
exit 1
}
fi
+#
+usrdev=
+usrsize=0
+if test -n "$usrfile"
+then
+ usrdev="$(mtblockdev $usrpart)"
+ test -n "$usrdev" -a -b "$usrdev" || {
+ echo "reflash: $usrpart($usrdev): cannot find $usrpart mtd partition." >&2
+ echo " check /proc/mtd, either the partition does not exist or there is no" >&2
+ echo " corresponding block device." >&2
+ exit 1
+ }
+ usrsize="$(devio "<<$usrdev" 'pr$')"
+ #
+ # check the input file size
+ test -n "$imgusrsize" -a "$imgusrsize" -gt 0 -a "$imgusrsize" -le "$usrsize" || {
+ echo "reflash: $usrfile: bad $usrpart size ($imgusrsize, max $usrsize)" >&2
+ exit 1
+ }
+fi
#
# INPUTS OK, ENVIRONMENT OK, UMOUNT ANY EXISTING MOUNT OF THE FLASHDISK
@@ -280,7 +378,7 @@ fi
# PRESERVE EXISTING CONFIGURATION
# -------------------------------
# Only required if the flash partition will be written
-if test -n "$ffsdev"
+if test -n "$ffsdev" -a -n "$preserve_config"
then
echo "reflash: preserving existing configuration file" >&2
#
@@ -352,6 +450,14 @@ do_ffs() {
fb #t-,255'
}
#
+do_usr() {
+ devio $progress "$@" "<<$usrfile" ">>$usrdev" '
+ # usrfs is at imgusroffset[imgusrsize]
+ ' "<= $imgusroffset" "cp $imgusrsize" '
+ # fill with 255
+ fb #t-,255'
+}
+#
# check_status $? type file(offset,size) device
# check the devio status code (given in $1)
check_status() {
@@ -384,6 +490,13 @@ check_status() {
esac
}
#
+if test -n "$usrdev"
+then
+ echo -n "reflash: writing usrfs to $usrdev " >&2
+ do_usr
+ check_status $? usrfs "$usrfile($imgusroffset,$imgusrsize)" "$usrdev"
+fi
+#
if test -n "$ffsdev"
then
echo -n "reflash: writing rootfs to $ffsdev " >&2
@@ -399,6 +512,19 @@ fi
fi
#
# verify - this just produces a warning
+if test -n "$usrdev"
+then
+ echo -n "reflash: verifying new usr image " >&2
+ if do_usr -v
+ then
+ echo " done" >&2
+ else
+ echo " failed" >&2
+ echo "reflash: WARNING: usrfs flash image verification failed" >&2
+ echo " The system is may be bootable." >&2
+ fi
+fi
+#
if test -n "$ffsdev"
then
echo -n "reflash: verifying new flash image " >&2
@@ -432,7 +558,7 @@ fi
# RESTORE THE OLD CONFIGURATION
# -----------------------------
# If not write the rootfs none of the following is required - exit now.
-test -n "$ffsdev" || exit 0
+test -n "$ffsdev" -a -n "$preserve_config" || exit 0
#
echo "reflash: restoring saved configuration files" >&2
#
============================================================
--- packages/slugos-init/slugos-init_0.10.bb df6d80351d45ed8cdfe76a4fbb744cf1a5a25db5
+++ packages/slugos-init/slugos-init_0.10.bb 7a48adabeaeb691db278d11f7dc5f773425eed4a
@@ -1,10 +1,10 @@ RDEPENDS = "busybox devio"
DESCRIPTION = "SlugOS initial network config via sysconf"
SECTION = "base"
PRIORITY = "required"
LICENSE = "GPL"
DEPENDS = "base-files devio"
RDEPENDS = "busybox devio"
-PR = "r76"
+PR = "r77"
SRC_URI = "file://boot/flash \
file://boot/disk \
More information about the Openembedded-commits
mailing list