From 11e88789b7e24834eae8efe30e7496f7faadeaff Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sat, 24 Apr 2021 14:13:52 +0200
Subject: [PATCH] platforms: added diskimg variant raspberrypi-plasma

---
 platforms/diskimg/Makefile      | 1 +
 platforms/diskimg/post.inc.sh   | 2 +-
 platforms/diskimg/pre.inc.sh    | 6 ++++++
 platforms/rootfs-light/Makefile | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/platforms/diskimg/Makefile b/platforms/diskimg/Makefile
index bc85a85..f6ce9b7 100644
--- a/platforms/diskimg/Makefile
+++ b/platforms/diskimg/Makefile
@@ -6,3 +6,4 @@ $(MAKEDIST_TARGET)-diskimg-bananapi:
 $(MAKEDIST_TARGET)-diskimg-cubox:
 $(MAKEDIST_TARGET)-diskimg-livecd:
 $(MAKEDIST_TARGET)-diskimg-raspberrypi:
+$(MAKEDIST_TARGET)-diskimg-raspberrypi-plasma:
diff --git a/platforms/diskimg/post.inc.sh b/platforms/diskimg/post.inc.sh
index fa9f8ab..28495cb 100644
--- a/platforms/diskimg/post.inc.sh
+++ b/platforms/diskimg/post.inc.sh
@@ -1,6 +1,6 @@
 [ "$RELEASE" -a "$RELEASE" != "devel" ] && RELEASE_ADD="-$RELEASE" || RELEASE_ADD=
 if [ "$MODE" = "rootfsinstall" ]; then
-   DISKIMG_FILE="$LOCALSTATEDIR/openmamba-rootfs-light${RELEASE_ADD}-$LANGUAGE.$DEVICEARCH.tar.xz"
+   DISKIMG_FILE="$LOCALSTATEDIR/${BASE_IMAGE}${RELEASE_ADD}-$LANGUAGE.$DEVICEARCH.tar.xz"
    echo "Using image $DISKIMG_FILE..."
    /usr/sbin/rootfsinstall -y $ROOTFSINSTALL_ADD $LOOPDEV $DISKIMG_FILE || \
        { retcode=$?
diff --git a/platforms/diskimg/pre.inc.sh b/platforms/diskimg/pre.inc.sh
index 60f53b4..686d848 100644
--- a/platforms/diskimg/pre.inc.sh
+++ b/platforms/diskimg/pre.inc.sh
@@ -5,6 +5,7 @@ case $VARIANT in
    cubox) MODE=rootfsinstall; ROOTFSINSTALL_ADD="-cubox"; MEDIA_SIZE=4192 ;;
    livecd) MODE=usbinstall; ROOTFSINSTALL_ADD= ;;
    raspberrypi)
+      BASE_IMAGE="openmamba-rootfs-light"
       MODE=rootfsinstall
       if [ "$ARCH" == "aarch64" ]; then
           ROOTFSINSTALL_ADD="-rpi64"
@@ -12,5 +13,10 @@ case $VARIANT in
           ROOTFSINSTALL_ADD="-rpi"
       fi
       MEDIA_SIZE=6144 ;;
+   raspberrypi-plasma)
+      BASE_IMAGE="openmamba-rootfs"
+      MODE=rootfsinstall
+      ROOTFSINSTALL_ADD="-rpi64"
+      MEDIA_SIZE=6912 ;;
    *) MODE=rootfsinstall; ROOTFSINSTALL_ADD= ;;
 esac
diff --git a/platforms/rootfs-light/Makefile b/platforms/rootfs-light/Makefile
index 529ad50..5b0c338 100644
--- a/platforms/rootfs-light/Makefile
+++ b/platforms/rootfs-light/Makefile
@@ -11,7 +11,7 @@ $(MAKEDIST_TARGET)-$(PLATFORM)-x86_64: \
              kernel-mamba-x86_64 firefox sddm
 
 $(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \
-             lxqt-session openbox lxqt-archiver lximage-qt \
+             lxqt-session openbox lxqt-archiver lximage-qt blueman \
              openssh-server usbutils wireless_tools screen \
              parted iputils file rootfiles ppp minicom locales mc \
              man-db curl zip unzip iptables iproute wpa_supplicant nfs-utils \