Your message dated Sun, 21 Apr 2024 09:21:11 +0000
with message-id <[email protected]>
and subject line Bug#1069578: fixed in mir 2.14.1-6
has caused the Debian Bug report #1069578,
regarding mir FTCBFS: runs host arch code
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
1069578: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1069578
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: mir
Version: 2.14.1-5
Tags: patch
User: [email protected]
Usertags: ftcbfs
mir fails to cross build from source as it fails running the built
mir_wayland_generator. This is a typical problem for cmake based
projects as cmake has very little idea of what a build architecture is
or what a native executable is. mir_wayland_generator happens to be
installed into libmirwayland-bin and that's what should be used during a
cross build. I'm attaching a patch implementing this and it is
conditional to the cross build profile in order to not affect native
builds. While at it, I noticed that the noinsttest build profile FTBFS
and I think mir-wlcs-integration should also be disabled by that
profile. I'm attaching a patch for your convenience.
Helmut
diff --minimal -Nru mir-2.14.1/debian/changelog mir-2.14.1/debian/changelog
--- mir-2.14.1/debian/changelog 2024-03-23 07:29:01.000000000 +0100
+++ mir-2.14.1/debian/changelog 2024-04-19 11:04:42.000000000 +0200
@@ -1,3 +1,12 @@
+mir (2.14.1-5.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Improve cross building: Use packages mir_wayland_generator during cross
+ builds. (Closes: #-1)
+ * Fix noinsttest build profile: skip package mir-wlcs-integration.
+
+ -- Helmut Grohne <[email protected]> Fri, 19 Apr 2024 11:04:42 +0200
+
mir (2.14.1-5) unstable; urgency=medium
[ Matthias Klose ]
diff --minimal -Nru mir-2.14.1/debian/control mir-2.14.1/debian/control
--- mir-2.14.1/debian/control 2024-02-28 21:03:56.000000000 +0100
+++ mir-2.14.1/debian/control 2024-04-19 11:04:42.000000000 +0200
@@ -27,6 +27,7 @@
libglm-dev,
libgoogle-glog-dev,
liblttng-ust-dev,
+ libmirwayland-bin <cross>,
libxkbcommon-dev (>= 0.5),
libumockdev-dev (>= 0.6) <!noinsttest>,
umockdev (>= 0.8.7) <!noinsttest>,
@@ -238,6 +239,7 @@
Package: mir-wlcs-integration
Architecture: linux-any
+Build-Profiles: <!noinsttest>
Pre-Depends: ${misc:Pre-Depends}
Breaks: mir-test-tools (<< 2.0.0.0+dev148~)
Replaces: mir-test-tools (<< 2.0.0.0+dev148~)
diff --minimal -Nru mir-2.14.1/debian/patches/cross.patch
mir-2.14.1/debian/patches/cross.patch
--- mir-2.14.1/debian/patches/cross.patch 1970-01-01 01:00:00.000000000
+0100
+++ mir-2.14.1/debian/patches/cross.patch 2024-04-19 11:04:42.000000000
+0200
@@ -0,0 +1,43 @@
+--- mir-2.14.1.orig/cmake/MirCommon.cmake
++++ mir-2.14.1/cmake/MirCommon.cmake
+@@ -310,6 +310,14 @@
+ add_dependencies(${DEPENDENT_TARGET} ${TARGET_NAME})
+ endfunction()
+
++set(
++ MIR_WAYLAND_GENERATOR_EXECUTABLE
++ "${CMAKE_BINARY_DIR}/bin/mir_wayland_generator"
++ CACHE
++ STRING
++ "Location of an externally supplied mir_wayland_generator executable"
++)
++
+ function (mir_generate_protocol_wrapper TARGET_NAME NAME_PREFIX PROTOCOL_FILE)
+ if (NAME_PREFIX STREQUAL "")
+ set(NAME_PREFIX "@") # won't match anything
+@@ -322,9 +330,9 @@
+ OUTPUT "${OUTPUT_PATH_HEADER}" "${OUTPUT_PATH_SRC}"
+ VERBATIM
+ COMMAND "sh" "-c"
+- "${CMAKE_BINARY_DIR}/bin/mir_wayland_generator ${NAME_PREFIX}
${PROTOCOL_PATH} header > ${OUTPUT_PATH_HEADER}"
++ "${MIR_WAYLAND_GENERATOR_EXECUTABLE} ${NAME_PREFIX} ${PROTOCOL_PATH}
header > ${OUTPUT_PATH_HEADER}"
+ COMMAND "sh" "-c"
+- "${CMAKE_BINARY_DIR}/bin/mir_wayland_generator ${NAME_PREFIX}
${PROTOCOL_PATH} source > ${OUTPUT_PATH_SRC}"
++ "${MIR_WAYLAND_GENERATOR_EXECUTABLE} ${NAME_PREFIX} ${PROTOCOL_PATH}
source > ${OUTPUT_PATH_SRC}"
+ DEPENDS mir_wayland_generator "${PROTOCOL_PATH}"
+ )
+ target_sources("${TARGET_NAME}" PRIVATE "${OUTPUT_PATH_HEADER}"
"${OUTPUT_PATH_SRC}")
+--- mir-2.14.1.orig/tests/acceptance-tests/wayland-generator/CMakeLists.txt
++++ mir-2.14.1/tests/acceptance-tests/wayland-generator/CMakeLists.txt
+@@ -5,9 +5,9 @@
+ OUTPUT "${GENERATED_HEADER}" "${GENERATED_SRC}"
+ VERBATIM
+ COMMAND "sh" "-c"
+- "${CMAKE_BINARY_DIR}/bin/mir_wayland_generator wl_ ${PROTOCOL_PATH} header
> ${GENERATED_HEADER}"
++ "${MIR_WAYLAND_GENERATOR_EXECUTABLE} wl_ ${PROTOCOL_PATH} header >
${GENERATED_HEADER}"
+ COMMAND "sh" "-c"
+- "${CMAKE_BINARY_DIR}/bin/mir_wayland_generator wl_ ${PROTOCOL_PATH} source
> ${GENERATED_SRC}"
++ "${MIR_WAYLAND_GENERATOR_EXECUTABLE} wl_ ${PROTOCOL_PATH} source >
${GENERATED_SRC}"
+ DEPENDS mir_wayland_generator "${PROTOCOL_PATH}"
+ )
+ add_custom_target(wayland_generator_test_generated_files ALL DEPENDS
"${GENERATED_SRC}" "${GENERATED_HEADER}")
diff --minimal -Nru mir-2.14.1/debian/patches/series
mir-2.14.1/debian/patches/series
--- mir-2.14.1/debian/patches/series 2024-03-23 07:29:01.000000000 +0100
+++ mir-2.14.1/debian/patches/series 2024-04-19 10:57:39.000000000 +0200
@@ -1,3 +1,4 @@
1002_arch-indep-only-install-target.patch
2002_dont-dpkg-gensymbols-by-upstream.patch
2001_time64.patch
+cross.patch
diff --minimal -Nru mir-2.14.1/debian/rules mir-2.14.1/debian/rules
--- mir-2.14.1/debian/rules 2024-02-28 21:03:54.000000000 +0100
+++ mir-2.14.1/debian/rules 2024-04-19 11:04:38.000000000 +0200
@@ -73,6 +73,10 @@
COMMON_CONFIGURE_OPTIONS += -DMIR_ENABLE_TESTS=OFF
endif
+ifneq (,$(filter cross,$(DEB_BUILD_PROFILES)))
+ COMMON_CONFIGURE_OPTIONS +=
-DMIR_WAYLAND_GENERATOR_EXECUTABLE=/usr/bin/mir_wayland_generator
+endif
+
# We can't guarantee non-Ubuntu builds will build against WLCS packages we
# control, so disable it on non-Ubuntu builds
#ifeq ($(filter Ubuntu,$(DEB_VENDOR)),)
--- End Message ---
--- Begin Message ---
Source: mir
Source-Version: 2.14.1-6
Done: Mike Gabriel <[email protected]>
We believe that the bug you reported is fixed in the latest version of
mir, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Mike Gabriel <[email protected]> (supplier of updated mir package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Sun, 21 Apr 2024 10:25:29 +0200
Source: mir
Architecture: source
Version: 2.14.1-6
Distribution: unstable
Urgency: medium
Maintainer: Debian Mir Team <[email protected]>
Changed-By: Mike Gabriel <[email protected]>
Closes: 1069578
Changes:
mir (2.14.1-6) unstable; urgency=medium
.
[ Helmut Grohne ]
* debian/:
+ Improve cross building: Use packages mir_wayland_generator during cross
builds. (Closes: #1069578)
* debian/control:
+ Fix noinsttest build profile: skip package mir-wlcs-integration.
.
[ Mike Gabriel ]
* debian/control:
+ Bump Standards-Version to 4.7.0. No changes needed.
Checksums-Sha1:
a7929839f570c033433249b778095f9934e1efef 6168 mir_2.14.1-6.dsc
83594765dd7d7b9f98161731e29c0e265dfd45a2 40816 mir_2.14.1-6.debian.tar.xz
cc4676cfad6750906b70b8d13c470015f6a75ddf 15579 mir_2.14.1-6_source.buildinfo
Checksums-Sha256:
2e89c33e6059fa831cb6232c3da5fa94785c809362342e0b8e6b71a4d020896f 6168
mir_2.14.1-6.dsc
cac21b2e882e885ebf43034b53782326210b0f3e331c965b2d90fbb282f53855 40816
mir_2.14.1-6.debian.tar.xz
f09a3bf7f363f1458edb4c3b8112ff01b9052532fff07dd1c7a0c62ce32d9f85 15579
mir_2.14.1-6_source.buildinfo
Files:
c96d7a27888b3c3241ebf7acfefd9660 6168 x11 optional mir_2.14.1-6.dsc
3ae95ff721994bb72552cca64e3666e9 40816 x11 optional mir_2.14.1-6.debian.tar.xz
d28d1096c67b93b54d71fbab8d88f17c 15579 x11 optional
mir_2.14.1-6_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQJJBAEBCAAzFiEEm/uu6GwKpf+/IgeCmvRrMCV3GzEFAmYk1e4VHHN1bndlYXZl
ckBkZWJpYW4ub3JnAAoJEJr0azAldxsxai0P/2JuIW35D4f8uHZQYWfOc2WoU7vI
y5dH464aqEE1mU2CQe7QvBh0o9MKBf3Isrdqu+9fYZtAesaqvm2iMLjk5ecchBXg
3vqsNkJKjNOPNtMKAjv9yMilzlDHySvuYvY1hDgg8P6s4XhSBXY7Gat1RLNCjeoS
UIc98GVx7ukdwo8zJ7krZMA3l4T5/oY3OT8hyVhsX4W9u4Fxm+g0NekKw2621+4i
d5RkE5onM93Kf/9IoqLrRrgfJx77ulE7tacM5djRhp9YQDnKgv5co9DQwG2WkAR6
NB2xNVhHHX1TrgTCxBttvknysoqZCru/zCsKlPc74x8hKnVTSPhMCIIYb/t25svB
Cb9DgmNeUQhqra47hRmvhmEU9UkssyKjEbhowEYVTNk1gT683bp0+p8SseZSi1Ts
qwZ+xFdsDjNshY+S2Nv52hOMxi/s78DZBGVuoTbKaUWzkz7AKQqczYFFQuW14Qho
ai256aAlu+zYwpsmGf0hwmkwDZ9Xsxu8vQV9SlgtEvEG2nx+TgD0/UuKmLvRe09U
le5jiW5ePY2922f95TZ+ZeM5O9pZHwLCB0x6U2yCBgWGxUxgYv7Rj9Ad7F2/6kMa
XGTjymXaoWevxAD9wq/RfWkhbp5QVYSljdMuPtxHYPH5rw6urQP0lD7emKflzr1Y
R13ZZfS/QbJq7HWa
=JTyK
-----END PGP SIGNATURE-----
pgpPZUg7Iody4.pgp
Description: PGP signature
--- End Message ---
