README.md: meta-office change branch to thud

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

README

@@ -1,178 +0,0 @@
-.-.    .-.
-|  \  /  |            .-.
-|   \/   |.-----.----.| |   .-----.-----.-----..----.
-|        ||     |  .-'| '--.|  ---' __  |     |.--  |
-|    |   ||  '  |  |  |  --'|---  |     |  |  |  '  \
-'----'---''-----'--'  '----''-----'--.  |--'--''--`--`
-                                   .-'  |
-                                   '----'
-
-meta-mortsgna is yet another distribution layer. It is based on Ångström
-distribution  - check https://github.com/Angstrom-distribution/meta-angstrom.
-
-The target of this layer is to build images with the best out-of-the-box
-experience and to support developers with helpers for common tasks.
-
--------------------------------------------------------------------------------
-Layer maintainer: Andreas Müller <schnitzeltony@gmail.com>
-
-
--------------------------------------------------------------------------------
-Additionally this layer checks the following variable in local.conf:
-
-* MORTSGNA_ARMV7_TUNE:
-  If this variable is set to "1", all armv7a / cortex variants are build as
-  armv7a.
-
-  + Reduce build time/disk-space required when building for multiple machines
-  - Build optimization (e.g vfp/NEON) is not the best your machine can get
-
-  Rules of thumb:
-  * If you build images for multiple armv7 machines and don't need to tickle
-    the last quarter of your machine's performance:
-    Set MORTSGNA_ARMV7_TUNE="1"
-  * If you are looking for best optimization for your machine and/or you have
-    a fast build host with lots of disk-space: don't!
-  see conf/distro/include/mortsgna-armv7-tune.inc for more information
-
--------------------------------------------------------------------------------
-The following image-features are (re-)added:
-
-* x11-base: Let systemd boot into grahical target
-
-* volatile-log: If set, journal goes to volatile /run/log and /var/log is
-  linked to /run/log which is volatile.
-  NOTE: We change OE-Core's default here: In bitbake.conf VOLATILE_LOG_DIR is
-  enabled so that all images are build for volatile log. Since this is far off
-  what others do change the default.
-  See conf/distro/include/mortsgna-image-logfile-volatile.inc for more
-  information.
-
--------------------------------------------------------------------------------
-This layer contains the following folders:
-
-appends:
-  All bbappends are stored in this folder. For each layer a sub-folder exists
-  and the appends are dynamic: If a layer is not in bblayers.conf the folder
-  for the layer is ignored (see conf/layer.conf).
-
-classes:
-  * instant-sysroot-cross.bbclass: Create a sysroot for remote
-    building/debugging - Yocto's suggested workflows are cumbersome for ad-hoc
-    usage.
-  * instant-sysroot-native.bbclass: Native recipes inheriting this class
-    install everything necessary to run into a native sysroot. It's like a
-    quick & minimal native SDK. Currently gcc-cross and gdb-cross inherit this
-    class to enable instant remote debugging.
-  * user-with-full-skel.bbclass: Helper to populate /etc/skel in user's
-    home at image creation time.
-
-conf:
-  layer.conf / and distro configurations
-
-recipes-defaultconfig:
-  * default configurations for lxqt and xfce to get a preconfigured
-    environment. Note that all data is stored in th image at /etc/skel
-  * unpriv-user: A default non root user (named morona) member of many groups
-    required for daily operations. It is shipped with home folder populated
-    form /etc/skel.
-
-recipes-image:
-  All images for console / kde / lxqt / xfce ar found. allgui-images build
-  images for all graphical environments.
-
-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
-    them.
-
-scripts:
-  A script collection
-  * to write images or kernel only to sdcards
-  * for changing recipe checksums automatically after version bump
-
-
--------------------------------------------------------------------------------
-This layer depends on:
-
-URI: git://git.openembedded.org/openembedded-core
-branch: master
-revision: HEAD
-
-
-For building console images:
-
-URI: git://git.openembedded.org/meta-openembedded
-Layer: meta-oe
-branch: master
-revision: HEAD
-
-URI: git://git.openembedded.org/meta-openembedded
-Layer: meta-networking
-branch: master
-revision: HEAD
-
-
--------------------------------------------------------------------------------
-Other layers are required when building 'GUI images'
-
-URI: git://git.openembedded.org/meta-openembedded
-Layer: meta-gnome
-branch: master
-revision: HEAD
-
-URI: git://git.openembedded.org/meta-openembedded
-Layer: meta-multimedia
-branch: master
-revision: HEAD
-
-URI: git://git.openembedded.org/meta-openembedded
-Layer: meta-python
-branch: master
-revision: HEAD
-
-URI: git://git.openembedded.org/meta-openembedded
-Layer: meta-xfce
-branch: master
-revision: HEAD
-
-URI: git://github.com/meta-qt5/meta-qt5.git
-branch: master
-revision: HEAD
-
-URI: git://github.com/schnitzeltony/meta-qt5-extra.git
-branch: master
-revision: HEAD
-
-URI: git://github.com/schnitzeltony/meta-office.git
-branch: master
-revision: HEAD
-
-URI: git://github.com/OSSystems/meta-browser.git
-branch: master
-revision: HEAD
-
-URI: git://github.com/cazfi/meta-games.git
-branch: master
-revision: HEAD
-
-URI: git://github.com/schnitzeltony/meta-retro
-branch: master
-revision: HEAD
-
--------------------------------------------------------------------------------
-To add plymouth to 'GUI images'
-
-URI: git://git.openembedded.org/meta-openembedded
-Layer: meta-initramfs
-branch: master
-revision: HEAD
-
--------------------------------------------------------------------------------
-To hear radio
-
-URI: git://github.com/balister/meta-sdr.git
-Layer: meta-initramfs
-branch: master
-revision: HEAD

README.md

