Branch: master

93cb16b7 2019-06-29 10:51:05 Slávek Banko 
DEB kima: Build nvidia support only for amd64 and i386.

Signed-off-by: Slávek Banko <slavek.banko@...>
M debian/_base/applications/kima/debian/control
M debian/_base/applications/kima/debian/rules
M ubuntu/_base/applications/kima/debian/control
M ubuntu/_base/applications/kima/debian/rules

debian/_base/applications/kima/debian/control

diff --git a/debian/_base/applications/kima/debian/control b/debian/_base/applications/kima/debian/control
index 5e9671b..65856a9 100644
--- a/debian/_base/applications/kima/debian/control
+++ b/debian/_base/applications/kima/debian/control
@@ -2,7 +2,8 @@
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@...>
-Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev, libxnvctrl-dev | nvidia-settings
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev,
+ libxnvctrl-dev [amd64 i386] | nvidia-settings [amd64 i386]
 Standards-Version: 3.8.4
 
 Package: kima-trinity

debian/_base/applications/kima/debian/rules

diff --git a/debian/_base/applications/kima/debian/rules b/debian/_base/applications/kima/debian/rules
index cee2a30..5598f7f 100755
--- a/debian/_base/applications/kima/debian/rules
+++ b/debian/_base/applications/kima/debian/rules
@@ -7,6 +7,8 @@
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
+WITH_NVCONTROL = $(if $(filter $(DEB_HOST_ARCH_CPU),amd64 i386),ON,OFF)
+
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
  -DCONFIG_INSTALL_DIR="/etc/trinity" \
@@ -16,4 +18,5 @@
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
  -DCMAKE_SKIP_RPATH="OFF" \
  -DBUILD_ALL="ON" \
- -DWITH_ALL_OPTIONS="ON"
+ -DWITH_ALL_OPTIONS="ON" \
+ -DWITH_NVCONTROL="$(WITH_NVCONTROL)"

ubuntu/_base/applications/kima/debian/control

diff --git a/ubuntu/_base/applications/kima/debian/control b/ubuntu/_base/applications/kima/debian/control
index 22547bc..eb5bcef 100644
--- a/ubuntu/_base/applications/kima/debian/control
+++ b/ubuntu/_base/applications/kima/debian/control
@@ -2,7 +2,8 @@
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@...>
-Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev, libxnvctrl-dev | nvidia-settings
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev,
+ libxnvctrl-dev [amd64 i386] | nvidia-settings [amd64 i386]
 Standards-Version: 3.8.4
 
 Package: kima-trinity

ubuntu/_base/applications/kima/debian/rules

diff --git a/ubuntu/_base/applications/kima/debian/rules b/ubuntu/_base/applications/kima/debian/rules
index cee2a30..5598f7f 100755
--- a/ubuntu/_base/applications/kima/debian/rules
+++ b/ubuntu/_base/applications/kima/debian/rules
@@ -7,6 +7,8 @@
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
+WITH_NVCONTROL = $(if $(filter $(DEB_HOST_ARCH_CPU),amd64 i386),ON,OFF)
+
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
  -DCONFIG_INSTALL_DIR="/etc/trinity" \
@@ -16,4 +18,5 @@
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
  -DCMAKE_SKIP_RPATH="OFF" \
  -DBUILD_ALL="ON" \
- -DWITH_ALL_OPTIONS="ON"
+ -DWITH_ALL_OPTIONS="ON" \
+ -DWITH_NVCONTROL="$(WITH_NVCONTROL)"