rpms/memtest86plus
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixed packaging regarding usrmove

Browse Source
This commit is contained in:
Jaroslav Škarvada 2013-01-08 12:11:32 +01:00
parent 19e8ffe64f
commit ba8eb1b9d8
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
memtest86+.spec
View File

@ -7,7 +7,7 @@
Name: memtest86+ Name: memtest86+
Version: 4.20 Version: 4.20
Release: 7%{?dist} Release: 8%{?dist}
License: GPLv2 License: GPLv2
Summary: Stand-alone memory tester for x86 and x86-64 computers Summary: Stand-alone memory tester for x86 and x86-64 computers
Group: System Environment/Base Group: System Environment/Base
@ -56,7 +56,6 @@ make
%install %install
rm -rf %{buildroot} rm -rf %{buildroot}
mkdir -p %{buildroot}/boot mkdir -p %{buildroot}/boot
mkdir -p %{buildroot}/sbin
mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_sbindir}
# the ELF (memtest) version. # the ELF (memtest) version.
@ -65,7 +64,7 @@ install -m644 memtest %{buildroot}/boot/elf-%{name}-%{version}
# the floppy (memtest.bin) version. # the floppy (memtest.bin) version.
install -m644 memtest.bin %{buildroot}/boot/%{name}-%{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 install -m755 %{SOURCE1} %{buildroot}%{_sbindir}/memtest-setup
sed -i 's/\r//' $RPM_BUILD_DIR/%{name}-%{version}/README 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 ] if [ -f /boot/grub/grub.conf ]
then then
sed -i -e's,kernel --type=netbsd /elf-%{name}-%{version},kernel /elf-%{name}-%{version},' /boot/grub/grub.conf 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 fi
%clean %clean
@ -94,13 +93,16 @@ rm -rf %{buildroot}
%doc README %doc README
/boot/%{name}-%{version} /boot/%{name}-%{version}
/boot/elf-%{name}-%{version} /boot/elf-%{name}-%{version}
/sbin/new-memtest-pkg %{_sbindir}/new-memtest-pkg
%dir %{_datadir}/%{name} %dir %{_datadir}/%{name}
%{_datadir}/%{name}/20_memtest86+ %{_datadir}/%{name}/20_memtest86+
%ghost %attr(0755,-,-) %{_sysconfdir}/grub.d/20_memtest86+ %ghost %attr(0755,-,-) %{_sysconfdir}/grub.d/20_memtest86+
%{_sbindir}/memtest-setup %{_sbindir}/memtest-setup
%changelog %changelog
* Tue Jan 8 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 4.20-8
- Fixed packaging regarding usrmove
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.20-7 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.20-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

28
new-memtest-pkg
View File

