remove x11 wayland vulkan from DISTRO_FEATURE

bblayers.conf.example

@@ -0,0 +1,17 @@
+# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+POKY_BBLAYERS_CONF_VERSION = "2"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+
+BBLAYERS ?= " \
+  /home/dany/experiments/poky/meta \
+  /home/dany/experiments/poky/meta-poky \
+  /home/dany/experiments/poky/meta-yocto-bsp \
+  /home/dany/experiments/yocto-layers/meta-raspberrypi \
+  /home/dany/workspace/meta-rpi-diya \
+  /home/dany/experiments/yocto-layers/meta-openembedded/meta-oe \
+  /home/dany/experiments/yocto-layers/meta-openembedded/meta-python \
+  /home/dany/experiments/yocto-layers/meta-openembedded/meta-multimedia \
+  "

conf/layer.conf

@@ -5,12 +5,12 @@ BBPATH .= ":${LAYERDIR}"
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
             ${LAYERDIR}/recipes-*/*/*.bbappend"
 
-BBFILE_COLLECTIONS += "meta-rpi-pharo"
-BBFILE_PATTERN_meta-rpi-pharo = "^${LAYERDIR}/"
-BBFILE_PRIORITY_meta-rpi-pharo = "11"
+BBFILE_COLLECTIONS += "meta-rpi-diya"
+BBFILE_PATTERN_meta-rpi-diya = "^${LAYERDIR}/"
+BBFILE_PRIORITY_meta-rpi-diya = "11"
 
-LAYERDEPENDS_meta-rpi-pharo = "core raspberrypi"
-LAYERSERIES_COMPAT_meta-rpi-pharo = "honister"
+LAYERDEPENDS_meta-rpi-diya = "core raspberrypi"
+LAYERSERIES_COMPAT_meta-rpi-diya = "mickledore"
 
 PACKAGE_CLASSES = "package_ipk"
 INHERIT += "rm_work"
@@ -18,8 +18,9 @@ INHERIT += "rm_work"
 EXTRA_IMAGE_FEATURES ?= " ssh-server-dropbear read-only-rootfs "
 # ssh-server-dropbear
 DISTRO_FEATURES:append := " vc4-gfx opengl "
+DISTRO_FEATURES:remove = " x11 wayland vulkan "
 # DISTRO_FEATURES:append := " vc4-gfx opengl directfb "
-MACHINE ?= "raspberrypi4-64"
+MACHINE ?= "raspberrypi0-2w-64"
 
 WKS_FILE="rpi.wks.in"
 ROOT_HOME = "/root"
@@ -31,6 +32,8 @@ ROOT_HOME = "/root"
 RPI_USE_U_BOOT = "0"
 RPI_USE_wS_28_DPI_LCD = "1"
 # enable usb boot in uboot
+ENABLE_DWC2_PERIPHERAL = "1"
+ENABLE_DWC2_HOST = "1"
 ENABLE_USB_U_BOOT = "0"
 ENABLE_UART = "0"
 DISABLE_SPLASH = "1"
@@ -40,23 +43,31 @@ ENABLE_SPI_BUS = "0"
 ENABLE_I2C = "0"
 KERNEL_MODULE_AUTOLOAD:rpi += " i2c-dev "
 
-VC4DTBO = "vc4-kms-v3d,nocomposite,noaudio"
+VC4DTBO = "vc4-kms-v3d,noaudio"
 
-KERNEL_DEVICETREE:append = " overlays/vc4-kms-dpi-generic.dtbo "
+KERNEL_DEVICETREE:append = " overlays/vc4-kms-dpi-generic.dtbo overlays/dpi24.dtbo "
 
 
 RPI_EXTRA_CONFIG += "${@['','\n\
-dtoverlay=vc4-kms-dpi-generic,hactive=480,hfp=26,hsync=16,hbp=10 \n\
+dtoverlay=vc4-kms-dpi-generic \n\
+dtparam=hactive=480,hfp=26,hsync=16,hbp=10 \n\
 dtparam=vactive=640,vfp=25,vsync=10,vbp=15 \n\
-dtparam=clock-frequency=32000000,rgb666-padhi \n\
+dtparam=clock-frequency=32000000 \n\
+dtparam=hsync-invert,vsync-invert,pixclk-invert \n\
+dtparam=rgb666-padhi,rotate=270 \n\
 dtoverlay=waveshare-28dpi-3b-4b \n\
 dtoverlay=waveshare-28dpi-3b \n\
-dtoverlay=waveshare-28dpi-4b \n\
-display_rotate=1 #1：90；2: 180； 3: 270 \n']['${RPI_USE_wS_28_DPI_LCD}' == '1']}"
+dtoverlay=waveshare-28dpi-4b \n']['${RPI_USE_wS_28_DPI_LCD}' == '1']}"
 
 RPI_EXTRA_CONFIG += '\n\
-start_x=1             # essential \n\
-dtparam=audio=on \n\
-gpu_mem=128           # at least, or maybe more if you wish \n\
-disable_camera_led=1  # optional \n\
-'
+# enable ads1115 sensor for battery monitoring \n\
+dtoverlay=ads1115-i2c-gpio,cha_enable,cha_cfg=4,cha_datarate=7,cha_gain=1 \n\
+#start_x=1             # essential \n\
+#gpu_mem=128           # at least, or maybe more if you wish \n\
+#disable_camera_led=1  # optional \n\
+'
+
+# extra kernel CMDLINE_RNDIS option
+# CMDLINE_RNDIS += " video=DPI-1:480x640,rotate=90 "
+# accept license for wifi and bluetooth firmware
+LICENSE_FLAGS_ACCEPTED = "synaptics-killswitch"

local.conf.example

@@ -0,0 +1,272 @@
+#
+# This file is your local configuration file and is where all local user settings
+# are placed. The comments in this file give some guide to the options a new user
+# to the system might want to change but pretty much any configuration option can
+# be set in this file. More adventurous users can look at local.conf.extended
+# which contains other examples of configuration which can be placed in this file
+# but new users likely won't need any of them initially.
+#
+# Lines starting with the '#' character are commented out and in some cases the
+# default values are provided as comments to show people example syntax. Enabling
+# the option is a question of removing the # character and making any change to the
+# variable as required.
+
+#
+# Machine Selection
+#
+# You need to select a specific machine to target the build with. There are a selection
+# of emulated machines available which can boot and run in the QEMU emulator:
+#
+#MACHINE ?= "qemuarm"
+#MACHINE ?= "qemuarm64"
+#MACHINE ?= "qemumips"
+#MACHINE ?= "qemumips64"
+#MACHINE ?= "qemuppc"
+#MACHINE ?= "qemux86"
+#MACHINE ?= "qemux86-64"
+#
+# There are also the following hardware board target machines included for 
+# demonstration purposes:
+#
+#MACHINE ?= "beaglebone-yocto"
+#MACHINE ?= "genericx86"
+#MACHINE ?= "genericx86-64"
+#MACHINE ?= "edgerouter"
+#
+# This sets the default machine to be qemux86-64 if no other machine is selected:
+
+#
+# Where to place downloads
+#
+# During a first build the system will download many different source code tarballs
+# from various upstream projects. This can take a while, particularly if your network
+# connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you
+# can preserve this directory to speed up this part of subsequent builds. This directory
+# is safe to share between multiple builds on the same machine too.
+#
+# The default is a downloads directory under TOPDIR which is the build directory.
+#
+#DL_DIR ?= "${TOPDIR}/downloads"
+
+#
+# Where to place shared-state files
+#
+# BitBake has the capability to accelerate builds based on previously built output.
+# This is done using "shared state" files which can be thought of as cache objects
+# and this option determines where those files are placed.
+#
+# You can wipe out TMPDIR leaving this directory intact and the build would regenerate
+# from these files if no changes were made to the configuration. If changes were made
+# to the configuration, only shared state files where the state was still valid would
+# be used (done using checksums).
+#
+# The default is a sstate-cache directory under TOPDIR.
+#
+#SSTATE_DIR ?= "${TOPDIR}/sstate-cache"
+
+#
+# Where to place the build output
+#
+# This option specifies where the bulk of the building work should be done and
+# where BitBake should place its temporary files and output. Keep in mind that
+# this includes the extraction and compilation of many applications and the toolchain
+# which can use Gigabytes of hard disk space.
+#
+# The default is a tmp directory under TOPDIR.
+#
+#TMPDIR = "${TOPDIR}/tmp"
+
+#
+# Default policy config
+#
+# The distribution setting controls which policy settings are used as defaults.
+# The default value is fine for general Yocto project use, at least initially.
+# Ultimately when creating custom policy, people will likely end up subclassing 
+# these defaults.
+#
+DISTRO ?= "poky"
+# As an example of a subclass there is a "bleeding" edge policy configuration
+# where many versions are set to the absolute latest code from the upstream 
+# source control systems. This is just mentioned here as an example, its not
+# useful to most new users.
+# DISTRO ?= "poky-bleeding"
+
+#
+# Package Management configuration
+#
+# This variable lists which packaging formats to enable. Multiple package backends
+# can be enabled at once and the first item listed in the variable will be used
+# to generate the root filesystems.
+# Options are:
+#  - 'package_deb' for debian style deb files
+#  - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager)
+#  - 'package_rpm' for rpm style packages
+# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk"
+# We default to rpm:
+
+#
+# SDK target architecture
+#
+# This variable specifies the architecture to build SDK items for and means
+# you can build the SDK packages for architectures other than the machine you are
+# running the build on (i.e. building i686 packages on an x86_64 host).
+# Supported values are i686, x86_64, aarch64
+#SDKMACHINE ?= "i686"
+
+#
+# Extra image configuration defaults
+#
+# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated
+# images. Some of these options are added to certain image types automatically. The
+# variable can contain the following options:
+#  "dbg-pkgs"       - add -dbg packages for all installed packages
+#                     (adds symbol information for debugging/profiling)
+#  "src-pkgs"       - add -src packages for all installed packages
+#                     (adds source code for debugging)
+#  "dev-pkgs"       - add -dev packages for all installed packages
+#                     (useful if you want to develop against libs in the image)
+#  "ptest-pkgs"     - add -ptest packages for all ptest-enabled packages
+#                     (useful if you want to run the package test suites)
+#  "tools-sdk"      - add development tools (gcc, make, pkgconfig etc.)
+#  "tools-debug"    - add debugging tools (gdb, strace)
+#  "eclipse-debug"  - add Eclipse remote debugging support
+#  "tools-profile"  - add profiling tools (oprofile, lttng, valgrind)
+#  "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.)
+#  "debug-tweaks"   - make an image suitable for development
+#                     e.g. ssh root access has a blank password
+# There are other application targets that can be used here too, see
+# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details.
+# We default to enabling the debugging tweaks.
+
+#
+# Additional image features
+#
+# The following is a list of additional classes to use when building images which
+# enable extra features. Some available options which can be included in this variable
+# are:
+#   - 'buildstats' collect build statistics
+USER_CLASSES ?= "buildstats"
+
+#
+# Runtime testing of images
+#
+# The build system can test booting virtual machine images under qemu (an emulator)
+# after any root filesystems are created and run tests against those images. It can also
+# run tests against any SDK that are built. To enable this uncomment these lines.
+# See classes/test{image,sdk}.bbclass for further details.
+#IMAGE_CLASSES += "testimage testsdk"
+#TESTIMAGE_AUTO:qemuall = "1"
+
+#
+# Interactive shell configuration
+#
+# Under certain circumstances the system may need input from you and to do this it
+# can launch an interactive shell. It needs to do this since the build is
+# multithreaded and needs to be able to handle the case where more than one parallel
+# process may require the user's attention. The default is iterate over the available
+# terminal types to find one that works.
+#
+# Examples of the occasions this may happen are when resolving patches which cannot
+# be applied, to use the devshell or the kernel menuconfig
+#
+# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none
+# Note: currently, Konsole support only works for KDE 3.x due to the way
+# newer Konsole versions behave
+#OE_TERMINAL = "auto"
+# By default disable interactive patch resolution (tasks will just fail instead):
+PATCHRESOLVE = "noop"
+
+#
+# Disk Space Monitoring during the build
+#
+# Monitor the disk space during the build. If there is less that 1GB of space or less
+# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully
+# shutdown the build. If there is less than 100MB or 1K inodes, perform a hard abort
+# of the build. The reason for this is that running completely out of space can corrupt
+# files and damages the build in ways which may not be easily recoverable.
+# It's necessary to monitor /tmp, if there is no space left the build will fail
+# with very exotic errors.
+BB_DISKMON_DIRS ??= "\
+    STOPTASKS,${TMPDIR},1G,100K \
+    STOPTASKS,${DL_DIR},1G,100K \
+    STOPTASKS,${SSTATE_DIR},1G,100K \
+    STOPTASKS,/tmp,100M,100K \
+    ABORT,${TMPDIR},100M,1K \
+    ABORT,${DL_DIR},100M,1K \
+    ABORT,${SSTATE_DIR},100M,1K \
+    ABORT,/tmp,10M,1K"
+
+#
+# Shared-state files from other locations
+#
+# As mentioned above, shared state files are prebuilt cache data objects which can be
+# used to accelerate build time. This variable can be used to configure the system
+# to search other mirror locations for these objects before it builds the data itself.
+#
+# This can be a filesystem directory, or a remote url such as http or ftp. These
+# would contain the sstate-cache results from previous builds (possibly from other
+# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the
+# cache locations to check for the shared objects.
+# NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH
+# at the end as shown in the examples below. This will be substituted with the
+# correct path within the directory structure.
+#SSTATE_MIRRORS ?= "\
+#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \
+#file://.* file:///some/local/dir/sstate/PATH"
+
+#
+# Yocto Project SState Mirror
+#
+# The Yocto Project has prebuilt artefacts available for its releases, you can enable
+# use of these by uncommenting the following lines. This will mean the build uses
+# the network to check for artefacts at the start of builds, which does slow it down
+# equally, it will also speed up the builds by not having to build things if they are
+# present in the cache. It assumes you can download something faster than you can build it
+# which will depend on your network.
+# Note: For this to work you also need hash-equivalence passthrough to the matching server
+#
+#BB_HASHSERVE_UPSTREAM = "typhoon.yocto.io:8687"
+#SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/3.4/PATH;downloadfilename=PATH"
+
+#
+# Qemu configuration
+#
+# By default native qemu will build with a builtin VNC server where graphical output can be
+# seen. The line below enables the SDL UI frontend too.
+PACKAGECONFIG:append:pn-qemu-system-native = " sdl"
+# By default libsdl2-native will be built, if you want to use your host's libSDL instead of 
+# the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below.
+#ASSUME_PROVIDED += "libsdl2-native"
+
+# You can also enable the Gtk UI frontend, which takes somewhat longer to build, but adds
+# a handy set of menus for controlling the emulator.
+#PACKAGECONFIG:append:pn-qemu-system-native = " gtk+"
+
+#
+# Hash Equivalence
+#
+# Enable support for automatically running a local hash equivalence server and
+# instruct bitbake to use a hash equivalence aware signature generator. Hash
+# equivalence improves reuse of sstate by detecting when a given sstate
+# artifact can be reused as equivalent, even if the current task hash doesn't
+# match the one that generated the artifact.
+#
+# A shared hash equivalent server can be set with "<HOSTNAME>:<PORT>" format
+#
+#BB_HASHSERVE = "auto"
+#BB_SIGNATURE_HANDLER = "OEEquivHash"
+
+#
+# Memory Resident Bitbake
+#
+# Bitbake's server component can stay in memory after the UI for the current command
+# has completed. This means subsequent commands can run faster since there is no need
+# for bitbake to reload cache files and so on. Number is in seconds, after which the
+# server will shut down.
+#
+#BB_SERVER_TIMEOUT = "60"
+
+# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to
+# track the version of this file when it was generated. This can safely be ignored if
+# this doesn't mean anything to you.
+CONF_VERSION = "2"

recipes-bsp/waveshare-2.8-lcd/files/dts/ads1115-i2c-gpio.dts

@@ -0,0 +1,103 @@
+/*
+ * TI ADS1115 multi-channel ADC overlay
+ */
+
+/dts-v1/;
+/plugin/;
+
+/ {
+	compatible = "brcm,bcm2835";
+
+	fragment@0 {
+		target = <&i2c_gpio>;
+		__overlay__ {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "okay";
+
+			ads1115: ads1115@48 {
+				compatible = "ti,ads1115";
+				status = "okay";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0x48>;
+			};
+		};
+	};
+
+	fragment@1 {
+		target = <&ads1115>;
+		__dormant__ {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			channel_a: channel_a {
+				reg = <4>;
+				ti,gain = <1>;
+				ti,datarate = <7>;
+			};
+		};
+	};
+
+	fragment@2 {
+		target = <&ads1115>;
+		__dormant__ {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			channel_b: channel_b {
+				reg = <5>;
+				ti,gain = <1>;
+				ti,datarate = <7>;
+			};
+		};
+	};
+
+	fragment@3 {
+		target = <&ads1115>;
+		__dormant__ {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			channel_c: channel_c {
+				reg = <6>;
+				ti,gain = <1>;
+				ti,datarate = <7>;
+			};
+		};
+	};
+
+	fragment@4 {
+		target = <&ads1115>;
+		__dormant__ {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			channel_d: channel_d {
+				reg = <7>;
+				ti,gain = <1>;
+				ti,datarate = <7>;
+			};
+		};
+	};
+
+	__overrides__ {
+		addr =            <&ads1115>,"reg:0";
+		cha_enable =      <0>,"=1";
+		cha_cfg =         <&channel_a>,"reg:0";
+		cha_gain =        <&channel_a>,"ti,gain:0";
+		cha_datarate =    <&channel_a>,"ti,datarate:0";
+		chb_enable =      <0>,"=2";
+		chb_cfg =         <&channel_b>,"reg:0";
+		chb_gain =        <&channel_b>,"ti,gain:0";
+		chb_datarate =    <&channel_b>,"ti,datarate:0";
+		chc_enable =      <0>,"=3";
+		chc_cfg =         <&channel_c>,"reg:0";
+		chc_gain =        <&channel_c>,"ti,gain:0";
+		chc_datarate =    <&channel_c>,"ti,datarate:0";
+		chd_enable =      <0>,"=4";
+		chd_cfg =         <&channel_d>,"reg:0";
+		chd_gain =        <&channel_d>,"ti,gain:0";
+		chd_datarate =    <&channel_d>,"ti,datarate:0";
+	};
+};

