packagegroup-gui-full: replace multiple packages by meta-retro-world

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>

README.md

@@ -220,7 +220,7 @@ Policies
 * Please do not send private emails to maintainers. For questions/suggestions.. use GitHub issues.
 * Pull requests should follow [OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) with the following additions:
   * Use 4 spaces for indention always
-  * For splitting of long list values use four-space indentation on sucessive lines set the closing quote as the first character ([OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) - second example)
+  * For splitting of long list values use four-space indentation on successive lines set the closing quote as the first character ([OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) - second example)
 
 
 -----------

appends/meta-browser/chromium-x11_%.bbappend

@@ -1 +1 @@
-PACKAGECONFIG_append = " use-egl impl-side-painting proprietary-codecs"
+PACKAGECONFIG = "proprietary-codecs"

appends/meta-gnome/devilspie2/default.lua

@@ -18,7 +18,6 @@ if(wnd_type == "WINDOW_TYPE_NORMAL") then
 		"xarchiver",
 		"Thunar",
 		"geany",
-		"gedit",
 	}
 
 	app_name = get_application_name()

appends/oe-core/base-files/profile

@@ -25,10 +25,10 @@ if [ -z "$LANG" ]; then
 fi
 
 # `ls' enhancements:
-export LS_OPTIONS='--color=auto'
 eval `dircolors`
-alias ls='ls $LS_OPTIONS'
-alias ll='ls $LS_OPTIONS -l'
+alias l.='ls -d .* --color=auto'
+alias ll='ls -l --color=auto'
+alias ls='ls --color=auto'
 
 # colorize all grep variants
 alias grep='grep --color'

appends/oe-core/enchant2_%.bbappend

@@ -0,0 +1,3 @@
+PACKAGECONFIG = "hunspell"
+
+RRECOMMENDS_${PN} += "hunspell-dictionaries"

appends/oe-core/sudo_%.bbappend

@@ -0,0 +1 @@
+PACKAGECONFIG_append = " pam-wheel"

conf/distro/mortsgna.conf

@@ -10,7 +10,7 @@
 ###############################################################################
 
 # follow Yocto version scheme
-DISTRO_VERSION = "v3.1"
+DISTRO_VERSION = "v3.3"
 
 # With Angstrom we had DISTRO_TYPE = "debug"/"release". No recipe except
 # good old lxdm takes care (yes it was me). OE-Core way is setting

conf/layer.conf

@@ -17,6 +17,7 @@ LAYERDEPENDS_mortsgna-layer = "core openembedded-layer networking-layer"
 
 BBFILES_DYNAMIC += " \
     browser-layer:${LAYERDIR}/appends/meta-browser/*.bbappend \
+    chromium-browser-layer:${LAYERDIR}/appends/meta-browser/*.bbappend \
     \
     gnome-layer:${LAYERDIR}/appends/meta-gnome/*.bbappend \
     \

raspi-image-test-and-setup

@@ -7,10 +7,10 @@ Setup new image:
 * copy this file to /home/morona / open with gedit / setup colour theme
 
 As root:
-* systemctl disable systemd-networkd-wait-online.service
-* TODO systemctl disable brcm43438
 * systemctl disable serial-getty@ttyS0
 * systemctl disable serial-getty@ttyAMA0
