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

@@ -87,7 +87,7 @@ It has its origin Ångström distribution  - check https://github.com/Angstrom-d
 
 ```
 URI: git://git.openembedded.org/openembedded-core
-branch: thud
+branch: master
 revision: HEAD
 ```
 
@@ -95,14 +95,14 @@ revision: HEAD
 ```
 URI: git://git.openembedded.org/meta-openembedded
 Layer: meta-oe
-branch: thud
+branch: master
 revision: HEAD
 ```
 
 ```
 URI: git://git.openembedded.org/meta-openembedded
 Layer: meta-networking
-branch: thud
+branch: master
 revision: HEAD
 ```
 
@@ -111,40 +111,40 @@ revision: HEAD
 ```
 URI: git://git.openembedded.org/meta-openembedded
 Layer: meta-gnome
-branch: thud
+branch: master
 revision: HEAD
 ```
 
 ```
 URI: git://git.openembedded.org/meta-openembedded
 Layer: meta-multimedia
-branch: thud
+branch: master
 revision: HEAD
 ```
 
 ```
 URI: git://git.openembedded.org/meta-openembedded
 Layer: meta-python
-branch: thud
+branch: master
 revision: HEAD
 ```
 
 ```
 URI: git://git.openembedded.org/meta-openembedded
 Layer: meta-xfce
-branch: thud
+branch: master
 revision: HEAD
 ```
 
 ```
 URI: git://github.com/meta-qt5/meta-qt5.git
-branch: thud
+branch: master
 revision: HEAD
 ```
 
 ```
 URI: git://github.com/schnitzeltony/meta-qt5-extra.git
-branch: thud
+branch: master
 revision: HEAD
 ```
 
@@ -153,7 +153,7 @@ revision: HEAD
 ```
 URI: git://git.openembedded.org/meta-openembedded
 Layer: meta-initramfs
-branch: thud
+branch: master
 revision: HEAD
 ```
 
@@ -174,14 +174,15 @@ revision: HEAD
 #### To pretend work:
 ```
 URI: git://github.com/schnitzeltony/meta-office.git
-branch: thud
+branch: master
 revision: HEAD
 ```
 
 #### To produce music:
+
 ```
-URI: git://github.com/schnitzeltony/meta-qt5-extra.git
-branch: thud
+URI: git://github.com/schnitzeltony/meta-musicians.git
+branch: master
 revision: HEAD
 ```
 
@@ -227,4 +228,3 @@ Maintainers
 -----------
 
 Layer maintainer: Andreas Müller <schnitzeltony@gmail.com>
-

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

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

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

@@ -0,0 +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-qt5/vlc_%.bbappend

@@ -0,0 +1,3 @@
+# VLC is not part of meta-qt5. We add append here so the append will work only
+# in case meta-qt5 is in layers
+PACKAGECONFIG_append = " qt5"

appends/oe-core/base-files/profile

@@ -18,7 +18,7 @@ if [ -d /etc/profile.d ]; then
 	unset i
 fi
 
-# locale fallback for UTF8
+# set locale fallback - all our images contain en_US
 if [ -z "$LANG" ]; then
     LANG="en_US.utf8"
     export LANG

appends/oe-core/libsdl2_%.bbappend

@@ -0,0 +1 @@
+PACKAGECONFIG_append_class-target = " jack"

appends/oe-core/openssh_%.bbappend

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

appends/oe-core/pulseaudio_%.bbappend

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

appends/oe-core/weston%.bbappend

@@ -0,0 +1,2 @@
+# A root session without password activated by just two keys - honestly..
+RRECOMMENDS_${PN}_remove = "weston-init"

classes/instant-sysroot-target.bbclass

@@ -38,10 +38,10 @@
 #   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++'
+#      C:   '${TMPDIR}/sysroot-instant-native/usr/bin/arm-mortsgna-linux-gnueabi/arm-mortsgna-linux-gnueabi-gcc'
+#      C++: '${TMPDIR}/sysroot-instant-native/usr/bin/arm-mortsgna-linux-gnueabi/arm-mortsgna-linux-gnueabi-g++'
 #   6. Select debugger e.g:
-#      GDB: '<TMDIR>/sysroot-instant-native/usr/bin/arm-mortsgna-linux-gnueabi/arm-mortsgna-linux-gnueabi-gdb'
+#      GDB: '${TMPDIR}/sysroot-instant-native/usr/bin/arm-mortsgna-linux-gnueabi/arm-mortsgna-linux-gnueabi-gdb'
 #   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