recipes-bsp/waveshare-2.8-lcd/files/dts/vc4-kms-waveshare-28dpi.dts

@@ -0,0 +1,101 @@
+/*
+ * vc4-kms-waveshare-28dpi-overlay.dts
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/pinctrl/bcm2835.h>
+
+/ {
+	compatible = "brcm,bcm2835";
+	fragment@0 {
+		target = <&gpio>;
+		__overlay__ {
+			pwm_pins: pwm_pins {
+				brcm,pins = <18>;
+				brcm,function = <BCM2835_FSEL_ALT5>;
+				brcm,pull = <0>;
+			};
+		};
+	};
+
+	fragment@1 {
+		target = <&pwm>;
+		frag1: __overlay__ {
+			pinctrl-names = "default";
+			pinctrl-0 = <&pwm_pins>;
+			assigned-clock-rates = <100000000>;
+			status = "okay";
+		};
+	};
+
+	fragment@2 {
+		target-path = "/";
+		__overlay__ {
+			//#gpio-cells = <2>;
+			/* Panel backlight through PWM0_0 on GPIO18 */
+			backlight_lvds: backlight {
+				compatible = "pwm-backlight";
+				pwms = <&pwm 0 10000000>;
+				brightness-levels = <0 1000>;
+				num-interpolated-steps = <1000>;
+				default-brightness-level = <1000>;
+			};
+
+			panel: panel {
+				reg = <0>;
+				compatible = "panel-dpi";
+				backlight = <&backlight_lvds>;
+
+				width-mm = <154>;
+				height-mm = <86>;
+				bus-format = <0x1015>;
+
+				timing: panel-timing {
+					clock-frequency = <28000000>;
+					hactive = <480>;
+					hfront-porch = <26>;
+					hsync-len = <16>;
+					hback-porch = <10>;
+					hsync-active = <0>;
+					vactive = <640>;
+					vfront-porch = <25>;
+					vsync-len = <10>;
+					vback-porch = <16>;
+					vsync-active = <0>;
+
+					de-active = <1>;
+					pixelclk-active = <1>;
+				};
+
+				port {
+					panel_in: endpoint {
+						remote-endpoint = <&dpi_out>;
+					};
+				};
+			};
+		};
+	};
+
+	fragment@3 {
+		target = <&dpi>;
+		dpi_node: __overlay__  {
+			status = "okay";
+
+			pinctrl-names = "default";
+			
+			/* refer to /home/pi/linux/arch/arm/boot/dts/bcm270x.dtsi
+			 * for the pin multiplex setting
+			 */
+			pinctrl-0 = <&dpi_18bit_cpadhi_gpio0>;
+
+			port {
+				dpi_out: endpoint {
+					remote-endpoint = <&panel_in>;
+				};
+			};
+		};
+	};
+};

