Revert "remove kclock for now"

This reverts commit e091bd3.
Sineware · Nov 7, 2023 · 003a63c · 003a63c
1 parent e091bd3
commit 003a63c
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 59 deletions.
diff --git a/.env b/.env
@@ -1,16 +1 @@
-KDE_CACHE=true
-
-PROLINUX_VARIANT=embedded
-PROLINUX_CHANNEL=dev
-
-TARGET_DEVICE=tablet-x64uefi
-
-MUSL_TOOLCHAIN=/home/seshpenguin/Documents/projects/prolinux-2/tmp/x86_64-linux-musl-native
-
-PGUSER=postgres
-PGHOST=192.168.11.88
-PGPASSWORD=Genesis?123SQL
-PGDATABASE=ocs2
-PGPORT=5432
-
-PRIVATE_KEY=LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb2dJQkFBS0NBUUJsUG5xNHZtdms2ZnZVMGFiZHpnTWwyM2FGVnZCcmRZcUEwRVF5eEYzYWk1WktrR1FXCm41NGlHTFlISEoyZ2Zzb1FpK0pHcDFDUHNLZDJTYnhHekNFaE5jTW52ZWtOREZMblFRQlYyQ2lSZnZaNjZjRisKRDBaTHhoOUMzZ3RHbDgrTFhPY3JGUXplTyttUmhiQVJDdVQ3ZWdZZkRCdUFrNzdkWjZJcVRrbnU3VEhNNE5RTQoyeXUrWU1WeFpMN3dFOHpVU0s5bjZWZTlKUTNDWWZQUmtnMUk3TEF1MXRNeHpyR04rOTB4bURXQXpDNjA4QkN6CllCMURwR280d3QzUTRXbldIR05wZlRnbDdaeW1FVnZsdG9iOExiT3A3VGlub3AyM0h0N3VaeGcxbmhJTHJ1RFgKQ01xNnE4cVZzdjMxSDUvVC9rdExxVGlnQmNTdWQ5bEsxd016QWdNQkFBRUNnZ0VBVTM1dU9MTVpTYVJKUVo1UQpUYlZhMVRxakNKM0ZFZW5TZWg3SFQxS3Z6ODZ6OS9RU0JySkY5L3FIQzJCbkFmZnQ3aTFlUTBReVpQMmJiU3FyCjhYcmdpNEhKMnBsOGUzMUJWV00rd296TUVBa3pmZlFPMVVZRmcvSDB6L0ZNUFVCdk1aQkJPRDlZNkdGaVl0ZHMKZHZHVUcydnJabWxXdVBlZlBQbjlPNFJxNW5WNC9jYzFIVjkzUU9qd0hKWDgvdlR0aVkzSDNhWUJCbW1zNyswTwpaNTJPZkZoR1VkbHFSZUdQUFBVUnNhZzJ3MHlYSUhZQWw2OFhaTmYxUkFMWEdnOFZPR1BzUjYwano5Znh1QzdOCklacnNDK3puM0dnY1FtOE4yTFNkZUlxcGFyTE1DeE9uOW5xYTg5QnI2ZHF4ODcxeEc2Vms3d1U1Q21ZNUJYTEIKZ3p1OUFRS0JnUURHUmdLV0tUajllRlBKc2JnczlTL1l2THIvRmpObnFOaTk5QzN2TnYvOUZjODVtOEIyQjBNVQpNVks4bTR3aTgvQzlxVmpxeW80RTErd0IwRW1ZSWtMVkJoLzQ4bzh6OEN5VGRvN0NBaFlncHcwNzZCd1hyeGE5Ck1YMjdobGhzcXU5TW05cUJIOUdXNk9QdWs4M3NEcUw2QjdvdXZMYjBJUmxXand6Z0ozY3lzd0tCZ1FDQ3VJcEUKU2xTQzd5V216eWhhc0pQMzl0cm5NaE5QODRJRitSUS9kNkR6TXFSL0REdDc5bGdKZnhxWU9aUlBVRm1YQkx4bApoMGttWVVGbmozWFhwRGVMV0xCWTdBcG55Ymp3TnFvcldvQlBrSGVuM3NScTA0NkJLU25xc3UycmxsOGxLaHVsClJiUmlhOHBCNW5VYUY3WjBQUDdFK3lpTWhja2hnbTJ1eHk4dGdRS0JnUUREUVJDdEJiMXN4OEZqbjlOcTJxNGEKdDRsRFNYNm45M3d5WERPY0hzS3JYbjNyRW5uUEFjbktLZVI3Zm9iYnFQVU1JYWhCMStWUjJiMDk3L3Q1aVV2ZApjcUdyekZxLzRDWlZ0ZXhTSERIa1IvNWRYMi9DMXhjQ2k2bHhNWlVFdHJUZjhaK1ZoMXNrVFFhaDNRWnVEOS9wCmNCQ21sQXRya09qZCtCUEs3cktReHdLQmdIYWx3UG5TN1hvYVRmWmx1SjczL3BYbVBUSHpSWXdmM1RoR3A1WWoKb3JhYWxLdXNFcUdsS3FzVDdyT1VMNFQ5elJOQmZTNDU2SzhwUHhBY0tqMmNFNzRxdFlWQVdRRnpHcVVOT004NAp5WlZ0N3UwelNOd2RRUThDcWNVWXVwZ3ZXQlNIYjZoRzZEOGN6dXVablZnZGhjRmpTMnJHL0Rydmcyc2kweUw4Ckwxb0JBb0dBVDFFaStkZUI4MkFNejVIcm4vNWdaTnV3ME5uTVM0ejFVLzRxWEttZE5OcUxwUXp2ZjlwRThPbWYKR0RHUjVQUnNpemdIOTM4akpVWkVGSHZxVzNkQ1Rzd1p4VmVyTENMM1Z5L0FwTE5QR3djeDRkdHNFVW9LMkdLOQpYSUFRaGgrTmlmVXR0K29TcnBZZ0tzZFlhdjFOaW5ibTZKSTZyYWQrd1g1cXVkbis1NGs9Ci0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0t
+KDE_CACHE=true
diff --git a/distro-files/initramfs/init b/distro-files/initramfs/init
@@ -33,7 +33,7 @@ echo "Locked Root: $locked_root"
 echo "Disable Kexec: $disable_kexec"
 echo "----"
 