@@ -0,0 +1,230 @@
+# meta-mortsgna: (more than) yet another distro layer
+
+The target of this layer is to build images with the best out-of-the-box experience and to support developers with helpers for common tasks.
+It has its origin Ångström distribution  - check https://github.com/Angstrom-distribution/meta-angstrom.
+
+----------------------------------------------
+### Additional global variable for local.conf:
+
+* MORTSGNA_ARMV7_TUNE:
+  
+  If this variable is set to "1", all armv7a / cortex variants are build as
+  armv7a.
+
+  \+ Reduce build time/disk-space required when building for multiple machines
+
+  \- Build optimization (e.g vfp/NEON) is not the best your machine can get
+
+  Rules of thumb:
+  * If you build images for multiple armv7 machines and don't need to tickle
+    the last quarter of your machine's performance:
+    Set MORTSGNA_ARMV7_TUNE="1"
+  * If you are looking for best optimization for your machine and/or you have
+    a fast build host with lots of disk-space: don't!
+  see [mortsgna-armv7-tune.inc](conf/distro/include/mortsgna-armv7-tune.inc) for more information
+
+------------------------------------------------
+### The following image-features are (re-)added:
+
+  * x11-base:
+    Let systemd boot into grahical target
+
+  * volatile-log:
+    If set, journal goes to volatile /run/log and /var/log is linked to /run/log 
+    which is volatile. NOTE: We change OE-Core's default here: In bitbake.conf
+    VOLATILE_LOG_DIR is enabled so that all images are build for volatile log. 
+    Since this is far off what others do change the default. See
+    [mortsgna-image-logfile-volatile.inc](conf/distro/include/mortsgna-image-logfile-volatile.inc) for more
+    information.
+
+----------------------------------------------
+### This layer contains the following folders:
+
+[appends](appends):
+  * All bbappends are stored in this folder. For each layer a sub-folder exists
+    and the appends are dynamic: If a layer is not in bblayers.conf the folder
+    for the layer is ignored (see conf/layer.conf).
+
+[classes](classes):
+  * [instant-sysroot-target.bbclass](classes/instant-sysroot-target.bbclass): Create a sysroot for target remote
+    building/debugging - Yocto's suggested workflows are cumbersome for ad-hoc
+    usage.
+  * [instant-sysroot-native.bbclass](classes/instant-sysroot-native.bbclass): Native recipes inheriting this class
+    install everything necessary to run into a native sysroot. For a
+    quick & minimal native SDK gcc-cross and gdb-cross inherit this class.
+    class to enable instant remote debugging.
+  * [user-with-full-skel.bbclass](classes/user-with-full-skel.bbclass): Helper to populate /etc/skel in user's
+    home at image creation time.
+
+[conf](conf):
+  * layer.conf / and distro configurations
+
+[recipes-defaultconfig](recipes-defaultconfig):
+  * default configurations for lxqt and xfce to get a preconfigured
+    environment. Note that all data is stored in th image at /etc/skel
+  * unpriv-user: A default non root user (named morona) member of many groups
+    required for daily operations. It is shipped with home folder populated
+    form /etc/skel.
+
+[recipes-image](recipes-image):
+  * All images for console / kde / lxqt / xfce ar found. allgui-images build
+    images for all graphical environments.
+
+[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
+    them.
+
+[scripts](scripts):
+  A script collection
+  * to write images or kernel only to sdcards
+  * for changing recipe checksums automatically after version bump -> [update-recipe-checksums.sh](scripts/update-recipe-checksums.sh)
+
+
+--------------------------
+### This layer depends on:
+
+```
+URI: git://git.openembedded.org/openembedded-core
+branch: thud
+revision: HEAD
+```
+
+#### For building console-images:
+```
+URI: git://git.openembedded.org/meta-openembedded
+Layer: meta-oe
+branch: thud
+revision: HEAD
+```
+
+```
+URI: git://git.openembedded.org/meta-openembedded
+Layer: meta-networking
+branch: thud
+revision: HEAD
+```
+
+#### For building GUI-images:
+
+```
+URI: git://git.openembedded.org/meta-openembedded
+Layer: meta-gnome
+branch: thud
+revision: HEAD
+```
+
+```
+URI: git://git.openembedded.org/meta-openembedded
+Layer: meta-multimedia
+branch: thud
+revision: HEAD
+```
+
+```
+URI: git://git.openembedded.org/meta-openembedded
+Layer: meta-python
+branch: thud
+revision: HEAD
+```
+
+```
+URI: git://git.openembedded.org/meta-openembedded
+Layer: meta-xfce
+branch: thud
+revision: HEAD
+```
+
+```
+URI: git://github.com/meta-qt5/meta-qt5.git
+branch: thud
+revision: HEAD
+```
+
+```
+URI: git://github.com/schnitzeltony/meta-qt5-extra.git
+branch: thud
+revision: HEAD
+```
+
+#### To add plymouth to GUI-images:
+
+```
+URI: git://git.openembedded.org/meta-openembedded
+Layer: meta-initramfs
+branch: thud
+revision: HEAD
+```
+
+#### To surf the internet:
+
+```
+URI: git://github.com/OSSystems/meta-browser.git
+branch: master
+revision: HEAD
+```
+
+```
+URI: git://github.com/meta-rust/meta-rust.git
+branch: master
+revision: HEAD
+```
+
+#### To pretend work:
+```
+URI: git://github.com/schnitzeltony/meta-office.git
+branch: thud
+revision: HEAD
+```
+
+#### To produce music:
+```
+URI: git://github.com/schnitzeltony/meta-qt5-extra.git
+branch: thud
+revision: HEAD
+```
+
+#### To hear radio:
+
+```
+URI: git://github.com/balister/meta-sdr.git
+branch: master
+revision: HEAD
+```
+
+#### To happily waste time:
+
+```
+URI: git://github.com/cazfi/meta-games.git
+branch: master
+revision: HEAD
+```
+
+```
+URI: git://github.com/schnitzeltony/meta-retro
+branch: master
+revision: HEAD
+```
+
+------------
+Contributing
+------------
+* Submit any patches against the `meta-mortsgna` layer by using the GitHub pull-request feature.
+
+
+--------
+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)
+
+
+-----------
+Maintainers
+-----------
+
+Layer maintainer: Andreas Müller <schnitzeltony@gmail.com>
+

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

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

appends/meta-qt5/qtbase_%.bbappend

@@ -7,30 +7,31 @@ PACKAGECONFIG_DISTRO += " \
 
 inherit instant-paths
 
