diff --git a/debian/changelog b/debian/changelog index 8f12bd7..85fe865 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +calamares-settings-ubuntu (1:25.10.3) questing; urgency=medium + + * Fix an FTBFS on riscv64 by disabling CGO on that platform. + * Add a "Static-Built-Using" field to the calamares-settings-ubuntu-common + binary package.. + * Add an "XS-Go-Import-Path" field to the source package. + + -- Aaron Rainbolt Sun, 17 Aug 2025 10:07:53 -0500 + calamares-settings-ubuntu (1:25.10.2) questing; urgency=medium * Revert the packageselect refactoring from Plucky, go back to the diff --git a/debian/control b/debian/control index 2c94114..d843006 100644 --- a/debian/control +++ b/debian/control @@ -4,6 +4,7 @@ Priority: optional Maintainer: Lubuntu Developers Uploaders: Simon Quigley Build-Depends: debhelper-compat (= 13), + dh-builtusing, dh-sequence-qmldeps, cmake, extra-cmake-modules, @@ -27,6 +28,7 @@ Homepage: https://code.launchpad.net/~ubuntu-qt-code/+git/calamares-settings-ubu Vcs-Browser: https://git.launchpad.net/~ubuntu-qt-code/+git/calamares-settings-ubuntu Vcs-Git: https://git.launchpad.net/~ubuntu-qt-code/+git/calamares-settings-ubuntu Rules-Requires-Root: no +XS-Go-Import-Path: github.com/snapcore/snapd Package: calamares-settings-kubuntu Architecture: all @@ -83,6 +85,7 @@ Depends: calamares (>= 3.3.13-0ubuntu4), sudo, ${misc:Depends}, ${shlibs:Depends} +Static-Built-Using: ${dh-builtusing:golang-github-snapcore-snapd-dev} Description: Common Calamares Settings This package contains the common Calamares settings for all flavors. There is also a automirror Python script to set sources based on diff --git a/debian/rules b/debian/rules index 68d59c9..4d000e1 100755 --- a/debian/rules +++ b/debian/rules @@ -13,8 +13,14 @@ export DATA_MODULES_DIR = "debian/calamares-settings-ubuntu-common-data/usr/lib/ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +# Go builds on riscv64 oftentimes fail if using CGO, see +# https://github.com/golang/go/issues/72840. +ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH),riscv64) + export CGO_ENABLED = 0 +endif + %: - dh $@ + dh $@ --with=builtusing override_dh_auto_configure: (cd $(PKGSELECT) && mkdir build && cd build && cmake ..) @@ -43,6 +49,6 @@ override_dh_missing: chmod 644 $(MODULES_DIR)/pkgselect/module.desc mkdir -pv $(USRDIR)/bin/ cp -v common/snap-seed-glue-emb/snap-seed-glue-emb $(USRDIR)/bin/snap-seed-glue-emb - mkdir -pv $(USRDIR)/libexec/ $(DATA_USRDIR)/libexec/ + mkdir -pv $(DATA_USRDIR)/libexec/ cp -v common/fixconkeys-part1 $(DATA_USRDIR)/libexec/fixconkeys-part1 cp -v common/fixconkeys-part2 $(DATA_USRDIR)/libexec/fixconkeys-part2