Mailinglist Archive: opensuse-commit (1650 mails)

< Previous

Hello community,

here is the log from the commit of package lilo
checked in at Thu Oct 2 16:03:44 CEST 2008.

--------
--- arch/i386/lilo/lilo.changes 2008-09-30 11:46:34.000000000 +0200
+++ /mounts/work_src_done/STABLE/lilo/lilo.changes 2008-10-02
15:28:25.000000000 +0200
@@ -1,0 +2,11 @@
+Thu Oct 2 15:27:53 CEST 2008 - olh@xxxxxxx
+
+- handle short reads in yaboot ext2fs
+
+-------------------------------------------------------------------
+Thu Oct 2 15:18:29 CEST 2008 - olh@xxxxxxx
+
+- increase initrd malloc chunksize from 4MB to 10MB
+ if memory is fragmented, initrd allocation will fail
+
+-------------------------------------------------------------------

calling whatdependson for head-i586

Old:
----
yaboot-22.8-r1138.tar.bz2

New:
----
yaboot-22.8-r1143.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ lilo.spec ++++++
--- /var/tmp/diff_new_pack.oX3813/_old 2008-10-02 16:03:32.000000000 +0200
+++ /var/tmp/diff_new_pack.oX3813/_new 2008-10-02 16:03:32.000000000 +0200
@@ -21,7 +21,7 @@

