Update platforms (#1617)

* Remove stretch, bionic, add lunar * Fix CEC CMakeList for Ubuntu 23.04 * Fix git version identification when run in docker and local code * Update SYSTEM_LIBS_SKIP list * Updates after Ubuntu Server 20.04, latest PI OS Light and CoreElec 20 * Update year * Skip List working with Fedora38 Server (x86) and libreElec 11 (x86) * Update platform tag handling * Show error, if ssl lib cannot be found * Update supported platforms * Script to install selected Pull Requests * Fix misspelled explanation + improve description * Correct run-id evaluation * Support python3 and python2 * Support to copy existing config for PR testing
hyperion-project · Jul 21, 2023 · 42c98da · 42c98da
1 parent 64642a4
commit 42c98da
Show file tree

Hide file tree

Showing 18 changed files with 310 additions and 109 deletions.
diff --git a/.github/workflows/apt/amd64.json b/.github/workflows/apt/amd64.json
@@ -1,12 +1,4 @@
 [
-	{
-		"distribution": "Bionic",
-		"architecture": "amd64",
-		"build-depends": "git, cmake, build-essential, qtbase5-dev, libqt5serialport5-dev, libqt5sql5-sqlite, libqt5svg5-dev, libqt5x11extras5-dev, libusb-1.0-0-dev, python3-dev, libcec-dev, libxcb-image0-dev, libxcb-util0-dev, libxcb-shm0-dev, libxcb-render0-dev, libxcb-randr0-dev, libxrandr-dev, libxrender-dev, libasound2-dev, libturbojpeg0-dev, libjpeg-dev, libssl1.0-dev, libmbedtls-dev",
-		"package-depends": "libpython3.6, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls10, libasound2, libturbojpeg, libcec4",
-		"cmake-environment": "-DUSE_SYSTEM_MBEDTLS_LIBS=ON -DENABLE_DEPLOY_DEPENDENCIES=OFF -DCMAKE_BUILD_TYPE=Release",
-		"description": "Ubuntu 18.04 (Bionic Beaver) (amd64)"
-	},
 	{
 		"distribution": "Focal",
 		"architecture": "amd64",
@@ -32,12 +24,12 @@
 		"description": "Ubuntu 22.10 (Kinetic Kudu) (amd64)"
 	},
 	{
-		"distribution": "Stretch",
+		"distribution": "Lunar",
 		"architecture": "amd64",
-		"build-depends": "git, cmake, build-essential, qtbase5-dev, libqt5serialport5-dev, libqt5sql5-sqlite, libqt5svg5-dev, libqt5x11extras5-dev, libusb-1.0-0-dev, python3-dev, libcec-dev, libxcb-image0-dev, libxcb-util0-dev, libxcb-shm0-dev, libxcb-render0-dev, libxcb-randr0-dev, libxrandr-dev, libxrender-dev, libasound2-dev, libturbojpeg0-dev, libjpeg-dev, libssl1.0-dev, libmbedtls-dev",
-		"package-depends": "libpython3.5, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls10, libasound2, libturbojpeg0, libcec4",
+		"build-depends": "git, cmake, build-essential, qtbase5-dev, libqt5serialport5-dev, libqt5sql5-sqlite, libqt5svg5-dev, libqt5x11extras5-dev, libusb-1.0-0-dev, python3-dev, libcec-dev, libxcb-image0-dev, libxcb-util0-dev, libxcb-shm0-dev, libxcb-render0-dev, libxcb-randr0-dev, libxrandr-dev, libxrender-dev, libasound2-dev, libturbojpeg0-dev, libjpeg-dev, libssl-dev, libmbedtls-dev",
+		"package-depends": "libpython3.11, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls14, libasound2, libturbojpeg, libcec6",
 		"cmake-environment": "-DUSE_SYSTEM_MBEDTLS_LIBS=ON -DENABLE_DEPLOY_DEPENDENCIES=OFF -DCMAKE_BUILD_TYPE=Release",
-		"description": "Debian 9.x (Stretch) (amd64)"
+		"description": "Ubuntu 23.04 (Lunar Lobster) (amd64)"
 	},
 	{
 		"distribution": "Buster",

diff --git a/.github/workflows/apt/arm64.json b/.github/workflows/apt/arm64.json
@@ -1,12 +1,4 @@
 [
-	{
-		"distribution": "Bionic",
-		"architecture": "arm64",
-		"build-depends": "git, cmake, build-essential, qtbase5-dev, libqt5serialport5-dev, libqt5sql5-sqlite, libqt5svg5-dev, libqt5x11extras5-dev, libusb-1.0-0-dev, python3-dev, libcec-dev, libxcb-image0-dev, libxcb-util0-dev, libxcb-shm0-dev, libxcb-render0-dev, libxcb-randr0-dev, libxrandr-dev, libxrender-dev, libasound2-dev, libturbojpeg0-dev, libjpeg-dev, libssl1.0-dev, libmbedtls-dev",
-		"package-depends": "libpython3.6, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls10, libasound2, libturbojpeg, libcec4",
-		"cmake-environment": "-DENABLE_DISPMANX=OFF -DENABLE_X11=ON -DENABLE_XCB=ON -DUSE_SYSTEM_MBEDTLS_LIBS=ON -DENABLE_DEPLOY_DEPENDENCIES=OFF -DCMAKE_BUILD_TYPE=Release",
-		"description": "Ubuntu 18.04 (Bionic Beaver) (arm64)"
-	},
 	{
 		"distribution": "Focal",
 		"architecture": "arm64",

diff --git a/.github/workflows/apt/armhf.json b/.github/workflows/apt/armhf.json
@@ -1,12 +1,4 @@
 [
-	{
-		"distribution": "Bionic",
-		"architecture": "armhf",
-		"build-depends": "git, cmake, build-essential, qtbase5-dev, libqt5serialport5-dev, libqt5sql5-sqlite, libqt5svg5-dev, libqt5x11extras5-dev, libusb-1.0-0-dev, python3-dev, libcec-dev, libxcb-image0-dev, libxcb-util0-dev, libxcb-shm0-dev, libxcb-render0-dev, libxcb-randr0-dev, libxrandr-dev, libxrender-dev, libasound2-dev, libturbojpeg0-dev, libjpeg-dev, libssl1.0-dev, libmbedtls-dev",
-		"package-depends": "libpython3.6, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls10, libasound2, libturbojpeg, libcec4",
-		"cmake-environment": "-DENABLE_DISPMANX=OFF -DENABLE_X11=ON -DENABLE_XCB=ON -DUSE_SYSTEM_MBEDTLS_LIBS=ON -DENABLE_DEPLOY_DEPENDENCIES=OFF -DCMAKE_BUILD_TYPE=Release",
-		"description": "Ubuntu 18.04 (Bionic Beaver) (armhf)"
-	},
 	{
 		"distribution": "Focal",
 		"architecture": "armhf",
@@ -31,14 +23,6 @@
 		"cmake-environment": "-DENABLE_DISPMANX=OFF -DENABLE_X11=ON -DENABLE_XCB=ON -DUSE_SYSTEM_MBEDTLS_LIBS=ON -DENABLE_DEPLOY_DEPENDENCIES=OFF -DCMAKE_BUILD_TYPE=Release",
 		"description": "Ubuntu 22.10 (Kinetic Kudu) (armhf)"
 	},
-	{
-		"distribution": "Stretch",
-		"architecture": "armhf",
-		"build-depends": "git, cmake, python3-dev, qtbase5-dev, libqt5serialport5-dev, libqt5sql5-sqlite, libqt5svg5-dev, build-essential, libusb-1.0-0-dev, libcec-dev, libssl1.0-dev, libraspberrypi-dev, libasound2-dev, libturbojpeg0-dev, libjpeg-dev, libmbedtls-dev",
-		"package-depends": "libpython3.5, libusb-1.0-0, libqt5widgets5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls10, libasound2, libturbojpeg0, libcec4",
-		"cmake-environment": "-DUSE_SYSTEM_MBEDTLS_LIBS=ON -DENABLE_DEPLOY_DEPENDENCIES=OFF -DCMAKE_BUILD_TYPE=Release",
-		"description":"Debian 9.x (Stretch) (armhf)"
-	},
 	{
 		"distribution": "Buster",
 		"architecture": "armhf",

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -18,16 +18,16 @@ jobs:
         dockerImage: [ x86_64, armv6l, armv7l, aarch64 ]
         include:
           - dockerImage: x86_64
-            dockerName: Debian Stretch (x86_64)
+            dockerName: Debian Buster (x86_64)
             platform: x11
           - dockerImage: armv6l
-            dockerName: Debian Stretch (Raspberry Pi v1 & ZERO)
+            dockerName: Debian Buster (Raspberry Pi v1 & ZERO)
             platform: rpi
           - dockerImage: armv7l
-            dockerName: Debian Stretch (Raspberry Pi 2 & 3)
+            dockerName: Debian Buster (Raspberry Pi 2 & 3)
             platform: rpi
           - dockerImage: aarch64
-            dockerName: Debian Stretch (Generic AARCH64)
+            dockerName: Debian Buster (Generic AARCH64)
             platform: amlogic
 
     steps:
@@ -47,7 +47,7 @@ jobs:
       - name: Build packages
         env:
           DOCKER_IMAGE: ${{ matrix.dockerImage }}
-          DOCKER_TAG: stretch
+          DOCKER_TAG: buster
           DOCKER_NAME: ${{ matrix.dockerName }}
           PLATFORM: ${{ matrix.platform }}
         shell: bash

diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml
@@ -20,16 +20,16 @@ jobs:
         dockerImage: [ x86_64, armv6l, armv7l, aarch64 ]
         include:
           - dockerImage: x86_64
-            dockerName: Debian Stretch (x86_64)
+            dockerName: Debian Buster (x86_64)
             platform: x11
           - dockerImage: armv6l
-            dockerName: Debian Stretch (Raspberry Pi v1 & ZERO)
+            dockerName: Debian Buster (Raspberry Pi v1 & ZERO)
             platform: rpi
           - dockerImage: armv7l
-            dockerName: Debian Stretch (Raspberry Pi 2 & 3)
+            dockerName: Debian Buster (Raspberry Pi 2 & 3)
             platform: rpi
           - dockerImage: aarch64
-            dockerName: Debian Stretch (Generic AARCH64)
+            dockerName: Debian Buster (Generic AARCH64)
             platform: amlogic
 
     steps:
@@ -41,7 +41,7 @@ jobs:
       - name: Build packages
         env:
           DOCKER_IMAGE: ${{ matrix.dockerImage }}
-          DOCKER_TAG: stretch
+          DOCKER_TAG: buster
           DOCKER_NAME: ${{ matrix.dockerName }}
           PLATFORM: ${{ matrix.platform }}
         shell: bash

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -180,19 +180,18 @@ if ( "${PLATFORM}" MATCHES "osx" )
 elseif ( "${PLATFORM}" MATCHES "rpi" )
 	SET ( DEFAULT_DISPMANX   ON )
 	SET ( DEFAULT_DEV_WS281XPWM  ON )
-elseif ( "${PLATFORM}" STREQUAL "amlogic" )
+elseif ( "${PLATFORM}" MATCHES "^amlogic" )
 	SET ( DEFAULT_AMLOGIC     ON )
-elseif ( "${PLATFORM}" STREQUAL "amlogic-dev" )
-	SET ( DEFAULT_AMLOGIC     ON )
-	SET ( DEFAULT_DISPMANX    OFF )
-	SET ( DEFAULT_QT          OFF )
-	SET ( DEFAULT_CEC         OFF )
-elseif ( "${PLATFORM}" STREQUAL "amlogic64" )
-	SET ( DEFAULT_AMLOGIC     ON )
-elseif ( "${PLATFORM}" MATCHES "x11" )
+    if ( "${PLATFORM}" MATCHES "-dev$" )
+		SET ( DEFAULT_AMLOGIC     ON )
+		SET ( DEFAULT_DISPMANX    OFF )
+		SET ( DEFAULT_QT          OFF )
+		SET ( DEFAULT_CEC         OFF )
+	endif()
+elseif ( "${PLATFORM}" MATCHES "^x11" )
 	SET ( DEFAULT_X11        ON )
 	SET ( DEFAULT_XCB        ON )
-	if ( "${PLATFORM}" STREQUAL "x11-dev" )
+	if ( "${PLATFORM}" MATCHES "-dev$" )
 		SET ( DEFAULT_AMLOGIC    ON)
 		SET ( DEFAULT_DEV_WS281XPWM  ON )
 	endif()
@@ -201,7 +200,7 @@ elseif ( "${PLATFORM}" STREQUAL "imx6" )
 endif()
 
 # enable tests for -dev builds
-if ( "${PLATFORM}" MATCHES "-dev" )
+if ( "${PLATFORM}" MATCHES "-dev$" )
 	SET ( DEFAULT_TESTS      ON )
 endif()
 

diff --git a/Installation.md b/Installation.md
@@ -7,9 +7,9 @@ For Windows and macOS is an installation file available on our [Release page](ht
 
 ## Linux:
 On the following operating systems, Hyperion can currently be installed/updated using the method listed below:
-- Raspbian Stretch/Raspberry Pi OS and later (armhf/arm64)
-- Debian Stretch (9) and later (armhf/arm64/x86_64)
-- Ubuntu 18.04 and later (armhf/arm64/x86_64)
+- Raspbian Buster/Raspberry Pi OS and later (armhf/arm64)
+- Debian Buster(10) and later (armhf/arm64/x86_64)
+- Ubuntu 20.04 and later (armhf/arm64/x86_64)
 
 ***
 

diff --git a/assets/webconfig/i18n/en.json b/assets/webconfig/i18n/en.json
@@ -560,7 +560,9 @@
     "edt_conf_webc_keyPassPhrase_title": "Key password",
     "edt_conf_webc_keyPath_expl": "Path to the key file (format PEM, encrypted with RSA)",
     "edt_conf_webc_keyPath_title": "Private key path",
-    "edt_conf_webc_sslport_expl": "Port oft the HTTPS-Webserver",
+    "edt_conf_webc_port_expl": "Port for the WebServer, RPC and WebSocket HTTP connections",
+    "edt_conf_webc_port_title": "HTTP Port",
+    "edt_conf_webc_sslport_expl": "Port for the WebServer, RPC and WebSocket HTTPS connections",
     "edt_conf_webc_sslport_title": "HTTPS Port",
     "edt_dev_auth_key_title": "Authentication Token",
     "edt_dev_auth_key_title_info": "Authentication Token required to acccess the device",

diff --git a/bin/scripts/docker-compile.sh b/bin/scripts/docker-compile.sh
@@ -62,8 +62,7 @@ function printHelp {
 echo "########################################################
 ## A script to compile Hyperion inside a docker container
 ## Requires installed Docker: https://www.docker.com/
-## Without arguments it will compile Hyperion for Debian Buster (x86_64) and uses Hyperion code from GitHub repository.
-## Supports Raspberry Pi (armv6l, armv7l) cross compilation (Debian Stretch/Buster) and native compilation (Raspbian Stretch/Buster)
+## Without arguments it will compile Hyperion for Debian Bullseye (x86_64) and uses Hyperion code from GitHub repository.
 ## For all images and tags currently available, see https://github.com/orgs/hyperion-project/packages
 ##
 ## Homepage: https://www.hyperion-project.org
@@ -73,7 +72,7 @@ echo "########################################################
 #
 # docker-compile.sh -h, --help          # Show this help message
 # docker-compile.sh -i, --image         # The docker image, e.g., x86_64, armv6l, armv7l, aarch64
-# docker-compile.sh -t, --tag           # The docker tag, e.g., stretch, buster, bullseye, bookworm
+# docker-compile.sh -t, --tag           # The docker tag, e.g., buster, bullseye, bookworm
 # docker-compile.sh -b, --type          # Release or Debug build
 # docker-compile.sh -p, --packages      # If true, build packages with CPack
 # docker-compile.sh -l, --local         # Run build using local code files