From 0e30a458374b83a038a0f3cff4c0432e22d7db6d Mon Sep 17 00:00:00 2001 From: Lucien Mueller Date: Wed, 20 Sep 2023 15:55:52 +0200 Subject: [PATCH] nwl-tests: update recipe for new file structure Signed-off-by: Lucien Mueller --- .../recipes-core/images/nwl-ramdisk-minimal.bb | 2 +- .../recipes-testing/nwl-tests/nwl-tests_git.bb | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/layers/meta-nwl-distro/recipes-core/images/nwl-ramdisk-minimal.bb b/layers/meta-nwl-distro/recipes-core/images/nwl-ramdisk-minimal.bb index 516797c..13aef50 100644 --- a/layers/meta-nwl-distro/recipes-core/images/nwl-ramdisk-minimal.bb +++ b/layers/meta-nwl-distro/recipes-core/images/nwl-ramdisk-minimal.bb @@ -34,7 +34,7 @@ IMAGE_INSTALL:append = " \ \ networkmanager-nmcli \ systemd-conf \ - nwl-tests-kernel \ + nwl-tests \ \ ${@bb.utils.contains("MACHINE_FEATURES", "wifi", "${WIFI_PACKAGES}", "", d)} \ " diff --git a/layers/meta-nwl-distro/recipes-testing/nwl-tests/nwl-tests_git.bb b/layers/meta-nwl-distro/recipes-testing/nwl-tests/nwl-tests_git.bb index 3964e9a..650b473 100644 --- a/layers/meta-nwl-distro/recipes-testing/nwl-tests/nwl-tests_git.bb +++ b/layers/meta-nwl-distro/recipes-testing/nwl-tests/nwl-tests_git.bb @@ -7,20 +7,16 @@ SRC_URI = "git://git@bitbucket.gad.local:7999/nm-nsp/nwl-test.git;protocol=ssh;b PV = "1.0+git${SRCPV}" -SRCREV = "8a3c5de105eb290342ed67e7cbeecb0879da1384" +SRCREV = "b20cf128663270b095f51d538b650d0536822069" S = "${WORKDIR}/git" -PACKAGES += "${PN}-kernel" -RDEPENDS:${PN}-kernel = "${PN} bats" +RDEPENDS:${PN} = "bats" FILES:${PN} = "${datadir}/*" -FILES:${PN}-kernel = "${bindir}/nwl-tests-kernel" +FILES:${PN} += "${bindir}/*" do_install () { - install -d ${D}${bindir} - install -m 0755 ${S}/kernel-tests/kernel-tests.bats ${D}${bindir}/nwl-tests-kernel - install -d ${D}${datadir}/nwl-tests - install -m 0644 ${S}/hardware-specifications/* ${D}${datadir}/nwl-tests/ + make install PREFIX=${D}${prefix} }