@@ -49,7 +49,7 @@
 #         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-target/usr/bin/thunar'
+# * Browse for executable e.g '${TMPDIR}/sysroot-instant-target-${MACHINE_ARCH}/usr/bin/thunar'
 # * Set IP:Port of target machine e.g '192.168.2.108:5000'
 # * Select 'OK'
 #

conf/distro/mortsgna.conf

@@ -10,7 +10,7 @@
 ###############################################################################
 
 # follow Yocto version scheme
-DISTRO_VERSION = "v2.6"
+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,8 +114,10 @@ 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"
 
+# warrior specific - on master there might come times they do the right thing...
+PNBLACKLIST[rng-tools] = "blocks shutdown and no issues found for openssl"
 
 ###############################################################################
 # Quality & security hardening
@@ -135,11 +137,12 @@ WARN_TO_ERROR_QA = " \
     already-stripped compile-host-path install-host-path \
     installed-vs-shipped ldflags pn-overrides rpaths staticdev \
     unknown-configure-option useless-rpaths host-user-contaminated \
-    invalid-packageconfig \
+    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
@@ -166,6 +169,7 @@ DISTRO_GUI_USER ?= "unpriv-user"
 # DEBUG_APPS: ship strace and procpc to make simple debugging a lot easier
 DISTRO_EXTRA_RRECOMMENDS += " \
     os-release \
+    default-locale \
     \
     kernel-module-vfat \
     kernel-module-ext2 \
@@ -192,6 +196,7 @@ EXTRA_IMAGE_FEATURES += " \
     empty-root-password \
     allow-empty-password \
     post-install-logging \
+    volatile-log \
 "
 
 # make x11-base a valid IMAGE_FEATURES
@@ -219,7 +224,7 @@ IMAGE_BOOT ?= "${IMAGE_INITSCRIPTS} \
 IMAGE_INSTALL += "${IMAGE_BOOT}"
 
 # some default locales
-IMAGE_LINGUAS ?= "de-de fr-fr en-gb en-us es-es it-it"
+IMAGE_LINGUAS_libc-glibc ?= "de-de fr-fr en-us en-gb es-es it-it"
 
 # there are important missing I bet
 IMAGE_LINGUAS_FULL ?= " \

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 = "sumo thud"
+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
@@ -22,6 +22,8 @@ BBFILES_DYNAMIC += " \
     \
     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 \

recipes-defaultconfig/locale/default-locale/locale.conf

@@ -0,0 +1,21 @@
+# Since systemd 240 LANG="C.UTF-8" is set if no /etc/locale.conf
+# is found and mentions that 'This locale is supported by various
+# distributions' and 'upstream glibc is going to make it available too' [1].
+#
+# And oe-core makes situation worse by setting default locale to 'C' (although
+# I aske for a change and was ignored as ususal [2]).
+#
+# [1] https://lists.freedesktop.org/archives/systemd-devel/2018-December/041852.html
+# [2] http://lists.openembedded.org/pipermail/openembedded-core/2019-April/281327.html
+#
+# Neither default is working properly:
+#
+# * german Umlaute cannot be displayed anymore
+# * at least menulibre does not start anymore and complains with
+#   | File "/usr/lib/python3.7/site-packages/menulibre/MenulibreApplication.py", line 390, in configure_application_actions
+#   |    label=_('Add _Launcher<65><72><EFBFBD>'),
+#   | UnicodeDecodeError: 'locale' codec can't decode byte 0xe2 in position 13: decoding error
+#
+# so set locale default - all our images contain en_US
+
+LANG="en_US.UTF-8"

recipes-defaultconfig/locale/default-locale_0.1.bb

@@ -0,0 +1,16 @@
+DESCRIPTION = "Set default locale"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+inherit allarch
+
+SRC_URI = "file://locale.conf"
+
+do_configure[noexec] = '1'
+
+do_compile[noexec] = '1'
+
+do_install() {
+    install -d ${D}${sysconfdir}
+    install -m 644 ${WORKDIR}/locale.conf ${D}${sysconfdir}/
+}

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

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

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

@@ -15,4 +15,4 @@ IMAGE_INSTALL += " \
     xfce4-orageclock-plugin \
 "
 
