Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-boot/palo/files: palo-1.16_p1-build.patch palo-remove-HOME-TERM.patch
Date: Sat, 22 Jan 2011 17:30:45
Message-Id: 20110122173034.43F7A20054@flycatcher.gentoo.org
1 jer 11/01/22 17:30:34
2
3 Modified: palo-1.16_p1-build.patch
4 palo-remove-HOME-TERM.patch
5 Log:
6 Clean up patches.
7
8 (Portage version: 2.2.0_alpha19/cvs/Linux i686)
9
10 Revision Changes Path
11 1.2 sys-boot/palo/files/palo-1.16_p1-build.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/palo/files/palo-1.16_p1-build.patch?rev=1.2&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/palo/files/palo-1.16_p1-build.patch?rev=1.2&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/palo/files/palo-1.16_p1-build.patch?r1=1.1&r2=1.2
16
17 Index: palo-1.16_p1-build.patch
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sys-boot/palo/files/palo-1.16_p1-build.patch,v
20 retrieving revision 1.1
21 retrieving revision 1.2
22 diff -u -r1.1 -r1.2
23 --- palo-1.16_p1-build.patch 7 May 2009 05:06:47 -0000 1.1
24 +++ palo-1.16_p1-build.patch 22 Jan 2011 17:30:34 -0000 1.2
25 @@ -1,5 +1,5 @@
26 ---- ./palo-1.16+nmu1/ipl/Makefile.orig 2007-09-12 18:12:03.000000000 +0200
27 -+++ ./palo-1.16+nmu1/ipl/Makefile 2009-05-07 06:16:20.000000000 +0200
28 +--- a/ipl/Makefile 2007-09-12 18:12:03.000000000 +0200
29 ++++ b/ipl/Makefile 2009-05-07 06:16:20.000000000 +0200
30 @@ -11,17 +11,11 @@
31
32 MACHINE := $(subst 64,,$(shell uname -m))
33 @@ -20,8 +20,8 @@
34 LDFLAGS = -N --section-start .init=0x60000 -e '$$START$$'
35
36 all: iplelf
37 ---- ./palo-1.16+nmu1/palo/Makefile.orig 2007-09-12 18:12:03.000000000 +0200
38 -+++ ./palo-1.16+nmu1/palo/Makefile 2009-05-07 06:16:50.000000000 +0200
39 +--- a/palo/Makefile 2007-09-12 18:12:03.000000000 +0200
40 ++++ b/palo/Makefile 2009-05-07 06:16:50.000000000 +0200
41 @@ -10,11 +10,11 @@
42 ###############{
43
44
45
46
47 1.2 sys-boot/palo/files/palo-remove-HOME-TERM.patch
48
49 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/palo/files/palo-remove-HOME-TERM.patch?rev=1.2&view=markup
50 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/palo/files/palo-remove-HOME-TERM.patch?rev=1.2&content-type=text/plain
51 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/palo/files/palo-remove-HOME-TERM.patch?r1=1.1&r2=1.2
52
53 Index: palo-remove-HOME-TERM.patch
54 ===================================================================
55 RCS file: /var/cvsroot/gentoo-x86/sys-boot/palo/files/palo-remove-HOME-TERM.patch,v
56 retrieving revision 1.1
57 retrieving revision 1.2
58 diff -u -r1.1 -r1.2
59 --- palo-remove-HOME-TERM.patch 17 May 2004 17:15:46 -0000 1.1
60 +++ palo-remove-HOME-TERM.patch 22 Jan 2011 17:30:34 -0000 1.2
61 @@ -1,6 +1,5 @@
62 -diff -uNr palo.orig/Makefile palo/Makefile
63 ---- palo.orig/Makefile 2004-05-17 13:39:00.431714000 +0200
64 -+++ palo/Makefile 2004-05-17 13:39:45.221714000 +0200
65 +--- a/Makefile 2004-05-17 13:39:00.431714000 +0200
66 ++++ b/Makefile 2004-05-17 13:39:45.221714000 +0200
67 @@ -56,7 +56,7 @@
68 ROOT=root=/dev/nfs nfsroot=${NFSROOT} ip=bootp
69 endif
70 @@ -10,9 +9,8 @@
71
72 all: makepalo README palo.conf
73
74 -diff -uNr palo.orig/README palo/README
75 ---- palo.orig/README 2004-05-17 13:39:00.431714000 +0200
76 -+++ palo/README 2004-05-17 13:40:09.341714000 +0200
77 +--- a/README 2004-05-17 13:39:00.431714000 +0200
78 ++++ b/README 2004-05-17 13:40:09.341714000 +0200
79 @@ -42,13 +42,13 @@
80 files to it, unmount.
81 * Use palo to make the disk bootable:
82 @@ -29,9 +27,8 @@
83 --recoverykernel=/boot/vmlinux
84 --init-partitioned=/dev/your-disk
85
86 -diff -uNr palo.orig/README.html palo/README.html
87 ---- palo.orig/README.html 2004-05-17 13:39:00.431714000 +0200
88 -+++ palo/README.html 2004-05-17 13:40:27.801714000 +0200
89 +--- a/README.html 2004-05-17 13:39:00.431714000 +0200
90 ++++ b/README.html 2004-05-17 13:40:27.801714000 +0200
91 @@ -52,13 +52,13 @@
92 <p><li>Use <i>palo</i> to make the disk bootable:
93 <pre>
94 @@ -48,9 +45,8 @@
95 --recoverykernel=/boot/vmlinux
96 --init-partitioned=/dev/your-disk</pre>
97 and running <i>palo</i>.
98 -diff -uNr palo.orig/ipl/ipl.c palo/ipl/ipl.c
99 ---- palo.orig/ipl/ipl.c 2004-05-17 13:39:00.491714000 +0200
100 -+++ palo/ipl/ipl.c 2004-05-17 13:39:19.681714000 +0200
101 +--- a/ipl/ipl.c 2004-05-17 13:39:00.491714000 +0200
102 ++++ b/ipl/ipl.c 2004-05-17 13:39:19.681714000 +0200
103 @@ -481,9 +481,6 @@
104 chk_strcat(commandline, "ttyB0", CMDLINELEN, &ok);
105 else
106 @@ -70,9 +66,8 @@
107 }
108 }
109
110 -diff -uNr palo.orig/palo.conf palo/palo.conf
111 ---- palo.orig/palo.conf 2004-05-17 13:39:00.431714000 +0200
112 -+++ palo/palo.conf 2004-05-17 13:41:01.541714000 +0200
113 +--- a/palo.conf 2004-05-17 13:39:00.431714000 +0200
114 ++++ b/palo.conf 2004-05-17 13:41:01.541714000 +0200
115 @@ -8,7 +8,7 @@
116 # recovery kernel, and the default dynamically-booted kernel.
117 # --recoverykernel=/boot/vmlinux