From owner-freebsd-ports@FreeBSD.ORG Mon Sep 22 15:18:56 2014 Return-Path: Delivered-To: freebsd-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 A0A02C4E; Mon, 22 Sep 2014 15:18:56 +0000 (UTC) Received: from d.mail.sonic.net (d.mail.sonic.net [64.142.111.50]) (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 7DC18887; Mon, 22 Sep 2014 15:18:56 +0000 (UTC) Received: from comporellon.tachypleus.net (polaris.tachypleus.net [75.101.50.44]) (authenticated bits=0) by d.mail.sonic.net (8.14.9/8.14.9) with ESMTP id s8MFIjFB011258 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Mon, 22 Sep 2014 08:18:46 -0700 Message-ID: <54203DD5.60107@freebsd.org> Date: Mon, 22 Sep 2014 08:18:45 -0700 From: Nathan Whitehorn User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.1.0 MIME-Version: 1.0 To: freebsd-ports , ports@FreeBSD.org 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> <53F2269D.20101@freebsd.org> <53F277F4.708@gmx.de> <53FCAF63.6030803@freebsd.org> <54185FB4.6000403@freebsd.org> <5419D2D9.2030907@gmx.de> In-Reply-To: <5419D2D9.2030907@gmx.de> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Sonic-CAuth: UmFuZG9tSVaWAeYttnDlWZy4JkXioXgifQw7pTe8+Aa0EouKDxGqA4CzU72ooVHiS/lzZUw5oi8Vzv+yrKxVMPCwxZhlGFNIF09GBy/0pPw= X-Sonic-ID: C;3qjQvmtC5BGCxADu5Qupew== M;xD4Ov2tC5BGCxADu5Qupew== X-Spam-Flag: No X-Sonic-Spam-Details: 0.0/5.0 by cerberusd Cc: Baptiste Daroussin , Warner Losh , Bryan Drewery 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, 22 Sep 2014 15:18:56 -0000 Baptiste, have you had a chance to look at this? I'd like to at least merge the changes to the bootstrapper in base so that it doesn't seg fault at start on armeb, but want to make sure the URLs are finalized before doing that. -Nathan On 09/17/14 11:28, olli hauer wrote: > On 2014-09-16 18:05, Nathan Whitehorn wrote: > < snip very long conversation> > http://lists.freebsd.org/pipermail/freebsd-ports/2014-September/095521.html > > >> I've made a third version of the patch that chases some recent updates to the ports tree and can be found at: >> http://people.freebsd.org/~nwhitehorn/pkg-new-abi-v3.diff >> >> Please let me know if you run into any difficulties. >> -Nathan > > Short success summary for patch pkg-new-abi-v3.diff > > The following tests where done on FrreeBSD-10 (amd64) with poudriere-devel for package building > > > Package building. > > build 1: 10amd64-default-abi1 > - package build (without pkg-new-abi-v3.diff) > > apply pkg-new-abi-v3.diff after build 1. > > build 2: 10amd64-default-abi2 > - $ cpdup 10amd64-default-abi1 10amd64-default-abi2 > - rebuild pkg (pkg-1.3.7_1) > > build 3: 10amd64-default-abi3 > - $ cpdup 10amd64-default-abi2 10amd64-default-abi3 > - remove some packages to force rebuild (pcre, and some others) > - rebuild missing packages > > build 4: 10amd64-default-abi4 > - fresh build (all packages with applied pkg-new-abi-v3.diff) > > > Setup apache based repo: > > # old ABI > Alias /pkg/freebsd:10:x86:64/abi1/ $path_to/10amd64-default-abi1/ > > # new ABI > # Note: both abi1 aliases are required for the upgrade / downgrade > # test and until all systems running the new patched pkg > Alias /pkg/FreeBSD:10:amd64/abi1/ $path_to/10amd64-default-abi1/ > Alias /pkg/FreeBSD:10:amd64/abi2/ $path_to/10amd64-default-abi2/ > Alias /pkg/FreeBSD:10:amd64/abi3/ $path_to/10amd64-default-abi3/ > Alias /pkg/FreeBSD:10:amd64/abi4/ $path_to/10amd64-default-abi4/ > > > $ cat pkg/repos/abi.conf > FreeBSD: { enabled: no } > abi: { > url: "http://$repo-host/pkg/${ABI}/abi1", <= changed during the tests > enabled : yes, > mirror_type : none > } > > > start: > - install packages from abi1 on fresh system > > test 1: > - change repo to abi2 + pkg update / upgrade to patched pkg > ==> OK, no issues > > test 2: > - remove some ports, reinstall them again, pkg upgrade -f > ==> OK, no issues > > test 3: > - change repo to abi3 + repead all tests > ==> OK, no issues > > test 4: > - change repo to abi4 + repead all tests > ==> OK, no issues > > test 5: > - change repo back to abi1 + repead all tests (downgraded pkg) > ==> OK, no issues > > > Short summary: > - update / upgrade / downgrade worked as expected between every build. > - packages are reporting on every test the old ABI (Architecture: freebsd:10:x86:64) > - issues found in patch v1/v2 are no longer present and fixed > > > I think the patch works as expected, but please test yourself! > > If someone is interested to get the packages from the builds 1-4 send me a PM, I have them available as archive (~120MB). > >