Remove fixmac

MAC setup magic should not be installed by default in all our images

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

README.md

@@ -70,7 +70,7 @@ It has its origin Ångström distribution  - check https://github.com/Angstrom-d
   * All images for console / kde / lxqt / xfce ar found. allgui-images build
     images for all graphical environments.
 
-[recipes-utils](recipes-utils):
+[recipes-utlis](recipes-utlis):
   * udev-rules-udisks-hide-bootpart: Hide boot partition from udisks
   * Some tools (these are the only left from angstrom). Honestly: Have never
     used them but kept them if users come from angstrom and might miss
@@ -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 successive 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 sucessive lines set the closing quote as the first character ([OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) - second example)
 
 
 -----------

TODO

@@ -1,5 +1,8 @@
 These are tasks are planned:
 
+OE:
+* Introduce security_flags.inc
+
 Scripts:
 * get rid of bashisms
 * dialog -> ncurses?

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

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

appends/meta-gnome/devilspie2/default.lua

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

appends/meta-gnome/network-manager-applet_%.bbappend

@@ -0,0 +1,3 @@
+EXTRA_OECONF_append = " \
+    --with-libnm-gtk \
+"

appends/meta-multimedia/fluidsynth_%.bbappend

@@ -1,6 +1,6 @@
 PACKAGECONFIG ?= " \
-    jack \
-    portaudio \
-    readline \
     sndfile \
+    jack \
+    pulseaudio \
+    portaudio \
 "

appends/meta-networking/dnsmasq_%.bbappend

@@ -1,5 +0,0 @@
-# In our environment dnsmasq is used by networkmanager only. That takes care
-# of all the configuration parameters necessary. Unfortunately this is broken
-# by dnsmasq running as service: It is set-up by configuration files and that
-# are not matching networkmanagers's needs.
-SYSTEMD_AUTO_ENABLE_${PN} = "disable"

appends/meta-networking/networkmanager-openvpn_%.bbappend

@@ -1 +1,12 @@
 PACKAGECONFIG_append = " gnome"
+DEPENDS_append = " gtk+3 networkmanager network-manager-applet"
+
+do_configure_append() {
+    # network-manager-openvpn.metainfo.xml is created in source folder but
+    # compile expects it in build folder. As long as nobody comes up with a
+    # better solution just support build:
+    if [ -e ${S}/appdata/network-manager-openvpn.metainfo.xml ]; then
+        mkdir -p ${B}/appdata
+        cp -f ${S}/appdata/network-manager-openvpn.metainfo.xml ${B}/appdata/
+    fi
+}

appends/meta-oe/nodejs_%.bbappend

@@ -1 +0,0 @@
-PACKAGECONFIG_append = " shared"

appends/meta-oe/udisks_%.bbappend

@@ -0,0 +1 @@
+RRECOMMENDS_${PN} += "udev-rules-udisks-hide-bootpart"

appends/meta-qt5/qtbase-native_%.bbappend

@@ -1,3 +1 @@
 inherit instant-sysroot-native
-
-INSANE_SKIP += "native-last"

appends/meta-qt5/qtbase_%.bbappend

@@ -7,11 +7,6 @@ PACKAGECONFIG_DISTRO += " \
 
 inherit instant-paths
 
