Merge pull request #1 from wirenboard/feature/SOFT-4768-bullseye-back…

…port Backport to Bullseye
wirenboard · Dec 12, 2024 · 8295fce · 8295fce
2 parents ae18c23 + 0ebe69a
commit 8295fce
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -0,0 +1,2 @@
+buildDebSbuild defaultTargets: 'bullseye-armhf bullseye-arm64',
+               customReleaseBranchPattern: 'wb'
diff --git 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 <petr.krasnoshchekov@wirenboard.com>  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
diff --git 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)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		buildDebSbuild defaultTargets: 'bullseye-armhf bullseye-arm64',
		customReleaseBranchPattern: 'wb'