rpms/yaboot/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 yaboot-1.3.13-yabootconfig.patch, 1.2, 1.3 yaboot-ppc64.patch, 1.1, 1.2 yaboot.spec, 1.47, 1.48
Roman Rakus (rrakus)
fedora-extras-commits at redhat.com
Wed Apr 16 11:22:03 UTC 2008
Author: rrakus
Update of /cvs/extras/rpms/yaboot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27699
Modified Files:
.cvsignore sources yaboot-1.3.13-yabootconfig.patch
yaboot-ppc64.patch yaboot.spec
Log Message:
Upstream 1.3.14
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yaboot/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 18 Sep 2004 08:21:27 -0000 1.6
+++ .cvsignore 16 Apr 2008 11:21:11 -0000 1.7
@@ -1,2 +1,3 @@
yaboot-1.3.12.tar.gz
yaboot-1.3.13.tar.gz
+yaboot-1.3.14.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yaboot/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 18 Sep 2004 08:21:27 -0000 1.6
+++ sources 16 Apr 2008 11:21:11 -0000 1.7
@@ -1,2 +1,3 @@
85cf685c1dc5873c2a5124ba4524b2d2 yaboot-1.3.12.tar.gz
f12798d1b2063f21d07e0ae7f602ccaf yaboot-1.3.13.tar.gz
+dd346812667ab3818248c9784fe8e38e yaboot-1.3.14.tar.gz
yaboot-1.3.13-yabootconfig.patch:
Index: yaboot-1.3.13-yabootconfig.patch
===================================================================
RCS file: /cvs/extras/rpms/yaboot/devel/yaboot-1.3.13-yabootconfig.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- yaboot-1.3.13-yabootconfig.patch 25 Jul 2005 20:28:32 -0000 1.2
+++ yaboot-1.3.13-yabootconfig.patch 16 Apr 2008 11:21:11 -0000 1.3
@@ -114,17 +114,14 @@
"")
break
;;
-@@ -474,7 +563,9 @@
-
+@@ -474,6 +563,6 @@
+ READLINKKV=`readlink /usr/src/linux`
## find the kernel in the usual places and (if not --quiet) ask the
## user if we cannot find one.
--if [ -f "${CHROOT}vmlinux" ] ; then
-+if [ -f "${CHROOT}${KERNELIMAGE}" ] ; then
-+ KERNEL="${CHROOT}${KERNELIMAGE}"
-+elif [ -f "${CHROOT}vmlinux" ] ; then
- KERNEL="${CHROOT}vmlinux"
- if [ -f "${CHROOT}initrd" ] ; then
- INITRD="${CHROOT}initrd"
+-for k in "vmlinux" "vmlinux-`uname -r`" "vmlinux-`uname -r`" "$READLINKKV" ; do
++for k in "${KERNELIMAGE}" "vmlinux" "vmlinux-`uname -r`" "vmlinux-`uname -r`" "$READLINKKV" ; do
+ if [ -f "${CHROOT}${k}" ] ; then
+ KERNEL="${CHROOT}${k}"
@@ -721,6 +812,36 @@
HEADER="## see also: /usr/share/doc/yaboot/examples for example configurations.\n"
fi
@@ -162,7 +159,7 @@
## setup append line
if [ -n "$KERNARGS" ] ; then
APPEND="\tappend=\"${KERNARGS}\"\n"
-@@ -740,24 +861,64 @@
+@@ -731,24 +850,64 @@
INITRDIMGS="\tinitrd=$INITRDIMG\n\tinitrd-size=8192\n"
fi
@@ -199,7 +196,7 @@
-##
-## run: \"man yaboot.conf\" for details. Do not make changes until you have!!
-${HEADER}##
--## For a dual-boot menu, add one or more of:
+-## For a dual-boot menu, add one or more of:
-## bsd=/dev/hdaX, macos=/dev/hdaY, macosx=/dev/hdaZ\n
-boot=${BOOT}${DEVICE:-}
+GLOBAL="boot=${BOOT}${DEVICE:-}
yaboot-ppc64.patch:
Index: yaboot-ppc64.patch
===================================================================
RCS file: /cvs/extras/rpms/yaboot/devel/yaboot-ppc64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- yaboot-ppc64.patch 14 Sep 2005 23:59:49 -0000 1.1
+++ yaboot-ppc64.patch 16 Apr 2008 11:21:11 -0000 1.2
@@ -1,29 +1,12 @@
--- yaboot-1.3.13/Makefile.ppc64 2005-09-14 20:01:12.920430616 -0400
+++ yaboot-1.3.13/Makefile 2005-09-14 20:01:21.090385992 -0400
-@@ -31,7 +31,7 @@
+@@ -36,7 +36,7 @@
# The flags for the yaboot binary.
#
--YBCFLAGS = -Os $(CFLAGS) -nostdinc -Wall -isystem `gcc -print-file-name=include` -fsigned-char
+-YBCFLAGS = -Os $(CFLAGS) -nostdinc -Wall -isystem `$(CC) -m32 -print-file-name=include` -fsigned-char
+-YBCFLAGS += -DVERSION=\"${VERSION}${VERSIONEXTRA}\" #"
+YBCFLAGS = -Os -m32 $(CFLAGS) -nostdinc -Wall -isystem `$(CC) -m32 -print-file-name=include` -fsigned-char
- YBCFLAGS += -DVERSION="\"${VERSION}${VERSIONEXTRA}\"" #"
++YBCFLAGS += -DVERSION="\"${VERSION}${VERSIONEXTRA}\"" #"
YBCFLAGS += -DTEXTADDR=$(TEXTADDR) -DDEBUG=$(DEBUG)
YBCFLAGS += -DMALLOCADDR=$(MALLOCADDR) -DMALLOCSIZE=$(MALLOCSIZE)
-@@ -60,7 +60,7 @@
-
- # Link flags
- #
--LFLAGS = -Ttext $(TEXTADDR) -Bstatic
-+LFLAGS = -Ttext $(TEXTADDR) -Bstatic -melf32ppclinux
-
- # Libraries
- #
-@@ -100,7 +100,7 @@
- AS := $(CROSS)as
- OBJCOPY := $(CROSS)objcopy
-
--lgcc = `$(CC) -print-libgcc-file-name`
-+lgcc = `$(CC) -m32 -print-libgcc-file-name`
-
- all: yaboot addnote mkofboot
-
Index: yaboot.spec
===================================================================
RCS file: /cvs/extras/rpms/yaboot/devel/yaboot.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- yaboot.spec 7 Apr 2008 14:48:14 -0000 1.47
+++ yaboot.spec 16 Apr 2008 11:21:11 -0000 1.48
@@ -1,7 +1,7 @@
Summary: Linux bootloader for Power Macintosh "New World" computers.
Name: yaboot
-Version: 1.3.13
-Release: 11%{?dist}
+Version: 1.3.14
+Release: 0%{?dist}
License: GPL
Group: System Environment/Base
Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@ -44,6 +44,7 @@
Obsoletes: ybin
ExclusiveArch: ppc ppc64
Requires: hfsutils
+BuildRequires: e2fsprogs-devel
%description
yaboot is a bootloader for PowerPC machines which works on New World ROM
@@ -63,28 +64,28 @@
%patch8 -p1 -b .sbin
%patch9 -p1 -b .config
%patch10 -p1 -b .parted
-%patch11 -p1 -b .manpage
-%patch12 -p1 -b .gcc34
-%patch13 -p1 -b .amigaparts
-%patch14 -p1 -b .swraid1
-%patch15 -p1 -b .nobootx
-%patch16 -p1 -b .swraid2
+#%patch11 -p1 -b .manpage
+#%patch12 -p1 -b .gcc34
+#%patch13 -p1 -b .amigaparts
+#%patch14 -p1 -b .swraid1
+#%patch15 -p1 -b .nobootx
+#%patch16 -p1 -b .swraid2
%patch17 -p1 -b .pegasos
%patch18 -p1 -b .ext2
-%patch19 -p1 -b .confarg
-%patch20 -p1 -b .ofpath
+#%patch19 -p1 -b .confarg
+#%patch20 -p1 -b .ofpath
%patch21 -p1 -b .pegasos-serial
%patch22 -p1 -b .deepmnt
-%patch23 -p1 -b .malloc
+#%patch23 -p1 -b .malloc
#patch24 -p1 -b .telnet
-%patch25 -p1 -b .netboot
-%patch26 -p1 -b .printversion
+#%patch25 -p1 -b .netboot
+#%patch26 -p1 -b .printversion
%patch27 -p1 -b .ppc64
-%patch28 -p1 -b .multisata
+#%patch28 -p1 -b .multisata
%patch29 -p1 -b .bootwrite
-%patch30 -p1 -b .addnote
-%patch31 -p1 -b .firewire
-%patch32 -p1 -b .bplan
+#%patch30 -p1 -b .addnote
+#%patch31 -p1 -b .firewire
+#%patch32 -p1 -b .bplan
%build
make VERSIONEXTRA='\ (Red Hat %version-%release)'
@@ -120,6 +121,9 @@
%ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
%changelog
+* Wed Apr 16 2008 Roman Rakus <rrakus at redhat.cz>
+- Upstram 1.3.14
+
* Thu Mar 27 2008 David Woodhouse <dwmw2 at redhat.com> - 1.3.13-11
- Correct off-by-one error in Amiga partition numbers
More information about the fedora-extras-commits
mailing list