[CUWiN-Dev] new netbsd snapshot

[David Young]

On Thu, Sep 14, 2006 at 04:22:12PM -0500, Bill Comisky wrote:
> On Wed, 13 Sep 2006, David Young wrote:
> 
> >A snapshot of my latest NetBSD sources is on cuw at
> >~dyoung/cuwin-netbsd-snap-13-Sep-2006.tgz.  We should use those sources
> >for the release.
> >
> 
> The cuw_pc kernel configuration (for ISO builds) needs to be updated for 
> this snapshot.  The patch below was a minimal change that got it compiling 
> here.  I saw the last update to the geode kernel config was more 
> substantial, so maybe there are other things you'd like to update?  If not 
> I'll commit.. suppose this should be merged to the new release branch too.

Here is my procedure for bringing CUWiN's kernel configurations up-to-date
with its NetBSD sources.  This deserves to be documented somewhere.

1 Find out what NetBSD configuration (filename & version) the config
  derives from:

        % cd $CUWIN_TRUNK/src/boot-image
        % ident kernel-conf/cuw_pc 
        kernel-conf/cuw_pc:
             $NetBSD: GENERIC,v 1.758 2006/06/19 15:44:44 gdamore Exp $
             $Revision: 1.758 $

2 Use cvs to find the differences between GENERIC rev 1.758 and the
  new NetBSD revision, rev BASE:

        % cd $CUWIN_NETBSD_SRC/sys/arch/i386/
        % cvs diff -r 1.758 -r BASE conf/GENERIC > /tmp/Gd

3 Apply the differences between 1.758 and BASE to cuw_pc:

        % cd $CUWIN_TRUNK/src/boot-image
        % patch kernel-conf/cuw_pc  < /tmp/Gd
        Hmm...  Looks like a unified diff to me...
        The text leading up to this was:
        --------------------------
        |Index: conf/GENERIC
        |===================================================================
        |RCS file: /cvsroot/src/sys/arch/i386/conf/GENERIC,v
        |retrieving revision 1.758
        |retrieving revision 1.781
        |diff -p -u -r1.758 -r1.781
        |--- conf/GENERIC       19 Jun 2006 15:44:44 -0000      1.758
        |+++ conf/GENERIC       10 Sep 2006 15:45:56 -0000      1.781
        --------------------------
        Patching file kernel-conf/cuw_pc using Plan A...
        Hunk #1 succeeded at 1.
        Hunk #2 succeeded at 24 with fuzz 2 (offset 2 lines).
        Hunk #3 succeeded at 49 with fuzz 2 (offset 5 lines).
        Hunk #4 failed at 89.
        Hunk #5 failed at 185.
        Hunk #6 failed at 203.
        Hunk #7 succeeded at 280 (offset -42 lines).
        Hunk #8 succeeded at 353 (offset 5 lines).
        Hunk #9 succeeded at 326 (offset -42 lines).
        Hunk #10 succeeded at 426 with fuzz 1 (offset 5 lines).
        Hunk #11 succeeded at 531 (offset -63 lines).
        Hunk #12 failed at 591.
        Hunk #13 failed at 645.
        Hunk #14 succeeded at 647 with fuzz 2 (offset -107 lines).
        Hunk #15 failed at 733.
        Hunk #16 failed at 758.
        Hunk #17 failed at 913.
        Hunk #18 failed at 1009.
        Hunk #19 failed at 1058.
        Hunk #20 succeeded at 893 with fuzz 2 (offset -360 lines).
        Hunk #21 succeeded at 1162 with fuzz 2 (offset -107 lines).
        Hunk #22 failed at 1192.
        Hunk #23 failed at 1241.
        Hunk #24 succeeded at 995 with fuzz 2 (offset -392 lines).
        12 out of 24 hunks failed--saving rejects to kernel-conf/cuw_pc.rej
        done

4 Resolve "conflicts," i.e., discard or manually apply the "rejected"
  hunks from above.  Remove cuw_pc.{rej,orig}.

5 Build and test.

6 Commit.

Dave

-- 
David Young             OJC Technologies
dyoung at ojctech.com      Urbana, IL * (217) 278-3933