[Patch] Using MACHINE_ARCH identifiers in pkg

[olli hauer]

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