-IMAGE_LINGUAS = "${IMAGE_LINGUAS_FULL}"
+IMAGE_LINGUAS_libc-glibc = "${IMAGE_LINGUAS_FULL}"

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

@@ -13,7 +13,6 @@ IMAGE_INSTALL += " \
     systemd-analyze \
     cpufrequtils \
     htop \
-    fixmac \
     util-linux-lsblk \
     nano \
 "

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

@@ -5,6 +5,7 @@ NETWORKPACKS ?= " \
     avahi-autoipd \
     iputils \
     networkmanager \
+    networkmanager-openvpn \
     networkmanager-bash-completion \
 "
 

recipes-image/kde/kde-full-image.bb

@@ -7,4 +7,4 @@ IMAGE_INSTALL += " \
     packagegroup-gui-full \
 " 
 
-IMAGE_LINGUAS = "${IMAGE_LINGUAS_FULL}"
+IMAGE_LINGUAS_libc-glibc = "${IMAGE_LINGUAS_FULL}"

recipes-image/lxqt/lxqt-full-image.bb

@@ -6,4 +6,4 @@ IMAGE_INSTALL += " \
     packagegroup-gui-full \
 "
 
-IMAGE_LINGUAS = "${IMAGE_LINGUAS_FULL}"
+IMAGE_LINGUAS_libc-glibc = "${IMAGE_LINGUAS_FULL}"

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

@@ -8,7 +8,7 @@ RDEPENDS_${PN} = " \
     qt5-creator \
     qtquickcontrols2-examples qtwayland-examples \
     hexedit \
-    glade3 \
+    glade3 glade \
     umbrello \
     lokalize \
     geany-plugins \

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

@@ -8,8 +8,6 @@ MACHINE_SPECIFICS_FULL = ""
 MACHINE_SPECIFICS_FULL_mx6 = "gstreamer1.0-plugins-imx"
 
 RDEPENDS_${PN} = " \
-    packagegroup-gui-music \
-    \
     source-han-sans-cn-fonts \
     source-han-sans-kr-fonts \
     source-han-sans-jp-fonts \
@@ -30,6 +28,7 @@ RDEPENDS_${PN} = " \
     gparted \
     \
     mpd \
+    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 \
@@ -50,9 +49,11 @@ RDEPENDS_${PN} = " \
     qskinny \
     \
     ${@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', '', d)} \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'games-layer', 'pingus supertux2 freeciv wesnoth-all astromenace chromium-bsu maelstrom', '', 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)} \
+    \
 "
 
 #    firefox 

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

@@ -1,15 +1,21 @@
-SUMMARY = "All packages required for a music image"
+SUMMARY = "All packages required for musician image"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
 inherit packagegroup
 
 RDEPENDS_${PN} = " \
-    meta-qt5-extra-music-world \
+    musicians-world \
+    mixxx \
+    qmmp \
     alsa-utils alsa-utils-scripts \
     jack-utils \
     pulseaudio-module-alsa-card \
+    pulseaudio-module-jack-sink \
+    pulseaudio-module-jack-source \
+    pulseaudio-module-jackdbus-detect \
     sox \
     a2jmidid \
     fluidsynth-bin \
+    xfce4-mixer \
 "

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

@@ -15,7 +15,6 @@ RDEPENDS_${PN} = " \
     ntp ntp-utils \
     tzdata \
     dnsmasq \
-    bind \
     devilspie2 \
     \
     gnome-system-monitor \

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

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

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

@@ -4,11 +4,8 @@ export IMAGE_BASENAME = "xfce4-music-image"
 
 XFCE_DM = "sddm sddm-morona-autologin"
 
-# Saving to SDCard creates delays/underruns
-IMAGE_FEATURES += "volatile-log"
-
 IMAGE_INSTALL += " \
-    packagegroup-gui-music \
+    packagegroup-gui-musicians \
     \
     ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'libreoffice', '', d)} \
     ${@bb.utils.contains('BBFILE_COLLECTIONS', 'browser-layer', 'chromium-x11', '', d)} \

scripts/bbone-card-write.sh

@@ -0,0 +1,14 @@
+#! /bin/bash
+
+# bbone-card-write.sh
+# (c) Copyright 2019 Andreas Müller <schnitzeltony@gmail.com>
+# Licensed under terms of GPLv2
+#
+# This script writes image to sdcard and aligns rootfs partition to max size.
+
+# Includes
+. `dirname $0`/include/common-helpers.inc
+. `dirname $0`/include/card-helpers.inc
+. `dirname $0`/include/machine-bbone.inc
+
+StartCardWrite