-do_install_append() {
-    # at least KDE's extra-cmake-modules expect qmake-qt5
-    ln -s qmake ${D}/${bindir}/qmake-qt5
-}
-
 do_copy_to_target_sysroot_append() {
     # ---------- qt.conf ----------
     # create

appends/meta-xfce/libxfce4ui_%.bbappend

@@ -1 +1 @@
-PACKAGECONFIG_append = " startup-notification gladeui2"
+PACKAGECONFIG_append = " startup-notification gladeui"

appends/meta-xfce/packagegroup-xfce-extended.bbappend

@@ -1,3 +0,0 @@
-RRECOMMENDS_${PN} += " \
-    imsettings \
-"

appends/meta-xfce/xfce4-settings_%.bbappend

@@ -1 +1 @@
-PACKAGECONFIG_append = " sound-setter notify"
+PACKAGECONFIG_append = " datetime-setter sound-setter notify"

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 l.='ls -d .* --color=auto'
+alias ls='ls $LS_OPTIONS'
-alias ll='ls -l --color=auto'
+alias ll='ls $LS_OPTIONS -l'
-alias ls='ls --color=auto'
 
 # colorize all grep variants
 alias grep='grep --color'

appends/oe-core/base-files_%.bbappend

@@ -3,6 +3,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 BASEFILESISSUEINSTALL = "do_install_mortsgnaissue"
 
 do_install_mortsgnaissue () {
+    echo ${MACHINE} > ${D}${sysconfdir}/hostname
+
     install -m 644 ${WORKDIR}/issue*  ${D}${sysconfdir}
     if [ -n "${DISTRO_NAME}" ]; then
         echo -n "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue

appends/oe-core/cmake%.bbappend

@@ -1,3 +1 @@
 inherit instant-sysroot-native
-
-INSANE_SKIP += "native-last"

appends/oe-core/enchant2_%.bbappend

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

appends/oe-core/libsoup-2.4_%.bbappend

@@ -0,0 +1 @@
+PACKAGECONFIG_append = " gnome"

appends/oe-core/openssh_%.bbappend

@@ -0,0 +1,2 @@
+RRECOMMENDS_${PN}-sshd_remove_class-target = "rng-tools"
+

appends/oe-core/packagegroup-core-x11-xserver%.bbappend

@@ -1,5 +0,0 @@
-# we want xf86-input-libinput and some BSP layers exceed their allowed limits :(
-XSERVER_remove = " xf86-input-evdev "
-
-# at least for test add xserver's standard xf86-video-modesetting
-XSERVER_append = " xf86-video-modesetting"

appends/oe-core/sudo_%.bbappend

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

classes/instant-sysroot-native.bbclass

@@ -16,7 +16,7 @@ instant_sysroot_copy () {
     hardlinkdir ${RECIPE_SYSROOT_NATIVE} ${INSTANT_NATIVE_PATH}
 }
 
-do_populate_sysroot[postfuncs] += "${INSTANTPOPULATE} "
+do_populate_sysroot[postfuncs] += "${INSTANTPOPULATE}"
 INSTANTPOPULATE = ""
 INSTANTPOPULATE_class-native = "instant_populate_sysroot"
 INSTANTPOPULATE_class-cross = "instant_populate_sysroot"

classes/instant-sysroot-target.bbclass

@@ -173,7 +173,7 @@ do_copy_to_target_sysroot() {
     fi
 }
 
-addtask copy_to_target_sysroot after do_package_write_deb do_package_write_ipk do_package_write_rpm before do_build
+addtask copy_to_target_sysroot after do_package before do_build
 
 # same as do package
 do_copy_to_target_sysroot[vardeps] = "${PACKAGEBUILDPKGD} ${PACKAGESPLITFUNCS} ${PACKAGEFUNCS} ${@gen_packagevar(d)}"

conf/distro/include/mortsgna-armv7-tune.inc

@@ -4,7 +4,7 @@ def armv7_tune_handler(d):
     # to common tune value
     if d.getVar('MORTSGNA_ARMV7_TUNE') == '1':
         features = d.getVar('TUNE_FEATURES').split()
-        if 'armv7a' in features or 'armv7ve'  or 'armv7ve'  or 'cortexa7'  or 'cortexa8'  or 'cortexa9' in features:
+        if 'armv7a' in features or 'armv7ve' in features:
             tune = 'armv7athf'
             if 'bigendian' in features:
                 tune += 'b'
@@ -12,5 +12,6 @@ def armv7_tune_handler(d):
                 tune += '-neon'
         else:
             tune = d.getVar('DEFAULTTUNE')
+
     return tune
 

conf/distro/include/mortsgna-distro-features.inc

@@ -34,10 +34,10 @@ VIRTUAL-RUNTIME_init_manager = "systemd"
 # USE-flag like features
 DISTRO_FEATURES += "tk"
 DISTRO_FEATURES += "x11"
+DISTRO_FEATURES += "3g"
 DISTRO_FEATURES += "pulseaudio"
 DISTRO_FEATURES += "ldconfig"
 DISTRO_FEATURES += "polkit"
-DISTRO_FEATURES += "helpfiles"
 
 # OpenGL support
 DISTRO_FEATURES += "opengl"
@@ -56,6 +56,3 @@ DISTRO_FEATURES += "${DISTRO_WAYLAND}"
 # Inherit the default LIBC features superset from OE-core
 DISTRO_FEATURES += "${DISTRO_FEATURES_LIBC}"
 
-# Uncomment for tests on gold-trouble only
-#DISTRO_FEATURES += 'ld-is-gold'
-

conf/distro/include/mortsgna-libc-musl.inc

@@ -4,8 +4,6 @@
 # libc settings
 DISTRO_FEATURES += "${@['', ' nls'][d.getVar('ENABLE_BINARY_LOCALE_GENERATION') == '1']}"
 
-DISTRO_FEATURES_remove = "ldconfig"
-
 USE_NLS_glib-2.0 = "yes"
 USE_NLS_glib-2.0-native = "yes"
 USE_NLS_gcc-cross = "no"

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

@@ -22,13 +22,3 @@ XSERVER ?= " \
     xf86-video-modesetting \
 "
 
-# Follow meta-java README:
-# Possible provider: cacao-initial-native and jamvm-initial-native
-PREFERRED_PROVIDER_virtual/java-initial-native = "cacao-initial-native"
-
-# Possible provider: cacao-native and jamvm-native
-PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
-
-# Optional since there is only one provider for now
-PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
-

conf/distro/mortsgna.conf

@@ -10,7 +10,7 @@
 ###############################################################################
 
 # follow Yocto version scheme
-DISTRO_VERSION = "v3.3"
+DISTRO_VERSION = "v2.7"
 
 # 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
@@ -114,16 +114,17 @@ ENABLE_BINARY_LOCALE_GENERATION_ep9312 = "0"
 ENABLE_BINARY_LOCALE_GENERATION_armeb = "0"
 
 # blacklist policy
-PNBLACKLIST[pn-fso-apm]             = "regular apmd is good enough"
+PNBLACKLIST[pn-fso-apm] = "regular apmd is good enough"
-PNBLACKLIST[weston-init]            = "A passwordless root session reachable by two keys - security???"
+
-PNBLACKLIST[packagegroup-core-x11] = "Conflicts with mortsgna-images"
+# warrior specific - on master there might come times they do the right thing...
-PNBLACKLIST[xserver-nodm-init]     = "Mortsgna-images use graphical display managers"
+PNBLACKLIST[rng-tools] = "blocks shutdown and no issues found for openssl"
 
 ###############################################################################
 # Quality & security hardening
 ###############################################################################
 
-require conf/distro/include/security_flags.inc
+# uncomment to enable security flags - images tested had issues
+#require conf/distro/include/security_flags.inc
 
 # disable static libs
 require conf/distro/include/no-static-libs.inc
@@ -132,19 +133,17 @@ require conf/distro/include/no-static-libs.inc
 # 1. They make sense
 # 2. Many poky users out there might complain about my other layers or patches
 #    sent
-# wait with 'mime' & 'mime-xdg' (meta-browser tests with old branches)
 WARN_TO_ERROR_QA = " \
     already-stripped compile-host-path install-host-path \
-    xorg-driver-abi textrel incompatible-license files-invalid infodir \
+    installed-vs-shipped ldflags pn-overrides rpaths staticdev \
-    build-deps symlink-to-sysroot multilib \
-    installed-vs-shipped ldflags pn-overrides rpaths staticdev libdir \
-    uppercase-pn \
     unknown-configure-option useless-rpaths host-user-contaminated \
-    invalid-packageconfig patch-fuzz src-uri-bad \
+    invalid-packageconfig patch-fuzz \
 "
 WARN_QA_remove = "${WARN_TO_ERROR_QA}"
 ERROR_QA_append = " ${WARN_TO_ERROR_QA}"
 
+PNBLACKLIST[weston-init]       = "A passwordless root session reachable by two keys - security???"
+
 ###############################################################################
 # Image defaults
 ###############################################################################

conf/layer.conf

@@ -8,7 +8,7 @@ BBFILE_COLLECTIONS += "mortsgna-layer"
 BBFILE_PATTERN_mortsgna-layer := "^${LAYERDIR}/"
 BBFILE_PRIORITY_mortsgna-layer = "7"
 
-LAYERSERIES_COMPAT_mortsgna-layer = "dunfell gatesgarth hardknott"
+LAYERSERIES_COMPAT_mortsgna-layer = "sumo thud warrior"
 
 # This is a compromise: Because of dynamic appends it needs oe-core only. Our
 # images have a huge dependency list (see README). So the layers set here are
@@ -17,14 +17,13 @@ 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 \
     \
-    networking-layer:${LAYERDIR}/appends/meta-networking/*.bbappend \
-    \
     multimedia-layer:${LAYERDIR}/appends/meta-multimedia/*.bbappend \
     \
+    networking-layer:${LAYERDIR}/appends/meta-networking/*.bbappend \
+    \
     openembedded-layer:${LAYERDIR}/appends/meta-oe/*.bbappend \
     \
     qt5-layer:${LAYERDIR}/appends/meta-qt5/*.bbappend \

raspi-image-test-and-setup

@@ -1,66 +0,0 @@
-Setup new image:
-
-* BACKUP CURRENT HOME
-* REMOVE NETWORK PLUG
-
-* 1st login xfce
-* copy this file to /home/morona / open with gedit / setup colour theme
-
-As root:
-* 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
-        card sndrpihifiberry
-    }
-    ctl.!default {
-        type hw
-        card sndrpihifiberry
-    }
-* audioinjector: enable mixer control "Output Mixer HiFi"
-* passwd
-
-As user:
-* passwd
-* check session autostart (evt. disable blueman/baloo/tracker/scrensaver..)
-* datetime: timezone
-* optionally for a tiny better performance: reduce screen resolution (yes really tested: 1280x1024 / 1280x720 are fine)
-* check /var/log/postinstall.log
-* restart
-* network plug
-* check journalctl output
-* check systemd-analyze: Can be 8-9s
-* glmark2-es2: On Pi3 (no B+) ~145 / On Pi 4 ~269
-* chromium unselect 'Allow Chromium-sign-in / add ad-blocker / check youtube music-video
-* libreoffice: open documents to set libreoffice default
-* jack setup
-* qtractor midiimport / open reference-project and check all instruments
-* ardour5/6
-* qmmp/projectm
-* mixxx
-* vlc
-* supercollider
-* krita/kdenlive/kalzium
-* set-up git (.gitconfig) / ssh-keygen -> github
-* qt-creator 
-    standard build directory:
-      /home/morona/tmp/qtbuilds/build-%{CurrentProject:Name}-%{CurrentKit:FileSystemName}-%{CurrentBuild:Name}
-    help/about plugins
-      disable ClangCodeModel
-    kit/compiler:
-      set gcc explicitly - clang causes trouble on qml-register functions
-    kit/cmake:
-      CMAKE_INSTALL_PREFIX:STRING=/home/morona/tmp/qtinstalls/usr
-      CMAKE_PREFIX_PATH:STRING=/home/morona/tmp/qtinstalls/usr;%{Qt:QT_INSTALL_PREFIX}
-      OE_QMAKE_PATH_EXTERNAL_HOST_BINS:STRING=/usr/bin
-* clone avr projects & build them
-* kicad: open example / check 3d preview
-* mame: set video opengl / test some ROMs
-* vice: select cairo
-* dosbox / dosbox-x / stella
-* supertux(kart??)
-* open all gnome- / all kde-plasma- / lxqt- / liri- / lumina-sessions
-

recipes-defaultconfig/guiconfig/xfce4-default-config/.config/autostart/gnome-shell-overrides-migration.desktop

@@ -1,3 +0,0 @@
-[Desktop Entry]
-Hidden=true
-

recipes-defaultconfig/guiconfig/xfce4-default-config/.config/autostart/imsettings-start.desktop

@@ -1,3 +0,0 @@
-[Desktop Entry]
-Hidden=true
-

recipes-defaultconfig/guiconfig/xfce4-default-config/.config/autostart/org.gnome.Evolution-alarm-notify.desktop

@@ -1,3 +0,0 @@
-[Desktop Entry]
-Hidden=true
-

recipes-defaultconfig/guiconfig/xfce4-default-config/.config/autostart/tracker-extract.desktop

@@ -1,3 +0,0 @@
-[Desktop Entry]
-Hidden=true
-

recipes-defaultconfig/guiconfig/xfce4-default-config/.config/autostart/tracker-miner-fs.desktop

@@ -1,3 +0,0 @@
-[Desktop Entry]
-Hidden=true
-

recipes-defaultconfig/guiconfig/xfce4-default-config/.config/autostart/tracker-store.desktop

@@ -1,3 +0,0 @@
-[Desktop Entry]
-Hidden=true
-

recipes-defaultconfig/guiconfig/xfce4-default-config/.config/autostart/xfce4-screensaver.desktop

@@ -1,3 +0,0 @@
-[Desktop Entry]
-Hidden=true
-

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

@@ -0,0 +1,11 @@
+[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,12 +1,10 @@
 timeout=1
-show_cpu=-3
+show_cpu=0
 show_icon=false
 show_label_freq=true
 show_label_governor=true
 show_warning=true
 keep_compact=false
 one_line=false
-fontname=Sans 7
+fontname=Sans 8
-icon_color_freq=false
-freq_unit=0
 

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

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

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

@@ -0,0 +1,28 @@
+[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

@@ -1,4 +1,4 @@
-favorites=exo-terminal-emulator.desktop,exo-file-manager.desktop,exo-web-browser.desktop,qjackctl.desktop,ardour5.desktop,ardour6.desktop,lmms.desktop,muse.desktop,qtractor.desktop,rosegarden.desktop,mixxx.desktop,cgenie.desktop,vice_64.desktop
+favorites=exo-terminal-emulator.desktop,exo-file-manager.desktop,exo-web-browser.desktop,qjackctl.desktop,ardour5.desktop,lmms.desktop,muse.desktop,qtractor.desktop,rosegarden.desktop,mixxx.desktop,cgenie.desktop,vice_64.desktop
 recent=
 button-title=Anwendungen
 button-icon=xfce4-whiskermenu
@@ -15,6 +15,7 @@ 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/xfce4-sensors-plugin-7.rc

@@ -1,23 +0,0 @@
-[General]
-Show_Title=false
-Show_Labels=false
-str_fontsize=small
-val_fontsize=1
-Font=Sans 11
-Update_Interval=1
-Show_Units=true
-Small_Spacings=false
-Command_Name=xfce4-sensors
-
-[Chip0]
-Name=ACPI
-Number=0
-
-[Chip0_Feature0]
-Address=0
-Name=thermal_zone0
-Color=#008000
-Show=true
-Min=0.00
-Max=70.00
-

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

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

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

@@ -1,8 +1,29 @@
 [Configuration]
+FontName=Monospace 9
+MiscAlwaysShowTabs=FALSE
+MiscBell=FALSE
+MiscBellUrgent=FALSE
+MiscBordersDefault=TRUE
+MiscCursorBlinks=FALSE
+MiscCursorShape=TERMINAL_CURSOR_SHAPE_BLOCK
+MiscDefaultGeometry=80x24
+MiscInheritGeometry=FALSE
 MiscMenubarDefault=FALSE
-MiscToolbarDefault=FALSE
+MiscMouseAutohide=FALSE
-MiscConfirmClose=FALSE
+MiscMouseWheelZoom=TRUE
-ScrollingLines=1000000
+MiscToolbarDefault=TRUE
-ScrollingOnOutput=FALSE
+MiscConfirmClose=TRUE
-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)
+MiscCycleTabs=TRUE
+MiscTabCloseButtons=TRUE
+MiscTabCloseMiddleClick=TRUE
+MiscTabPosition=GTK_POS_TOP
+MiscHighlightUrls=TRUE
+MiscMiddleClickOpensUri=FALSE
+MiscCopyOnSelect=FALSE
+MiscDefaultWorkingDir=
+MiscRewrapOnResize=TRUE
+MiscUseShiftArrowsToScroll=FALSE
+MiscSlimTabs=FALSE
+ColorForeground=#000000000000
+ColorBackground=#fae0f4f1a311
 

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,142,50,50,254,50,50,80,181,139"/>
+  <property name="last-details-view-column-widths" type="string" value="50,155,50,50,492,50,50,83,181"/>
   <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_50_PERCENT"/>
+  <property name="last-details-view-zoom-level" type="string" value="THUNAR_ZOOM_LEVEL_SMALL"/>
   <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="232"/>
+  <property name="last-separator-position" type="int" value="303"/>
-  <property name="last-show-hidden" type="bool" value="true"/>
+  <property name="last-show-hidden" type="bool" value="false"/>
   <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,13 +14,13 @@
         <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"/>
         <value type="int" value="2"/>
         <value type="int" value="4"/>
         <value type="int" value="11"/>
-        <value type="int" value="7"/>
         <value type="int" value="12"/>
         <value type="int" value="1"/>
       </property>
@@ -52,17 +52,19 @@
       <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"/>
@@ -82,24 +84,6 @@
     <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/guiconfig/xfce4-default-config/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml

@@ -3,6 +3,6 @@
 <channel name="xfce4-settings-manager" version="1.0">
   <property name="last" type="empty">
     <property name="window-width" type="int" value="858"/>
-    <property name="window-height" type="int" value="675"/>
+    <property name="window-height" type="int" value="661"/>
   </property>
 </channel>

recipes-defaultconfig/guiconfig/xfce4-default-config/.local/share/applications/mimeapps.list

@@ -0,0 +1,37 @@
+[Default Applications]
+application/x-bzip-compressed-tar=xarchiver.desktop
+application/x-compressed-tar=xarchiver.desktop
+text/plain=gedit.desktop
+application/x-lrzip=xarchiver.desktop
+application/x-bzip=xarchiver.desktop
+application/gzip=xarchiver.desktop
+application/x-lzip=xarchiver.desktop
+application/zip=xarchiver.desktop
+application/x-lzma-compressed-tar=xarchiver.desktop
+application/x-tar=xarchiver.desktop
+application/x-tarz=xarchiver.desktop
+application/x-ustar=xarchiver.desktop
+application/x-xz-compressed-tar=xarchiver.desktop
+image/png=ristretto.desktop
+image/jpeg=ristretto.desktop
+application/x-deb=xarchiver.desktop
+application/pdf=evince.desktop
+
+[Added Associations]
+application/x-bzip-compressed-tar=xarchiver.desktop;
+application/x-compressed-tar=xarchiver.desktop;
+text/plain=gedit.desktop;
+application/x-lrzip=xarchiver.desktop;
+application/x-bzip=xarchiver.desktop;
+application/gzip=xarchiver.desktop;
+application/x-lzip=xarchiver.desktop;
+application/zip=xarchiver.desktop;
+application/x-lzma-compressed-tar=xarchiver.desktop;
+application/x-tar=xarchiver.desktop;
+application/x-tarz=xarchiver.desktop;
+application/x-ustar=xarchiver.desktop;
+application/x-xz-compressed-tar=xarchiver.desktop;
+image/png=ristretto.desktop;
+image/jpeg=ristretto.desktop;
+application/x-deb=xarchiver.desktop;
+application/pdf=evince.desktop;

recipes-defaultconfig/users/group-wheel.bb

@@ -1,11 +0,0 @@
-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,13 +6,12 @@ inherit useradd user-with-full-skel
 
 USERNAME = "morona"
 # groups user shall be member of (NO WHITESPACES ALLOWED)
-USERGROUPS = "audio,video,dialout,wheel,${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'datetime,network,', '', d)}systemd-journal"
+USERGROUPS = "audio,video,${@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-image/allgui/allgui-base-image.bb

@@ -17,8 +17,6 @@ IMAGE_INSTALL += " \
     network-manager-applet \
     xfce4-default-config \
     \
-    packagegroup-gnome-desktop \
-    \
     packagegroup-lxqt-base \
     lxqt-default-config \
     \

recipes-image/allgui/allgui-dev-image.bb

@@ -5,6 +5,7 @@ export IMAGE_BASENAME = "allgui-dev-image"
 IMAGE_INSTALL += " \
     packagegroup-gui-dev \
     \
+    exo-csource \
     xfce4-dev-tools \
     libxfce4ui-glade \
 "

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

@@ -13,15 +13,6 @@ IMAGE_INSTALL += " \
     \
     orage \
     xfce4-orageclock-plugin \
-    \
-    pkgconfig binutils-symlinks elfutils gnu-config \
-    cmake meson \
-    gdbserver \
-    git git-bash-completion \
-    qt5-creator \
-    qwt-qt5 \
-    \
-    nodejs nodejs-npm nodejs-systemtap \
 "
 
 IMAGE_LINGUAS_libc-glibc = "${IMAGE_LINGUAS_FULL}"

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

@@ -13,7 +13,5 @@ IMAGE_INSTALL += " \
     \
     packagegroup-kde-apps-tiny \
     \
-    packagegroup-gnome-apps \
-    \
     weston-examples \
 "

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

@@ -12,20 +12,11 @@ IMAGE_INSTALL += " \
     systemd-bash-completion \
     systemd-analyze \
     cpufrequtils \
-    findutils \
     htop \
     util-linux-lsblk \
     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/gnome/gnome-base-image.bb

@@ -1,19 +0,0 @@
-require recipes-image/console/console-net-image.bb
-require recipes-image/include/x11-base.inc
-
-export IMAGE_BASENAME = "gnome-base-image"
-
-GNOME_DM ?= "gdm"
-
-IMAGE_INSTALL += " \
-    ${X11_BASE_INSTALL} \
-    ${GNOME_DM} \
-    \
-    packagegroup-gnome-desktop \
-    packagegroup-gui-base \
-    \
-    network-manager-applet \
-"
-
-# reenable graphical target
-IMAGE_FEATURES += "x11-base"

recipes-image/gnome/gnome-tiny-image.bb

@@ -1,10 +0,0 @@
-require gnome-base-image.bb
-
-export IMAGE_BASENAME = "gnome-tiny-image"
-
-IMAGE_INSTALL += " \
-    packagegroup-gnome-apps \
-    \
-    packagegroup-gui-tiny \
-"
-

recipes-image/include/x11-base.inc

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

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

@@ -5,53 +5,45 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 inherit packagegroup
 
 RDEPENDS_${PN} = " \
-    qt5-creator qtwebengine-dev \
+    qt5-creator \
     qtquickcontrols2-examples qtwayland-examples \
     hexedit \
-    glade \
+    glade3 glade \
     umbrello \
     lokalize \
     geany-plugins \
-    gtk+3-demo \
+    gtk-demo gtk+3-demo \
     \
     weston weston-xwayland  \
     \
     unzip xz tar bzip2 \
-    make cmake extra-cmake-modules meson \
+    make cmake \
     automake autoconf libtool m4 \
-    gcc-symlinks g++-symlinks cpp-symlinks libgomp-dev \
+    gcc-symlinks g++-symlinks cpp-symlinks \
     dtc \
-    pkgconfig binutils-symlinks elfutils gnu-config util-linux \
+    pkgconfig binutils-symlinks elfutils gnu-config \
     gdb gdbserver \
-    valgrind \
+    git git-bash-completion subversion \
-    git git-bash-completion git-perltools subversion \
+    python python-shell python-subprocess \
-    python3-core \
+    python3 \
     perl php vala lua php json-glib \
     texinfo gettext \
-    patch quilt ncurses dialog kdialog \
+    patch quilt ncurses dialog \
     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 minicom i2c-tools \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'browser-layer', 'chromium-x11', '', d)} \
-    python3-pyserial python3-smbus python3-smbus2 python3-spidev \
-    \
-    ${@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_rpi = "rpi-gpio"
+RDEPENDS_${PN}_append_libc-glibc = " \
+    glibc-utils \
+"
 
 #    qemu
-#    
+#    valgrind
 

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

@@ -12,48 +12,52 @@ RDEPENDS_${PN} = " \
     source-han-sans-kr-fonts \
     source-han-sans-jp-fonts \
     source-han-sans-tw-fonts \
-    ttf-noto-emoji-color \
-    ttf-noto-emoji-regular \
     \
     tzdata-misc tzdata-africa \
     tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \
     tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific \
     \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'libreoffice', '', d)} \
+    abiword-meta \
     gimp \
     fontforge \
     menulibre \
     \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'browser-layer', 'chromium-x11', '', d)} \
+    \
     gparted \
-    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 \
+    dragon \
     gstreamer1.0-plugins-base-meta gstreamer1.0-plugins-good-meta \
     pulseaudio-misc \
+    ${MACHINE_SPECIFICS_FULL} \
+    \
+    ark \
+    filelight \
+    konsole \
+    spectacle \
+    \
+    kde-apps-world \
+    \
+    gottcode-world \
     \
     qwt-qt5-examples \
     gnuplot gnuplot-x11 \
+    qskinny \
     \
-    ${MACHINE_SPECIFICS_FULL} \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-retro', 'mame dosbox z80 vice stella opentyrian d1x-rebirth', '', d)} \
-    \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'games-layer', 'pingus supertux2 freeciv wesnoth-all astromenace chromium-bsu maelstrom', '', d)} \
-    ${@bb.utils.contains_any('BBFILE_COLLECTIONS', 'browser-layer chromium-browser-layer', 'chromium-x11', '', d)} \
-    \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-retro', 'meta-retro-world', '', d)} \
-    \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'libreoffice abiword-meta', '', d)} \
-    \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'games-layer', 'pingus supertuxkart supertux2 freeciv wesnoth-all astromenace chromium-bsu maelstrom scummvm', '', d)} \
-    \
     ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-musicians', 'packagegroup-gui-musicians', '', d)} \
     \
     ${@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 scribus', '', d)} \
 "
 
 #    firefox 
 #    gursormaker
 #    kodi 
+#    mpv 
 

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

@@ -7,9 +7,11 @@ inherit packagegroup
 # Those listed here are either ugly or nonworking
 RDEPENDS_${PN} = " \
     atanks \
+    scummvm \
     etr \
     gnome-chess \
     gnome-robots \
+    supertuxkart \
     \
     gnome-games \
     mog \

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

@@ -5,12 +5,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 inherit packagegroup
 
 RDEPENDS_${PN} = " \
+    tzdata \
     ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-initramfs', 'plymouth plymouth-set-default-theme plymouth-initrd', '', d)} \
     xdg-user-dirs \
     \
     evince \
     geany \
     \
+    ntp ntp-utils \
     tzdata \
     dnsmasq \
     devilspie2 \
@@ -18,5 +20,5 @@ RDEPENDS_${PN} = " \
     gnome-system-monitor \
     dconf-editor \
     \
-    glmark2 mesa-demos \
+    glmark2 mesa-demos eglinfo-x11 \
 "

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

@@ -7,6 +7,7 @@ export IMAGE_BASENAME = "xfce4-dev-image"
 IMAGE_INSTALL += " \
     packagegroup-gui-dev \
     \
+    exo-csource \
     xfce4-dev-tools \
     libxfce4ui-glade \
 "

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

@@ -1,30 +0,0 @@
-require xfce4-music-image.bb
-
-export IMAGE_BASENAME = "xfce4-music-dev-image"
-
-XFCE_DM = "sddm sddm-morona-autologin"
-
-IMAGE_INSTALL += " \
-    packagegroup-gui-dev \
-    \
-    xfce4-dev-tools \
-    libxfce4ui-glade \
-    \
-    packagegroup-gui-musicians \
-    \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'libreoffice', '', d)} \
-    ${@bb.utils.contains_any('BBFILE_COLLECTIONS', 'browser-layer chromium-browser-layer', 'chromium-x11', '', d)} \
-    \
-    jack-dev \
-    lv2-dev \
-    libvorbis-dev \
-    aubio-dev \
-    libmad-dev \
-    libsamplerate0-dev \
-    rubberband-dev \
-    liblo-dev \
-    lilv-dev \
-    suil-dev \
-    serd-dev \
-    sord-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_any('BBFILE_COLLECTIONS', 'browser-layer chromium-browser-layer', 'chromium-x11', '', d)} \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'browser-layer', 'chromium-x11', '', d)} \
 "

recipes-image/xfce4/xfce4-tiny-image.bb

@@ -8,6 +8,5 @@ IMAGE_INSTALL += " \
     rodent-icon-theme \
     \
     packagegroup-gui-tiny \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-musicians', 'xfce4-mixer', '', d)} \
 "
 

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

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

scripts/include/card-helpers.inc

@@ -104,13 +104,7 @@ SelectDeployedFile() {
         if [ -z "$_TMPDIR" ]; then
             ErrorOut "Bitbake environment variable TMPDIR not found!"
         fi
-        DeployPath=${_TMPDIR}/deploy/images/${Machine}
+        for FilePath in `find ${_TMPDIR}/deploy/images/${Machine} $FindString | sort` ; do
-        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`

scripts/update-recipe-checksums.sh

@@ -1,36 +1,26 @@
 #!/bin/sh
 
 # raspberrypi-card-write.sh
-# (c) Copyright 2020 Andreas Müller <schnitzeltony@gmail.com>
+# (c) Copyright 2018 Andreas Müller <schnitzeltony@gmail.com>
 # Licensed under terms of GPLv2
 #
 # This script updates checksums in recipes after version bump. It is supposed
 # to run run in same environment as bitbake:
 #
-# update-recipe-checksums.sh [-d <recipedir> <recipes>
+# update-recipe-checksums.sh <recipe>
 #
 # where <recipe> can be a single recipe, a packagegroup an image or...
 
 # Includes
 . `dirname $0`/include/common-helpers.inc
 
-echo
-if [ "$1" = "-d" ]; then
-    shift
-    _TOPDIR="$1"
-    echo -e "${style_bold}Use $1 as recipe directory...${style_normal}"
-    shift
-fi
-
 if [ -z "$1" ]; then
     ErrorOut "No fetch target set in first parameter!"
 fi
 
-if [ "x$_TOPDIR" = "x" ]; then
+# Ask bitbake for recipe directory
-    echo -e "${style_bold}Ask bitbake for recipe directory...${style_normal}"
+GetBitbakeEnvVar "TOPDIR"
-    GetBitbakeEnvVar "TOPDIR"
+_TOPDIR="$BitbakeEnvVar"
-    _TOPDIR="$BitbakeEnvVar"
-fi
 
 echo
 echo -e "${style_bold}Run bitbake -k --runall=fetch $@...${style_normal}"