From 4ccfe92e5944f3442e29385b66ae2925c976775a Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 22 Jul 2020 13:13:13 +0200 Subject: [PATCH] cross/musl-*: upgrade to 1.2.0 Related: https://postmarketos.org/blog/2020/07/21/breaking-update-in-edge/ --- cross/musl-aarch64/APKBUILD | 16 ++++++++-------- cross/musl-armhf/APKBUILD | 16 ++++++++-------- cross/musl-armv7/APKBUILD | 16 ++++++++-------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/cross/musl-aarch64/APKBUILD b/cross/musl-aarch64/APKBUILD index 4432341d7..ad839f2a5 100644 --- a/cross/musl-aarch64/APKBUILD +++ b/cross/musl-aarch64/APKBUILD @@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then fi pkgname=musl-aarch64 -pkgver=1.1.24 -pkgrel=9 +pkgver=1.2.0 +pkgrel=0 arch="armhf armv7 x86_64 x86" subpackages="musl-dev-aarch64:package_dev" @@ -23,8 +23,8 @@ pkgdesc="the musl library (lib c) implementation for $_arch" _target="$(arch_to_hostspec $_arch)" source=" - musl-$pkgver-r$pkgrel-$_arch.apk::$_mirror/edge/main/$_arch/musl-$pkgver-r$pkgrel.apk - musl-dev-$pkgver-r$pkgrel-$_arch.apk::$_mirror/edge/main/$_arch/musl-dev-$pkgver-r$pkgrel.apk + musl-$pkgver-r$pkgrel-$_arch-edge.apk::$_mirror/edge/main/$_arch/musl-$pkgver-r$pkgrel.apk + musl-dev-$pkgver-r$pkgrel-$_arch-edge.apk::$_mirror/edge/main/$_arch/musl-dev-$pkgver-r$pkgrel.apk " package() { @@ -32,7 +32,7 @@ package() { cd "$pkgdir/usr/$_target" # Use 'busybox tar' to avoid 'tar: Child returned status 141' # on some machines (builds.sr.ht, gitlab-ci). See pmaports#26. - busybox tar -xf $srcdir/musl-$pkgver-r$pkgrel-$_arch.apk + busybox tar -xf $srcdir/musl-$pkgver-r$pkgrel-$_arch-edge.apk rm .PKGINFO .SIGN.* } package_dev() { @@ -40,7 +40,7 @@ package_dev() { cd "$subpkgdir/usr/$_target" # Use 'busybox tar' to avoid 'tar: Child returned status 141' # on some machines (builds.sr.ht, gitlab-ci). See pmaports#26. - busybox tar -xf $srcdir/musl-dev-$pkgver-r$pkgrel-$_arch.apk + busybox tar -xf $srcdir/musl-dev-$pkgver-r$pkgrel-$_arch-edge.apk rm .PKGINFO .SIGN.* # symlink everything from /usr/$_target/usr/* to /usr/$_target/* @@ -55,5 +55,5 @@ package_dev() { done } -sha512sums="0aa5ddaea60c3d2bceb4a0f08c02354a5bcddde59f2a6041be5270ab194d698fb5ac4a73f7bd2e28ec4b9ff1d29a4826ae2cfc7ee106ae77e81e271873ef9b2e musl-1.1.24-r9-aarch64.apk -b11d9414ab16477b6b1fbc97cd7dd222ec8a6d60fd85200d1d8159dfa70c8b5ea2875a7f138eb29b3923f9a6c1b2e02008533d83bd9855783a5f53d5649e6723 musl-dev-1.1.24-r9-aarch64.apk" +sha512sums="c0d1dca6f9269fc0d49e4d1d7b91d25e84cd43c12b83dedb13bd34f6d35c1399bb9c0e71db5259a42bac427a664c15f12d7367b058599306e0c807209b73bfc2 musl-1.2.0-r0-aarch64-edge.apk +3b5102c0a711d94d606270632173b50c8d08bdcb01cb56face242b880d4374db66fd4d82c6228e93beb9d24a5b7b3e1b28324c3ec7341d3b185b818e40c2295f musl-dev-1.2.0-r0-aarch64-edge.apk" diff --git a/cross/musl-armhf/APKBUILD b/cross/musl-armhf/APKBUILD index 75d1ef187..ebe6c56a2 100644 --- a/cross/musl-armhf/APKBUILD +++ b/cross/musl-armhf/APKBUILD @@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then fi pkgname=musl-armhf -pkgver=1.1.24 -pkgrel=9 +pkgver=1.2.0 +pkgrel=0 arch="armv7 aarch64 x86_64 x86" subpackages="musl-dev-armhf:package_dev" @@ -23,8 +23,8 @@ pkgdesc="the musl library (lib c) implementation for $_arch" _target="$(arch_to_hostspec $_arch)" source=" - musl-$pkgver-r$pkgrel-$_arch.apk::$_mirror/edge/main/$_arch/musl-$pkgver-r$pkgrel.apk - musl-dev-$pkgver-r$pkgrel-$_arch.apk::$_mirror/edge/main/$_arch/musl-dev-$pkgver-r$pkgrel.apk + musl-$pkgver-r$pkgrel-$_arch-edge.apk::$_mirror/edge/main/$_arch/musl-$pkgver-r$pkgrel.apk + musl-dev-$pkgver-r$pkgrel-$_arch-edge.apk::$_mirror/edge/main/$_arch/musl-dev-$pkgver-r$pkgrel.apk " package() { @@ -32,7 +32,7 @@ package() { cd "$pkgdir/usr/$_target" # Use 'busybox tar' to avoid 'tar: Child returned status 141' # on some machines (builds.sr.ht, gitlab-ci). See pmaports#26. - busybox tar -xf $srcdir/musl-$pkgver-r$pkgrel-$_arch.apk + busybox tar -xf $srcdir/musl-$pkgver-r$pkgrel-$_arch-edge.apk rm .PKGINFO .SIGN.* } package_dev() { @@ -40,7 +40,7 @@ package_dev() { cd "$subpkgdir/usr/$_target" # Use 'busybox tar' to avoid 'tar: Child returned status 141' # on some machines (builds.sr.ht, gitlab-ci). See pmaports#26. - busybox tar -xf $srcdir/musl-dev-$pkgver-r$pkgrel-$_arch.apk + busybox tar -xf $srcdir/musl-dev-$pkgver-r$pkgrel-$_arch-edge.apk rm .PKGINFO .SIGN.* # symlink everything from /usr/$_target/usr/* to /usr/$_target/* @@ -55,5 +55,5 @@ package_dev() { done } -sha512sums="7a7521bc71174b0b481f276b1a2b11067982e9f4639c14665ad9cca4cf2fe756b60096ce06a5a257a6ec91ad811946debae932118ea3dbad1002300fe7f681d3 musl-1.1.24-r9-armhf.apk -5ffc9367b34b6ea722007f7152ea51fe242222925aa3ea9b0f0f426d437502066685443d2decbf3475e3b92add79749e6cc7de01403ddf3a9e708aedd98e516b musl-dev-1.1.24-r9-armhf.apk" +sha512sums="e88426f6924135024c7ddb05b6a1c3ea7f5f428a67a202889fd1f3a72368ea54e54a2a441efd65b9b54ac9750dfaad8d79b2d92b02f607b8f74638de84732da6 musl-1.2.0-r0-armhf-edge.apk +a75d2eaee77d6cd89b5e015cf25b728ef215300927d0e76b1cb6f896db5e258c9f8dd207646eb26365c3d518da27538e9968498f6b4bcc1c26cfd8022b112d96 musl-dev-1.2.0-r0-armhf-edge.apk" diff --git a/cross/musl-armv7/APKBUILD b/cross/musl-armv7/APKBUILD index b00cf97a6..18e6df23a 100644 --- a/cross/musl-armv7/APKBUILD +++ b/cross/musl-armv7/APKBUILD @@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then fi pkgname=musl-armv7 -pkgver=1.1.24 -pkgrel=9 +pkgver=1.2.0 +pkgrel=0 arch="armhf aarch64 x86_64 x86" subpackages="musl-dev-armv7:package_dev" @@ -23,8 +23,8 @@ pkgdesc="the musl library (lib c) implementation for $_arch" _target="$(arch_to_hostspec $_arch)" source=" - musl-$pkgver-r$pkgrel-$_arch.apk::$_mirror/edge/main/$_arch/musl-$pkgver-r$pkgrel.apk - musl-dev-$pkgver-r$pkgrel-$_arch.apk::$_mirror/edge/main/$_arch/musl-dev-$pkgver-r$pkgrel.apk + musl-$pkgver-r$pkgrel-$_arch-edge.apk::$_mirror/edge/main/$_arch/musl-$pkgver-r$pkgrel.apk + musl-dev-$pkgver-r$pkgrel-$_arch-edge.apk::$_mirror/edge/main/$_arch/musl-dev-$pkgver-r$pkgrel.apk " package() { @@ -32,7 +32,7 @@ package() { cd "$pkgdir/usr/$_target" # Use 'busybox tar' to avoid 'tar: Child returned status 141' # on some machines (builds.sr.ht, gitlab-ci). See pmaports#26. - busybox tar -xf $srcdir/musl-$pkgver-r$pkgrel-$_arch.apk + busybox tar -xf $srcdir/musl-$pkgver-r$pkgrel-$_arch-edge.apk rm .PKGINFO .SIGN.* } package_dev() { @@ -40,7 +40,7 @@ package_dev() { cd "$subpkgdir/usr/$_target" # Use 'busybox tar' to avoid 'tar: Child returned status 141' # on some machines (builds.sr.ht, gitlab-ci). See pmaports#26. - busybox tar -xf $srcdir/musl-dev-$pkgver-r$pkgrel-$_arch.apk + busybox tar -xf $srcdir/musl-dev-$pkgver-r$pkgrel-$_arch-edge.apk rm .PKGINFO .SIGN.* # symlink everything from /usr/$_target/usr/* to /usr/$_target/* @@ -55,5 +55,5 @@ package_dev() { done } -sha512sums="7cada2cbad1cb2d5e28b2b35ba72125d6f133051a6f9718640f51cd71bef8b9db3b66c0554847cdd5781bb5fd9fcab6f2e9af3cc60583fe3332086da1e8dd18a musl-1.1.24-r9-armv7.apk -6754eabd258c2c8ab908bd3b0b461cea79c9a01822c90fc72e23a90fda0006659f99e75c92877a42d0015d2579e10bd285126bfc02219aad07101dc6ca4e2126 musl-dev-1.1.24-r9-armv7.apk" +sha512sums="58857098e6b8c1dcd9224738f56e110fe10a22ac99fd10cc82eaa2f4572c138aafc91ff11263c059053e7a2fb92e0ced46f18ff5f91802630492fb16320da987 musl-1.2.0-r0-armv7-edge.apk +5cbc6d9d276a6fbc08287dbcdb2737d227052e4d945e3c555c4db322de62113b309143ed1ec0b52d26884c6bf0d031628a97b9f48e803ca6b17c9cd40b5fef23 musl-dev-1.2.0-r0-armv7-edge.apk"