OSDN Git Service

kbuild: rpm-pkg: replace $RPM_BUILD_ROOT with %{buildroot}
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Sat, 30 Sep 2017 01:10:08 +0000 (10:10 +0900)
committerMasahiro Yamada <yamada.masahiro@socionext.com>
Tue, 14 Nov 2017 14:19:01 +0000 (23:19 +0900)
$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>
scripts/package/mkspec

index d352a01..280027f 100755 (executable)
@@ -81,30 +81,30 @@ $S  %build
 $S     make %{?_smp_mflags} KBUILD_BUILD_VERSION=%{release}
 $S
        %install
-       mkdir -p \$RPM_BUILD_ROOT/boot
+       mkdir -p %{buildroot}/boot
        %ifarch ia64
-       mkdir -p \$RPM_BUILD_ROOT/boot/efi
-       cp \$(make image_name) \$RPM_BUILD_ROOT/boot/efi/vmlinuz-$KERNELRELEASE
-       ln -s efi/vmlinuz-$KERNELRELEASE \$RPM_BUILD_ROOT/boot/
+       mkdir -p %{buildroot}/boot/efi
+       cp \$(make image_name) %{buildroot}/boot/efi/vmlinuz-$KERNELRELEASE
+       ln -s efi/vmlinuz-$KERNELRELEASE %{buildroot}/boot/
        %else
-       cp \$(make image_name) \$RPM_BUILD_ROOT/boot/vmlinuz-$KERNELRELEASE
+       cp \$(make image_name) %{buildroot}/boot/vmlinuz-$KERNELRELEASE
        %endif
-$M     make %{?_smp_mflags} INSTALL_MOD_PATH=\$RPM_BUILD_ROOT KBUILD_SRC= modules_install
-       make %{?_smp_mflags} INSTALL_HDR_PATH=\$RPM_BUILD_ROOT/usr KBUILD_SRC= headers_install
-       cp System.map \$RPM_BUILD_ROOT/boot/System.map-$KERNELRELEASE
-       cp .config \$RPM_BUILD_ROOT/boot/config-$KERNELRELEASE
+$M     make %{?_smp_mflags} INSTALL_MOD_PATH=%{buildroot} KBUILD_SRC= modules_install
+       make %{?_smp_mflags} INSTALL_HDR_PATH=%{buildroot}/usr KBUILD_SRC= headers_install
+       cp System.map %{buildroot}/boot/System.map-$KERNELRELEASE
+       cp .config %{buildroot}/boot/config-$KERNELRELEASE
        bzip2 -9 --keep vmlinux
-       mv vmlinux.bz2 \$RPM_BUILD_ROOT/boot/vmlinux-$KERNELRELEASE.bz2
-$S$M   rm -f \$RPM_BUILD_ROOT/lib/modules/$KERNELRELEASE/build
-$S$M   rm -f \$RPM_BUILD_ROOT/lib/modules/$KERNELRELEASE/source
-$S$M   mkdir -p \$RPM_BUILD_ROOT/usr/src/kernels/$KERNELRELEASE
-$S$M   tar cf - . $EXCLUDES | tar xf - -C \$RPM_BUILD_ROOT/usr/src/kernels/$KERNELRELEASE
-$S$M   cd \$RPM_BUILD_ROOT/lib/modules/$KERNELRELEASE
+       mv vmlinux.bz2 %{buildroot}/boot/vmlinux-$KERNELRELEASE.bz2
+$S$M   rm -f %{buildroot}/lib/modules/$KERNELRELEASE/build
+$S$M   rm -f %{buildroot}/lib/modules/$KERNELRELEASE/source
+$S$M   mkdir -p %{buildroot}/usr/src/kernels/$KERNELRELEASE
+$S$M   tar cf - . $EXCLUDES | tar xf - -C %{buildroot}/usr/src/kernels/$KERNELRELEASE
+$S$M   cd %{buildroot}/lib/modules/$KERNELRELEASE
 $S$M   ln -sf /usr/src/kernels/$KERNELRELEASE build
 $S$M   ln -sf /usr/src/kernels/$KERNELRELEASE source
 
        %clean
-       rm -rf \$RPM_BUILD_ROOT
+       rm -rf %{buildroot}
 
        %post
        if [ -x /sbin/installkernel -a -r /boot/vmlinuz-$KERNELRELEASE -a -r /boot/System.map-$KERNELRELEASE ]; then