kbuild/mkspec: avoid using brace expansion

PATCH In review Anton Tikhomirov 2 participants 2 messages Oct 25, 2016 – Dec 11, 2016 Kbuild

Share & tools

Anton Tikhomirov

author

2016-10-25 09:15 UTC #0 lore raw

PATCH 1/1 kbuild/mkspec: avoid using brace expansion

Brace expansion might not work properly if _buildshell RPM macro points to a shell other than bash. Particularly, with _bulidshell defined to /bin/dash it leads to broken build and source symlinks.

Signed-off-by Anton Tikhomirov <[email protected]>

---
 scripts/package/mkspec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

scripts/package/mkspec +2 -1

index 57673ba..bb43f15 100755
@@ -116,7 +116,8 @@ echo 'mv vmlinux.bz2 $RPM_BUILD_ROOT'"/boot/vmlinux-$KERNELRELEASE.bz2"
 echo "%endif"
 
 if ! $PREBUILT; then
-echo 'rm -f $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE/{build,source}"
+echo 'rm -f $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE/build"
+echo 'rm -f $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE/source"
 echo "mkdir -p "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNELRELEASE"
 echo "EXCLUDES=\"$RCS_TAR_IGNORE --exclude .tmp_versions --exclude=*vmlinux* --exclude=*.o --exclude=*.ko --exclude=*.cmd --exclude=Documentation --exclude=firmware --exclude .config.old --exclude .missing-syscalls.d\""
 echo "tar "'$EXCLUDES'" -cf- . | (cd "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNELRELEASE;tar xvf -)"

Signature · 1 line

2.7.4

Michal Marek

2016-12-11 10:00 UTC #1 lore raw

Quoted 8 lines · Anton Tikhomirov

Brace expansion might not work properly if _buildshell RPM macro points to a shell other than bash. Particularly, with _bulidshell defined to /bin/dash it leads to broken build and source symlinks.
Signed-off-by Anton Tikhomirov <[email protected]>
---
 scripts/package/mkspec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Applied to kbuild.git#misc, thanks.

Michal