From b499ec80540014782ea92d843cbcd1f7a76258f5 Mon Sep 17 00:00:00 2001 From: vollstock Date: Tue, 23 Jul 2024 16:25:39 +0200 Subject: [PATCH] build and deploy on arm64 --- README.md | 13 ++++++++++--- deploy-tooloop-package.sh | 19 +++++++++++-------- out/Tooloop OS Package/package/DEBIAN/control | 5 ++--- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 6fc0029..1cf7f84 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,15 @@ # Install dev environment +Only on arm64 + ```bash -sudo apt install node +wget https://launchpad.net/ubuntu/+source/phantomjs/2.1.1+dfsg-2ubuntu1/+build/19118060/+files/phantomjs_2.1.1+dfsg-2ubuntu1_arm64.deb +sudo apt install ./phantomjs_2.1.1+dfsg-2ubuntu1_arm64.deb +``` + +```bash +sudo apt install nodejs sudo apt install npm sudo apt install rpm @@ -12,8 +19,8 @@ npm install # On Linux # https://github.com/electron/electron/issues/17972 -sudo chown root chrome-sandbox -chmod 4755 chrome-sandbox +sudo chown root node_modules/electron/dist/chrome-sandbox +sudo chmod 4755 node_modules/electron/dist/chrome-sandbox # for cross compilation Mac -> Linux brew install dpkg diff --git a/deploy-tooloop-package.sh b/deploy-tooloop-package.sh index cc2ff93..082e86e 100644 --- a/deploy-tooloop-package.sh +++ b/deploy-tooloop-package.sh @@ -2,22 +2,25 @@ # set -e +# Get current cpu architecture +architecture=$(dpkg --print-architecture) + # Remove old builds excluding scripts and config example find ./out/Tooloop\ OS\ Package/package/assets/presentation/ -type f -not -name '*sh' -not -name 'config*' -print0 | xargs -0 rm -f -- -# unzip zip -unzip -o ./out/make/zip/linux/x64/Tooloop\ Kiosk\ Browser-linux-x64-1.0.0.zip -d ./out/Tooloop\ OS\ Package/package/assets/presentation +# Unzip zip +unzip -o ./out/make/zip/linux/$architecture/Tooloop\ Kiosk\ Browser-linux-$architecture-1.0.0.zip -d ./out/Tooloop\ OS\ Package/package/assets/presentation -# move contents to Tooloop package directory -mv -f ./out/Tooloop\ OS\ Package/package/assets/presentation/Tooloop\ Kiosk\ Browser-linux-x64/* ./out/Tooloop\ OS\ Package/package/assets/presentation/ +# Move contents to Tooloop package directory +mv -f ./out/Tooloop\ OS\ Package/package/assets/presentation/Tooloop\ Kiosk\ Browser-linux-$architecture/* ./out/Tooloop\ OS\ Package/package/assets/presentation/ -# remove empty directory -rm -fr ./out/Tooloop\ OS\ Package/package/assets/presentation/Tooloop\ Kiosk\ Browser-linux-x64/ +# Remove empty directory +rm -fr ./out/Tooloop\ OS\ Package/package/assets/presentation/Tooloop\ Kiosk\ Browser-linux-$architecture/ -# copy package to package project +# Copy package to package project cp -fr ./out/Tooloop\ OS\ Package/ /home/tooloop/Tooloop-Packages/kiosk-browser -# re-build and deploy all packages and update control center +# Re-build and deploy all packages and update control center cd /home/tooloop/Tooloop-Packages/ /bin/bash /home/tooloop/Tooloop-Packages/build.sh /bin/bash /home/tooloop/Tooloop-Packages/deploy.sh diff --git a/out/Tooloop OS Package/package/DEBIAN/control b/out/Tooloop OS Package/package/DEBIAN/control index 76421f1..f573936 100644 --- a/out/Tooloop OS Package/package/DEBIAN/control +++ b/out/Tooloop OS Package/package/DEBIAN/control @@ -2,14 +2,13 @@ Package: tooloop-kiosk-browser Version: 1.0.0 Maintainer: Tooloop Multimedia Homepage: https://www.tooloop.de -Bugs: https://github.com/Tooloop/Tooloop-Packages +Bugs: https://www.tooloop.de Section: tooloop/presentation Architecture: all Recommends: tooloop-transparent-cursor Suggests: tooloop-nginx Name: Kiosk Browser Description: A feature-rich fullscreen browser for touch kiosks - A simple full-screen kiosk browser based on chromium. - You can define its’ homepage in the settings. + A full-screen kiosk browser. Thumbnail: thumbnail-kiosk-browser.png