From 3d2c112120ae1fb3bb3bb64e441e8430dca06430 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: May 08 2009 02:47:53 +0000 Subject: * Thu May 07 2009 David Cantrell - 11.5.0.51-1 - Don't clear the first partition on any disk with a Mac disk label (#492154). (clumens) - Add detailedMessageWindow to the cmdline class (#499700). (clumens) - Don't traceback when a freespace partition is present (#499662). (clumens) - Do nomodeset when doing xdriver=vesa (ajax) - Fix calculation of smallest PV's size in the lvm dialog. (#493753) (dlehman) - Fix KeyError when partition numbers change during allocation. (#497911) (dlehman) - Update EFI CD booting code in mk-images (pjones) --- diff --git a/.cvsignore b/.cvsignore index a9787ff..f6fb0da 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -anaconda-11.5.0.49.tar.bz2 -anaconda-11.5.0.50.tar.bz2 +anaconda-11.5.0.51.tar.bz2 diff --git a/anaconda-efi.patch b/anaconda-efi.patch deleted file mode 100644 index 19b8b96..0000000 --- a/anaconda-efi.patch +++ /dev/null @@ -1,249 +0,0 @@ -diff -ruN anaconda-11.5.0.42.orig/bootdisk/i386/grub.conf anaconda-11.5.0.42/bootdisk/i386/grub.conf ---- anaconda-11.5.0.42.orig/bootdisk/i386/grub.conf 2009-04-09 16:53:01.000000000 -0400 -+++ anaconda-11.5.0.42/bootdisk/i386/grub.conf 2009-04-09 17:00:45.000000000 -0400 -@@ -1,8 +1,8 @@ - #debug --graphics - default=0 --splashimage=/EFI/boot/splash.xpm.gz -+splashimage=@SPLASHPATH@ - timeout 5 - hiddenmenu - title @PRODUCT@ @VERSION@ -- kernel /EFI/boot/vmlinuz -- initrd /EFI/boot/initrd.img -+ kernel @KERNELPATH@ -+ initrd @INITRDPATH@ -diff -ruN anaconda-11.5.0.42.orig/bootdisk/x86_64/grub.conf anaconda-11.5.0.42/bootdisk/x86_64/grub.conf ---- anaconda-11.5.0.42.orig/bootdisk/x86_64/grub.conf 2009-04-09 16:53:01.000000000 -0400 -+++ anaconda-11.5.0.42/bootdisk/x86_64/grub.conf 2009-04-09 17:00:45.000000000 -0400 -@@ -1,8 +1,8 @@ - #debug --graphics - default=0 --splashimage=/EFI/boot/splash.xpm.gz -+splashimage=@SPLASHPATH@ - timeout 5 - hiddenmenu - title @PRODUCT@ @VERSION@ -- kernel /EFI/boot/vmlinuz -- initrd /EFI/boot/initrd.img -+ kernel @KERNELPATH@ -+ initrd @INITRDPATH@ -diff -ruN anaconda-11.5.0.42.orig/scripts/buildinstall anaconda-11.5.0.42/scripts/buildinstall ---- anaconda-11.5.0.42.orig/scripts/buildinstall 2009-04-09 16:53:01.000000000 -0400 -+++ anaconda-11.5.0.42/scripts/buildinstall 2009-04-09 17:00:45.000000000 -0400 -@@ -219,8 +219,9 @@ - $MK_TREEINFO --family="$PRODUCTSTR" ${VARIANT:+--variant="$VARIANT"} --version=$VERSION --arch=$BASEARCH --outfile=$OUTPUT/.treeinfo - - # FIXME: need to update mk-images to take the yumconf --echo "Making images..." --$MK_IMAGES $DEBUGSTR $NOGRSTR --imgdir $TREEDIR/install --arch $BASEARCH --product "$PRODUCTSTR" --version $VERSION --bugurl "$BUGURL" --output $OUTPUT $yumconf || die "image creation failed" -+MKIMGCMD="$MK_IMAGES $DEBUGSTR $NOGRSTR --imgdir $TREEDIR/install --arch $BASEARCH --product "$PRODUCTSTR" --version $VERSION --bugurl "$BUGURL" --output $OUTPUT $yumconf" -+echo "Making images: $PWD\$ $MKIMGCMD" -+$MKIMGCMD || die "image creation failed" - - echo "Writing .discinfo file" - $MK_STAMP --releasestr="$RELEASESTR" --arch=$BASEARCH --discNum="ALL" --outfile=$OUTPUT/.discinfo -diff -ruN anaconda-11.5.0.42.orig/scripts/mk-images anaconda-11.5.0.42/scripts/mk-images ---- anaconda-11.5.0.42.orig/scripts/mk-images 2009-04-09 16:53:01.000000000 -0400 -+++ anaconda-11.5.0.42/scripts/mk-images 2009-04-09 17:00:45.000000000 -0400 -@@ -889,6 +889,7 @@ - # this gets overloaded if we're on an EFI-capable arch (... with grub) - makeEfiImages() - { -+ echo "Not on an EFI capable machine; skipping EFI images." - /bin/true - } - -diff -ruN anaconda-11.5.0.42.orig/scripts/mk-images.efi anaconda-11.5.0.42/scripts/mk-images.efi ---- anaconda-11.5.0.42.orig/scripts/mk-images.efi 2009-04-09 16:53:01.000000000 -0400 -+++ anaconda-11.5.0.42/scripts/mk-images.efi 2009-04-09 17:00:45.000000000 -0400 -@@ -45,6 +45,7 @@ - - #makeefibootimage required for EFI bootloader dosfs image - makeefibootimage() { -+ echo "in makeefibootimage: makeefibootimage $@" - MBD_FILENAME="" - KERNELFILE="" - INITRDFILE="" -@@ -57,20 +58,29 @@ - KERNELFILE=$2 - shift; shift - continue -+ elif [ $1 = "--kernelpath" ]; then -+ KERNELPATH=$2 -+ shift; shift -+ continue - elif [ $1 = "--initrd" ]; then - INITRDFILE=$2 - shift; shift - continue -+ elif [ $1 = "--initrdpath" ]; then -+ INITRDPATH=$2 -+ shift; shift -+ continue - elif [ $1 = "--imagename" ]; then - MBD_FILENAME=$IMAGEPATH/$2 - shift; shift - continue - elif [ $1 = "--grubpkg" ]; then - grubpkg=$2 -+ echo "grubpkg=$grubpkg" - shift; shift - continue - fi -- echo "Unknown option passed to makebootdisk" -+ echo "Unknown option passed to makebootdisk: \"$1\"" - exit 1 - done - -@@ -111,6 +121,7 @@ - - # prepare and build an efiboot.img. - prepareEfiImage() { -+ echo "in prepareEfiImage" - prepareEfiTree || return 1 - - # dynamically calculate the size of the dosfs -@@ -125,47 +136,65 @@ - # prepare a directory with the kernel, initrd, and various message files - # used to populate the efi boot image - prepareEfiTree() { -- mkdir -p $MBD_BOOTTREE_TMP/EFI/boot -+ echo "in prepareEfiTree" -+ mkdir -p $MBD_BOOTTREE_TMP/EFI/BOOT - -- cp -a $BOOTDISKDIR/* $MBD_BOOTTREE_TMP/EFI/boot/ -- [ -n "$INITRDFILE" ] && cp $INITRDFILE $MBD_BOOTTREE_TMP/EFI/boot/initrd.img -- [ -n "$KERNELFILE" ] && cp $KERNELFILE $MBD_BOOTTREE_TMP/EFI/boot/vmlinuz -- -- sed -i "s/@PRODUCT@/$PRODUCT/g" $MBD_BOOTTREE_TMP/EFI/boot/grub.conf -- sed -i "s/@VERSION@/$VERSION/g" $MBD_BOOTTREE_TMP/EFI/boot/grub.conf -- -- yumdownloader -c $yumconf $grubpkg -+ cp -av $BOOTDISKDIR/*.conf $MBD_BOOTTREE_TMP/EFI/BOOT/ -+ [ -n "$KERNELFILE" ] && cp -av $KERNELFILE $MBD_BOOTTREE_TMP/EFI/BOOT/vmlinuz -+ [ -n "$INITRDFILE" ] && cp -av $INITRDFILE $MBD_BOOTTREE_TMP/EFI/BOOT/initrd.img -+ [ -z "$KERNELPATH" ] && KERNELPATH="/EFI/BOOT/vmlinuz" -+ [ -z "$INITRDPATH" ] && INITRDPATH="/EFI/BOOT/initrd.img" -+ -+ SPLASHPATH="/EFI/BOOT/splash.xpm.gz" -+ sed -e "s/@PRODUCT@/$PRODUCT/g" \ -+ -e "s/@VERSION@/$VERSION/g" \ -+ -e "s,@KERNELPATH@,$KERNELPATH,g" \ -+ -e "s,@INITRDPATH@,$INITRDPATH,g" \ -+ -e "s,@SPLASHPATH@,$SPLASHPATH,g" \ -+ -i $MBD_BOOTTREE_TMP/EFI/BOOT/grub.conf -+ -+ ydcmd="yumdownloader -c $yumconf $grubpkg" -+ echo "(grubpkg) $ydcmd" -+ $ydcmd - rpm2cpio $grubpkg.rpm | (cd $KERNELROOT; cpio --quiet -iumd) -- cp $KERNELROOT/boot/efi/EFI/redhat/grub.efi $MBD_BOOTTREE_TMP/EFI/boot/grub.efi -+ cp -av $KERNELROOT/boot/efi/EFI/redhat/grub.efi $MBD_BOOTTREE_TMP/EFI/BOOT/grub.efi - - # The first generation Mactel machines get the bootloader name wrong - # as per the spec. Awesome, guys. - if [ "$efiarch" == "ia32" ]; then -- cp $MBD_BOOTTREE_TMP/EFI/boot/grub.efi $MBD_BOOTTREE_TMP/EFI/boot/boot.efi -- cp $MBD_BOOTTREE_TMP/EFI/boot/grub.conf $MBD_BOOTTREE_TMP/EFI/boot/boot.conf -+ cp -av $MBD_BOOTTREE_TMP/EFI/BOOT/grub.efi $MBD_BOOTTREE_TMP/EFI/BOOT/BOOT.efi -+ cp -av $MBD_BOOTTREE_TMP/EFI/BOOT/grub.conf $MBD_BOOTTREE_TMP/EFI/BOOT/BOOT.conf - fi - -- mv $MBD_BOOTTREE_TMP/EFI/boot/grub.efi $MBD_BOOTTREE_TMP/EFI/boot/boot${efiarch}.efi -- mv $MBD_BOOTTREE_TMP/EFI/boot/grub.conf $MBD_BOOTTREE_TMP/EFI/boot/boot${efiarch}.conf -+ local tmpefiarch=${efiarch} -+ case ${efiarch} in -+ x64) tmpefiarch="X64" ;; -+ ia32) tmpefiarch="IA32" ;; -+ esac -+ mv -v $MBD_BOOTTREE_TMP/EFI/BOOT/grub.efi $MBD_BOOTTREE_TMP/EFI/BOOT/BOOT${tmpefiarch}.efi -+ mv -v $MBD_BOOTTREE_TMP/EFI/BOOT/grub.conf $MBD_BOOTTREE_TMP/EFI/BOOT/BOOT${tmpefiarch}.conf - - artpkg=$(repoquery --qf "%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}" --whatprovides ${brandpkgname}-logos | grep -v generic-logos | head -1) - if [ -z "$artpkg" ]; then - argpkg="generic-logos" - fi - -- yumdownloader -c ${yumconf} ${artpkg} -+ ydcmd="yumdownloader -c ${yumconf} ${artpkg}" -+ echo "(artpkg) $ydcmd" -+ $ydcmd - rpm2cpio ${artpkg}.rpm | (cd $KERNELROOT; cpio --quiet -iumd) -- cp $KERNELROOT/boot/grub/splash.xpm.gz $MBD_BOOTTREE_TMP/EFI/boot/splash.xpm.gz -+ cp -av $KERNELROOT/boot/grub/splash.xpm.gz $MBD_BOOTTREE_TMP/$SPLASHPATH - - # if we don't have a kernel or initrd, we're making a CD image and we need - # to mirror EFI/ to the cd. - if [ -z "$KERNELFILE" -a -z "$INITRDFILE" ]; then - cp -av $MBD_BOOTTREE_TMP/EFI/ $TOPDESTPATH/EFI/ -- rm -f $TOPDESTPATH/EFI/boot/*.efi -+ rm -f $TOPDESTPATH/EFI/BOOT/*.efi - fi - } - - makeEfiImages() { -+ echo "in makeEfiImages" - yumconf="$1" - echo "Making EFI images ($PWD)" - if [ "$kernelvers" != "$kernelxen" ]; then -@@ -182,9 +211,10 @@ - return 1 - fi - echo "Building efiboot.img for ${efiarch}/$KERNELARCH at $TOPDESTPATH/images/efiboot.img" -+ echo "grubpkg: ${grubpkg}" - - makeefibootimage \ -- --imagename pxeboot/efiboot.img \ -+ --imagename efiboot.img \ - --kernel $TOPDESTPATH/images/pxeboot/vmlinuz \ - --initrd $TOPDESTPATH/images/pxeboot/initrd.img \ - --grubpkg ${grubpkg} -@@ -194,13 +224,16 @@ - return $ret - fi - -- makeefibootdisk $TOPDESTPATH/images/pxeboot/efiboot.img $TOPDESTPATH/images/efidisk.img -- [ $ret -eq 0 ] || return $ret -+ makeefibootdisk $TOPDESTPATH/images/efiboot.img $TOPDESTPATH/images/efidisk.img - local ret=$? -+ [ $ret -eq 0 ] || return $ret -+ rm -vf $TOPDESTPATH/images/efiboot.img - - # make a boot image with just boot*.efi in it... - makeefibootimage \ -- --imagename pxeboot/efiboot.img \ -+ --imagename efiboot.img \ -+ --kernelpath /images/pxeboot/vmlinuz \ -+ --initrdpath /images/pxeboot/initrd.img \ - --grubpkg ${grubpkg} - local ret=$? - if [ $ret -ne 0 ]; then -diff -ruN anaconda-11.5.0.42.orig/scripts/mk-images.x86 anaconda-11.5.0.42/scripts/mk-images.x86 ---- anaconda-11.5.0.42.orig/scripts/mk-images.x86 2009-04-09 16:53:01.000000000 -0400 -+++ anaconda-11.5.0.42/scripts/mk-images.x86 2009-04-09 17:00:45.000000000 -0400 -@@ -159,15 +159,16 @@ - if [ -n "$BOOTISO" ]; then - EFIARGS="" - EFIGRAFT="" -- if [ -f $TOPDESTPATH/images/pxeboot/efiboot.img ]; then -- cp $TOPDESTPATH/images/pxeboot/efiboot.img $TOPDESTPATH/isolinux/efiboot.img -- EFIARGS="-eltorito-alt-boot -e isolinux/efiboot.img -no-emul-boot" -- EFIGRAFT="EFI/boot=$TOPDESTPATH/EFI/boot" -+ if [ -f $TOPDESTPATH/images/efiboot.img ]; then -+ echo "Found efiboot.img, making an EFI-capable boot.iso" -+ EFIARGS="-eltorito-alt-boot -e images/efiboot.img -no-emul-boot" -+ EFIGRAFT="EFI/BOOT=$TOPDESTPATH/EFI/BOOT" -+ else -+ echo "No efiboot.img found, making BIOS-only boot.iso" - fi - BIOSARGS="-b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table" -- echo $PWD:\$ mkisofs -o $TOPDESTPATH/images/$BOOTISO $BIOSARGS $EFIARGS -R -J -V "$PRODUCT" -T -graft-points isolinux=$TOPDESTPATH/isolinux images/install.img=$TOPDESTPATH/images/install.img $EFIGRAFT -- mkisofs -o $TOPDESTPATH/images/$BOOTISO $BIOSARGS $EFIARGS -R -J -V "$PRODUCT" -T -graft-points isolinux=$TOPDESTPATH/isolinux images/install.img=$TOPDESTPATH/images/install.img $EFIGRAFT -- implantisomd5 $TOPDESTPATH/images/$BOOTISO -+ mkisocmd="mkisofs -v -o $TOPDESTPATH/images/$BOOTISO $BIOSARGS $EFIARGS -R -J -V "$PRODUCT" -T -graft-points isolinux=$TOPDESTPATH/isolinux images=$TOPDESTPATH/images $EFIGRAFT" -+ echo $PWD:\$ $mkisocmd -+ $mkisocmd - fi -- - } diff --git a/anaconda.spec b/anaconda.spec index 5bfffe3..d868d91 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -2,7 +2,7 @@ Summary: Graphical system installer Name: anaconda -Version: 11.5.0.50 +Version: 11.5.0.51 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -13,7 +13,6 @@ URL: http://fedoraproject.org/wiki/Anaconda # git checkout -b archive-branch anaconda-%{version}-%{release} # make archive-no-tag Source0: %{name}-%{version}.tar.bz2 -Patch0: anaconda-efi.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -155,7 +154,6 @@ system. These files are of little use on an already installed system. %prep %setup -q -%patch0 -p1 %build %{__make} depend @@ -213,6 +211,18 @@ update-desktop-database &> /dev/null || : %endif %changelog +* Thu May 07 2009 David Cantrell - 11.5.0.51-1 +- Don't clear the first partition on any disk with a Mac disk label + (#492154). (clumens) +- Add detailedMessageWindow to the cmdline class (#499700). (clumens) +- Don't traceback when a freespace partition is present (#499662). (clumens) +- Do nomodeset when doing xdriver=vesa (ajax) +- Fix calculation of smallest PV's size in the lvm dialog. (#493753) + (dlehman) +- Fix KeyError when partition numbers change during allocation. (#497911) + (dlehman) +- Update EFI CD booting code in mk-images (pjones) + * Wed May 06 2009 Chris Lumens - 11.5.0.50-1 - Use storage objects throughout the partition editing UI code (#491806, #496002). (clumens) diff --git a/sources b/sources index c9c9e93..c93d76a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -517afb58cc8d0e1645c04f656ba46671 anaconda-11.5.0.50.tar.bz2 +630893fb748d415d569e6ed46a5f2f8d anaconda-11.5.0.51.tar.bz2