Skip to contentSkip to conversation

package/dtbocfg: new package

PATCH Applied Herve Codina 2 participants 2 messages Sep 28, 2021 – Oct 11, 2021

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 package/dtbocfg: new package

dtbocfg, which stands for Device Tree Blob Overlay Configuration File System, was developed to serve as a userspace API of Device Tree Overlay.

https://github.com/ikwzm/dtbocfg

---
Changes v1 -> v2:
- Fixed indentation in Config.in file
- Added test part to myself in DEVELOPERS file
- Removed 'v' char from DTBOCFG_VERSION

 DEVELOPERS                                    |  4 ++
 package/Config.in                             |  1 +
 package/dtbocfg/Config.in                     |  8 ++++
 package/dtbocfg/dtbocfg.hash                  |  3 ++
 package/dtbocfg/dtbocfg.mk                    | 18 +++++++++
 support/testing/tests/package/test_dtbocfg.py | 37 +++++++++++++++++++
 6 files changed, 71 insertions(+)
 create mode 100644 package/dtbocfg/Config.in
 create mode 100644 package/dtbocfg/dtbocfg.hash
 create mode 100644 package/dtbocfg/dtbocfg.mk
 create mode 100644 support/testing/tests/package/test_dtbocfg.py
DEVELOPERS +4 -0
index 1f977190ab..3e2edc1f3c 100644
@@ -1148,6 +1148,10 @@ F:	package/sysrepo/
 N:	Henrique Camargo <[email protected]>
 F:	package/json-glib/
 
+N:	Hervé Codina <[email protected]>
+F:	package/dtbocfg/
+F:	support/testing/tests/package/test_dtbocfg.py
+
 N:	Hiroshi Kawashima <[email protected]>
 F:	package/gauche/
 F:	package/gmrender-resurrect/
package/Config.in +1 -0
index 2f83c87582..0ce2f64d8a 100644
@@ -460,6 +460,7 @@ endmenu
 	source "package/dmidecode/Config.in"
 	source "package/dmraid/Config.in"
 	source "package/dt-utils/Config.in"
+	source "package/dtbocfg/Config.in"
 	source "package/dtv-scan-tables/Config.in"
 	source "package/dump1090/Config.in"
 	source "package/dvb-apps/Config.in"
