Verified Commit d88ed86f authored by Karel Koci's avatar Karel Koci 🤘
Browse files

Merge branch 'hotfix/nor-update' into develop

parents 29178282 27ffdc9e
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=turris-nor-update PKG_NAME:=turris-nor-update
PKG_VERSION:=1.0 PKG_VERSION:=1.0.1
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz> PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz>
......
...@@ -67,11 +67,11 @@ flash() { ...@@ -67,11 +67,11 @@ flash() {
shift 2 shift 2
while [ -n "${1:+x}" ] && [ ! -r "$1" ]; do while [ "$# -gt 0 ] && [ ! -r "$1" ]; do
shift shift
done done
if [ -z "${1:+x}" ]; then if [ "$#" -eq 0 ]; then
echo "Can't find anything to flash to '$flashing' partition" echo "Can't find anything to flash to '$flashing' partition"
return 0 return 0
fi fi
...@@ -81,7 +81,6 @@ flash() { ...@@ -81,7 +81,6 @@ flash() {
fi fi
v_echo "Checking and flashing '$flashing' partition: $1 -> /dev/$part" v_echo "Checking and flashing '$flashing' partition: $1 -> /dev/$part"
return 0 # TODO remove
if mtd verify "$1" "/dev/$part"; then if mtd verify "$1" "/dev/$part"; then
v_echo "Partition with $flashing was up to date already." v_echo "Partition with $flashing was up to date already."
else else
...@@ -140,7 +139,7 @@ fix_boot_scr ...@@ -140,7 +139,7 @@ fix_boot_scr
# To simplify the configuration so we can use relative paths for parts of the firmware # To simplify the configuration so we can use relative paths for parts of the firmware
cd "/usr/share/nor-update/" cd "/usr/share/nor-update/"
if [ -n "$DEVEL" ]; then if [ -z "$DEVEL" ]; then
SECURE_FIRMWARE_DEVEL="" SECURE_FIRMWARE_DEVEL=""
UBOOT_DEVEL="" UBOOT_DEVEL=""
RESCUE_DEVEL="" RESCUE_DEVEL=""
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment