From owner-freebsd-stable@FreeBSD.ORG Fri Jul 18 11:56:22 2014 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5F8079E4 for ; Fri, 18 Jul 2014 11:56:22 +0000 (UTC) Received: from smarthost1.greenhost.nl (smarthost1.greenhost.nl [195.190.28.81]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 20A522AB0 for ; Fri, 18 Jul 2014 11:56:21 +0000 (UTC) Received: from smtp.greenhost.nl ([213.108.104.138]) by smarthost1.greenhost.nl with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1X86lo-0002Nr-U1 for freebsd-stable@freebsd.org; Fri, 18 Jul 2014 13:56:13 +0200 Content-Type: text/plain; charset=iso-8859-15; format=flowed; delsp=yes To: freebsd-stable@freebsd.org Subject: Re: svn: E155017: Checksum mismatch References: <20140717140810.GA21681@ymer.thorshammare.org> <86k37b3s6q.wl-hskuhra@eumx.net> <20140718114953.GA28536@ymer.thorshammare.org> Date: Fri, 18 Jul 2014 13:56:11 +0200 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: "Ronald Klop" Message-ID: In-Reply-To: <20140718114953.GA28536@ymer.thorshammare.org> User-Agent: Opera Mail/12.17 (Win32) X-Authenticated-As-Hash: 398f5522cb258ce43cb679602f8cfe8b62a256d1 X-Virus-Scanned: by clamav at smarthost1.samage.net X-Spam-Level: / X-Spam-Score: -0.2 X-Spam-Status: No, score=-0.2 required=5.0 tests=ALL_TRUSTED, BAYES_50 autolearn=disabled version=3.3.2 X-Scan-Signature: 3cea6f85c46863b7448b52c7b19d39b8 X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jul 2014 11:56:22 -0000 On Fri, 18 Jul 2014 13:49:53 +0200, Charlie Root wrote: > On Fri, Jul 18, 2014 at 11:57:33AM +0200, Herbert J. Skuhra wrote: >> On Thu, 17 Jul 2014 16:08:10 +0200 >> User Admin wrote: >> >> > Hello >> > >> > root@ymer:/usr/src # uname -a >> > FreeBSD ymer.thorshammare.org 10.0-STABLE FreeBSD 10.0-STABLE #2 >> r268147M: Wed J >> ^^^ >> > ul 9 03:32:09 CEST 2014 >> hasse@ymer.thorshammare.org:/usr/obj/usr/src/sys/YM >> > ER i386 >> > >> > I'm following stable, and at todays update I got the following error: >> > >> > root@ymer:/usr/src # svnlite up >> > Updating '.': >> > svn: E155017: Checksum mismatch while updating >> '/usr/src/sys/cam/ctl/ctl_error.c >> > ': >> > expected: 0eb4bc2c16922d6e9528af853e1ef8c7 >> > actual: 192119e45a85b5b19dbd5c5313de23ba >> > >> > any advice on how to act upon this ? >> >> You run a modified kernel. What have you modified? Run 'svnlite >> status' to view changes or 'svnlite revert -R .' to revert changes. >> Then try 'svnlite up' again. >> >> -- >> Herbert >> _______________________________________________ >> freebsd-stable@freebsd.org mailing list >> http://lists.freebsd.org/mailman/listinfo/freebsd-stable >> To unsubscribe, send any mail to >> "freebsd-stable-unsubscribe@freebsd.org" > > Hello > Thank you for helping. > > This is what I get following your recommendations, and also attaching my > make.conf and custom kernel YMER : > > root@ymer:/usr/src # svnlite status > ! . > ! sys > ! sys/cam > ! sys/cam/ctl > ? sys/kern/uipc_sockbuf.c.orig > ? sys/netinet/sctp_auth.c.orig > ? sys/netinet/sctp_indata.c.orig > ? sys/netinet/sctputil.c.orig > > root@ymer:/usr/src # svnlite revert -R . > > root@ymer:/usr/src # svnlite up > Updating '.': > U usr.bin/showmount/showmount.8 > U usr.bin/calendar/calendars/calendar.holiday > U sys/amd64/conf/GENERIC > U sys/arm/conf/ZEDBOARD > U sys/sparc64/conf/GENERIC > U sys/conf/kern.mk > U sys/cam/scsi/scsi_da.c > U sys/cam/ata/ata_da.c > svn: E155017: Checksum mismatch while updating > '/usr/src/sys/cam/ctl/ctl_error.c': > expected: 0eb4bc2c16922d6e9528af853e1ef8c7 > actual: 192119e45a85b5b19dbd5c5313de23ba > > root@ymer:/usr/src # cat /etc/make.conf > CC=clang > CXX=clang++ > CPP=clang-cpp > > NO_WERROR= > WERROR= > > KERNCONF=YMER > WITH_PKGNG=yes > > root@ymer:/usr/src # cat /usr/src/sys/i386/conf/YMER > include GENERIC > nocpu i486_CPU > ident YMER > > nooptions WITNESS > nooptions INVARIANTS > > nodevice eisa > > nodevice fdc > > device ahci > > options ALTQ > options ALTQ_CBQ > options ALTQ_RED > options ALTQ_RIO > options ALTQ_HFSC > options ALTQ_CDNR > options ALTQ_PRIQ > options ALTQ_NOPCC > options ALTQ_DEBUG > > options ACCEPT_FILTER_DATA > options ACCEPT_FILTER_DNS > options ACCEPT_FILTER_HTTP > > options SC_NORM_ATTR=(FG_GREEN|BG_BLACK) > options SC_NORM_REV_ATTR=(FG_YELLOW|BG_GREEN) > options SC_KERNEL_CONS_ATTR=(FG_RED|BG_BLACK) > options SC_KERNEL_CONS_REV_ATTR=(FG_BLACK|BG_RED) > > What happens if you delete the file with the mismatch? cd /usr/src rm sys/cam/ctl/ctl_error.c svnlite up Svn should redownload the complete file. Cheers, Ronald.