package/dtbocfg/Config.in new file +8 -0
new file mode 100644
index 0000000000..c1e8318e5c
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_DTBOCFG
+	bool "dtbocfg"
+	help
+	  dtbocfg, which stands for Device Tree Blob Overlay
+	  Configuration File System, was developed to serve
+	  as a userspace API of Device Tree Overlay.
+
+	  https://github.com/ikwzm/dtbocfg
package/dtbocfg/dtbocfg.hash new file +3 -0
new file mode 100644
index 0000000000..7db69f9e59
@@ -0,0 +1,3 @@
+# Locally computed:
+sha256  faa53aefd7f7636c65e2b56bec223d2bc7676354e3ad9b5c1691aca349b9bbb8  dtbocfg-0.0.9.tar.gz
+sha256  e57cb9f2ed607cd95bf1b64371325c505c1ac8fe640a8c9933e7fe7637a38567  LICENSE
package/dtbocfg/dtbocfg.mk new file +18 -0
new file mode 100644
index 0000000000..68beb1a45e
@@ -0,0 +1,18 @@
+################################################################################
+#
+# dtbocfg
+#
+################################################################################
+
+DTBOCFG_VERSION = 0.0.9
+DTBOCFG_SITE = $(call github,ikwzm,dtbocfg,v$(DTBOCFG_VERSION))
+DTBOCFG_LICENSE = BSD-2-Clause
+DTBOCFG_LICENSE_FILES = LICENSE
+
+define DTBOCFG_LINUX_CONFIG_FIXUPS
+	$(call KCONFIG_ENABLE_OPT,CONFIG_OF_OVERLAY)
+	$(call KCONFIG_ENABLE_OPT,CONFIG_CONFIGFS_FS)
+endef
+
+$(eval $(kernel-module))
+$(eval $(generic-package))
support/testing/tests/package/test_dtbocfg.py new file +37 -0
new file mode 100644
index 0000000000..d25b1692b4
@@ -0,0 +1,37 @@
+import os
+
+import infra.basetest
+
+
+class TestDtbocfg(infra.basetest.BRTest):
+    config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
+        """
+        BR2_LINUX_KERNEL=y
+        BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+        BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7"
+        BR2_LINUX_KERNEL_USE_DEFCONFIG=y
+        BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
+        BR2_PACKAGE_DTBOCFG=y
+        BR2_TARGET_ROOTFS_CPIO=y
+        # BR2_TARGET_ROOTFS_TAR is not set
+        """
+
+    def test_run(self):
+        img = os.path.join(self.builddir, "images", "rootfs.cpio")
+        kernel = os.path.join(self.builddir, "images", "zImage")
+        kernel_cmdline = ["console=ttyAMA0"]
+        dtb = infra.download(self.downloaddir, "vexpress-v2p-ca9.dtb")
+        options = ["-M", "vexpress-a9", "-dtb", dtb, "-initrd", img]
+
+        self.emulator.boot(arch="armv7", kernel=kernel,
+                           kernel_cmdline=kernel_cmdline,
+                           options=options)
+        self.emulator.login()
+        self.assertRunOk("modprobe dtbocfg.ko")
+        self.assertRunOk("mkdir /tmp/config && mount -t configfs none /tmp/config")
+
+        # Check that overlays directory is present.
+        # From dtbocfg site (https://github.com/ikwzm/dtbocfg):
+        #   If /config/device-tree/overlays is created, it is ready to use
+        #   dtbocfg
+        self.assertRunOk("ls /tmp/config/device-tree/overlays/")
Signature · 6 lines
2.31.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw
Quoted 13 lines · Herve Codina

dtbocfg, which stands for Device Tree Blob Overlay Configuration File System, was developed to serve as a userspace API of Device Tree Overlay.

https://github.com/ikwzm/dtbocfg

---
Changes v1 -> v2:
- Fixed indentation in Config.in file
- Added test part to myself in DEVELOPERS file
- Removed 'v' char from DTBOCFG_VERSION

Quoted 6 lines
  DEVELOPERS                                    |  4 ++
  package/Config.in                             |  1 +
  package/dtbocfg/Config.in                     |  8 ++++
  package/dtbocfg/dtbocfg.hash                  |  3 ++
  package/dtbocfg/dtbocfg.mk                    | 18 +++++++++
  support/testing/tests/package/test_dtbocfg.py | 37 +++++++++++++++++++

With a test! Most excellent!

Applied to master, thanks.

Regards,
Arnout

Quoted 114 lines
  6 files changed, 71 insertions(+)

create mode 100644 package/dtbocfg/Config.in
create mode 100644 package/dtbocfg/dtbocfg.hash create mode 100644 package/dtbocfg/dtbocfg.mk
create mode 100644 support/testing/tests/package/test_dtbocfg.py

DEVELOPERS +4 -0
index 1f977190ab..3e2edc1f3c 100644
@@ -1148,6 +1148,10 @@ F:	package/sysrepo/
  N:	Henrique Camargo <[email protected]>
  F:	package/json-glib/
 
+N:	Hervé Codina <[email protected]>
+F:	package/dtbocfg/
+F:	support/testing/tests/package/test_dtbocfg.py
+
  N:	Hiroshi Kawashima <[email protected]>
  F:	package/gauche/
  F:	package/gmrender-resurrect/
package/Config.in +1 -0
index 2f83c87582..0ce2f64d8a 100644
@@ -460,6 +460,7 @@ endmenu
  	source "package/dmidecode/Config.in"
  	source "package/dmraid/Config.in"
  	source "package/dt-utils/Config.in"