recipes-bsp/waveshare-2.8-lcd/waveshare-2.8-lcd.bb

@@ -2,13 +2,25 @@ SUMMARY = "Waveshare 2.8 inch DPI"
 DESCRIPTION = "support overlay layer for Waveshare 2.8 inch DPI"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+inherit devicetree
 
-do_deploy () {
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+SRC_URI = " file://dts/ads1115-i2c-gpio.dts "
+
+S = "${WORKDIR}/dts"
+DT_FILES = "ads1115-i2c-gpio.dtbo"
+
+COMPATIBLE_MACHINE = "raspberrypi.*"
+
+do_deploy:append () {
     install -d ${DEPLOY_DIR_IMAGE}
+    # install -m 0755 ${B}/vc4-kms-waveshare-28dpi.dtbo ${DEPLOY_DIR_IMAGE}/vc4-kms-waveshare-28dpi.dtbo
+    install -m 0755 ${B}/ads1115-i2c-gpio.dtbo ${DEPLOY_DIR_IMAGE}/ads1115-i2c-gpio.dtbo
+    install -m 0755 ${THISDIR}/files/vc4-kms-DPI-28inch.dtbo ${DEPLOY_DIR_IMAGE}/vc4-kms-DPI-28inch.dtbo
     install -m 0755 ${THISDIR}/files/waveshare-28dpi-3b-4b.dtbo ${DEPLOY_DIR_IMAGE}/waveshare-28dpi-3b-4b.dtbo
     install -m 0755 ${THISDIR}/files/waveshare-28dpi-3b.dtbo ${DEPLOY_DIR_IMAGE}/waveshare-28dpi-3b.dtbo
     install -m 0755 ${THISDIR}/files/waveshare-28dpi-4b.dtbo ${DEPLOY_DIR_IMAGE}/waveshare-28dpi-4b.dtbo
     # install -m 0755 ${THISDIR}/files/start.mp3 ${DEPLOY_DIR_IMAGE}/start.mp3
 }
 
-addtask deploy
+# addtask deploy

recipes-core/dropbear/files/default

@@ -1,2 +1,2 @@
 DROPBEAR_EXTRA_ARGS="-w"
-DROPBEAR_RSAKEY_DIR=/home/diya/etc/dropbear
+DROPBEAR_RSAKEY_DIR=/etc/dropbear

recipes-core/images/README.md

@@ -9,6 +9,8 @@ pulseaudio-module-cli \
 pulseaudio-module-echo-cancel \
 pulseaudio-misc \
 i2c-tools \
+mpg123
+libsdl2-mixer \
 #tslib 
 #tslib-tests 
 #tslib-calibrate 

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

@@ -1,32 +1,33 @@
 inherit extrausers
 
-KERNEL_DEVICETREE:append = "${@bb.utils.contains('RPI_USE_wS_28_DPI_LCD', '1', ' overlays/waveshare-28dpi-3b-4b.dtbo overlays/waveshare-28dpi-3b.dtbo overlays/waveshare-28dpi-4b.dtbo ', ' ', d)}"
+KERNEL_DEVICETREE:append = "${@bb.utils.contains('RPI_USE_wS_28_DPI_LCD', '1', ' overlays/dpi24.dtbo overlays/vc4-kms-dpi-generic.dtbo overlays/ads1115-i2c-gpio.dtbo overlays/ads1115-i2c-gpio.dtbo overlays/vc4-kms-DPI-28inch.dtbo overlays/waveshare-28dpi-3b-4b.dtbo overlays/waveshare-28dpi-3b.dtbo overlays/waveshare-28dpi-4b.dtbo ', ' ', d)}"
 
-
-EXTRA_USERS_PARAMS = "usermod -p BJpK8ADNDLsGg root; \
-                        usermod -p 2Pe/4xyFxsokE diya; \
+# usermod -p BJpK8ADNDLsGg root;
+EXTRA_USERS_PARAMS = "usermod -p 2Pe/4xyFxsokE diya; \
                         usermod -a -G video diya; \
                         usermod -a -G tty diya; \
                         usermod -a -G input diya; \
                         usermod -a -G dialout diya; \
                         usermod -a -G audio diya; \
-                        usermod -a -G avahi diya \
+                        usermod -a -G avahi diya; \
+                        usermod -a -G sudo diya \
                         "
 IMAGE_BOOT_FILES:append = "fs_resize"
-# KERNEL_DEVICETREE:append = "${@bb.utils.contains('RPI_USE_wS_28_DPI_LCD', '1', ' overlays/vc4-kms-dpi-generic.dtbo overlays/waveshare-28dpi-3b-4b.dtbo overlays/waveshare-28dpi-3b.dtbo overlays/waveshare-28dpi-4b.dtbo ', ' ', d)}"
 
-IMAGE_INSTALL:append = "mpg123 \
-                        libcurl \
+IMAGE_INSTALL:append = "libcurl \
                         libdrm \
                         libgbm \
                         libgles2 \
                         libegl-mesa \
                         libgl-mesa \
                         libglapi \
+                        libudev \
+                        udev \
                         glew \
                         freetype \
                         freeglut \
                         mesa \
+                        sudo \
                         libsdl2 \
                         libsdl2-ttf \
                         libsdl2-image \
@@ -37,5 +38,13 @@ IMAGE_INSTALL:append = "mpg123 \
                         waveshare-2.8-lcd \
                         realtekfw \
                         diya-overlay \
-                        opensmalltalk-cog-vm \
-                        " 
+                        i2c-tools \
+                        bash \
+                        nano \
+                        wpa-supplicant \
+                        evtest \
+                        raspi-gpio \
+                        qtbase \
+                        qt5-opengles2-test \
+                        " 
+

recipes-core/init-ifupdown/files/itf_diya

@@ -0,0 +1,24 @@
+# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
+ 
+# The loopback interface
+auto lo
+iface lo inet loopback
+
+# Wireless interfaces
+auto wlan0
+iface wlan0 inet dhcp
+# wireless_mode managed
+# wireless_essid any
+# wpa-driver wext
+wpa-conf /etc/network/wpa_supplicant.conf
+
+# Ethernet/RNDIS gadget (g_ether)
+# ... or on host side, usbnet and random hwaddr
+iface usb0 inet static
+	address 192.168.7.2
+	netmask 255.255.255.0
+	network 192.168.7.0
+	gateway 192.168.7.1
+
+# Bluetooth networking
+# iface bnep0 inet dhcp

recipes-core/init-ifupdown/init-ifupdown_%.bbappend

@@ -1,3 +1,7 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+SRC_URI += " file://itf_diya "
+
 do_install:append () {
     rm ${D}/etc/network/interfaces
+    install -m 0644 ${WORKDIR}/itf_diya ${D}/etc/network/interfaces
 }

recipes-diya/diya-overlay/diya-overlay.bb

@@ -17,15 +17,19 @@ GROUPADD_PACKAGES = "${PN}"
 USERADD_PARAM:${PN} = "-u 1000 -d /home/diya -r -s /bin/sh diya"
 
 INITSCRIPT_NAME = "confd"
-INITSCRIPT_PARAMS = "start 80 S ."
+INITSCRIPT_PARAMS = "start 30 S ."
 
 do_install() {
     install -d ${D}/${sysconfdir}/init.d/
+    install -d ${DEPLOY_DIR_IMAGE}
     install -m 0755 ${WORKDIR}/confd ${D}/${sysconfdir}/init.d/confd
     install -d ${D}/usr/bin/
     install -d ${D}/etc/default/volatiles
-	install -m 0644 ${WORKDIR}/80_diya ${D}${sysconfdir}/default/volatiles
+	# install -m 0644 ${WORKDIR}/80_diya ${D}${sysconfdir}/default/volatiles
     install -m 0755 ${WORKDIR}/expandfs.sh ${D}/usr/bin/expandfs.sh
     install -m 0755 ${WORKDIR}/fs_resize ${DEPLOY_DIR_IMAGE}/
-}
 
+    install -d ${D}/var/etc
+    install -d ${D}/var/etc/upper
+    install -d ${D}/var/etc/work
+}

