Compare commits

...

33 Commits
master ... f9

Author SHA1 Message Date
Fedora Release Engineering 2837327af2 dist-git conversion 2010-07-29 05:44:00 +00:00
Bill Nottingham e0e6a629d7 Fix typo that causes a failure to update the common directory. (releng #2781) 2009-11-26 01:27:34 +00:00
Tom Callaway aebe6e8192 try to make the sparc tftp initrd even smaller 2009-03-11 20:27:02 +00:00
Tom Callaway 309214bfeb temporary hack to keep tftpinitrd.img around 2009-03-09 20:02:56 +00:00
Tom Callaway 29557b3c30 take out more modules in smalltftp patch (on sparc) 2009-02-12 19:59:44 +00:00
Tom Callaway dc7578651c Make the tftp image smaller by restricting the modules heavily (on sparc) 2009-02-11 20:05:48 +00:00
Tom Callaway a90457c565 back out anaconda-11.4.0.83-sparc-getMinimumSector.patch. that code is almost never right on sparc, so we also back it out where it existed before. 2009-02-02 20:22:56 +00:00
Tom Callaway f9644e264c make sure we never start at sector 0 on sun disk 2008-12-18 23:02:07 +00:00
Tom Callaway 877e4e3828 fix isys raid code to work with newer kernel headers 2008-12-16 18:47:00 +00:00
Tom Callaway 80b583db6c tftp fix, fix verify for sparc 2008-12-16 15:33:14 +00:00
Tom Callaway d5273b8837 fix upd-instroot to only pull in sparcv9 for glibc, openssl && drop debugging patch 2008-12-11 21:42:12 +00:00
Tom Callaway 49e1bb1441 debugging loader 2008-10-15 21:07:59 +00:00
Tom Callaway 95874e1a0b fix silo.conf 2008-10-05 16:17:10 +00:00
Tom Callaway c62ffb43f2 one more pkgorder fix, drop patch suffix 2008-10-04 16:06:33 +00:00
Tom Callaway 5217f98728 simplify sparc specific bits, this actually works (mostly) 2008-10-04 15:52:04 +00:00
Tom Callaway a90429421c still more sparc fixes 2008-10-03 20:01:34 +00:00
Tom Callaway b0ed869dd3 fix sparc conditionals in upd-instroot 2008-10-02 21:47:48 +00:00
Tom Callaway c1562c1176 clean up sparc specific work 2008-10-02 19:37:20 +00:00
Tom Callaway c3ee7864f8 more sparc fixes 2008-10-02 14:22:12 +00:00
David Cantrell b87b4efaaa * Wed Oct 01 2008 David Cantrell <dcantrell@redhat.com> - 11.4.0.83-1
- Require elftoaout and piggyback on sparc. (dcantrell)
- Add screenfont-sparc.gz (dcantrell)
- Add keymaps files for sparc and sparc64. (dcantrell)
- Do not build on sparc64. (dcantrell)
- Various sparc fixes. (dcantrell)
- Fix build errors in auditd.c (kanarip)
- Fix pkgorder for new yum in F-9 (tcallawa)
- Make yumdownloader backwards compatible. (dcantrell)
- Don't run lspci with an explicit path (katzj)
- Include lspci on all images (#445974) (katzj)
2008-10-02 01:59:18 +00:00
Tom Callaway f37194fdc6 fix pkgorder to work with the latest yum, fix bz445974, dont call lspci with an explicit path, update oriya translations, fall back to old yumdownloader if new one fails 2008-10-01 21:48:52 +00:00
Tom Callaway e11e025d53 fix build 2008-10-01 14:15:48 +00:00
Tom Callaway 1d48d833ec ExcludeArch: sparc64 2008-10-01 13:35:21 +00:00
Tom Callaway bbb1a7664c sparc support 2008-10-01 13:09:08 +00:00
Christopher Edward Lumens 554ce7b54c New version. 2008-05-06 21:07:34 +00:00
Jeremy Katz ef88745c48 * Thu May 01 2008 Jeremy Katz <katzj@redhat.com> - 11.4.0.81-1
- Use 'yum clean all' when cleaning up after an upgrade, not
  preupgrade (#374921) (katzj)
- Disable grub-install on x86_64 Xen Domu (#442685) (markmc)
- Fix typo (katzj)
- Auto-import gpg key to work around poor PackageKit UI (katzj)
- Deal with udevd dying sometimes (#439633) (katzj)
- Kickstart flag is backwards (katzj)
- If we're given a language, don't warn about console fonts (#444258) (katzj)
2008-05-02 02:58:35 +00:00
Jeremy Katz 7c93a9a038 * Wed Apr 30 2008 Jeremy Katz <katzj@redhat.com> - 11.4.0.80-1
- And actually include the bash binary too (#443700) (katzj)
- Search path rather than hard-coding path to mdadm (#444843) (katzj)
2008-05-01 03:10:46 +00:00
Jeremy Katz 5db7f2824f * Tue Apr 29 2008 Jeremy Katz <katzj@redhat.com> - 11.4.0.79-1
- Disable betanag (#443908) (katzj)
- Use bash for minstg2 shell (#443700) (katzj)
- Revert PS1 and PATH changes as they don't work with
  busybox as used in minstg2 (katzj)
2008-04-30 01:16:23 +00:00
David Cantrell 51e8c95bb7 * Mon Apr 28 2008 David Cantrell <dcantrell@redhat.com> - 11.4.0.78-1
- Write per-interface DNS info to ifcfg files (#443244) (dcantrell)
- Clean up sanityCheckHostname() in network.py (dcantrell)
- Activate autorepeat for GUI installs. (jgranado)
2008-04-29 00:46:58 +00:00
David Cantrell 7647362f9c * Fri Apr 25 2008 David Cantrell <dcantrell@redhat.com> - 11.4.0.77-1
- Preserve 'set the hostname' setting when going Next/Back (#443414) (dcantrell)
- Avoid traceback on network configuration screen (#444184) (dcantrell)
- Add missing backslashes for the .profile here document. (dcantrell)
- Label the efi boot filesystem on ia64 as well. (pjones)
- Don't use size to determine if a partition is an EFI system
  partition; instead, (pjones)
- Handle the DVD having a disknumber of ALL. (443291) (jkeating)
- Make the LUKS passphrase prompt fit on an 80x25 screen. (#442100) (dlehman)
- Don't dd the image from /dev/zero _and_ use
  "mkdosfs -C <image> <blockcount>" (pjones)
- label the filesystem in efidisk.img so that HAL and such won't try to
  mount it. (pjones)
- fix testiso Makefile target - boot.iso, not netinst.iso (wwoods)
2008-04-26 02:08:14 +00:00
Jeremy Katz cdfdaa83d0 * Thu Apr 24 2008 Chris Lumens <clumens@redhat.com> - 11.4.0.76-1
- Use the execWithCapture wrapper to be consistent. (jgranado)
- Call the mdadm with full path. (jgranado)
- Use the correct ls(1) alias. (dcantrell)
- Set PS1 and ls(1) alias for tty2 shell. (dcantrell)
- Lookinig for the capabilities file in xen is valid in more cases. (jgranado)
- Avoid putting virtualization option when in Xen or VMware.
  (#443373) (jgranado)
- If the stage2 image is on a CD, don't bother copying it (#441336). (clumens)
- Once we've found the stage2 media on CD, always use it (#443736). (clumens)
- Change mount point for CD to /mnt/stage2 when looking for stage2
  (#443755). (clumens)
- Switch to using 'yum clean all' to clean up after preupgrade
  (#374921) (katzj)
- Handle .utf8 vs .UTF-8 (#443408) (katzj)
- Avoid dividing by zero (#439160) (katzj)
- Changes related to BZ #230949 (dcantrell)
- $XORGDRIVERS no longer exists (markmc)
- Bump version. (katzj)
- Write IPv6 values to /etc/sysconfig/... correctly (#433290) (dcantrell)
- Use the right base class for autopart handler. (clumens)
2008-04-24 20:27:24 +00:00
Jeremy Katz cd35a67b37 * Thu Apr 24 2008 Chris Lumens <clumens@redhat.com> - 11.4.0.76-1
- Use the execWithCapture wrapper to be consistent. (jgranado)
- Call the mdadm with full path. (jgranado)
- Use the correct ls(1) alias. (dcantrell)
- Set PS1 and ls(1) alias for tty2 shell. (dcantrell)
- Lookinig for the capabilities file in xen is valid in more cases. (jgranado)
- Avoid putting virtualization option when in Xen or VMware.
  (#443373) (jgranado)
- If the stage2 image is on a CD, don't bother copying it (#441336). (clumens)
- Once we've found the stage2 media on CD, always use it (#443736). (clumens)
- Change mount point for CD to /mnt/stage2 when looking for stage2
  (#443755). (clumens)
- Switch to using 'yum clean all' to clean up after preupgrade
  (#374921) (katzj)
- Handle .utf8 vs .UTF-8 (#443408) (katzj)
- Avoid dividing by zero (#439160) (katzj)
- Changes related to BZ #230949 (dcantrell)
- $XORGDRIVERS no longer exists (markmc)
- Bump version. (katzj)
- Write IPv6 values to /etc/sysconfig/... correctly (#433290) (dcantrell)
- Use the right base class for autopart handler. (clumens)
2008-04-24 20:27:24 +00:00
Jesse Keating 16e0d46870 Initialize branch F-9 for anaconda 2008-04-20 12:14:47 +00:00
14 changed files with 648 additions and 6 deletions

View File

@ -1 +0,0 @@
anaconda-11.4.0.75.tar.bz2

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
anaconda-11.4.0.83.tar.bz2

View File

@ -4,7 +4,7 @@ NAME := anaconda
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))

View File

@ -0,0 +1,251 @@
diff -up anaconda-11.4.0.83/bootdisk/sparc/silo.conf.spot anaconda-11.4.0.83/bootdisk/sparc/silo.conf
--- anaconda-11.4.0.83/bootdisk/sparc/silo.conf.spot 2008-10-01 21:32:11.000000000 -0400
+++ anaconda-11.4.0.83/bootdisk/sparc/silo.conf 2008-10-05 12:09:12.000000000 -0400
@@ -2,31 +2,31 @@ partition=1
default=linux
read-write
timeout=100
-message=/etc/boot.msg
-image="cat /etc/boot.msg"
+message=/boot/boot.msg
+image="cat /boot/boot.msg"
label=1
single-key
-image="cat /etc/options.msg"
+image="cat /boot/options.msg"
label=2
single-key
-image="cat /etc/general.msg"
+image="cat /boot/general.msg"
label=3
single-key
-image="cat /etc/param.msg"
+image="cat /boot/param.msg"
label=4
single-key
-image="cat /etc/rescue.msg"
+image="cat /boot/rescue.msg"
label=5
single-key
-image[sun4u]=/boot/vmlinux
+image[sun4u]=/boot/vmlinuz
label=linux
alias=install
initrd=/boot/initrd.img
-image[sun4u]=/boot/vmlinux
+image[sun4u]=/boot/vmlinuz
label=text
append=text
initrd=/boot/initrd.img
-image[sun4u]=/boot/vmlinux
+image[sun4u]=/boot/vmlinuz
label=ks
append=ks
initrd=/boot/initrd.img
diff -up anaconda-11.4.0.83/scripts/mk-images.sparc.spot anaconda-11.4.0.83/scripts/mk-images.sparc
--- anaconda-11.4.0.83/scripts/mk-images.sparc.spot 2008-10-01 21:32:11.000000000 -0400
+++ anaconda-11.4.0.83/scripts/mk-images.sparc 2008-10-05 12:08:50.000000000 -0400
@@ -44,6 +44,8 @@ maketftp() {
exit 1
done
+ echo "Making a $KERNELARCH tftp image: $TFTPIMAGE"
+
elftoaout $TFTPKERNEL -o $TFTPIMAGE
if [ "$KERNELARCH" = "sparc" ]; then
piggyback $TFTPIMAGE $TFTPSYSMAP $TFTPINITRD
@@ -52,51 +54,41 @@ maketftp() {
fi
}
-prepareBootImage() {
- echo "sparc: prepareBootImage() is called"
+prepareBootTree() {
+ echo "sparc: prepareBootTree() is called"
+ (cd $BOOTDISKDIR; find . -maxdepth 1 ! -type d | cpio --quiet -p $MBD_BOOTTREE)
+
+ cp $MBD_FSIMAGE $MBD_BOOTTREE/initrd.img
+ cp $KERNELROOT/boot/vmlinuz-* $MBD_BOOTTREE/vmlinuz
+ cp $KERNELROOT/boot/System.map-* $MBD_BOOTTREE/System.map
- dd if=/dev/zero of=$MBD_TMPIMAGE bs=1k count=$BOOTDISKSIZE 2>/dev/null
- echo y | /sbin/mke2fs -b 1024 -r 0 -O none $MBD_TMPIMAGE > /dev/null 2>/dev/null
- LODEV=`findloopdevice $MBD_TMPIMAGE`
- mount $LODEV -t ext2 $MBD_BOOTTREE
- cp $BOOTDISKDIR/fd.b $MBD_BOOTTREE
- cp $BOOTDISKDIR/second.b $MBD_BOOTTREE
- cp $BOOTDISKDIR/*.msg $stagedir
- mkdir -p $MBD_BOOTTREE/etc
- cp $BOOTDISKDIR/silo.conf $MBD_BOOTTREE/etc
- zcat $KERNELROOT/boot/vmlinuz-* | gzip -9 > $MBD_BOOTTREE/vmlinux.gz
- umount $LODEV
- losetup -d $LODEV
- mount -o loop -t ext2 $MBD_TMPIMAGE $MBD_BOOTTREE
- $SILO -r $MBD_BOOTTREE -i /fd.b -b /second.b -C /etc/silo.conf -F
}
makeBootImages() {
echo "Building boot images for kernel $kernelvers.$KERNELARCH"
- mkdir -p $TOPDESTPATH/boot
- cp $BOOTDISKDIR/isofs.b $TOPDESTPATH/boot
- cp $BOOTDISKDIR/second.b $TOPDESTPATH/boot
- cp $BOOTDISKDIR/etc/silo.conf $TOPDESTPATH/boot
-
- mkdir -p $TOPDESTPATH/etc
- cp $BOOTDISKDIR/*.msg $TOPDESTPATH/etc
-
- mkdir -p $TOPDESTPATH/kernels
- cp $KERNELROOT/boot/vmlinuz-* $TOPDESTPATH/kernels/vmlinux
- cp $KERNELROOT/boot/System.map-* $TOPDESTPATH/boot/System.map
-
- echo "List of init modules: $INITRDMODS $SPARCMODS"
-
- makeinitrd --initrdto $TOPDESTPATH/boot/initrd.img \
+ echo "Building initrd.img"
+ makeinitrd --initrdto $TOPDESTPATH/images/initrd.img \
--initrdsize 8192 \
--loaderbin loader \
--modules "$INITRDMODS $SPARCMODS"
-
- maketftp --kernel $TOPDESTPATH/boot/vmlinux \
- --imagename $TOPDESTPATH/images/tftp.img \
- --initrdfrom $TOPDESTPATH/boot/initrd.img \
- --systemmap $TOPDESTPATH/boot/System.map
+ [ $? = 0 ] || exit 1
+ if [ -f $IMGPATH/usr/lib/anaconda-runtime/boot/second.b ]; then
+ echo "Building boot dir for silo"
+ MBD_BOOTTREE=$TOPDESTPATH/boot
+ MBD_FSIMAGE=$TOPDESTPATH/images/initrd.img
+ mkdir $MBD_BOOTTREE
+ cp $IMGPATH/usr/lib/anaconda-runtime/boot/*.b $MBD_BOOTTREE/
+
+ prepareBootTree
+
+ maketftp --kernel $MBD_BOOTTREE/vmlinuz \
+ --imagename $TOPDESTPATH/images/tftp.img \
+ --systemmap $MBD_BOOTTREE/System.map
+ else
+ echo "I can't find SILO in $IMGPATH/usr/lib/anaconda-runtime/boot ?!?"
+ exit 1
+ fi
}
@@ -110,6 +102,8 @@ doPostImages() {
-r -V "PBOOT" -A "$PRODUCT $VERSION" \
-x Fedora \
-x repodata \
- -sparc-label "$PRODUCT $VERSION Boot Disc" -o $TOPDESTPATH/images/$BOOTISO $TOPDESTPATH
+ -sparc-label "$PRODUCT $VERSION Boot Disc" \
+ -o $TOPDESTPATH/images/$BOOTISO -graft-points \
+ boot=$TOPDESTPATH/boot images/stage2.img=$TOPDESTPATH/images/stage2.img
fi
}
diff -up anaconda-11.4.0.83/scripts/mk-images.spot anaconda-11.4.0.83/scripts/mk-images
--- anaconda-11.4.0.83/scripts/mk-images.spot 2008-10-01 21:32:11.000000000 -0400
+++ anaconda-11.4.0.83/scripts/mk-images 2008-10-05 12:08:50.000000000 -0400
@@ -128,7 +128,7 @@ INITRDMODS="$USBMODS $FIREWIREMODS $IDEM
KERNELDIR="/boot"
fi
- if [ "$BUILDARCH" = "sparc64" ]; then
+ if [ "$BUILDARCH" = "sparc64" -o "$BUILDARCH" = "sparcv9" ]; then
BASEARCH=sparc
else
BASEARCH=$BUILDARCH
@@ -136,7 +136,7 @@ INITRDMODS="$USBMODS $FIREWIREMODS $IDEM
# explicit block size setting for some arches (FIXME: we compose
# ppc64-ish trees as ppc, so we have to set the "wrong" block size)
- if [ "$BUILDARCH" = "sparc64" ]; then
+ if [ "$BUILDARCH" = "sparc64" -o "$BUILDARCH" = "sparcv9" ]; then
CRAMBS="--blocksize 8192"
elif [ "$BUILDARCH" = "sparc" ]; then
CRAMBS="--blocksize 4096"
@@ -198,9 +198,9 @@ INITRDMODS="$USBMODS $FIREWIREMODS $IDEM
if [ "$BUILDARCH" != "s390" -a "$BUILDARCH" != "s390x" ]; then
# go ahead and create the keymaps so we only have to do it once
- if [ -f $IMGPATH/usr/lib/anaconda-runtime/keymaps-override-$BUILDARCH ]; then
+ if [ -f $IMGPATH/usr/lib/anaconda-runtime/keymaps-override-$BASEARCH ]; then
echo "Found keymap override, using it"
- cp $IMGPATH/usr/lib/anaconda-runtime/keymaps-override-$BUILDARCH $KEYMAPS
+ cp $IMGPATH/usr/lib/anaconda-runtime/keymaps-override-$BASEARCH $KEYMAPS
else
echo "Running: $GETKEYMAPS $BUILDARCH $KEYMAPS $IMGPATH"
$GETKEYMAPS $BUILDARCH $KEYMAPS $IMGPATH
@@ -734,6 +734,8 @@ elif [ ${BUILDARCH} = ppc64 ]; then
elif [ ${BUILDARCH} = "x86_64" -o ${BUILDARCH} = "i386" ]; then
source $TOPDIR/mk-images.x86
source $TOPDIR/mk-images.efi
+elif [ ${BUILDARCH} = "sparc64" -o ${BUILDARCH} = "sparcv9" ]; then
+ source $TOPDIR/mk-images.sparc
else
source $TOPDIR/mk-images.${BUILDARCH}
fi
@@ -754,6 +756,8 @@ elif [ "$BUILDARCH" = "x86_64" ]; then
elif [ "$BUILDARCH" = "ia64" ]; then
kerneltags="kernel kernel-xen"
efiarch="ia64"
+elif [ "$BUILDARCH" = "sparcv9" -o "$BUILDARCH" = "sparc64" ]; then
+ arches="sparc64"
fi
foundakernel=""
diff -up anaconda-11.4.0.83/scripts/pkgorder.spot anaconda-11.4.0.83/scripts/pkgorder
--- anaconda-11.4.0.83/scripts/pkgorder.spot 2008-10-01 21:32:11.000000000 -0400
+++ anaconda-11.4.0.83/scripts/pkgorder 2008-10-05 12:08:50.000000000 -0400
@@ -71,7 +71,7 @@ class PackageOrderer(yum.YumBase):
self.doRepoSetup()
# We have to hack this in here, otherwise, we won't get sparc64v, sparcv9v
- if arch.startswith("sparc64"):
+ if arch.startswith("sparc64") or arch.startswith("sparcv9"):
self.arch = "sparc64v"
self.doSackSetup(rpmUtils.arch.getArchList(self.arch))
self.doTsSetup()
diff -up anaconda-11.4.0.83/scripts/upd-instroot.spot anaconda-11.4.0.83/scripts/upd-instroot
--- anaconda-11.4.0.83/scripts/upd-instroot.spot 2008-10-01 21:32:11.000000000 -0400
+++ anaconda-11.4.0.83/scripts/upd-instroot 2008-10-05 12:08:50.000000000 -0400
@@ -198,7 +198,7 @@ if [ $ARCH = ppc -o $ARCH = ppc64 ]; the
PACKAGES="$PACKAGES pcmciautils pdisk yaboot hfsutils"
fi
-if [ $ARCH = sparc -o $ARCH = sparc64 ]; then
+if [ $ARCH = sparc -o $ARCH = sparcv9 -o $ARCH = sparc64 ]; then
PACKAGES="$PACKAGES silo"
fi
@@ -266,7 +266,7 @@ fi
#
# add bootloader for particular arch
#
-if [ $ARCH = sparc ]; then
+if [ $ARCH = sparc -o $ARCH = sparcv9 -o $ARCH = sparc64 ]; then
PACKAGESGR="$PACKAGESGR tilo silo"
fi
@@ -312,6 +312,7 @@ KEEPFILE=${TMPDIR:-/tmp}/keepfile.$$
cat > $KEEPFILE <<EOF
boot/efi/EFI/redhat/elilo.efi
boot/efi/EFI/redhat/grub.efi
+boot/*.b
bin/bash
bin/dbus-daemon
bin/fdisk*
@@ -1050,11 +1051,10 @@ for p in $DEST $DESTGR; do
done
# copy bootloader files for sparc
- if [ $ARCH = sparc -a $p = $DESTGR ]; then
+ if [ $ARCH = sparc -o $ARCH = sparcv9 -o $ARCH = sparc64 ]; then
mkdir -p $p/usr/lib/anaconda-runtime/boot
- [ -d $p/boot ] || die "ERROR: directory missing: $p/boot"
- (cd $p/boot; find -name "*.b") | (cd $p/boot; /bin/cpio --quiet -pdmu $p/usr/lib/anaconda-runtime/boot)
- fi
+ cp -af $p/boot/*.b $p/usr/lib/anaconda-runtime/boot
+ fi
# copy bootloader file for ppc
if [ $ARCH = ppc -o $ARCH = ppc64 ]; then

View File

@ -0,0 +1,19 @@
diff -up anaconda-11.4.0.83/autopart.py.BAD anaconda-11.4.0.83/autopart.py
--- anaconda-11.4.0.83/autopart.py.BAD 2009-02-02 15:18:26.000000000 -0500
+++ anaconda-11.4.0.83/autopart.py 2009-02-02 15:18:46.000000000 -0500
@@ -195,10 +195,11 @@ class partlist:
self.parts = []
def getMinimumSector(disk):
- if disk.type.name == 'sun':
- start = long(disk.dev.sectors * disk.dev.heads)
- start /= (1024 / disk.dev.sector_size)
- return start + 1
+ # This is more trouble than it is worth.
+ # if disk.type.name == 'sun':
+ # start = long(disk.dev.sectors * disk.dev.heads)
+ # start /= (1024 / disk.dev.sector_size)
+ # return start + 1
return 0L
# first step of partitioning voodoo

View File

@ -0,0 +1,30 @@
diff -up anaconda-11.4.0.83/isys/isys.c.BAD anaconda-11.4.0.83/isys/isys.c
--- anaconda-11.4.0.83/isys/isys.c.BAD 2008-12-16 13:38:53.000000000 -0500
+++ anaconda-11.4.0.83/isys/isys.c 2008-12-16 13:41:34.000000000 -0500
@@ -679,7 +679,7 @@ static PyObject * doWipeRaidSuperblock(P
/* put the size in 1k blocks */
size >>= 1;
- if (lseek64(fd, ((off64_t) 1024) * (off64_t) MD_NEW_SIZE_BLOCKS(size), SEEK_SET) < 0) {
+ if (lseek64(fd, ((off64_t) 512) * (off64_t) MD_NEW_SIZE_SECTORS(size), SEEK_SET) < 0) {
PyErr_SetFromErrno(PyExc_SystemError);
return NULL;
}
@@ -711,7 +711,7 @@ static PyObject * doGetRaidSuperblock(Py
/* put the size in 1k blocks */
size >>= 1;
- if (lseek64(fd, ((off64_t) 1024) * (off64_t) MD_NEW_SIZE_BLOCKS(size), SEEK_SET) < 0) {
+ if (lseek64(fd, ((off64_t) 512) * (off64_t) MD_NEW_SIZE_SECTORS(size), SEEK_SET) < 0) {
PyErr_SetFromErrno(PyExc_SystemError);
return NULL;
}
@@ -749,7 +749,7 @@ static PyObject * doGetRaidChunkSize(PyO
/* put the size in 1k blocks */
size >>= 1;
- if (lseek64(fd, ((off64_t) 1024) * (off64_t) MD_NEW_SIZE_BLOCKS(size), SEEK_SET) < 0) {
+ if (lseek64(fd, ((off64_t) 512) * (off64_t) MD_NEW_SIZE_SECTORS(size), SEEK_SET) < 0) {
PyErr_SetFromErrno(PyExc_SystemError);
return NULL;
}

View File

@ -0,0 +1,80 @@
diff -up anaconda-11.4.0.83/scripts/mk-images.sparc.BAD anaconda-11.4.0.83/scripts/mk-images.sparc
--- anaconda-11.4.0.83/scripts/mk-images.sparc.BAD 2009-03-11 15:55:44.000000000 -0400
+++ anaconda-11.4.0.83/scripts/mk-images.sparc 2009-03-11 16:22:28.000000000 -0400
@@ -20,16 +20,55 @@
# modules that are needed. this is the generic "needed for every arch" stuff
TFTPCOMMONMODS="nfs sunrpc lockd cramfs loop squashfs ipv6"
TFTPUSBMODS="ohci-hcd uhci-hcd ehci-hcd hid mousedev usb-storage"
+TFTPFSMODS="ext2 ext3 ext4dev lock_nolock cifs"
INITRDMODS="$USBMODS $FIREWIREMODS $IDEMODS $SCSIMODS $FSMODS $LVMMODS $RAIDMODS $CRYPTOMODS $COMMONMODS $PCMCIASOCKMODS =scsi =net"
-TFTPINITRDMODS="$TFTPCOMMONMODS $TFTPUSBMODS $FIREWIREMODS $IDEMODS $SCSIMODS $FSMODS $LVMMODS $CRYPTOMODS"
+TFTPINITRDMODS="$TFTPCOMMONMODS $TFTPUSBMODS $IDEMODS $SCSIMODS $TFTPFSMODS $LVMMODS $CRYPTOMODS"
SPARCCOMMONMODS="openpromfs sermouse"
-SPARCSCSIMODS="qlogicpti esp sym53c8xx qlogicisp mptbase mptscsih mptfc mptsas qla2xxx qla2100 qla2200 qla2300 pata_cmd64x pata_ali"
+SPARCSCSIMODS="qlogicpti esp sym53c8xx qlogicisp mptbase mptscsih mptfc mptsas qla2xxx pata_cmd64x pata_ali"
SPARCNETMODS="cassini e1000 e1000e sunbmac sungem sunhme sunlance sunqe sunvnet tg3 tulip"
SPARCMODS="$SPARCCOMMONMODS $SPARCSCSIMODS $SPARCNETMODS"
TILO=$IMGPATH/usr/bin/tilo
SILO=$IMGPATH/usr/sbin/silo
+# This is a disgusting hack. Unfortunately, it's the only way we can get files out of the tftpinitrd without worse hacks.
+
+makeproductfile() {
+ root=$1
+
+ rm -f $root/.buildstamp
+ echo $IMAGEUUID > $root/.buildstamp
+ echo $PRODUCT >> $root/.buildstamp
+ echo $VERSION >> $root/.buildstamp
+ if [ -n "$BUGURL" ]; then
+ echo $BUGURL >> $root/.buildstamp
+ fi
+ if [ "$AMITFTP" = "1" ]; then
+ rm -rf $root/modules/*/kernel/drivers/isdn/i4l/isdn.ko*
+ rm -rf $root/modules/*/kernel/drivers/isdn/isdnloop/isdnloop.ko*
+ rm -rf $root/modules/*/kernel/drivers/media/common/ir-common.ko*
+ rm -rf $root/modules/*/kernel/drivers/media/video/bt8xx/bttv.ko*
+ rm -rf $root/modules/*/kernel/drivers/media/video/btcx-risc.ko*
+ rm -rf $root/modules/*/kernel/drivers/media/video/v4l1-compat.ko*
+ rm -rf $root/modules/*/kernel/drivers/media/video/videodev.ko*
+ rm -rf $root/modules/*/kernel/drivers/media/video/videobuf-core.ko*
+ rm -rf $root/modules/*/kernel/drivers/media/video/compat_ioctl32.ko*
+ rm -rf $root/modules/*/kernel/drivers/media/video/videobuf-dma-sg.ko*
+ rm -rf $root/modules/*/kernel/drivers/media/video/v4l2-common.ko*
+ rm -rf $root/modules/*/kernel/drivers/media/video/tveeprom.ko*
+ rm -rf $root/modules/*/kernel/drivers/media/common/ir-common.ko*
+ rm -rf $root/modules/*/kernel/drivers/media/dvb/bt8xx/bt878.ko*
+ rm -rf $root/modules/*/kernel/drivers/media/dvb/bt8xx/dst.ko*
+ rm -rf $root/modules/*/kernel/drivers/media/dvb/dvb-core/dvb-core.ko*
+ rm -rf $root/firmware/ql2100_fw.bin
+ rm -rf $root/firmware/ql2300_fw.bin
+ rm -rf $root/firmware/ql2322_fw.bin
+ rm -rf $root/firmware/ql2400_fw.bin
+ rm -rf $root/firmware/ql2400_fw.bin_mid
+ fi
+}
+
+
maketftp() {
while [ x$(echo $1 | cut -c1-2) = x"--" ]; do
if [ $1 = "--kernel" ]; then
@@ -77,12 +116,18 @@ makeBootImages() {
echo "Building boot images for kernel $kernelvers.$KERNELARCH"
echo "Building initrd.img"
+
+ export AMITFTP=0
+
makeinitrd --initrdto $TOPDESTPATH/images/initrd.img \
--initrdsize 8192 \
--loaderbin loader \
--modules "$INITRDMODS $SPARCMODS"
[ $? = 0 ] || exit 1
echo "Building special tftpinitrd.img"
+
+ export AMITFTP=1
+
makeinitrd --initrdto $TOPDESTPATH/images/tftpinitrd.img \
--initrdsize 8192 \
--loaderbin loader \

View File

@ -0,0 +1,11 @@
diff -up anaconda-11.4.0.83/scripts/mk-images.sparc.BAD anaconda-11.4.0.83/scripts/mk-images.sparc
--- anaconda-11.4.0.83/scripts/mk-images.sparc.BAD 2008-12-13 10:45:14.000000000 -0500
+++ anaconda-11.4.0.83/scripts/mk-images.sparc 2008-12-13 10:45:46.000000000 -0500
@@ -84,6 +84,7 @@ makeBootImages() {
maketftp --kernel $MBD_BOOTTREE/vmlinuz \
--imagename $TOPDESTPATH/images/tftp.img \
+ --initrdfrom $TOPDESTPATH/images/initrd.img \
--systemmap $MBD_BOOTTREE/System.map
else
echo "I can't find SILO in $IMGPATH/usr/lib/anaconda-runtime/boot ?!?"

View File

@ -0,0 +1,13 @@
diff -up anaconda-11.4.0.83/image.py.BAD anaconda-11.4.0.83/image.py
--- anaconda-11.4.0.83/image.py.BAD 2008-12-15 09:32:51.000000000 -0500
+++ anaconda-11.4.0.83/image.py 2008-12-15 09:34:17.000000000 -0500
@@ -31,6 +31,9 @@ log = logging.getLogger("anaconda")
# don't. *sigh*
if os.uname()[4] == "s390x":
_arch = "s390x"
+# This is somewhat false, but we need this to pass the verify check.
+elif os.uname()[4] == "sparc64":
+ _arch = "sparcv9"
else:
_arch = rhpl.getArch()

View File

@ -0,0 +1,46 @@
diff -up anaconda-11.4.0.83/scripts/mk-images.sparc.BAD anaconda-11.4.0.83/scripts/mk-images.sparc
--- anaconda-11.4.0.83/scripts/mk-images.sparc.BAD 2009-02-11 14:59:20.000000000 -0500
+++ anaconda-11.4.0.83/scripts/mk-images.sparc 2009-02-11 14:59:38.000000000 -0500
@@ -17,7 +17,16 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-SPARCMODS="openpromfs sermouse qlogicpti pluto fcal soc socal esp fc4 aic7xxx sym53c8xx qlogicisp mptbase mptscsih mptfc mptsas qla2xxx qla2100 qla2200 qla2300"
+# modules that are needed. this is the generic "needed for every arch" stuff
+TFTPCOMMONMODS="nfs sunrpc lockd cramfs loop squashfs ipv6"
+TFTPUSBMODS="ohci-hcd uhci-hcd ehci-hcd hid mousedev usb-storage"
+INITRDMODS="$USBMODS $FIREWIREMODS $IDEMODS $SCSIMODS $FSMODS $LVMMODS $RAIDMODS $CRYPTOMODS $COMMONMODS $PCMCIASOCKMODS =scsi =net"
+TFTPINITRDMODS="$TFTPCOMMONMODS $TFTPUSBMODS $FIREWIREMODS $IDEMODS $SCSIMODS $FSMODS $LVMMODS $CRYPTOMODS"
+SPARCCOMMONMODS="openpromfs sermouse"
+SPARCSCSIMODS="qlogicpti esp sym53c8xx qlogicisp mptbase mptscsih mptfc mptsas qla2xxx qla2100 qla2200 qla2300 pata_cmd64x pata_ali"
+SPARCNETMODS="cassini e1000 e1000e sunbmac sungem sunhme sunlance sunqe sunvnet tg3 tulip"
+SPARCMODS="$SPARCCOMMONMODS $SPARCSCSIMODS $SPARCNETMODS"
+
TILO=$IMGPATH/usr/bin/tilo
SILO=$IMGPATH/usr/sbin/silo
@@ -73,6 +82,12 @@ makeBootImages() {
--loaderbin loader \
--modules "$INITRDMODS $SPARCMODS"
[ $? = 0 ] || exit 1
+ echo "Building special tftpinitrd.img"
+ makeinitrd --initrdto $TOPDESTPATH/images/tftpinitrd.img \
+ --initrdsize 8192 \
+ --loaderbin loader \
+ --modules "$TFTPINITRDMODS $SPARCMODS"
+ [ $? = 0 ] || exit 1
if [ -f $IMGPATH/usr/lib/anaconda-runtime/boot/second.b ]; then
echo "Building boot dir for silo"
MBD_BOOTTREE=$TOPDESTPATH/boot
@@ -84,8 +99,10 @@ makeBootImages() {
maketftp --kernel $MBD_BOOTTREE/vmlinuz \
--imagename $TOPDESTPATH/images/tftp.img \
- --initrdfrom $TOPDESTPATH/images/initrd.img \
+ --initrdfrom $TOPDESTPATH/images/tftpinitrd.img \
--systemmap $MBD_BOOTTREE/System.map
+ echo "Deleting $TOPDESTPATH/images/tftpinitrd.img , we only want this for the tftp image creation"
+ # rm -rf $TOPDESTPATH/images/tftpinitrd.img
else
echo "I can't find SILO in $IMGPATH/usr/lib/anaconda-runtime/boot ?!?"
exit 1

View File

@ -0,0 +1,12 @@
diff -up anaconda-11.4.0.83/scripts/upd-instroot.BAD anaconda-11.4.0.83/scripts/upd-instroot
--- anaconda-11.4.0.83/scripts/upd-instroot.BAD 2008-12-11 16:29:16.000000000 -0500
+++ anaconda-11.4.0.83/scripts/upd-instroot 2008-12-11 16:30:18.000000000 -0500
@@ -169,6 +169,8 @@ PACKAGES="glibc-common setup python newt
if [ $ARCH = i386 ]; then
PACKAGES="$PACKAGES glibc.i386 openssl.i386"
+elif [ $ARCH = sparc -o $ARCH = sparcv9 -o $ARCH = sparc64 ]; then
+ PACKAGES="$PACKAGES glibc.sparcv9 openssl.sparcv9"
else
PACKAGES="$PACKAGES glibc openssl"
fi

View File

@ -2,22 +2,31 @@
Summary: Graphical system installer
Name: anaconda
Version: 11.4.0.75
Release: 1
Version: 11.4.0.83
Release: 16
License: GPLv2+
Group: Applications/System
URL: http://fedoraproject.org/wiki/Anaconda
Source0: anaconda-%{version}.tar.bz2
Patch0: anaconda-11.4.0.83-more-sparc-fixes.patch
Patch1: anaconda-11.4.0.83-sparc-upd-instroot-nov9vforglibc.patch
Patch2: anaconda-11.4.0.83-sparc-fixtftp.patch
Patch3: anaconda-11.4.0.83-sparc-fixverify.patch
Patch4: anaconda-11.4.0.83-raid-headers.patch
Patch5: anaconda-11.4.0.83-no-sun-disk-magic-for-getMinimumSector.patch
Patch6: anaconda-11.4.0.83-sparc-smalltftp.patch
Patch7: anaconda-11.4.0.83-sparc-evensmallertftp.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExcludeArch: sparc64
# Versions of required components (done so we make sure the buildrequires
# match the requires versions of things).
%define dmver 1.02.17-6
%define gettextver 0.11
%define intltoolver 0.31.2-3
%define libdhcpver 1.99.6-2
%define libdhcpver 1.99.8-1
%define libnlver 1.0
%define libselinuxver 1.6
%define mkinitrdver 5.1.2-1
@ -88,6 +97,10 @@ Requires: e2fsprogs
%ifarch %{ix86} x86_64 ia64
Requires: dmidecode
%endif
%ifarch sparc sparcv9
Requires: elftoaout
Requires: piggyback
%endif
Requires: python-pyblock >= %{pythonpyblockver}
Requires: libbdevid >= %{libbdevidver}
Requires: libbdevid-python
@ -145,6 +158,21 @@ sets, but are not meant for use on already installed systems.
%prep
%setup -q
%patch0 -p1
# Fix upd-instroot to force sparcv9 for glibc and openssl
%patch1 -p1
# Fix tftp generation to use an initrd
%patch2 -p1
# Fix arch comparison for sparcv9 in verify function
%patch3 -p1
# Fix isys raid code for newer kernel headers (from anaconda HEAD)
%patch4 -p1
# Get rid of sun disk specific getMinimumsector routines
%patch5 -p1
# Make the tftp image smaller by restricting the modules heavily (on sparc)
%patch6 -p1
# Make the tftp image even smaller on sparc, includes one dirty hack
%patch7 -p1
%build
%{__make} depend
@ -207,6 +235,157 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{bu
/sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
%changelog
* Wed Mar 11 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 11.4.0.83-16
- try a function overload hack to delete more files from the tftp initrd
so we can get it under the limit
* Mon Mar 9 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 11.4.0.83-15.1
- HACK: Don't delete the tftpinitrd.img, we need to look at it to see what
else we can scoop out
* Wed Feb 11 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 11.4.0.83-15
- tweak smalltftp patch to take out more modules (on sparc)
* Wed Feb 11 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 11.4.0.83-14
- Make the tftp image smaller by restricting the modules heavily (on sparc)
* Mon Feb 2 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 11.4.0.83-13
- back out anaconda-11.4.0.83-sparc-getMinimumSector.patch
that code is almost never right on sparc, so we also back it out where
it existed before.
* Thu Dec 18 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 11.4.0.83-12
- Make sure the minimum sector is never 0 on sun disk types
* Tue Dec 16 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 11.4.0.83-11
- fix isys raid code to work with newer kernel headers
* Tue Dec 16 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 11.4.0.83-10
- Fix tftp generation to use an initrd
- Fix arch comparison for sparcv9 in verify function
* Thu Dec 11 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 11.4.0.83-9
- Fix upd-instroot to force sparcv9 for glibc and openssl
- drop debugging patch
* Wed Oct 15 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 11.4.0.83-8.1
- debugging the loader to troubleshoot sparc problems, temporary patch
* Sun Oct 05 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 11.4.0.83-8
- fix silo.conf
* Sat Oct 04 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 11.4.0.83-7
- one more pkgorder fix, drop patch suffix
* Sat Oct 04 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 11.4.0.83-6
- simplify sparc specific bits, this actually works (mostly)
* Thu Oct 02 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 11.4.0.83-5
- still more sparc fixes
* Thu Oct 02 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 11.4.0.83-4
- fix sparc conditionals in upd-instroot
* Thu Oct 02 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 11.4.0.83-3
- clean up sparc specific work
* Wed Oct 01 2008 David Cantrell <dcantrell@redhat.com> - 11.4.0.83-1
- Require elftoaout and piggyback on sparc. (dcantrell)
- Add screenfont-sparc.gz (dcantrell)
- Add keymaps files for sparc and sparc64. (dcantrell)
- Do not build on sparc64. (dcantrell)
- Various sparc fixes. (dcantrell)
- Fix build errors in auditd.c (kanarip)
- Fix pkgorder for new yum in F-9 (tcallawa)
- Make yumdownloader backwards compatible. (dcantrell)
- Don't run lspci with an explicit path (katzj)
- Include lspci on all images (#445974) (katzj)
* Wed Oct 1 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 11.4.0.82-5
- patch pkgorder to work with the latest f9 yum
- include lspci on all images (katzj)
- don't run lspci with an explicit path (katzj)
- update oriya translation (mgiri)
- fallback to the old yumdownloader if the new one isn't found (kanarip)
* Wed Oct 1 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 11.4.0.82-4
- don't use ".sparc" suffix for patch, confuses during %%install
* Wed Oct 1 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 11.4.0.82-3
- ExcludeArch: sparc64
* Sun Sep 28 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 11.4.0.82-2
- fix sparc support (merge relevant changes from old Aurora)
* Tue May 06 2008 Chris Lumens <clumens@redhat.com> - 11.4.0.82-1
- Look in the right place when ISO images are in a subdirectory
(#443580). (clumens)
- Don't crash when given URLs of the form ftp://user@host/path
(#445295). (dlehman)
- And run in the root (#374921) (katzj)
* Thu May 01 2008 Jeremy Katz <katzj@redhat.com> - 11.4.0.81-1
- Use 'yum clean all' when cleaning up after an upgrade, not
preupgrade (#374921) (katzj)
- Disable grub-install on x86_64 Xen Domu (#442685) (markmc)
- Fix typo (katzj)
- Auto-import gpg key to work around poor PackageKit UI (katzj)
- Deal with udevd dying sometimes (#439633) (katzj)
- Kickstart flag is backwards (katzj)
- If we're given a language, don't warn about console fonts (#444258) (katzj)
* Wed Apr 30 2008 Jeremy Katz <katzj@redhat.com> - 11.4.0.80-1
- And actually include the bash binary too (#443700) (katzj)
- Search path rather than hard-coding path to mdadm (#444843) (katzj)
* Tue Apr 29 2008 Jeremy Katz <katzj@redhat.com> - 11.4.0.79-1
- Disable betanag (#443908) (katzj)
- Use bash for minstg2 shell (#443700) (katzj)
- Revert PS1 and PATH changes as they don't work with
busybox as used in minstg2 (katzj)
* Mon Apr 28 2008 David Cantrell <dcantrell@redhat.com> - 11.4.0.78-1
- Write per-interface DNS info to ifcfg files (#443244) (dcantrell)
- Clean up sanityCheckHostname() in network.py (dcantrell)
- Activate autorepeat for GUI installs. (jgranado)
* Fri Apr 25 2008 David Cantrell <dcantrell@redhat.com> - 11.4.0.77-1
- Preserve 'set the hostname' setting when going Next/Back (#443414) (dcantrell)
- Avoid traceback on network configuration screen (#444184) (dcantrell)
- Add missing backslashes for the .profile here document. (dcantrell)
- Label the efi boot filesystem on ia64 as well. (pjones)
- Don't use size to determine if a partition is an EFI system
partition; instead, (pjones)
- Handle the DVD having a disknumber of ALL. (443291) (jkeating)
- Make the LUKS passphrase prompt fit on an 80x25 screen. (#442100) (dlehman)
- Don't dd the image from /dev/zero _and_ use
"mkdosfs -C <image> <blockcount>" (pjones)
- label the filesystem in efidisk.img so that HAL and such won't try to
mount it. (pjones)
- fix testiso Makefile target - boot.iso, not netinst.iso (wwoods)
* Thu Apr 24 2008 Chris Lumens <clumens@redhat.com> - 11.4.0.76-1
- Use the execWithCapture wrapper to be consistent. (jgranado)
- Call the mdadm with full path. (jgranado)
- Use the correct ls(1) alias. (dcantrell)
- Set PS1 and ls(1) alias for tty2 shell. (dcantrell)
- Lookinig for the capabilities file in xen is valid in more cases. (jgranado)
- Avoid putting virtualization option when in Xen or VMware.
(#443373) (jgranado)
- If the stage2 image is on a CD, don't bother copying it (#441336). (clumens)
- Once we've found the stage2 media on CD, always use it (#443736). (clumens)
- Change mount point for CD to /mnt/stage2 when looking for stage2
(#443755). (clumens)
- Switch to using 'yum clean all' to clean up after preupgrade
(#374921) (katzj)
- Handle .utf8 vs .UTF-8 (#443408) (katzj)
- Avoid dividing by zero (#439160) (katzj)
- Changes related to BZ #230949 (dcantrell)
- $XORGDRIVERS no longer exists (markmc)
- Bump version. (katzj)
- Write IPv6 values to /etc/sysconfig/... correctly (#433290) (dcantrell)
- Use the right base class for autopart handler. (clumens)
* Fri Apr 18 2008 Jeremy Katz <katzj@redhat.com> - 11.4.0.75-1
- Listing the directories before expiring yum caches helps (katzj)

1
branch Normal file
View File

@ -0,0 +1 @@
F-9

View File

@ -1 +1 @@
4ac7ec316a6bf8bf86d2a064b8052616 anaconda-11.4.0.75.tar.bz2
3c512484c7ea6d14918d64e9ba7a31d7 anaconda-11.4.0.83.tar.bz2