From dbbdf7cfa47f1710942327f78f2243e06fcac1ae Mon Sep 17 00:00:00 2001 From: Pablo Castellano Date: Wed, 4 Oct 2017 17:05:00 +0200 Subject: [PATCH] Fix #436: Clean apkbuilds (#692) * Remove empty build() functions * Remove obsolete '|| return 1' statements --- cross/binutils-aarch64/APKBUILD | 7 +++--- cross/binutils-armhf/APKBUILD | 7 +++--- cross/ccache-cross-symlinks/APKBUILD | 4 ++-- cross/qemu-user-static-repack/APKBUILD | 14 ++++++------ device/device-asus-grouper/APKBUILD | 6 +---- device/device-fairphone-fp2/APKBUILD | 6 +---- device/device-htc-ace/APKBUILD | 6 +---- device/device-htc-bravo/APKBUILD | 6 +---- device/device-huawei-angler/APKBUILD | 6 +---- device/device-lg-d855/APKBUILD | 6 +---- device/device-lg-hammerhead/APKBUILD | 6 +---- device/device-lg-lenok/APKBUILD | 6 +---- device/device-lg-mako/APKBUILD | 6 +---- device/device-motorola-titan/APKBUILD | 6 +---- device/device-oneplus-bacon/APKBUILD | 6 +---- device/device-qemu-aarch64/APKBUILD | 6 +---- device/device-qemu-amd64/APKBUILD | 6 +---- device/device-qemu-vexpress/APKBUILD | 6 +---- device/device-samsung-i9070/APKBUILD | 6 +---- device/device-samsung-i9100/APKBUILD | 6 +---- device/device-samsung-maguro/APKBUILD | 6 +---- device/device-samsung-n7100/APKBUILD | 6 +---- device/device-sony-amami/APKBUILD | 6 +---- device/device-sony-aries/APKBUILD | 6 +---- device/device-sony-castor-windy/APKBUILD | 6 +---- device/device-sony-yuga/APKBUILD | 6 +---- device/device-t2m-flame/APKBUILD | 6 +---- device/linux-asus-flo/APKBUILD | 16 ++++++-------- device/linux-asus-grouper/APKBUILD | 9 ++++---- device/linux-fairphone-fp2/APKBUILD | 14 +++++------- device/linux-htc-ace/APKBUILD | 11 +++++----- device/linux-htc-bravo/APKBUILD | 11 +++++----- device/linux-huawei-angler/APKBUILD | 9 ++++---- device/linux-huawei-y530/APKBUILD | 18 +++++++-------- device/linux-lg-d855/APKBUILD | 9 ++++---- device/linux-lg-hammerhead/APKBUILD | 14 +++++------- device/linux-lg-lenok/APKBUILD | 9 ++++---- device/linux-lg-mako/APKBUILD | 9 ++++---- device/linux-motorola-titan/APKBUILD | 11 +++++----- device/linux-oneplus-bacon/APKBUILD | 14 +++++------- device/linux-samsung-i9070/APKBUILD | 22 +++++++++---------- device/linux-samsung-i9100/APKBUILD | 16 ++++++-------- device/linux-samsung-n7100/APKBUILD | 9 ++++---- device/linux-samsung-tuna/APKBUILD | 9 ++++---- device/linux-sony-amami/APKBUILD | 11 +++++----- device/linux-sony-aries/APKBUILD | 11 +++++----- device/linux-sony-castor-windy/APKBUILD | 14 +++++------- device/linux-sony-yuga/APKBUILD | 11 +++++----- device/linux-t2m-flame/APKBUILD | 10 ++++----- firmware/firmware-adreno/APKBUILD | 6 +---- kde/dbus-nox11/APKBUILD | 9 ++++---- kde/extra-cmake-modules/APKBUILD | 8 +++---- kde/gpgme/APKBUILD | 9 ++++---- kde/phonon/APKBUILD | 10 ++++----- kde/poppler-qt5/APKBUILD | 5 ++--- maemo/gtk+2.0-maemo/APKBUILD | 19 ++++++++-------- main/dtbtool/APKBUILD | 4 ++-- main/hello-world-wrapper/APKBUILD | 4 ++-- main/hello-world/APKBUILD | 4 ++-- main/libsparse/APKBUILD | 4 ++-- main/linux-postmarketos/APKBUILD | 15 ++++++------- main/postmarketos-demos/APKBUILD | 4 ++-- .../APKBUILD | 6 +---- main/postmarketos-splash/APKBUILD | 6 +---- main/postmarketos-ui-weston/APKBUILD | 4 ++-- main/weston/APKBUILD | 10 ++++----- 66 files changed, 212 insertions(+), 352 deletions(-) diff --git a/cross/binutils-aarch64/APKBUILD b/cross/binutils-aarch64/APKBUILD index 57bd6896c..d6f5e1590 100644 --- a/cross/binutils-aarch64/APKBUILD +++ b/cross/binutils-aarch64/APKBUILD @@ -5,7 +5,7 @@ pkgname="binutils-aarch64" pkgver=2.28 -pkgrel=2 +pkgrel=3 pkgdesc="Tools necessary to build programs for aarch64 targets" url="http://www.gnu.org/software/binutils/" depends="" @@ -47,14 +47,13 @@ build() { --enable-deterministic-archives \ --disable-multilib \ --disable-werror \ - --disable-nls \ - || return 1 + --disable-nls make } package() { cd "$builddir" - make install DESTDIR="$pkgdir" || return 1 + make install DESTDIR="$pkgdir" # remove man, info folders rm -rf "$pkgdir"/usr/share diff --git a/cross/binutils-armhf/APKBUILD b/cross/binutils-armhf/APKBUILD index 4b703e74d..a0714e44b 100644 --- a/cross/binutils-armhf/APKBUILD +++ b/cross/binutils-armhf/APKBUILD @@ -5,7 +5,7 @@ pkgname="binutils-armhf" pkgver=2.28 -pkgrel=2 +pkgrel=3 pkgdesc="Tools necessary to build programs for armhf targets" url="http://www.gnu.org/software/binutils/" depends="" @@ -47,14 +47,13 @@ build() { --enable-deterministic-archives \ --disable-multilib \ --disable-werror \ - --disable-nls \ - || return 1 + --disable-nls make } package() { cd "$builddir" - make install DESTDIR="$pkgdir" || return 1 + make install DESTDIR="$pkgdir" # remove man, info folders rm -rf "$pkgdir"/usr/share diff --git a/cross/ccache-cross-symlinks/APKBUILD b/cross/ccache-cross-symlinks/APKBUILD index a50632954..af7107fbf 100644 --- a/cross/ccache-cross-symlinks/APKBUILD +++ b/cross/ccache-cross-symlinks/APKBUILD @@ -3,7 +3,7 @@ pkgname=ccache-cross-symlinks pkgver=1 -pkgrel=2 +pkgrel=3 pkgdesc="Enable ccache for cross-compilers with symlinks" url="https://ccache.samba.org/" arch="noarch" @@ -21,7 +21,7 @@ package() { for _arch in $_archs; do _hostspec="$(arch_to_hostspec $_arch)" for _bin in $_bins; do - ln -v -s /usr/bin/ccache ${_hostspec}-${_bin} || return 1 + ln -v -s /usr/bin/ccache ${_hostspec}-${_bin} done done } diff --git a/cross/qemu-user-static-repack/APKBUILD b/cross/qemu-user-static-repack/APKBUILD index 159a2ab7c..3e6f69807 100644 --- a/cross/qemu-user-static-repack/APKBUILD +++ b/cross/qemu-user-static-repack/APKBUILD @@ -1,7 +1,7 @@ pkgname=qemu-user-static-repack pkgver=2.8 _debver=${pkgver}+dfsg-6_amd64 -pkgrel=6 +pkgrel=7 pkgdesc="QEMU user mode emulation binaries (static version)" arch=x86_64 url="https://wiki.debian.org/DebianKernel/ARMMP" @@ -15,17 +15,17 @@ unpack() { cd "$srcdir" for i in $source; do case $i in - *.deb) ar x ${i##*/} || return 1 ;; + *.deb) ar x ${i##*/} ;; esac done # postinst in this archive contains the binfmt information - tar -xf "$srcdir/control.tar.gz" || return 1 + tar -xf "$srcdir/control.tar.gz" } package() { mkdir -p "$pkgdir" - tar -xJf "$srcdir"/data.tar.xz -C $pkgdir || return 1 + tar -xJf "$srcdir"/data.tar.xz -C $pkgdir return 0 } @@ -36,18 +36,18 @@ build() { "# Non-standard file format with grepped binfmt information" \ "# from Debians postinst script. Used in pmbootstrap." do - echo "$line" >> $_binfmtout || return 1 + echo "$line" >> $_binfmtout done for suffix in mask magic; do - grep "_${suffix}=" postinst >> $_binfmtout || return 1 + grep "_${suffix}=" postinst >> $_binfmtout done } binfmt() { mkdir -p "$pkgdir-binfmt" install -Dm644 $_binfmtout \ - "$pkgdir-binfmt/usr/share/qemu-user-binfmt.txt" || return 1 + "$pkgdir-binfmt/usr/share/qemu-user-binfmt.txt" } sha512sums="fb3f2f711b7ee393b0f3ef34f6b7157483a240112d88906e13116a91c583377afae1a297b7d158c31b2e7de38a104db34dc3532e64edae5b063c5531eb56bac9 qemu-user-static_2.8+dfsg-6_amd64.deb" diff --git a/device/device-asus-grouper/APKBUILD b/device/device-asus-grouper/APKBUILD index 1600ffe8f..0bcf73828 100644 --- a/device/device-asus-grouper/APKBUILD +++ b/device/device-asus-grouper/APKBUILD @@ -1,6 +1,6 @@ pkgname=device-asus-grouper pkgver=1 -pkgrel=5 +pkgrel=6 pkgdesc="Asus Nexus 7 2012 Wifi" url="https://github.com/postmarketOS" arch="noarch" @@ -12,10 +12,6 @@ subpackages="" source="deviceinfo 90-android-touch-dev.rules" options="!check" -build() { - return 0 -} - package() { install -D -m644 "$srcdir/deviceinfo" \ "$pkgdir/etc/deviceinfo" diff --git a/device/device-fairphone-fp2/APKBUILD b/device/device-fairphone-fp2/APKBUILD index 1637070ff..2919ddfcf 100644 --- a/device/device-fairphone-fp2/APKBUILD +++ b/device/device-fairphone-fp2/APKBUILD @@ -1,6 +1,6 @@ pkgname=device-fairphone-fp2 pkgver=1 -pkgrel=2 +pkgrel=3 pkgdesc="Fairphone 2" url="https://github.com/postmarketOS" arch="noarch" @@ -16,10 +16,6 @@ source=" " options="!check" -build() { - return 0 -} - package() { install -D -m644 "$srcdir"/deviceinfo \ "$pkgdir"/etc/deviceinfo diff --git a/device/device-htc-ace/APKBUILD b/device/device-htc-ace/APKBUILD index b7c6d907c..f645cb7f4 100644 --- a/device/device-htc-ace/APKBUILD +++ b/device/device-htc-ace/APKBUILD @@ -1,6 +1,6 @@ pkgname=device-htc-ace pkgver=1 -pkgrel=3 +pkgrel=4 pkgdesc="HTC Desire HD" url="https://github.com/postmarketOS" arch="noarch" @@ -16,10 +16,6 @@ source=" " options="!check" -build() { - return 0 -} - package() { install -D -m644 "$srcdir"/deviceinfo \ "$pkgdir"/etc/deviceinfo diff --git a/device/device-htc-bravo/APKBUILD b/device/device-htc-bravo/APKBUILD index 89f98014e..68553186a 100644 --- a/device/device-htc-bravo/APKBUILD +++ b/device/device-htc-bravo/APKBUILD @@ -1,6 +1,6 @@ pkgname=device-htc-bravo pkgver=1 -pkgrel=5 +pkgrel=6 pkgdesc="HTC Desire" url="https://github.com/postmarketOS" arch="noarch" @@ -16,10 +16,6 @@ source=" " options="!check" -build() { - return 0 -} - package() { install -D -m644 "$srcdir"/deviceinfo \ "$pkgdir"/etc/deviceinfo diff --git a/device/device-huawei-angler/APKBUILD b/device/device-huawei-angler/APKBUILD index 76e70275a..1b7e03bba 100644 --- a/device/device-huawei-angler/APKBUILD +++ b/device/device-huawei-angler/APKBUILD @@ -1,6 +1,6 @@ pkgname=device-huawei-angler pkgver=1 -pkgrel=3 +pkgrel=4 pkgdesc="Huawei Nexus 6P" url="https://github.com/postmarketOS" arch="noarch" @@ -20,10 +20,6 @@ source=" # See https://github.com/LineageOS/android_device_huawei_angler/blob/cm-14.1/init.angler.rc#L450 options="!check" -build() { - return 0 -} - package() { install -D -m644 "$srcdir/deviceinfo" \ "$pkgdir/etc/deviceinfo" diff --git a/device/device-lg-d855/APKBUILD b/device/device-lg-d855/APKBUILD index d134489aa..e7808a80e 100644 --- a/device/device-lg-d855/APKBUILD +++ b/device/device-lg-d855/APKBUILD @@ -1,6 +1,6 @@ pkgname=device-lg-d855 pkgver=1 -pkgrel=8 +pkgrel=9 pkgdesc="LG G3 International" url="https://github.com/postmarketOS" arch="noarch" @@ -12,10 +12,6 @@ subpackages="" source="deviceinfo 90-android-touch-dev.rules" options="!check" -build() { - return 0 -} - package() { install -D -m644 "$srcdir/deviceinfo" \ "$pkgdir/etc/deviceinfo" diff --git a/device/device-lg-hammerhead/APKBUILD b/device/device-lg-hammerhead/APKBUILD index dec5c3412..f95e23465 100644 --- a/device/device-lg-hammerhead/APKBUILD +++ b/device/device-lg-hammerhead/APKBUILD @@ -1,6 +1,6 @@ pkgname=device-lg-hammerhead pkgver=1 -pkgrel=11 +pkgrel=12 pkgdesc="Google Nexus 5" url="https://github.com/postmarketOS" arch="noarch" @@ -18,10 +18,6 @@ source=" " options="!check" -build() { - return 0 -} - package() { install -D -m644 "$srcdir"/deviceinfo \ "$pkgdir"/etc/deviceinfo diff --git a/device/device-lg-lenok/APKBUILD b/device/device-lg-lenok/APKBUILD index 72b79f481..4d7fd9321 100644 --- a/device/device-lg-lenok/APKBUILD +++ b/device/device-lg-lenok/APKBUILD @@ -1,6 +1,6 @@ pkgname=device-lg-lenok pkgver=1 -pkgrel=3 +pkgrel=4 pkgdesc="LG G Watch R" url="https://github.com/postmarketOS" arch="noarch" @@ -12,10 +12,6 @@ subpackages="" source="deviceinfo initfs-hook.sh 90-android-touch-dev.rules fb_fix.sh" options="!check" -build() { - return 0 -} - package() { install -D -m644 "$srcdir"/deviceinfo \ "$pkgdir"/etc/deviceinfo diff --git a/device/device-lg-mako/APKBUILD b/device/device-lg-mako/APKBUILD index ac6609a0d..e198a6c0c 100644 --- a/device/device-lg-mako/APKBUILD +++ b/device/device-lg-mako/APKBUILD @@ -1,6 +1,6 @@ pkgname=device-lg-mako pkgver=2 -pkgrel=11 +pkgrel=12 pkgdesc="Google Nexus 4" url="https://github.com/postmarketOS" arch="noarch" @@ -12,10 +12,6 @@ subpackages="" source="deviceinfo 90-android-touch-dev.rules profile.sh udev-v4l-hack.sh pointercal fb.modes" options="!check" -build() { - return 0 -} - package() { install -D -m644 "$srcdir"/deviceinfo \ "$pkgdir"/etc/deviceinfo diff --git a/device/device-motorola-titan/APKBUILD b/device/device-motorola-titan/APKBUILD index c78f14030..3b63b6585 100644 --- a/device/device-motorola-titan/APKBUILD +++ b/device/device-motorola-titan/APKBUILD @@ -1,6 +1,6 @@ pkgname=device-motorola-titan pkgver=1 -pkgrel=12 +pkgrel=13 pkgdesc="Motorola Moto G 2014" url="https://github.com/postmarketOS" arch="noarch" @@ -12,10 +12,6 @@ subpackages="" source="deviceinfo 90-android-touch-dev.rules profile.sh udev-v4l-hack.sh" options="!check" -build() { - return 0 -} - package() { install -D -m644 "$srcdir/deviceinfo" \ "$pkgdir/etc/deviceinfo" diff --git a/device/device-oneplus-bacon/APKBUILD b/device/device-oneplus-bacon/APKBUILD index 0fdc9c422..db7059d58 100644 --- a/device/device-oneplus-bacon/APKBUILD +++ b/device/device-oneplus-bacon/APKBUILD @@ -1,6 +1,6 @@ pkgname=device-oneplus-bacon pkgver=1 -pkgrel=3 +pkgrel=4 pkgdesc="OnePlus One" url="https://github.com/postmarketOS" arch="noarch" @@ -12,10 +12,6 @@ subpackages="" source="deviceinfo 90-android-touch-dev.rules" options="!check" -build() { - return 0 -} - package() { install -D -m644 "$srcdir"/deviceinfo \ "$pkgdir"/etc/deviceinfo diff --git a/device/device-qemu-aarch64/APKBUILD b/device/device-qemu-aarch64/APKBUILD index bca4e93d8..8fcedb5ae 100644 --- a/device/device-qemu-aarch64/APKBUILD +++ b/device/device-qemu-aarch64/APKBUILD @@ -1,6 +1,6 @@ pkgname=device-qemu-aarch64 pkgver=1 -pkgrel=3 +pkgrel=4 pkgdesc="Simulated device in qemu with vexpress soc" url="https://github.com/postmarketOS" arch="noarch" @@ -11,10 +11,6 @@ subpackages="" source="deviceinfo interfaces" options="!check" -build() { - return 0 -} - package() { install -D -m644 "$srcdir"/deviceinfo \ "$pkgdir"/etc/deviceinfo diff --git a/device/device-qemu-amd64/APKBUILD b/device/device-qemu-amd64/APKBUILD index 655aaf505..6a9918e05 100644 --- a/device/device-qemu-amd64/APKBUILD +++ b/device/device-qemu-amd64/APKBUILD @@ -1,6 +1,6 @@ pkgname=device-qemu-amd64 pkgver=1 -pkgrel=4 +pkgrel=5 pkgdesc="Simulated device in qemu with an x86 platform" url="https://github.com/postmarketOS" arch="noarch" @@ -11,10 +11,6 @@ subpackages="" source="deviceinfo interfaces" options="!check" -build() { - return 0 -} - package() { install -D -m644 "$srcdir"/deviceinfo \ "$pkgdir"/etc/deviceinfo diff --git a/device/device-qemu-vexpress/APKBUILD b/device/device-qemu-vexpress/APKBUILD index 7778d8de5..569844ae0 100644 --- a/device/device-qemu-vexpress/APKBUILD +++ b/device/device-qemu-vexpress/APKBUILD @@ -1,6 +1,6 @@ pkgname=device-qemu-vexpress pkgver=1 -pkgrel=10 +pkgrel=11 pkgdesc="Simulated device in qemu with vexpress soc" url="https://github.com/postmarketOS" arch="noarch" @@ -11,10 +11,6 @@ subpackages="" source="deviceinfo interfaces" options="!check" -build() { - return 0 -} - package() { install -D -m644 "$srcdir"/deviceinfo \ "$pkgdir"/etc/deviceinfo diff --git a/device/device-samsung-i9070/APKBUILD b/device/device-samsung-i9070/APKBUILD index 28356a111..82ce5cfe0 100644 --- a/device/device-samsung-i9070/APKBUILD +++ b/device/device-samsung-i9070/APKBUILD @@ -1,6 +1,6 @@ pkgname=device-samsung-i9070 pkgver=1 -pkgrel=11 +pkgrel=12 pkgdesc="Samsung Galaxy S Advance" url="https://github.com/postmarketOS" arch="noarch" @@ -17,10 +17,6 @@ source=" " options="!check" -build() { - return 0 -} - package() { install -D -m644 "$srcdir/deviceinfo" \ "$pkgdir/etc/deviceinfo" diff --git a/device/device-samsung-i9100/APKBUILD b/device/device-samsung-i9100/APKBUILD index e597e5492..f1cae123d 100644 --- a/device/device-samsung-i9100/APKBUILD +++ b/device/device-samsung-i9100/APKBUILD @@ -1,6 +1,6 @@ pkgname=device-samsung-i9100 pkgver=1 -pkgrel=12 +pkgrel=13 pkgdesc="Samsung Galaxy SII" url="https://github.com/postmarketOS" arch="noarch" @@ -16,10 +16,6 @@ source=" " options="!check" -build() { - return 0 -} - package() { install -D -m644 "$srcdir/deviceinfo" \ "$pkgdir/etc/deviceinfo" diff --git a/device/device-samsung-maguro/APKBUILD b/device/device-samsung-maguro/APKBUILD index ff55c070e..36c4d0f54 100644 --- a/device/device-samsung-maguro/APKBUILD +++ b/device/device-samsung-maguro/APKBUILD @@ -1,6 +1,6 @@ pkgname=device-samsung-maguro pkgver=2 -pkgrel=9 +pkgrel=10 pkgdesc="Google Galaxy Nexus (GSM)" url="https://github.com/postmarketOS" arch="noarch" @@ -16,10 +16,6 @@ source=" " options="!check" -build() { - return 0 -} - package() { install -D -m644 "$srcdir"/deviceinfo \ "$pkgdir"/etc/deviceinfo diff --git a/device/device-samsung-n7100/APKBUILD b/device/device-samsung-n7100/APKBUILD index d073f8726..09a6001c5 100644 --- a/device/device-samsung-n7100/APKBUILD +++ b/device/device-samsung-n7100/APKBUILD @@ -1,6 +1,6 @@ pkgname=device-samsung-n7100 pkgver=1 -pkgrel=8 +pkgrel=9 pkgdesc="Samsung Galaxy Note II (GSM)" url="https://github.com/postmarketOS" arch="noarch" @@ -12,10 +12,6 @@ subpackages="" source="deviceinfo 90-android-touch-dev.rules" options="!check" -build() { - return 0 -} - package() { install -D -m644 "$srcdir/deviceinfo" \ "$pkgdir/etc/deviceinfo" diff --git a/device/device-sony-amami/APKBUILD b/device/device-sony-amami/APKBUILD index bd9be0d4c..b33be1a2e 100644 --- a/device/device-sony-amami/APKBUILD +++ b/device/device-sony-amami/APKBUILD @@ -1,6 +1,6 @@ pkgname=device-sony-amami pkgver=1 -pkgrel=10 +pkgrel=11 pkgdesc="Sony Xperia Z1 Compact" url="https://github.com/postmarketOS" arch="noarch" @@ -12,10 +12,6 @@ subpackages="" source="deviceinfo 90-android-touch-dev.rules fb-workaround.sh udev-v4l-hack.sh" options="!check" -build() { - return 0 -} - package() { install -D -m644 "$srcdir/deviceinfo" \ "$pkgdir/etc/deviceinfo" diff --git a/device/device-sony-aries/APKBUILD b/device/device-sony-aries/APKBUILD index 5c5ec452a..8d571887b 100644 --- a/device/device-sony-aries/APKBUILD +++ b/device/device-sony-aries/APKBUILD @@ -1,6 +1,6 @@ pkgname=device-sony-aries pkgver=1 -pkgrel=9 +pkgrel=10 pkgdesc="Sony Xperia Z3 Compact" url="https://github.com/postmarketOS" arch="noarch" @@ -12,10 +12,6 @@ subpackages="" source="deviceinfo 90-android-touch-dev.rules fb-workaround.sh" options="!check" -build() { - return 0 -} - package() { install -D -m644 "$srcdir/deviceinfo" \ "$pkgdir/etc/deviceinfo" diff --git a/device/device-sony-castor-windy/APKBUILD b/device/device-sony-castor-windy/APKBUILD index e18e1b922..99d26ffb7 100644 --- a/device/device-sony-castor-windy/APKBUILD +++ b/device/device-sony-castor-windy/APKBUILD @@ -1,6 +1,6 @@ pkgname=device-sony-castor-windy pkgver=1 -pkgrel=6 +pkgrel=7 pkgdesc="Sony Xperia Z2 Tablet WIFI" url="https://github.com/postmarketOS" arch="noarch" @@ -12,10 +12,6 @@ subpackages="" source="modules-load.conf deviceinfo 90-android-touch-dev.rules brcmfmac4339-sdio.txt" options="!check" -build() { - return 0 -} - package() { install -D -m644 "$srcdir/deviceinfo" \ "$pkgdir/etc/deviceinfo" diff --git a/device/device-sony-yuga/APKBUILD b/device/device-sony-yuga/APKBUILD index c4ecf08f1..6fd8118c2 100644 --- a/device/device-sony-yuga/APKBUILD +++ b/device/device-sony-yuga/APKBUILD @@ -1,6 +1,6 @@ pkgname=device-sony-yuga pkgver=1 -pkgrel=2 +pkgrel=3 pkgdesc="Sony Xperia Z" url="https://github.com/postmarketOS" arch="noarch" @@ -12,10 +12,6 @@ subpackages="" source="deviceinfo 90-android-touch-dev.rules fb-workaround.sh udev-v4l-hack.sh" options="!check" -build() { - return 0 -} - package() { install -D -m644 "$srcdir/deviceinfo" \ "$pkgdir/etc/deviceinfo" diff --git a/device/device-t2m-flame/APKBUILD b/device/device-t2m-flame/APKBUILD index 849dce0fb..6b86bbe2b 100644 --- a/device/device-t2m-flame/APKBUILD +++ b/device/device-t2m-flame/APKBUILD @@ -1,6 +1,6 @@ pkgname=device-t2m-flame pkgver=1 -pkgrel=4 +pkgrel=5 pkgdesc="Mozilla Flame" url="https://github.com/postmarketOS" arch="noarch" @@ -12,10 +12,6 @@ subpackages="" source="deviceinfo 90-android-touch-dev.rules $install" options="!check" -build() { - return 0 -} - package() { install -D -m644 "$srcdir"/deviceinfo \ "$pkgdir"/etc/deviceinfo diff --git a/device/linux-asus-flo/APKBUILD b/device/linux-asus-flo/APKBUILD index 972a9f9b8..a7a87f4f7 100644 --- a/device/linux-asus-flo/APKBUILD +++ b/device/linux-asus-flo/APKBUILD @@ -9,7 +9,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=2 +pkgrel=3 arch="armhf" pkgdesc="Nexus 7 2013 WIFI mainline kernel" url="https://git.linaro.org/people/john.stultz/flo.git/log/?h=flo-v4.11" @@ -36,14 +36,14 @@ prepare() { default_prepare mkdir -p "$srcdir"/build - cp "$srcdir"/$_config "$srcdir"/build/.config || return 1 + cp "$srcdir"/$_config "$srcdir"/build/.config make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \ silentoldconfig } # this is so we can do: 'abuild menuconfig' to reconfigure kernel menuconfig() { - cd "$srcdir"/build || return 1 + cd "$srcdir"/build make ARCH="$_carch" menuconfig cp .config "$startdir"/$_config } @@ -55,25 +55,23 @@ build() { make ARCH="$_carch" CC="${CC:-gcc}" \ KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \ CFLAGS_MODULE=-fno-pic \ - zImage modules qcom-apq8064-asus-nexus7-flo.dtb \ - || return 1 + zImage modules qcom-apq8064-asus-nexus7-flo.dtb } package() { cd "$srcdir/build/arch/arm/boot" cat zImage dts/qcom-apq8064-asus-nexus7-flo.dtb > zImage-dtb - + install -Dm644 "$srcdir/build/arch/arm/boot/zImage-dtb" \ "$pkgdir/boot/vmlinuz-$_flavor" install -D "$srcdir/build/include/config/kernel.release" \ "$pkgdir/usr/share/kernel/$_flavor/kernel.release" - + cd "$srcdir"/build make -j1 modules_install \ ARCH="$_carch" \ - INSTALL_MOD_PATH="$pkgdir" \ - || return 1 + INSTALL_MOD_PATH="$pkgdir" } sha512sums="13c16e580a960c4c4ed4daf13f1939909617cb91455d1c61323ddf1b98a8f492161a6be6ddcf317dd16786c5ef4f98f77175c9972ce7aae99f7e6f0570a665b6 linux-asus-flo-26da7a1e84232d3f0fd89e2dae2e48e77db00873.tar.gz 1c32a6190d0561f2144fc5922477f24a2390464773d9100da5cd00df57639dec3071dc5c7c94ed30435c00d372c41bc40933614ccd497e394fe1d14116735eb4 config-asus-flo.armhf" diff --git a/device/linux-asus-grouper/APKBUILD b/device/linux-asus-grouper/APKBUILD index 7d9df17d2..1e262effa 100644 --- a/device/linux-asus-grouper/APKBUILD +++ b/device/linux-asus-grouper/APKBUILD @@ -20,7 +20,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=4 +pkgrel=5 arch="armhf" pkgdesc="Nexus 7 (2012) kernel from LineageOS" url="https://github.com/LineageOS/android_kernel_asus_grouper" @@ -72,7 +72,7 @@ prepare() { cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/" mkdir -p "$srcdir"/build - cp "$srcdir"/$_config "$srcdir"/build/.config || return 1 + cp "$srcdir"/$_config "$srcdir"/build/.config make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \ silentoldconfig } @@ -81,7 +81,7 @@ prepare() { # this is so we can do: 'abuild menuconfig' to reconfigure kernel menuconfig() { - cd "$srcdir"/build || return 1 + cd "$srcdir"/build make ARCH="$_carch" menuconfig cp .config "$startdir"/$_config } @@ -90,8 +90,7 @@ build() { cd "$srcdir"/build unset LDFLAGS make ARCH="$_carch" CC="${CC:-gcc}" \ - KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \ - || return 1 + KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" } package() { diff --git a/device/linux-fairphone-fp2/APKBUILD b/device/linux-fairphone-fp2/APKBUILD index 1c67a656f..603a683f5 100644 --- a/device/linux-fairphone-fp2/APKBUILD +++ b/device/linux-fairphone-fp2/APKBUILD @@ -20,7 +20,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=1 +pkgrel=2 arch="armhf" pkgdesc="LineageOS kernel for Fairphone 2" url="https://github.com/LineageOS/android_kernel_fairphone_msm8974" @@ -75,7 +75,7 @@ prepare() { cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/" mkdir -p "$srcdir"/build - cp "$srcdir"/$_config "$srcdir"/build/.config || return 1 + cp "$srcdir"/$_config "$srcdir"/build/.config echo "--[ silentoldconfig ]--" yes "" | make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \ oldconfig @@ -85,7 +85,7 @@ prepare() { # this is so we can do: 'abuild menuconfig' to reconfigure kernel menuconfig() { - cd "$srcdir"/build || return 1 + cd "$srcdir"/build echo "--[ menuconfig ]--" make ARCH="$_carch" menuconfig cp .config "$startdir"/$_config @@ -95,12 +95,11 @@ build() { cd "$srcdir"/build unset LDFLAGS make ARCH="$_carch" CC="${CC:-gcc}" \ - KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y \ - || return 1 + KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y echo "--[ Build modules ]--" make ARCH="$_carch" CC="${CC:-gcc}" \ KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y \ - modules || return 1 + modules dtbTool -s 2048 -p "scripts/dtc/" -o "arch/arm/boot/dt.img" "arch/arm/boot/" } @@ -120,8 +119,7 @@ package() { echo "--[ Installing modules ]--" make ARCH="$_carch" CC="${CC:-gcc}" \ KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y \ - INSTALL_MOD_PATH="$pkgdir" modules_install \ - || return 1 + INSTALL_MOD_PATH="$pkgdir" modules_install } sha512sums="acddc069c3e8aa5b58c82eddc6e335946695e618fe5756e81a730cbcfbba0fd256b6e46024c46a66f8551d67608edd6d55b5a7cfa8ea98b064ca1ddaa1d7238d 8c73c363d1cd11624ddda9a1ef08b9dc7a5569e4.zip diff --git a/device/linux-htc-ace/APKBUILD b/device/linux-htc-ace/APKBUILD index 56b74ba9a..817260f72 100644 --- a/device/linux-htc-ace/APKBUILD +++ b/device/linux-htc-ace/APKBUILD @@ -19,7 +19,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=3 +pkgrel=4 arch="armhf" pkgdesc="HTC Desire kernel from OpenDesireProject" url="https://github.com/OpenDesireProject/android_kernel_htc_msm7x30" @@ -67,10 +67,10 @@ prepare() { fi # gcc6 support - cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/" || return 1 + cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/" mkdir -p "$srcdir"/build - cp "$srcdir"/$_config "$srcdir"/build/.config || return 1 + cp "$srcdir"/$_config "$srcdir"/build/.config yes "" | make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \ oldconfig } @@ -79,7 +79,7 @@ prepare() { # this is so we can do: 'abuild menuconfig' to reconfigure kernel menuconfig() { - cd "$srcdir"/build || return 1 + cd "$srcdir"/build echo "--[ menuconfig ]--" make ARCH="$_carch" menuconfig cp .config "$startdir"/$_config @@ -91,8 +91,7 @@ build() { echo "--[ Build kernel + modules ]--" make ARCH="$_carch" CC="${CC:-gcc}" \ - KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \ - || return 1 + KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" } package() { diff --git a/device/linux-htc-bravo/APKBUILD b/device/linux-htc-bravo/APKBUILD index 99a0d7163..dce71d841 100644 --- a/device/linux-htc-bravo/APKBUILD +++ b/device/linux-htc-bravo/APKBUILD @@ -20,7 +20,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=4 +pkgrel=5 arch="armhf" pkgdesc="HTC Desire kernel from spezi77" url="https://github.com/spezi77/android_kernel_htc_qsd8k_3.0" @@ -67,10 +67,10 @@ prepare() { fi # gcc6 support - cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/" || return 1 + cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/" mkdir -p "$srcdir"/build - cp "$srcdir"/$_config "$srcdir"/build/.config || return 1 + cp "$srcdir"/$_config "$srcdir"/build/.config yes "" | make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \ oldconfig } @@ -79,7 +79,7 @@ prepare() { # this is so we can do: 'abuild menuconfig' to reconfigure kernel menuconfig() { - cd "$srcdir"/build || return 1 + cd "$srcdir"/build echo "--[ menuconfig ]--" make ARCH="$_carch" menuconfig cp .config "$startdir"/$_config @@ -91,8 +91,7 @@ build() { echo "--[ Build kernel + modules ]--" make ARCH="$_carch" CC="${CC:-gcc}" \ - KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \ - || return 1 + KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" } package() { diff --git a/device/linux-huawei-angler/APKBUILD b/device/linux-huawei-angler/APKBUILD index cada28500..687720581 100644 --- a/device/linux-huawei-angler/APKBUILD +++ b/device/linux-huawei-angler/APKBUILD @@ -20,7 +20,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=2 +pkgrel=3 arch="aarch64" pkgdesc="LineageOS kernel for Nexus 6P Angler" url="https://github.com/LineageOS/android_kernel_huawei_angler" @@ -71,7 +71,7 @@ prepare() { cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/" mkdir -p "$srcdir"/build - cp "$srcdir"/$_config "$srcdir"/build/.config || return 1 + cp "$srcdir"/$_config "$srcdir"/build/.config echo "--[ silentoldconfig ]--" yes "" | make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \ oldconfig @@ -81,7 +81,7 @@ prepare() { # this is so we can do: 'abuild menuconfig' to reconfigure kernel menuconfig() { - cd "$srcdir"/build || return 1 + cd "$srcdir"/build echo "--[ menuconfig ]--" make ARCH="$_carch" menuconfig cp .config "$startdir"/$_config @@ -91,8 +91,7 @@ build() { cd "$srcdir"/build unset LDFLAGS make ARCH="$_carch" CC="${CC:-gcc}" \ - KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y \ - || return 1 + KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y } package() { diff --git a/device/linux-huawei-y530/APKBUILD b/device/linux-huawei-y530/APKBUILD index 5d18403cf..2d9931e5e 100644 --- a/device/linux-huawei-y530/APKBUILD +++ b/device/linux-huawei-y530/APKBUILD @@ -21,7 +21,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=1 +pkgrel=2 arch="armhf" pkgdesc="Kernel for Huawei MSM8x1x devices" url="https://github.com/PieroV/${_repository}" @@ -78,10 +78,10 @@ prepare() { fi # gcc6 support - cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/" || return 1 + cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/" mkdir -p "$srcdir"/build - cp "$srcdir"/$_config "$srcdir"/build/.config || return 1 + cp "$srcdir"/$_config "$srcdir"/build/.config make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \ silentoldconfig } @@ -90,7 +90,7 @@ prepare() { # this is so we can do: 'abuild menuconfig' to reconfigure kernel menuconfig() { - cd "$srcdir"/build || return 1 + cd "$srcdir"/build echo "--[ menuconfig ]--" make ARCH="$_carch" menuconfig cp .config "$startdir"/$_config @@ -102,15 +102,14 @@ build() { echo "--[ Build kernel ]--" make ARCH="$_carch" CC="${CC:-gcc}" \ - KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y \ - || return 1 + KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y echo "--[ Build modules ]--" - # the 'no-pic' flag is necessary to avoid the + # the 'no-pic' flag is necessary to avoid the # error 'Unknown symbol _GLOBAL_OFFSET_TABLE_ (err 0)' when loading the module make ARCH="$_carch" CC="${CC:-gcc}" CFLAGS_MODULE="-fno-pic" \ KBUILD_BUILD_VERSION="$((pkgrel + 1))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y \ - modules || return 1 + modules echo "--[ Generate master DTB ]--" dtbTool -s 2048 -p "scripts/dtc/" -o "arch/arm/boot/dt.img" "arch/arm/boot/" @@ -134,8 +133,7 @@ package() { echo "--[ Installing modules ]--" make ARCH="$_carch" CC="${CC:-gcc}" \ KBUILD_BUILD_VERSION="$((pkgrel + 1))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y \ - INSTALL_MOD_PATH="$pkgdir" INSTALL_MOD_STRIP=1 modules_install \ - || return 1 + INSTALL_MOD_PATH="$pkgdir" INSTALL_MOD_STRIP=1 modules_install } sha512sums="b88fe4981fb35d289977c9a7ca6b041ec8d09380250485d7b3f3e1e1ef51ba500db2e1aecd222aa8c140a3b9ec5ed2fa638b68ddf446efe81f278aa8b8e7871f linux-huawei-y530-1880463bf10c4c2d2b348698614a613902184e22.tar.gz diff --git a/device/linux-lg-d855/APKBUILD b/device/linux-lg-d855/APKBUILD index 617d47366..78eb190b8 100644 --- a/device/linux-lg-d855/APKBUILD +++ b/device/linux-lg-d855/APKBUILD @@ -20,7 +20,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=5 +pkgrel=6 arch="armhf" pkgdesc="LG G3 kernel from LineageOS" url="https://github.com/LineageOS/android_kernel_lge_g3" @@ -71,7 +71,7 @@ prepare() { cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/" mkdir -p "$srcdir"/build - cp "$srcdir"/$_config "$srcdir"/build/.config || return 1 + cp "$srcdir"/$_config "$srcdir"/build/.config make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \ silentoldconfig } @@ -80,7 +80,7 @@ prepare() { # this is so we can do: 'abuild menuconfig' to reconfigure kernel menuconfig() { - cd "$srcdir"/build || return 1 + cd "$srcdir"/build make ARCH="$_carch" menuconfig cp .config "$startdir"/$_config } @@ -89,8 +89,7 @@ build() { cd "$srcdir"/build unset LDFLAGS make ARCH="$_carch" CC="${CC:-gcc}" \ - KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \ - || return 1 + KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" } package() { diff --git a/device/linux-lg-hammerhead/APKBUILD b/device/linux-lg-hammerhead/APKBUILD index e87fea627..f7e77c114 100644 --- a/device/linux-lg-hammerhead/APKBUILD +++ b/device/linux-lg-hammerhead/APKBUILD @@ -19,7 +19,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=8 +pkgrel=9 arch="armhf" pkgdesc="LineageOS kernel for Nexus 5 hammerhead" url="https://github.com/LineageOS/android_kernel_lge_hammerhead" @@ -71,7 +71,7 @@ prepare() { cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/" mkdir -p "$srcdir"/build - cp "$srcdir"/$_config "$srcdir"/build/.config || return 1 + cp "$srcdir"/$_config "$srcdir"/build/.config echo "--[ silentoldconfig ]--" yes "" | make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \ oldconfig @@ -81,7 +81,7 @@ prepare() { # this is so we can do: 'abuild menuconfig' to reconfigure kernel menuconfig() { - cd "$srcdir"/build || return 1 + cd "$srcdir"/build echo "--[ menuconfig ]--" make ARCH="$_carch" menuconfig cp .config "$startdir"/$_config @@ -91,12 +91,11 @@ build() { cd "$srcdir"/build unset LDFLAGS make ARCH="$_carch" CC="${CC:-gcc}" \ - KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y \ - || return 1 + KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y echo "--[ Build modules ]--" make ARCH="$_carch" CC="${CC:-gcc}" \ KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y \ - modules || return 1 + modules } package() { @@ -111,8 +110,7 @@ package() { echo "--[ Installing modules ]--" make ARCH="$_carch" CC="${CC:-gcc}" \ KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y \ - INSTALL_MOD_PATH="$pkgdir" INSTALL_MOD_STRIP=1 modules_install \ - || return 1 + INSTALL_MOD_PATH="$pkgdir" INSTALL_MOD_STRIP=1 modules_install } sha512sums="f02667fcdbec30f222e0be537a68de39adaee54790a7870dd406e97613f416492713c43f97685e69802acbc0628c1cb3201bb2213899988178600d6e14a4a928 linux-lg-hammerhead-1dae34efb7d2399073ca371c953aafd2ed503849.tar.gz diff --git a/device/linux-lg-lenok/APKBUILD b/device/linux-lg-lenok/APKBUILD index beef4c1f1..3934a3467 100644 --- a/device/linux-lg-lenok/APKBUILD +++ b/device/linux-lg-lenok/APKBUILD @@ -22,7 +22,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=5 +pkgrel=6 arch="armhf" pkgdesc="G Watch R kernel" url="https://github.com/Tsunamical/kernel_lge_bass-lenok" @@ -73,7 +73,7 @@ prepare() { cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/" mkdir -p "$srcdir"/build - cp "$srcdir"/$_config "$srcdir"/build/.config || return 1 + cp "$srcdir"/$_config "$srcdir"/build/.config make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \ silentoldconfig } @@ -82,7 +82,7 @@ prepare() { # this is so we can do: 'abuild menuconfig' to reconfigure kernel menuconfig() { - cd "$srcdir"/build || return 1 + cd "$srcdir"/build make ARCH="$_carch" menuconfig cp .config "$startdir"/$_config } @@ -91,8 +91,7 @@ build() { cd "$srcdir"/build unset LDFLAGS make ARCH="$_carch" CC="${CC:-gcc}" \ - KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \ - || return 1 + KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" } package() { diff --git a/device/linux-lg-mako/APKBUILD b/device/linux-lg-mako/APKBUILD index 0b2510641..c755ea7e8 100644 --- a/device/linux-lg-mako/APKBUILD +++ b/device/linux-lg-mako/APKBUILD @@ -20,7 +20,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=5 +pkgrel=6 arch="armhf" pkgdesc="Nexus 4 kernel from LineageOS" url="https://github.com/LineageOS/lge-kernel-mako" @@ -71,7 +71,7 @@ prepare() { cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/" mkdir -p "$srcdir"/build - cp "$srcdir"/$_config "$srcdir"/build/.config || return 1 + cp "$srcdir"/$_config "$srcdir"/build/.config make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \ silentoldconfig } @@ -80,7 +80,7 @@ prepare() { # this is so we can do: 'abuild menuconfig' to reconfigure kernel menuconfig() { - cd "$srcdir"/build || return 1 + cd "$srcdir"/build make ARCH="$_carch" menuconfig cp .config "$startdir"/$_config } @@ -89,8 +89,7 @@ build() { cd "$srcdir"/build unset LDFLAGS make ARCH="$_carch" CC="${CC:-gcc}" \ - KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \ - || return 1 + KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" } package() { diff --git a/device/linux-motorola-titan/APKBUILD b/device/linux-motorola-titan/APKBUILD index da96b5c6b..efc135cfe 100644 --- a/device/linux-motorola-titan/APKBUILD +++ b/device/linux-motorola-titan/APKBUILD @@ -24,7 +24,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=4 +pkgrel=5 arch="armhf" pkgdesc="Motorola Moto G 2014 kernel from LineageOS" url="https://github.com/LineageOS/android_kernel_motorola_msm8226" @@ -75,10 +75,10 @@ prepare() { fi # gcc6 support - cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/" || return 1 + cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/" mkdir -p "$srcdir"/build - cp "$srcdir"/$_config "$srcdir"/build/.config || return 1 + cp "$srcdir"/$_config "$srcdir"/build/.config make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \ silentoldconfig } @@ -87,7 +87,7 @@ prepare() { # this is so we can do: 'abuild menuconfig' to reconfigure kernel menuconfig() { - cd "$srcdir"/build || return 1 + cd "$srcdir"/build make ARCH="$_carch" menuconfig cp .config "$startdir"/$_config } @@ -97,8 +97,7 @@ build() { unset LDFLAGS make ARCH="$_carch" CC="${CC:-gcc}" \ - KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \ - || return 1 + KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" } package() { diff --git a/device/linux-oneplus-bacon/APKBUILD b/device/linux-oneplus-bacon/APKBUILD index 126b92e3b..1283d8c60 100644 --- a/device/linux-oneplus-bacon/APKBUILD +++ b/device/linux-oneplus-bacon/APKBUILD @@ -21,7 +21,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=4 +pkgrel=5 arch="armhf" pkgdesc="LineageOS 14.1 kernel for OnePlus One (bacon)" url="https://github.com/LineageOS/android_kernel_oneplus_msm8974" @@ -72,7 +72,7 @@ prepare() { cp -v "$srcdir"/compiler-gcc6.h "$ksrcdir"/include/linux/ mkdir -p "$srcdir"/build - cp "$srcdir"/$_config "$srcdir"/build/.config || return 1 + cp "$srcdir"/$_config "$srcdir"/build/.config echo "--[ silentoldconfig ]--" yes "" | make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \ @@ -81,7 +81,7 @@ prepare() { # this is so we can do `abuild menuconfig` to reconfigure kernel menuconfig() { - cd "$srcdir"/build || return 1 + cd "$srcdir"/build echo "--[ menuconfig ]--" make ARCH="$_carch" menuconfig @@ -93,13 +93,12 @@ build() { unset LDFLAGS make ARCH="$_carch" CC="${CC:-gcc}" \ - KBUILD_BUILD_VERSION="$((pkgrel + 1))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y \ - || return 1 + KBUILD_BUILD_VERSION="$((pkgrel + 1))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y echo "--[ Build modules ]--" make ARCH="$_carch" CC="${CC:-gcc}" \ KBUILD_BUILD_VERSION="$((pkgrel + 1))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y \ - modules || return 1 + modules dtbTool -s 2048 -p "scripts/dtc/" -o "arch/arm/boot/dt.img" "arch/arm/boot/" } @@ -120,8 +119,7 @@ package() { echo "--[ Installing modules ]--" make ARCH="$_carch" CC="${CC:-gcc}" \ KBUILD_BUILD_VERSION="$((pkgrel + 1))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y \ - INSTALL_MOD_PATH="$pkgdir" INSTALL_MOD_STRIP=1 modules_install \ - || return 1 + INSTALL_MOD_PATH="$pkgdir" INSTALL_MOD_STRIP=1 modules_install } sha512sums="94d0048439e70b11637a7a122e8652d4e997ee413d6e54ea0aed7f2c68e137fcc19b6784dcc0dedf0b80240ba16060634b517d5865ec6c7222e4dea44d3c059a linux-oneplus-bacon-dd65620ba04a8c6ba0e30553c9c95388daefae02.tar.gz diff --git a/device/linux-samsung-i9070/APKBUILD b/device/linux-samsung-i9070/APKBUILD index 2c2e2c227..df92d335f 100644 --- a/device/linux-samsung-i9070/APKBUILD +++ b/device/linux-samsung-i9070/APKBUILD @@ -26,7 +26,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=6 +pkgrel=7 arch="armhf" pkgdesc="Samsung Galaxy S Advance kernel from Epirex" url="https://github.com/Epirex/Samsung_STE_Kernel" @@ -83,22 +83,22 @@ prepare() { cp -v /usr/$(arch_to_hostspec $arch)/bin/busybox.static \ "$ksrcdir"/usr/u8500_initramfs_files/busybox - # use custom init script in the initramfs which loads the initramfs from + # use custom init script in the initramfs which loads the initramfs from # the kernel2 partition ("isorec") - cp -v "$srcdir"/init "$ksrcdir"/usr/u8500_initramfs_files/init || return 1 + cp -v "$srcdir"/init "$ksrcdir"/usr/u8500_initramfs_files/init # gcc6 support - cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/" || return 1 + cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/" mkdir -p "$srcdir"/build - cp "$srcdir"/$_config "$srcdir"/build/.config || return 1 + cp "$srcdir"/$_config "$srcdir"/build/.config make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \ silentoldconfig } # this is so we can do: 'abuild menuconfig' to reconfigure kernel menuconfig() { - cd "$srcdir"/build || return 1 + cd "$srcdir"/build echo "--[ menuconfig ]--" make ARCH="$_carch" menuconfig cp .config "$startdir"/$_config @@ -110,15 +110,14 @@ build() { echo "--[ Build kernel ]--" make ARCH="$_carch" CC="${CC:-gcc}" \ - KBUILD_BUILD_VERSION="$((pkgrel + 1))-Alpine" \ - || return 1 + KBUILD_BUILD_VERSION="$((pkgrel + 1))-Alpine" echo "--[ Build modules ]--" - # the 'no-pic' flag is necessary to avoid the + # the 'no-pic' flag is necessary to avoid the # error 'Unknown symbol _GLOBAL_OFFSET_TABLE_ (err 0)' when loading the module make ARCH="$_carch" CC="${CC:-gcc}" CFLAGS_MODULE="-fno-pic" \ KBUILD_BUILD_VERSION="$((pkgrel + 1))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y \ - modules || return 1 + modules } package() { @@ -135,8 +134,7 @@ package() { echo "--[ Installing modules ]--" make ARCH="$_carch" CC="${CC:-gcc}" \ KBUILD_BUILD_VERSION="$((pkgrel + 1))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y \ - INSTALL_MOD_PATH="$pkgdir" INSTALL_MOD_STRIP=1 modules_install \ - || return 1 + INSTALL_MOD_PATH="$pkgdir" INSTALL_MOD_STRIP=1 modules_install } sha512sums="bb8218d803ec27f983449a43d14df75122311609a39e5b57095f4e8933752a2699fa0d4df1674aeee7d6e3a439551dacc9af3cab26b6e3e71f0441a4f16693df linux-samsung-i9070-ac7219c4b8dcec7bc5a598d42c6be0db4aa36332.tar.gz diff --git a/device/linux-samsung-i9100/APKBUILD b/device/linux-samsung-i9100/APKBUILD index 9c7b587e8..bc19bb42b 100644 --- a/device/linux-samsung-i9100/APKBUILD +++ b/device/linux-samsung-i9100/APKBUILD @@ -24,7 +24,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=8 +pkgrel=9 arch="armhf" pkgdesc="Samsung Galaxy SII kernel from LineageOS" url="https://github.com/LineageOS/android_kernel_samsung_smdk4412" @@ -83,15 +83,14 @@ prepare() { # partition, not only when the recovery key combination was used. cd "$ksrcdir"/usr/ mv galaxys2_initramfs.list galaxys2_initramfs.list_old - grep -v "../../ramdisk" galaxys2_initramfs.list_old > galaxys2_initramfs.list \ - || return 1 - cp -v "$srcdir"/init "$ksrcdir"/usr/galaxys2_initramfs_files/init || return 1 + grep -v "../../ramdisk" galaxys2_initramfs.list_old > galaxys2_initramfs.list + cp -v "$srcdir"/init "$ksrcdir"/usr/galaxys2_initramfs_files/init # gcc6 support - cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/" || return 1 + cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/" mkdir -p "$srcdir"/build - cp "$srcdir"/$_config "$srcdir"/build/.config || return 1 + cp "$srcdir"/$_config "$srcdir"/build/.config make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \ silentoldconfig } @@ -100,7 +99,7 @@ prepare() { # this is so we can do: 'abuild menuconfig' to reconfigure kernel menuconfig() { - cd "$srcdir"/build || return 1 + cd "$srcdir"/build make ARCH="$_carch" menuconfig cp .config "$startdir"/$_config } @@ -110,8 +109,7 @@ build() { unset LDFLAGS make ARCH="$_carch" CC="${CC:-gcc}" \ - KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \ - || return 1 + KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" } package() { diff --git a/device/linux-samsung-n7100/APKBUILD b/device/linux-samsung-n7100/APKBUILD index b0a3e985e..a5045a8da 100644 --- a/device/linux-samsung-n7100/APKBUILD +++ b/device/linux-samsung-n7100/APKBUILD @@ -25,7 +25,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=3 +pkgrel=4 arch="armhf" pkgdesc="Samsung Galaxy Note II (GSM) Kernel from ParanoidNote" url="https://github.com/bigbiff/android_kernel_samsung_smdk4412" @@ -78,7 +78,7 @@ prepare() { cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/" mkdir -p "$srcdir"/build - cp "$srcdir"/$_config "$srcdir"/build/.config || return 1 + cp "$srcdir"/$_config "$srcdir"/build/.config make -k -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \ silentoldconfig } @@ -87,7 +87,7 @@ prepare() { # this is so we can do: 'abuild menuconfig' to reconfigure kernel menuconfig() { - cd "$srcdir"/build || return 1 + cd "$srcdir"/build make ARCH="$_carch" menuconfig cp .config "$startdir"/$_config } @@ -96,8 +96,7 @@ build() { cd "$srcdir"/build unset LDFLAGS make ARCH="$_carch" CC="${CC:-gcc}" \ - KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \ - || return 1 + KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" } package() { diff --git a/device/linux-samsung-tuna/APKBUILD b/device/linux-samsung-tuna/APKBUILD index 9f55670ce..42686ba9b 100644 --- a/device/linux-samsung-tuna/APKBUILD +++ b/device/linux-samsung-tuna/APKBUILD @@ -20,7 +20,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=4 +pkgrel=5 arch="armhf" pkgdesc="Nexus 4 kernel from LineageOS" url="https://github.com/LineageOS/android_kernel_samsung_tuna" @@ -72,7 +72,7 @@ prepare() { cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/" mkdir -p "$srcdir"/build - cp "$srcdir"/$_config "$srcdir"/build/.config || return 1 + cp "$srcdir"/$_config "$srcdir"/build/.config make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \ silentoldconfig } @@ -81,7 +81,7 @@ prepare() { # this is so we can do: 'abuild menuconfig' to reconfigure kernel menuconfig() { - cd "$srcdir"/build || return 1 + cd "$srcdir"/build make ARCH="$_carch" menuconfig cp .config "$startdir"/$_config } @@ -90,8 +90,7 @@ build() { cd "$srcdir"/build unset LDFLAGS make ARCH="$_carch" CC="${CC:-gcc}" \ - KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \ - || return 1 + KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" } package() { diff --git a/device/linux-sony-amami/APKBUILD b/device/linux-sony-amami/APKBUILD index 1f0910488..d980b9729 100644 --- a/device/linux-sony-amami/APKBUILD +++ b/device/linux-sony-amami/APKBUILD @@ -22,7 +22,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=7 +pkgrel=8 arch="armhf" pkgdesc="Sony Xperia Z1 Compact kernel" url="https://github.com/sonyxperiadev/kernel" @@ -70,10 +70,10 @@ prepare() { fi # gcc6 support - cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/" || return 1 + cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/" mkdir -p "$srcdir"/build - cp "$srcdir"/$_config "$srcdir"/build/.config || return 1 + cp "$srcdir"/$_config "$srcdir"/build/.config make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \ silentoldconfig } @@ -82,7 +82,7 @@ prepare() { # this is so we can do: 'abuild menuconfig' to reconfigure kernel menuconfig() { - cd "$srcdir"/build || return 1 + cd "$srcdir"/build make ARCH="$_carch" menuconfig cp .config "$startdir"/$_config } @@ -92,8 +92,7 @@ build() { unset LDFLAGS make ARCH="$_carch" CC="${CC:-gcc}" \ - KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \ - || return 1 + KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" } package() { diff --git a/device/linux-sony-aries/APKBUILD b/device/linux-sony-aries/APKBUILD index 5845f0e27..4ecc0cfac 100644 --- a/device/linux-sony-aries/APKBUILD +++ b/device/linux-sony-aries/APKBUILD @@ -22,7 +22,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=3 +pkgrel=4 arch="armhf" pkgdesc="Sony Xperia Z3 Compact kernel" url="https://github.com/sonyxperiadev/kernel" @@ -70,10 +70,10 @@ prepare() { fi # gcc6 support - cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/" || return 1 + cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/" mkdir -p "$srcdir"/build - cp "$srcdir"/$_config "$srcdir"/build/.config || return 1 + cp "$srcdir"/$_config "$srcdir"/build/.config make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \ silentoldconfig } @@ -82,7 +82,7 @@ prepare() { # this is so we can do: 'abuild menuconfig' to reconfigure kernel menuconfig() { - cd "$srcdir"/build || return 1 + cd "$srcdir"/build make ARCH="$_carch" menuconfig cp .config "$startdir"/$_config } @@ -92,8 +92,7 @@ build() { unset LDFLAGS make ARCH="$_carch" CC="${CC:-gcc}" \ - KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \ - || return 1 + KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" } package() { diff --git a/device/linux-sony-castor-windy/APKBUILD b/device/linux-sony-castor-windy/APKBUILD index 1ab5f0f4b..7c66687fb 100644 --- a/device/linux-sony-castor-windy/APKBUILD +++ b/device/linux-sony-castor-windy/APKBUILD @@ -21,7 +21,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=2 +pkgrel=3 arch="armhf" pkgdesc="Sony Xperia Z2 Tablet kernel" url="https://github.com/andersson" @@ -69,10 +69,10 @@ prepare() { fi # gcc6 support - cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/" || return 1 + cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/" mkdir -p "$srcdir"/build - cp "$srcdir"/$_config "$srcdir"/build/.config || return 1 + cp "$srcdir"/$_config "$srcdir"/build/.config make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \ silentoldconfig } @@ -81,7 +81,7 @@ prepare() { # this is so we can do: 'abuild menuconfig' to reconfigure kernel menuconfig() { - cd "$srcdir"/build || return 1 + cd "$srcdir"/build make ARCH="$_carch" menuconfig cp .config "$startdir"/$_config } @@ -92,8 +92,7 @@ build() { make ARCH="$_carch" CC="${CC:-gcc}" \ KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \ - CFLAGS_MODULE=-fno-pic \ - || return 1 + CFLAGS_MODULE=-fno-pic } package() { @@ -111,8 +110,7 @@ package() { make -j1 modules_install \ ARCH="$_carch" \ INSTALL_MOD_STRIP=1 \ - INSTALL_MOD_PATH="$pkgdir" \ - || return 1 + INSTALL_MOD_PATH="$pkgdir" } sha512sums="42e3d7ea75a2e69a7589e74409fe43f2abdee0f4cc1fcea1b138622e3845524145e4c41343abc57d71236b1e2f59715f719845fcf5e628a6c343e9b10d06942a linux-sony-castor-windy-next.tar.gz diff --git a/device/linux-sony-yuga/APKBUILD b/device/linux-sony-yuga/APKBUILD index 8f3a808c6..083db9abe 100644 --- a/device/linux-sony-yuga/APKBUILD +++ b/device/linux-sony-yuga/APKBUILD @@ -20,7 +20,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=2 +pkgrel=3 arch="armhf" pkgdesc="Sony Xperia Z kernel" url="https://github.com/LineageOS/android_kernel_sony_apq8064" @@ -71,10 +71,10 @@ prepare() { fi # gcc6 support - cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/" || return 1 + cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/" mkdir -p "$srcdir"/build - cp "$srcdir"/$_config "$srcdir"/build/.config || return 1 + cp "$srcdir"/$_config "$srcdir"/build/.config make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \ silentoldconfig } @@ -83,7 +83,7 @@ prepare() { # this is so we can do: 'abuild menuconfig' to reconfigure kernel menuconfig() { - cd "$srcdir"/build || return 1 + cd "$srcdir"/build make ARCH="$_carch" menuconfig cp .config "$startdir"/$_config } @@ -93,8 +93,7 @@ build() { unset LDFLAGS make ARCH="$_carch" CC="${CC:-gcc}" \ - KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \ - || return 1 + KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" } package() { diff --git a/device/linux-t2m-flame/APKBUILD b/device/linux-t2m-flame/APKBUILD index 99b41f0d4..f104c68c9 100644 --- a/device/linux-t2m-flame/APKBUILD +++ b/device/linux-t2m-flame/APKBUILD @@ -20,7 +20,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=6 +pkgrel=7 arch="armhf" pkgdesc="T2M flame kernel" url="https://github.com/mozilla-b2g/codeaurora_kernel_msm" @@ -76,13 +76,13 @@ prepare() { cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/" mkdir -p "$srcdir"/build - cp "$srcdir"/$_config "$srcdir"/build/.config || return 1 + cp "$srcdir"/$_config "$srcdir"/build/.config make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \ silentoldconfig } menuconfig() { - cd "$srcdir"/build || return 1 + cd "$srcdir"/build make ARCH="$_carch" menuconfig cp .config "$startdir"/$_config } @@ -92,8 +92,8 @@ build() { unset LDFLAGS make ARCH="$_carch" CC="${CC:-gcc}" \ - KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y DTC_FLAGS="-p 1024" \ - || return 1 + KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \ + CONFIG_NO_ERROR_ON_MISMATCH=y DTC_FLAGS="-p 1024" dtbTool -s 2048 -p "scripts/dtc/" -o "arch/arm/boot/dt.img" "arch/arm/boot/" } diff --git a/firmware/firmware-adreno/APKBUILD b/firmware/firmware-adreno/APKBUILD index b566452db..c66d2e722 100644 --- a/firmware/firmware-adreno/APKBUILD +++ b/firmware/firmware-adreno/APKBUILD @@ -2,7 +2,7 @@ _files="a225_pm4.fw a225_pfp.fw a225p5_pm4.fw a300_pfp.fw a300_pm4.fw a330_pfp.f pkgname=firmware-adreno pkgver=1 -pkgrel=2 +pkgrel=3 pkgdesc="Firmware for adreno gpus" url="https://github.com/TheMuppets/proprietary_vendor_sony" arch="noarch" @@ -14,10 +14,6 @@ subpackages="" for _i in $_files; do source="$source https://github.com/TheMuppets/proprietary_vendor_sony/raw/cm-14.1/shinano-common/proprietary/etc/firmware/$_i"; done options="!check" -build() { - return 0 -} - package() { mkdir -p $pkgdir/lib/firmware/postmarketos for _i in $_files; do install -D -m644 "$srcdir/$_i" "$pkgdir/lib/firmware/postmarketos/$_i"; done diff --git a/kde/dbus-nox11/APKBUILD b/kde/dbus-nox11/APKBUILD index c3075c554..01b55a82c 100644 --- a/kde/dbus-nox11/APKBUILD +++ b/kde/dbus-nox11/APKBUILD @@ -1,7 +1,7 @@ pkgbase=dbus pkgname=dbus-nox11 pkgver=1.10.18 -pkgrel=0 +pkgrel=1 pkgdesc="Freedesktop.org message bus system" provides="dbus dbus-dev dbus-doc dbus-x11" replaces="dbus dbus-dev dbus-doc dbus-x11" @@ -41,14 +41,13 @@ build() { --enable-inotify \ --disable-dnotify \ --disable-tests \ - --disable-asserts \ - || return 1 - make || return 1 + --disable-asserts + make } package() { cd "$srcdir"/$pkgbase-$pkgver - make -j1 DESTDIR="$pkgdir" install || return 1 + make -j1 DESTDIR="$pkgdir" install install -Dm755 "$srcdir"/dbus.initd "$pkgdir"/etc/init.d/dbus } diff --git a/kde/extra-cmake-modules/APKBUILD b/kde/extra-cmake-modules/APKBUILD index 970218a10..e01760650 100644 --- a/kde/extra-cmake-modules/APKBUILD +++ b/kde/extra-cmake-modules/APKBUILD @@ -1,6 +1,6 @@ pkgname=extra-cmake-modules pkgver=5.37.0 -pkgrel=0 +pkgrel=1 pkgdesc="Extra CMake modules" url="https://projects.kde.org/projects/kdesupport/extra-cmake-modules" arch="noarch" @@ -13,13 +13,13 @@ builddir="$srcdir"/${pkgname}-${pkgver}/build build() { mkdir -p "$builddir" && cd "$builddir" - cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_TESTING=OFF || return 1 - make || return 1 + cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_TESTING=OFF + make } package() { cd "$builddir" - make DESTDIR="$pkgdir" install/fast || return 1 + make DESTDIR="$pkgdir" install/fast install -Dm644 ../COPYING-CMAKE-SCRIPTS \ "$pkgdir"/usr/share/licenses/$pkgname/COPYING diff --git a/kde/gpgme/APKBUILD b/kde/gpgme/APKBUILD index 1563db491..bf82dd805 100644 --- a/kde/gpgme/APKBUILD +++ b/kde/gpgme/APKBUILD @@ -1,6 +1,6 @@ pkgname=gpgme pkgver=1.9.0 -pkgrel=0 +pkgrel=1 pkgdesc="gnupg made easy" url="http://www.gnupg.org/related_software/gpgme/" arch="all" @@ -21,14 +21,13 @@ build() { --sysconfdir=/etc \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ - --localstatedir=/var \ - || return 1 - make || return 1 + --localstatedir=/var + make } package() { cd "$builddir" - make DESTDIR="$pkgdir" install || return 1 + make DESTDIR="$pkgdir" install } sha512sums="2a33343e907d9d70cc57dc1ef4e1c01995e1030bb0db937f44435643d6abfbb1bd55d52ba241701fa702783ebf035c09941131604fd8a811474b8bee41afccc8 gpgme-1.9.0.tar.bz2" diff --git a/kde/phonon/APKBUILD b/kde/phonon/APKBUILD index b4b895475..982b9f6d9 100644 --- a/kde/phonon/APKBUILD +++ b/kde/phonon/APKBUILD @@ -1,6 +1,6 @@ pkgname=phonon pkgver=4.9.1 -pkgrel=1 +pkgrel=2 pkgdesc="KDE multimedia backend" url="http://phonon.kde.org/" arch="all" @@ -16,7 +16,7 @@ prepare() { cd "$builddir" for i in $source; do case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + *.patch) msg $i; patch -p1 -i "$srcdir"/$i ;; esac done mkdir -p "$builddir"/build @@ -31,13 +31,13 @@ build() { -DPHONON_BUILD_PHONON4QT5=ON \ -DDBUS_INTERFACES_INSTALL_DIR=/usr/share/dbus-1/interfaces \ -Wno-dev \ - "$builddir" || return 1 - make || return 1 + "$builddir" + make } package() { cd "$builddir"/build - make DESTDIR="$pkgdir" install || return 1 + make DESTDIR="$pkgdir" install } sha512sums="a1741765071a625d9b9073d9ad1571b91cf5bfce2223bd1b034828d02dc52624587a6ec5352f3702df79f6e4201007596843fbcb9f15c9b489a858200787d728 phonon-4.9.1.tar.xz" diff --git a/kde/poppler-qt5/APKBUILD b/kde/poppler-qt5/APKBUILD index f7fad961e..b86fecae2 100644 --- a/kde/poppler-qt5/APKBUILD +++ b/kde/poppler-qt5/APKBUILD @@ -1,7 +1,7 @@ pkgname=poppler-qt5 pkgdesc="Poppler Qt5 bindings" pkgver=0.57.0 -pkgrel=1 +pkgrel=2 arch="all" license="GPL" depends="poppler" @@ -26,8 +26,7 @@ build() { --enable-zlib \ --enable-poppler-glib \ --disable-poppler-qt4 \ - --enable-poppler-qt5 \ - || return 1 + --enable-poppler-qt5 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool diff --git a/maemo/gtk+2.0-maemo/APKBUILD b/maemo/gtk+2.0-maemo/APKBUILD index a9301ca0d..1efd641b4 100644 --- a/maemo/gtk+2.0-maemo/APKBUILD +++ b/maemo/gtk+2.0-maemo/APKBUILD @@ -1,6 +1,6 @@ pkgname=gtk+2.0-maemo pkgver=2.24.31 -pkgrel=1 +pkgrel=2 subpkg=gtk-update-icon-cache pkgdesc="The GTK+ Toolkit (v2)" url="http://www.gtk.org/" @@ -75,7 +75,7 @@ prepare() { *.patch | *.diff) filename=`basename "$i"` msg $filename - patch -p1 -i "$srcdir/$filename" || return 1 + patch -p1 -i "$srcdir/$filename" ;; esac done @@ -96,33 +96,32 @@ build() { --localstatedir=/var \ --with-xinput=yes \ --without-libjasper \ - --with-included-loaders=png \ - || return 1 + --with-included-loaders=png # https://bugzilla.gnome.org/show_bug.cgi?id=655517 - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool || return 1 - make || return 1 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } package() { cd "$_builddir" - make DESTDIR="$pkgdir" install || return 1 + make DESTDIR="$pkgdir" install } dev() { mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/share/ - mv "$pkgdir"/usr/share/gtk-2.0 "$subpkgdir"/usr/share/ || return 1 + mv "$pkgdir"/usr/share/gtk-2.0 "$subpkgdir"/usr/share/ default_dev replaces="gtk+2.0" mv "$pkgdir"/usr/bin/gtk-builder-convert \ "$pkgdir"/usr/bin/gtk-demo \ - "$subpkgdir"/usr/bin || return 1 + "$subpkgdir"/usr/bin } icon_cache() { depends="hicolor-icon-theme" mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/"$subpkg" "$subpkgdir"/usr/bin || return 1 + mv "$pkgdir"/usr/bin/"$subpkg" "$subpkgdir"/usr/bin } sha512sums="75b846661308d94b5236e7e1c367deabf57753792ca87e92f9769822dd5ec90e00cd8d5574adcc12162e3702e1ae6dc152278a1d218f9bd9e4d1c8dc1dd520c1 gtk+-2.24.31.tar.xz diff --git a/main/dtbtool/APKBUILD b/main/dtbtool/APKBUILD index 19b22fc60..01f544036 100644 --- a/main/dtbtool/APKBUILD +++ b/main/dtbtool/APKBUILD @@ -1,6 +1,6 @@ pkgname=dtbtool pkgver=3 -pkgrel=2 +pkgrel=3 pkgdesc="dtbtool" url="https://github.com/LineageOS/android_device_qcom_common/tree/cm-14.1/dtbtool" arch="all" @@ -15,7 +15,7 @@ build() { package() { install -D -m755 "$srcdir"/dtbTool \ - "$pkgdir"/usr/bin/dtbTool || return 1 + "$pkgdir"/usr/bin/dtbTool } sha512sums="a98b24b962be0f11c037bdf420db57621249ba52d666b162b897fe02d06bd65969e4c260d5b2e01e2f851c9649d6e19d8584126b7ea6e5070424f41d383de1a7 dtbtool.c 18dd845899a3c11f0d5ae2eefb23eedf14b7c6d2e39a1c4e59f08fd893e5b549a5e9221413d1a2b4c9ab4507fb759fd6ae419a0223a98fb737b56cb467ef3d12 Makefile" diff --git a/main/hello-world-wrapper/APKBUILD b/main/hello-world-wrapper/APKBUILD index 1d0bf69d3..e752eb119 100644 --- a/main/hello-world-wrapper/APKBUILD +++ b/main/hello-world-wrapper/APKBUILD @@ -1,6 +1,6 @@ pkgname=hello-world-wrapper pkgver=1 -pkgrel=1 +pkgrel=2 pkgdesc="Dependency test package wrapping hello-world" url="https://github.org/postmarketOS" arch="noarch" @@ -20,6 +20,6 @@ check() { package() { install -D -m755 "$srcdir"/hello-world-wrapper.sh \ - "$pkgdir"/usr/bin/hello-world-wrapper || return 1 + "$pkgdir"/usr/bin/hello-world-wrapper } sha512sums="a5c25ab16c0d98749b9cce8f347b115b44522c1d791e0ffcd248c65d25343936a542ea6b8af81a3d2e4f17e7ab9403ec44b5af679129bf0ed880dd4c5bcf7139 hello-world-wrapper.sh" diff --git a/main/hello-world/APKBUILD b/main/hello-world/APKBUILD index a3152bf60..2ed7a7001 100644 --- a/main/hello-world/APKBUILD +++ b/main/hello-world/APKBUILD @@ -1,6 +1,6 @@ pkgname=hello-world pkgver=1 -pkgrel=2 +pkgrel=3 pkgdesc="hello world program to be built in the testsuite" url="https://en.wikipedia.org/wiki/%22Hello,_World!%22_program" arch="all" @@ -25,7 +25,7 @@ check() { package() { install -D -m755 "$srcdir"/hello-world \ - "$pkgdir"/usr/bin/hello-world || return 1 + "$pkgdir"/usr/bin/hello-world } sha512sums="d5ad91600d9be3e53be4cb6e5846b0757786c947b2c0d10f612f67262fc91c148e8d73621623e259ca9dcd5e2c8ec7069cebec44165e203ea8c0133669d3382d main.c 80c32948d3254f5e4f9084d73754824e7d7d7d117770b041a1a13baf056773de265153fe518cc3e735db55b638411aa6fbd0e17b5b674dfc89e69a9391fbd3bb Makefile" diff --git a/main/libsparse/APKBUILD b/main/libsparse/APKBUILD index c8100b575..ac9024d24 100644 --- a/main/libsparse/APKBUILD +++ b/main/libsparse/APKBUILD @@ -1,6 +1,6 @@ pkgname=libsparse pkgver="1.0.0" -pkgrel=1 +pkgrel=2 pkgdesc="Android Sparse library" url="https://android.googlesource.com" arch="all" @@ -22,7 +22,7 @@ package() { cd "$srcdir"/android-simg2img-"$pkgver" for i in append2simg img2simg simg2img simg2simg simg_dump.py; do - install -D -m755 "$i" "$pkgdir"/usr/bin/"$i" || return 1 + install -D -m755 "$i" "$pkgdir"/usr/bin/"$i" done } diff --git a/main/linux-postmarketos/APKBUILD b/main/linux-postmarketos/APKBUILD index 09294711a..71e0fd4d8 100644 --- a/main/linux-postmarketos/APKBUILD +++ b/main/linux-postmarketos/APKBUILD @@ -18,7 +18,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=0 +pkgrel=1 arch="all" pkgdesc="Mainline Linux for pmOS supported chipsets (OMAP)" @@ -61,7 +61,7 @@ prepare() { cd "$ksrcdir" if [ "$_kernver" != "$pkgver" ]; then msg "Applying patch-$pkgver.xz" - unxz -c < "$srcdir"/patch-$pkgver.xz | patch -p1 -N || return 1 + unxz -c < "$srcdir"/patch-$pkgver.xz | patch -p1 -N fi # first apply patches in specified order @@ -84,7 +84,7 @@ prepare() { fi mkdir -p "$srcdir"/build - cp -v "$srcdir"/$_config "$srcdir"/build/.config || return 1 + cp -v "$srcdir"/$_config "$srcdir"/build/.config make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \ silentoldconfig } @@ -93,7 +93,7 @@ prepare() { # this is so we can do: 'abuild menuconfig' to reconfigure kernel menuconfig() { - cd "$srcdir"/build || return 1 + cd "$srcdir"/build make ARCH="$_carch" menuconfig cp .config "$startdir"/$_config } @@ -108,7 +108,7 @@ build() { package() { cd "$srcdir/build/arch/${_carch}/boot" - + if [ "$CARCH" == "aarch64" ]; then install -Dm644 "$srcdir/build/arch/${_carch}/boot/Image" \ "$pkgdir/boot/vmlinuz-$_flavor" @@ -131,8 +131,7 @@ package() { make -j1 $_install \ ARCH="$_carch" \ INSTALL_MOD_PATH="$pkgdir" \ - INSTALL_DTBS_PATH="$pkgdir/usr/share/dtb" \ - || return 1 + INSTALL_DTBS_PATH="$pkgdir/usr/share/dtb" } @@ -175,7 +174,7 @@ dev() { -o -path './scripts/*' -prune -o -type f \ \( -name 'Makefile*' -o -name 'Kconfig*' -o -name 'Kbuild*' -o \ -name '*.sh' -o -name '*.pl' -o -name '*.lds' \) \ - -print | cpio -pdm "$dir" || return 1 + -print | cpio -pdm "$dir" cp -a scripts include "$dir" find $(find arch -name include -type d -print) -type f \ | cpio -pdm "$dir" diff --git a/main/postmarketos-demos/APKBUILD b/main/postmarketos-demos/APKBUILD index beb1efb85..c78029acb 100644 --- a/main/postmarketos-demos/APKBUILD +++ b/main/postmarketos-demos/APKBUILD @@ -1,6 +1,6 @@ pkgname=postmarketos-demos pkgver=5 -pkgrel=0 +pkgrel=1 pkgdesc="Simple touch menu for a few demo programs" url="https://github.com/postmarketOS" arch="all" @@ -18,7 +18,7 @@ build() { package() { install -D -m755 "$srcdir"/postmarketos-demos \ - "$pkgdir"/usr/bin/postmarketos-demos || return 1 + "$pkgdir"/usr/bin/postmarketos-demos } sha512sums="f9093f79a1ae189637269318d7001b619d35ad68b291b7979de2f619f74bdb4cc6779dd2f98962fa1ba17b65c0d5b84dac5cd99c35b9b24fae00e65ab68d664d main.c 83d8a95e9e1e95dffa8661e547444e83e72e572dcd0c637376f678bbd20a351c4b971a315311edefeb58a4cca14fd3e586fb581a262b2d217e25092459539b98 Makefile" diff --git a/main/postmarketos-mkinitfs-hook-usb-shell/APKBUILD b/main/postmarketos-mkinitfs-hook-usb-shell/APKBUILD index 9184e05df..c5f880abc 100644 --- a/main/postmarketos-mkinitfs-hook-usb-shell/APKBUILD +++ b/main/postmarketos-mkinitfs-hook-usb-shell/APKBUILD @@ -1,6 +1,6 @@ pkgname=postmarketos-mkinitfs-hook-usb-shell pkgver=0.1.0 -pkgrel=0 +pkgrel=1 pkgdesc="Root shell in the initramfs (security hole, for debugging only)" url="https://github.com/postmarketOS" # multipath-tools: kpartx @@ -9,10 +9,6 @@ source="20-usb-shell.sh" arch="noarch" license="GPL2" -build() { - return 0 -} - package() { mkdir -p "$pkgdir"/etc/postmarketos-mkinitfs/hooks/ install -Dm644 "$srcdir"/20-usb-shell.sh \ diff --git a/main/postmarketos-splash/APKBUILD b/main/postmarketos-splash/APKBUILD index 597ae31b7..0a0c8f11b 100644 --- a/main/postmarketos-splash/APKBUILD +++ b/main/postmarketos-splash/APKBUILD @@ -1,6 +1,6 @@ pkgname=postmarketos-splash pkgver=1 -pkgrel=3 +pkgrel=4 pkgdesc="Splash screen for postmarketOS" url="https://github.com/postmarketos" arch="noarch" @@ -11,10 +11,6 @@ install="" subpackages="" source="make-splash.py config.ini https://github.com/postmarketOS/artwork/raw/master/logo/pmos.ttf" -build() { - return 0 -} - package() { install -D -m755 "$srcdir"/make-splash.py \ "$pkgdir"/usr/bin/pmos-make-splash diff --git a/main/postmarketos-ui-weston/APKBUILD b/main/postmarketos-ui-weston/APKBUILD index cdd8b2f13..d24f3fab4 100644 --- a/main/postmarketos-ui-weston/APKBUILD +++ b/main/postmarketos-ui-weston/APKBUILD @@ -1,6 +1,6 @@ pkgname=postmarketos-ui-weston pkgver=1 -pkgrel=4 +pkgrel=5 pkgdesc="Meta package for weston" url="https://github.com/postmarketOS" arch="noarch" @@ -16,7 +16,7 @@ options="!check" package() { install -D -m644 "$srcdir"/start_weston.sh \ - "$pkgdir"/etc/profile.d/start_weston.sh || return 1 + "$pkgdir"/etc/profile.d/start_weston.sh } sha512sums="432a27be3dbc83be2bee14a663d6e8c3fe1285daaeb1e08566bf1e8504cf3a680a688f15aae5c849849debe20655e01e735e1f7a3fe94bd28d083bbb0198a9f2 start_weston.sh 94a690ed8f86c23620fa437bdcae01a851dfd9d8ffa64802be53dbb6bcd4f71cd59145f45c08a45ddd85082890095610946e6baa51fb4e9dc0b982fdc5ec2dc3 postmarketos-ui-weston.post-install" diff --git a/main/weston/APKBUILD b/main/weston/APKBUILD index 86ce3bd66..d87c7f7bd 100644 --- a/main/weston/APKBUILD +++ b/main/weston/APKBUILD @@ -7,7 +7,7 @@ pkgname=weston pkgver=9999 _pkgver=3.0.0 -pkgrel=5 +pkgrel=6 _libname=lib$pkgname _libdir=$_libname-${_pkgver%%.*} pkgdesc="The reference Wayland server" @@ -77,19 +77,19 @@ libs() { _libd() { pkgdesc="Desktop shells abstraction library for libweston compositors" - mkdir -p "$subpkgdir"/usr/lib || return 1 + mkdir -p "$subpkgdir"/usr/lib mv "$pkgdir"/usr/lib/*desktop* "$subpkgdir"/usr/lib } clients() { pkgdesc="Weston example clients" - mkdir -p "$subpkgdir"/usr/bin || return 1 + mkdir -p "$subpkgdir"/usr/bin mv "$pkgdir"/usr/bin/$pkgname-* "$subpkgdir"/usr/bin } xwayland() { pkgdesc="Wayland module to run X Clients" - mkdir -p "$subpkgdir"/usr/lib/$_libdir || return 1 + mkdir -p "$subpkgdir"/usr/lib/$_libdir mv "$pkgdir"/usr/lib/$_libdir/xwayland.so \ "$subpkgdir"/usr/lib/$_libdir } @@ -130,7 +130,7 @@ _sub() { pkgdesc="Weston client: $name" ;; esac - mkdir -p "$subpkgdir"/$path || return 1 + mkdir -p "$subpkgdir"/$path mv "$pkgdir"/$path/$name "$subpkgdir"/$path } sha512sums="b824c39f2a884f6d50d607613f447090621f684c96f7d905f25f6e500dabd03ecb2b1cd1030babc193c3417223cb220103abb792437e1a5ead7229a76b5c7a58 weston-3.0.0.tar.xz