recipes-diya/diya-overlay/files/80_diya

@@ -1,2 +1,3 @@
-l root root 0644 /etc/network/interfaces /home/diya/etc/network/interfaces
-l root root 0644 /etc/dropbear /home/diya/etc/dropbear
+# d root root 0755 /var/etc/upper none
+# d root root 0755 /var/etc/work none
+# l root root 0644 /etc/dropbear /var/etc/dropbear

recipes-diya/diya-overlay/files/confd

@@ -6,6 +6,12 @@ DESC="Auto deployment configuration from media"
 case "$1" in
     start)
         echo -n "Start $DESC: "
+        # mount the overlay which is not auto mount by fstab
+        # this make /etc editable
+        mount -t overlay -o lowerdir=/etc,upperdir=/var/etc/upper,workdir=/var/etc/work overlay /etc
+        # for some reason the LCD backlight is turned off
+        # need to turn it on manually
+        echo  0 > /sys/class/backlight/backlight/bl_power
         if [ -f "/boot/fs_resize" ]; then
             /usr/bin/expandfs.sh
             touch /boot/home_partition_should_be_formated
@@ -14,23 +20,20 @@ case "$1" in
         fi
         if [ -f "/boot/home_partition_should_be_formated" ]; then
             echo "Trying to format the home partition"
