diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2011-01-22 17:30:34 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2011-01-22 17:30:34 +0000 |
| commit | 58e2268b66b4ff8ffba05d315cf4a803332989d5 (patch) | |
| tree | 24f76d21f0cf617aa841aa3c723a9a0980a0b445 /sys-boot | |
| parent | ppc/ppc64 stable wrt 350551 (diff) | |
| download | gentoo-2-58e2268b66b4ff8ffba05d315cf4a803332989d5.tar.gz gentoo-2-58e2268b66b4ff8ffba05d315cf4a803332989d5.tar.bz2 gentoo-2-58e2268b66b4ff8ffba05d315cf4a803332989d5.zip | |
Clean up patches.
(Portage version: 2.2.0_alpha19/cvs/Linux i686)
Diffstat (limited to 'sys-boot')
| -rw-r--r-- | sys-boot/palo/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-boot/palo/files/palo-1.16_p1-build.patch | 8 | ||||
| -rw-r--r-- | sys-boot/palo/files/palo-remove-HOME-TERM.patch | 25 |
3 files changed, 19 insertions, 20 deletions
diff --git a/sys-boot/palo/ChangeLog b/sys-boot/palo/ChangeLog index 7e3cbe4e7ead..8c02c7687275 100644 --- a/sys-boot/palo/ChangeLog +++ b/sys-boot/palo/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-boot/palo # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/palo/ChangeLog,v 1.28 2011/01/03 11:51:15 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/palo/ChangeLog,v 1.29 2011/01/22 17:30:34 jer Exp $ + + 22 Jan 2011; Jeroen Roovers <jer@gentoo.org> files/palo-1.16_p1-build.patch, + files/palo-remove-HOME-TERM.patch: + Clean up patches. 03 Jan 2011; Jeroen Roovers <jer@gentoo.org> -palo-1.17.ebuild, -files/palo-1.17-fortify-source.patch, palo-1.18.ebuild: diff --git a/sys-boot/palo/files/palo-1.16_p1-build.patch b/sys-boot/palo/files/palo-1.16_p1-build.patch index 4bb1f2aaffd6..d1fe3359bb44 100644 --- a/sys-boot/palo/files/palo-1.16_p1-build.patch +++ b/sys-boot/palo/files/palo-1.16_p1-build.patch @@ -1,5 +1,5 @@ ---- ./palo-1.16+nmu1/ipl/Makefile.orig 2007-09-12 18:12:03.000000000 +0200 -+++ ./palo-1.16+nmu1/ipl/Makefile 2009-05-07 06:16:20.000000000 +0200 +--- a/ipl/Makefile 2007-09-12 18:12:03.000000000 +0200 ++++ b/ipl/Makefile 2009-05-07 06:16:20.000000000 +0200 @@ -11,17 +11,11 @@ MACHINE := $(subst 64,,$(shell uname -m)) @@ -20,8 +20,8 @@ LDFLAGS = -N --section-start .init=0x60000 -e '$$START$$' all: iplelf ---- ./palo-1.16+nmu1/palo/Makefile.orig 2007-09-12 18:12:03.000000000 +0200 -+++ ./palo-1.16+nmu1/palo/Makefile 2009-05-07 06:16:50.000000000 +0200 +--- a/palo/Makefile 2007-09-12 18:12:03.000000000 +0200 ++++ b/palo/Makefile 2009-05-07 06:16:50.000000000 +0200 @@ -10,11 +10,11 @@ ###############{ diff --git a/sys-boot/palo/files/palo-remove-HOME-TERM.patch b/sys-boot/palo/files/palo-remove-HOME-TERM.patch index 0e5221addb2a..6d157edcd067 100644 --- a/sys-boot/palo/files/palo-remove-HOME-TERM.patch +++ b/sys-boot/palo/files/palo-remove-HOME-TERM.patch @@ -1,6 +1,5 @@ -diff -uNr palo.orig/Makefile palo/Makefile ---- palo.orig/Makefile 2004-05-17 13:39:00.431714000 +0200 -+++ palo/Makefile 2004-05-17 13:39:45.221714000 +0200 +--- a/Makefile 2004-05-17 13:39:00.431714000 +0200 ++++ b/Makefile 2004-05-17 13:39:45.221714000 +0200 @@ -56,7 +56,7 @@ ROOT=root=/dev/nfs nfsroot=${NFSROOT} ip=bootp endif @@ -10,9 +9,8 @@ diff -uNr palo.orig/Makefile palo/Makefile all: makepalo README palo.conf -diff -uNr palo.orig/README palo/README ---- palo.orig/README 2004-05-17 13:39:00.431714000 +0200 -+++ palo/README 2004-05-17 13:40:09.341714000 +0200 +--- a/README 2004-05-17 13:39:00.431714000 +0200 ++++ b/README 2004-05-17 13:40:09.341714000 +0200 @@ -42,13 +42,13 @@ files to it, unmount. * Use palo to make the disk bootable: @@ -29,9 +27,8 @@ diff -uNr palo.orig/README palo/README --recoverykernel=/boot/vmlinux --init-partitioned=/dev/your-disk -diff -uNr palo.orig/README.html palo/README.html ---- palo.orig/README.html 2004-05-17 13:39:00.431714000 +0200 -+++ palo/README.html 2004-05-17 13:40:27.801714000 +0200 +--- a/README.html 2004-05-17 13:39:00.431714000 +0200 ++++ b/README.html 2004-05-17 13:40:27.801714000 +0200 @@ -52,13 +52,13 @@ <p><li>Use <i>palo</i> to make the disk bootable: <pre> @@ -48,9 +45,8 @@ diff -uNr palo.orig/README.html palo/README.html --recoverykernel=/boot/vmlinux --init-partitioned=/dev/your-disk</pre> and running <i>palo</i>. -diff -uNr palo.orig/ipl/ipl.c palo/ipl/ipl.c ---- palo.orig/ipl/ipl.c 2004-05-17 13:39:00.491714000 +0200 -+++ palo/ipl/ipl.c 2004-05-17 13:39:19.681714000 +0200 +--- a/ipl/ipl.c 2004-05-17 13:39:00.491714000 +0200 ++++ b/ipl/ipl.c 2004-05-17 13:39:19.681714000 +0200 @@ -481,9 +481,6 @@ chk_strcat(commandline, "ttyB0", CMDLINELEN, &ok); else @@ -70,9 +66,8 @@ diff -uNr palo.orig/ipl/ipl.c palo/ipl/ipl.c } } -diff -uNr palo.orig/palo.conf palo/palo.conf ---- palo.orig/palo.conf 2004-05-17 13:39:00.431714000 +0200 -+++ palo/palo.conf 2004-05-17 13:41:01.541714000 +0200 +--- a/palo.conf 2004-05-17 13:39:00.431714000 +0200 ++++ b/palo.conf 2004-05-17 13:41:01.541714000 +0200 @@ -8,7 +8,7 @@ # recovery kernel, and the default dynamically-booted kernel. # --recoverykernel=/boot/vmlinux |