Revert "Fix FTBFS on !(amd64)."

This reverts commit 26c675cb3d.
ubuntu/noble ubuntu/1%24.04.3
Aaron Rainbolt 1 year ago
parent 26c675cb3d
commit f14cf77d43

6
debian/changelog vendored

@ -1,3 +1,9 @@
calamares-settings-ubuntu (1:24.04.3) noble; urgency=medium
* Revert a failed FTBFS fix.
-- Aaron Rainbolt <arraybolt3@gmail.com> Wed, 15 Nov 2023 17:01:22 -0600
calamares-settings-ubuntu (1:24.04.2) noble; urgency=medium calamares-settings-ubuntu (1:24.04.2) noble; urgency=medium
* Fix FTBFS on !(amd64). * Fix FTBFS on !(amd64).

7
debian/rules vendored

@ -8,21 +8,14 @@ MODULES_DIR = "debian/calamares-settings-ubuntu-common/usr/lib/$(DEB_HOST_MULTIA
dh $@ dh $@
override_dh_auto_configure: override_dh_auto_configure:
ifeq ($(DEB_BUILD_ARCH),amd64)
cd $(PKGSELECT) && mkdir build && cd build && cmake .. cd $(PKGSELECT) && mkdir build && cd build && cmake ..
endif
override_dh_auto_build: override_dh_auto_build:
ifeq ($(DEB_BUILD_ARCH),amd64)
make; make;
cd $(PKGSELECT)/build && $(MAKE) cd $(PKGSELECT)/build && $(MAKE)
endif
override_dh_auto_install: 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 cd $(PKGSELECT)/build && $(MAKE) DESTDIR=$(CURDIR)/debian/calamares-settings-ubuntu-common/usr/lib/$(DEB_HOST_MULTIARCH)/ install
endif
override_dh_missing: override_dh_missing:
dh_missing dh_missing

Loading…
Cancel
Save