diff --git a/yaboot/yaboot-1.3.15-05122010.tar.gz b/yaboot/yaboot-1.3.15-05122010.tar.gz new file mode 100644 index 0000000..568fa96 Binary files /dev/null and b/yaboot/yaboot-1.3.15-05122010.tar.gz differ diff --git a/yaboot/yaboot-32bitbuild.patch b/yaboot/yaboot-32bitbuild.patch new file mode 100644 index 0000000..76e3fa7 --- /dev/null +++ b/yaboot/yaboot-32bitbuild.patch @@ -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) diff --git a/yaboot/yaboot-skipmac.patch b/yaboot/yaboot-skipmac.patch new file mode 100644 index 0000000..31dc167 --- /dev/null +++ b/yaboot/yaboot-skipmac.patch @@ -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. diff --git a/yaboot/yaboot-xcat.spec b/yaboot/yaboot-xcat.spec index e5b1856..35a9bb0 100644 --- a/yaboot/yaboot-xcat.spec +++ b/yaboot/yaboot-xcat.spec @@ -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