@ -11,7 +11,7 @@
PATH=/sbin:/bin:$PATH PATH=/sbin:/bin:$PATH
lilo=/sbin/lilo lilo=/usr/sbin/lilo
# some defaults that are sane for most arches # some defaults that are sane for most arches
kernelName=elf-memtest86+ kernelName=elf-memtest86+
@ -19,7 +19,7 @@ kernelName=elf-memtest86+
if [ -x ./grubby ]; then if [ -x ./grubby ]; then
grubby=./grubby grubby=./grubby
else else
grubby=/sbin/grubby grubby=/usr/sbin/grubby
fi fi
cfgGrub="" cfgGrub=""
@ -37,7 +37,7 @@ if [ $ARCH = 'ia64' ]; then
elif [ $ARCH = 'ppc64' -o $ARCH = 'ppc' ]; then elif [ $ARCH = 'ppc64' -o $ARCH = 'ppc' ]; then
liloConfig=/etc/yaboot.conf liloConfig=/etc/yaboot.conf
bootPrefix=/boot bootPrefix=/boot
lilo=/sbin/ybin lilo=/usr/sbin/ybin
kernelName=vmlinux kernelName=vmlinux
liloFlag=yaboot liloFlag=yaboot
runLilo="yes" runLilo="yes"
@ -46,13 +46,13 @@ elif [ $ARCH = 'sparc' -o $ARCH = 'sparc64' ]; then
liloConfig=/etc/silo.conf liloConfig=/etc/silo.conf
bootPrefix=/boot bootPrefix=/boot
liloFlag=silo liloFlag=silo
lilo=/sbin/silo lilo=/usr/sbin/silo
isx86="" isx86=""
elif [ $ARCH = 's390' -o $ARCH = 's390x' ]; then elif [ $ARCH = 's390' -o $ARCH = 's390x' ]; then
liloConfig=/etc/zipl.conf liloConfig=/etc/zipl.conf
bootPrefix=/boot bootPrefix=/boot
liloFlag=zipl liloFlag=zipl
lilo=/sbin/zipl lilo=/usr/sbin/zipl
runLilo="yes" runLilo="yes"
isx86="" isx86=""
else else
@ -98,10 +98,10 @@ install() {
[ -n "$verbose" ] && echo "On an iSeries, just making img file" [ -n "$verbose" ] && echo "On an iSeries, just making img file"
if [ -z $initrdfile ]; then if [ -z $initrdfile ]; then
[ -n "$verbose" ] && echo "No initrd, just adding system map" [ -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 else
/sbin/addSystemMap $bootPrefix/System.map-$version $bootPrefix/$kernelName-$version $bootPrefix/vmlinux.sm-$version /usr/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/addRamDisk $initrdfile $bootPrefix/System.map-$version $bootPrefix/vmlinux.sm-$version $bootPrefix/vmlinitrd-$version 2>/dev/null
rm $bootPrefix/vmlinux.sm-$version rm $bootPrefix/vmlinux.sm-$version
fi fi
return return
@ -112,7 +112,7 @@ install() {
rootdevice=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/fstab) rootdevice=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/fstab)
short=$(echo $rootdevice | cut -d= -f1) short=$(echo $rootdevice | cut -d= -f1)
if [ "$short" == "LABEL" -o "$short" == "UUID" ]; then 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 }') rootdevice=$(mount | awk '$3 == "/" { print $1 }')
fi fi
fi fi
@ -127,7 +127,7 @@ install() {
else else
title="Red Hat Linux ($version)" title="Red Hat Linux ($version)"
fi fi
/sbin/grubby --add-kernel=$bootPrefix/$kernelName-$version $INITRD \ /usr/sbin/grubby --add-kernel=$bootPrefix/$kernelName-$version $INITRD \
--copy-default --title "$title" \ --copy-default --title "$title" \
--args="root=$rootdevice $kernargs" \ --args="root=$rootdevice $kernargs" \
--remove-kernel="TITLE=$title" --remove-kernel="TITLE=$title"
@ -138,7 +138,7 @@ install() {
if [ -n "$cfgLilo" ]; then if [ -n "$cfgLilo" ]; then
[ -n "$verbose" ] && echo "adding $version to $liloConfig" [ -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 \ --copy-default --title $version \
--args="root=$rootdevice $kernargs" \ --args="root=$rootdevice $kernargs" \
--remove-kernel="TITLE=$version" \ --remove-kernel="TITLE=$version" \
@ -168,14 +168,14 @@ remove() {
if [ -n "$cfgGrub" ]; then if [ -n "$cfgGrub" ]; then
[ -n "$verbose" ] && echo "removing $version from $grubConfig" [ -n "$verbose" ] && echo "removing $version from $grubConfig"
/sbin/grubby --remove-kernel=$bootPrefix/$kernelName-$version /usr/sbin/grubby --remove-kernel=$bootPrefix/$kernelName-$version
else else
[ -n "$verbose" ] && echo "$grubConfig does not exist, not running grubby" [ -n "$verbose" ] && echo "$grubConfig does not exist, not running grubby"
fi fi
if [ -n "$cfgLilo" ]; then if [ -n "$cfgLilo" ]; then
[ -n "$verbose" ] && echo "removing $version from $liloConfig" [ -n "$verbose" ] && echo "removing $version from $liloConfig"
/sbin/grubby --remove-kernel=$bootPrefix/$kernelName-$version \ /usr/sbin/grubby --remove-kernel=$bootPrefix/$kernelName-$version \
--$liloFlag --$liloFlag
if [ -n "$runLilo" ]; then if [ -n "$runLilo" ]; then
@ -193,7 +193,7 @@ remove() {
mkinitrd() { mkinitrd() {
[ -n "$verbose" ] && echo "creating initrd $initrdfile using $version" [ -n "$verbose" ] && echo "creating initrd $initrdfile using $version"
/sbin/mkinitrd -f $initrdfile $version /usr/sbin/mkinitrd -f $initrdfile $version
rc=$? rc=$?
if [ $rc != 0 ]; then if [ $rc != 0 ]; then
echo "mkinitrd failed" >&2 echo "mkinitrd failed" >&2