aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2017-09-29 21:10:08 -0400
committerMasahiro Yamada <yamada.masahiro@socionext.com>2017-11-14 09:19:01 -0500
commit002494d87d51cb87a4dd7bd11743113cd759e714 (patch)
tree6221b14850f9aba8f4a05cd78ba65acedd5ca041
parent0b7f12f5912de636a9c1671ee343f31f21c42b2f (diff)
kbuild: rpm-pkg: replace $RPM_BUILD_ROOT with %{buildroot}
$RPM_BUILD_ROOT must be escaped to prevent shell from expanding it when generating the spec file. %{build_root} is more readable than \$RPM_BUILD_ROOT. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
-rwxr-xr-xscripts/package/mkspec32
1 files changed, 16 insertions, 16 deletions
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index d352a0188770..280027fad991 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -81,30 +81,30 @@ $S %build
81$S make %{?_smp_mflags} KBUILD_BUILD_VERSION=%{release} 81$S make %{?_smp_mflags} KBUILD_BUILD_VERSION=%{release}
82$S 82$S
83 %install 83 %install
84 mkdir -p \$RPM_BUILD_ROOT/boot 84 mkdir -p %{buildroot}/boot
85 %ifarch ia64 85 %ifarch ia64
86 mkdir -p \$RPM_BUILD_ROOT/boot/efi 86 mkdir -p %{buildroot}/boot/efi
87 cp \$(make image_name) \$RPM_BUILD_ROOT/boot/efi/vmlinuz-$KERNELRELEASE 87 cp \$(make image_name) %{buildroot}/boot/efi/vmlinuz-$KERNELRELEASE
88 ln -s efi/vmlinuz-$KERNELRELEASE \$RPM_BUILD_ROOT/boot/ 88 ln -s efi/vmlinuz-$KERNELRELEASE %{buildroot}/boot/
89 %else 89 %else
90 cp \$(make image_name) \$RPM_BUILD_ROOT/boot/vmlinuz-$KERNELRELEASE 90 cp \$(make image_name) %{buildroot}/boot/vmlinuz-$KERNELRELEASE
91 %endif 91 %endif
92$M make %{?_smp_mflags} INSTALL_MOD_PATH=\$RPM_BUILD_ROOT KBUILD_SRC= modules_install 92$M make %{?_smp_mflags} INSTALL_MOD_PATH=%{buildroot} KBUILD_SRC= modules_install
93 make %{?_smp_mflags} INSTALL_HDR_PATH=\$RPM_BUILD_ROOT/usr KBUILD_SRC= headers_install 93 make %{?_smp_mflags} INSTALL_HDR_PATH=%{buildroot}/usr KBUILD_SRC= headers_install
94 cp System.map \$RPM_BUILD_ROOT/boot/System.map-$KERNELRELEASE 94 cp System.map %{buildroot}/boot/System.map-$KERNELRELEASE
95 cp .config \$RPM_BUILD_ROOT/boot/config-$KERNELRELEASE 95 cp .config %{buildroot}/boot/config-$KERNELRELEASE
96 bzip2 -9 --keep vmlinux 96 bzip2 -9 --keep vmlinux
97 mv vmlinux.bz2 \$RPM_BUILD_ROOT/boot/vmlinux-$KERNELRELEASE.bz2 97 mv vmlinux.bz2 %{buildroot}/boot/vmlinux-$KERNELRELEASE.bz2
98$S$M rm -f \$RPM_BUILD_ROOT/lib/modules/$KERNELRELEASE/build 98$S$M rm -f %{buildroot}/lib/modules/$KERNELRELEASE/build
99$S$M rm -f \$RPM_BUILD_ROOT/lib/modules/$KERNELRELEASE/source 99$S$M rm -f %{buildroot}/lib/modules/$KERNELRELEASE/source
100$S$M mkdir -p \$RPM_BUILD_ROOT/usr/src/kernels/$KERNELRELEASE 100$S$M mkdir -p %{buildroot}/usr/src/kernels/$KERNELRELEASE
101$S$M tar cf - . $EXCLUDES | tar xf - -C \$RPM_BUILD_ROOT/usr/src/kernels/$KERNELRELEASE 101$S$M tar cf - . $EXCLUDES | tar xf - -C %{buildroot}/usr/src/kernels/$KERNELRELEASE
102$S$M cd \$RPM_BUILD_ROOT/lib/modules/$KERNELRELEASE 102$S$M cd %{buildroot}/lib/modules/$KERNELRELEASE
103$S$M ln -sf /usr/src/kernels/$KERNELRELEASE build 103$S$M ln -sf /usr/src/kernels/$KERNELRELEASE build
104$S$M ln -sf /usr/src/kernels/$KERNELRELEASE source 104$S$M ln -sf /usr/src/kernels/$KERNELRELEASE source
105 105
106 %clean 106 %clean
107 rm -rf \$RPM_BUILD_ROOT 107 rm -rf %{buildroot}
108 108
109 %post 109 %post
110 if [ -x /sbin/installkernel -a -r /boot/vmlinuz-$KERNELRELEASE -a -r /boot/System.map-$KERNELRELEASE ]; then 110 if [ -x /sbin/installkernel -a -r /boot/vmlinuz-$KERNELRELEASE -a -r /boot/System.map-$KERNELRELEASE ]; then