-            umount /dev/mmcblk0p3
-            yes | mkfs.ext4 /dev/mmcblk0p3
-            mount /dev/mmcblk0p3 /home
-            mkdir -p /home/diya/etc/network
-            mkdir -p /home/diya/etc/dropbear
+            umount /dev/mmcblk0p4
+            yes | mkfs.ext4 /dev/mmcblk0p4
+            mount /dev/mmcblk0p4 /home
+            mkdir -p /home/diya
             chown -R diya:diya /home/diya
             rm /boot/home_partition_should_be_formated
         fi
-        if [ -e "/boot/install" ];then
-            cp -rf /boot/install/* /home/diya
-            rm -rf /boot/install
+        if [ -e "/boot/wpa_supplicant.conf" ];then
+            mv /boot/wpa_supplicant.conf /etc/network/
             reboot
         fi
         # display information
         # disable wifi power save
         /usr/sbin/iw wlan0 set power_save off
-        /sbin/ip a
     ;;
     *)
         N=/etc/init.d/$NAME

recipes-diya/diya-overlay/files/expandfs.sh

@@ -1,6 +1,6 @@
 #! /bin/sh
 line=$(
-sed -e 's/\s*\([\+0-9a-zA-Z]*\).*/\1/' << EOF | fdisk /dev/mmcblk0 | grep /dev/mmcblk0p3
+sed -e 's/\s*\([\+0-9a-zA-Z]*\).*/\1/' << EOF | fdisk /dev/mmcblk0 | grep /dev/mmcblk0p4
 p
 q
 EOF
