History

scripts: fix link-vmlinux.sh bash-ism

While building linux with dash shell: LINK vmlinux trap: SIGHUP: bad trap /src/linux-4.0/Makefile:933: recipe for target 'vmlinux' failed make[1]: *** [vmlinux] Error 1 See the following document for behavior of posix shell trap instruction: http://pubs.opengroup.org/onlinepubs/000095399/utilities/trap.html

Sylvain BERTRAND committed 11 years ago

Commit ab160db1 parent ee4eb201 file · +14 −2Browse files

Showing the changes to scripts (1 of 1 file). Show all

Unified · Split

scripts/link-vmlinux.sh+14−2
@@ -111,7 +111,6 @@ sortextable() · 110 unmodified lines
111}111}
112 112
113# Delete output files in case of error113# Delete output files in case of error
114trap cleanup SIGHUP SIGINT SIGQUIT SIGTERM ERR
115cleanup()114cleanup()
116{115{
117 rm -f .old_version116 rm -f .old_version
@@ -124,6 +123,20 @@ cleanup() · 6 unmodified lines
124 rm -f vmlinux.o123 rm -f vmlinux.o
125}124}
126 125
126on_exit()
127{
128 if [ $? -ne 0 ]; then
129 cleanup
130 fi
131}
132trap on_exit EXIT
133
134on_signals()
135{
136 exit 1
137}
138trap on_signals HUP INT QUIT TERM
139
127#140#
128#141#
129# Use "make V=1" to debug this script142# Use "make V=1" to debug this script
@@ -231,7 +244,6 @@ if [ -n "${CONFIG_KALLSYMS}" ]; then · 101 unmodified lines
231 if ! cmp -s System.map .tmp_System.map; then244 if ! cmp -s System.map .tmp_System.map; then
232 echo >&2 Inconsistent kallsyms data245 echo >&2 Inconsistent kallsyms data
233 echo >&2 Try "make KALLSYMS_EXTRA_PASS=1" as a workaround246 echo >&2 Try "make KALLSYMS_EXTRA_PASS=1" as a workaround
234 cleanup
235 exit 1247 exit 1
236 fi248 fi
237fi249fi