Name: lilo
ExclusiveArch: ppc ppc64 %ix86 x86_64
-%define yaboot_vers 22.8-r1138
+%define yaboot_vers 22.8-r1143
Group: System/Boot
License: BSD 3-Clause
Summary: The Linux Loader, a Boot Menu
@@ -50,7 +50,7 @@
BuildRequires: gcc-32bit glibc-devel-32bit libgcc42-32bit libmudflap42-32bit
%endif
Version: 22.8
-Release: 27
+Release: 28
Source0: lilo-ppc-%{version}.tar.bz2
Source1:
http://penguinppc.org/projects/yaboot/yaboot-%{yaboot_vers}.tar.bz2
Source86: lilo-%{version}.src.tar.bz2
@@ -212,6 +212,11 @@
%endif
%doc %{_mandir}/*/*
%changelog
+* Thu Oct 02 2008 olh@xxxxxxx
+- handle short reads in yaboot ext2fs
+* Thu Oct 02 2008 olh@xxxxxxx
+- increase initrd malloc chunksize from 4MB to 10MB
+ if memory is fragmented, initrd allocation will fail
* Tue Sep 30 2008 olh@xxxxxxx
- handle memory for initrd download correctly
* Mon Sep 29 2008 olh@xxxxxxx

++++++ lilo-ppc-22.8.tar.bz2 ++++++

++++++ yaboot-22.8-r1138.tar.bz2 -> yaboot-22.8-r1143.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yaboot-22.8-r1138/Changelog.SuSE
new/yaboot-22.8-r1143/Changelog.SuSE
--- old/yaboot-22.8-r1138/Changelog.SuSE 2008-09-30 11:42:25.000000000
+0200
+++ new/yaboot-22.8-r1143/Changelog.SuSE 2008-10-02 15:28:25.000000000
+0200
@@ -1,4 +1,35 @@
------------------------------------------------------------------------
+r1143 | olh | 2008-10-02 13:28:25 +0000 (Thu, 02 Oct 2008) | 2 lines
+Changed paths:
+ M /trunk/lilo.changes
+ M /trunk/yaboot/second/fs_ext2.c
+
++- handle short reads in yaboot ext2fs
+
+------------------------------------------------------------------------
+r1142 | olh | 2008-10-02 13:19:28 +0000 (Thu, 02 Oct 2008) | 3 lines
+Changed paths:
+ M /trunk/lilo.changes
+ M /trunk/yaboot/second/yaboot.c
+
++- increase initrd malloc chunksize from 4MB to 10MB
++ if memory is fragmented, initrd allocation will fail
+
+------------------------------------------------------------------------
+r1141 | olh | 2008-10-02 13:17:04 +0000 (Thu, 02 Oct 2008) | 1 line
+Changed paths:
+ M /trunk/yaboot/Makefile
+ M /trunk/yaboot/second/yaboot.c
+ M /trunk/yaboot/yaboot.deps
+
+ rebuild yaboot.c if HARD_CODED_BOOTPATH changes
+------------------------------------------------------------------------
+r1140 | olh | 2008-10-02 12:14:38 +0000 (Thu, 02 Oct 2008) | 1 line
+Changed paths:
+ M /trunk/yaboot/second/fs_ext2.c
+
+Lindent second/fs_ext2.c
+------------------------------------------------------------------------
r1138 | olh | 2008-09-30 09:42:25 +0000 (Tue, 30 Sep 2008) | 1 line
Changed paths:
M /trunk/yaboot/second/yaboot.c
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yaboot-22.8-r1138/Makefile
new/yaboot-22.8-r1143/Makefile
--- old/yaboot-22.8-r1138/Makefile 2008-09-25 15:32:32.000000000 +0200
+++ new/yaboot-22.8-r1143/Makefile 2008-10-02 15:17:04.000000000 +0200
@@ -6,7 +6,7 @@

include Config

-VERSION = 22.8-r1138
+VERSION = 22.8-r1143
# Debug mode (spam/verbose)
DEBUG = 0
# make install vars
@@ -34,9 +34,6 @@
YBCFLAGS += -O1 -g
endif

-ifneq ($(HARD_CODED_BOOTPATH),)
-YBCFLAGS += -DHARD_CODED_BOOTPATH=\"$(HARD_CODED_BOOTPATH)\"
-endif
ifeq ($(CONFIG_COLOR_TEXT),y)
YBCFLAGS += -DCONFIG_COLOR_TEXT
endif
@@ -132,6 +129,20 @@
cp -f $@~ $@ ; \
fi

+include/hardcoded_bootpath.h: FORCE
+ifeq ($(HARD_CODED_BOOTPATH),)
+ @echo "#undef HARD_CODED_BOOTPATH" > $@~
+else
+ @echo "#define HARD_CODED_BOOTPATH \"$(HARD_CODED_BOOTPATH)\"" > $@~
+endif
+ @if test -f $@ ; then \
+ if ! diff -u $@ $@~ ; then \
+ cp -f $@~ $@ ; \
+ fi ; \
+ else \
+ cp -f $@~ $@ ; \
+ fi
+
second/empty.c:
rm -f $@
echo '' > $@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yaboot-22.8-r1138/second/fs_ext2.c
new/yaboot-22.8-r1143/second/fs_ext2.c
--- old/yaboot-22.8-r1138/second/fs_ext2.c 2007-02-10 19:51:46.000000000
+0100
+++ new/yaboot-22.8-r1143/second/fs_ext2.c 2008-10-02 15:28:25.000000000
+0200
@@ -177,7 +177,6 @@
return FILE_ERR_OK;
}

-
static int read_dump_range(void)
{
int count = read_range_count;
@@ -220,8 +219,7 @@
static int read_iterator(ext2_filsys fs, u32 * blocknr, int lg_block, void
*private)
{
#ifdef VERBOSE_DEBUG
- DEBUG_F("read_it: p_bloc: 0x%x, l_bloc: 0x%x, f_pos: 0x%Lx, rng_pos:
0x%lx ",
- *blocknr, lg_block, read_cur_file->pos, read_last_logical);
+ DEBUG_F("read_it: p_bloc: 0x%x, l_bloc: 0x%x, f_pos: 0x%Lx, rng_pos:
0x%lx ", *blocknr, lg_block, read_cur_file->pos, read_last_logical);
#endif
if (lg_block < 0) {
#ifdef VERBOSE_DEBUG
@@ -330,7 +328,6 @@
return 0;
}

-
static int ext2_read(struct boot_file_t *file, unsigned int size, void *buffer)
{
long retval;
@@ -436,7 +433,7 @@

static long linux_read_blk(io_channel channel, unsigned long block, int count,
void *data)
{
- int size, size_read;
+ int size, size_read, to_read, i;
unsigned long long tempb;

if (count == 0)
@@ -444,16 +441,32 @@

tempb = (((unsigned long long)block) * ((unsigned long long)bs)) + doff;
size = (count < 0) ? -count : count * bs;
+ to_read = size;
+ i = 0;
if (dend && (tempb + size) > dend) {
prom_printf("bad seek: blk %08lx c %08x\n", block, count);
return EXT2_ET_LLSEEK_FAILED;
}
prom_seek(cur_file->of_device, tempb);
- size_read = prom_read(cur_file->of_device, data, size);
- if (size_read != size) {
- DEBUG_F("\nRead error on block %lx. expected %x, got %x\n",
block, size, size_read);
- return EXT2_ET_SHORT_READ;
- }
+ do {
+ size_read = prom_read(cur_file->of_device, data, size);
+ if (size_read == 0) {
+ if (i++ > 5) {
+ prom_printf("%s: block %08lx size %08x: read
returned nothing, %08x bytes remaining\n", __func__, block, to_read, size);
+ return EXT2_ET_SHORT_READ;
+ }
+ } else {
+ if (size_read != size)
+ prom_printf("%s: block %08lx size %08x: got
%08x bytes, expected %08x\n", __func__, block, to_read, size_read, size);
+ if (size_read > 0 && size_read <= size) {
+ i = 0;
+ size -= size_read;
+ } else {
+ if (i++ > 5)
+ return EXT2_ET_SHORT_READ;
+ }
+ }
+ } while (size > 0);
return 0;
}

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yaboot-22.8-r1138/second/yaboot.c
new/yaboot-22.8-r1143/second/yaboot.c
--- old/yaboot-22.8-r1138/second/yaboot.c 2008-09-30 11:42:25.000000000
+0200
+++ new/yaboot-22.8-r1143/second/yaboot.c 2008-10-02 15:19:28.000000000
+0200
@@ -55,6 +55,7 @@
#include <debug.h>
#include <partition.h>
#include <version.h>
+#include <hardcoded_bootpath.h>

static char *hard_coded_bootpath(char *bootpath)
{
@@ -1102,7 +1103,7 @@
if (file.dev_type == TYPE_NET)
chunksize = file.len;
else
- chunksize = 4 * 1024 * 1024;
+ chunksize = 10 * 1024 * 1024; /* FIXME:
if we had a stat() ... */
/* try to claim memory up to 128MB */
while (claim_base + chunksize < 128 * 1024 *
1024) {
initrd_base = prom_claim((void
*)claim_base, chunksize, 0);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yaboot-22.8-r1138/yaboot.deps
new/yaboot-22.8-r1143/yaboot.deps
--- old/yaboot-22.8-r1138/yaboot.deps 2008-09-25 14:49:43.000000000 +0200
+++ new/yaboot-22.8-r1143/yaboot.deps 2008-10-02 15:17:04.000000000 +0200
@@ -185,6 +185,7 @@
second/yaboot.o: \
second/yaboot.c \
include/version.h \
+ include/hardcoded_bootpath.h \
include/string.h \
include/types.h \
include/ctype.h \

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous

Next >

Mailinglist Archive: opensuse-commit (1650 mails)

commit lilo

Search this list

List Navigation

This Thread