add emacs and remove libreoffice

appends/meta-gnome/faenza-icon-theme_%.bbappend

@@ -0,0 +1,3 @@
+do_install:prepend() {
+    install -d ${D}${datadir}/themes
+}

conf/distro/include/mortsgna-preferred-providers.inc

@@ -7,8 +7,10 @@ PREFERRED_PROVIDER_linux-libc-headers-nativesdk  = "linux-libc-headers-nativesdk
 PREFERRED_PROVIDER_jpeg = "libjpeg-turbo"
 PREFERRED_PROVIDER_jpeg-native = "libjpeg-turbo-native"
 
-# Prefer gummiboot over grub
-EFI_PROVIDER                                     = "gummiboot"
+# Prefer systemd-boot over grub
+#EFI_PROVIDER                                     = "systemd-boot"
+# Erik: use grub for now
+EFI_PROVIDER                                     = "grub-efi"
 
 # X11
 PREFERRED_PROVIDER_virtual/libx11 = "libx11"

recipes-image/allgui/allgui-base-image.bb

@@ -3,15 +3,11 @@ require recipes-image/include/x11-base.inc
 
 export IMAGE_BASENAME = "allgui-base-image"
 
-# currently: plasma / xfce / lxqt / weston
+# currently: xfce / lxqt / weston
 IMAGE_INSTALL += " \
     ${X11_BASE_INSTALL} \
     packagegroup-gui-base \
     \
-    sddm sddm-morona-autologin \
-    \
-    kf5-world \
-    plasma-world \
     \
     packagegroup-xfce-base \
     network-manager-applet \
@@ -28,6 +24,9 @@ IMAGE_INSTALL += " \
     \
     weston weston-xwayland \
 "
+#    sddm sddm-morona-autologin 
+#    kf5-world
+#    plasma-world
 
 # reenable graphical target
 IMAGE_FEATURES += "x11-base"

recipes-image/allgui/allgui-full-image.bb

@@ -4,7 +4,6 @@ export IMAGE_BASENAME = "allgui-full-image"
 
 IMAGE_INSTALL += " \
     packagegroup-gui-full \
-    kde-world \
     \
     faenza-icon-theme \
     openzone \
@@ -21,5 +20,6 @@ IMAGE_INSTALL += " \
     \
     nodejs nodejs-npm nodejs-systemtap \
 "
+#    kde-world 
 
 IMAGE_LINGUAS:libc-glibc = "${IMAGE_LINGUAS_FULL}"

recipes-image/allgui/allgui-tiny-image.bb

@@ -11,9 +11,8 @@ IMAGE_INSTALL += " \
     rodent-icon-theme \
     adwaita-qt \
     \
-    packagegroup-kde-apps-tiny \
-    \
     packagegroup-gnome-apps \
     \
     weston-examples \
 "
+#    packagegroup-kde-apps-tiny 

recipes-image/console/console-base-image.bb

@@ -16,6 +16,7 @@ IMAGE_INSTALL += " \
     htop \
     util-linux-lsblk \
     nano \
+    emacs \
     rsync \
     wget \
     dbus-broker \

recipes-image/console/console-net-image.bb

@@ -7,7 +7,6 @@ NETWORKPACKS ?= " \
     networkmanager \
     networkmanager-openvpn \
     networkmanager-nmcli \
-    networkmanager-nmcli-bash-completion \
 "
 
 IMAGE_INSTALL += " \

recipes-image/kde/kde-base-image.bb

@@ -7,7 +7,6 @@ IMAGE_INSTALL += " \
     ${X11_BASE_INSTALL} \
     packagegroup-gui-base \
     \
-    sddm sddm-morona-autologin \
     \
     kf5-world \
     plasma-world \
@@ -15,6 +14,7 @@ IMAGE_INSTALL += " \
     konsole \
     dolphin \
 "
+#    sddm sddm-morona-autologin
 
 # reenable graphical target
 IMAGE_FEATURES += "x11-base"