+* systemctl enable dbus-broker.service
+* systemctl --global enable dbus-broker.service
 * create /home/<user>/.asoundrc with (soundcards can be sndrpihifiberry/audioinjectorpi...)
     pcm.!default {
         type hw

recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/desktop/icons.screen0-1213x1008.rc

@@ -1,11 +0,0 @@
-[xfdesktop-version-4.10.3+-rcfile_format]
-4.10.3+=true
-
-[BB09-AB56]
-row=1
-col=0
-
-[4C9E-146F]
-row=0
-col=0
-

recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/panel/cpufreq-11.rc

@@ -1,10 +1,12 @@
 timeout=1
-show_cpu=0
+show_cpu=-3
 show_icon=false
 show_label_freq=true
 show_label_governor=true
 show_warning=true
 keep_compact=false
 one_line=false
-fontname=Sans 8
+fontname=Sans 7
+icon_color_freq=false
+freq_unit=0
 

recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/panel/cpugraph-1.rc

@@ -10,8 +10,6 @@ Command=xfce4-taskmanager
 InTerminal=0
 StartupNotification=1
 ColorMode=0
-Foreground1=#0000ffff0000
-Foreground2=#ffff00000000
-Foreground3=#00000000ffff
-Background=#333339393b3b
+Background=rgb(0,0,0)
+PerCore=0
 

recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/panel/systemload-12.rc

@@ -1,28 +0,0 @@
-[Main]
-Timeout=500
-Timeout_Seconds=1
-Use_Timeout_Seconds=false
-Use_Click_Command=false
-Click_Command=xfce4-taskmanager
-
-[SL_Cpu]
-Enabled=false
-Use_Label=true
-Color=rgb(0,0,192)
-Text=cpu
-
-[SL_Mem]
-Enabled=true
-Use_Label=false
-Color=rgb(0,192,0)
-Text=mem
-
-[SL_Swap]
-Enabled=false
-Use_Label=true
-Color=rgb(240,240,0)
-Text=swap
-
-[SL_Uptime]
-Enabled=false
-

recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/panel/whiskermenu-3.rc

@@ -15,7 +15,6 @@ category-icon-size=1
 load-hierarchy=false
 recent-items-max=10
 favorites-in-recent=true
-display-recent-default=false
 position-search-alternate=false
 position-commands-alternate=false
 position-categories-alternate=false

recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/panel/xkb-plugin-7.rc

@@ -1,4 +0,0 @@
-display_type=0
-display_textsize=2
-group_policy=0
-

recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/terminal/terminalrc

@@ -1,23 +1,8 @@
 [Configuration]
-ColorForeground=#ffffffffffff
-ColorBackground=#000000000000
-ColorCursor=#a0a0a0a0a0a0
-FontName=Monospace 10
-MiscAlwaysShowTabs=FALSE
-MiscBell=FALSE
-MiscBordersDefault=TRUE
-MiscCursorBlinks=FALSE
-MiscCursorShape=TERMINAL_CURSOR_SHAPE_BLOCK
-MiscDefaultGeometry=80x24
-MiscInheritGeometry=FALSE
 MiscMenubarDefault=FALSE
-MiscMouseAutohide=FALSE
-MiscToolbarDefault=TRUE
-MiscConfirmClose=TRUE
-MiscCycleTabs=TRUE
-MiscTabCloseButtons=TRUE
-MiscTabCloseMiddleClick=TRUE
-MiscTabPosition=GTK_POS_TOP
-MiscHighlightUrls=TRUE
+MiscToolbarDefault=FALSE
+MiscConfirmClose=FALSE
 ScrollingLines=1000000
+ScrollingOnOutput=FALSE
+ColorPalette=rgb(0,0,0);rgb(252,30,30);rgb(132,237,32);rgb(236,202,50);rgb(48,70,252);rgb(198,60,221);rgb(6,152,154);rgb(211,215,207);rgb(85,87,83);rgb(252,96,96);rgb(161,246,79);rgb(247,232,114);rgb(99,131,254);rgb(211,167,206);rgb(80,252,252);rgb(238,238,236)
 

recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml

@@ -4,14 +4,14 @@
   <property name="default-view" type="string" value="void"/>
   <property name="last-compact-view-zoom-level" type="string" value="THUNAR_ZOOM_LEVEL_SMALLEST"/>
   <property name="last-details-view-column-order" type="string" value="THUNAR_COLUMN_NAME,THUNAR_COLUMN_SIZE,THUNAR_COLUMN_TYPE,THUNAR_COLUMN_DATE_MODIFIED"/>
-  <property name="last-details-view-column-widths" type="string" value="50,155,50,50,492,50,50,83,181"/>
+  <property name="last-details-view-column-widths" type="string" value="50,142,50,50,254,50,50,80,181,139"/>
   <property name="last-details-view-fixed-columns" type="bool" value="false"/>
   <property name="last-details-view-visible-columns" type="string" value="THUNAR_COLUMN_DATE_MODIFIED,THUNAR_COLUMN_NAME,THUNAR_COLUMN_SIZE,THUNAR_COLUMN_TYPE"/>
-  <property name="last-details-view-zoom-level" type="string" value="THUNAR_ZOOM_LEVEL_SMALL"/>
+  <property name="last-details-view-zoom-level" type="string" value="THUNAR_ZOOM_LEVEL_50_PERCENT"/>
   <property name="last-icon-view-zoom-level" type="string" value="THUNAR_ZOOM_LEVEL_NORMAL"/>
   <property name="last-location-bar" type="string" value="ThunarLocationEntry"/>
-  <property name="last-separator-position" type="int" value="303"/>
-  <property name="last-show-hidden" type="bool" value="false"/>
+  <property name="last-separator-position" type="int" value="232"/>
+  <property name="last-show-hidden" type="bool" value="true"/>
   <property name="last-side-pane" type="string" value="ThunarShortcutsPane"/>
   <property name="last-sort-column" type="string" value="THUNAR_COLUMN_NAME"/>
   <property name="last-sort-order" type="string" value="GTK_SORT_ASCENDING"/>

recipes-defaultconfig/guiconfig/xfce4-default-config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml

@@ -14,7 +14,6 @@
         <value type="int" value="15"/>
         <value type="int" value="8"/>
         <value type="int" value="5"/>
-        <value type="int" value="9"/>
         <value type="int" value="13"/>
         <value type="int" value="6"/>
         <value type="int" value="10"/>
@@ -53,19 +52,17 @@
       <property name="show-frame" type="bool" value="false"/>
       <property name="size-max" type="uint" value="40"/>
       <property name="square-icons" type="bool" value="false"/>
+      <property name="icon-size" type="int" value="32"/>
     </property>
     <property name="plugin-8" type="string" value="closebutton">
       <property name="theme" type="string" value="Default"/>
     </property>
-    <property name="plugin-9" type="string" value="separator">
-      <property name="expand" type="bool" value="true"/>
-      <property name="style" type="uint" value="0"/>
-    </property>
     <property name="plugin-10" type="string" value="separator">
       <property name="style" type="uint" value="0"/>
     </property>
     <property name="plugin-13" type="string" value="separator">
       <property name="style" type="uint" value="0"/>
+      <property name="expand" type="bool" value="true"/>
     </property>
     <property name="plugin-2" type="string" value="clock">
       <property name="mode" type="uint" value="0"/>
@@ -85,7 +82,24 @@
     <property name="plugin-3" type="string" value="whiskermenu"/>
     <property name="plugin-1" type="string" value="cpugraph"/>
     <property name="plugin-11" type="string" value="cpufreq"/>
-    <property name="plugin-12" type="string" value="systemload"/>
+    <property name="plugin-12" type="string" value="systemload">
+      <property name="cpu" type="empty">
+        <property name="enabled" type="bool" value="false"/>
+      </property>
+      <property name="memory" type="empty">
+        <property name="label" type="string" value=""/>
+      </property>
+      <property name="swap" type="empty">
+        <property name="enabled" type="bool" value="false"/>
+      </property>
+      <property name="uptime" type="empty">
+        <property name="enabled" type="bool" value="false"/>
+      </property>
+      <property name="network" type="empty">
+        <property name="enabled" type="bool" value="true"/>
+        <property name="label" type="string" value=""/>
+      </property>
+    </property>
     <property name="plugin-7" type="string" value="xfce4-sensors-plugin"/>
   </property>
 </channel>

recipes-defaultconfig/users/group-wheel.bb

@@ -0,0 +1,11 @@
+SUMMARY = "Create usergroup wheel for sudo"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+
+inherit useradd
+
+USERADD_PACKAGES = "${PN}"
+#USERADD_PARAM = ""
+GROUPADD_PARAM_${PN} = "--system wheel"
+
+ALLOW_EMPTY_${PN} = "1"

recipes-defaultconfig/users/unpriv-user_1.2.bb

@@ -6,12 +6,13 @@ inherit useradd user-with-full-skel
 
 USERNAME = "morona"
 # groups user shall be member of (NO WHITESPACES ALLOWED)
-USERGROUPS = "audio,video,${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'datetime,network,', '', d)}systemd-journal"
+USERGROUPS = "audio,video,dialout,wheel,${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'datetime,network,', '', d)}systemd-journal"
 
 # all those we are member of
 USER_DEPS ?= " \
     systemd \
     \
+    group-wheel \
     ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'polkit-group-rule-datetime polkit-group-rule-network', '', d)} \
 "
 

recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.36.3.bb

@@ -1,38 +0,0 @@
-SUMMARY = "GNOME disk utility"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-SECTION = "x11/gnome"
-
-DEPENDS = " \
-    gtk+3 \
-    libdvdread \
-    libcanberra \
-    libnotify \
-    libsecret \
-    libpwquality \
-    udisks2 \
-"
-
-GNOMEBASEBUILDCLASS = "meson"
-
-inherit gnomebase gsettings gtk-icon-cache gettext features_check upstream-version-is-even mime-xdg
-
-REQUIRED_DISTRO_FEATURES = "x11"
-
-EXTRA_OEMESON = " \
-    -Dman=false \
-"
-
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
-
-# As soon as elogind is of interest this needs rework: meson option is combo
-PACKAGECONFIG[systemd] = "-Dlogind=libsystemd,-Dlogind=none,systemd"
-
-SRC_URI[archive.sha256sum] = "dd033d3f36ab070bc72317cf3045e5b4927765543f1bce7612b2c7f96595167a"
-
-FILES_${PN} += " \
-    ${datadir}/metainfo \
-    ${datadir}/dbus-1 \
-"
-

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

@@ -18,8 +18,14 @@ IMAGE_INSTALL += " \
     nano \
     rsync \
     wget \
+    dbus-broker \
+    sudo \
+    ${LIBC_SPECIFIC_PACKS} \
 "
 
+LIBC_SPECIFIC_PACKS = ""
+LIBC_SPECIFIC_PACKS_libc-glibc = "glibc-gconv glibc-gconvs glibc-utils"
+
 IMAGE_DEV_MANAGER   = "udev"
 IMAGE_INIT_MANAGER  = "systemd"
 IMAGE_INITSCRIPTS   = " "

recipes-image/include/x11-base.inc

@@ -4,7 +4,6 @@ X11_BASE_INSTALL += " \
     ${DISTRO_GUI_USER} \
     packagegroup-core-x11-xserver \
     \
-    dbus \
     iso-codes \
     mime-support \
     xauth \

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

@@ -21,34 +21,36 @@ RDEPENDS_${PN} = " \
     automake autoconf libtool m4 \
     gcc-symlinks g++-symlinks cpp-symlinks libgomp-dev \
     dtc \
-    pkgconfig binutils-symlinks elfutils gnu-config \
+    pkgconfig binutils-symlinks elfutils gnu-config util-linux \
     gdb gdbserver \
     valgrind \
     git git-bash-completion git-perltools subversion \
     python3-core \
     perl php vala lua php json-glib \
     texinfo gettext \
-    patch quilt ncurses dialog \
+    patch quilt ncurses dialog kdialog \
     man man-pages \
     gawk \
     chrpath \
     nodejs nodejs-npm nodejs-systemtap \
     \
+    ruby ruby-dev \
+    \
     libeigen-dev \
     \
     wireshark \
     nfs-utils-client \
     lmsensors-sensord lmsensors-sensorsdetect \
     \
-    pulseview qtiohelper \
+    pulseview qtiohelper minicom i2c-tools \
+    python3-pyserial python3-smbus python3-smbus2 python3-spidev \
     \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'browser-layer', 'chromium-x11', '', d)} \
+    ${@bb.utils.contains_any('BBFILE_COLLECTIONS', 'browser-layer chromium-browser-layer', 'chromium-x11', '', d)} \
     ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-microcontroller', 'meta-microcontroller-world', '', d)} \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'rubygems', 'rubygems-jekyll', '', d)} \
 "
 
-RDEPENDS_${PN}_append_libc-glibc = " \
-    glibc-utils \
-"
+RDEPENDS_${PN}_append_rpi = "rpi-gpio"
 
 #    qemu
 #    

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

@@ -27,6 +27,7 @@ RDEPENDS_${PN} = " \
     gnome-disk-utility \
     \
     mpd \
+    mpv \
     vlc \
     parole gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-omx gstreamer1.0-libav \
     gstreamer1.0-plugins-base-meta gstreamer1.0-plugins-good-meta \
@@ -37,9 +38,9 @@ RDEPENDS_${PN} = " \
     \
     ${MACHINE_SPECIFICS_FULL} \
     \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'browser-layer', 'chromium-x11', '', d)} \
