From c0ee2ce316e8b02b05216d65eedc17b52c8963f2 Mon Sep 17 00:00:00 2001 From: unitexe Date: Sat, 11 Apr 2026 00:01:08 -0500 Subject: meta-raspberrypi patches no longer needed --- .../include/layers/meta-raspberrypi/main.yml | 2 +- .../quilt/0001-wic-rename-kickstart-files.patch | 19 ---------- ...name-machine-features-backfill-considered.patch | 42 ---------------------- 3 files changed, 1 insertion(+), 62 deletions(-) delete mode 100644 meta-unit-kas/include/layers/meta-raspberrypi/patches/wrynose/quilt/0001-wic-rename-kickstart-files.patch delete mode 100644 meta-unit-kas/include/layers/meta-raspberrypi/patches/wrynose/quilt/0002-rename-machine-features-backfill-considered.patch (limited to 'meta-unit-kas/include') diff --git a/meta-unit-kas/include/layers/meta-raspberrypi/main.yml b/meta-unit-kas/include/layers/meta-raspberrypi/main.yml index fb0b98f..ee2d55d 100644 --- a/meta-unit-kas/include/layers/meta-raspberrypi/main.yml +++ b/meta-unit-kas/include/layers/meta-raspberrypi/main.yml @@ -4,4 +4,4 @@ header: repos: meta-raspberrypi: branch: master - commit: 0ec061905ab2119d90b533476753837256742f8f + commit: b83766291188efb956c475b09c9666c2dfe2cb69 diff --git a/meta-unit-kas/include/layers/meta-raspberrypi/patches/wrynose/quilt/0001-wic-rename-kickstart-files.patch b/meta-unit-kas/include/layers/meta-raspberrypi/patches/wrynose/quilt/0001-wic-rename-kickstart-files.patch deleted file mode 100644 index b157459..0000000 --- a/meta-unit-kas/include/layers/meta-raspberrypi/patches/wrynose/quilt/0001-wic-rename-kickstart-files.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 6ba346936d5b567cb46a26c94a9a477b6a783303 Mon Sep 17 00:00:00 2001 -From: unitexe -Date: Thu, 9 Apr 2026 22:38:20 -0500 -Subject: [PATCH] wic: rename kickstart files from wic to files/wic - -Upstream-Status: Inappropriate [embedded-specific] - ---- - {wic => files/wic}/sdimage-raspberrypi.wks | 0 - 1 file changed, 0 insertions(+), 0 deletions(-) - rename {wic => files/wic}/sdimage-raspberrypi.wks (100%) - -diff --git a/wic/sdimage-raspberrypi.wks b/files/wic/sdimage-raspberrypi.wks -similarity index 100% -rename from wic/sdimage-raspberrypi.wks -rename to files/wic/sdimage-raspberrypi.wks --- -2.43.0 - diff --git a/meta-unit-kas/include/layers/meta-raspberrypi/patches/wrynose/quilt/0002-rename-machine-features-backfill-considered.patch b/meta-unit-kas/include/layers/meta-raspberrypi/patches/wrynose/quilt/0002-rename-machine-features-backfill-considered.patch deleted file mode 100644 index f950dd5..0000000 --- a/meta-unit-kas/include/layers/meta-raspberrypi/patches/wrynose/quilt/0002-rename-machine-features-backfill-considered.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 26d1d5fc920283dce574588919a165890a397e6d Mon Sep 17 00:00:00 2001 -From: unitexe -Date: Fri, 10 Apr 2026 10:27:06 -0500 -Subject: [PATCH 2/2] rename machine features backfill considered - -Upstream-Status: Inappropriate [embedded-specific] - ---- - conf/machine/include/rpi-base.inc | 2 +- - docs/extra-build-config.md | 3 +-- - 2 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc -index 0ae64f8..bbdc652 100644 ---- a/conf/machine/include/rpi-base.inc -+++ b/conf/machine/include/rpi-base.inc -@@ -129,7 +129,7 @@ KERNEL_IMAGETYPE ?= "${@bb.utils.contains('RPI_USE_U_BOOT', '1', \ - MACHINE_FEATURES += "apm usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio ${@bb.utils.contains('DISABLE_VC4GRAPHICS', '1', '', 'vc4graphics', d)}" - - # Raspberry Pi has no hardware clock --MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc" -+MACHINE_FEATURES_OPTED_OUT = "rtc" - - MACHINE_EXTRA_RRECOMMENDS += "kernel-modules udev-rules-rpi" - MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "${@oe.utils.conditional('ENABLE_I2C', '1', 'kernel-module-i2c-dev kernel-module-i2c-bcm2708', '', d)}" -diff --git a/docs/extra-build-config.md b/docs/extra-build-config.md -index 00e0579..26220d5 100644 ---- a/docs/extra-build-config.md -+++ b/docs/extra-build-config.md -@@ -463,8 +463,7 @@ all, some later boards will come with one). - which means that if an attached device is provided for which support is needed, - the recommended way forward is to write a new machine configuration based on an - existing one. Check the documentation for --`MACHINE_FEATURES_BACKFILL_CONSIDERED` for how this is disabled for the --relevant machines. -+`MACHINE_FEATURES_OPTED_OUT` for how this is disabled for the relevant machines. - - Even when `MACHINE_FEATURES` is tweaked to include the needed `rtc` string, - make sure that your kernel configuration is supporting the attached device and --- -2.43.0 - -- cgit v1.2.3