From ba8eb1b9d80a892027cd4bef0f967d42cf01d3d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 8 Jan 2013 12:11:32 +0100 Subject: [PATCH] Fixed packaging regarding usrmove --- memtest86+.spec | 12 +++++++----- new-memtest-pkg | 28 ++++++++++++++-------------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/memtest86+.spec b/memtest86+.spec index 41434f8..fb01556 100644 --- a/memtest86+.spec +++ b/memtest86+.spec @@ -7,7 +7,7 @@ Name: memtest86+ Version: 4.20 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2 Summary: Stand-alone memory tester for x86 and x86-64 computers Group: System Environment/Base @@ -56,7 +56,6 @@ make %install rm -rf %{buildroot} mkdir -p %{buildroot}/boot -mkdir -p %{buildroot}/sbin mkdir -p %{buildroot}%{_sbindir} # the ELF (memtest) version. @@ -65,7 +64,7 @@ install -m644 memtest %{buildroot}/boot/elf-%{name}-%{version} # the floppy (memtest.bin) version. install -m644 memtest.bin %{buildroot}/boot/%{name}-%{version} -install -m755 %{SOURCE2} %{buildroot}/sbin/new-memtest-pkg +install -m755 %{SOURCE2} %{buildroot}%{_sbindir}/new-memtest-pkg install -m755 %{SOURCE1} %{buildroot}%{_sbindir}/memtest-setup sed -i 's/\r//' $RPM_BUILD_DIR/%{name}-%{version}/README @@ -83,7 +82,7 @@ install -m644 %{SOURCE3} %{buildroot}%{_datadir}/%{name} if [ -f /boot/grub/grub.conf ] then sed -i -e's,kernel --type=netbsd /elf-%{name}-%{version},kernel /elf-%{name}-%{version},' /boot/grub/grub.conf - /sbin/new-memtest-pkg --remove %{version} + %{_sbindir}/new-memtest-pkg --remove %{version} fi %clean @@ -94,13 +93,16 @@ rm -rf %{buildroot} %doc README /boot/%{name}-%{version} /boot/elf-%{name}-%{version} -/sbin/new-memtest-pkg +%{_sbindir}/new-memtest-pkg %dir %{_datadir}/%{name} %{_datadir}/%{name}/20_memtest86+ %ghost %attr(0755,-,-) %{_sysconfdir}/grub.d/20_memtest86+ %{_sbindir}/memtest-setup %changelog +* Tue Jan 8 2013 Jaroslav Škarvada - 4.20-8 +- Fixed packaging regarding usrmove + * Fri Jul 20 2012 Fedora Release Engineering - 4.20-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/new-memtest-pkg b/new-memtest-pkg index 8446b6e..eed86ad 100755 --- a/new-memtest-pkg +++ b/new-memtest-pkg @@ -11,7 +11,7 @@ PATH=/sbin:/bin:$PATH -lilo=/sbin/lilo +lilo=/usr/sbin/lilo # some defaults that are sane for most arches kernelName=elf-memtest86+ @@ -19,7 +19,7 @@ kernelName=elf-memtest86+ if [ -x ./grubby ]; then grubby=./grubby else - grubby=/sbin/grubby + grubby=/usr/sbin/grubby fi cfgGrub="" @@ -37,7 +37,7 @@ if [ $ARCH = 'ia64' ]; then elif [ $ARCH = 'ppc64' -o $ARCH = 'ppc' ]; then liloConfig=/etc/yaboot.conf bootPrefix=/boot - lilo=/sbin/ybin + lilo=/usr/sbin/ybin kernelName=vmlinux liloFlag=yaboot runLilo="yes" @@ -46,13 +46,13 @@ elif [ $ARCH = 'sparc' -o $ARCH = 'sparc64' ]; then liloConfig=/etc/silo.conf bootPrefix=/boot liloFlag=silo - lilo=/sbin/silo + lilo=/usr/sbin/silo isx86="" elif [ $ARCH = 's390' -o $ARCH = 's390x' ]; then liloConfig=/etc/zipl.conf bootPrefix=/boot liloFlag=zipl - lilo=/sbin/zipl + lilo=/usr/sbin/zipl runLilo="yes" isx86="" else @@ -98,10 +98,10 @@ install() { [ -n "$verbose" ] && echo "On an iSeries, just making img file" if [ -z $initrdfile ]; then [ -n "$verbose" ] && echo "No initrd, just adding system map" - /sbin/addSystemMap $bootPrefix/System.map-$version $bootPrefix/$kernelName-$version $bootPrefix/vmlinitrd-$version + /usr/sbin/addSystemMap $bootPrefix/System.map-$version $bootPrefix/$kernelName-$version $bootPrefix/vmlinitrd-$version else - /sbin/addSystemMap $bootPrefix/System.map-$version $bootPrefix/$kernelName-$version $bootPrefix/vmlinux.sm-$version - /sbin/addRamDisk $initrdfile $bootPrefix/System.map-$version $bootPrefix/vmlinux.sm-$version $bootPrefix/vmlinitrd-$version 2>/dev/null + /usr/sbin/addSystemMap $bootPrefix/System.map-$version $bootPrefix/$kernelName-$version $bootPrefix/vmlinux.sm-$version + /usr/sbin/addRamDisk $initrdfile $bootPrefix/System.map-$version $bootPrefix/vmlinux.sm-$version $bootPrefix/vmlinitrd-$version 2>/dev/null rm $bootPrefix/vmlinux.sm-$version fi return @@ -112,7 +112,7 @@ install() { rootdevice=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/fstab) short=$(echo $rootdevice | cut -d= -f1) if [ "$short" == "LABEL" -o "$short" == "UUID" ]; then - if ! /sbin/findfs "$rootdevice" &> /dev/null; then + if ! /usr/sbin/findfs "$rootdevice" &> /dev/null; then rootdevice=$(mount | awk '$3 == "/" { print $1 }') fi fi @@ -127,7 +127,7 @@ install() { else title="Red Hat Linux ($version)" fi - /sbin/grubby --add-kernel=$bootPrefix/$kernelName-$version $INITRD \ + /usr/sbin/grubby --add-kernel=$bootPrefix/$kernelName-$version $INITRD \ --copy-default --title "$title" \ --args="root=$rootdevice $kernargs" \ --remove-kernel="TITLE=$title" @@ -138,7 +138,7 @@ install() { if [ -n "$cfgLilo" ]; then [ -n "$verbose" ] && echo "adding $version to $liloConfig" - /sbin/grubby --add-kernel=$bootPrefix/$kernelName-$version $INITRD \ + /usr/sbin/grubby --add-kernel=$bootPrefix/$kernelName-$version $INITRD \ --copy-default --title $version \ --args="root=$rootdevice $kernargs" \ --remove-kernel="TITLE=$version" \ @@ -168,14 +168,14 @@ remove() { if [ -n "$cfgGrub" ]; then [ -n "$verbose" ] && echo "removing $version from $grubConfig" - /sbin/grubby --remove-kernel=$bootPrefix/$kernelName-$version + /usr/sbin/grubby --remove-kernel=$bootPrefix/$kernelName-$version else [ -n "$verbose" ] && echo "$grubConfig does not exist, not running grubby" fi if [ -n "$cfgLilo" ]; then [ -n "$verbose" ] && echo "removing $version from $liloConfig" - /sbin/grubby --remove-kernel=$bootPrefix/$kernelName-$version \ + /usr/sbin/grubby --remove-kernel=$bootPrefix/$kernelName-$version \ --$liloFlag if [ -n "$runLilo" ]; then @@ -193,7 +193,7 @@ remove() { mkinitrd() { [ -n "$verbose" ] && echo "creating initrd $initrdfile using $version" - /sbin/mkinitrd -f $initrdfile $version + /usr/sbin/mkinitrd -f $initrdfile $version rc=$? if [ $rc != 0 ]; then echo "mkinitrd failed" >&2