migrated yocto platform to dunfell and updated pitrezor to 1.9.4

.gitignore

@@ -6,4 +6,4 @@ build/downloads/
 build/sstate-cache/
 build/tmp/
 build/bitbake-cookerdaemon.log
-images
+images/

.gitmodules

@@ -1,12 +1,9 @@
 [submodule "poky"]
 	path = poky
-	url = git://git.yoctoproject.org/poky.git
-	branch = rocko
+	url = git://git.yoctoproject.org/poky
 [submodule "meta-openembedded"]
 	path = meta-openembedded
 	url = git://git.openembedded.org/meta-openembedded
-	branch = rocko
 [submodule "meta-raspberrypi"]
 	path = meta-raspberrypi
 	url = git://git.yoctoproject.org/meta-raspberrypi
-	branch = rocko

Dockerfile

@@ -1,7 +1,7 @@
 FROM debian:jessie
 
 RUN apt-get update && \
-	apt-get install -y gawk wget git-core diffstat unzip texinfo gcc-multilib build-essential chrpath socat cpio python python3 python3-pip python3-pexpect  xz-utils debianutils iputils-ping locales
+	apt-get install -y gawk wget git-core diffstat unzip texinfo gcc-multilib build-essential chrpath socat cpio python python3 python3-pip python3-pexpect xz-utils debianutils iputils-ping locales
 
 RUN useradd -ms /bin/bash -p build build --uid 30000
 

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 heneault
+Copyright (c) 2017, 2018, 2019, 2020, 2021 [email protected]
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

build/conf/local.conf

@@ -1,18 +1,21 @@
 MACHINE ??= "raspberrypi0-wifi"
+#MACHINE ??= "raspberrypi4"
 DISTRO ?= "poky"
 PACKAGE_CLASSES ?= "package_rpm"
-EXTRA_IMAGE_FEATURES += "debug-tweaks read-only-rootfs"
+EXTRA_IMAGE_FEATURES += "read-only-rootfs"
 USER_CLASSES ?= "buildstats image-mklibs image-prelink"
 PATCHRESOLVE = "noop"
-
 DISTRO_FEATURES_remove = " acl alsa argp bluetooth irda largefile opengl pcmcia usbgadget usbhost xattr nfs zeroconf pci 3g nfc x11 wayland pulseaudio "
+IMAGE_FSTYPES = "rpi-sdimg"
 VIRTUAL-RUNTIME_init_manager = "sysvinit"
 VIRTUAL-RUNTIME_dev_manager = ""
 BOOTDD_VOLUME_ID = "boot"
-SERIAL_CONSOLE = ""
+SERIAL_CONSOLES = ""
+SERIAL_CONSOLES_CHECK_forcevariable = ""
 SYSVINIT_ENABLED_GETTYS = ""
-KERNEL_DEVICETREE_append = " overlays/dwc2.dtbo "
+ENABLE_DWC2_PERIPHERAL = "1"
 GPU_MEM = "64"
+DISABLE_VC4GRAPHICS = "1"
 CMDLINE = "dwc_otg.lpm_enable=0 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait consoleblank=0 ro quiet "
 KERNEL_MODULE_AUTOLOAD += " gadgetfs dwc2 "
 EXTRA_IMAGECMD_ext3 = "-i 4096 -L fs"

meta-pitrezor/conf/layer.conf

@@ -8,3 +8,5 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "meta-pitrezor"
 BBFILE_PATTERN_meta-pitrezor = "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-pitrezor = "10"
+
+LAYERSERIES_COMPAT_meta-pitrezor = "dunfell"

meta-pitrezor/recipes-core/images/pitrezor-image-debug.bb

@@ -1,8 +1,15 @@
 include pitrezor-image.bb 
+inherit extrausers
+EXTRA_USERS_PARAMS = "usermod -P raspberry root;"
 
-IMAGE_INSTALL += " \
-        kernel-module-brcmfmac \
-        "
+customize_image_debug() {
+  sed -i '/^DROPBEAR_EXTRA_ARGS=/ s/-w//' ${IMAGE_ROOTFS}${sysconfdir}/default/dropbear
+  echo brcmfmac >> ${IMAGE_ROOTFS}${sysconfdir}/modules-load.d/brcmfmac.conf
+  echo auto wlan0 >> ${IMAGE_ROOTFS}${sysconfdir}/network/interfaces
+  ln -s ../init.d/networking ${IMAGE_ROOTFS}${sysconfdir}/rc5.d/S05network
+}
 
-IMAGE_INSTALL += " linux-firmware-bcm43430 wireless-tools wpa-supplicant dropbear gdbserver strace "
+ROOTFS_POSTPROCESS_COMMAND_append = " customize_image_debug; "
+
+IMAGE_INSTALL += " iw wireless-regdb-static wpa-supplicant linux-firmware-rpidistro-bcm43430 linux-firmware-rpidistro-bcm43455 kernel-module-brcmfmac dropbear gdbserver strace "
 

meta-pitrezor/recipes-core/pitrezor/pitrezor_git.bb

@@ -13,7 +13,7 @@ SRC_URI = "git://github.com/heneault/trezor-firmware.git;branch=pitrezor \
            file://pitrezor.config \
           "
 
-SRCREV = "cbfe1ded0005e4edda29b5b70148331043a3963e"
+SRCREV = "4671d69e275ae35a62482c0711dc153a5b4ad442"
 
 S = "${WORKDIR}/git"
 

meta-pitrezor/recipes-graphics/libsdl2/libsdl2_%.bbappend

@@ -1,4 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI += "file://yocto.patch"
 DEPENDS = "virtual/egl"
 PACKAGECONFIG = "gles2"
+

meta-pitrezor/recipes-kernel/linux/linux-raspberrypi/usb_inode.patch

@@ -1,6 +1,7 @@
---- git/drivers/usb/gadget/legacy/inode.c	2018-11-10 17:41:56.027719759 -0500
-+++ git.new/drivers/usb/gadget/legacy/inode.c	2018-11-10 18:00:17.401165612 -0500
-@@ -1284,7 +1284,7 @@
+diff -Nur kernel-source-orig/drivers/usb/gadget/legacy/inode.c kernel-source/drivers/usb/gadget/legacy/inode.c
+--- kernel-source-orig/drivers/usb/gadget/legacy/inode.c	2021-01-10 18:03:26.352594310 -0500
++++ kernel-source/drivers/usb/gadget/legacy/inode.c	2021-01-10 19:18:24.027112431 -0500
+@@ -1281,7 +1281,7 @@
 
  	qual.bLength = sizeof qual;
  	qual.bDescriptorType = USB_DT_DEVICE_QUALIFIER;
@@ -9,7 +10,7 @@
 
  	desc = dev->dev;
  	qual.bDeviceClass = desc->bDeviceClass;
-@@ -1393,11 +1393,8 @@
+@@ -1389,11 +1389,8 @@
  			if (value >= 0)
  				value = min (w_length, (u16) value);
  			break;
@@ -22,10 +23,10 @@
  		}
  		break;
 
-@@ -1856,7 +1853,6 @@
+@@ -1852,7 +1849,6 @@
+ 			|| dev->dev->bDescriptorType != USB_DT_DEVICE
  			|| dev->dev->bNumConfigurations != 1)
  		goto fail;
- 	dev->dev->bNumConfigurations = 1;
 -	dev->dev->bcdUSB = cpu_to_le16 (0x0200);
 
  	/* triggers gadgetfs_bind(); then we can enumerate. */