scripts/include/machine-bbone.inc

@@ -0,0 +1,75 @@
+#! /bin/bash
+
+# machine-bbone.inc
+# (c) Copyright 2019 Andreas Müller <schnitzeltony@gmail.com>
+# Licensed under terms of GPLv2
+#
+# This script contains settings and callbacks for TI beagle boards
+
+# default settings
+DEFAULT_MACHINE_FAMILY='*bone*'
+DEFAULT_FIND_ROOTFS='-name *.wic -o -name *.wic.gz -type l'
+DEFAULT_KERNEL_IMAGE_TYPE='zImage'
+
+# callback for card-write
+RootCardWriteCallback() {
+    # rootfs write/resize to card fit
+    time(
+        # evt. write partition table
+        CheckPartitionTable "$DevicePath"
+        # write
+        StartMessage="\nWrite $DeployedFile to $DevicePath..."
+        if echo $DeployedFile | grep -q '.wic.gz'; then
+            EvalExAuto "gunzip -c $DeployedFile | dd of=$DevicePath oflag=nocache bs=1024K" "$StartMessage"
+        elif echo $DeployedFile | grep -q '.wic.xz'; then
+            EvalExAuto "tar -x -f $DeployedFile --to-stdout | dd of=$DevicePath oflag=nocache bs=1024K" "$StartMessage"
+        else
+            EvalExAuto "dd of=$DevicePath oflag=nocache if=$DeployedFile bs=1024K" "$StartMessage"
+        fi
+        # resize I
+        EvalExAuto "parted -s $DevicePath -- resizepart 2 -0" "\nResize I ${DevicePath}2..."
+        # resize II
+        EvalExAuto "resize2fs ${DevicePath}2" "\nResize II ${DevicePath}2..."
+     )
+}
+
+# callback for card-kernel-write (WIP)
+RootCardKernelWriteCallback() {
+    tmpdir=`mktemp -d`
+
+    # mount boot partition
+    EvalExAuto "mount ${DevicePath}1 $tmpdir" "\nMount boot partition ${DevicePath}1 to $tmpdir..."
+    # initial kernel
+    EvalExAuto "rm -f $tmpdir/${KernelImageType}*" "\nRemove old kernels..."
+    EvalExAuto "cp $DeployedFile $tmpdir/$KernelImageType" "\nCopy new kernel $KernelImageType..."
+    # devicetrees
+    EvalExAuto "rm -f $tmpdir/*.dtb" "\nRemove old devicetrees..."
+    echo
+    for dtb in `find ${DeployFileDir} -name "${KernelImageType}*.dtb" -type l`; do
+        dtbname=`basename $dtb | sed 's:'${KernelImageType}'-::'`
+        EvalExAuto "cp $dtb $tmpdir/${dtbname}" "Copy $dtb -> $tmpdir/${dtbname}..."
+    done
+    # unmount boot partition
+    EvalExAuto "sleep 1 && umount ${DevicePath}1" "\nUnmount boot partition..."
+
+    # mount rootfs
+    EvalExAuto "mount ${DevicePath}2 $tmpdir" "\nMount rootfs ${DevicePath}2 to $tmpdir..."
+    # rootfs/boot kernel
+    EvalExAuto "rm -f $tmpdir/boot/${KernelImageType}*" "\nRemove old kernels..."
+    EvalExAuto "cp $DeployedFile $tmpdir/boot/$KernelWithAbiName" "\nCopy new kernel to /boot/$KernelWithAbiName..."
+    EvalExAuto "ln -sf $KernelWithAbiName $tmpdir/boot/$KernelImageType" "\nLink kernel to /boot/$KernelImageType -> $KernelWithAbiName..."
+    # kernel modules
+    CopyKernelModules
+    RegisterKernelModules
+    # unmount rootfs
+    EvalExAuto "sleep 1 && umount ${DevicePath}2" "\nUnmount rootfs..."
+
+    rm -rf $tmpdir
+}
+
+CheckPrerequisite "time"
+CheckPrerequisite "gunzip"
+CheckPrerequisite "tar"
+CheckPrerequisite "dd"
+CheckPrerequisite "parted"
+CheckPrerequisite "resize2fs"