diff --git a/.gitmodules b/.gitmodules index b5cb34a..96ecf76 100644 --- a/.gitmodules +++ b/.gitmodules @@ -14,3 +14,11 @@ path = poky/meta-clang url = https://github.com/kraj/meta-clang.git branch = kirkstone +[submodule "poky/meta-vulkan"] + path = poky/meta-vulkan + url = https://github.com/jwinarske/meta-vulkan.git + branch = kirkstone +[submodule "poky/meta-wayland"] + path = poky/meta-wayland + url = https://codeberg.org/flk/meta-wayland.git + branch = kirkstone diff --git a/build/conf/bblayers.conf b/build/conf/bblayers.conf index 73d35ae..53245b3 100644 --- a/build/conf/bblayers.conf +++ b/build/conf/bblayers.conf @@ -18,6 +18,7 @@ BBLAYERS ?= " \ ${YOCTOROOT}/poky/meta-openembedded/meta-python \ ${YOCTOROOT}/poky/meta-openembedded/meta-networking \ ${YOCTOROOT}/poky/meta-flutter \ + ${YOCTOROOT}/poky/meta-wayland \ ${YOCTOROOT}/poky/meta-flutter-apps \ ${YOCTOROOT}/poky/meta-stargazer \ " diff --git a/build/conf/local.conf b/build/conf/local.conf index ef3d1cb..4f00b45 100644 --- a/build/conf/local.conf +++ b/build/conf/local.conf @@ -49,7 +49,8 @@ MACHINE ??= "raspberrypi4-64" # MACHINE ??= "raspberrypi3-64" # pi4 -IMAGE_INSTALL:append = " flutter-pi flutter-elinux flutter-service flutter-libraries linux-firmware-rpidistro-bcm43430 linux-firmware-bcm43455 kernel-image kernel-devicetree liberation-fonts networkmanager dhcpcd iptables iw linux-firmware ca-certificates gstreamer1.0-rtsp-server gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-libav libinput libxkbcommon tzdata alsa-utils alsa-lib bcm2835-dev" +IMAGE_INSTALL:append = " flutter-pi flutter-auto flutter-elinux flutter-service flutter-libraries linux-firmware-rpidistro-bcm43430 linux-firmware-bcm43455 kernel-image kernel-devicetree liberation-fonts networkmanager dhcpcd iptables iw linux-firmware ca-certificates gstreamer1.0-rtsp-server gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-libav libinput libxkbcommon tzdata alsa-utils alsa-lib bcm2835-dev" +CORE_IMAGE_EXTRA_INSTALL += "wayland weston cage" # pi 0 w2 #IMAGE_INSTALL:append = " flutter-pi flutter-elinux flutter-service flutter-libraries linux-firmware-rpidistro-bcm43436s linux-firmware-bcm43455 kernel-image kernel-devicetree liberation-fonts networkmanager dhcpcd iptables iw linux-firmware ca-certificates gstreamer1.0-rtsp-server gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-libav libinput libxkbcommon tzdata" @@ -80,7 +81,7 @@ INIT_MANAGER = "systemd" # MENDER_TENANT_TOKEN = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIzNGQwNjgzYy01NDM4LTQwNTUtYTgwNy1mYTVmMTNjMDI5ZTYiLCJzdWIiOiI1ZjkwZTY1Yi01N2YyLTQ5NDYtOGU2ZC1hN2NhZGIwNjg4YzAiLCJleHAiOjE2OTg1OTUyNjIsImlhdCI6MTY5ODUwODg2MiwibWVuZGVyLnRlbmFudCI6IjY1MzQzYWQ4ZDdjOTNlZTM3NTFhMmUyNCIsIm1lbmRlci51c2VyIjp0cnVlLCJpc3MiOiJNZW5kZXIgVXNlcnMiLCJzY3AiOiJtZW5kZXIuKiIsIm1lbmRlci5wbGFuIjoiZW50ZXJwcmlzZSIsIm1lbmRlci50cmlhbCI6dHJ1ZSwibWVuZGVyLmFkZG9ucyI6W3sibmFtZSI6ImNvbmZpZ3VyZSIsImVuYWJsZWQiOnRydWV9LHsibmFtZSI6InRyb3VibGVzaG9vdCIsImVuYWJsZWQiOnRydWV9LHsibmFtZSI6Im1vbml0b3IiLCJlbmFibGVkIjp0cnVlfV0sIm5iZiI6MTY5ODUwODg2Mn0.dABkcij0pm7d4o4RqYsWWparQbZQ4J-uL0iaQuaoYzPnObdPemoB61JyzNcBnA0rYzBsaa5yu177rFnwNGzuxN-tdxID1BMpADo_EwrXRxuQlRx287XJQTZRa9Ilj-nUpDq-XWOePKccm2_6SmMP6cCvoyB3aHADIQ9bl99iM0txduj2uVA8KDh2vKa5zq_Cjci1DHomweY_k9wXlC9jDXQ_cLdfPrVK9gapemLVBMN0lw8RbdUWwYVUipCIOJVlN0jObpDIyEx5p4zRAqKEMJIEPrNvl32IdtWZS9H2QsfZQXLc3AflfpIhzvh3Wovs7y4iAO14o0Vb5PRPPj5e0nI7MQoyjQnv1VG_Lhd1gJoYB3bNcv1lMJC24B9lnEF3c68z2SAeOGgq17KZJb2NZRzw5qdoRXUWsbt5BhSbNqzCReL5xuCZxXkH2E4J4t2aSXhlEJsGOX9AEVetqnSe4oViTygAGmy6A_Q76EQLNjovA20YZjDC7nsJS428rDVw" # KERNEL_FEATURES:remove = "cfg/fs/vfat.scc" -DISTRO_FEATURES:append = " systemd opengl wifi" +DISTRO_FEATURES:append = " systemd opengl wifi wayland pam" DISABLE_OVERSCAN = "1" DISABLE_SPLASH = "1" diff --git a/poky/.gitignore b/poky/.gitignore index 6a8c62a..5b0b0ad 100644 --- a/poky/.gitignore +++ b/poky/.gitignore @@ -24,6 +24,8 @@ hob-image-*.bb !meta-raspberrypi !meta-stargazer !meta-flutter +!meta-vulkan +!meta-wayland !meta-mender !meta-mender-community /documentation/*/eclipse/ @@ -37,4 +39,4 @@ pull-*/ bitbake/lib/toaster/contrib/tts/backlog.txt bitbake/lib/toaster/contrib/tts/log/* bitbake/lib/toaster/contrib/tts/.cache/* -bitbake/lib/bb/tests/runqueue-tests/bitbake-cookerdaemon.log \ No newline at end of file +bitbake/lib/bb/tests/runqueue-tests/bitbake-cookerdaemon.log diff --git a/poky/meta-stargazer/recipes-core/systemd/files/flutter.service b/poky/meta-stargazer/recipes-core/systemd/files/flutter.service index 3710957..d686bad 100644 --- a/poky/meta-stargazer/recipes-core/systemd/files/flutter.service +++ b/poky/meta-stargazer/recipes-core/systemd/files/flutter.service @@ -3,11 +3,43 @@ Description=Flutter App Service After=network.target StartLimitIntervalSec=0 +Requires=systemd-user-sessions.service +After=systemd-user-sessions.service + +After=plymouth-quit-wait.service + +Wants=dbus.socket +After=dbus.socket + +Before=graphical.target + +ConditionPathExists=/dev/tty0 + [Service] Type=simple Restart=always RestartSec=1 +#ExecStart=/usr/bin/cage /usr/bin/flutter-auto-launch ExecStart=/usr/bin/flutter-pi --release /flutter/flutter_elinux/3.19.2/release +User=root +Group=root + +WorkingDirectory=/home/root + +PAMName=weston-autologin + +TTYPath=/dev/tty7 +TTYReset=yes +TTYVHangup=yes +TTYTDisallocate=yes + +StandardInput=tty-fail +StandardOutput=journal +StandardError=journal + +UtmpIdentifier=tty7 +UtmpMode=user + [Install] WantedBy=multi-user.target \ No newline at end of file diff --git a/poky/meta-vulkan b/poky/meta-vulkan new file mode 160000 index 0000000..ceb47bd --- /dev/null +++ b/poky/meta-vulkan @@ -0,0 +1 @@ +Subproject commit ceb47bd0ed2a9f657fdae48a901e8a41ba697e74 diff --git a/poky/meta-wayland b/poky/meta-wayland new file mode 160000 index 0000000..cb22939 --- /dev/null +++ b/poky/meta-wayland @@ -0,0 +1 @@ +Subproject commit cb22939f751c74baa51d9474ba6e8ba647e99756