From e2f60269b9330d7225b2547e057ef0859ccec155 Mon Sep 17 00:00:00 2001 From: Dirk Müller Date: Dec 13 2021 18:06:27 +0000 Subject: - rpm/*.spec.in: use buildroot macro instead of env variable The RPM_BUILD_ROOT variable is considered deprecated over a buildroot macro. future proof the spec files. --- diff --git a/rpm/kernel-docs.spec.in b/rpm/kernel-docs.spec.in index 423ea18..a0ea956 100644 --- a/rpm/kernel-docs.spec.in +++ b/rpm/kernel-docs.spec.in @@ -118,14 +118,14 @@ make %{?make_arg} O=$PWD/pdf pdfdocs %install cd linux-%srcversion %if %build_html -install -d $RPM_BUILD_ROOT%{_datadir}/doc/kernel/html/rst -cp -a html/Documentation/output/* $RPM_BUILD_ROOT%{_datadir}/doc/kernel/html/rst || true +install -d %{buildroot}%{_datadir}/doc/kernel/html/rst +cp -a html/Documentation/output/* %{buildroot}%{_datadir}/doc/kernel/html/rst || true %endif %if %build_pdf -install -d $RPM_BUILD_ROOT%{_datadir}/doc/kernel/pdf +install -d %{buildroot}%{_datadir}/doc/kernel/pdf for i in pdf/Documentation/output/latex/*.pdf; do - cp -a $i $RPM_BUILD_ROOT%{_datadir}/doc/kernel/pdf + cp -a $i %{buildroot}%{_datadir}/doc/kernel/pdf done %endif diff --git a/rpm/kernel-obs-build.spec.in b/rpm/kernel-obs-build.spec.in index 64b49a9..71bc0c8 100644 --- a/rpm/kernel-obs-build.spec.in +++ b/rpm/kernel-obs-build.spec.in @@ -158,9 +158,9 @@ dracut --reproducible --host-only --no-hostonly-cmdline \ rm -rf /usr/lib/dracut/modules.d/80obs %install -install -d -m 0755 $RPM_BUILD_ROOT -cp -v /boot/%{kernel_name}-*%{kernel_flavor} $RPM_BUILD_ROOT/.build.kernel.kvm -cp -v /tmp/initrd.kvm $RPM_BUILD_ROOT/.build.initrd.kvm +install -d -m 0755 %{buildroot} +cp -v /boot/%{kernel_name}-*%{kernel_flavor} %{buildroot}/.build.kernel.kvm +cp -v /tmp/initrd.kvm %{buildroot}/.build.initrd.kvm # inform worker about availability of virtio-serial touch %{buildroot}/.build.console.kvm @@ -170,7 +170,7 @@ fi #inform worker about arch #see obs-build commit e47399d738e51 -uname -m > $RPM_BUILD_ROOT/.build.hostarch.kvm +uname -m > %{buildroot}/.build.hostarch.kvm %files /.build.kernel.* diff --git a/rpm/kernel-source.spec.in b/rpm/kernel-source.spec.in index 48d2eae..30b0394 100644 --- a/rpm/kernel-source.spec.in +++ b/rpm/kernel-source.spec.in @@ -202,8 +202,8 @@ echo "Symbol(s): %symbols" %build %install -mkdir -p $RPM_BUILD_ROOT/usr/src -pushd $RPM_BUILD_ROOT/usr/src +mkdir -p %{buildroot}/usr/src +pushd %{buildroot}/usr/src # Unpack the vanilla kernel sources tar -xf %{S:0} @@ -240,7 +240,7 @@ cd .. %endif # Hardlink duplicate files automatically (from package fdupes). -%fdupes $RPM_BUILD_ROOT +%fdupes %{buildroot} popd %if ! %vanilla_only @@ -251,18 +251,18 @@ cp %_sourcedir/README.SUSE %_sourcedir/config-options.changes.txt %buildroot/$DO ln -s $DOC/README.SUSE %buildroot/%src_install_dir/ %if "%variant" == "" -install -m 755 -d $RPM_BUILD_ROOT%{_rpmmacrodir} -install -m 644 %_sourcedir/macros.kernel-source $RPM_BUILD_ROOT%{_rpmmacrodir} -echo "%%kernel_module_directory %{kernel_module_directory}" >> $RPM_BUILD_ROOT%{_rpmmacrodir}/macros.kernel-source +install -m 755 -d %{buildroot}%{_rpmmacrodir} +install -m 644 %_sourcedir/macros.kernel-source %{buildroot}%{_rpmmacrodir} +echo "%%kernel_module_directory %{kernel_module_directory}" >> %{buildroot}%{_rpmmacrodir}/macros.kernel-source -install -m 755 -d $RPM_BUILD_ROOT/usr/lib/rpm +install -m 755 -d %{buildroot}/usr/lib/rpm install -m 644 %_sourcedir/kernel-{module,cert}-subpackage \ - $RPM_BUILD_ROOT/usr/lib/rpm/ -install -m 755 -d $RPM_BUILD_ROOT/usr/lib/rpm/kernel -install -m 755 %_sourcedir/{splitflist,mergedep,moddep,modflist,kernel-subpackage-build} $RPM_BUILD_ROOT/usr/lib/rpm/kernel -install -m 644 %_sourcedir/kernel-subpackage-spec $RPM_BUILD_ROOT/usr/lib/rpm/kernel -install -m 644 %_sourcedir/kernel-spec-macros $RPM_BUILD_ROOT/usr/lib/rpm/kernel -install -m 644 -T %_sourcedir/kernel-default-base.spec.txt $RPM_BUILD_ROOT/usr/lib/rpm/kernel/kernel-default-base.spec + %{buildroot}/usr/lib/rpm/ +install -m 755 -d %{buildroot}/usr/lib/rpm/kernel +install -m 755 %_sourcedir/{splitflist,mergedep,moddep,modflist,kernel-subpackage-build} %{buildroot}/usr/lib/rpm/kernel +install -m 644 %_sourcedir/kernel-subpackage-spec %{buildroot}/usr/lib/rpm/kernel +install -m 644 %_sourcedir/kernel-spec-macros %{buildroot}/usr/lib/rpm/kernel +install -m 644 -T %_sourcedir/kernel-default-base.spec.txt %{buildroot}/usr/lib/rpm/kernel/kernel-default-base.spec %endif pushd "%buildroot" diff --git a/rpm/kernel-subpackage-build b/rpm/kernel-subpackage-build index ede3da3..a9c810f 100644 --- a/rpm/kernel-subpackage-build +++ b/rpm/kernel-subpackage-build @@ -8,7 +8,7 @@ package_nvr=$3 set -o pipefail -install -d -m 0755 $RPM_BUILD_ROOT/boot +install -d -m 0755 %{buildroot}/boot $scriptdir/splitflist $kernel_package_name kernel.flist kernel-ghost.flist echo Ghost files: @@ -33,11 +33,11 @@ $scriptdir/moddep modules.dep request-modules modules $scriptdir/modflist kernel.flist modules modules.flist /lib/modules/$KREL/modules.builtin grep -v "^$USR/lib/modules/$KREL\\(\$\\|/kernel\\)" < kernel.flist >> modules.flist || : -tar -C / -cf- -T modules.flist | tar -C $RPM_BUILD_ROOT -xvf- +tar -C / -cf- -T modules.flist | tar -C %{buildroot} -xvf- -[ -z "$USR" ] || ln -s usr/lib $RPM_BUILD_ROOT/lib -moderr="$(/usr/sbin/depmod -b $RPM_BUILD_ROOT -e -F /boot/System.map-$KREL $KREL 2>&1 > /dev/null)" -[ -z "$USR" ] || rm $RPM_BUILD_ROOT/lib +[ -z "$USR" ] || ln -s usr/lib %{buildroot}/lib +moderr="$(/usr/sbin/depmod -b %{buildroot} -e -F /boot/System.map-$KREL $KREL 2>&1 > /dev/null)" +[ -z "$USR" ] || rm %{buildroot}/lib if [ "$moderr" ] ; then echo Picked modules have errors: @@ -59,14 +59,14 @@ while read name mode size mtime link; do p="${mode:0-4:4}" (( p != 0 )) || p='' if (( t == 0100000 )); then - install -D -m "${p:-0644}" /dev/null "$RPM_BUILD_ROOT$name" - dd if=/dev/null bs=1 count=0 status=none seek="$size" of="$RPM_BUILD_ROOT$name" - touch -h --date="@$mtime" "$RPM_BUILD_ROOT$name" + install -D -m "${p:-0644}" /dev/null "%{buildroot}$name" + dd if=/dev/null bs=1 count=0 status=none seek="$size" of="%{buildroot}$name" + touch -h --date="@$mtime" "%{buildroot}$name" elif (( t == 0040000 )); then - install -d -m "${p:-0755}" "$RPM_BUILD_ROOT$name" - touch -h -date="@$mtime" "$RPM_BUILD_ROOT$name" + install -d -m "${p:-0755}" "%{buildroot}$name" + touch -h -date="@$mtime" "%{buildroot}$name" elif (( t == 0120000 )); then - ln -s "$link" "$RPM_BUILD_ROOT$name" - touch -h --date="@$mtime" "$RPM_BUILD_ROOT$name" + ln -s "$link" "%{buildroot}$name" + touch -h --date="@$mtime" "%{buildroot}$name" fi done < kernel-ghost.flist