Subject: CVSup/CVS issues?
To: None <netbsd-help@netbsd.org>
From: Nino Dehne <usenet-2005-01-b07e88f7@0x54434D.net>
List: netbsd-help
Date: 01/10/2005 01:23:09
Hi,

I cvsup'd both -current and netbsd-2-0 from grappa.unix-ag.uni-kl.de today. Last cvsup was on 2005-01-02. In -current I got the following:

src/dist/openpam/lib/openpam_findenv.c: Checksum mismatch -- will transfer entire file

as well as for the following files:

src/dist/openpam/lib/openpam_get_option.c
src/dist/openpam/lib/openpam_impl.h
src/dist/openpam/lib/openpam_nullconv.c
src/dist/openpam/lib/openpam_restore_cred.c
src/dist/openpam/lib/openpam_set_option.c
src/dist/openpam/lib/openpam_ttyconv.c
src/dist/openpam/lib/pam_acct_mgmt.c
src/dist/openpam/lib/pam_authenticate.c
src/dist/openpam/lib/pam_chauthtok.c
src/dist/openpam/lib/pam_close_session.c
src/dist/openpam/lib/pam_end.c
src/dist/openpam/lib/pam_get_authtok.c
src/dist/openpam/lib/pam_get_data.c
src/dist/openpam/lib/pam_get_item.c
src/dist/openpam/lib/pam_get_user.c
src/dist/openpam/lib/pam_getenv.c
src/dist/openpam/lib/pam_getenvlist.c
src/dist/openpam/lib/pam_open_session.c
src/dist/openpam/lib/pam_putenv.c
src/dist/openpam/lib/pam_set_data.c
src/dist/openpam/lib/pam_set_item.c
src/dist/openpam/lib/pam_setcred.c
src/dist/openpam/lib/pam_setenv.c
src/lib/libc/net/getprotobyname.c
src/lib/libc/net/getprotobynumber.c
src/lib/libutil/ttymsg.c

netbsd-2-0 had received the following changes:

Edit src/doc/CHANGES-2.0.1
Edit src/lib/libc/arch/sparc64/gen/_setjmp.S
Edit src/lib/libc/arch/x86_64/gen/swapcontext.S
Edit src/sys/arch/macppc/conf/INSTALL
Edit src/sys/arch/powerpc/powerpc/trap.c
Edit src/sys/arch/sparc64/sparc64/pmap.c
Edit src/sys/arch/xen/i386/locore.S
Edit src/sys/arch/xen/i386/machdep.c
Edit src/sys/dev/mii/igphy.c
Edit src/sys/dev/mii/igphyreg.h
Edit src/sys/dev/pci/if_sk.c
Edit src/sys/dev/pci/if_skreg.h
Edit src/sys/dev/pci/if_skvar.h
Edit src/sys/dev/pci/if_wm.c
Edit src/sys/dev/pci/if_wmreg.h
Edit src/sys/net/if_media.c

When I try to compile a kernel I get:

/usr/src/sys/dev/pci/if_wm.c:377:2: '#' is not followed by a macro parameter
/usr/src/sys/dev/pci/if_wm.c:1560:9: "/*" within comment
nbmkdep: compile failed.

if_wm.c is /*  $NetBSD: if_wm.c,v 1.68.2.3 2004/07/16 21:21:07 he Exp $    */

line 377 is the #define:

    /* Now sync whatever is left. */                \
    bus_dmamap_sync((sc)->sc_dmat, (sc)->sc_cddmamap,       \
#define CSR_WRITE_FLUSH(sc)                     \
    (void) CSR_READ((sc), WMREG_STATUS)
        WM_CDTXOFF(__x), sizeof(wiseman_txdesc_t) * __n, (ops));    \

lines 1558-1562:

/*

    /*
     * Loop through the send queue, setting up transmit descriptors
     * until we drain the queue, or use up all available transmit


When I try to view the changelog for if_wm.c on http://cvsweb.netbsd.org/bsdweb.cgi/ I don't see _any_ entries for it.

What the hell is wrong here? What is supposedly the "standard" method to retrieve one's source? CVSup never failed on me so far and I use it for other source trees (FreeBSD, OpenBSD) as well.

Regards,

ND

-- 
Of course it runs NetBSD.