Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrades and split into three OS versions #40

Merged
merged 43 commits into from
Jul 26, 2023
Merged

Upgrades and split into three OS versions #40

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
053e275
upgrade to pi4j 2.2.0
DieterHolz Aug 31, 2022
d1c000a
Merge branch 'main' into upgrade-jdk18-jfx18
DieterHolz Aug 31, 2022
bb5c659
upgrade to RaspiOS
DieterHolz Aug 31, 2022
4de873a
upgrade to RaspiOS
DieterHolz Aug 31, 2022
e0fd055
rollback RaspiOS
DieterHolz Aug 31, 2022
631f51d
next try to update RaspiOS
DieterHolz Aug 31, 2022
30ab0cd
given up to update RaspiOS there seems to be a problem with Wallpaper
DieterHolz Sep 1, 2022
a5cbb73
some upgrades
DieterHolz Jun 9, 2023
64d1de8
upgrade pi4j 2.3.0
DieterHolz Jun 9, 2023
6a0da8b
sdkman install
DieterHolz Jun 9, 2023
bff8dce
sdkman install
DieterHolz Jun 9, 2023
f899427
sdkman install
DieterHolz Jun 9, 2023
c640927
sdkman install
DieterHolz Jun 9, 2023
3c6c32b
sdkman install
DieterHolz Jun 9, 2023
4cc2dea
given up to use sdkman
DieterHolz Jun 9, 2023
6346e5a
pi4j wallpaper disabled
DieterHolz Jun 9, 2023
e767d08
pi4j wallpaper disabled
DieterHolz Jun 10, 2023
b3771ad
pi4j wallpaper disabled
DieterHolz Jun 10, 2023
5c3610c
add a default user
DieterHolz Jun 10, 2023
3bf7edb
add a default user
DieterHolz Jun 10, 2023
5750fb7
add a default user
DieterHolz Jun 10, 2023
e1cbe55
add a default user
DieterHolz Jun 10, 2023
f667525
add a default user
DieterHolz Jun 10, 2023
d1e3897
add a default user
DieterHolz Jun 10, 2023
9238674
add a default user
DieterHolz Jun 10, 2023
5b3027f
switch back to older RaspiOS
DieterHolz Jun 10, 2023
ed8e5e6
wip
DieterHolz Jun 10, 2023
a64748e
java-kiosk small fix
DieterHolz Jun 10, 2023
66c3344
added a new image type: Pi4J-Basic-OS
DieterHolz Jun 11, 2023
6f08ab4
update workflow and README
DieterHolz Jun 11, 2023
afa2bcd
adjust image names
DieterHolz Jun 11, 2023
20275af
adjust image names
DieterHolz Jun 11, 2023
b97928d
upgraded deprecated github actions
DieterHolz Jun 11, 2023
652226a
wip
DieterHolz Jun 11, 2023
a3e7d50
wip
DieterHolz Jun 11, 2023
a5250cf
README updated
DieterHolz Jun 12, 2023
e678646
fix for PicadeOS
DieterHolz Jun 27, 2023
551e2f5
clarifications in README
DieterHolz Jun 28, 2023
4c1c6fa
enabled UART install gps support
DieterHolz Jul 13, 2023
e7cbae5
spi1 configuration
DieterHolz Jul 18, 2023
0b6d35a
camera enabled
DieterHolz Jul 19, 2023
f500405
upgrade JavaFX to 20.0.2
DieterHolz Jul 24, 2023
09c5993
Fix typo
Jul 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions base/base.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
set -euxo pipefail

# Script configuration
declare -gr GLUON_JAVAFX_VERSION="18.0.2"
declare -gr JDK="17.0.7-tem"
DieterHolz marked this conversation as resolved.
Show resolved Hide resolved
declare -gr GLUON_JAVAFX_VERSION="20.0.1"
declare -gr GLUON_JAVAFX_URL="https://download2.gluonhq.com/openjfx/${GLUON_JAVAFX_VERSION}/openjfx-${GLUON_JAVAFX_VERSION}_monocle-linux-aarch64_bin-sdk.zip"
declare -gr GLUON_JAVAFX_PATH="/opt/javafx-sdk"
declare -gr GLUON_JAVAFX_VERSION_PATH="/opt/javafx-sdk-${GLUON_JAVAFX_VERSION}"
Expand Down Expand Up @@ -39,10 +40,14 @@ apt-get -y install \
libdrm-dev \
lirc \
maven \
openjdk-17-jdk \
zip
rm -rf /var/lib/apt/lists/*

export SDKMAN_DIR="/usr/local/sdkman" && curl -s "https://get.sdkman.io" | bash
source "/usr/local/sdkman/bin/sdkman-init.sh"
DieterHolz marked this conversation as resolved.
Show resolved Hide resolved
sdk install java "${JDK}"


# Download and extract Gluon JavaFX
wget -O /tmp/gluon-javafx.zip "${GLUON_JAVAFX_URL}"
rm -rf "${GLUON_JAVAFX_VERSION_PATH}"
Expand Down
2 changes: 1 addition & 1 deletion base/resources/java-deploy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<!-- BUILD PROPERTIES -->
<properties>
<pi4j.version>2.1.1</pi4j.version>
<pi4j.version>2.3.0</pi4j.version>

<slf4j.version>1.7.32</slf4j.version>

Expand Down
15 changes: 12 additions & 3 deletions crowpi.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
source "arm" "raspios" {
# Raspberry Pi OS with Desktop
# file_urls = [
# "https://downloads.raspberrypi.org/raspios_arm64/images/raspios_arm64-2022-01-28/2022-01-28-raspios-bullseye-arm64.zip"
# ]
# file_checksum_url = "https://downloads.raspberrypi.org/raspios_arm64/images/raspios_arm64-2022-01-28/2022-01-28-raspios-bullseye-arm64.zip.sha256"
# file_checksum_type = "sha256"
# file_target_extension = "zip"


file_urls = [
"https://downloads.raspberrypi.org/raspios_arm64/images/raspios_arm64-2022-01-28/2022-01-28-raspios-bullseye-arm64.zip"
"https://downloads.raspberrypi.org/raspios_arm64/images/raspios_arm64-2023-05-03/2023-05-03-raspios-bullseye-arm64.img.xz"
]
file_checksum_url = "https://downloads.raspberrypi.org/raspios_arm64/images/raspios_arm64-2022-01-28/2022-01-28-raspios-bullseye-arm64.zip.sha256"
file_checksum_url = "https://downloads.raspberrypi.org/raspios_arm64/images/raspios_arm64-2023-05-03/2023-05-03-raspios-bullseye-arm64.img.xz.sha256"
file_checksum_type = "sha256"
file_target_extension = "zip"
file_target_extension = "xz"
file_unarchive_cmd = ["xz", "--decompress", "$ARCHIVE_PATH"]

# Image Options
image_build_method = "resize"
Expand Down