+    ${@bb.utils.contains_any('BBFILE_COLLECTIONS', 'browser-layer chromium-browser-layer', 'chromium-x11', '', d)} \
     \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-retro', 'mame dosbox dosbox-x cage cass80 z80 vice stella opentyrian d1x-rebirth', '', d)} \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-retro', 'meta-retro-world', '', d)} \
     \
     ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'libreoffice abiword-meta', '', d)} \
     \
@@ -49,11 +50,10 @@ 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', '', d)} \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-qt5-extra', 'gottcode-world kde-apps-world qmlarkdown quaternion spectral scribus', '', d)} \
 "
 
 #    firefox 
 #    gursormaker
 #    kodi 
-#    mpv 
 

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

@@ -13,7 +13,7 @@ IMAGE_INSTALL += " \
     packagegroup-gui-musicians \
     \
     ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'libreoffice', '', d)} \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'browser-layer', 'chromium-x11', '', d)} \
+    ${@bb.utils.contains_any('BBFILE_COLLECTIONS', 'browser-layer chromium-browser-layer', 'chromium-x11', '', d)} \
     \
     jack-dev \
     lv2-dev \

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

@@ -8,5 +8,5 @@ IMAGE_INSTALL += " \
     packagegroup-gui-musicians \
     \
     ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'libreoffice', '', d)} \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'browser-layer', 'chromium-x11', '', d)} \
+    ${@bb.utils.contains_any('BBFILE_COLLECTIONS', 'browser-layer chromium-browser-layer', 'chromium-x11', '', d)} \
 "

