From owner-freebsd-current@FreeBSD.ORG Sun Aug 26 03:17:35 2007 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3E05616A418; Sun, 26 Aug 2007 03:17:35 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from mojo.ru (mojo.ru [84.252.152.63]) by mx1.freebsd.org (Postfix) with ESMTP id BB45D13C461; Sun, 26 Aug 2007 03:17:34 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from [192.168.0.16] (nc-76-4-28-21.dhcp.embarqhsd.net [76.4.28.21]) (authenticated bits=0) by mojo.ru (8.12.11.20060308/8.12.10) with ESMTP id l7Q3HcLp003024 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 26 Aug 2007 07:17:41 +0400 Message-ID: <46D0F0C3.1000203@FreeBSD.org> Date: Sat, 25 Aug 2007 23:17:23 -0400 From: "Constantine A. Murenin" Organization: Google Summer of Code 2007 Student @ The FreeBSD Project User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.7.5) Gecko/20041217 X-Accept-Language: en-gb, en-gb-oed, en, en-us, ru, ru-ru, ru-su MIME-Version: 1.0 To: Harald Schmalzbauer References: <200708210339.l7L3dUX0038042@repoman.freebsd.org> <200708260054.42892.h.schmalzbauer@omnisec.de> <46D0BEEF.1020601@FreeBSD.org> <200708260208.35700.h.schmalzbauer@omnisec.de> In-Reply-To: <200708260208.35700.h.schmalzbauer@omnisec.de> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Cc: freebsd-current@FreeBSD.org, "Constantine A. Murenin" Subject: Re: GSoC2007: cnst-sensors.2007-08-20.patch X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Aug 2007 03:17:35 -0000 On 25/08/2007 20:08, Harald Schmalzbauer wrote: > Am Sonntag, 26. August 2007 01:44:47 schrieb Constantine A. Murenin: > >>On 25/08/2007 18:54, Harald Schmalzbauer wrote: >> >>>Am Dienstag, 21. August 2007 22:54:22 schrieb Constantine A. Murenin: >>> >>>>http://p4web.freebsd.org/depot/projects/soc2007/cnst-sensors/cnst-sensors >>>>.2 007-08-20.patch >>> >>>Thanks a lot for your hard work. >>>I'd love to test it but the 08-20 patch doesn't cleanly apply to >>>todays -current in coretemp. >>>Can you supply a diff to that patch or reroll a new patch? >> >>Thanks for testing! >> >>The coretemp.c updated to contain the 2007-08-23 change from the CVS >>(coretemp.c#rev1.2) can be downloaded directly from my perforce branch: >> >>http://p4web.freebsd.org/@sr=125633@//depot/projects/soc2007/cnst-sensors/s >>ys.dev.coretemp/coretemp.c > > > Great, but I have other problems too. > Compiling world fails here: > cc -O2 -fno-strict-aliasing -pipe -march=nocona -DINET6 -c /usr/src/usr.bin/systat/sensors.c > In file included from /usr/src/usr.bin/systat/sensors.c:298: > /usr/src/usr.bin/systat/systat.h:39: error: redefinition of 'struct cmdtab' > /usr/src/usr.bin/systat/sensors.c:309: error: redefinition of 'opensensors' > /usr/src/usr.bin/systat/sensors.c:47: error: previous definition > of 'opensensors' was here > /usr/src/usr.bin/systat/sensors.c:315: error: redefinition of 'closesensors' > /usr/src/usr.bin/systat/sensors.c:53: error: previous definition > of 'closesensors' was here > /usr/src/usr.bin/systat/sensors.c:325: error: redefinition of 'labelsensors' > /usr/src/usr.bin/systat/sensors.c:63: error: previous definition > of 'labelsensors' was here > /usr/src/usr.bin/systat/sensors.c:336: error: redefinition of 'fetchsensors' > /usr/src/usr.bin/systat/sensors.c:74: error: previous definition > of 'fetchsensors' was here > /usr/src/usr.bin/systat/sensors.c:378: error: redefinition of 'drvstat' > /usr/src/usr.bin/systat/sensors.c:116: error: previous definition of 'drvstat' > was here > /usr/src/usr.bin/systat/sensors.c:386: error: redefinition of 'showsensors' > /usr/src/usr.bin/systat/sensors.c:124: error: previous definition > of 'showsensors' was here > /usr/src/usr.bin/systat/sensors.c:393: error: redefinition of 'initsensors' > /usr/src/usr.bin/systat/sensors.c:131: error: previous definition > of 'initsensors' was here > /usr/src/usr.bin/systat/sensors.c:399: error: redefinition of 'printline' > /usr/src/usr.bin/systat/sensors.c:137: error: previous definition > of 'printline' was here > /usr/src/usr.bin/systat/sensors.c:477: error: redefinition of 'fmttime' > /usr/src/usr.bin/systat/sensors.c:215: error: previous definition of 'fmttime' > was here > *** Error code 1 > > Thanks, > > -Harry You must have applied the patch twice. There are only 212 lines in systat/sensors.c, as is clearly evidenced in the patch: Index: usr.bin/systat/sensors.c =================================================================== RCS file: usr.bin/systat/sensors.c diff -N usr.bin/systat/sensors.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ usr.bin/systat/sensors.c 20 Aug 2007 23:30:32 -0000 @@ -0,0 +1,262 @@ C.