From owner-freebsd-ports@FreeBSD.ORG Wed Sep 17 18:28:52 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 3DB2FF13; Wed, 17 Sep 2014 18:28:52 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mout.gmx.net", Issuer "TeleSec ServerPass DE-1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DC7165FA; Wed, 17 Sep 2014 18:28:51 +0000 (UTC) Received: from [192.168.0.101] ([87.139.233.65]) by mail.gmx.com (mrgmx101) with ESMTPSA (Nemesis) id 0M4ScS-1YFPGw2U1s-00ydqJ; Wed, 17 Sep 2014 20:28:42 +0200 Message-ID: <5419D2D9.2030907@gmx.de> Date: Wed, 17 Sep 2014 20:28:41 +0200 From: olli hauer Reply-To: freebsd-ports User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:31.0) Gecko/20100101 Thunderbird/31.1.1 MIME-Version: 1.0 To: 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> In-Reply-To: <54185FB4.6000403@freebsd.org> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:gGF8g+icZusCQv1dTMKDhwVU8ZOxO3RBlidjBSsJKcgcTQBt1EJ vuiAPdbfE25uhJ7VtIFx0oq37cTcxn6fgEFQBx1zJa7GYC4iQOqjZ6DcQO9TyADOBpAdjTF mEDCoCT2Xj4yKUH8ngDgUrJcQItbZNi3pnCE/AGHz6CBRBuMAVAadpEqfbzZMxj0vtbcM5e eqHNX/LmoaGKguYgW60yQ== X-UI-Out-Filterresults: notjunk:1; Cc: Baptiste Daroussin , Nathan Whitehorn , 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: Wed, 17 Sep 2014 18:28:52 -0000 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). -- olli