recipes-utils/udev-udisks/udev-rules-udisks-hide-bootpart_1.0.bb

@@ -12,7 +12,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 # Feel free to add more...
 
 BOOTPARTSPEC = "boot,vfat BOOT,vfat"
-BOOTPARTSPEC_rpi = "raspberrypi,vfat"
+# Both raspi layers thip theit own rule
+BOOTPARTSPEC_rpi = ""
 
 do_install () {
 	install -d ${D}${nonarch_base_libdir}/udev/rules.d

scripts/include/card-helpers.inc

@@ -104,7 +104,13 @@ SelectDeployedFile() {
         if [ -z "$_TMPDIR" ]; then
             ErrorOut "Bitbake environment variable TMPDIR not found!"
         fi
-        for FilePath in `find ${_TMPDIR}/deploy/images/${Machine} $FindString | sort` ; do
+        DeployPath=${_TMPDIR}/deploy/images/${Machine}
+        if [ ! -e ${DeployPath} ]; then
+            echo "${style_yellow}${style_bold}DeployPath: ${DeployPath}${style_normal}"
+            ErrorOut "Deploy path for ${Machine} not found! Wrong script started?"
+        fi
+        
+        for FilePath in `find ${DeployPath} $FindString | sort` ; do
             iCount=`expr $iCount + 1`
             RootFileNameArr[${iCount}]="$FilePath"
             FileSize=`du -Dh "$FilePath" | cut -f1`