EBcL 1.2 (#16)

Elektrobit · Jul 11, 2024 · 6f874c8 · 6f874c8
1 parent 9ed9879
commit 6f874c8
Show file tree

Hide file tree

Showing 40 changed files with 134 additions and 132 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,9 +1,9 @@
 // For format details, see https://aka.ms/devcontainer.json. For config options, see the
 // README at: https://github.com/devcontainers/templates/tree/main/src/ubuntu
 {
-	"name": "EB corbos Linux SDK 1.1.1",
+	"name": "EB corbos Linux SDK 1.2",
 	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"image": "linux.elektrobit.com/ebcl/sdk:1.1.1",
+	"image": "linux.elektrobit.com/ebcl/sdk:1.2",
 	// Features to add to the dev container. More info: https://containers.dev/features.
 	// "features": {},
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog for the EBcL VS Code workspace template
 
+## Relesae 1.2 - 2024-07-11
+
+Update for EBcL release 1.2.
+
+Changes:
+- Update URLs to new APT repository for EBcL 1.2
+- Adapt example images to new crinit package split
+- Improve example images
+
 
 ## Relesae 1.1.1 - 2024-04-25
 

diff --git a/ebcl_sdk_1-1-1.code-workspace → ebcl_sdk_1-2.code-workspace b/ebcl_sdk_1-1-1.code-workspace → ebcl_sdk_1-2.code-workspace
diff --git a/images/berrymill.conf b/images/berrymill.conf
@@ -11,38 +11,65 @@ repos:
     # Architecture
     # Conforms to Debian standard: https://wiki.debian.org/SupportedArchitectures
     amd64:
-      # Just an alias of the repo, free form
+      Jammy:
+        url: http://archive.ubuntu.com/ubuntu
+        type: apt-deb
+        key: file:///etc/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg
+        name: jammy
+        components: main
+
+      Jammy-Security:
+        url: http://archive.ubuntu.com/ubuntu
+        type: apt-deb
+        key: file:///etc/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg
+        name: jammy-security
+        components: main
+
       EBcL:
-        url: http://linux.elektrobit.com/eb-corbos-linux/1.1.1
+        url: http://linux.elektrobit.com/eb-corbos-linux/1.2
         type: apt-deb
         key: file:///etc/berrymill/keyrings.d/repo_eb_gm.pub.gpg
         name: ebcl
         components: prod
 
       EBcL-Not-Supported:
-        url: http://linux.elektrobit.com/eb-corbos-linux/1.1.1
+        url: http://linux.elektrobit.com/eb-corbos-linux/1.2
         type: apt-deb
         key: file:///etc/berrymill/keyrings.d/repo_eb_gm.pub.gpg
         name: ebcl
-        components: all
+        components: dev
 
     arm64:
+      Jammy:
+        url: http://ports.ubuntu.com/ubuntu-ports
+        type: apt-deb
+        key: file:///etc/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg
+        name: jammy
+        components: main
+
+      Jammy-Security:
+        url: http://ports.ubuntu.com/ubuntu-ports
+        type: apt-deb
+        key: file:///etc/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg
+        name: jammy-security
+        components: main
+
       EBcL:
-        url: http://linux.elektrobit.com/eb-corbos-linux/1.1.1
+        url: http://linux.elektrobit.com/eb-corbos-linux/1.2
         type: apt-deb
         key: file:///etc/berrymill/keyrings.d/repo_eb_gm.pub.gpg
         name: ebcl
         components: prod
 
       EBcL-Not-Supported:
-        url: http://linux.elektrobit.com/eb-corbos-linux/1.1.1
+        url: http://linux.elektrobit.com/eb-corbos-linux/1.2
         type: apt-deb
         key: file:///etc/berrymill/keyrings.d/repo_eb_gm.pub.gpg
         name: ebcl
-        components: all
+        components: dev
 
       EBcL-NXP-RDB2:
-        url: http://linux.elektrobit.com/eb-corbos-linux/1.1.1
+        url: http://linux.elektrobit.com/eb-corbos-linux/1.2
         type: apt-deb
         key: file:///etc/berrymill/keyrings.d/repo_eb_gm.pub.gpg
         name: ebcl_nxp_public

diff --git a/images/berrymill.template b/images/berrymill.template
@@ -11,20 +11,33 @@ repos:
     # Architecture
     # Conforms to Debian standard: https://wiki.debian.org/SupportedArchitectures
     amd64:
-      # Just an alias of the repo, free form
+      Jammy:
+        url: http://archive.ubuntu.com/ubuntu
+        type: apt-deb
+        key: file:///etc/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg
+        name: jammy
+        components: main
+
+      Jammy-Security:
+        url: http://archive.ubuntu.com/ubuntu
+        type: apt-deb
+        key: file:///etc/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg
+        name: jammy-security
+        components: main
+
       EBcL:
-        url: http://linux.elektrobit.com/eb-corbos-linux/1.1.1
+        url: http://linux.elektrobit.com/eb-corbos-linux/1.2
         type: apt-deb
         key: file:///etc/berrymill/keyrings.d/repo_eb_gm.pub.gpg
         name: ebcl
         components: prod
 
       EBcL-Not-Supported:
-        url: http://linux.elektrobit.com/eb-corbos-linux/1.1.1
+        url: http://linux.elektrobit.com/eb-corbos-linux/1.2
         type: apt-deb
         key: file:///etc/berrymill/keyrings.d/repo_eb_gm.pub.gpg
         name: ebcl
-        components: all
+        components: dev
 
       app:
         url: http://REPOIP:8000
@@ -34,22 +47,36 @@ repos:
         components: main
 
     arm64:
+      Jammy:
+        url: http://ports.ubuntu.com/ubuntu-ports
+        type: apt-deb
+        key: file:///etc/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg
+        name: jammy
+        components: main
+
+      Jammy-Security:
+        url: http://ports.ubuntu.com/ubuntu-ports
+        type: apt-deb
+        key: file:///etc/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg
+        name: jammy-security
+        components: main
+
       EBcL:
-        url: http://linux.elektrobit.com/eb-corbos-linux/1.1.1
+        url: http://linux.elektrobit.com/eb-corbos-linux/1.2
         type: apt-deb
         key: file:///etc/berrymill/keyrings.d/repo_eb_gm.pub.gpg
         name: ebcl
         components: prod
 
       EBcL-Not-Supported:
-        url: http://linux.elektrobit.com/eb-corbos-linux/1.1.1
+        url: http://linux.elektrobit.com/eb-corbos-linux/1.2
         type: apt-deb
         key: file:///etc/berrymill/keyrings.d/repo_eb_gm.pub.gpg
         name: ebcl
         components: all
 
       EBcL-NXP-RDB2:
-        url: http://linux.elektrobit.com/eb-corbos-linux/1.1.1
+        url: http://linux.elektrobit.com/eb-corbos-linux/1.2
         type: apt-deb
         key: file:///etc/berrymill/keyrings.d/repo_eb_gm.pub.gpg
         name: ebcl_nxp_public

diff --git a/images/qemu-crinit-aarch64/appliance.kiwi b/images/qemu-crinit-aarch64/appliance.kiwi
@@ -32,11 +32,14 @@
         <!-- system -->
         <!-- crinit and related packages -->
         <package name="crinit"/>
-        <package name="crinit-shutdown"/>
+        <package name="crinit-ctl"/>
         <package name="elos"/>
         <package name="elos-coredump"/>
+        <package name="elos-plugin-backend-json"/>
+        <package name="elos-plugin-backend-dummy"/>
+        <package name="elos-plugin-scanner-kmsg"/>
+        <package name="elos-plugin-scanner-syslog"/>
         <package name="netifd"/>
-        <package name="crinit-machine-id-gen"/>
         <package name="udhcpc"/>
         <package name="ubus"/>
         <!-- core tools -->
@@ -50,27 +53,22 @@
         <package name="findutils"/>
         <!-- modprobe - for loading USB drivers -->
         <package name="kmod"/>
-        <!-- licenses tool -->
-        <package name="dpkg-licenses"/>
         <!-- ssh -->
         <package name="openssh-server"/>
         <package name="openssh-client"/>
         <!-- network tools -->
         <package name="iproute2"/>
         <package name="iptables"/>
         <package name="iputils-ping"/>
-        <!-- apt support -->
-        <package name="apt-utils"/>
         <!-- required for apt gpg key verification -->
         <package name="gnupg"/>
-        <!-- required for apt update -->
-        <package name="dialog"/>
         <!-- add editors -->
         <package name="vim"/>
         <package name="nano"/>
+        <!-- dependency of my-json-app -->
+        <package name="libjsoncpp25"/>
         <!-- debug tools -->
         <package name="gdbserver"/>
-        <package name="libc6-dbg"/>
         <package name="socat"/>
         <package name="iperf3"/>
         <package name="tcpdump"/>

diff --git a/images/qemu-crinit-aarch64/appliance_sysroot.kiwi b/images/qemu-crinit-aarch64/appliance_sysroot.kiwi
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <image schemaversion="6.8" name="Ubuntu-22.04_appliance">
-    <inherit path="/tmp/img/appliance.kiwi"/>
+    <inherit path="appliance.kiwi"/>
     <!--
         Add libjsoncpp headers.
     -->

diff --git a/images/qemu-crinit-aarch64/config.sh b/images/qemu-crinit-aarch64/config.sh
@@ -7,11 +7,6 @@ test -f /.kconfig && . /.kconfig
 
 set -ex
 
-#======================================
-# Create license information
-#--------------------------------------
-/usr/local/bin/dpkg-licenses/dpkg-licenses > /licenses
-
 #==================================
 # Turn grub-mkconfig into a noop
 #----------------------------------

diff --git a/images/qemu-crinit-aarch64/root/etc/apt/sources.list b/images/qemu-crinit-aarch64/root/etc/apt/sources.list
@@ -1,4 +1,4 @@
-deb http://linux.elektrobit.com/eb-corbos-linux/1.1.1 ebcl prod dev
+deb http://linux.elektrobit.com/eb-corbos-linux/1.2 ebcl prod dev
 deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy main universe multiverse restricted
 deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy-security main universe multiverse restricted
 deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy main universe multiverse restricted

diff --git a/images/qemu-crinit-aarch64/root/etc/crinit/crinit.d/earlysetup.crinit b/images/qemu-crinit-aarch64/root/etc/crinit/crinit.d/earlysetup.crinit
@@ -1,7 +1,6 @@
 NAME = earlysetup
 
 COMMAND = /bin/hostname qemucrinitvm
-          /usr/bin/machine-id-gen
 
 PROVIDES = machine-id:wait
 RESPAWN = NO

diff --git a/images/qemu-crinit-aarch64/root/etc/machine-id b/images/qemu-crinit-aarch64/root/etc/machine-id
@@ -0,0 +1 @@
+004711
diff --git a/images/qemu-crinit-x86_64/appliance.kiwi b/images/qemu-crinit-x86_64/appliance.kiwi
@@ -34,11 +34,14 @@
         <!-- system -->
         <!-- crinit and related packages -->
         <package name="crinit"/>
-        <package name="crinit-shutdown"/>
+        <package name="crinit-ctl"/>
         <package name="elos"/>
         <package name="elos-coredump"/>
+        <package name="elos-plugin-backend-json"/>
+        <package name="elos-plugin-backend-dummy"/>
+        <package name="elos-plugin-scanner-kmsg"/>
+        <package name="elos-plugin-scanner-syslog"/>
         <package name="netifd"/>
-        <package name="crinit-machine-id-gen"/>
         <package name="udhcpc"/>
         <package name="ubus"/>
         <!-- core tools -->
@@ -52,24 +55,22 @@
         <package name="findutils"/>
         <!-- modprobe - for loading USB drivers -->
         <package name="kmod"/>
-        <!-- licenses tool -->
-        <package name="dpkg-licenses"/>
         <!-- ssh -->
         <package name="openssh-server"/>
         <package name="openssh-client"/>
         <!-- network tools -->
         <package name="iproute2"/>
         <package name="iptables"/>
         <package name="iputils-ping"/>
-        <!-- apt support -->
-        <package name="apt-utils"/>
         <!-- required for apt gpg key verification -->
         <package name="gnupg"/>
         <!-- required for apt update -->
         <package name="dialog"/>
         <!-- add editors -->
         <package name="vim"/>
         <package name="nano"/>
+        <!-- dependency of my-json-app -->
+        <package name="libjsoncpp25"/>
         <!-- debug tools -->
         <package name="gdbserver"/>
         <package name="libc6-dbg"/>

diff --git a/images/qemu-crinit-x86_64/appliance_sysroot.kiwi b/images/qemu-crinit-x86_64/appliance_sysroot.kiwi
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <image schemaversion="6.8" name="Ubuntu-22.04_appliance">
-    <inherit path="/tmp/img/appliance.kiwi"/>
+    <inherit path="appliance.kiwi"/>
     <!--
         Add libjsoncpp headers.
     -->

diff --git a/images/qemu-crinit-x86_64/config.sh b/images/qemu-crinit-x86_64/config.sh
@@ -7,11 +7,6 @@ test -f /.kconfig && . /.kconfig
 
 set -ex
 
-#======================================
-# Create license information
-#--------------------------------------
-/usr/local/bin/dpkg-licenses/dpkg-licenses > /licenses
-
 #==================================
 # Turn grub-mkconfig into a noop
 #----------------------------------

diff --git a/images/qemu-crinit-x86_64/root/etc/apt/sources.list b/images/qemu-crinit-x86_64/root/etc/apt/sources.list
@@ -1,4 +1,4 @@
-deb http://linux.elektrobit.com/eb-corbos-linux/1.1.1 ebcl prod dev
+deb http://linux.elektrobit.com/eb-corbos-linux/1.2 ebcl prod dev
 deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy main universe multiverse restricted
 deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy-security main universe multiverse restricted
 deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy main universe multiverse restricted

diff --git a/images/qemu-crinit-x86_64/root/etc/crinit/crinit.d/earlysetup.crinit b/images/qemu-crinit-x86_64/root/etc/crinit/crinit.d/earlysetup.crinit
@@ -1,7 +1,6 @@
 NAME = earlysetup
 
 COMMAND = /bin/hostname qemucrinitvm
-          /usr/bin/machine-id-gen   
 
 PROVIDES = machine-id:wait
 RESPAWN = NO

diff --git a/images/qemu-crinit-x86_64/root/etc/elos/elosd.json b/images/qemu-crinit-x86_64/root/etc/elos/elosd.json
@@ -13,21 +13,13 @@
       ],
       "ClientInputs": {
         "PluginSearchPath": "/usr/local/lib/elos/client",
-        "Plugins": {}
+        "Plugins": {
+
+        }
       },
       "EventLogging": {
         "PluginSearchPath": "/usr/lib/x86_64-linux-gnu/elos/backend",
         "Plugins": {
-          "coredump": {
-            "File": "backend_json.so",
-            "Run": "always",
-            "Filter": [
-              ".e.messageCode 5005 EQ"
-            ],
-            "Config": {
-              "StoragePath": "/var/log/coredumps_%host%_%date%_%count%.log"
-            }
-          },
           "everythingElse": {
             "File": "backend_json.so",
             "Run": "always",
@@ -49,10 +41,9 @@
           "SyslogPath": "/dev/log",
           "MappingRules": {
             "MessageCodes": {
-              "4000": ".event.source.appName 'ssh' STRCMP",
-              "2000": ".event.source.appName 'crinit' STRCMP",
               "1000": ".event.source.appName 'login' STRCMP",
-              "1102": "1 1 EQ"
+              "1102": "1 1 EQ",
+              "2000": ".event.source.appName 'crinit' STRCMP"
             }
           }
         },

diff --git a/images/qemu-crinit-x86_64/root/etc/machine-id b/images/qemu-crinit-x86_64/root/etc/machine-id
@@ -0,0 +1 @@
+004711