From 26c675cb3da5244e718aa62fa951537197c5ed7a Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Tue, 14 Nov 2023 14:46:04 -0600 Subject: [PATCH] Fix FTBFS on !(amd64). --- debian/changelog | 6 ++++++ debian/rules | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6944618..5c27bf3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +calamares-settings-ubuntu (1:24.04.2) noble; urgency=medium + + * Fix FTBFS on !(amd64). + + -- Simon Quigley Tue, 14 Nov 2023 14:34:09 -0600 + calamares-settings-ubuntu (1:24.04.1) noble; urgency=medium * Fix Vcs-*. diff --git a/debian/rules b/debian/rules index 1012151..1eb8d5f 100755 --- a/debian/rules +++ b/debian/rules @@ -8,14 +8,21 @@ MODULES_DIR = "debian/calamares-settings-ubuntu-common/usr/lib/$(DEB_HOST_MULTIA dh $@ override_dh_auto_configure: +ifeq ($(DEB_BUILD_ARCH),amd64) cd $(PKGSELECT) && mkdir build && cd build && cmake .. +endif override_dh_auto_build: +ifeq ($(DEB_BUILD_ARCH),amd64) make; cd $(PKGSELECT)/build && $(MAKE) +endif override_dh_auto_install: +ifeq ($(DEB_BUILD_ARCH),amd64) cd $(PKGSELECT)/build && $(MAKE) DESTDIR=$(CURDIR)/debian/calamares-settings-ubuntu-common/usr/lib/$(DEB_HOST_MULTIARCH)/ install +endif + override_dh_missing: dh_missing