@@ -18,11 +18,11 @@ fi
 
 echo "Expanding the partition"
 sed -e 's/\s*\([\+0-9a-zA-Z]*\).*/\1/' << EOF | fdisk /dev/mmcblk0
-d
-3
+d # delete partition
+4 # number 4
 n # new partition
 p # primary partition
-3 # partition number 3
+4 # partition number 4
 $start_sector
   # default - end of disk 
 p # print the in-memory partition table

recipes-example/example/example_0.1.bb

@@ -3,6 +3,8 @@ DESCRIPTION = "Recipe created by bitbake-layers"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
+inherit pkgconfig
+
 DEPENDS += "libsdl2"
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 SRC_URI = "file://sdl_test.cpp file://sdlgl.c file://sdlglshader.c"

recipes-example/example/files/sdl_test.cpp

@@ -84,10 +84,10 @@ int main( int argc, char** argv )
                 running = false;
                 break;
             case SDL_KEYDOWN:
-                if(ev.key.keysym.sym == SDLK_ESCAPE)
-                {
-                    running = false;
-                }
+                //if(ev.key.keysym.sym == SDLK_ESCAPE)
+                //{
+                running = false;
+                //}
                 break;
             case SDL_FINGERDOWN:
             case SDL_FINGERMOTION:

recipes-extended/sudo/sudo_%.bbappend