recipes-image/packagegroups/packagegroup-gui-full.bb

@@ -41,7 +41,7 @@ RDEPENDS:${PN} = " \
     \
     ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-retro', 'meta-retro-world', '', d)} \
     \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'libreoffice inkscape scribus abiword-meta', '', d)} \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'inkscape scribus abiword-meta', '', d)} \
     \
     ${@bb.utils.contains('BBFILE_COLLECTIONS', 'games-layer', 'pingus supertuxkart supertux2 freeciv wesnoth-all astromenace chromium-bsu maelstrom scummvm pinball pinball-table-gnu pinball-table-hurd', '', d)} \
     \
@@ -49,8 +49,13 @@ RDEPENDS:${PN} = " \
     \
     ${@bb.utils.contains('BBFILE_COLLECTIONS', 'sdr-layer', 'packagegroup-sdr-python-extended packagegroup-sdr-gnuradio-base packagegroup-sdr-gnuradio-extended packagegroup-sdr-rtlsdr packagegroup-sdr-uhd', '', d)} \
     \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-qt5-extra', 'gottcode-world kde-apps-world qmlarkdown quaternion spectral kdreports', '', d)} \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-qt5-extra', 'gottcode-world qmlarkdown kdreports', '', d)} \
 "
+#libreoffice 
+
+# kde-apps-world
+# quaternion
+# spectral
 
 #    firefox 
 #    gursormaker

recipes-image/weston/weston-base-image.bb

@@ -7,13 +7,13 @@ inherit user-with-full-skel
 IMAGE_INSTALL += " \
     ${DISTRO_GUI_USER} \
     \
-    sddm sddm-morona-autologin \
     \
     weston \
     weston-examples \
     \
     glmark2 mesa-demos \
 "
+#    sddm sddm-morona-autologin 
 
 # reenable graphical target
 IMAGE_FEATURES += "x11-base"

recipes-image/xfce4/xfce4-base-image.bb

@@ -3,6 +3,7 @@ require recipes-image/include/x11-base.inc
 
 export IMAGE_BASENAME = "xfce4-base-image"
 
+#XFCE_DM = "sddm sddm-morona-autologin"
 XFCE_DM ?= "lxdm"
 
 IMAGE_INSTALL += " \

recipes-image/xfce4/xfce4-dev-image.bb

@@ -1,6 +1,7 @@
 require recipes-image/xfce4/xfce4-tiny-image.bb
 
-XFCE_DM = "sddm sddm-morona-autologin"
+#XFCE_DM = "sddm sddm-morona-autologin"
+XFCE_DM = "lxdm"
 
 export IMAGE_BASENAME = "xfce4-dev-image"
 

recipes-image/xfce4/xfce4-full-image.bb

@@ -1,6 +1,7 @@
 require xfce4-tiny-image.bb
 
-XFCE_DM = "sddm sddm-morona-autologin"
+#XFCE_DM = "sddm sddm-morona-autologin"
+XFCE_DM = "lxdm"
 
 export IMAGE_BASENAME = "xfce4-full-image"
 

recipes-image/xfce4/xfce4-music-dev-image.bb

@@ -2,7 +2,8 @@ require xfce4-music-image.bb
 
 export IMAGE_BASENAME = "xfce4-music-dev-image"
 
-XFCE_DM = "sddm sddm-morona-autologin"
+#XFCE_DM = "sddm sddm-morona-autologin"
+XFCE_DM = "lxdm"
 
 IMAGE_INSTALL += " \
     packagegroup-gui-dev \

recipes-image/xfce4/xfce4-music-image.bb

@@ -2,7 +2,8 @@ require xfce4-tiny-image.bb
 
 export IMAGE_BASENAME = "xfce4-music-image"
 
-XFCE_DM = "sddm sddm-morona-autologin"
+#XFCE_DM = "sddm sddm-morona-autologin"
+XFCE_DM = "lxdm"
 
 IMAGE_INSTALL += " \
     packagegroup-gui-musicians \