Skip to contentSkip to conversation

linux-yocto-dev: drop DeviceTree validation dependencies

PATCH In review Ross Burton 2 participants 4 messages Sep 25

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 linux-yocto-dev: drop DeviceTree validation dependencies

The mandatory DeviceTree schema checking was added in 5.16-rc4[1] but it was reverted in 5.16-rc5[2], so drop it from from linux-yocto-dev.bb.

Note that linux-yocto.bb went from 5.15 to 5.19, so this change never impacted that recipe.

[1] linux 53182e81f47d4 ("kbuild: Enable DT schema checks for %.dtb targets")
[2] linux 75e895343d5a2 ("Revert "kbuild: Enable DT schema checks for %.dtb targets"")

---
 meta/recipes-kernel/linux/linux-yocto-dev.bb | 10 ----------
 1 file changed, 10 deletions(-)
meta/recipes-kernel/linux/linux-yocto-dev.bb +0 -10
index 03999c5318a..be5a33bdd61 100644
@@ -35,16 +35,6 @@ PV = "${LINUX_VERSION}+git"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
-# yaml and dtschema are required for 5.16+ device tree validation, libyaml is checked
-# via pkgconfig, so must always be present, but we can wrap the others to make them
-# conditional
-DEPENDS += "libyaml-native"
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[dt-validation] = ",,python3-dtschema-native"
-# we need the wrappers if validation isn't in the packageconfig
-DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'dt-validation', '', 'python3-dtschema-wrapper-native', d)}"
-
 COMPATIBLE_MACHINE = "^(qemuarmv5|qemuarm|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv32|qemuriscv64|qemuloongarch64)$"
 
 KERNEL_DEVICETREE:qemuarmv5 = "arm/versatile-pb.dtb"
Signature · 1 line
2.43.0
#1 lore raw

PATCH 2/2 python3-dtschema-wrapper: remove obsolete recipe

This recipe was added so that the 5.16-rc4 kernel wouldn't depend on python3-dtschema-native to validate the DeviceTree files at build time.

However, that requirement was removed in -rc5, so this recipe is not required.

---
 meta/conf/distro/include/maintainers.inc      |  1 -
 .../python3-dtschema-wrapper/dt-doc-validate  | 20 -------------------
 .../dtc/python3-dtschema-wrapper/dt-mk-schema | 20 -------------------
 .../dtc/python3-dtschema-wrapper/dt-validate  | 20 -------------------
 .../dtc/python3-dtschema-wrapper_2021.10.bb   | 19 ------------------
 5 files changed, 80 deletions(-)
 delete mode 100644 meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-doc-validate
 delete mode 100644 meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-mk-schema
 delete mode 100644 meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-validate
 delete mode 100644 meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb
meta/conf/distro/include/maintainers.inc +0 -1
index 53f5e6bf92a..d3dddaaee97 100644
@@ -645,7 +645,6 @@ RECIPE_MAINTAINER:pn-python3-dbusmock = "Trevor Gamblin <[email protected]>"
 RECIPE_MAINTAINER:pn-python3-docutils = "Trevor Gamblin <[email protected]>"
 RECIPE_MAINTAINER:pn-python3-dtc = "Trevor Gamblin <[email protected]>"
 RECIPE_MAINTAINER:pn-python3-dtschema = "Bruce Ashfield <[email protected]>"
-RECIPE_MAINTAINER:pn-python3-dtschema-wrapper = "Bruce Ashfield <[email protected]>"
 RECIPE_MAINTAINER:pn-python3-editables = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER:pn-python3-extras = "Trevor Gamblin <[email protected]>"
 RECIPE_MAINTAINER:pn-python3-flit-core = "Tim Orling <[email protected]>"
meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-doc-validate deleted +0 -20
deleted file mode 100644
index 2aa57851c7e..00000000000
@@ -1,20 +0,0 @@
-#!/bin/sh
-# dt-doc-validate wrapper to allow kernel dt-validation to pass
-#
-# Copyright (C) 2021 Bruce Ashfield <[email protected]>
-# License: MIT (see COPYING.MIT at the root of the repository for terms)
-
-for arg; do
-    case "$arg" in
-        --version)
-            echo "v2021.10"
-            ;;
-    esac
-done
-
-# TBD: left for future consideration
-# exec dt-doc-validate.real "$@"
-
-# we always succeed
-exit 0
-
meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-mk-schema deleted +0 -20
deleted file mode 100644
index 24b89d86198..00000000000
@@ -1,20 +0,0 @@
-#!/bin/sh
-# dt-mk-schema wrapper to allow kernel dt-validation to pass
-#
-# Copyright (C) 2021 Bruce Ashfield <[email protected]>
-# License: MIT (see COPYING.MIT at the root of the repository for terms)
-
-for arg; do
-    case "$arg" in
-        --version)
-            echo "v2021.10"
-            ;;
-    esac
-done
-
-# TBD: left for future consideration
-# exec dt-mk-schema.real "$@"
-
-# we always succeed
-exit 0
-
meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-validate deleted +0 -20
deleted file mode 100644
index 8a4710a7eda..00000000000
@@ -1,20 +0,0 @@
-#!/bin/sh
-# dt-validate wrapper to allow kernel dt-validation to pass
-#
-# Copyright (C) 2021 Bruce Ashfield <[email protected]>
-# License: MIT (see COPYING.MIT at the root of the repository for terms)
-
-for arg; do
-    case "$arg" in
-        --version)
-            echo "v2021.10"
-            ;;
-    esac
-done
-
-# TBD: left for future consideration
-# exec dt-validate.real "$@"
-
-# we always succeed
-exit 0
-
meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb deleted +0 -19
deleted file mode 100644
index b19f53e20d8..00000000000
@@ -1,19 +0,0 @@
-SUMMARY = "Wrapper for tooling for devicetree validation using YAML and jsonschema"
-HOMEPAGE = "https://yoctoproject.org"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-SRC_URI = "file://dt-doc-validate \
-           file://dt-mk-schema \
-           file://dt-validate"
-
-S = "${UNPACKDIR}"
-
-do_install() {
-    install -d ${D}${bindir}/
-    install -m 755 ${UNPACKDIR}/dt-doc-validate ${D}${bindir}/
-    install -m 755 ${UNPACKDIR}/dt-mk-schema ${D}${bindir}/
-    install -m 755 ${UNPACKDIR}/dt-validate ${D}${bindir}/
-}
-
-BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.43.0
Acked-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] python3-dtschema-wrapper: remove obsolete recipe

Quoted 33 lines · Ross Burton

This recipe was added so that the 5.16-rc4 kernel wouldn't depend on python3-dtschema-native to validate the DeviceTree files at build time.

However, that requirement was removed in -rc5, so this recipe is not required.

---
 meta/conf/distro/include/maintainers.inc      |  1 -
 .../python3-dtschema-wrapper/dt-doc-validate  | 20 -------------------
 .../dtc/python3-dtschema-wrapper/dt-mk-schema | 20 -------------------
 .../dtc/python3-dtschema-wrapper/dt-validate  | 20 -------------------
 .../dtc/python3-dtschema-wrapper_2021.10.bb   | 19 ------------------
 5 files changed, 80 deletions(-)
 delete mode 100644
meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-doc-validate
 delete mode 100644
meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-mk-schema
 delete mode 100644
meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-validate
 delete mode 100644 meta/recipes-kernel/dtc/

python3-dtschema-wrapper_2021.10.bb

meta/conf/distro/include/maintainers.inc +0 -0
index 53f5e6bf92a..d3dddaaee97 100644
@@ -645,7 +645,6 @@ RECIPE_MAINTAINER:pn-python3-dbusmock = "Trevor

Gamblin <[email protected]>"
RECIPE_MAINTAINER:pn-python3-docutils = "Trevor Gamblin <
[email protected]>"
RECIPE_MAINTAINER:pn-python3-dtc = "Trevor Gamblin <[email protected]

Quoted 6 lines
Quoted 1 line

"

RECIPE_MAINTAINER:pn-python3-dtschema = "Bruce Ashfield <
[email protected]>" -RECIPE_MAINTAINER:pn-python3-dtschema-wrapper = "Bruce Ashfield < [email protected]>"

Clearly the maintainer of this recipe was at the top of his game tracking its use!

Quoted 120 lines

RECIPE_MAINTAINER:pn-python3-editables = "Ross Burton <
[email protected]>"
RECIPE_MAINTAINER:pn-python3-extras = "Trevor Gamblin <
[email protected]>"
RECIPE_MAINTAINER:pn-python3-flit-core = "Tim Orling <
[email protected]>"
diff --git a/meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-doc-validate b/meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-doc-validate deleted file mode 100644
index 2aa57851c7e..00000000000

meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-doc-validate deleted +0 -20
@@ -1,20 +0,0 @@
-#!/bin/sh
-# dt-doc-validate wrapper to allow kernel dt-validation to pass
-#
-# Copyright (C) 2021 Bruce Ashfield <[email protected]>
-# License: MIT (see COPYING.MIT at the root of the repository for terms)
-
-for arg; do
-    case "$arg" in
-        --version)
-            echo "v2021.10"
-            ;;
-    esac
-done
-
-# TBD: left for future consideration
-# exec dt-doc-validate.real "$@"
-
-# we always succeed
-exit 0
-
meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-mk-schema deleted +0 -20
deleted file mode 100644
index 24b89d86198..00000000000
@@ -1,20 +0,0 @@
-#!/bin/sh
-# dt-mk-schema wrapper to allow kernel dt-validation to pass
-#
-# Copyright (C) 2021 Bruce Ashfield <[email protected]>
-# License: MIT (see COPYING.MIT at the root of the repository for terms)
-
-for arg; do
-    case "$arg" in
-        --version)
-            echo "v2021.10"
-            ;;
-    esac
-done
-
-# TBD: left for future consideration
-# exec dt-mk-schema.real "$@"
-
-# we always succeed
-exit 0
-
meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-validate deleted +0 -20
deleted file mode 100644
index 8a4710a7eda..00000000000
@@ -1,20 +0,0 @@
-#!/bin/sh
-# dt-validate wrapper to allow kernel dt-validation to pass
-#
-# Copyright (C) 2021 Bruce Ashfield <[email protected]>
-# License: MIT (see COPYING.MIT at the root of the repository for terms)
-
-for arg; do
-    case "$arg" in
-        --version)
-            echo "v2021.10"
-            ;;
-    esac
-done
-
-# TBD: left for future consideration
-# exec dt-validate.real "$@"
-
-# we always succeed
-exit 0
-
meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb deleted +0 -1
deleted file mode 100644
index b19f53e20d8..00000000000
@@ -1,19 +0,0 @@
-SUMMARY = "Wrapper for tooling for devicetree validation using YAML and

jsonschema"

meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb deleted +0 -3
-HOMEPAGE = "https://yoctoproject.org"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM =

"file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"

meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb deleted +0 -16
-
-SRC_URI = "file://dt-doc-validate \
-           file://dt-mk-schema \
-           file://dt-validate"
-
-S = "${UNPACKDIR}"
-
-do_install() {
-    install -d ${D}${bindir}/
-    install -m 755 ${UNPACKDIR}/dt-doc-validate ${D}${bindir}/
-    install -m 755 ${UNPACKDIR}/dt-mk-schema ${D}${bindir}/
-    install -m 755 ${UNPACKDIR}/dt-validate ${D}${bindir}/
-}
-
-BBCLASSEXTEND = "native nativesdk"
--

2.43.0

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end
- "Use the force Harry" - Gandalf, Star Trek II
#3 lore raw
In reply to Ross Burton

Ackd

Bruce

Quoted 46 lines · Ross Burton

The mandatory DeviceTree schema checking was added in 5.16-rc4[1] but it was reverted in 5.16-rc5[2], so drop it from from linux-yocto-dev.bb.

Note that linux-yocto.bb went from 5.15 to 5.19, so this change never impacted that recipe.

[1] linux 53182e81f47d4 ("kbuild: Enable DT schema checks for %.dtb targets")
[2] linux 75e895343d5a2 ("Revert "kbuild: Enable DT schema checks for %.dtb targets"")

---
 meta/recipes-kernel/linux/linux-yocto-dev.bb | 10 ----------
 1 file changed, 10 deletions(-)
meta/recipes-kernel/linux/linux-yocto-dev.bb +0 -1
index 03999c5318a..be5a33bdd61 100644
@@ -35,16 +35,6 @@ PV = "${LINUX_VERSION}+git"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
-# yaml and dtschema are required for 5.16+ device tree validation,

libyaml is checked
-# via pkgconfig, so must always be present, but we can wrap the others to make them

meta/recipes-kernel/linux/linux-yocto-dev.bb +0 -7
-# conditional
-DEPENDS += "libyaml-native"
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[dt-validation] = ",,python3-dtschema-native"
-# we need the wrappers if validation isn't in the packageconfig
-DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'dt-validation', '',

'python3-dtschema-wrapper-native', d)}"
-
COMPATIBLE_MACHINE =
"^(qemuarmv5|qemuarm|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv32|qemuriscv64|qemuloongarch64)$"

KERNEL_DEVICETREE:qemuarmv5 = "arm/versatile-pb.dtb"
--
2.43.0

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end
- "Use the force Harry" - Gandalf, Star Trek II