From 922cc77d8961c7cc03c06290ebaaf2820d07ed33 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 2 Jul 2024 11:42:00 +0100 Subject: [PATCH 1/3] Fix building debian packages on non-clean checkouts If we leave the `.so` in place it causes the tests to fail, as it gets picked up (instead of the newly built .so) and so fails with mismatched GLIBC errors. --- docker/build_debian.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/build_debian.sh b/docker/build_debian.sh index 9eae38af919..844e8cb40e8 100644 --- a/docker/build_debian.sh +++ b/docker/build_debian.sh @@ -11,6 +11,9 @@ DIST=$(cut -d ':' -f2 <<< "${distro:?}") cp -aT /synapse/source /synapse/build cd /synapse/build +# Delete any existing `.so` files to ensure a clean build. +rm /synapse/build/synapse/*.so + # if this is a prerelease, set the Section accordingly. # # When the package is later added to the package repo, reprepro will use the From b06c597e4fd62b71a9e699f1bc1d92755aebfc5a Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 2 Jul 2024 11:43:59 +0100 Subject: [PATCH 2/3] Newsfile --- changelog.d/17390.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/17390.misc diff --git a/changelog.d/17390.misc b/changelog.d/17390.misc new file mode 100644 index 00000000000..6a4e344c5c1 --- /dev/null +++ b/changelog.d/17390.misc @@ -0,0 +1 @@ +Fix building debian packages on non-clean checkouts. From b92f20c9e0fdec88e6f6a10f52d4bfad72696e89 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 2 Jul 2024 11:48:28 +0100 Subject: [PATCH 3/3] Fix --- docker/build_debian.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/build_debian.sh b/docker/build_debian.sh index 844e8cb40e8..00e0856c7d3 100644 --- a/docker/build_debian.sh +++ b/docker/build_debian.sh @@ -12,7 +12,7 @@ cp -aT /synapse/source /synapse/build cd /synapse/build # Delete any existing `.so` files to ensure a clean build. -rm /synapse/build/synapse/*.so +rm -f /synapse/build/synapse/*.so # if this is a prerelease, set the Section accordingly. #