summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Gilles <jgilles@multitech.com>2011-09-14 11:26:16 -0500
committerJesse Gilles <jgilles@multitech.com>2011-09-14 11:26:16 -0500
commitc21efb1b59e787cfc5845a67868c76a1e90b16bd (patch)
tree51cc003bae09ffd6b48729ab984d54c335dc629a
parent8f7db558b65f8264372f4d6d8af1848baf3bc485 (diff)
parent9b2e32f170ef283b6d183c8b1cdd92b2a608a62f (diff)
Merge branch 'master' of sw.multitech.prv:/usr/local/git/jjg/corecdp-dev
-rw-r--r--multitech/recipes/initscripts/initscripts-1.0/corecdp/umountfs7
-rw-r--r--multitech/recipes/initscripts/initscripts_1.0.bbappend2
2 files changed, 8 insertions, 1 deletions
diff --git a/multitech/recipes/initscripts/initscripts-1.0/corecdp/umountfs b/multitech/recipes/initscripts/initscripts-1.0/corecdp/umountfs
index 871f538..a0d7155 100644
--- a/multitech/recipes/initscripts/initscripts-1.0/corecdp/umountfs
+++ b/multitech/recipes/initscripts/initscripts-1.0/corecdp/umountfs
@@ -73,11 +73,16 @@ flash_upgrade() {
return
fi
+ echo ""
+ echo "Starting flash upgrade from ${flash_dir}..."
+
if [ -f ${uImage_file} ]; then
echo "Flashing ${uImage_mtd} (uImage) with ${uImage_file}..."
flash_eraseall ${uImage_mtd}
nandwrite -p ${uImage_mtd} ${uImage_file}
+ else
+ echo "uImage file ${uImage_file} not found"
fi
if [ -f ${rootfs_file} ]; then
@@ -105,6 +110,8 @@ flash_upgrade() {
# Should not get here normally
echo "upgrade-reboot failed"
exit 1
+ else
+ echo "rootfs file ${rootfs_file} not found"
fi
}
diff --git a/multitech/recipes/initscripts/initscripts_1.0.bbappend b/multitech/recipes/initscripts/initscripts_1.0.bbappend
index 3a98f61..93284e0 100644
--- a/multitech/recipes/initscripts/initscripts_1.0.bbappend
+++ b/multitech/recipes/initscripts/initscripts_1.0.bbappend
@@ -1,4 +1,4 @@
FILESEXTRA := "${THISDIR}"
FILESPATHBASE =. "${FILESEXTRA}:"
-PR .= ".corecdp1"
+PR .= ".corecdp2"