From 666a42f40faafdaf8c4bda8ca8000507997a05cf Mon Sep 17 00:00:00 2001 From: Petr Krasnoshchekov Date: Thu, 12 Dec 2024 11:50:28 +0500 Subject: [PATCH 1/2] Backport to Bullseye * Fix building with libwebsockets16 * Add Jenkinsfile --- Jenkinsfile | 2 ++ debian/changelog | 8 ++++++++ debian/source/format | 1 - src/CMakeLists.txt | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 Jenkinsfile delete mode 100644 debian/source/format diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 00000000..55d7b46b --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,2 @@ +buildDebChroot defaultTargets: 'bullseye-armhf bullseye-arm64', + customReleaseBranchPattern: 'wb' diff --git a/debian/changelog b/debian/changelog index 6b1f54db..a8547d1e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +mosquitto (2.0.20-1-wb100) stable; urgency=medium + + * Backport to Bullseye + * Fix building with libwebsockets16 + * Add Jenkinsfile + + -- Petr Krasnoshchekov Thu, 12 Dec 2024 11:47:06 +0500 + mosquitto (2.0.20-1) unstable; urgency=medium * Team upload. diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 163aaf8d..00000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dce8313f..9380a046 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -200,7 +200,7 @@ if (WITH_WEBSOCKETS) link_directories(${mosquitto_SOURCE_DIR}) endif (WIN32) else (STATIC_WEBSOCKETS) - set (MOSQ_LIBS ${MOSQ_LIBS} websockets_shared) + set (MOSQ_LIBS ${MOSQ_LIBS} websockets) endif (STATIC_WEBSOCKETS) endif (WITH_WEBSOCKETS) From 0ebe69a3b73b29b1acec06d6da24084850db62e0 Mon Sep 17 00:00:00 2001 From: Petr Krasnoshchekov Date: Thu, 12 Dec 2024 12:54:53 +0500 Subject: [PATCH 2/2] Fix Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 55d7b46b..8f82e2f4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ -buildDebChroot defaultTargets: 'bullseye-armhf bullseye-arm64', +buildDebSbuild defaultTargets: 'bullseye-armhf bullseye-arm64', customReleaseBranchPattern: 'wb'