Add OpenCV to installed imaged. Developer: Add OpenJDK-11 next to OpenJDK-17 and the OpenCV developer dependencies

8 files changed, 11 insertions, 6 deletions

diff --git a/scripts/01-build-raspi_deb11_arm64-rw-lightxdev-jau.cfg b/scripts/01-build-raspi_deb11_arm64-rw-lightxdev-jau.cfg
index 9d57a33..522108b 100644
--- a/scripts/01-build-raspi_deb11_arm64-rw-lightxdev-jau.cfg
+++ b/scripts/01-build-raspi_deb11_arm64-rw-lightxdev-jau.cfg
@@ -13,7 +13,7 @@ export RELEASE=bullseye
 export APT_PROXY=http://jordan:3142
 
 export CUSTOM_NAME="RaspiArm64LightDev"
-export CUSTOM_VERSION="1.3-rw"
+export CUSTOM_VERSION="1.4-rw"
 
 export PI_GEN="pi-gen (jau branch)"
 
diff --git a/scripts/01-build-raspi_deb11_arm64-rw-lightxdev.cfg b/scripts/01-build-raspi_deb11_arm64-rw-lightxdev.cfg
index 24121d6..fe7f165 100644
--- a/scripts/01-build-raspi_deb11_arm64-rw-lightxdev.cfg
+++ b/scripts/01-build-raspi_deb11_arm64-rw-lightxdev.cfg
@@ -13,7 +13,7 @@ export RELEASE=bullseye
 # export APT_PROXY=http://jordan:3142
 
 export CUSTOM_NAME="RaspiArm64LightDev"
-export CUSTOM_VERSION="1.3-rw"
+export CUSTOM_VERSION="1.4-rw"
 
 export PI_GEN="pi-gen (custom branch)"
 
diff --git a/scripts/01-build-raspi_deb12_arm64-rw-lightxdev-jau.cfg b/scripts/01-build-raspi_deb12_arm64-rw-lightxdev-jau.cfg
index 91fe8df..c6361db 100644
--- a/scripts/01-build-raspi_deb12_arm64-rw-lightxdev-jau.cfg
+++ b/scripts/01-build-raspi_deb12_arm64-rw-lightxdev-jau.cfg
@@ -14,7 +14,7 @@ export RELEASE=bookworm
 export APT_PROXY=http://jordan:3142
 
 export CUSTOM_NAME="RaspiArm64LightDev"
-export CUSTOM_VERSION="1.3-rw"
+export CUSTOM_VERSION="1.4-rw"
 
 export PI_GEN="pi-gen (jau branch)"
 
@@ -38,6 +38,7 @@ export FIRST_USER_NAME="pi"
 export FIRST_USER_PASS="pi"
 export ENABLE_SSH=1
 export PUBKEY_SSH_FIRST_USER="ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAm2qfo3uiWT9V7E/sH6unVO6XhGHeNnGUswxuADwFAKyflJq2yCALWIX7+DzEhBc7O9HxVztZAHLA+lfEpctQkA7KPgX98rjLHJlrm1lQXCPjwWjTZBrGNCmjWpYkc8jew/BzngmiwDlshYqzp0rWKNvQbkGJaVctqaraJAzE3F2wa+KkSBQuw2rAhiarbiO4MtO1AIw25EnSXHhP9EpeTKhAniKm73q977m5wpzaU+uwoGPCIyVl+BeaGLbPPIF35PJbg4tIqG6WLy3a8++Mf5Ml8lETcYYfjh4er3CvqFLhAYcaCLPNOwkK/YT4UnYZoZ4nt0Z+JWjxeNhIuJf64neysBdgB5E5FEYP2iYH+EUjcYp7YCrl/3/ag4Z2KAsF2qEa6/+s90Clm0r2mqRcQyLYQ6Co1YlYa1/jq7qsiuNgWvn5Mg8Pt4+L/C0KoycvUr4HhTS8EBJx+774p2uBa3mB65Vg2llKb8DdtQwR1bh0Ot9cjKTJY0pDyPiFbemZh2q7qD958bsOZCly43WYRd6E0Df68Q2MTz6ZC1y+z103gsEiK8bXmZp42ghDa96Ik2JO6pWCEUjBJ/9+rdudRHcfDlBqoS6+wg/z+WvtRtEyvVO4LSTrsX5xHWzVloSZeAGowmLbxGWHGWfl5oCcNfUzXo0lXDP0bzyy5NxWkpE= sven@phalanx"
