Splitting up the 'mega' patches

Gerard Beekmans gerard at linuxfromscratch.org
Thu Jan 2 16:19:01 PST 2003


On January 2, 2003 05:11 pm, Greg Schafer wrote:
> You sure about that? I thought everything above the "diff -uNr" (or
> whatever) is ignored.

I guess not entirely sure.

But how about between two files?

ie the glibc-rootperl.patch:

diff -Naur glibc-2.3.1.orig/login/Makefile glibc-2.3.1/login/Makefile
--- glibc-2.3.1.orig/login/Makefile     2002-10-02 00:19:57.000000000 -0700
+++ glibc-2.3.1/login/Makefile  2002-12-31 07:49:57.000000000 -0800
@@ -55,7 +55,7 @@
 # pt_chown needs to be setuid root.
 $(inst_libexecdir)/pt_chown: $(objpfx)pt_chown $(+force)
        $(make-target-directory)
-       -$(INSTALL_PROGRAM) -m 4755 -o root $< $@
+       -$(INSTALL_PROGRAM) -m 4755 -o 0 $< $@
 
 # Depend on libc.so so a DT_NEEDED is generated in the shared objects.
 # This ensures they will load libc.so for needed symbols if loaded by
diff -Naur glibc-2.3.1.orig/malloc/Makefile glibc-2.3.1/malloc/Makefile
--- glibc-2.3.1.orig/malloc/Makefile    2002-09-17 18:28:35.000000000 -0700
+++ glibc-2.3.1/malloc/Makefile 2002-12-31 07:50:58.000000000 -0800

the "# Depend on libc.so so a DT_NEEDED..." is not considered a comment.

Or wait...maybe in between the "diff -Naur ...." and the --- +++ lines

Yes works nice, here's what I tried:

diff -Naur man-1.5k.orig/src/man.c man-1.5k/src/man.c

Okay this is a comment section, our patch does the following:
1) blah
2) bleh
3) and foobar too

--- man-1.5k.orig/src/man.c 2002-07-17 15:33:20.000000000 -0600
+++ man-1.5k/src/man.c  2002-12-31 14:53:12.000000000 -0700

...and the rest here...

Well, learned something new today.

Okay so we have options. Comments in the patch, or have it create a file and 
put the stuff in there? I think a file is still nicer. It's that or update a 
packages Changelog file as that's what we really should be doing ;)

-- 
Gerard Beekmans
www.linuxfromscratch.org

-*- If Linux doesn't have the solution, you have the wrong problem -*-
-- 
Unsubscribe: send email to listar at linuxfromscratch.org
and put 'unsubscribe lfs-dev' in the subject header of the message



More information about the lfs-dev mailing list