add built/install structure for prawnos config packages

scripts/BuildScripts/FilesystemScripts/buildFilesystem.sh

@@ -294,6 +294,15 @@ cd $PRAWNOS_ROOT && make filesystem_packages_install  TARGET=$TARGET_ARCH INSTAL
 chroot $outmnt apt install -y ${prawnos_base_debs_prebuilt_install[@]}
 chroot $outmnt apt install -y -d ${prawnos_base_debs_prebuilt_download[@]}
 chroot $outmnt apt install -y -d ${prawnos_xfce_debs_prebuilt_download[@]}
+if [ $TARGET_ARCH = "armhf" ]
+then
+    chroot $outmnt apt install -y -d ${prawnos_armhf_debs_prebuilt_download[@]}
+fi
+
+if [ $TARGET_ARCH = "arm64" ]
+then
+    chroot $outmnt apt install -y -d ${prawnos_arm64_debs_prebuilt_download[@]}
+fi
 
 ## PrawnOS mesa packages
 # PrawnOS only has specific mesa packages when the debian upstream versions are too old.

scripts/InstallScripts/InstallPackages.sh

@@ -76,37 +76,32 @@ done
 #Set the timezone
 dpkg-reconfigure tzdata
 
+## GENERAL CONFIG
 #Install shared packages
 DEBIAN_FRONTEND=noninteractive apt install -y ${base_debs_download[@]}
 DEBIAN_FRONTEND=noninteractive apt install -y ${prawnos_base_debs_prebuilt_download[@]}
 
+DEBIAN_FRONTEND=noninteractive apt install -y prawnos-general-config
 
-## GENERAL CONFIG
-
-dpkg -i /prawnos-general-config*.deb
-
-
-## DEVICE SPECIFIC
+## DEVICE SPECIFIC CONFIG
 #Copy in acpi, pulse audio, trackpad settings, funtion key settings
 device_model=$(get_device)
 
 if [[ $device_model == $device_veyron_speedy ]] || [[ $device_model == $device_veyron_minnie ]]
 then
-    dpkg -i /prawnos-veyron-config*.deb
+    DEBIAN_FRONTEND=noninteractive apt install -y prawnos-veyron-config
 fi
 
-#if [[ $device_model == $device_gru_kevin ]] || [[ $device_model == $device_gru_bob ]]
-#then
-#nothing for now
-#dpkg -i /prawnos-gru-config*.deb
-#fi
-
+if [[ $device_model == $device_gru_kevin ]] || [[ $device_model == $device_gru_bob ]]
+then
+    DEBIAN_FRONTEND=noninteractive apt install -y prawnos-gru-config
+fi
 
 ## DE SPECIFIC
 if [ "$DE" = "gnome" ]
 then
 
-  apt install -y ${gnome_debs_download[@]}
+  DEBIAN_FRONTEND=noninteractive apt install -y ${gnome_debs_download[@]}
 
   #apply gsettings and tweaks changes
   cp $DIR/Gnome/prawnos-setting-schema/* /usr/share/glib-2.0/schemas/
@@ -129,28 +124,14 @@ then
   apt install -y ${prawnos_xfce_debs_prebuilt_download[@]}
 
   # remove light-locker, as it is broken on this machine. See issue https://github.com/SolidHal/PrawnOS/issues/56#issuecomment-504681175
-  # apt remove -y light-locker
-  # apt purge -y light-locker
+  apt remove -y light-locker
+  apt purge -y light-locker
 
   #Install packages not in an apt repo
   # TODO: likely drop this in favor of just using the upstream
   dpkg -i $DIR/xfce-themes/*
-
-  dpkg -i /prawnos-xfce-config*.deb /libinput-gestures*.deb
-
-  ###PLANK 
-  #Make plank autostart
-  # cp $DIR/xfce-config/plank/plank.desktop /etc/xdg/autostart/
-
-  #install plank launcher
-  # mkdir -p /etc/skel/.config/plank/dock1/launchers/
-  # cp -rf $DIR/xfce-config/plank/plank-launchers/* /etc/skel/.config/plank/dock1/launchers/
-
 fi
 
-
-
-
 apt clean -y && apt autoremove --purge -y
 
 #reload the CA certificate symlinks

scripts/Shared/package_lists.sh

@@ -169,10 +169,13 @@ gnome_debs_download=(
 # and choosing xfce
 prawnos_xfce_debs_prebuilt_download=(
     xsecurelock
+    prawnos-xfce-config
+    libinput-gestures
 )
 
 # packages built by prawnos, to be installed when running InstallPrawnOS
 prawnos_base_debs_prebuilt_download=(
+    prawnos-general-config
 )
 
 # packages built by prawnos, to be installed at build time
@@ -200,4 +203,12 @@ prawnos_mesa_prebuilt_install=(
     mesa-vulkan-drivers=20.2.1-100
 )
 
+prawnos_armhf_debs_prebuilt_download=(
+    prawnos-veyron-config
+)
+
+prawnos_arm64_debs_prebuilt_download=(
+    prawnos-gru-config
+)
+
 # ====================================== END Package Lists =======================================