fix build

Sineware · Sep 28, 2023 · 92b7844 · 92b7844
1 parent 54edf79
commit 92b7844
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/scripts/pushImage.sh b/scripts/pushImage.sh
@@ -1,26 +1,29 @@
 #!/usr/bin/env bash
 set -e 
 USER=user
-HOST=192.168.11.109
+HOST=192.168.1.231
 PORT=22
 DIR=/home/user/
 
+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 "'")
 echo "Selected root: ${SELECTED_ROOT}"
 
 echo "Pushing image to ${HOST}:${DIR}"
-rsync -e "ssh -p ${PORT}" --info=progress2 -avz ./output/prolinux-root-embedded-dev.squish ${USER}@${HOST}:${DIR}
+rsync -e "ssh -p ${PORT}" --info=progress2 -avz ./output/prolinux-root-${VARIANT}-${CHANNEL}.squish ${USER}@${HOST}:${DIR}
 
 if [ "$SELECTED_ROOT" == " a" ]; then
     echo "Setting root to b..."
     ssh -p ${PORT} ${USER}@${HOST} "sed -i '/pl2.selected_root/d' /sineware/data/prolinux.toml"
     ssh -p ${PORT} ${USER}@${HOST} "echo \"pl2.selected_root = 'b'\" >> /sineware/data/prolinux.toml"
-    ssh -p ${PORT} ${USER}@${HOST} "sudo cp prolinux-root-embedded-dev.squish /sineware/prolinux_b.squish"
+    ssh -p ${PORT} ${USER}@${HOST} "sudo cp prolinux-root-${VARIANT}-${CHANNEL}.squish /sineware/prolinux_b.squish"
 else
     echo "Setting root to a..."
     ssh -p ${PORT} ${USER}@${HOST} "sed -i '/pl2.selected_root/d' /sineware/data/prolinux.toml"
     ssh -p ${PORT} ${USER}@${HOST} "echo \"pl2.selected_root = 'a'\" >> /sineware/data/prolinux.toml"
-    ssh -p ${PORT} ${USER}@${HOST} "sudo cp prolinux-root-embedded-dev.squish /sineware/prolinux_a.squish"
+    ssh -p ${PORT} ${USER}@${HOST} "sudo cp prolinux-root-${VARIANT}-${CHANNEL}.squish /sineware/prolinux_a.squish"
 
 fi
 

diff --git a/src/helpers/snap-build-state.ts b/src/helpers/snap-build-state.ts
@@ -0,0 +1,3 @@
+export async function snapBuildState() {
+    // Captures information about the build at the time of the build and adds it to a JSON array file.
+}
diff --git a/src/index.ts b/src/index.ts
@@ -86,7 +86,7 @@ async function main() {
     exec(`sudo arch-chroot ${ROOTFS_DIR} /bin/bash -x <<'EOF'
         set -e
         chown root:root /
-        echo 'Server = ${arch === "arm64" ? "https://fl.us.mirror.archlinuxarm.org/$arch/$repo" : "https://mirror.csclub.uwaterloo.ca/archlinux/$repo/os/$arch"}' > /etc/pacman.d/mirrorlist
+        echo 'Server = ${arch === "arm64" ? "https://fl.us.mirror.archlinuxarm.org/$arch/$repo" : "http://mirror.csclub.uwaterloo.ca/archlinux/$repo/os/$arch"}' > /etc/pacman.d/mirrorlist
         
         sed -i "s/#ParallelDownloads = 5/ParallelDownloads = 5/g" /etc/pacman.conf
         
@@ -97,8 +97,8 @@ async function main() {
         pacman -S --noconfirm bluez xorg-server xorg-xwayland openssh lightdm lightdm-gtk-greeter mold onboard nodejs npm flatpak rsync
         pacman -S --noconfirm appstream-qt libdmtx libxaw lua ttf-hack qrencode xorg-xmessage xorg-xsetroot zxing-cpp accountsservice exiv2 lmdb zsync
         pacman -S --noconfirm maliit-keyboard qt5-graphicaleffects xdotool libdisplay-info qcoro-qt6 gpgme
-        pacman -S $(pacman -Ssq qt6-) --noconfirm
-        pacman -S python-websocket-client python-wsaccel pyside2
+        pacman -S --noconfirm $(pacman -Ssq qt6-) 
+        pacman -S --noconfirm python-websocket-client python-wsaccel pyside2
 
         echo "Setting up user"
         ${arch === "x64" ? 'useradd -m -G wheel user' : ''}

diff --git a/src/os-variants/mobile/mobile-dev.ts b/src/os-variants/mobile/mobile-dev.ts
@@ -10,8 +10,8 @@ export async function buildMobileDev() {
         "export CC='ccache gcc'",
         "export CXX='ccache g++'",
     ] : [
-        "export CC='ccache gcc'",
-        "export CXX='ccache g++'",
+        //"export CC='ccache gcc'",
+        //"export CXX='ccache g++'",
     ]
 
     // @ts-ignore
@@ -23,7 +23,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 solid kactivities kpackage kio kcmutils kirigami kdeclarative kwayland kidletime oxygen-icons5 breeze-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 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"
+    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 solid kactivities kpackage kio kcmutils kirigami kdeclarative kwayland kidletime oxygen-icons5 breeze-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"
 
     // todo remove ssh-keygen -A from here
     if(process.env.KDE_CACHE === "true") {