From owner-freebsd-ports@FreeBSD.ORG Mon Aug 18 16:15:53 2014 Return-Path: Delivered-To: ports@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 988706B0; Mon, 18 Aug 2014 16:15:53 +0000 (UTC) Received: from c.mail.sonic.net (c.mail.sonic.net [64.142.111.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 77AE43880; Mon, 18 Aug 2014 16:15:53 +0000 (UTC) Received: from zeppelin.tachypleus.net (polaris.tachypleus.net [75.101.50.44]) (authenticated bits=0) by c.mail.sonic.net (8.14.9/8.14.9) with ESMTP id s7IGFPkx017505 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Mon, 18 Aug 2014 09:15:27 -0700 Message-ID: <53F2269D.20101@freebsd.org> Date: Mon, 18 Aug 2014 09:15:25 -0700 From: Nathan Whitehorn User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.0 MIME-Version: 1.0 To: olli hauer , Bryan Drewery Subject: Re: [Patch] Using MACHINE_ARCH identifiers in pkg References: <5383EEB6.6010703@freebsd.org> <538614AB.4070803@freebsd.org> <53ECCF7F.3040107@FreeBSD.org> <53ECD741.5090703@freebsd.org> <53ED1044.80302@gmx.de> <53ED110C.1040500@FreeBSD.org> <53ED1ED2.7050605@gmx.de> In-Reply-To: <53ED1ED2.7050605@gmx.de> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Sonic-CAuth: UmFuZG9tSVaRtA/XsU2Ugwa2ryNKMRyFuRPwy50/4a9UjKKPHAR4WT9WTAwjHQpdhMRDIBAdXw3wIn2xAv7N+ngd0yk2i+CVSYldNhjYLd8= X-Sonic-ID: C;6Mf/3PIm5BGpLN90oK8kYw== M;hLOB3fIm5BGpLN90oK8kYw== X-Spam-Flag: No X-Sonic-Spam-Details: 0.0/5.0 by cerberusd Cc: ports@FreeBSD.org, Baptiste Daroussin , Warner Losh X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Aug 2014 16:15:53 -0000 On 08/14/14 13:40, olli hauer wrote: > On 2014-08-14 21:42, Bryan Drewery wrote: >> On 8/14/2014 2:38 PM, olli hauer wrote: >>> On 2014-08-14 17:35, Nathan Whitehorn wrote: > ... > >> Something I've mentioned to Bapt a few times is that pkg needs a way to >> have a list of accepted ABI strings. Then we could add both the old and >> the new style as accepted (internally) so that old and new repositories >> will continue to work. >> > Ups, rollback is not possible after the client database was updated. > > Even by rollback and rebuild the package metadata the following error pops up. > > ~/pkg-static.old_ABI update -f > Updating repository catalogue > pkg-static: Repository str has a wrong packagesite, need to re-create database > Fetching meta.txz: 100% of 584 B > Fetching digests.txz: 100% of 43 kB > Fetching packagesite.txz: 100% of 138 kB > > Adding new entries: 34% > pkg-static: wrong architecture: FreeBSD:8:amd64 instead of freebsd:8:x86:64 > > pkg-static: repository str contains packages with wrong ABI: FreeBSD:8:amd64 > Adding new entries: 100% > pkg-static: Unable to update repository str Hm. I'm not sure how to handle this. There are two places that emit hard errors in such cases: pkg-add, which is fine since we have a workaround there, and here. The check is at line 446 of libpkg/repo/binary/update.c (you can comment it out for testing). For this one, there does not seem to be any good solution and we need to find one since this is the same issue you ran into the upgrade path. Here are the two options I see. They are similar to each other, and we could do both for some time. 1. Make an intermediate pkg that is otherwise unaltered but doesn't have this check during updates and keep it in the tree for some substantial length of time so most people have it by the time we want upgrades to the new ABI strings. 2. Set PKGNG_ALTABI globally on the ports tree for i386 and amd64 for some period of time so that all built packages get the current ABI identifiers rather than the new ones. Any preference here? Or other options? > > Roll back on the client > # ~/bin/pkg-static backup -r /var/backups/pkgng.db > > > Roll back on the build host: > - remove all packages that where created meanwhile with the patched pkg > including pkg. > - reinstall unpatched pkg on the build host > - start a new build > > By doing a manual cleanup I also found that packages containing the old ABI are not removed. > > # ls -ltr > -rw-r--r-- 2 root wheel 2592992 Aug 14 21:10 openssl-1.0.1_15.txz > -rw-r--r-- 2 root wheel 1963944 Aug 14 21:11 subversion-1.8.10_1.txz > > # ls -l openssl* > -rw-r--r-- 3 root wheel 2593488 Aug 11 17:31 openssl-1.0.1_14.txz > -rw-r--r-- 2 root wheel 2592992 Aug 14 21:10 openssl-1.0.1_15.txz Is this on the build host or the client? In other words, is this a poudriere issue or a pkg one? > So the patch has more side affects ... > > Anyway I'm happy to test new patches to get rid of the old ABI string ;) > Thanks for your testing so far! -Nathan