From 2988251cc96151ab23395f8b8348213fdfa785db Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Mon, 29 May 2017 19:30:33 +0200 Subject: [PATCH 1/5] Update *-armhf aports to pass the testcases again * gcc-armhf: has been updated upstream (minor code change without version bump) * musl-armhf: use default mirror from config instead of random other https mirror Rebuilding the packages is not required. --- gcc-armhf/APKBUILD | 4 +++- musl-armhf/APKBUILD | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gcc-armhf/APKBUILD b/gcc-armhf/APKBUILD index 722c9b700..943455709 100644 --- a/gcc-armhf/APKBUILD +++ b/gcc-armhf/APKBUILD @@ -370,7 +370,9 @@ package() { rm -f "$pkgdir"/usr/lib/libffi* "$pkgdir"/usr/share/man/man3/ffi* find "$pkgdir" -name 'ffi*.h' | xargs rm -f - mkdir -p "$pkgdir"/usr/share/gdb/python/auto-load/usr/lib + local gdblib=${_target:+$CTARGET/}lib + mkdir -p "$pkgdir"/usr/share/gdb/python/auto-load/usr/$gdblib + "$pkgdir"/usr/share/gdb/python/auto-load/usr/$gdblib/ paxmark -pmrs "$pkgdir"/$_gcclibexec/cc1 diff --git a/musl-armhf/APKBUILD b/musl-armhf/APKBUILD index b98ae1a49..5e707a661 100644 --- a/musl-armhf/APKBUILD +++ b/musl-armhf/APKBUILD @@ -7,7 +7,7 @@ pkgrel=9 subpackages="musl-dev-armhf:package_dev" _arch="armhf" -_mirror="https://mirror1.hs-esslingen.de/pub/Mirrors/alpine/" +_mirror="https://nl.alpinelinux.org/alpine/" url="https://musl-libc.org" license="MIT" From 2e0760706e429b4aca289a45159c5e9517be06c6 Mon Sep 17 00:00:00 2001 From: Mathieu Maret Date: Mon, 29 May 2017 22:32:13 +0200 Subject: [PATCH 2/5] Update qemu-user-static to package release 6 the older one is no more accessible --- qemu-user-static-repack/APKBUILD | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/qemu-user-static-repack/APKBUILD b/qemu-user-static-repack/APKBUILD index c90335a4b..159a2ab7c 100644 --- a/qemu-user-static-repack/APKBUILD +++ b/qemu-user-static-repack/APKBUILD @@ -1,7 +1,7 @@ pkgname=qemu-user-static-repack pkgver=2.8 -_debver=${pkgver}+dfsg-5+b1_amd64 -pkgrel=5 +_debver=${pkgver}+dfsg-6_amd64 +pkgrel=6 pkgdesc="QEMU user mode emulation binaries (static version)" arch=x86_64 url="https://wiki.debian.org/DebianKernel/ARMMP" @@ -18,7 +18,7 @@ unpack() { *.deb) ar x ${i##*/} || return 1 ;; esac done - + # postinst in this archive contains the binfmt information tar -xf "$srcdir/control.tar.gz" || return 1 } @@ -38,16 +38,16 @@ build() { do echo "$line" >> $_binfmtout || return 1 done - + for suffix in mask magic; do grep "_${suffix}=" postinst >> $_binfmtout || return 1 done } -binfmt() { +binfmt() { mkdir -p "$pkgdir-binfmt" install -Dm644 $_binfmtout \ "$pkgdir-binfmt/usr/share/qemu-user-binfmt.txt" || return 1 } -sha512sums="4dd4aab9a8c1040d93d0846b419b2b5b206c18cc92ec6e292ba0b8ffd347dd66ec76065e6737b4dd7c3504439d9332e1cda3865bdcd03f470330990d6cb1b6e6 qemu-user-static_2.8+dfsg-5+b1_amd64.deb" +sha512sums="fb3f2f711b7ee393b0f3ef34f6b7157483a240112d88906e13116a91c583377afae1a297b7d158c31b2e7de38a104db34dc3532e64edae5b063c5531eb56bac9 qemu-user-static_2.8+dfsg-6_amd64.deb" From 257163f220ed32a77a883c253691d4c6096f5f64 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 31 May 2017 18:18:45 +0200 Subject: [PATCH 3/5] Fix #19: gcc-armhf didn't compile anymore --- gcc-armhf/APKBUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/gcc-armhf/APKBUILD b/gcc-armhf/APKBUILD index 943455709..c202f7984 100644 --- a/gcc-armhf/APKBUILD +++ b/gcc-armhf/APKBUILD @@ -372,6 +372,7 @@ package() { local gdblib=${_target:+$CTARGET/}lib mkdir -p "$pkgdir"/usr/share/gdb/python/auto-load/usr/$gdblib + mv "$pkgdir"/usr/$gdblib/*-gdb.py \ "$pkgdir"/usr/share/gdb/python/auto-load/usr/$gdblib/ paxmark -pmrs "$pkgdir"/$_gcclibexec/cc1 From 348bceb5ceecf45698a05eda72d9092bde570b87 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 31 May 2017 18:39:42 +0200 Subject: [PATCH 4/5] New aport: unpackbootimg Useful to extract flash offsets, as described here: https://github.com/postmarketOS/pmbootstrap/wiki/How-to-find-device-specific-information --- unpackbootimg/APKBUILD | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 unpackbootimg/APKBUILD diff --git a/unpackbootimg/APKBUILD b/unpackbootimg/APKBUILD new file mode 100644 index 000000000..3018631ae --- /dev/null +++ b/unpackbootimg/APKBUILD @@ -0,0 +1,21 @@ +pkgname=unpackbootimg +pkgver="14.1" +pkgrel=1 +pkgdesc="Android bootimg (zimage + initramfs) extraction tool" +url="https://github.com/LineageOS/android_system_core" +arch="noarch" +license="APACHE2" +depends="python3" +source="$pkgname-$pkgver.py::https://raw.githubusercontent.com/LineageOS/android_system_core/cm-${pkgver}/mkbootimg/${pkgname}" +options="!check" + +build() { + cp "$srcdir"/"$pkgname"-"$pkgver".py "$srcdir"/"$pkgname" + sed -i -e 's./usr/bin/env python./usr/bin/env python3.' "$srcdir"/"$pkgname" +} + +package() { + install -Dm755 "$srcdir"/"$pkgname" "$pkgdir"/usr/bin/"$pkgname" +} + +sha512sums="b86022b3f16a6a35c68a7dd00b0ce2dcac667162f11581090bdb07d50a3ea93a74c2f493405d3d6751d40bf463c022216738ad8bcafc457dfc55e08aa5c2ed0e unpackbootimg-14.1.py" From 0554fdbccf908ad50a74757f2024f0f70067d086 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 31 May 2017 19:10:29 +0200 Subject: [PATCH 5/5] Minor aports clean up * Use MIT as license for device-* aports and symlink packages. That way we don't have the "FIXME" string in the license field, and the MIT is used by Alpine for internal packages, too. * linux-* aports: properly name the downloaded files: prefix with the package name, so it does not just have the git commit as name. --- ccache-cross-symlinks/APKBUILD | 2 +- device-lg-mako/APKBUILD | 2 +- device-samsung-i9100/APKBUILD | 2 +- gcc-cross-wrappers/APKBUILD | 2 +- linux-lg-mako/APKBUILD | 4 ++-- linux-samsung-i9100/APKBUILD | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ccache-cross-symlinks/APKBUILD b/ccache-cross-symlinks/APKBUILD index e30f95786..a50632954 100644 --- a/ccache-cross-symlinks/APKBUILD +++ b/ccache-cross-symlinks/APKBUILD @@ -7,7 +7,7 @@ pkgrel=2 pkgdesc="Enable ccache for cross-compilers with symlinks" url="https://ccache.samba.org/" arch="noarch" -license="GPL3+" +license="MIT" depends="ccache" makedepends="" source="" diff --git a/device-lg-mako/APKBUILD b/device-lg-mako/APKBUILD index a29a5bc2e..572d3c7fd 100644 --- a/device-lg-mako/APKBUILD +++ b/device-lg-mako/APKBUILD @@ -4,7 +4,7 @@ pkgrel=2 pkgdesc="Google Nexus 4" url="https://github.com/postmarketOS" arch="noarch" -license="FIXME" +license="MIT" depends="linux-lg-mako" makedepends="" install="" diff --git a/device-samsung-i9100/APKBUILD b/device-samsung-i9100/APKBUILD index b5c562bbe..ed02d3d1b 100644 --- a/device-samsung-i9100/APKBUILD +++ b/device-samsung-i9100/APKBUILD @@ -4,7 +4,7 @@ pkgrel=2 pkgdesc="Samsung Galaxy SII" url="https://github.com/postmarketOS" arch="noarch" -license="FIXME" +license="MIT" depends="linux-samsung-i9100" makedepends="" install="" diff --git a/gcc-cross-wrappers/APKBUILD b/gcc-cross-wrappers/APKBUILD index 7aeb6967e..52c37dc7f 100644 --- a/gcc-cross-wrappers/APKBUILD +++ b/gcc-cross-wrappers/APKBUILD @@ -4,7 +4,7 @@ pkgrel=1 pkgdesc="GCC wrappers pointing to cross-compilers (for distcc + ccache)" url="https://github.com/postmarketOS" arch="noarch" -license="GPL3+" +license="MIT" depends="" makedepends="" source="" diff --git a/linux-lg-mako/APKBUILD b/linux-lg-mako/APKBUILD index b35f004fe..d86d4616b 100644 --- a/linux-lg-mako/APKBUILD +++ b/linux-lg-mako/APKBUILD @@ -29,7 +29,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev" options="!strip !check !tracedeps" install= source=" - https://github.com/LineageOS/${_vendor}-kernel-mako/archive/${_hash}.zip + $pkgname-$_hash.zip::https://github.com/LineageOS/${_vendor}-kernel-mako/archive/${_hash}.zip $_config compiler-gcc6.h gpu-msm-fix-gcc5-compile.patch @@ -101,7 +101,7 @@ package() { "$pkgdir/usr/share/kernel/$_flavor/kernel.release" } -sha512sums="5a1636374ea0d2b219de5b501035e8b03935c9cf31a5c1aaa831805318d9ff780b0e13f11c73343c63c74a026c4846215ec7954a1b23740bb690b9723d5d9e11 1495bfcf93f9e0e896331f29e1850387c31d6714.zip +sha512sums="5a1636374ea0d2b219de5b501035e8b03935c9cf31a5c1aaa831805318d9ff780b0e13f11c73343c63c74a026c4846215ec7954a1b23740bb690b9723d5d9e11 linux-lg-mako-1495bfcf93f9e0e896331f29e1850387c31d6714.zip 091f0a6d604653098e3d06a834fa3d4a9c34cbdb4b742c949950bada118e58cc858dce817e763023fe7ac5dd7ae17930ef7a3de765e5b7d84b1971572dbf37a1 config-lg-mako.armhf d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc compiler-gcc6.h 7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881 gpu-msm-fix-gcc5-compile.patch" diff --git a/linux-samsung-i9100/APKBUILD b/linux-samsung-i9100/APKBUILD index 7ccbb494c..5e3f02ff4 100644 --- a/linux-samsung-i9100/APKBUILD +++ b/linux-samsung-i9100/APKBUILD @@ -38,7 +38,7 @@ findutils busybox-static" options="!strip !check !tracedeps" install= source=" - https://github.com/LineageOS/android_kernel_samsung_smdk4412/archive/${_hash}.zip + $pkgname-$_hash.zip::https://github.com/LineageOS/android_kernel_samsung_smdk4412/archive/${_hash}.zip $_config compiler-gcc6.h init @@ -125,7 +125,7 @@ package() { "$pkgdir/usr/share/kernel/$_flavor/kernel.release" } -sha512sums="28198b1312d66a1af28e112f3252aa9fbbbee8bf373776c556cdbc1c75517072a1eec6522717df0b2bc4f6b5f06b9ce07d2cb29a2de07fc56c4ea072f4d46c82 349a3e91e76d17e67ef6213e1f6712e700695631.zip +sha512sums="28198b1312d66a1af28e112f3252aa9fbbbee8bf373776c556cdbc1c75517072a1eec6522717df0b2bc4f6b5f06b9ce07d2cb29a2de07fc56c4ea072f4d46c82 linux-samsung-i9100-349a3e91e76d17e67ef6213e1f6712e700695631.zip 7ce82e81ca8d472f01f8097e3a434fe0130d66b16b29ed3d4c5ce94870fb4efe3b5e79523802b078fcdc737e5a1ee6351bc8427d1271a098eab8e9f35b95e6b1 config-samsung-i9100.armhf d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc compiler-gcc6.h dd4094d5f4ec281d32f12af88cb22a782e497c8e52f69cf60b73ac7d6171fc95f1f8040b3d0ad2ff3f016d22ac1d91c5b522e5d03203534a76742bc55a082af5 init"