[Debootloaders-devel] r239 - in /trunk/silo/debian: changelog patches/series patches/silo-revert-relocation-commit.patch

[jurij at alioth.debian.org]

Author: jurij
Date: Mon Feb  1 21:09:07 2010
New Revision: 239

URL: http://svn.debian.org/wsvn/debootloaders/?sc=1&rev=239
Log:
  * Add silo-revert-relocation-commit.patch reverting upstream
    commit 71816c5699b32bab03e57be6768a562d9568e33b which breaks
    SILO (fails to boot).


Added:
    trunk/silo/debian/patches/silo-revert-relocation-commit.patch
Modified:
    trunk/silo/debian/changelog
    trunk/silo/debian/patches/series

Modified: trunk/silo/debian/changelog
URL: http://svn.debian.org/wsvn/debootloaders/trunk/silo/debian/changelog?rev=239&op=diff
==============================================================================
--- trunk/silo/debian/changelog (original)
+++ trunk/silo/debian/changelog Mon Feb  1 21:09:07 2010
@@ -14,6 +14,9 @@
   * Add silo-linux-types.patch to fix an FTBFS caused by changes in
     the linux-libc-dev headers, which are now defining _LINUX_TYPES_H
     again. Bump linux-libc-dev build-dep to >= 2.6.32.
+  * Add silo-revert-relocation-commit.patch reverting upstream
+    commit 71816c5699b32bab03e57be6768a562d9568e33b which breaks
+    SILO (fails to boot).
   * Build with default GCC, remove build-dep on gcc-4.3.
     (Closes: #533811)
   * Fix bashism in debian/rules. (Closes: #535419)

Modified: trunk/silo/debian/patches/series
URL: http://svn.debian.org/wsvn/debootloaders/trunk/silo/debian/patches/series?rev=239&op=diff
==============================================================================
--- trunk/silo/debian/patches/series (original)
+++ trunk/silo/debian/patches/series Mon Feb  1 21:09:07 2010
@@ -1,1 +1,2 @@
 silo-linux-types.patch
+silo-revert-relocation-commit.patch

Added: trunk/silo/debian/patches/silo-revert-relocation-commit.patch
URL: http://svn.debian.org/wsvn/debootloaders/trunk/silo/debian/patches/silo-revert-relocation-commit.patch?rev=239&op=file
==============================================================================
--- trunk/silo/debian/patches/silo-revert-relocation-commit.patch (added)
+++ trunk/silo/debian/patches/silo-revert-relocation-commit.patch Mon Feb  1 21:09:07 2010
@@ -1,0 +1,14 @@
+diff -aur a/Rules.make b/Rules.make
+--- a/Rules.make	2010-01-31 13:24:57.000000000 +0000
++++ b/Rules.make	2010-02-01 21:02:50.000000000 +0000
+@@ -11,8 +11,8 @@
+ ELFTOAOUT=elftoaout
+ BIN2H=../common/bin2h
+ 
+-SMALL_RELOC=0x2E0000
+-LARGE_RELOC=0x3E0000
++SMALL_RELOC=0x280000
++LARGE_RELOC=0x380000
+ 
+ cc-option-yn = $(shell if $(CC) $(CFLAGS) $(1) -S -o /dev/null -xc /dev/null \
+ 		> /dev/null 2>&1; then echo "y"; else echo "n"; fi;)