Merge branch 'master' of ssh://git.iohub.dev:2222/dany/meta-diya

recipes-core/base-files/base-files_%.bbappend

@@ -22,3 +22,11 @@ cat << EOF >> "${D}${sysconfdir}/profile"
 export MACHINE=${MACHINE}
 EOF
 }
+
+# workaround for Qemu mouse problem:
+# https://github.com/swaywm/sway/issues/6581
+do_install:append:qemux86-64 () {
+    cat << 'EOF' >> "${D}${sysconfdir}/profile"
+export WLR_NO_HARDWARE_CURSORS=1
+EOF
+}

recipes-core/images/base-image.inc

@@ -33,7 +33,8 @@ IMAGE_INSTALL:append = "kernel-modules \
                         i2c-tools \
                         bash \
                         nano \
-                        wpa-supplicant \
+                        iwd \
+                        networkmanager networkmanager-nmcli networkmanager-bluetooth dhcpcd \
                         evtest \
                         rsync \
                         coreutils \

recipes-core/images/core-image-base.bbappend

@@ -16,6 +16,7 @@ IMAGE_INSTALL:append = "pango \
                         pixman \
                         cairo \
                         glib-2.0 \
+                        glibmm \
                         freetype \
                         fontconfig \
                         librsvg librsvg-gtk \

recipes-core/init-ifupdown/files/itf_diya

@@ -5,12 +5,12 @@ auto lo
 iface lo inet loopback
 
 # Wireless interfaces
-auto wlan0
-iface wlan0 inet dhcp
+#auto wlan0
+#iface wlan0 inet dhcp
 # wireless_mode managed
 # wireless_essid any
 # wpa-driver wext
-wpa-conf /etc/network/wpa_supplicant.conf
+#wpa-conf /etc/network/wpa_supplicant.conf
 
 # Ethernet/RNDIS gadget (g_ether)
 # ... or on host side, usbnet and random hwaddr

recipes-diya/diya-overlay/files/confd

@@ -34,13 +34,10 @@ case "$1" in
             mkdir -p /home/diya
             chown -R diya:diya /home/diya
         fi
-        if [ -e "/boot/wpa_supplicant.conf" ];then
-            mv /boot/wpa_supplicant.conf /etc/network/
-            reboot
+        if ls /boot/*.nmconnection > /dev/null 2>&1 ;then
+            mv /boot/*.nmconnection /etc/NetworkManager/system-connections/
+            chmod 600 /etc/NetworkManager/system-connections/*.nmconnection
         fi
-        # display information
-        # disable wifi power save
-        # /usr/sbin/iw wlan0 set power_save off
     ;;
     *)
         N=/etc/init.d/$NAME