mirror of
https://git.launchpad.net/~ubuntu-qt-code/+git/calamares-settings-ubuntu
synced 2025-09-09 06:14:05 +00:00
Fix Go-related FTBFS.
This commit is contained in:
parent
214d83e0bc
commit
69a33c1fe9
9
debian/changelog
vendored
9
debian/changelog
vendored
@ -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 <arraybolt3@ubuntu.com> Sun, 17 Aug 2025 10:07:53 -0500
|
||||||
|
|
||||||
calamares-settings-ubuntu (1:25.10.2) questing; urgency=medium
|
calamares-settings-ubuntu (1:25.10.2) questing; urgency=medium
|
||||||
|
|
||||||
* Revert the packageselect refactoring from Plucky, go back to the
|
* Revert the packageselect refactoring from Plucky, go back to the
|
||||||
|
3
debian/control
vendored
3
debian/control
vendored
@ -4,6 +4,7 @@ Priority: optional
|
|||||||
Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
|
Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
|
||||||
Uploaders: Simon Quigley <tsimonq2@ubuntu.com>
|
Uploaders: Simon Quigley <tsimonq2@ubuntu.com>
|
||||||
Build-Depends: debhelper-compat (= 13),
|
Build-Depends: debhelper-compat (= 13),
|
||||||
|
dh-builtusing,
|
||||||
dh-sequence-qmldeps,
|
dh-sequence-qmldeps,
|
||||||
cmake,
|
cmake,
|
||||||
extra-cmake-modules,
|
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-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
|
Vcs-Git: https://git.launchpad.net/~ubuntu-qt-code/+git/calamares-settings-ubuntu
|
||||||
Rules-Requires-Root: no
|
Rules-Requires-Root: no
|
||||||
|
XS-Go-Import-Path: github.com/snapcore/snapd
|
||||||
|
|
||||||
Package: calamares-settings-kubuntu
|
Package: calamares-settings-kubuntu
|
||||||
Architecture: all
|
Architecture: all
|
||||||
@ -83,6 +85,7 @@ Depends: calamares (>= 3.3.13-0ubuntu4),
|
|||||||
sudo,
|
sudo,
|
||||||
${misc:Depends},
|
${misc:Depends},
|
||||||
${shlibs:Depends}
|
${shlibs:Depends}
|
||||||
|
Static-Built-Using: ${dh-builtusing:golang-github-snapcore-snapd-dev}
|
||||||
Description: Common Calamares Settings
|
Description: Common Calamares Settings
|
||||||
This package contains the common Calamares settings for all flavors.
|
This package contains the common Calamares settings for all flavors.
|
||||||
There is also a automirror Python script to set sources based on
|
There is also a automirror Python script to set sources based on
|
||||||
|
10
debian/rules
vendored
10
debian/rules
vendored
@ -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)
|
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:
|
override_dh_auto_configure:
|
||||||
(cd $(PKGSELECT) && mkdir build && cd build && cmake ..)
|
(cd $(PKGSELECT) && mkdir build && cd build && cmake ..)
|
||||||
@ -43,6 +49,6 @@ override_dh_missing:
|
|||||||
chmod 644 $(MODULES_DIR)/pkgselect/module.desc
|
chmod 644 $(MODULES_DIR)/pkgselect/module.desc
|
||||||
mkdir -pv $(USRDIR)/bin/
|
mkdir -pv $(USRDIR)/bin/
|
||||||
cp -v common/snap-seed-glue-emb/snap-seed-glue-emb $(USRDIR)/bin/snap-seed-glue-emb
|
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-part1 $(DATA_USRDIR)/libexec/fixconkeys-part1
|
||||||
cp -v common/fixconkeys-part2 $(DATA_USRDIR)/libexec/fixconkeys-part2
|
cp -v common/fixconkeys-part2 $(DATA_USRDIR)/libexec/fixconkeys-part2
|
||||||
|
Loading…
x
Reference in New Issue
Block a user