From owner-freebsd-current@freebsd.org Wed Feb 28 19:05:59 2018 Return-Path: Delivered-To: freebsd-current@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E70CAF3DA8A for ; Wed, 28 Feb 2018 19:05:58 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from mail.baldwin.cx (bigwig.baldwin.cx [96.47.65.170]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9942888361; Wed, 28 Feb 2018 19:05:58 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from ralph.baldwin.cx (ralph.baldwin.cx [66.234.199.215]) by mail.baldwin.cx (Postfix) with ESMTPSA id 2223310A87D; Wed, 28 Feb 2018 14:05:52 -0500 (EST) From: John Baldwin To: freebsd-current@freebsd.org, cem@freebsd.org Cc: Ronald Klop Subject: Re: pkg does not recognize correct kernel version Date: Wed, 28 Feb 2018 10:57:53 -0800 Message-ID: <20287587.l4BUZnE1AB@ralph.baldwin.cx> User-Agent: KMail/4.14.10 (FreeBSD/11.1-STABLE; KDE/4.14.30; amd64; ; ) In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mail.baldwin.cx); Wed, 28 Feb 2018 14:05:52 -0500 (EST) X-Virus-Scanned: clamav-milter 0.99.2 at mail.baldwin.cx X-Virus-Status: Clean X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.25 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: Wed, 28 Feb 2018 19:05:59 -0000 On Tuesday, February 20, 2018 10:19:02 AM Conrad Meyer wrote: > On Mon, Feb 19, 2018 at 2:38 PM, Ronald Klop wrote: > > On Mon, 19 Feb 2018 22:05:51 +0100, Konstantin Belousov > > wrote: > > > >> Look at the man page. pkg reads version from the /bin/sh ELF FreeBSD > > > > > > Which man page? I can't find it in pkg help update or pkg help upgrade or > > man pkg. > > I had to dig for quite a while to find a reference (pkg.conf(5)): > > ABI: string The ABI of the package you want to install. Default: > derived from the ABI of the /bin/sh binary. > > >> version note: > >> orion% file /bin/ls > >> /bin/ls: ELF 64-bit LSB executable, x86-64, version 1 (FreeBSD), > >> dynamically linked, interpreter /libexec/ld-elf.so.1, for FreeBSD 11.1 > >> (1101506), FreeBSD-style, stripped > >> > >> Update world past the __FreeBSD_version which is reported for the > >> repository. > > > > > > Does this mean I always have to do a *clean* buildworld after every version > > bump? This takes ages. > > You could also do a -DNO_CLEAN buildworld. > > Or you can continue to override with "-o OSVERSION=foo", although that > may eventually result in broken packages. In general the OSVERSION is > bumped conservatively (more often than will actually result in > breakage), so you can get away with the easy workaround for a while > between buildworlds. NO_CLEAN=yes doesn't work. A clean buildworld is required. The reason is that the __FreeBSD_version embedded in binaries is stored in /usr/lib/crt*.o, but that the dependency rules in lib/csu/Makefile do not rebuild these .o files everytime changes (so a NO_CLEAN=yes buildworld won't rebuild them leaving them with a stale version). Furthermore, when binaries and shared libraries are built, our Makefiles do not specify that the relevant /usr/lib/crt*.o files are dependencies, so even if we fixed the missing dependency, no binaries would relink to pick up the updated __FreeBSD_version file unless some other input to the binary changed. This one could perhaps be mostly mitigated by forcing libc to depend on the relevant crt*.o files explicitly (or even having it depend on to force relinking of everything when changes). This matters for more than just pkg as the kernel also looks at the embedded __FreeBSD_version in binaries to make decisions about compat shims to enable (grep for P_OSREL in sys/). -- John Baldwin