@@ -0,0 +1,9 @@
+do_install:append() {
+    # grant all permission to sudo group
+    sed -i 's/^#\s*\(%sudo\s*ALL=(ALL:ALL)\s*ALL\)/\1/'  ${D}/${sysconfdir}/sudoers
+    # allow sudo group to power off/reboot system without password
+    cat << EOF >> ${D}/${sysconfdir}/sudoers
+## sudo user group is allowed to execute halt and reboot 
+%sudo ALL=NOPASSWD: /sbin/halt, /sbin/reboot, /sbin/poweroff
+EOF
+}

recipes-graphics/libsdl2/libsdl2_%.bbappend

@@ -0,0 +1,4 @@
+DEPENS += " mesa libdrm alsa virtual/libgbm virtual/libgles2 udev libudev "
+
+PACKAGECONFIG = " kmsdrm opengl gles2 alsa libusb "
+# PACKAGECONFIG:remove = "x11 wayland"

recipes-kernel/linux/files/diya.cfg

@@ -1 +1,2 @@
 CONFIG_TOUCHSCREEN_GOODIX=m
+CONFIG_OVERLAY_FS=y

recipes-kernel/linux/linux-raspberrypi_%.bbappend

@@ -2,5 +2,5 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
  
 # inherit kernel
 SRC_URI += " \
-    file://goodix.cfg \
+    file://diya.cfg \
 "

