From 7a6bda3911fadee778d182e0014d223c74a111f2 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Sun, 17 Nov 2019 15:24:17 +0100 Subject: [PATCH] hybris: disable x86, x86_64 Closes #384. [ci:skip-vercheck] --- hybris/android-headers-4.4/APKBUILD | 2 +- hybris/android-headers-7.1/APKBUILD | 2 +- hybris/android-headers-9.0/APKBUILD | 2 +- hybris/drihybrisproto/APKBUILD | 2 +- hybris/hybris-base/APKBUILD | 2 +- hybris/libhybris/APKBUILD | 2 +- hybris/lxc-android/APKBUILD | 2 +- hybris/pulseaudio-modules-droid/APKBUILD | 2 +- hybris/pulsecore-private-headers/APKBUILD | 2 +- hybris/xf86-video-hwcomposer/APKBUILD | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hybris/android-headers-4.4/APKBUILD b/hybris/android-headers-4.4/APKBUILD index 840265196..eba09b908 100644 --- a/hybris/android-headers-4.4/APKBUILD +++ b/hybris/android-headers-4.4/APKBUILD @@ -3,7 +3,7 @@ _pkgname=android-headers pkgver=4.4_git20171022 _pkgver=4.4 pkgrel=0 -arch="noarch" +arch="noarch !x86 !x86_64" url="https://github.com/ubports/android-headers" license="Apache" makedepends="" diff --git a/hybris/android-headers-7.1/APKBUILD b/hybris/android-headers-7.1/APKBUILD index 9b79fb070..948149199 100644 --- a/hybris/android-headers-7.1/APKBUILD +++ b/hybris/android-headers-7.1/APKBUILD @@ -3,7 +3,7 @@ _pkgname=android-headers pkgver=7.1_git20170630 _pkgver=7.1 pkgrel=0 -arch="noarch" +arch="noarch !x86 !x86_64" url="https://github.com/Halium/android-headers" license="Apache" makedepends="" diff --git a/hybris/android-headers-9.0/APKBUILD b/hybris/android-headers-9.0/APKBUILD index 4ebb1636d..9841b7a6a 100644 --- a/hybris/android-headers-9.0/APKBUILD +++ b/hybris/android-headers-9.0/APKBUILD @@ -3,7 +3,7 @@ _pkgname=android-headers pkgver=9.0_git20190803 _pkgver=9.0 pkgrel=0 -arch="noarch" +arch="noarch !x86 !x86_64" url="https://github.com/Halium/android-headers" license="Apache" makedepends="" diff --git a/hybris/drihybrisproto/APKBUILD b/hybris/drihybrisproto/APKBUILD index fffc3faf3..09472b743 100644 --- a/hybris/drihybrisproto/APKBUILD +++ b/hybris/drihybrisproto/APKBUILD @@ -4,7 +4,7 @@ pkgrel=0 _commit="3291c0ff9af4a2568474aa7b1b0a3786818705dc" pkgdesc="X11 DRIHYBRIS protocol" url="https://github.com/NotKit/drihybris" -arch="noarch" +arch="noarch !x86 !x86_64" license="MIT" options="!check" depends="" diff --git a/hybris/hybris-base/APKBUILD b/hybris/hybris-base/APKBUILD index e1f377943..fffe2c067 100644 --- a/hybris/hybris-base/APKBUILD +++ b/hybris/hybris-base/APKBUILD @@ -7,7 +7,7 @@ url="https://postmarketos.org" license="GPL-3.0-or-later" options="!check" # libhybris cannot be built for arch x86_64 -arch="x86 armhf armv7 aarch64" +arch="armhf armv7 aarch64" depends="lxc-android libhybris libhybris-7.1 libhybris-egl libhybris-gles libhybris-libwayland-egl wayland-libs-client wayland-libs-server" subpackages="$pkgname-x11-generic:x11_generic $pkgname-x11-caf:x11_caf" diff --git a/hybris/libhybris/APKBUILD b/hybris/libhybris/APKBUILD index 53dc6525c..55eceecf3 100644 --- a/hybris/libhybris/APKBUILD +++ b/hybris/libhybris/APKBUILD @@ -1,7 +1,7 @@ pkgname=libhybris pkgver=1.0_git20191001 pkgrel=1 -arch="x86 armhf armv7 aarch64" +arch="armhf armv7 aarch64" url="https://github.com/libhybris/libhybris" license="Apache" makedepends="autoconf automake libtool wayland-dev linux-headers bsd-compat-headers diff --git a/hybris/lxc-android/APKBUILD b/hybris/lxc-android/APKBUILD index a66c3141f..e11afd1d8 100644 --- a/hybris/lxc-android/APKBUILD +++ b/hybris/lxc-android/APKBUILD @@ -1,7 +1,7 @@ pkgname=lxc-android pkgver=1.0_git20190315 pkgrel=2 -arch="noarch" +arch="noarch !x86 !x86_64" url="https://github.com/Halium/lxc-android" license="Apache" makedepends="" diff --git a/hybris/pulseaudio-modules-droid/APKBUILD b/hybris/pulseaudio-modules-droid/APKBUILD index d7d27fdc5..87b93250c 100644 --- a/hybris/pulseaudio-modules-droid/APKBUILD +++ b/hybris/pulseaudio-modules-droid/APKBUILD @@ -9,7 +9,7 @@ _pkgver=12.2.79 pkgrel=1 pkgdesc="PulseAudio Droid modules by Mer project" url="https://github.com/mer-hybris/pulseaudio-modules-droid" -arch="x86 armv7 aarch64" +arch="armv7 aarch64" license="LGPL-2.1-or-later" depends="pulseaudio" makedepends="autoconf automake libtool m4 intltool dbus-dev expat-dev pulseaudio-dev pulsecore-private-headers android-headers-7.1 android-headers-7.1-caf libhybris-dev libhybris-7.1" diff --git a/hybris/pulsecore-private-headers/APKBUILD b/hybris/pulsecore-private-headers/APKBUILD index e6e8b2960..4c1ba9436 100644 --- a/hybris/pulsecore-private-headers/APKBUILD +++ b/hybris/pulsecore-private-headers/APKBUILD @@ -5,7 +5,7 @@ pkgver=13.0 pkgrel=0 pkgdesc="PulseAudio internal development library (headers and pkg-config)" url="http://www.freedesktop.org/wiki/Software/PulseAudio" -arch="all" +arch="all !x86 !x86_64" license="LGPL-2.1-or-later" depends="pulseaudio-dev libpulse pkgconfig" options="!check" # No test suite available diff --git a/hybris/xf86-video-hwcomposer/APKBUILD b/hybris/xf86-video-hwcomposer/APKBUILD index c5c156616..0e07315ce 100644 --- a/hybris/xf86-video-hwcomposer/APKBUILD +++ b/hybris/xf86-video-hwcomposer/APKBUILD @@ -3,7 +3,7 @@ pkgver=1.0_git20190925 pkgrel=0 pkgdesc="X.Org driver for Android devices rendering through HWComposer API" url="https://github.com/NotKit/xf86-video-hwcomposer" -arch="armhf armv7 aarch64" +arch="armhf armv7 aarch64 !x86 !x86_64" license="MIT" depends="drihybris glamor-hybris" makedepends="autoconf automake util-macros libtool