+export PUBKEY2_SSH_FIRST_USER="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC+pMJr432NOaDKnVN9+KDARU3XPDCMcwlsDdFHAEuVIGiNE2yxsC+UVKqu2+ZWKIlNET0zW8b87WsWVwiTa58lkxVre3g9DYAXpV7HPsf0bpTmzKqfPUC2z52aISluH/+Mf5FlytqFgpzx1VxREjvAw2H0GFE2K7+GsVcDFxjd5hv81FVAO9KISFnVVP9i+mSR7P4QOUYmXMw7Zq1z6hjXAGxXupEx8p/6KCqgo1tdVQBefJNOJpCABDI0yHgRsXnm7CUv1a/vM7QfCsn1hugcEGilacBLBcQp6EhXvleavX3ixffNV9RmOO0X06/EVwBtgal9aH375XABWihUi3EkRvfRqo07eieWzTIj6gO+AhZmuu4X/o53W5BG+cgMRV/+VGsLijH6jdvVv9W+motjX16TSHbSBHFaiwFyreAFi/A7WiUqdcbe12nnUsHlumhJSAIynCHKy6hgFEuGQFdENcudCgNMF7SDQEB52TwiO6BZuP6VHw4nNqxm+sbmKjgKi5vTrzIe7JkuRX+eIZLFZifFS7kfIRfQY67sCerTYsnC0Y0muX+VixKG3FIL6iSlF3KLOd41LPVNmBbpZK7oC62qrXBhvgA2d9D92o5rzqFCA6obEYiEDgyN6liASJD6VFNey366FyZzsf2U2dUeHFkyUxY0EEEFNeoOPhF5SQ== [email protected]"
 export PUBKEY_ONLY_SSH=1
 
 export STAGE_LIST="stage0 stage1 stage2 stage3a stage3a_dev"
diff --git a/scripts/01-build-raspi_deb12_arm64-rw-lightxdev.cfg b/scripts/01-build-raspi_deb12_arm64-rw-lightxdev.cfg
index 8283202..863fc96 100644
--- a/scripts/01-build-raspi_deb12_arm64-rw-lightxdev.cfg
+++ b/scripts/01-build-raspi_deb12_arm64-rw-lightxdev.cfg
@@ -14,7 +14,7 @@ export RELEASE=bookworm
 # export APT_PROXY=http://jordan:3142
 
 export CUSTOM_NAME="RaspiArm64LightDev"
-export CUSTOM_VERSION="1.3-rw"
+export CUSTOM_VERSION="1.4-rw"
 
 export PI_GEN="pi-gen (custom branch)"
 
diff --git a/stage3a/00-install-packages/00-packages-bookworm b/stage3a/00-install-packages/00-packages-bookworm
index eec4590..7b8ad53 100644
--- a/stage3a/00-install-packages/00-packages-bookworm
+++ b/stage3a/00-install-packages/00-packages-bookworm
@@ -1,2 +1,3 @@
 openjdk-17-jre openjdk-17-jre-headless openjdk-17-jre-zero openjfx
 libavcodec59 libavformat59 libavdevice59 libavutil57 libswresample4
+libopencv-java
diff --git a/stage3a/00-install-packages/00-packages-bullseye b/stage3a/00-install-packages/00-packages-bullseye
index b3057a3..b179a12 100644
--- a/stage3a/00-install-packages/00-packages-bullseye
+++ b/stage3a/00-install-packages/00-packages-bullseye
@@ -1,2 +1,3 @@
 openjdk-17-jre openjdk-17-jre-headless openjdk-17-jre-zero openjfx
 libavcodec58 libavformat58 libavdevice58 libavutil56 libswresample3
+libopencv4.5-java
diff --git a/stage3a_dev/00-install-packages/00-packages-bookworm b/stage3a_dev/00-install-packages/00-packages-bookworm
index 8d7c678..cbeadcf 100644
--- a/stage3a_dev/00-install-packages/00-packages-bookworm
+++ b/stage3a_dev/00-install-packages/00-packages-bookworm
@@ -1,2 +1,3 @@
-openjdk-17-jdk openjdk-17-jdk-headless junit4 ant
+openjdk-11-jdk openjdk-11-jre openjdk-17-jdk openjdk-17-jdk-headless junit4 ant
 libavcodec-dev libavformat-dev libavdevice-dev libavutil-dev libswresample-dev
+libopencv-java libopencv-dev
diff --git a/stage3a_dev/00-install-packages/00-packages-bullseye b/stage3a_dev/00-install-packages/00-packages-bullseye
index 8d7c678..d312a60 100644
--- a/stage3a_dev/00-install-packages/00-packages-bullseye
+++ b/stage3a_dev/00-install-packages/00-packages-bullseye
@@ -1,2 +1,3 @@
-openjdk-17-jdk openjdk-17-jdk-headless junit4 ant
+openjdk-11-jdk openjdk-11-jre openjdk-17-jdk openjdk-17-jdk-headless junit4 ant
 libavcodec-dev libavformat-dev libavdevice-dev libavutil-dev libswresample-dev
+libopencv4.5-java libopencv-dev