+	source "package/dtbocfg/Config.in"
  	source "package/dtv-scan-tables/Config.in"
  	source "package/dump1090/Config.in"
  	source "package/dvb-apps/Config.in"
package/dtbocfg/Config.in new file +8 -0
new file mode 100644
index 0000000000..c1e8318e5c
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_DTBOCFG
+	bool "dtbocfg"
+	help
+	  dtbocfg, which stands for Device Tree Blob Overlay
+	  Configuration File System, was developed to serve
+	  as a userspace API of Device Tree Overlay.
+
+	  https://github.com/ikwzm/dtbocfg
package/dtbocfg/dtbocfg.hash new file +3 -0
new file mode 100644
index 0000000000..7db69f9e59
@@ -0,0 +1,3 @@
+# Locally computed:
+sha256  faa53aefd7f7636c65e2b56bec223d2bc7676354e3ad9b5c1691aca349b9bbb8  dtbocfg-0.0.9.tar.gz
+sha256  e57cb9f2ed607cd95bf1b64371325c505c1ac8fe640a8c9933e7fe7637a38567  LICENSE
package/dtbocfg/dtbocfg.mk new file +18 -0
new file mode 100644
index 0000000000..68beb1a45e
@@ -0,0 +1,18 @@
+################################################################################
+#
+# dtbocfg
+#
+################################################################################
+
+DTBOCFG_VERSION = 0.0.9
+DTBOCFG_SITE = $(call github,ikwzm,dtbocfg,v$(DTBOCFG_VERSION))
+DTBOCFG_LICENSE = BSD-2-Clause
+DTBOCFG_LICENSE_FILES = LICENSE
+
+define DTBOCFG_LINUX_CONFIG_FIXUPS
+	$(call KCONFIG_ENABLE_OPT,CONFIG_OF_OVERLAY)
+	$(call KCONFIG_ENABLE_OPT,CONFIG_CONFIGFS_FS)
+endef
+
+$(eval $(kernel-module))
+$(eval $(generic-package))
support/testing/tests/package/test_dtbocfg.py new file +27 -0
new file mode 100644
index 0000000000..d25b1692b4
@@ -0,0 +1,37 @@
+import os
+
+import infra.basetest
+
+
+class TestDtbocfg(infra.basetest.BRTest):
+    config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
+        """
+        BR2_LINUX_KERNEL=y
+        BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+        BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7"
+        BR2_LINUX_KERNEL_USE_DEFCONFIG=y
+        BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
+        BR2_PACKAGE_DTBOCFG=y
+        BR2_TARGET_ROOTFS_CPIO=y
+        # BR2_TARGET_ROOTFS_TAR is not set
+        """
+
+    def test_run(self):
+        img = os.path.join(self.builddir, "images", "rootfs.cpio")
+        kernel = os.path.join(self.builddir, "images", "zImage")
+        kernel_cmdline = ["console=ttyAMA0"]
+        dtb = infra.download(self.downloaddir, "vexpress-v2p-ca9.dtb")
+        options = ["-M", "vexpress-a9", "-dtb", dtb, "-initrd", img]
+
+        self.emulator.boot(arch="armv7", kernel=kernel,
+                           kernel_cmdline=kernel_cmdline,

support/testing/tests/package/test_dtbocfg.py line 37

Quoted 10 lines
support/testing/tests/package/test_dtbocfg.py new file +10 -0
+                           options=options)
+        self.emulator.login()
+        self.assertRunOk("modprobe dtbocfg.ko")
+        self.assertRunOk("mkdir /tmp/config && mount -t configfs none /tmp/config")
+
+        # Check that overlays directory is present.
+        # From dtbocfg site (https://github.com/ikwzm/dtbocfg):
+        #   If /config/device-tree/overlays is created, it is ready to use
+        #   dtbocfg
+        self.assertRunOk("ls /tmp/config/device-tree/overlays/")

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot