xCAT/xcat-dep
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-dep.git synced 2024-11-21 09:01:46 +00:00
Code Issues Projects Releases Wiki Activity

-Refresh yaboot to address issues in recent SLES11 updates

Browse Source 
Former-commit-id: 2fc472cfefa6d1611e757e5cc2922d55d5a11f14
This commit is contained in:
jbjohnso 2010-05-12 22:04:57 +00:00
parent b4fc6d1a1a
commit 5ef6e417e4
4 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
yaboot/yaboot-1.3.15-05122010.tar.gz Normal file
View File

Binary file not shown.

12
yaboot/yaboot-32bitbuild.patch Normal file
View File

@ -0,0 +1,12 @@
diff -urN yaboot-1.3.15-05122010/Makefile yaboot-1.3.15-05122010-32bit/Makefile
--- yaboot-1.3.15-05122010/Makefile 2010-05-12 16:09:10.000000000 -0400
+++ yaboot-1.3.15-05122010-32bit/Makefile 2010-05-12 18:02:04.000000000 -0400
@@ -35,7 +35,7 @@
# The flags for the yaboot binary.
#
-YBCFLAGS = -Os $(CFLAGS) -nostdinc -Wall -isystem `$(CC) -m32 -print-file-name=include` -fsigned-char
+YBCFLAGS = -Os -m32 $(CFLAGS) -nostdinc -Wall -isystem `$(CC) -m32 -print-file-name=include` -fsigned-char
YBCFLAGS += -DVERSION=\"${VERSION}${VERSIONEXTRA}\" #"
YBCFLAGS += -DTEXTADDR=$(TEXTADDR) -DDEBUG=$(DEBUG)
YBCFLAGS += -DMALLOCADDR=$(MALLOCADDR) -DMALLOCSIZE=$(MALLOCSIZE)

18
yaboot/yaboot-skipmac.patch Normal file
View File

@ -0,0 +1,18 @@
diff -urN yaboot-1.3.15-05122010/second/yaboot.c yaboot-1.3.15-05122010-skipmac/second/yaboot.c
--- yaboot-1.3.15-05122010/second/yaboot.c 2010-05-12 16:09:10.000000000 -0400
+++ yaboot-1.3.15-05122010-skipmac/second/yaboot.c 2010-05-12 17:47:55.000000000 -0400
@@ -481,12 +481,14 @@
if (!fspec.file)
goto out;
+ /*
sprintf(fspec.file, "%s%02x-", cfgpath, packet->htype);
strcat(fspec.file, prom_get_mac(packet));
rc = load_config_file(&fspec);
if (rc)
goto out;
+ */
/*
* Now try to match on IP.

12
yaboot/yaboot-xcat.spec
View File

@ -1,16 +1,16 @@
%define pkg yaboot-xcat
%define ver 1.3.14
%define ver 1.3.15
Summary: yaboot binary for tftp server
Name: %{pkg}
Version: %{ver}
Release: 2
Release: 05122010
Group: System/Administration
License: GPL2
URL: http://yaboot.ozlabs.org/
Source: http://yaboot.ozlabs.org/releases/yaboot-1.3.14.tar.gz
Patch0: yaboot-fixes.patch
Patch1: yaboot-buf-expand.patch
Source: yaboot-%{ver}-%{release}.tar.gz
Patch0: yaboot-skipmac.patch
Patch1: yaboot-32bitbuild.patch
BuildRoot: %{_tmppath}/%{pkg}-buildroot
Prefix: %{_prefix}
BuildArch: noarch
@ -22,7 +22,7 @@ ppc nodes.
%prep
%{__rm} -rf %{buildroot}
%setup -q -n yaboot-%{ver}
%setup -q -n yaboot-%{ver}-%{release}
%patch0 -p1
%patch1 -p1