diff --git a/rpm/kernel-subpackage-build b/rpm/kernel-subpackage-build index a9c810f..ede3da3 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 %{buildroot}/boot +install -d -m 0755 $RPM_BUILD_ROOT/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 %{buildroot} -xvf- +tar -C / -cf- -T modules.flist | tar -C $RPM_BUILD_ROOT -xvf- -[ -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 +[ -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 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 "%{buildroot}$name" - dd if=/dev/null bs=1 count=0 status=none seek="$size" of="%{buildroot}$name" - touch -h --date="@$mtime" "%{buildroot}$name" + 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" elif (( t == 0040000 )); then - install -d -m "${p:-0755}" "%{buildroot}$name" - touch -h -date="@$mtime" "%{buildroot}$name" + install -d -m "${p:-0755}" "$RPM_BUILD_ROOT$name" + touch -h -date="@$mtime" "$RPM_BUILD_ROOT$name" elif (( t == 0120000 )); then - ln -s "$link" "%{buildroot}$name" - touch -h --date="@$mtime" "%{buildroot}$name" + ln -s "$link" "$RPM_BUILD_ROOT$name" + touch -h --date="@$mtime" "$RPM_BUILD_ROOT$name" fi done < kernel-ghost.flist