From 9432ff1d68668c6adc7423b3e07d980daa09b059 Mon Sep 17 00:00:00 2001
From: Andreas Fankhauser hiddenalpha.ch
Date: Thu, 26 Sep 2024 17:00:44 +0200
Subject: PaisaNoSlim update platform patch.
---
src/main/paisa-nonslim/patches/platform.patch | 152 +++++++-------------------
1 file changed, 40 insertions(+), 112 deletions(-)
diff --git a/src/main/paisa-nonslim/patches/platform.patch b/src/main/paisa-nonslim/patches/platform.patch
index 1257896..f6ab36b 100644
--- a/src/main/paisa-nonslim/patches/platform.patch
+++ b/src/main/paisa-nonslim/patches/platform.patch
@@ -16,120 +16,48 @@
ch.post.it.paisa
---- a/poms/service/paisa-service-superpom/pom.xml
-+++ b/poms/service/paisa-service-superpom/pom.xml
-@@ -271,6 +271,54 @@
- org.jfrog.buildinfo
- artifactory-maven-plugin
-
-+
-+
-+ org.codehaus.gmaven
-+ groovy-maven-plugin
-+ 2.1.1
-+
-+
-+ prepare-package
-+
-+ execute
-+
-+
-+
-+
-+
-+ io.github.java-native:jssc
-+
-+
-+
-+
-+
-+
-+
-
+ Mit mario debugging herausgefunden
+ (index 5f8d03973..16e9554eb 100644)
+
+
+--- a/alice/alice-docker/alice-docker-service-base/Dockerfile
++++ b/alice/alice-docker/alice-docker-service-base/Dockerfile
+@@ -17,7 +17,7 @@ COPY install/jetty/ ${JETTY_HOME}/
+ # copy slimmed libraries, generated in alice-docker-service-base pom
+ COPY target/jetty/ ${JETTY_HOME}/
+
+-RUN chmod 755 /usr/lib64/libmscan_api.so /usr/lib64/libmdis_api.so
++RUN chmod 755 /usr/lib/libmscan_api.so /usr/lib/libmdis_api.so
+ RUN sed -i -e "s|platform_version|${PROJECT_VERSION}|g" ${JETTY_HOME}/modules/AllowNullPathInfo.mod
+ WORKDIR ${JETTY_HOME}
-
+@@ -30,8 +30,13 @@ RUN apt-get update && \
+ apt-get clean all && \
+ # TODO: may be unused
+ chmod +x ./bin/jetty.sh && \
+- chmod +x ./bin/start-jetty.sh && \
++ chmod +x ./bin/start-jetty.sh && \
+- chmod u+s /usr/bin/tcpdump
++ chmod u+s /usr/bin/tcpdump && \
++ # needed for tty devices (add to base-jetty) && \
++ groupmod -g 18 dialout && \
++ groupmod -g 63 audio && \
++ # TODO remove as soon as it is fixed in base-jetty && \
++ usermod -a -G 5,7,18,63,jetty,2001,2002 jetty
+
+ # switch back to non-root
+ USER jetty
---- a/poms/service/paisa-service-superpom/pom.xml
-+++ b/poms/service/paisa-service-superpom/pom.xml
-@@ -882,53 +930,6 @@
- slim
-
-
--
-- org.codehaus.gmaven
-- groovy-maven-plugin
-- 2.1.1
--
--
-- prepare-package
--
-- execute
--
--
--
--
--
-- io.github.java-native:jssc
--
--
--
--
--
--
--
-
-
-
+diff --git a/alice/alice-docker/alice-docker-service-base/install/men_device_driver/usr/lib64/libmdis_api.so b/alice/alice-docker/alice-docker-service-base/install/men_device_driver/usr/lib/libmdis_api.so
+similarity index 100%
+rename from alice/alice-docker/alice-docker-service-base/install/men_device_driver/usr/lib64/libmdis_api.so
+rename to alice/alice-docker/alice-docker-service-base/install/men_device_driver/usr/lib/libmdis_api.so
+
+
+diff --git a/alice/alice-docker/alice-docker-service-base/install/men_device_driver/usr/lib64/libmscan_api.so b/alice/alice-docker/alice-docker-service-base/install/men_device_driver/usr/lib/libmscan_api.so
+similarity index 100%
+rename from alice/alice-docker/alice-docker-service-base/install/men_device_driver/usr/lib64/libmscan_api.so
+rename to alice/alice-docker/alice-docker-service-base/install/men_device_driver/usr/lib/libmscan_api.so
--
cgit v1.1
From bc633486f571ed24cef3f245f9aa79dc92042243 Mon Sep 17 00:00:00 2001
From: Andreas Fankhauser hiddenalpha.ch
Date: Fri, 27 Sep 2024 14:53:51 +0200
Subject: PaisaNoSlim fix platform patch for libs.
---
src/main/paisa-nonslim/patches/allitnil.patch | 48 +++++++++++++++++++++++++++
src/main/paisa-nonslim/patches/platform.patch | 15 +++++----
2 files changed, 57 insertions(+), 6 deletions(-)
create mode 100644 src/main/paisa-nonslim/patches/allitnil.patch
diff --git a/src/main/paisa-nonslim/patches/allitnil.patch b/src/main/paisa-nonslim/patches/allitnil.patch
new file mode 100644
index 0000000..38ae4bf
--- /dev/null
+++ b/src/main/paisa-nonslim/patches/allitnil.patch
@@ -0,0 +1,48 @@
+
+ [SDCISA-15648] Just look what happens when we remove this
+
+ No idea why this lib got loaded. Comments do NOT tell anything useful. Also
+ the relevant jira issue (ISAVF-2413) is of no use, as it is no longer available.
+
+
+--- a/allitnil-domain/src/main/java/ch/post/it/paisa/allitnil/domain/printer/extendo/ExtendoNativeDriverLinux.java
++++ b/allitnil-domain/src/main/java/ch/post/it/paisa/allitnil/domain/printer/extendo/ExtendoNativeDriverLinux.java
+@@ -18,7 +18,6 @@ public class ExtendoNativeDriverLinux extends ExtendoNativeDriverAdapter {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(ExtendoNativeDriverLinux.class);
+
+- public static final String LIB_PATH_LIBRT = "/native-64/librt.so.1";
+ public static final String LIB_PATH_LIBEXOTB = "/native-64/libExoTb.so.1.0";
+ public static final String LIB_PATH_LIBEXOAPI = "/native-64/libExoApi.so.1.0";
+
+@@ -27,15 +26,6 @@ public class ExtendoNativeDriverLinux extends ExtendoNativeDriverAdapter {
+ private String printerPath;
+ private int printerHandle = 0;
+
+- /**
+- * Library dependency deklarieren. Veranlasst das laden von libRt unter Linux.
+- *
+- * @see libRt
+- * - POSIX.1b Realtime Extensions library
+- */
+- private interface LibRt extends Library {}
+-
+ /**
+ * Library dependency deklarieren. Veranlasst das laden von libRt unter Linux.
+ *
+@@ -47,7 +37,6 @@ public class ExtendoNativeDriverLinux extends ExtendoNativeDriverAdapter {
+
+ static {
+ try {
+- Native.load(LIB_PATH_LIBRT, LibRt.class);
+ Native.load(LIB_PATH_LIBEXOTB, LibExoTb.class);
+ driver = Native.load(LIB_PATH_LIBEXOAPI, ExtendoNativeLibraryLinux.class);
+ } catch (Exception e) {
+
+
+ TODO rm allitnil-domain/src/main/resources/native-32/librt.so.1
+
+ TODO rm allitnil-domain/src/main/resources/native-64/librt.so.1
+
+
diff --git a/src/main/paisa-nonslim/patches/platform.patch b/src/main/paisa-nonslim/patches/platform.patch
index f6ab36b..6eb8c6e 100644
--- a/src/main/paisa-nonslim/patches/platform.patch
+++ b/src/main/paisa-nonslim/patches/platform.patch
@@ -17,8 +17,6 @@
Mit mario debugging herausgefunden
- (index 5f8d03973..16e9554eb 100644)
-
--- a/alice/alice-docker/alice-docker-service-base/Dockerfile
+++ b/alice/alice-docker/alice-docker-service-base/Dockerfile
@@ -31,18 +29,23 @@
RUN sed -i -e "s|platform_version|${PROJECT_VERSION}|g" ${JETTY_HOME}/modules/AllowNullPathInfo.mod
WORKDIR ${JETTY_HOME}
-@@ -30,8 +30,13 @@ RUN apt-get update && \
+@@ -26,12 +26,18 @@
+ pulseaudio pulseaudio-utils \
+ libncurses5 \
+ i2c-tools sudo vim gzip procps psmisc tar socat \
++ libusb-1.0-0 `# used by allitnil/caveman` \
+ tcpdump lsof telnet net-tools && \
apt-get clean all && \
# TODO: may be unused
chmod +x ./bin/jetty.sh && \
- chmod +x ./bin/start-jetty.sh && \
-+ chmod +x ./bin/start-jetty.sh && \
- chmod u+s /usr/bin/tcpdump
++ chmod +x ./bin/start-jetty.sh && \
+ chmod u+s /usr/bin/tcpdump && \
-+ # needed for tty devices (add to base-jetty) && \
++ # needed for tty devices (add to base-jetty)
+ groupmod -g 18 dialout && \
+ groupmod -g 63 audio && \
-+ # TODO remove as soon as it is fixed in base-jetty && \
++ # remove as soon as it is fixed in base-jetty
+ usermod -a -G 5,7,18,63,jetty,2001,2002 jetty
# switch back to non-root
--
cgit v1.1
From b19402b2767d22473b85048c4eba3cd7514f4a18 Mon Sep 17 00:00:00 2001
From: Andreas Fankhauser hiddenalpha.ch
Date: Fri, 27 Sep 2024 16:28:49 +0200
Subject: PaisaNoSlim perf tests vorbereiten.
---
src/main/paisa-nonslim/README.txt | 36 ++++++++++--------------------------
1 file changed, 10 insertions(+), 26 deletions(-)
diff --git a/src/main/paisa-nonslim/README.txt b/src/main/paisa-nonslim/README.txt
index bb7efb8..21af56c 100644
--- a/src/main/paisa-nonslim/README.txt
+++ b/src/main/paisa-nonslim/README.txt
@@ -71,31 +71,6 @@ Evtl für diese services den jssc als "provided" angeben.
done \
-## TaskQueue
-
-- await feedback for "pobble" from sandro due to "flanian artifact missing"
-- await feedback for "thor" from sandro (20240919)
-- await feedback for "rob" from sandro (20240919)
-
-
-## Installation
-
-{
- "timestamp": "2024-08-06T16:54:42.042+02:00",
- "hostname": "eddie00849",
- "instanceName": "default",
- "eaglePort": 7012,
- "activations": {
- "SDCISA-15648-1722955735781-legacy": "2024-07-01T00:04:00.000Z",
- "SDCISA-15648-1722955733398-noslim": "2024-07-01T00:03:00.000Z",
- "bundle-sw_4011-data_3997": "2024-07-29T11:49:53.152Z",
- "bundle-sw_4012-data_3997": "2024-07-25T02:00:00.000Z",
- "bundle-sw_4012-data_4005": "2024-07-16T23:00:00.000Z"
- }
-}
-
-
-
## Measurements
&& while true; do ssh donner -oRemoteCommand='true \
@@ -108,6 +83,13 @@ Evtl für diese services den jssc als "provided" angeben.
;done' | tee -a donner-perf/donner-perf-$(date -u +%Y%m%d-%H%M%SZ).log \
&& sleep 5 || break; done \
+ && THELOG="donner-perf-20240927-131453Z.log" \
+ && cat "${THELOG:?}" \
+ | sed -E 's_^([0-9]+) +([0-9:]+) .+age: ([0-9.]+), ([0-9.]+), ([0-9.]+) +( Mem: .*).*$_\1;\2;\3;\4;\5\6_' \
+ | sed -E 's_^(.+) Mem: +([0-9]+) +([0-9]+) +([0-9]+) +([0-9]+) +([0-9]+) +([0-9]+).*$_\1;\2;\3;\4;\5;\6_' \
+ > "${THELOG:?}.csv" \
+
+
Boot ab KassenTaster, login mit RFID, vorgeschlagene Fahrt anmelden, warten.
2024-07-31 (begin-): isa ausschalten, backups erstellen.
@@ -128,8 +110,10 @@ When+0200;version;LoginScreen[sec];FahrtGewaehlt[sec];
2024-08-09T__:__;noslim;___;___;
+## Performance smoketest from remote at 27sep2024
-
+1313Z umschalten auf "new" (aka NoSlim) dann reboot mit messung.
+1338Z umschalten auf "alt" (aka "bundle-sw_4098-data_4110") dann reboot mit messung.
--
cgit v1.1