-do_copy_to_cross_sysroot_append() {
+do_copy_to_target_sysroot_append() {
     # ---------- qt.conf ----------
     # create
     generate_qt_config_file_paths
 
-    # copy to cross sysroot
+    # move to target sysroot
     qtconf=`basename ${OE_QMAKE_QTCONF_PATH}`
-    targetpath=${INSTANT_CROSS_PATH}${OE_QMAKE_PATH_HOST_BINS}
+    targetpath=${INSTANT_TARGET_PATH}${OE_QMAKE_PATH_HOST_BINS}
-    cp -f "${OE_QMAKE_QTCONF_PATH}" "$targetpath"
+    rm -f "$targetpath/$qtconf"
+    mv "${OE_QMAKE_QTCONF_PATH}" "$targetpath"
     echo "${OE_QMAKE_PATH_HOST_BINS}/$qtconf" >> ${INSTANT_MANIFEST}
 
     # adjust to instant sysroot
     sed -i \
         -e 's:${STAGING_DIR_NATIVE}:${INSTANT_NATIVE_PATH}:g' \
-        -e 's:${STAGING_DIR_HOST}:${INSTANT_CROSS_PATH}:g' \
+        -e 's:${STAGING_DIR_HOST}:${INSTANT_TARGET_PATH}:g' \
         -e 's:^HostBinaries =.*:HostBinaries = ${INSTANT_NATIVE_PATH}${bindir}${QT_DIR_NAME}:g' \
         "$targetpath/$qtconf"
 
     # ---------- mkspecs qmake.conf ----------
-    rm ${INSTANT_CROSS_PATH}${libdir}${QT_DIR_NAME}/mkspecs/${XPLATFORM}/qmake.conf
+    rm ${INSTANT_TARGET_PATH}${libdir}${QT_DIR_NAME}/mkspecs/${XPLATFORM}/qmake.conf
     cp -f "${WORKDIR}/packages-split/${PN}-mkspecs${libdir}${QT_DIR_NAME}/mkspecs/${XPLATFORM}/qmake.conf" \
-        "${INSTANT_CROSS_PATH}${libdir}${QT_DIR_NAME}/mkspecs/${XPLATFORM}/"
+        "${INSTANT_TARGET_PATH}${libdir}${QT_DIR_NAME}/mkspecs/${XPLATFORM}/"
     sed -i \
-        -e 's:${DEBUG_PREFIX_MAP}:-fdebug-prefix-map=${INSTANT_CROSS_PATH}= -fdebug-prefix-map=${INSTANT_NATIVE_PATH}=:g' \
+        -e 's:${DEBUG_PREFIX_MAP}:-fdebug-prefix-map=${INSTANT_TARGET_PATH}= -fdebug-prefix-map=${INSTANT_NATIVE_PATH}=:g' \
-        "${INSTANT_CROSS_PATH}${libdir}${QT_DIR_NAME}/mkspecs/${XPLATFORM}/qmake.conf"
+        "${INSTANT_TARGET_PATH}${libdir}${QT_DIR_NAME}/mkspecs/${XPLATFORM}/qmake.conf"
 
 }

appends/meta-qt5/qtquickcontrols2_%.bbappend

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

appends/meta-qt5/qtwayland_%.bbappend

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

appends/oe-core/base-files/profile

@@ -3,14 +3,12 @@
 
 PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin"
 
-EDITOR="vi"			# needed for packages like cron, git-commit
-
 TERM="xterm-256color"
 
-# Set the prompt for bash and ash (no other shells known to be in use here)
+# Set the prompt for bash
 PS1='\u@\h:\W\$ '
-PROMPT_COMMAND='printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"'
 
+# loop profile.d scriptlets
 if [ -d /etc/profile.d ]; then
 	for i in /etc/profile.d/*.sh; do
 		if [ -f $i -a -r $i ]; then
@@ -20,15 +18,44 @@ if [ -d /etc/profile.d ]; then
 	unset i
 fi
 
-if command -v resize >/dev/null && command -v tty >/dev/null; then
+# locale fallback for UTF8
-	# Make sure we are on a serial console (i.e. the device used starts with
+if [ -z "$LANG" ]; then
-	# /dev/tty[A-z]), otherwise we confuse e.g. the eclipse launcher which
+    LANG="en_US.utf8"
-	# tries do use ssh
+    export LANG
-	case $(tty) in
-		/dev/tty[A-z]*) resize >/dev/null;;
-	esac
 fi
 
-export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM PROMPT_COMMAND
+# `ls' enhancements:
+export LS_OPTIONS='--color=auto'
+eval `dircolors`
+alias ls='ls $LS_OPTIONS'
+alias ll='ls $LS_OPTIONS -l'
+
+# colorize all grep variants
+alias grep='grep --color'
+alias egrep='egrep --color=auto'
+alias fgrep='fgrep --color=auto'
+alias xzegrep='xzegrep --color=auto'
+alias xzfgrep='xzfgrep --color=auto'
+alias xzgrep='xzgrep --color=auto'
+alias zegrep='zegrep --color=auto'
+alias zfgrep='zfgrep --color=auto'
+alias zgrep='zgrep --color=auto'
+
+# Turn on parallel history
+shopt -s histappend
+history -a
+
+HOSTNAME=`hostname 2>/dev/null`
+HISTSIZE=1000
+if [ "$HISTCONTROL" = "ignorespace" ] ; then
+    export HISTCONTROL=ignoreboth
+else
+    export HISTCONTROL=ignoredups
+fi
+
+# Turn on checkwinsize
+shopt -s checkwinsize
+
+export PATH TERM PS1 PROMPT_COMMAND HOSTNAME HISTSIZE
 
 umask 022

appends/oe-core/base-files/share/dot.bashrc

@@ -1,13 +1,5 @@
-# ~/.bashrc: executed by bash(1) for non-login shells.
+# ~/.bashrc: executed by bash(1) for interactive non-login shells.
 
-PS1='\u@\h:\W\$ '
+if [ -f /etc/profile ]; then
-
+  . /etc/profile
-# `ls' enhancements:
+fi
-export LS_OPTIONS='--color=auto'
-eval `dircolors`
-alias ls='ls $LS_OPTIONS'
-alias ll='ls $LS_OPTIONS -l'
-# REVISIT - do not change path
-alias su='su --login'
-
-umask 022

appends/oe-core/base-files/share/dot.profile

@@ -1,14 +1,5 @@
-# ~/.profile: executed by Bourne-compatible login shells.
+# ~/.profile: executed by interactive login shells.
 
 if [ -f ~/.bashrc ]; then
   . ~/.bashrc
 fi
-
-# Might fail after "su - myuser" when /dev/tty* is not writable by "myuser".
-mesg n 2>/dev/null
-
-# locale fallback for UTF8
-if [ -z "$LANG" ]; then
-    LANG="en_US.utf8"
-    export LANG
-fi

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

@@ -0,0 +1,3 @@
+do_install_append() {
+    sed -i 's|root::0:0:root:/home/root:/bin/sh|root::0:0:root:/home/root:/bin/bash|' ${D}${datadir}/${BPN}/passwd.master
+}

appends/oe-core/cmake%.bbappend

@@ -0,0 +1 @@
+inherit instant-sysroot-native

appends/oe-core/gstreamer1.0-plugins-bad_%.bbappend

@@ -3,5 +3,4 @@ PACKAGECONFIG_append = " \
     libmms \
     faad \
     fluidsynth \
-    gtk \
 "

appends/oe-core/gstreamer1.0-plugins-ugly_%.bbappend

@@ -1,4 +1,3 @@
 PACKAGECONFIG_append = " \
-    mad \
     x264 \
 "

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

@@ -1 +1 @@
-PACKAGECONFIG ?= "gnome"
+PACKAGECONFIG_append = " gnome"

classes/image-buildinfo-mortsgna.bbclass

@@ -0,0 +1,86 @@
+#
+# Writes build information to target filesystem on /etc/buildinfo
+#
+# Copyright (C) 2014 Intel Corporation
+# Author: Alejandro Enedino Hernandez Samaniego <alejandro.hernandez@intel.com>
+#
+# Licensed under the MIT license, see COPYING.MIT for details
+#
+# Usage: add INHERIT += "image-buildinfo_mortsgna-mortsgna" to your conf file
+#
+# This is a slightly reworked version oe-core's version. Patch was sent [1] 
+# but...
+# [1] http://lists.openembedded.org/pipermail/openembedded-core/2018-September/274747.html
+
+# Desired variables to display 
+IMAGE_BUILDINFO_MORTSGNA_VARS ?= "DISTRO DISTRO_VERSION"
+
+# Desired location of the output file in the image.
+IMAGE_BUILDINFO_MORTSGNA_FILE ??= "${sysconfdir}/buildinfo"
+
+# Gets git branch's status (clean or dirty)
+def get_layer_mortsgna_git_status(path):
+    import subprocess
+    try:
+        subprocess.check_output("""cd %s; export PSEUDO_UNLOAD=1; set -e;
+                                git diff --quiet --no-ext-diff
+                                git diff --quiet --no-ext-diff --cached""" % path,
+                                shell=True,
+                                stderr=subprocess.STDOUT)
+        return ""
+    except subprocess.CalledProcessError as ex:
+        # Silently treat errors as "modified", without checking for the
+        # (expected) return code 1 in a modified git repo. For example, we get
+        # output and a 129 return code when a layer isn't a git repo at all.
+        return "-- modified"
+
+# Returns layer revisions along with their respective status
+def get_layer_mortsgna_revs(d):
+    layers = (d.getVar("BBLAYERS") or "").split()
+    medadata_revs = ["%-17s = %s:%s %s" % (os.path.basename(i), \
+        base_get_metadata_git_branch(i, None).strip(), \
+        base_get_metadata_git_revision(i, None), \
+        get_layer_mortsgna_git_status(i)) \
+            for i in layers]
+    return '\n'.join(medadata_revs)
+
+def buildinfo_mortsgna_target(d):
+        # Get context
+        if d.getVar('BB_WORKERCONTEXT') != '1':
+                return ""
+        # taken from base.bbclass
+        localdata = bb.data.createCopy(d)
+        statuslines = []
+        g = globals()
+        func = 'buildcfg_vars'
+        if func not in g:
+            bb.warn("Build configuration function '%s' does not exist" % func)
+        else:
+            flines = g[func](localdata)
+            if flines:
+                statuslines.extend(flines)
+        return ('\n%s\n' % '\n'.join(statuslines))
+
+# Write build information to target filesystem
+python buildinfo_mortsgna () {
+    if not d.getVar('IMAGE_BUILDINFO_MORTSGNA_FILE'):
+        return
+    with open(d.expand('${IMAGE_ROOTFS}${IMAGE_BUILDINFO_MORTSGNA_FILE}'), 'w') as build:
+        build.writelines((
+            '''-----------------------
+Build Configuration:  |
+-----------------------
+''',
+            buildinfo_mortsgna_target(d),
+            '''
+-----------------------
+Layer Revisions:      |
+-----------------------
+''',
+            get_layer_mortsgna_revs(d),
+            '''
+'''
+       ))
+}
+
+IMAGE_PREPROCESS_COMMAND += "buildinfo_mortsgna;"

classes/instant-paths.bbclass

@@ -1,5 +1,5 @@
 # This is where instant native sysroot is installed to
 INSTANT_NATIVE_PATH = "${TMPDIR}/sysroot-instant-native"
 
-# This is where instant cross sysroot is installed to
+# This is where instant target sysroot is installed to
-INSTANT_CROSS_PATH = "${TMPDIR}/sysroot-instant-cross-${MACHINE_ARCH}"
+INSTANT_TARGET_PATH = "${TMPDIR}/sysroot-instant-target-${MACHINE_ARCH}"

classes/instant-sysroot-native.bbclass

@@ -1,5 +1,7 @@
 #------------------------------------------------------------------------------
 # class for instant native sysroot
+#
+# Hardlink recipe sysroot and generated sysroot to instant native sysroot
 #------------------------------------------------------------------------------
 
 inherit utils instant-paths
@@ -20,10 +22,10 @@ INSTANTPOPULATE_class-native = "instant_populate_sysroot"
 INSTANTPOPULATE_class-cross = "instant_populate_sysroot"
 
 instant_populate_sysroot () {
-    for executable in `find ${SYSROOT_DESTDIR}/${STAGING_DIR_NATIVE} -type f`; do
+    find "${SYSROOT_DESTDIR}${STAGING_DIR_NATIVE}" -type f -o -type l | while read file; do
-        alignedpath=`echo ${executable} | sed 's:${SYSROOT_DESTDIR}/${STAGING_DIR_NATIVE}::'`
+        alignedpath=`echo "$file" | sed 's:${SYSROOT_DESTDIR}${STAGING_DIR_NATIVE}::'`
-        targetdir=`dirname ${INSTANT_NATIVE_PATH}/${alignedpath}`
+        targetdir=`dirname "${INSTANT_NATIVE_PATH}/${alignedpath}"`
         mkdir -p "$targetdir"
-        cp -fl "${executable}" "${targetdir}"
+        cp -fld "${file}" "${targetdir}"
     done
 }

classes/instant-sysroot-target.bbclass

@@ -9,10 +9,10 @@
 # To achieve, a debug sysroot is build with low cost:
 #
 # * All files are hard-linked to recipe's ${WORKDIR}/package
-# * Additional build time for task do_copy_to_cross_sysroot for most recipes is < 1s
+# * Additional build time for task do_copy_to_target_sysroot for most recipes is < 1s
 #
 # to enable debug sysroot build set:
-# 'INHERIT += "instant-sysroot-cross"'
+# 'INHERIT += "instant-sysroot-target"'
 # in your local.conf
 #
 # to debug by remote do:
@@ -24,24 +24,32 @@
 #   'gdbserver :5000 /usr/bin/thunar'
 #
 # ON BUILD HOST (suggested IDE: QtCreator)
-# * build gdb-cross-<TARGET_ARCH> (done automatically on images if this class
+# * 'bitbake gdb-cross-<TARGET_ARCH>' (done automatically on images if this class
-#   enabled - see EXTRA_IMAGEDEPENDS below)
+#   is enabled - see EXTRA_IMAGEDEPENDS below)
+# * 'bitbake qtcreator-sdk-prepare' once to create a valid qt.conf for qmake
 # * in QtCreator select Menu Debug/Start Debugging/Attach to Running Debug Server
 #   -> Dialog 'Start Debugger' opens
 # * At the first session a so called 'Kit' has to be set up (1st line -> 'Manage').
-#   The settings are kept so 1.-6. have to be done once only.
+#   The settings are kept so 1.- 8. have to be done once only.
 #   1. Create a Kit by 'Add' -> further dialog opens
 #   2. Select an name for the Kit e.g 'OE'
-#   3. Set sysroot (see INSTANT_CROSS_PATH in instant-path.bbclass):
+#   3. On recent QtCreators select 'Generic Linux Device' for 'Device type' -
-#      ${TMPDIR}/sysroot-instant-cross-${MACHINE_ARCH}
+#      otherwise QtCreator won't let you select the kit later
-#   4. Select compilers (it is not necessary for debug but without QTCreator won't enable Kit) for C and C++ e.g:
+#   4. Set sysroot (see INSTANT_TARGET_PATH in instant-path.bbclass):
+#      ${TMPDIR}/sysroot-instant-target-${MACHINE_ARCH}
+#   5. Select compilers (it is not necessary for debug but without QTCreator won't enable Kit) for C and C++ e.g:
 #      C:   '<TMDIR>/sysroot-instant-native/usr/bin/arm-mortsgna-linux-gnueabi/arm-mortsgna-linux-gnueabi-gcc'
 #      C++: '<TMDIR>/sysroot-instant-native/usr/bin/arm-mortsgna-linux-gnueabi/arm-mortsgna-linux-gnueabi-g++'
-#   5. Select debugger e.g:
+#   6. Select debugger e.g:
 #      GDB: '<TMDIR>/sysroot-instant-native/usr/bin/arm-mortsgna-linux-gnueabi/arm-mortsgna-linux-gnueabi-gdb'
-#   6. Select 'OK' in Options dialog -> 'Start Debugger' should be back on top
+#   7. To avoid qtcreator stopping on certain signals Select 'Debugger' in left list and in
+#      * 'GDB'-tab unselect 'Show a message box when reciving a signal'
+#      * 'Locals & Expressions' add in 'Debugging Helper Customization' lines as
+#         'handle SIG32 pass nostop noprint' to pass SIG32 to application without
+#         running int breaks
+#   8. Select 'OK' in Options dialog -> 'Start Debugger' should be back on top
 # * Make sure 'OE' Kit is selected
-# * Browse for executable e.g '<TMDIR>/sysroot-instant-cross/usr/bin/thunar'
+# * Browse for executable e.g '<TMDIR>/sysroot-instant-target/usr/bin/thunar'
 # * Set IP:Port of target machine e.g '192.168.2.108:5000'
 # * Select 'OK'
 #
@@ -56,27 +64,27 @@ EXTRA_IMAGEDEPENDS += "gdb-cross-${TARGET_ARCH} gdb"
 
 python __anonymous () {
     if d.getVar('CLASSOVERRIDE') != 'class-target':
-        bb.build.deltask('do_copy_to_cross_sysroot', d)
+        bb.build.deltask('do_copy_to_target_sysroot', d)
 }
 
-INSTANT_MANIFEST = "${INSTANT_CROSS_PATH}/manifests/${PN}"
+INSTANT_MANIFEST = "${INSTANT_TARGET_PATH}/manifests/${PN}"
 
-do_copy_to_cross_sysroot() {
+do_copy_to_target_sysroot() {
     # ---------- bail out on package-less recipes ----------
     if [ ! -d "${WORKDIR}/packages-split" -o ! -d ${WORKDIR}/package ]; then
         exit 0
     fi
 
     # ---------- remove old sources ----------
-    rm -rf ${INSTANT_CROSS_PATH}/usr/src/debug/${PN}
+    rm -rf ${INSTANT_TARGET_PATH}/usr/src/debug/${PN}
 
     # ---------- remove old files in manifest and manifest ----------
     if [ -f ${INSTANT_MANIFEST} ] ; then
         echo "Old manifest ${INSTANT_MANIFEST} found - remove files..."
         # remove old files from sysroot
         for file in `cat ${INSTANT_MANIFEST}` ; do
-            if ! rm "${INSTANT_CROSS_PATH}/$file" 2> /dev/null; then
+            if ! rm "${INSTANT_TARGET_PATH}/$file" 2> /dev/null; then
-                echo "Tried to delete '${INSTANT_CROSS_PATH}/$file' but it is not there! A look into mainfest creation at '${INSTANT_MANIFEST}' might help."
+                echo "Tried to delete '${INSTANT_TARGET_PATH}/$file' but it is not there! A look into mainfest creation at '${INSTANT_MANIFEST}' might help."
             fi
         done
         # remove old manifest
@@ -85,12 +93,12 @@ do_copy_to_cross_sysroot() {
 
     # ---------- hard link source code files ----------
     if [ -d ${WORKDIR}/package/usr/src/debug/${PN} ] ; then
-        mkdir -p ${INSTANT_CROSS_PATH}/usr/src/debug/${PN}
+        mkdir -p ${INSTANT_TARGET_PATH}/usr/src/debug/${PN}
-        hardlinkdir ${WORKDIR}/package/usr/src/debug/${PN} ${INSTANT_CROSS_PATH}/usr/src/debug/${PN}
+        hardlinkdir ${WORKDIR}/package/usr/src/debug/${PN} ${INSTANT_TARGET_PATH}/usr/src/debug/${PN}
     fi
 
     # ---------- names of binaries and debuginfo -> manifest ----------
-    mkdir -p ${INSTANT_CROSS_PATH}/manifests
+    mkdir -p ${INSTANT_TARGET_PATH}/manifests
     # get path to library-link once only
     if [ "${PN}" = "glibc-locale" ] ; then
         PACK_SPLIT_LIB_LINK_SEARCH_PATH=`find ${WORKDIR}/packages-split -mindepth 1 -maxdepth 1 -type d ! -name '*-dbg' ! -name '*-dev' ! -name '*-staticdev' ! -name '*-doc' ! -name 'glibc*-localedata-*' ! -name 'glibc-charmap-*' ! -name 'locale-base-*'`
@@ -159,17 +167,17 @@ do_copy_to_cross_sysroot() {
         for file in `cat ${INSTANT_MANIFEST}` ; do
             file=`echo $file | cut -c 2-`
             if [ -e $file ] ; then
-                echo -n $file | cpio --null -pdlu ${INSTANT_CROSS_PATH} > /dev/null 2>&1
+                echo -n $file | cpio --null -pdlu ${INSTANT_TARGET_PATH} > /dev/null 2>&1
             fi
         done
     fi
 }
 
-addtask copy_to_cross_sysroot after do_package before do_build
+addtask copy_to_target_sysroot after do_package before do_build
 
 # same as do package
-do_copy_to_cross_sysroot[vardeps] = "${PACKAGEBUILDPKGD} ${PACKAGESPLITFUNCS} ${PACKAGEFUNCS} ${@gen_packagevar(d)}"
+do_copy_to_target_sysroot[vardeps] = "${PACKAGEBUILDPKGD} ${PACKAGESPLITFUNCS} ${PACKAGEFUNCS} ${@gen_packagevar(d)}"
 
-do_copy_to_cross_sysroot[stamp-extra-info] = "${MACHINE_ARCH}"
+do_copy_to_target_sysroot[stamp-extra-info] = "${MACHINE_ARCH}"
 
-do_build[recrdeptask] += "do_copy_to_cross_sysroot"
+do_build[recrdeptask] += "do_copy_to_target_sysroot"

classes/instant-toolchain-target.bbclass

@@ -0,0 +1,28 @@
+#------------------------------------------------------------------------------
+# class for instant toolchain
+#------------------------------------------------------------------------------
+
+inherit instant-paths
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+do_compile[postfuncs] += "${COMPILE_POST_TARGET}"
+COMPILE_POST_TARGET = ""
+COMPILE_POST_TARGET_class-target = "instant_compile_target"
+
+INSTANTPOPULATE_TOOLCHAIN_VARS = " \
+    CC \
+    CFLAGS \
+"
+
+python instant_compile_target () {
+    # create sourceable script that exports variables necessary
+    for envvar in d.getVar('INSTANTPOPULATE_TOOLCHAIN_VARS').split():
+        content = d.getVar(envvar).strip()
+        line = 'export %s="%s"' % (envvar, content)
+        line = line.replace(d.getVar('DEBUG_PREFIX_MAP'),'-fdebug-prefix-map=%s= -fdebug-prefix-map=%s=' % (d.getVar('INSTANT_TARGET_PATH'), d.getVar('INSTANT_NATIVE_PATH') ))
+        line = line.replace(d.getVar('STAGING_DIR_NATIVE'),d.getVar('INSTANT_NATIVE_PATH'))
+        line = line.replace(d.getVar('STAGING_DIR_HOST'),d.getVar('INSTANT_TARGET_PATH'))
+        print(line)
+        print(d.getVar('DEBUG_PREFIX_MAP'))
+}

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

@@ -1,9 +1,9 @@
 def armv7_tune_handler(d):
-    tune = d.getVar('DEFAULTTUNE', True)
+    tune = d.getVar('DEFAULTTUNE')
     # set MORTSGNA_ARMV7_TUNE="1" in your local.conf to reduce all cortex variants
     # to common tune value
-    if d.getVar('MORTSGNA_ARMV7_TUNE', True) == '1':
+    if d.getVar('MORTSGNA_ARMV7_TUNE') == '1':
-        features = d.getVar('TUNE_FEATURES', True).split()
+        features = d.getVar('TUNE_FEATURES').split()
         if 'armv7a' in features or 'armv7ve' in features:
             tune = 'armv7athf'
             if 'bigendian' in features:
@@ -11,7 +11,7 @@ def armv7_tune_handler(d):
             if 'neon' in features:
                 tune += '-neon'
         else:
-            tune = d.getVar('DEFAULTTUNE', True)
+            tune = d.getVar('DEFAULTTUNE')
 
     return tune
 

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

@@ -1,5 +1,29 @@
 # We want images supporting the following features (for packagegroup(-core)-base)
-DISTRO_FEATURES = "alsa argp bluetooth ext2 ipv4 ipv6 irda largefile nfs pam pci pcmcia ppp smbfs systemd usbgadget usbhost vfat wifi xattr zeroconf gobject-introspection-data"
+
+DISTRO_FEATURES = " \
+    alsa \
+    argp \
+    bluetooth \
+    ext2 \
+    ipv4 \
+    ipv6 \
+    irda \
+    largefile \
+    nfs \
+    pam \
+    pci \
+    pcmcia \
+    ppp \
+    smbfs \
+    systemd \
+    usbgadget \
+    usbhost \
+    vfat \
+    wifi \
+    xattr \
+    zeroconf \
+    gobject-introspection-data \
+"
 
 # Disable sysvinit for recipes with systemd support
 DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit"
@@ -13,6 +37,7 @@ DISTRO_FEATURES += "x11"
 DISTRO_FEATURES += "3g"
 DISTRO_FEATURES += "pulseaudio"
 DISTRO_FEATURES += "ldconfig"
+DISTRO_FEATURES += "polkit"
 
 # OpenGL support
 DISTRO_FEATURES += "opengl"

conf/distro/include/mortsgna-inherits.inc

@@ -20,7 +20,7 @@ INHERIT += "insane"
 INHERIT += "sstate"
 
 # drop buildinfo to /etc/build
-INHERIT += "image-buildinfo"
+INHERIT += "image-buildinfo-mortsgna"
 
 # Prelink images
 INHERIT += "image-prelink"

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

@@ -1,17 +1,2 @@
 # glibc:
 PNBLACKLIST[libiconv] = "the glibc provided iconv library is used"
-
-TARGET_OS = "linux"
-
-# sane-toolchain.inc has this, and explains the GNU and ABI suffices:
-#TARGET_OS = "${@compute_os_portion_of_target_triplet(d)}"
-
-TARGET_OS .= "${@['','-gnueabi'][d.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
-TARGET_OS .= "${@['','-gnuspe'][d.getVar('TUNE_PKGARCH',d,1) in ['ppce500', 'ppce500v2']]}"
-
-# perl has some problems, see http://bugs.openembedded.net/show_bug.cgi?id=1616
-# [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os"
-
-TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][d.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel', 'mips64', 'mips64el']]}"
-
-

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

@@ -2,10 +2,8 @@
 
 # The things musl can provide.  We default to wanting musl to provide them.
 # libc settings
-DISTRO_FEATURES += "${@['', ' nls'][d.getVar('ENABLE_BINARY_LOCALE_GENERATION', 1) == '1']}"
+DISTRO_FEATURES += "${@['', ' nls'][d.getVar('ENABLE_BINARY_LOCALE_GENERATION') == '1']}"
 
 USE_NLS_glib-2.0 = "yes"
 USE_NLS_glib-2.0-native = "yes"
 USE_NLS_gcc-cross = "no"
-
-TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][d.getVar('TARGET_ARCH',1) in ['mips', 'mipsel', 'mips64', 'mips64el', 'avr32']]}"

conf/distro/mortsgna.conf

@@ -9,7 +9,8 @@
 # Global settings
 ###############################################################################
 
-DISTRO_VERSION = "v0.1"
+# follow Yocto version scheme
+DISTRO_VERSION = "v2.6"
 
 # 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
@@ -130,9 +131,12 @@ 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
-WARN_TO_ERROR_QA = "already-stripped compile-host-path install-host-path \
+WARN_TO_ERROR_QA = " \
-                    installed-vs-shipped ldflags pn-overrides rpaths staticdev \
+    already-stripped compile-host-path install-host-path \
-                    unknown-configure-option useless-rpaths host-user-contaminated"
+    installed-vs-shipped ldflags pn-overrides rpaths staticdev \
+    unknown-configure-option useless-rpaths host-user-contaminated \
+    invalid-packageconfig \
+"
 WARN_QA_remove = "${WARN_TO_ERROR_QA}"
 ERROR_QA_append = " ${WARN_TO_ERROR_QA}"
 
@@ -175,7 +179,12 @@ DISTRO_EXTRA_RRECOMMENDS += " \
 "
 
 # In case one wants to use packagegroup-basic: Prefer openssh over dropbear
-TASK_BASIC_SSHDAEMON = "openssh-ssh openssh-sshd openssh-scp openssh-sftp openssh-sftp-server"
+# Note: to avoid redundancies TASK_BASIC_SSHDAEMON is used in this layer
+TASK_BASIC_SSHDAEMON = " \
+    openssh-ssh openssh-sshd \
+    openssh-scp \
+    openssh-sftp openssh-sftp-server \
+"
 
 # Image features strongly suggested
 EXTRA_IMAGE_FEATURES += " \

qt5-sdk-recipes/qtcreator-sdk-prepare.bb

@@ -2,21 +2,19 @@ SUMMARY = "Prepare environment for cross building/debugging with QtCreator"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+inherit qmake5_base instant-toolchain-target
-
-inherit qmake5_base instant-paths
 
 DEPENDS = "qtbase"
 
 deltask do_prepare_recipe_sysroot
 
-do_install[depends] = "qtbase:do_copy_to_cross_sysroot"
+do_install[depends] = "qtbase:do_copy_to_target_sysroot"
 do_install[nostamp] = "1"
 
 do_install() {
     # inject qt.conf into native sysroot
     qtconf=`basename ${OE_QMAKE_QTCONF_PATH}`
-    sourcepath=${INSTANT_CROSS_PATH}${OE_QMAKE_PATH_HOST_BINS}
+    sourcepath=${INSTANT_TARGET_PATH}${OE_QMAKE_PATH_HOST_BINS}
     targetpath=${INSTANT_NATIVE_PATH}${OE_QMAKE_PATH_HOST_BINS}
     # be sure we remove old link (if any...)
     rm -f $targetpath/$qtconf
@@ -25,10 +23,10 @@ do_install() {
 
 ALLOW_EMPTY_${PN} = "1"
 
+# An image installing this requires the following packages at least for working
+# instant sdk support
 RDEPENDS_${PN} = " \
     qtbase \
     gdbserver \
-    openssh-sshd \
+    ${TASK_BASIC_SSHDAEMON} \
-    openssh-ssh \
-    openssh-scp \
 "

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

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="pointers" version="1.0">
-  <property name="ADS7846_Touchscreen" type="empty">
-    <property name="TouchscreenPointer" type="bool" value="true"/>
-  </property>
-  <property name="eGalax_Inc_USB_TouchController" type="empty">
-    <property name="TouchscreenPointer" type="bool" value="true"/>
-  </property>
-</channel>

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

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="ristretto" version="1.0">
-  <property name="window" type="empty">
-    <property name="navigationbar" type="empty">
-      <property name="position" type="string" value="left"/>
-    </property>
-  </property>
-  <property name="desktop" type="empty">
-    <property name="type" type="string" value="xfce"/>
-  </property>
-</channel>

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

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="thunar-volman" version="1.0">
-  <property name="automount-drives" type="empty">
-    <property name="enabled" type="bool" value="true"/>
-  </property>
-  <property name="automount-media" type="empty">
-    <property name="enabled" type="bool" value="true"/>
-  </property>
-</channel>

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

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-appfinder" version="1.0">
-  <property name="last" type="empty">
-    <property name="window-height" type="int" value="343"/>
-    <property name="window-width" type="int" value="750"/>
-    <property name="pane-position" type="int" value="180"/>
-  </property>
-</channel>

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

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-mixer" version="1.0">
-  <property name="sound-card" type="string" value="overoAlsamixer"/>
-  <property name="sound-cards" type="empty">
-    <property name="overoAlsamixer" type="array">
-      <value type="string" value="DAC1 Analog"/>
-      <value type="string" value="Headset"/>
-      <value type="string" value="HeadsetL Mixer AudioL1"/>
-      <value type="string" value="HeadsetR Mixer AudioR1"/>
-    </property>
-  </property>
-  <property name="window-height" type="int" value="400"/>
-  <property name="window-width" type="int" value="659"/>
-</channel>

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

@@ -23,7 +23,6 @@
         <value type="int" value="11"/>
         <value type="int" value="12"/>
         <value type="int" value="1"/>
-        <value type="int" value="7"/>
       </property>
       <property name="mode" type="uint" value="2"/>
       <property name="background-alpha" type="uint" value="17"/>
@@ -84,9 +83,6 @@
     </property>
     <property name="plugin-3" type="string" value="whiskermenu"/>
     <property name="plugin-1" type="string" value="cpugraph"/>
-    <property name="plugin-7" type="string" value="xkb">
-      <property name="group-policy" type="uint" value="0"/>
-    </property>
     <property name="plugin-11" type="string" value="cpufreq"/>
     <property name="plugin-12" type="string" value="systemload"/>
   </property>

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

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-settings-editor" version="1.0">
-  <property name="last" type="empty">
-    <property name="window-width" type="int" value="640"/>
-    <property name="window-height" type="int" value="500"/>
-    <property name="paned-position" type="int" value="180"/>
-  </property>
-</channel>

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

@@ -3,7 +3,7 @@
 <channel name="xsettings" version="1.0">
   <property name="Net" type="empty">
     <property name="ThemeName" type="string" value="Adwaita-dark"/>
-    <property name="IconThemeName" type="empty"/>
+    <property name="IconThemeName" type="string" value="Adwaita"/>
     <property name="DoubleClickTime" type="empty"/>
     <property name="DoubleClickDistance" type="empty"/>
     <property name="DndDragThreshold" type="empty"/>
@@ -31,7 +31,7 @@
     <property name="MenuImages" type="empty"/>
     <property name="ButtonImages" type="empty"/>
     <property name="MenuBarAccel" type="empty"/>
-    <property name="CursorThemeName" type="string" value="default"/>
+    <property name="CursorThemeName" type="string" value="Adwaita"/>
     <property name="CursorThemeSize" type="empty"/>
     <property name="DecorationLayout" type="empty"/>
     <property name="TouchscreenMode" type="bool" value="false"/>

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

@@ -16,10 +16,13 @@ IMAGE_INSTALL += " \
     packagegroup-xfce-base \
     network-manager-applet \
     xfce4-default-config \
+    vte \
     \
     packagegroup-lxqt-base \
     lxqt-default-config \
     \
+    liri-world \
+    \
     lumina \
     \
     weston weston-xwayland \

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

@@ -7,11 +7,13 @@ IMAGE_INSTALL += " \
     ${ROOTFS_PKGMANAGE} \
     update-alternatives-opkg \
     coreutils \
+    bash \
+    bash-completion \
+    systemd-bash-completion \
     systemd-analyze \
     cpufrequtils \
     htop \
     fixmac \
-    glibc-utils \
     util-linux-lsblk \
     nano \
 "

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

@@ -1,12 +1,15 @@
 require console-base-image.bb
 
-IMAGE_INSTALL += " \
+NETWORKPACKS ?= " \
+    ${TASK_BASIC_SSHDAEMON} \
     avahi-autoipd \
-    networkmanager \
-    openssh-sshd \
-    openssh-ssh \
-    openssh-scp \
     iputils \
+    networkmanager \
+    networkmanager-bash-completion \
+"
+
+IMAGE_INSTALL += " \
+    ${NETWORKPACKS} \
 "
 
 export IMAGE_BASENAME = "console-net-image"

recipes-image/liri/liri-base-image.bb

@@ -0,0 +1,14 @@
+require recipes-image/console/console-net-image.bb
+require recipes-image/include/x11-base.inc
+
+export IMAGE_BASENAME = "liri-base-image"
+
+IMAGE_INSTALL += " \
+    ${X11_BASE_INSTALL} \
+    sddm \
+    \
+    liri-world \
+"
+
+# reenable graphical target
+IMAGE_FEATURES += "x11-base"

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

@@ -6,6 +6,7 @@ inherit packagegroup
 
 RDEPENDS_${PN} = " \
     qt5-creator \
+    qtquickcontrols2-examples qtwayland-examples \
     hexedit \
     glade3 \
     umbrello \
@@ -13,6 +14,8 @@ RDEPENDS_${PN} = " \
     geany-plugins \
     gtk-demo gtk+3-demo \
     \
+    weston weston-xwayland  \
+    \
     unzip xz tar bzip2 \
     make cmake \
     automake autoconf libtool m4 \
@@ -21,44 +24,24 @@ RDEPENDS_${PN} = " \
     pkgconfig binutils-symlinks elfutils gnu-config \
     gdb gdbserver \
     git git-bash-completion subversion \
-    python-shell python-subprocess \
+    python python-shell python-subprocess \
-    python perl php vala lua php json-glib \
+    python3 \
+    perl php vala lua php json-glib \
     texinfo gettext \
     patch quilt ncurses dialog \
     man man-pages \
     gawk \
     chrpath \
     \
-    qtbase-tools \
-    qtbase-plugins \
-    qtbase-examples \
-    qtbase-doc \
-    qtdeclarative-tools \
-    qtdeclarative-qmlplugins \
-    qtscript \
-    qtgraphicaleffects-qmlplugins \
-    qtquickcontrols-qmlplugins \
-    qtsvg-plugins \
-    \
-    qtbase-dbg \
-    qt3d-dbg \
-    qtconnectivity-dbg \
-    qtdeclarative-dbg \
-    qtenginio-dbg \
-    qtimageformats-dbg \
-    qtlocation-dbg \
-    qtmultimedia-dbg \
-    qtsensors-dbg \
-    qtsvg-dbg \
-    qtsystems-dbg \
-    qttools-dbg \
-    qtwebsockets-dbg \
-    qtwebchannel-dbg \
-    qtquickcontrols-dbg \
-    \
     wireshark \
     nfs-utils-client \
     lmsensors-sensord lmsensors-sensorsdetect \
+    \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'browser-layer', 'chromium-x11', '', d)} \
+"
+
+RDEPENDS_${PN}_append_libc-glibc = " \
+    glibc-utils \
 "
 
 #    qemu

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

@@ -28,10 +28,9 @@ RDEPENDS_${PN} = " \
     ${@bb.utils.contains('BBFILE_COLLECTIONS', 'browser-layer', 'chromium-x11', '', d)} \
     \
     gparted \
-    gnome-system-monitor \
     \
     mpd \
-    parole \
+    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 \
@@ -44,10 +43,7 @@ RDEPENDS_${PN} = " \
     \
     kde-apps-world \
     \
-    gottet \
+    gottcode-world \
-    hexalate \
-    peg-e \
-    simsu \
     \
     qwt-qt5-examples \
     gnuplot gnuplot-x11 \

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

@@ -18,7 +18,7 @@ RDEPENDS_${PN} = " \
     bind \
     devilspie2 \
     \
-    bash-completion \
+    gnome-system-monitor \
     dconf-editor \
     \
     glmark2 mesa-demos eglinfo-x11 \

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

@@ -9,8 +9,9 @@ IMAGE_INSTALL += " \
     ${X11_BASE_INSTALL} \
     ${XFCE_DM} \
     \
-    packagegroup-xfce-base \
     packagegroup-gui-base \
+    packagegroup-xfce-base \
+    vte \
     \
     network-manager-applet \
     xfce4-default-config \

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

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

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

@@ -1,5 +1,7 @@
 require xfce4-tiny-image.bb
 
+XFCE_DM = "sddm sddm-morona-autologin"
+
 export IMAGE_BASENAME = "xfce4-full-image"
 
 IMAGE_INSTALL += " \

scripts/update-recipe-checksums.sh

@@ -23,9 +23,9 @@ GetBitbakeEnvVar "TOPDIR"
 _TOPDIR="$BitbakeEnvVar"
 
 echo
-echo -e "${style_bold}Run bitbake -k --runall=fetch ${1}...${style_normal}"
+echo -e "${style_bold}Run bitbake -k --runall=fetch $@...${style_normal}"
 
-bitbake -k --runall=fetch $1 2>&1 | while read line; do
+bitbake -k --runall=fetch "$@" 2>&1 | while read line; do
    if echo "$line" | grep -q "was expected"; then
        # Shorten line to ensure not being confused by filenames containing spaces
        line=`echo "$line" | sed 's:.*checksum ::'`