Home Home > GIT Browse > scripts
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQu Wenruo <wqu@suse.com>2018-09-11 16:07:27 +0800
committerQu Wenruo <wqu@suse.com>2018-09-11 16:14:14 +0800
commit4be920feb00bf087a1d96e5053e5a7fe5c160167 (patch)
treea4dc9d9a28900603b49c9d99fdd008c67bf993f3
parentc2c287e48ab988c0274001fc0a560160677511f1 (diff)
scripts: sequence-patch.sh: Use '_' to replace '#' charactor (bsc#1107937)
The pound char ('#') could cause kernel "make prepare" failure if toolchain contains latest automake (1.15). "make prepare" wil fail like: $ LANG=C make modules_prepare [snip] CALL scripts/checksyscalls.sh DESCEND objtool HOSTCC /home/adam/btrfs/suse/kernel-source/tmp/linux-4.12-bsc#123456/tools/objtool/fixdep.o HOSTLD /home/adam/btrfs/suse/kernel-source/tmp/linux-4.12-bsc#123456/tools/objtool/fixdep-in.o LINK /home/adam/btrfs/suse/kernel-source/tmp/linux-4.12-bsc#123456/tools/objtool/fixdep /home/adam/btrfs/suse/kernel-source/tmp/linux-4.12-bsc#123456/tools/objtool/.fixdep-in.o.cmd:1: *** missing separator. Stop. make[4]: *** [Makefile:42: /home/adam/btrfs/suse/kernel-source/tmp/linux-4.12-bsc#123456/tools/objtool/fixdep-in.o] Error 2 make[3]: *** [/home/adam/btrfs/suse/kernel-source/tmp/linux-4.12-bsc#123456/tools/build/Makefile.include:4: fixdep] Error 2 make[2]: *** [Makefile:52: /home/adam/btrfs/suse/kernel-source/tmp/linux-4.12-bsc#123456/tools/objtool/libsubcmd.a] Error 2 make[1]: *** [Makefile:61: objtool] Error 2 make: *** [Makefile:1689: tools/objtool] Error 2 The cause is latest make will consider pound char as a separator. Kernel has some fixes for it: 9feeb638cde0 ("tools build: fix # escaping in .cmd files for future Make") 9564a8cf422d ("Kbuild: fix # escaping in .cmd files for future Make") But backporting those 2 fixes can't solve the problem if the kernel path contains '#'. Considering how common we name the branch using bsc#123456, it would definitely cause problem if using some rolling release distributions. Fix the $TAG variable by replacing the '#' to '_', so we won't need to bother the problem. Signed-off-by: Qu Wenruo <wqu@suse.com>
-rwxr-xr-xscripts/sequence-patch.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/sequence-patch.sh b/scripts/sequence-patch.sh
index 2447abd8dc..a1bd7b817f 100755
--- a/scripts/sequence-patch.sh
+++ b/scripts/sequence-patch.sh
@@ -394,6 +394,7 @@ export TMPDIR
ORIG_DIR=$SCRATCH_AREA/linux-$SRCVERSION.orig
TAG=$(get_branch_name)
TAG=${TAG//\//_}
+TAG=${TAG//\#/_}
if $VANILLA; then
TAG=${TAG}-vanilla
fi