rpms/yaboot/F-12 sources, 1.8, 1.9 yaboot-1.3.14-better_netboot.patch, 1.3, 1.4 yaboot-1.3.14-better_netboot2.patch, 1.1, 1.2 yaboot-1.3.14-ipv6.patch, 1.1, 1.2 yaboot.spec, 1.76, 1.77
Roman Rakus
rrakus at fedoraproject.org
Tue Jan 12 12:09:15 UTC 2010
Author: rrakus
Update of /cvs/pkgs/rpms/yaboot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19154
Modified Files:
sources yaboot-1.3.14-better_netboot.patch
yaboot-1.3.14-better_netboot2.patch yaboot-1.3.14-ipv6.patch
yaboot.spec
Log Message:
Use correct upstream source tarball. Patch changed for that source
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yaboot/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources 14 Aug 2009 14:07:35 -0000 1.8
+++ sources 12 Jan 2010 12:09:15 -0000 1.9
@@ -1 +1 @@
-dd346812667ab3818248c9784fe8e38e yaboot-1.3.14.tar.gz
+9b1246c474eeb37f61081ad762563b35 yaboot-1.3.14.tar.gz
yaboot-1.3.14-better_netboot.patch:
include/debug.h | 4
include/file.h | 8 +
include/fs.h | 8 -
second/file.c | 214 ++++++++++++++++++++++++++++++++++++++-------------
second/fs.c | 6 -
second/fs_ext2.c | 8 -
second/fs_iso.c | 6 -
second/fs_of.c | 58 +++++++++----
second/fs_reiserfs.c | 12 +-
second/fs_xfs.c | 18 ++--
second/yaboot.c | 4
11 files changed, 244 insertions(+), 102 deletions(-)
Index: yaboot-1.3.14-better_netboot.patch
===================================================================
RCS file: /cvs/pkgs/rpms/yaboot/F-12/yaboot-1.3.14-better_netboot.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- yaboot-1.3.14-better_netboot.patch 24 Sep 2009 12:16:42 -0000 1.3
+++ yaboot-1.3.14-better_netboot.patch 12 Jan 2010 12:09:15 -0000 1.4
@@ -1,7 +1,6 @@
-diff --git a/include/debug.h b/include/debug.h
-index 47a9cce..dcac25a 100644
---- a/include/debug.h
-+++ b/include/debug.h
+diff -up yaboot-1.3.14/include/debug.h.netboot yaboot-1.3.14/include/debug.h
+--- yaboot-1.3.14/include/debug.h.netboot 2007-08-17 16:29:26.000000000 +0200
++++ yaboot-1.3.14/include/debug.h 2010-01-12 12:14:00.000000000 +0100
@@ -32,8 +32,8 @@
prom_printf( fmt, ## args );\
}
@@ -13,10 +12,9 @@ index 47a9cce..dcac25a 100644
# define DEBUG_SLEEP prom_sleep(3)
#else
#define DEBUG_ENTER
-diff --git a/include/file.h b/include/file.h
-index b6b9fe5..ca76a52 100644
---- a/include/file.h
-+++ b/include/file.h
+diff -up yaboot-1.3.14/include/file.h.netboot yaboot-1.3.14/include/file.h
+--- yaboot-1.3.14/include/file.h.netboot 2007-08-17 16:29:26.000000000 +0200
++++ yaboot-1.3.14/include/file.h 2010-01-12 12:14:00.000000000 +0100
@@ -39,7 +39,13 @@ struct boot_file_t;
struct boot_fspec_t {
char* dev; /* OF device path */
@@ -40,10 +38,9 @@ index b6b9fe5..ca76a52 100644
struct boot_file_t* file);
extern int
-diff --git a/include/fs.h b/include/fs.h
-index d960fea..1ff7986 100644
---- a/include/fs.h
-+++ b/include/fs.h
+diff -up yaboot-1.3.14/include/fs.h.netboot yaboot-1.3.14/include/fs.h
+--- yaboot-1.3.14/include/fs.h.netboot 2007-08-17 16:29:26.000000000 +0200
++++ yaboot-1.3.14/include/fs.h 2010-01-12 12:14:00.000000000 +0100
@@ -27,14 +27,14 @@
#include "file.h"
@@ -71,10 +68,9 @@ index d960fea..1ff7986 100644
+ struct partition_t *part, struct boot_fspec_t *fspec);
#endif
-diff --git a/second/file.c b/second/file.c
-index 4054dd1..e429272 100644
---- a/second/file.c
-+++ b/second/file.c
+diff -up yaboot-1.3.14/second/file.c.netboot yaboot-1.3.14/second/file.c
+--- yaboot-1.3.14/second/file.c.netboot 2007-08-17 16:29:26.000000000 +0200
++++ yaboot-1.3.14/second/file.c 2010-01-12 12:14:00.000000000 +0100
@@ -38,19 +38,56 @@
extern char bootdevice[];
@@ -139,7 +135,7 @@ index 4054dd1..e429272 100644
/* The obp-tftp device arguments should be at the end of
* the argument list. Skip over any extra arguments (promiscuous,
-@@ -77,46 +114,110 @@ static char *netdev_path_to_filename(const char *path)
+@@ -77,46 +114,110 @@ static char *netdev_path_to_filename(con
if (tmp && tmp > args)
args = tmp + strlen("rarp");
@@ -153,15 +149,15 @@ index 4054dd1..e429272 100644
+ str = malloc(strlen(args) + 1); /*long enough to hold all strings */
+ if (!str)
+ return 0;
++
++ if (args[-1] != ':')
++ args++; /* If comma(,) is not immediately followed by ':' then go past the , */
- tmp = args;
- tmp--;
- /* If the preceding character is ':' then there were no
- * non-obp-tftp arguments and we know we're right up to the
- * filename. Otherwise, we must advance args once more.
-+ if (args[-1] != ':')
-+ args++; /* If comma(,) is not immediately followed by ':' then go past the , */
-+
+ /*
+ * read the arguments in order: siaddr,filename,ciaddr,giaddr,
+ * bootp-retries,tftp-retries,addl_prameters
@@ -255,16 +251,16 @@ index 4054dd1..e429272 100644
+extract_netboot_args(char *imagepath, struct boot_fspec_t *result)
+{
+ int ret;
++
++ DEBUG_F("imagepath = %s\n", imagepath);
- strncpy(filename, args, len);
- filename[len - 1] = '\0';
-+ DEBUG_F("imagepath = %s\n", imagepath);
++ if (!imagepath)
++ return 1;
- DEBUG_F("filename = %s\n", filename);
- return filename;
-+ if (!imagepath)
-+ return 1;
-+
+ ret = extract_ipv4_args(imagepath, result);
+ ret |= extract_netinfo_args(result);
+
@@ -280,7 +276,7 @@ index 4054dd1..e429272 100644
}
static char *netdev_path_to_dev(const char *path)
-@@ -163,6 +264,10 @@ static char *netdev_path_to_dev(const char *path)
+@@ -163,6 +264,10 @@ static char *netdev_path_to_dev(const ch
- enet:,/tftpboot/vmlinux
- enet:bootp
- enet:0
@@ -291,7 +287,7 @@ index 4054dd1..e429272 100644
Supported only if defdevice == NULL
- disc
- any other device path lacking a :
-@@ -179,6 +284,9 @@ parse_device_path(char *imagepath, char *defdevice, int defpart,
+@@ -179,6 +284,9 @@ parse_device_path(char *imagepath, char
char *defdev = NULL;
int device_kind = -1;
@@ -301,7 +297,7 @@ index 4054dd1..e429272 100644
result->dev = NULL;
result->part = -1;
result->file = NULL;
-@@ -247,10 +355,15 @@ parse_device_path(char *imagepath, char *defdevice, int defpart,
+@@ -247,10 +355,15 @@ parse_device_path(char *imagepath, char
}
if (device_kind == FILE_DEVICE_NET) {
@@ -320,7 +316,7 @@ index 4054dd1..e429272 100644
if (!defdev)
result->dev = netdev_path_to_dev(ipath);
-@@ -287,15 +400,14 @@ parse_device_path(char *imagepath, char *defdevice, int defpart,
+@@ -287,15 +400,14 @@ parse_device_path(char *imagepath, char
static int
file_block_open( struct boot_file_t* file,
@@ -338,7 +334,7 @@ index 4054dd1..e429272 100644
found = NULL;
#if DEBUG
-@@ -308,7 +420,7 @@ file_block_open( struct boot_file_t* file,
+@@ -308,7 +420,7 @@ file_block_open( struct boot_file_t* fil
DEBUG_F("number: %02d, start: 0x%08lx, length: 0x%08lx\n",
p->part_number, p->part_start, p->part_size );
if (partition == -1) {
@@ -347,7 +343,7 @@ index 4054dd1..e429272 100644
if (file->fs == NULL || fserrorno != FILE_ERR_OK)
continue;
else {
-@@ -328,7 +440,7 @@ file_block_open( struct boot_file_t* file,
+@@ -328,7 +440,7 @@ file_block_open( struct boot_file_t* fil
* cases, let OF figure out a default partition.
*/
DEBUG_F( "Using OF defaults.. (found = %p)\n", found );
@@ -380,7 +376,7 @@ index 4054dd1..e429272 100644
{
int result;
-@@ -399,10 +509,10 @@ int open_file(const struct boot_fspec_t* spec, struct boot_file_t* file)
+@@ -399,10 +509,10 @@ int open_file(const struct boot_fspec_t*
switch(file->device_kind) {
case FILE_DEVICE_BLOCK:
DEBUG_F("device is a block device\n");
@@ -393,11 +389,10 @@ index 4054dd1..e429272 100644
}
return 0;
}
-diff --git a/second/fs.c b/second/fs.c
-index 2ae7066..b748bed 100644
---- a/second/fs.c
-+++ b/second/fs.c
-@@ -56,12 +56,12 @@ const struct fs_t *fs_of = &of_filesystem; /* needed by ISO9660 */
+diff -up yaboot-1.3.14/second/fs.c.netboot yaboot-1.3.14/second/fs.c
+--- yaboot-1.3.14/second/fs.c.netboot 2007-08-17 16:29:26.000000000 +0200
++++ yaboot-1.3.14/second/fs.c 2010-01-12 12:14:00.000000000 +0100
+@@ -56,12 +56,12 @@ const struct fs_t *fs_of = &of_filesyste
const struct fs_t *fs_of_netboot = &of_net_filesystem; /* needed by file.c */
const struct fs_t *
@@ -413,11 +408,10 @@ index 2ae7066..b748bed 100644
break;
return *fs;
-diff --git a/second/fs_ext2.c b/second/fs_ext2.c
-index 67571f2..d24450d 100644
---- a/second/fs_ext2.c
-+++ b/second/fs_ext2.c
-@@ -46,9 +46,8 @@ typedef int FILE;
+diff -up yaboot-1.3.14/second/fs_ext2.c.netboot yaboot-1.3.14/second/fs_ext2.c
+--- yaboot-1.3.14/second/fs_ext2.c.netboot 2010-01-12 12:14:00.000000000 +0100
++++ yaboot-1.3.14/second/fs_ext2.c 2010-01-12 12:14:00.000000000 +0100
+@@ -45,9 +45,8 @@ typedef int FILE;
#include "ext2fs/ext2fs.h"
static int ext2_open( struct boot_file_t* file,
@@ -428,7 +422,7 @@ index 67571f2..d24450d 100644
static int ext2_read( struct boot_file_t* file,
unsigned int size,
void* buffer);
-@@ -123,14 +122,15 @@ void com_err (const char *a, long i, const char *fmt,...)
+@@ -122,14 +121,15 @@ void com_err (const char *a, long i, con
static int
ext2_open( struct boot_file_t* file,
@@ -446,10 +440,9 @@ index 67571f2..d24450d 100644
DEBUG_ENTER;
DEBUG_OPEN;
-diff --git a/second/fs_iso.c b/second/fs_iso.c
-index 303790f..33d43b3 100644
---- a/second/fs_iso.c
-+++ b/second/fs_iso.c
+diff -up yaboot-1.3.14/second/fs_iso.c.netboot yaboot-1.3.14/second/fs_iso.c
+--- yaboot-1.3.14/second/fs_iso.c.netboot 2007-08-17 16:29:26.000000000 +0200
++++ yaboot-1.3.14/second/fs_iso.c 2010-01-12 12:14:00.000000000 +0100
@@ -29,9 +29,8 @@
#include "errors.h"
@@ -472,16 +465,12 @@ index 303790f..33d43b3 100644
{
return FILE_ERR_BAD_FSYS;
}
-diff --git a/second/fs_of.c b/second/fs_of.c
-index 95c131d..5c7dd9b 100644
---- a/second/fs_of.c
-+++ b/second/fs_of.c
-@@ -45,17 +45,17 @@
- #include "debug.h"
-
- #define LOAD_BUFFER_POS 0x1000000
--#define LOAD_BUFFER_SIZE 0x1000000
-+#define LOAD_BUFFER_SIZE 0x2000000
+diff -up yaboot-1.3.14/second/fs_of.c.netboot yaboot-1.3.14/second/fs_of.c
+--- yaboot-1.3.14/second/fs_of.c.netboot 2007-08-17 16:29:26.000000000 +0200
++++ yaboot-1.3.14/second/fs_of.c 2010-01-12 12:17:30.000000000 +0100
+@@ -48,15 +48,15 @@
+ /* this cannot be safely increased any further */
+ #define LOAD_BUFFER_SIZE 0x600000
-static int of_open(struct boot_file_t* file, const char* dev_name,
- struct partition_t* part, const char* file_name);
@@ -499,7 +488,7 @@ index 95c131d..5c7dd9b 100644
static int of_net_read(struct boot_file_t* file, unsigned int size, void* buffer);
static int of_net_seek(struct boot_file_t* file, unsigned int newpos);
-@@ -79,8 +79,8 @@ struct fs_t of_net_filesystem =
+@@ -80,8 +80,8 @@ struct fs_t of_net_filesystem =
};
static int
@@ -510,7 +499,7 @@ index 95c131d..5c7dd9b 100644
{
static char buffer[1024];
char *filename;
-@@ -89,7 +89,7 @@ of_open(struct boot_file_t* file, const char* dev_name,
+@@ -90,7 +90,7 @@ of_open(struct boot_file_t* file, const
DEBUG_ENTER;
DEBUG_OPEN;
@@ -519,7 +508,7 @@ index 95c131d..5c7dd9b 100644
strcat(buffer, ":");
if (part) {
if (part->sys_ind == LINUX_RAID) {
-@@ -101,10 +101,10 @@ of_open(struct boot_file_t* file, const char* dev_name,
+@@ -102,10 +102,10 @@ of_open(struct boot_file_t* file, const
sprintf(pn, "%02d", part->part_number);
strcat(buffer, pn);
}
@@ -532,7 +521,7 @@ index 95c131d..5c7dd9b 100644
for (p = filename; *p; p++)
if (*p == '/')
*p = '\\';
-@@ -131,25 +131,47 @@ of_open(struct boot_file_t* file, const char* dev_name,
+@@ -132,25 +132,47 @@ of_open(struct boot_file_t* file, const
}
static int
@@ -589,11 +578,10 @@ index 95c131d..5c7dd9b 100644
}
DEBUG_F("Opening: \"%s\"\n", buffer);
-diff --git a/second/fs_reiserfs.c b/second/fs_reiserfs.c
-index 238f523..4b83a7a 100644
---- a/second/fs_reiserfs.c
-+++ b/second/fs_reiserfs.c
-@@ -33,8 +33,8 @@
+diff -up yaboot-1.3.14/second/fs_reiserfs.c.netboot yaboot-1.3.14/second/fs_reiserfs.c
+--- yaboot-1.3.14/second/fs_reiserfs.c.netboot 2007-08-17 16:29:26.000000000 +0200
++++ yaboot-1.3.14/second/fs_reiserfs.c 2010-01-12 12:14:00.000000000 +0100
+@@ -32,8 +32,8 @@
#include "reiserfs/reiserfs.h"
/* Exported in struct fs_t */
@@ -604,7 +592,7 @@ index 238f523..4b83a7a 100644
static int reiserfs_read( struct boot_file_t *file, unsigned int size,
void *buffer );
-@@ -63,10 +63,12 @@ int errnum;
+@@ -62,10 +62,12 @@ int errnum;
static int
@@ -619,7 +607,7 @@ index 238f523..4b83a7a 100644
DEBUG_ENTER;
DEBUG_OPEN;
-@@ -74,7 +76,7 @@ reiserfs_open( struct boot_file_t *file, const char *dev_name,
+@@ -73,7 +75,7 @@ reiserfs_open( struct boot_file_t *file,
memset( INFO, 0, sizeof(struct reiserfs_state) );
INFO->file = file;
@@ -628,11 +616,10 @@ index 238f523..4b83a7a 100644
{
DEBUG_F( "Determining offset for partition %d\n", part->part_number );
INFO->partition_offset = ((uint64_t)part->part_start) * part->blocksize;
-diff --git a/second/fs_xfs.c b/second/fs_xfs.c
-index 04d6cf3..e27d857 100644
---- a/second/fs_xfs.c
-+++ b/second/fs_xfs.c
-@@ -39,8 +39,8 @@ int xfs_read_data (char *buf, int len);
+diff -up yaboot-1.3.14/second/fs_xfs.c.netboot yaboot-1.3.14/second/fs_xfs.c
+--- yaboot-1.3.14/second/fs_xfs.c.netboot 2007-08-17 16:29:26.000000000 +0200
++++ yaboot-1.3.14/second/fs_xfs.c 2010-01-12 12:19:15.000000000 +0100
+@@ -38,8 +38,8 @@ int xfs_read_data (char *buf, int len);
int xfs_dir (char *dirname);
/* Exported in struct fs_t */
@@ -643,7 +630,7 @@ index 04d6cf3..e27d857 100644
static int xfs_read(struct boot_file_t *file, unsigned int size, void *buffer);
static int xfs_seek(struct boot_file_t *file, unsigned int newpos);
static int xfs_close(struct boot_file_t *file);
-@@ -59,8 +59,8 @@ uint64_t partition_offset;
+@@ -58,8 +58,8 @@ uint64_t partition_offset;
int errnum;
static int
@@ -654,21 +641,19 @@ index 04d6cf3..e27d857 100644
{
static char buffer[1024];
-@@ -78,11 +78,11 @@ xfs_open(struct boot_file_t *file, const char *dev_name,
+@@ -77,9 +77,9 @@ xfs_open(struct boot_file_t *file, const
else
partition_offset = 0;
-- strncpy(buffer, dev_name, 1020);
-+ strncpy(buffer, fspec->dev, 1020);
- if (_machine != _MACH_bplan)
- strcat(buffer, ":0"); /* 0 is full disk in (non-buggy) OF */
+- sprintf(buffer, "%s:%d", dev_name, 0); /* 0 is full disk in OF */
++ sprintf(buffer, "%s:%d", fspec->dev, 0); /* 0 is full disk in OF */
DEBUG_F("Trying to open dev_name=%s; filename=%s; partition offset=%Lu\n",
- buffer, file_name, partition_offset);
+ buffer, fspec->file, partition_offset);
file->of_device = prom_open(buffer);
if (file->of_device == PROM_INVALID_HANDLE || file->of_device == NULL)
-@@ -105,8 +105,8 @@ xfs_open(struct boot_file_t *file, const char *dev_name,
+@@ -102,8 +102,8 @@ xfs_open(struct boot_file_t *file, const
return FILE_ERR_BAD_FSYS;
}
@@ -679,7 +664,7 @@ index 04d6cf3..e27d857 100644
if(!xfs_dir(buffer))
{
DEBUG_F("xfs_dir() failed. errnum = %d\n", errnum);
-@@ -116,7 +116,7 @@ xfs_open(struct boot_file_t *file, const char *dev_name,
+@@ -113,7 +113,7 @@ xfs_open(struct boot_file_t *file, const
return errnum;
}
@@ -688,11 +673,10 @@ index 04d6cf3..e27d857 100644
DEBUG_LEAVE(FILE_ERR_OK);
return FILE_ERR_OK;
-diff --git a/second/yaboot.c b/second/yaboot.c
-index 3db7b4f..8a74d7a 100644
---- a/second/yaboot.c
-+++ b/second/yaboot.c
-@@ -300,6 +300,7 @@ void print_message_file(char *filename)
+diff -up yaboot-1.3.14/second/yaboot.c.netboot yaboot-1.3.14/second/yaboot.c
+--- yaboot-1.3.14/second/yaboot.c.netboot 2010-01-12 12:14:00.000000000 +0100
++++ yaboot-1.3.14/second/yaboot.c 2010-01-12 12:22:45.000000000 +0100
+@@ -290,6 +290,7 @@ void print_message_file(char *filename)
}
strncpy(msgpath, filename, sizeof(msgpath));
@@ -700,7 +684,7 @@ index 3db7b4f..8a74d7a 100644
if (!parse_device_path(msgpath, defdev, defpart, "/etc/yaboot.msg", &msgfile)) {
prom_printf("%s: Unable to parse\n", msgpath);
goto done;
-@@ -988,6 +989,7 @@ int get_params(struct boot_param_t* params)
+@@ -918,6 +919,7 @@ int get_params(struct boot_param_t* para
if (!label && password)
check_password ("To boot a custom image you must enter the password.");
@@ -708,15 +692,15 @@ index 3db7b4f..8a74d7a 100644
if (!parse_device_path(imagepath, defdevice, defpart,
"/vmlinux", ¶ms->kernel)) {
prom_printf("%s: Unable to parse\n", imagepath);
-@@ -1009,6 +1011,7 @@ int get_params(struct boot_param_t* params)
- strncpy(initrdpath, p, 1024);
-
- DEBUG_F("Parsing initrd path <%s>\n", initrdpath);
-+ params->rd = boot; /* Copy all the original paramters */
+@@ -931,6 +933,7 @@ int get_params(struct boot_param_t* para
+ if (p && *p) {
+ DEBUG_F("Parsing initrd path <%s>\n", p);
+ strncpy(initrdpath, p, 1024);
++ params->rd = boot; /* Copy all the original paramters */
if (!parse_device_path(initrdpath, defdevice, defpart,
"/root.bin", ¶ms->rd)) {
prom_printf("%s: Unable to parse\n", imagepath);
-@@ -1019,6 +1022,7 @@ int get_params(struct boot_param_t* params)
+@@ -941,6 +944,7 @@ int get_params(struct boot_param_t* para
if (p && *p) {
DEBUG_F("Parsing sysmap path <%s>\n", p);
strncpy(sysmappath, p, 1024);
yaboot-1.3.14-better_netboot2.patch:
include/file.h | 1
include/prom.h | 2
second/cfg.c | 3 +
second/file.c | 127 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
second/fs_of.c | 48 +++++++++++++--------
second/prom.c | 6 ++
second/yaboot.c | 4 +
7 files changed, 166 insertions(+), 25 deletions(-)
Index: yaboot-1.3.14-better_netboot2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/yaboot/F-12/yaboot-1.3.14-better_netboot2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- yaboot-1.3.14-better_netboot2.patch 29 Oct 2009 10:58:41 -0000 1.1
+++ yaboot-1.3.14-better_netboot2.patch 12 Jan 2010 12:09:15 -0000 1.2
@@ -1,6 +1,6 @@
-diff -purN yaboot-1.3.14.orig/include/file.h yaboot-1.3.14/include/file.h
---- yaboot-1.3.14.orig/include/file.h 2009-10-15 11:39:01.112642471 +1100
-+++ yaboot-1.3.14/include/file.h 2009-10-15 15:29:04.692654961 +1100
+diff -up yaboot-1.3.14/include/file.h.netboot2 yaboot-1.3.14/include/file.h
+--- yaboot-1.3.14/include/file.h.netboot2 2010-01-12 12:27:00.000000000 +0100
++++ yaboot-1.3.14/include/file.h 2010-01-12 12:27:00.000000000 +0100
@@ -45,6 +45,7 @@ struct boot_fspec_t {
char* giaddr; /* Gateway address */
char* bootp_retries; /* Bootp retries */
@@ -9,10 +9,10 @@ diff -purN yaboot-1.3.14.orig/include/fi
char* addl_params; /* copy all additional parameters */
/* Following fields are used only in ipv6 format */
-diff -purN yaboot-1.3.14.orig/include/prom.h yaboot-1.3.14/include/prom.h
---- yaboot-1.3.14.orig/include/prom.h 2009-10-15 15:23:39.796944672 +1100
-+++ yaboot-1.3.14/include/prom.h 2009-10-15 15:29:04.692654961 +1100
-@@ -153,7 +153,7 @@ struct bootp_packet {
+diff -up yaboot-1.3.14/include/prom.h.netboot2 yaboot-1.3.14/include/prom.h
+--- yaboot-1.3.14/include/prom.h.netboot2 2010-01-12 12:27:00.000000000 +0100
++++ yaboot-1.3.14/include/prom.h 2010-01-12 12:27:00.000000000 +0100
+@@ -149,7 +149,7 @@ struct bootp_packet {
unsigned char chaddr[16];
unsigned char sname[64];
unsigned char file[128];
@@ -21,9 +21,9 @@ diff -purN yaboot-1.3.14.orig/include/pr
};
struct bootp_packet * prom_get_netinfo (void);
-diff -purN yaboot-1.3.14.orig/second/cfg.c yaboot-1.3.14/second/cfg.c
---- yaboot-1.3.14.orig/second/cfg.c 2009-10-15 15:23:39.798647660 +1100
-+++ yaboot-1.3.14/second/cfg.c 2009-10-15 15:29:04.693668247 +1100
+diff -up yaboot-1.3.14/second/cfg.c.netboot2 yaboot-1.3.14/second/cfg.c
+--- yaboot-1.3.14/second/cfg.c.netboot2 2010-01-12 12:27:00.000000000 +0100
++++ yaboot-1.3.14/second/cfg.c 2010-01-12 12:27:00.000000000 +0100
@@ -597,6 +597,9 @@ int cfg_set_default_by_mac (char *mac_ad
char * label = NULL;
int haslabel = 0;
@@ -34,9 +34,9 @@ diff -purN yaboot-1.3.14.orig/second/cfg
/* check if there is an image label equal to mac_addr */
for (tmp = images; tmp; tmp = tmp->next) {
label = cfg_get_strg_i (tmp->table, "label");
-diff -purN yaboot-1.3.14.orig/second/file.c yaboot-1.3.14/second/file.c
---- yaboot-1.3.14.orig/second/file.c 2009-10-15 15:23:39.802647442 +1100
-+++ yaboot-1.3.14/second/file.c 2009-10-15 15:29:04.694645423 +1100
+diff -up yaboot-1.3.14/second/file.c.netboot2 yaboot-1.3.14/second/file.c
+--- yaboot-1.3.14/second/file.c.netboot2 2010-01-12 12:27:00.000000000 +0100
++++ yaboot-1.3.14/second/file.c 2010-01-12 12:27:00.000000000 +0100
@@ -51,6 +51,42 @@ ipv4_to_str(__u32 ip)
return buf;
}
@@ -202,19 +202,19 @@ diff -purN yaboot-1.3.14.orig/second/fil
/* FIXME: Yck! if we /still/ do not have a gateway then "cheat" and use
* the server. This will be okay if the client and server are on
* the same IP network, if not then lets hope the server does ICMP
-diff -purN yaboot-1.3.14.orig/second/fs_of.c yaboot-1.3.14/second/fs_of.c
---- yaboot-1.3.14.orig/second/fs_of.c 2009-10-15 15:23:39.805647069 +1100
-+++ yaboot-1.3.14/second/fs_of.c 2009-10-15 15:29:04.695645439 +1100
+diff -up yaboot-1.3.14/second/fs_of.c.netboot2 yaboot-1.3.14/second/fs_of.c
+--- yaboot-1.3.14/second/fs_of.c.netboot2 2010-01-12 12:27:00.000000000 +0100
++++ yaboot-1.3.14/second/fs_of.c 2010-01-12 12:28:06.000000000 +0100
@@ -44,7 +44,7 @@
#include "errors.h"
#include "debug.h"
--#define LOAD_BUFFER_POS 0x1000000
-+#define LOAD_BUFFER_POS 0x0000000
- #define LOAD_BUFFER_SIZE 0x2000000
+-#define LOAD_BUFFER_POS 0x600000
++#define LOAD_BUFFER_POS 0x000000
+ /* this cannot be safely increased any further */
+ #define LOAD_BUFFER_SIZE 0x600000
- static int of_open(struct boot_file_t* file,
-@@ -137,6 +137,7 @@ of_net_open(struct boot_file_t* file,
+@@ -138,6 +138,7 @@ of_net_open(struct boot_file_t* file,
static char buffer[1024];
char *filename = NULL;
char *p;
@@ -222,7 +222,7 @@ diff -purN yaboot-1.3.14.orig/second/fs_
DEBUG_ENTER;
DEBUG_OPEN;
-@@ -148,34 +149,47 @@ of_net_open(struct boot_file_t* file,
+@@ -149,34 +150,47 @@ of_net_open(struct boot_file_t* file,
*p = '\\';
}
@@ -286,10 +286,10 @@ diff -purN yaboot-1.3.14.orig/second/fs_
}
DEBUG_F("Opening: \"%s\"\n", buffer);
-diff -purN yaboot-1.3.14.orig/second/prom.c yaboot-1.3.14/second/prom.c
---- yaboot-1.3.14.orig/second/prom.c 2009-10-15 15:23:39.806647224 +1100
-+++ yaboot-1.3.14/second/prom.c 2009-10-15 15:29:04.696645314 +1100
-@@ -685,6 +685,10 @@ struct bootp_packet * prom_get_netinfo (
+diff -up yaboot-1.3.14/second/prom.c.netboot2 yaboot-1.3.14/second/prom.c
+--- yaboot-1.3.14/second/prom.c.netboot2 2010-01-12 12:27:00.000000000 +0100
++++ yaboot-1.3.14/second/prom.c 2010-01-12 12:27:00.000000000 +0100
+@@ -666,6 +666,10 @@ struct bootp_packet * prom_get_netinfo (
void *bootp_response = NULL;
char *propname;
struct bootp_packet *packet;
@@ -300,7 +300,7 @@ diff -purN yaboot-1.3.14.orig/second/pro
int i = 0, size, offset = 0;
prom_handle chosen;
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
-@@ -709,7 +713,7 @@ struct bootp_packet * prom_get_netinfo (
+@@ -690,7 +694,7 @@ struct bootp_packet * prom_get_netinfo (
if (size <= 0)
return NULL;
@@ -309,10 +309,10 @@ diff -purN yaboot-1.3.14.orig/second/pro
prom_printf("Malformed %s property?\n", propname);
return NULL;
}
-diff -purN yaboot-1.3.14.orig/second/yaboot.c yaboot-1.3.14/second/yaboot.c
---- yaboot-1.3.14.orig/second/yaboot.c 2009-10-15 15:23:39.809646432 +1100
-+++ yaboot-1.3.14/second/yaboot.c 2009-10-15 15:29:04.697642396 +1100
-@@ -471,6 +471,10 @@ static int load_my_config_file(struct bo
+diff -up yaboot-1.3.14/second/yaboot.c.netboot2 yaboot-1.3.14/second/yaboot.c
+--- yaboot-1.3.14/second/yaboot.c.netboot2 2010-01-12 12:27:00.000000000 +0100
++++ yaboot-1.3.14/second/yaboot.c 2010-01-12 12:27:00.000000000 +0100
+@@ -461,6 +461,10 @@ static int load_my_config_file(struct bo
int minlen;
packet = prom_get_netinfo();
yaboot-1.3.14-ipv6.patch:
include/file.h | 5 +++++
include/prom.h | 1 +
second/file.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
second/fs_of.c | 8 ++++++--
4 files changed, 64 insertions(+), 3 deletions(-)
Index: yaboot-1.3.14-ipv6.patch
===================================================================
RCS file: /cvs/pkgs/rpms/yaboot/F-12/yaboot-1.3.14-ipv6.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- yaboot-1.3.14-ipv6.patch 14 Aug 2009 13:55:36 -0000 1.1
+++ yaboot-1.3.14-ipv6.patch 12 Jan 2010 12:09:15 -0000 1.2
@@ -1,6 +1,6 @@
-diff -up yaboot-1.3.14/include/file.h.ipv6_4 yaboot-1.3.14/include/file.h
---- yaboot-1.3.14/include/file.h.ipv6_4 2009-08-14 13:48:47.000000000 +0200
-+++ yaboot-1.3.14/include/file.h 2009-08-14 13:48:47.000000000 +0200
+diff -up yaboot-1.3.14/include/file.h.ipv6 yaboot-1.3.14/include/file.h
+--- yaboot-1.3.14/include/file.h.ipv6 2010-01-12 12:24:04.000000000 +0100
++++ yaboot-1.3.14/include/file.h 2010-01-12 12:24:04.000000000 +0100
@@ -46,6 +46,11 @@ struct boot_fspec_t {
char* bootp_retries; /* Bootp retries */
char* tftp_retries; /* TFTP retries */
@@ -13,20 +13,20 @@ diff -up yaboot-1.3.14/include/file.h.ip
};
struct boot_file_t {
-diff -up yaboot-1.3.14/include/prom.h.ipv6_4 yaboot-1.3.14/include/prom.h
---- yaboot-1.3.14/include/prom.h.ipv6_4 2008-04-15 15:34:48.000000000 +0200
-+++ yaboot-1.3.14/include/prom.h 2009-08-14 14:37:25.000000000 +0200
+diff -up yaboot-1.3.14/include/prom.h.ipv6 yaboot-1.3.14/include/prom.h
+--- yaboot-1.3.14/include/prom.h.ipv6 2007-08-17 16:29:26.000000000 +0200
++++ yaboot-1.3.14/include/prom.h 2010-01-12 12:25:38.000000000 +0100
@@ -37,6 +37,7 @@ typedef void *phandle;
#define PROM_INVALID_HANDLE ((prom_handle)-1UL)
#define BOOTDEVSZ (2048) /* iscsi args can be in excess of 1040 bytes */
#define TOK_ISCSI "iscsi"
+#define TOK_IPV6 "ipv6"
- #define PROM_CLAIM_MAX_ADDR 0x8000000
- #define BOOTLASTSZ 1024
- #define FW_NBR_REBOOTSZ 4
-diff -up yaboot-1.3.14/second/file.c.ipv6_4 yaboot-1.3.14/second/file.c
---- yaboot-1.3.14/second/file.c.ipv6_4 2009-08-14 13:48:47.000000000 +0200
-+++ yaboot-1.3.14/second/file.c 2009-08-14 14:44:37.000000000 +0200
+
+ struct prom_args;
+ typedef int (*prom_entry)(struct prom_args *);
+diff -up yaboot-1.3.14/second/file.c.ipv6 yaboot-1.3.14/second/file.c
+--- yaboot-1.3.14/second/file.c.ipv6 2010-01-12 12:24:04.000000000 +0100
++++ yaboot-1.3.14/second/file.c 2010-01-12 12:24:04.000000000 +0100
@@ -193,6 +193,50 @@ extract_netinfo_args(struct boot_fspec_t
}
@@ -103,10 +103,10 @@ diff -up yaboot-1.3.14/second/file.c.ipv
return ret;
}
-diff -up yaboot-1.3.14/second/fs_of.c.ipv6_4 yaboot-1.3.14/second/fs_of.c
---- yaboot-1.3.14/second/fs_of.c.ipv6_4 2009-08-14 13:48:47.000000000 +0200
-+++ yaboot-1.3.14/second/fs_of.c 2009-08-14 14:47:18.000000000 +0200
-@@ -148,14 +148,18 @@ of_net_open(struct boot_file_t* file,
+diff -up yaboot-1.3.14/second/fs_of.c.ipv6 yaboot-1.3.14/second/fs_of.c
+--- yaboot-1.3.14/second/fs_of.c.ipv6 2010-01-12 12:24:04.000000000 +0100
++++ yaboot-1.3.14/second/fs_of.c 2010-01-12 12:24:04.000000000 +0100
+@@ -149,14 +149,18 @@ of_net_open(struct boot_file_t* file,
*p = '\\';
}
Index: yaboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yaboot/F-12/yaboot.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- yaboot.spec 3 Dec 2009 10:15:31 -0000 1.76
+++ yaboot.spec 12 Jan 2010 12:09:15 -0000 1.77
@@ -1,7 +1,7 @@
Summary: Linux bootloader for Power Macintosh "New World" computers
Name: yaboot
Version: 1.3.14
-Release: 24%{?dist}
+Release: 25%{?dist}
License: GPLv2+
Group: System Environment/Base
Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@ -19,9 +19,7 @@ Patch17: yaboot-1.3.13-pegasos-claim.pat
Patch18: yaboot-1.3.13-pegasos-ext2.patch
Patch21: yaboot-1.3.13-pegasos-serial.patch
Patch22: yaboot-1.3.13-allow-deep-mntpoint.patch
-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
Patch32: yaboot-relocatable-kernel.patch
@@ -80,9 +78,7 @@ yaboot can also bootload IBM pSeries mac
%patch18 -p1 -b .ext2
%patch21 -p1 -b .pegasos-serial
%patch22 -p1 -b .deepmnt
-%patch27 -p1 -b .ppc64
%patch28 -p1 -b .bootwrite
-%patch29 -p1 -b .baseaddr
%patch30 -p1 -b .bootonce
%patch31 -p1 -b .maxtoken
%patch32 -p1 -b .relocatable
@@ -140,6 +136,10 @@ rm -rf $RPM_BUILD_ROOT
%ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
%changelog
+* Tue Jan 12 2010 rrakus at redhat.com 1.3.14-25
+- Use correct upstream source tarball
+- Patch changed for that source
+
* Tue Dec 01 2009 Roman Rakus <rrakus at redhat.com> - 1.3.14-24
- Fixed summary, buildroot
- Converted doc/yaboot-howto.de.sgml to utf8
More information about the scm-commits
mailing list