bastif pushed to branch master at Debian Java Maintainers / vnu


Commits:
d7130bba by Fab Stz at 2026-06-02T10:54:02+02:00
Increase Stacksize to 3072 on loong64 for jetty & tomcat packages

Will hopefully fix autopkgtest on loong64 for
- bin:vnu-jetty9
- bin:vnu-jetty12
- bin:vnu-tomcat11

- - - - -
bab53196 by Fab Stz at 2026-06-02T10:56:07+02:00
Update changelog for 23.4.11+dfsg-5 release

- - - - -


8 changed files:

- debian/changelog
- debian/rules
- debian/tests/webapp_validate_common.sh
- debian/vnu-jetty12-start.d-xss.ini → debian/vnu-jetty12-start.d-xss-i386.ini
- + debian/vnu-jetty12-start.d-xss-loong64.ini
- debian/vnu-jetty9-start.d-xss.ini → debian/vnu-jetty9-start.d-xss-i386.ini
- + debian/vnu-jetty9-start.d-xss-loong64.ini
- debian/vnu-tomcat11.README.Debian


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+vnu (23.4.11+dfsg-5) UNRELEASED; urgency=medium
+
+  * Depends: remove tomcat-jakartaee-migration from bin:vnu-tomcat11
+  * Increase Stacksize to 3072 on loong64 for jetty & tomcat packages
+
+ -- Fab Stz <[email protected]>  Tue, 02 Jun 2026 10:54:54 +0200
+
 vnu (23.4.11+dfsg-4) unstable; urgency=medium
 
   * Make build reproducible (in manpage generation)


=====================================
debian/rules
=====================================
@@ -111,8 +111,8 @@ execute_after_dh_install-arch:
 ifneq ($(filter $(ARCH_REQUIRING_CUSTOM_XSS),$(DEB_HOST_ARCH)),)
        mkdir -p debian/vnu-jetty9/etc/jetty9/start.d/
        mkdir -p debian/vnu-jetty12/etc/jetty12/start.d/
-       cp debian/vnu-jetty9-start.d-xss.ini 
debian/vnu-jetty9/etc/jetty9/start.d/vnu-xss-$(DEB_HOST_ARCH).ini
-       cp debian/vnu-jetty12-start.d-xss.ini 
debian/vnu-jetty12/etc/jetty12/start.d/vnu-xss-$(DEB_HOST_ARCH).ini
+       cp debian/vnu-jetty9-start.d-xss-$(DEB_HOST_ARCH).ini 
debian/vnu-jetty9/etc/jetty9/start.d/vnu-xss-$(DEB_HOST_ARCH).ini
+       cp debian/vnu-jetty12-start.d-xss-$(DEB_HOST_ARCH).ini 
debian/vnu-jetty12/etc/jetty12/start.d/vnu-xss-$(DEB_HOST_ARCH).ini
 endif
 
 override_dh_installchangelogs:


=====================================
debian/tests/webapp_validate_common.sh
=====================================
@@ -79,10 +79,14 @@ start_server()
   if [ -n "$AUTOPKGTEST_TMP" ]; then
     case "$server" in
     tomcat11)
-      if [ "$(dpkg --print-architecture)" = "i386" ] || [ "$(dpkg 
--print-architecture)" = "loong64" ]; then
+      if [ "$(dpkg --print-architecture)" = "i386" ]; then
         echo "Adding -Xss2048k JVM option."
         echo -e '[Service]\nEnvironment="CATALINA_OPTS=-Xss2048k"' | sudo 
systemctl edit --drop-in vnu-tomcat11.conf --stdin tomcat11.service 2>&1
       fi
+      if [ "$(dpkg --print-architecture)" = "loong64" ]; then
+        echo "Adding -Xss3072k JVM option."
+        echo -e '[Service]\nEnvironment="CATALINA_OPTS=-Xss3072k"' | sudo 
systemctl edit --drop-in vnu-tomcat11.conf --stdin tomcat11.service 2>&1
+      fi
       ;;
     esac
 


=====================================
debian/vnu-jetty12-start.d-xss.ini → debian/vnu-jetty12-start.d-xss-i386.ini
=====================================


=====================================
debian/vnu-jetty12-start.d-xss-loong64.ini
=====================================
@@ -0,0 +1,2 @@
+--exec
+-Xss3072k


=====================================
debian/vnu-jetty9-start.d-xss.ini → debian/vnu-jetty9-start.d-xss-i386.ini
=====================================


=====================================
debian/vnu-jetty9-start.d-xss-loong64.ini
=====================================
@@ -0,0 +1,2 @@
+--exec
+-Xss3072k


=====================================
debian/vnu-tomcat11.README.Debian
=====================================
@@ -3,10 +3,13 @@ With tomcat11, vnu webapp is reachable at:
   http://localhost:8080/vnu
 
 On some architectures (eg. i386, loong64), you may also have to launch
-tomcat with the following JVM option "-Xss2048k".
+tomcat with the following JVM option "-Xss%SIZE%k".
+Where %SIZE% is
+  - 2048 on i386
+  - 3072 on loong64
 
 To achieve this, you could set the CATALINA_OPTS environment variable this way.
-  echo -e '[Service]\nEnvironment="CATALINA_OPTS=-Xss2048k"' | \
+  SIZE=2048 && echo -e '[Service]\nEnvironment="CATALINA_OPTS=-Xss'$SIZE'k"' | 
\
     systemctl edit --drop-in vnu-tomcat11.conf --stdin tomcat11.service
 
 Then restart the service:



View it on GitLab: 
https://salsa.debian.org/java-team/vnu/-/compare/01bab3fbcbfaa76f5b7fab285cf1322c7c0745c5...bab531966da66095c6d95b9a41bf1ac6895af9e3

-- 
View it on GitLab: 
https://salsa.debian.org/java-team/vnu/-/compare/01bab3fbcbfaa76f5b7fab285cf1322c7c0745c5...bab531966da66095c6d95b9a41bf1ac6895af9e3
You're receiving this email because of your account on salsa.debian.org. Manage 
all notifications: https://salsa.debian.org/-/profile/notifications | Help: 
https://salsa.debian.org/help


_______________________________________________
pkg-java-commits mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to