rpms/yaboot/devel yaboot-1.3.14-bigger-max-token.patch, NONE, 1.1 yaboot-1.3.14-fix-bootonce-nvram.patch, NONE, 1.1 yaboot.spec, 1.54, 1.55
David Woodhouse
dwmw2 at fedoraproject.org
Fri Nov 21 17:08:53 UTC 2008
- Previous message (by thread): rpms/bluez/devel .cvsignore, 1.16, 1.17 bluez.spec, 1.25, 1.26 sources, 1.16, 1.17
- Next message (by thread): rpms/ario/devel ario.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dwmw2
Update of /cvs/pkgs/rpms/yaboot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29672
Modified Files:
yaboot.spec
Added Files:
yaboot-1.3.14-bigger-max-token.patch
yaboot-1.3.14-fix-bootonce-nvram.patch
Log Message:
fix bootonce, MAX_TOKEN
yaboot-1.3.14-bigger-max-token.patch:
--- NEW FILE yaboot-1.3.14-bigger-max-token.patch ---
diff -up yaboot-1.3.14/second/cfg.c.bigger-max-token yaboot-1.3.14/second/cfg.c
--- yaboot-1.3.14/second/cfg.c.bigger-max-token 2008-11-12 14:39:11.000000000 -0500
+++ yaboot-1.3.14/second/cfg.c 2008-11-12 14:39:17.000000000 -0500
@@ -41,7 +41,7 @@ typedef struct {
void *data;
} CONFIG;
-#define MAX_TOKEN 200
+#define MAX_TOKEN 511
#define MAX_VAR_NAME MAX_TOKEN
#define EOF -1
yaboot-1.3.14-fix-bootonce-nvram.patch:
--- NEW FILE yaboot-1.3.14-fix-bootonce-nvram.patch ---
diff -up yaboot-1.3.14/ybin/ybin.fix-bootonce-nvram yaboot-1.3.14/ybin/ybin
--- yaboot-1.3.14/ybin/ybin.fix-bootonce-nvram 2008-11-12 14:51:28.000000000 -0500
+++ yaboot-1.3.14/ybin/ybin 2008-11-13 12:15:21.000000000 -0500
@@ -1689,14 +1689,15 @@ checkconf || exit 1
if [ "x$bootonce" != "x" ]; then
foundlabel=`sed s/\#.*// $bootconf | grep "label=$bootonce$" | wc -l`
- if [ "$nonvram" = 0 ]; then
+ if [ "$nonvram" = 1 ]; then
echo 1>&2 "$PRG: --bootonce specified, but nvsetenv not available."
exit 1
fi
if [ "$foundlabel" = 1 ]; then
nvsetenv boot-once "$bootonce"
foundlabel=`nvsetenv boot-once`
- if [ "$foundlabel" != "boot-once=$bootonce" ]; then
+ if [ "$foundlabel" != "boot-once=$bootonce" -a \
+ "$foundlabel" != "$bootonce" ]; then
echo 1>&2 "$PRG: Could not nvsetenv boot-once $bootonce"
exit 1
fi
Index: yaboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yaboot/devel/yaboot.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- yaboot.spec 5 Nov 2008 12:46:07 -0000 1.54
+++ yaboot.spec 21 Nov 2008 17:08:23 -0000 1.55
@@ -1,7 +1,7 @@
Summary: Linux bootloader for Power Macintosh "New World" computers.
Name: yaboot
Version: 1.3.14
-Release: 6%{?dist}
+Release: 7%{?dist}
License: GPLv2+
Group: System Environment/Base
Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@ -22,6 +22,8 @@
Patch27: yaboot-ppc64.patch
Patch28: yaboot-1.3.13-dontwritehome.patch
Patch29: yaboot-1.3.14-baseaddr.patch
+Patch30: yaboot-1.3.14-fix-bootonce-nvram.patch
+Patch31: yaboot-1.3.14-bigger-max-token.patch
URL: http://yaboot.ozlabs.org/
BuildRoot: %{_tmppath}/%{name}-root
@@ -54,6 +56,8 @@
%patch27 -p1 -b .ppc64
%patch28 -p1 -b .bootwrite
%patch29 -p1 -b .baseaddr
+%patch30 -p1 -b .bootonce
+%patch31 -p1 -b .maxtoken
%build
make VERSIONEXTRA='\ (Red Hat %version-%release)'
@@ -89,6 +93,10 @@
%ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
%changelog
+* Fri Nov 21 2008 David Woodhouse <David.Woodhouse at intel.com> - 1.3.14-7
+- Fix 'ybin --bootonce' (#471425)
+- Fix maximum token length, to fix preupgrade (#471321)
+
* Wed Nov 05 2008 Roman Rakus <rrakus at redhat.com> - 1.3.14-6
- Changed kernel load base address
Resolves: #468492
- Previous message (by thread): rpms/bluez/devel .cvsignore, 1.16, 1.17 bluez.spec, 1.25, 1.26 sources, 1.16, 1.17
- Next message (by thread): rpms/ario/devel ario.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list