recipes-multimedia/libsdl2/libsdl2_%.bbappend

@@ -1,5 +0,0 @@
-DEPENS += " mesa libdrm virtual/libgbm alsa virtual/libgles2 "
-EXTRA_OECONF:append=" --disable-video-x11 \
-                        --disable-video-wayland \
-                        --enable-video-kmsdrm \
-                        --enable-video-opengles"

recipes-qt/qt5/qtbase_%.bbappend

@@ -0,0 +1,2 @@
+PACKAGECONFIG += " freetype jpeg libpng kms openssl widgets gles2 eglfs optimize-size udev "
+PACKAGECONFIG:remove = " tests tools examples "

wic/rpi.wks.in

@@ -2,7 +2,11 @@
 # long-description: Creates a partitioned SD card image for use with
 # Raspberry Pi. Boot files are located in the first vfat partition.
 
-part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4096 --size 50
-part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --label root --align 4096 --size 150
+part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4096 --size 32
+# read only roofs
+part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --label root --align 4096 --size 150 --exclude-path home/ var/etc/
+# modifiable configurations stored in /var/etc
+part /var/etc --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/var/etc --ondisk mmcblk0 --fstype=ext4 --label diya --align 1024 --size 32
+# home partition
 part /home --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/home --ondisk mmcblk0 --fstype=ext4 --label home --align 1024 --size 16
 # part /home --ondisk mmcblk0 --fstype=vfat --label music --active --align 1024 --size 16