Skip to content

Commit 002494d

Browse files
committed
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>
1 parent 0b7f12f commit 002494d

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

scripts/package/mkspec

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -81,30 +81,30 @@ $S %build
8181
$S make %{?_smp_mflags} KBUILD_BUILD_VERSION=%{release}
8282
$S
8383
%install
84-
mkdir -p \$RPM_BUILD_ROOT/boot
84+
mkdir -p %{buildroot}/boot
8585
%ifarch ia64
86-
mkdir -p \$RPM_BUILD_ROOT/boot/efi
87-
cp \$(make image_name) \$RPM_BUILD_ROOT/boot/efi/vmlinuz-$KERNELRELEASE
88-
ln -s efi/vmlinuz-$KERNELRELEASE \$RPM_BUILD_ROOT/boot/
86+
mkdir -p %{buildroot}/boot/efi
87+
cp \$(make image_name) %{buildroot}/boot/efi/vmlinuz-$KERNELRELEASE
88+
ln -s efi/vmlinuz-$KERNELRELEASE %{buildroot}/boot/
8989
%else
90-
cp \$(make image_name) \$RPM_BUILD_ROOT/boot/vmlinuz-$KERNELRELEASE
90+
cp \$(make image_name) %{buildroot}/boot/vmlinuz-$KERNELRELEASE
9191
%endif
92-
$M make %{?_smp_mflags} INSTALL_MOD_PATH=\$RPM_BUILD_ROOT KBUILD_SRC= modules_install
93-
make %{?_smp_mflags} INSTALL_HDR_PATH=\$RPM_BUILD_ROOT/usr KBUILD_SRC= headers_install
94-
cp System.map \$RPM_BUILD_ROOT/boot/System.map-$KERNELRELEASE
95-
cp .config \$RPM_BUILD_ROOT/boot/config-$KERNELRELEASE
92+
$M make %{?_smp_mflags} INSTALL_MOD_PATH=%{buildroot} KBUILD_SRC= modules_install
93+
make %{?_smp_mflags} INSTALL_HDR_PATH=%{buildroot}/usr KBUILD_SRC= headers_install
94+
cp System.map %{buildroot}/boot/System.map-$KERNELRELEASE
95+
cp .config %{buildroot}/boot/config-$KERNELRELEASE
9696
bzip2 -9 --keep vmlinux
97-
mv vmlinux.bz2 \$RPM_BUILD_ROOT/boot/vmlinux-$KERNELRELEASE.bz2
98-
$S$M rm -f \$RPM_BUILD_ROOT/lib/modules/$KERNELRELEASE/build
99-
$S$M rm -f \$RPM_BUILD_ROOT/lib/modules/$KERNELRELEASE/source
100-
$S$M mkdir -p \$RPM_BUILD_ROOT/usr/src/kernels/$KERNELRELEASE
101-
$S$M tar cf - . $EXCLUDES | tar xf - -C \$RPM_BUILD_ROOT/usr/src/kernels/$KERNELRELEASE
102-
$S$M cd \$RPM_BUILD_ROOT/lib/modules/$KERNELRELEASE
97+
mv vmlinux.bz2 %{buildroot}/boot/vmlinux-$KERNELRELEASE.bz2
98+
$S$M rm -f %{buildroot}/lib/modules/$KERNELRELEASE/build
99+
$S$M rm -f %{buildroot}/lib/modules/$KERNELRELEASE/source
100+
$S$M mkdir -p %{buildroot}/usr/src/kernels/$KERNELRELEASE
101+
$S$M tar cf - . $EXCLUDES | tar xf - -C %{buildroot}/usr/src/kernels/$KERNELRELEASE
102+
$S$M cd %{buildroot}/lib/modules/$KERNELRELEASE
103103
$S$M ln -sf /usr/src/kernels/$KERNELRELEASE build
104104
$S$M ln -sf /usr/src/kernels/$KERNELRELEASE source
105105
106106
%clean
107-
rm -rf \$RPM_BUILD_ROOT
107+
rm -rf %{buildroot}
108108
109109
%post
110110
if [ -x /sbin/installkernel -a -r /boot/vmlinuz-$KERNELRELEASE -a -r /boot/System.map-$KERNELRELEASE ]; then

0 commit comments

Comments
 (0)