-mount -o loop /sysroot/prolinux_${selected_root}.squish /sysroot/squishroot || splash_error "Could not mount squashfs!"
+mount -o loop /sysroot/prolinux_${selected_root}.squish /sysroot/squishroot 
 
 # if pl2.stage2 is in the cmdline, OR if disable_kexec is true, we are in stage 2
 if [ "$(cat /proc/cmdline | grep pl2.stage2)" != "" ] || [ "$disable_kexec" = "true" ]; then

diff --git a/distro-files/layout/home/user/.config/kdesrc-buildrc b/distro-files/layout/home/user/.config/kdesrc-buildrc
@@ -25,7 +25,7 @@ global
     # 2. num-cores-low-mem, which is set to largest value that appears safe for
     #    particularly heavyweight modules based on total memory, intended for
     #    modules like qtwebengine
-    num-cores 24
+    num-cores 8
     num-cores-low-mem 7
 
     # kdesrc-build can install a sample .xsession file for "Custom"

diff --git a/scripts/deploy.sh b/scripts/deploy.sh
@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
 USER=swadmin
 HOST=192.168.11.213
-#HOST=192.168.1.231
 PORT=22
 DIR=/home/swadmin/jenkins/workspace/prolinux-2-mobile-dev-arm64
-#DIR=/home/user/prolinux-2
 
 rsync -e "ssh -p ${PORT}" -avz --exclude="tmp" --exclude ".git" --exclude "node_modules" --exclude "build" --exclude "output" . ${USER}@${HOST}:${DIR}
diff --git a/scripts/plr-build.sh b/scripts/plr-build.sh
diff --git a/scripts/pushImage.sh b/scripts/pushImage.sh
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 set -e 
 USER=user
-HOST=192.168.11.109
+HOST=192.168.1.231
 PORT=22
 DIR=/home/user/
 
-VARIANT=embedded
+VARIANT=mobile
 CHANNEL=dev
 
 SELECTED_ROOT=$(ssh -p ${PORT} ${USER}@${HOST} "cat /sineware/data/prolinux.toml" | grep "pl2.selected_root" | cut -d "=" -f2 | tr -d "'")

