diff options
author | Amaury Pouly <amaury.pouly@gmail.com> | 2016-10-19 17:02:41 +0200 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2016-10-19 17:09:04 +0200 |
commit | 13d892eef1c78d14314b7d3a2cb9035e9ba1420c (patch) | |
tree | fdd330f4f0d5a1d317b63ac2faca1255c1c6e8b5 | |
parent | eaa1cb3469c1abef0433c1a23102b53d59e47814 (diff) | |
download | rockbox-13d892eef1c78d14314b7d3a2cb9035e9ba1420c.tar.gz rockbox-13d892eef1c78d14314b7d3a2cb9035e9ba1420c.zip |
nwztools: update makefile and add script
The new script allows the upgrade to execute a file found on the user partition.
Change-Id: I564941d01bcdbae050002e77cb119f3d95ecdc21
-rw-r--r-- | utils/nwztools/scripts/Makefile | 22 | ||||
-rw-r--r-- | utils/nwztools/scripts/exec_file.sh | 2 | ||||
-rw-r--r-- | utils/nwztools/scripts/exec_file_extern.sh.in | 54 |
3 files changed, 76 insertions, 2 deletions
diff --git a/utils/nwztools/scripts/Makefile b/utils/nwztools/scripts/Makefile index 36ccfbb496..207534a006 100644 --- a/utils/nwztools/scripts/Makefile +++ b/utils/nwztools/scripts/Makefile | |||
@@ -8,7 +8,8 @@ all: | |||
8 | @echo "- dump_rootfs: dumps the root filesystem to rootfs.tgz" | 8 | @echo "- dump_rootfs: dumps the root filesystem to rootfs.tgz" |
9 | @echo "- do_fw_upgrade: put the device in NWZ_DEV in firmware upgrade mode" | 9 | @echo "- do_fw_upgrade: put the device in NWZ_DEV in firmware upgrade mode" |
10 | @echo "- copy_fw_upgrade: copy firmware to a device with the right name" | 10 | @echo "- copy_fw_upgrade: copy firmware to a device with the right name" |
11 | @echo "- exec_file: craft an upgrade that executes a script/executable" | 11 | @echo "- exec_file: craft an upgrade that embeds and execute a file" |
12 | @echo "- exec_file_extern: craft an upgrade that execute a file on the user partition" | ||
12 | @echo "- list_targets: produce of list of available targets" | 13 | @echo "- list_targets: produce of list of available targets" |
13 | 14 | ||
14 | ifndef UPG | 15 | ifndef UPG |
@@ -43,6 +44,7 @@ ifndef NWZ_DEV | |||
43 | want_dev: | 44 | want_dev: |
44 | $(info Please set NWZ_DEV to your dev. For example:) | 45 | $(info Please set NWZ_DEV to your dev. For example:) |
45 | $(info make do_fw_upgrade NWZ_DEV=/dev/sdx) | 46 | $(info make do_fw_upgrade NWZ_DEV=/dev/sdx) |
47 | $(error "") | ||
46 | else | 48 | else |
47 | want_dev: ; | 49 | want_dev: ; |
48 | endif | 50 | endif |
@@ -51,15 +53,33 @@ ifndef NWZ_MOUNT | |||
51 | want_mount: | 53 | want_mount: |
52 | $(info Please set NWZ_MOUNT to your dev mount point. For example:) | 54 | $(info Please set NWZ_MOUNT to your dev mount point. For example:) |
53 | $(info make copy_fw_upgrade NWZ_MOUNT=/media/WALKMAN ...) | 55 | $(info make copy_fw_upgrade NWZ_MOUNT=/media/WALKMAN ...) |
56 | $(error "") | ||
54 | else | 57 | else |
55 | want_mount: ; | 58 | want_mount: ; |
56 | endif | 59 | endif |
57 | 60 | ||
61 | ifndef LOG | ||
62 | want_log: | ||
63 | $(info Please set LOG to the log filename. For example:) | ||
64 | $(info make exec_file_extern LOG=exec.log ...) | ||
65 | $(error "") | ||
66 | else | ||
67 | want_log: ; | ||
68 | endif | ||
69 | |||
58 | UPGPACK=$(upgtool) -c -m $(NWZ_TARGET) $(UPG) $(1) | 70 | UPGPACK=$(upgtool) -c -m $(NWZ_TARGET) $(UPG) $(1) |
59 | 71 | ||
60 | exec_file: want_target want_exec want_upg | 72 | exec_file: want_target want_exec want_upg |
61 | $(call UPGPACK, exec_file.sh $(EXEC)) | 73 | $(call UPGPACK, exec_file.sh $(EXEC)) |
62 | 74 | ||
75 | exec_file_extern.tmp: want_exec want_upg want_log | ||
76 | cat exec_file_extern.sh.in | sed "s|NWZ_EXEC_THIS|$(EXEC)|" |\ | ||
77 | sed "s|NWZ_LOG_THIS|$(LOG)|" > $@ | ||
78 | .INTERMEDIATE: exec_file_extern.tmp | ||
79 | |||
80 | exec_file_extern: want_target want_exec want_upg want_log exec_file_extern.tmp | ||
81 | $(call UPGPACK, exec_file_extern.tmp) | ||
82 | |||
63 | dump_rootfs: want_target want_upg | 83 | dump_rootfs: want_target want_upg |
64 | $(call UPGPACK, dump_rootfs.sh) | 84 | $(call UPGPACK, dump_rootfs.sh) |
65 | 85 | ||
diff --git a/utils/nwztools/scripts/exec_file.sh b/utils/nwztools/scripts/exec_file.sh index 059014de2c..368909123f 100644 --- a/utils/nwztools/scripts/exec_file.sh +++ b/utils/nwztools/scripts/exec_file.sh | |||
@@ -51,7 +51,7 @@ fi | |||
51 | 51 | ||
52 | # run it and redirect all outputs to exec.txt | 52 | # run it and redirect all outputs to exec.txt |
53 | lcdmsg -f /usr/local/bin/font_08x12.bmp -l 0,7 "Running file..." | 53 | lcdmsg -f /usr/local/bin/font_08x12.bmp -l 0,7 "Running file..." |
54 | /tmp/exec 2>&1 >$CONTENTS/exec.txt | 54 | /tmp/exec >$CONTENTS/exec.txt 2>&1 |
55 | 55 | ||
56 | # 4) Success screen | 56 | # 4) Success screen |
57 | lcdmsg -f /usr/local/bin/font_08x12.bmp -l 0,15 "Rebooting in 3 seconds." | 57 | lcdmsg -f /usr/local/bin/font_08x12.bmp -l 0,15 "Rebooting in 3 seconds." |
diff --git a/utils/nwztools/scripts/exec_file_extern.sh.in b/utils/nwztools/scripts/exec_file_extern.sh.in new file mode 100644 index 0000000000..c4413baae4 --- /dev/null +++ b/utils/nwztools/scripts/exec_file_extern.sh.in | |||
@@ -0,0 +1,54 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | # The updater script on the NWZ has a major bug/feature: | ||
4 | # it does NOT clear the update flag if the update scrit fails | ||
5 | # thus causing a update/reboot loop and a bricked device | ||
6 | # always clear to make sure we don't end up being screwed | ||
7 | nvpflag fup 0xFFFFFFFF | ||
8 | |||
9 | # | ||
10 | # This script remounts the user (aka contents) partition read-write-exec and | ||
11 | # runs the file given and redirects its output and error to a file. | ||
12 | # To use this file, you need to replace NWZ_EXEC_THIS by the file you want to | ||
13 | # execute and NWZ_LOG_THIS by the name of the file you want to log to. You may | ||
14 | # use sed as follows for this purpose: | ||
15 | # cat exec_file_extern.sh.in | sed 's|NWZ_EXEC_THIS|myfile.elf|' | \ | ||
16 | # sed 's|NWZ_LOG_THIS|exec.log|' > my_exec_file.sh | ||
17 | # | ||
18 | # NOTE 1: technically, NWZ_EXEC_THIS can be any command, not just a file | ||
19 | # NOTE 2: this script will export the variable NWZ_CONTENTS that is the path to | ||
20 | # the user partition, so that if NWZ_EXEC_THIS is a bash script, it can | ||
21 | # easily use it | ||
22 | # | ||
23 | |||
24 | # go to /tmp | ||
25 | cd /tmp | ||
26 | |||
27 | # get content partition path | ||
28 | CONTENTS="/contents" | ||
29 | CONTENTS_PART=`mount | grep contents | awk '{ print $1 }'` | ||
30 | |||
31 | lcdmsg -c -f /usr/local/bin/font_08x12.bmp -l 0,3 "Contents partition:\n$CONTENTS_PART" | ||
32 | |||
33 | # 2) We need to remount the contents partition in read-write mode be able to | ||
34 | # write something on it | ||
35 | lcdmsg -f /usr/local/bin/font_08x12.bmp -l 0,6 "Remount $CONTENTS rw and exec" | ||
36 | if ! mount -o remount,rw,umask=000 $CONTENTS_PART $CONTENTS | ||
37 | then | ||
38 | lcdmsg -f /usr/local/bin/font_08x12.bmp -l 0,7 "ERROR: remount failed" | ||
39 | sleep 3 | ||
40 | exit 0 | ||
41 | fi | ||
42 | |||
43 | # run file and redirect all outputs | ||
44 | lcdmsg -f /usr/local/bin/font_08x12.bmp -l 0,7 "Running file..." | ||
45 | export NWZ_CONTENTS="$CONTENTS" | ||
46 | $CONTENTS/NWZ_EXEC_THIS >$CONTENTS/NWZ_LOG_THIS 2>&1 | ||
47 | |||
48 | # 4) Success screen | ||
49 | lcdmsg -f /usr/local/bin/font_08x12.bmp -l 0,15 "Rebooting in 3 seconds." | ||
50 | sleep 3 | ||
51 | sync | ||
52 | |||
53 | # finish | ||
54 | exit 0 | ||