diff --git a/src/os-variants/mobile/mobile-dev.ts b/src/os-variants/mobile/mobile-dev.ts
@@ -26,7 +26,7 @@ export async function buildMobileDev() {
 
     //const packagesToBuild = "kcmutils plasma5support kirigami-addons plasma-mobile plasma-pa plasma-nm qqc2-breeze-style"
     // ktextwidgets gpgme
-    const packagesToBuild = "extra-cmake-modules kcoreaddons ki18n kconfig plasma-wayland-protocols karchive kdoctools kwidgetsaddons polkit-qt-1 kcodecs kauth kguiaddons kwindowsystem kcolorscheme kconfigwidgets kdbusaddons kcrash kiconthemes kcompletion kitemviews sonnet kglobalaccel kservice ktextwidgets qca knotifications kxmlgui kbookmarks kjobwidgets kwallet kwallet-pam solid kactivities kpackage kio kcmutils kirigami kdeclarative kwayland kidletime oxygen-icons kparts syntax-highlighting kdnssd kitemmodels ktexteditor kunitconversion threadweaver attica kcmutils ksvg plasma-framework syndication knewstuff frameworkintegration kdecoration layer-shell-qt libkscreen poppler krunner breeze kscreenlocker libqaccessibilityclient zxing-cpp phonon kfilemetadata kpty networkmanager-qt kpipewire kglobalacceld wayland-protocols kwin libkexiv2 selenium-webdriver-at-spi baloo kactivities-stats kded kdesu kholidays knotifyconfig kpeople kquickcharts modemmanager-qt prison libksysguard plasma-nano kuserfeedback kirigami-addons plasma5support kstatusnotifieritem plasma-workspace bluez-qt milou plasma-mobile plasma-nm plasma-pa qqc2-breeze-style plasma-settings kactivitymanagerd ksystemstats qqc2-desktop-style kscreen powerdevil plasma-desktop bluedevil plasma-integration breeze-icons konsole qmlkonsole purpose futuresql kquickimageeditor angelfish kweathercore extragear/utils/kweather kalk appstream discover polkit-kde-agent-1 kde-cli-tools xdg-desktop-portal-kde kcontacts kmoretools dolphin alligator elisa kasts keysmith koko tokodon spectacle"
+    const packagesToBuild = "extra-cmake-modules kcoreaddons ki18n kconfig plasma-wayland-protocols karchive kdoctools kwidgetsaddons polkit-qt-1 kcodecs kauth kguiaddons kwindowsystem kcolorscheme kconfigwidgets kdbusaddons kcrash kiconthemes kcompletion kitemviews sonnet kglobalaccel kservice ktextwidgets qca knotifications kxmlgui kbookmarks kjobwidgets kwallet kwallet-pam solid kactivities kpackage kio kcmutils kirigami kdeclarative kwayland kidletime oxygen-icons kparts syntax-highlighting kdnssd kitemmodels ktexteditor kunitconversion threadweaver attica kcmutils ksvg plasma-framework syndication knewstuff frameworkintegration kdecoration layer-shell-qt libkscreen poppler krunner breeze kscreenlocker libqaccessibilityclient zxing-cpp phonon kfilemetadata kpty networkmanager-qt kpipewire kglobalacceld wayland-protocols kwin libkexiv2 selenium-webdriver-at-spi baloo kactivities-stats kded kdesu kholidays knotifyconfig kpeople kquickcharts modemmanager-qt prison libksysguard plasma-nano kuserfeedback kirigami-addons plasma5support kstatusnotifieritem plasma-workspace bluez-qt milou plasma-mobile plasma-nm plasma-pa qqc2-breeze-style plasma-settings kactivitymanagerd ksystemstats qqc2-desktop-style kscreen powerdevil plasma-desktop bluedevil plasma-integration breeze-icons konsole qmlkonsole purpose futuresql kquickimageeditor angelfish kclock kweathercore extragear/utils/kweather kalk appstream discover polkit-kde-agent-1 kde-cli-tools xdg-desktop-portal-kde kcontacts kmoretools dolphin alligator elisa kasts keysmith koko tokodon spectacle"
 
     // todo remove ssh-keygen -A from here
     if(process.env.KDE_CACHE === "true") {