* [meta-oe][PATCH 1/3] ell: remove unused patch
@ 2018-11-21 8:10 Martin Hundebøll
2018-11-21 8:10 ` [meta-oe][PATCH 2/3] ell: update to 0.15 Martin Hundebøll
2018-11-21 8:10 ` [meta-oe][PATCH 3/3] iwd: add version 0.12 Martin Hundebøll
0 siblings, 2 replies; 11+ messages in thread
From: Martin Hundebøll @ 2018-11-21 8:10 UTC (permalink / raw)
To: openembedded-devel
Commit cc7bce67b ('ell: update to 0.8') removed the patch from SRC_URI
but forgot to delete it from the git tree.
Signed-off-by: Martin Hundebøll <martin@geanix.com>
---
...arp.h-from-libc-instead-of-linux-hea.patch | 39 -------------------
1 file changed, 39 deletions(-)
delete mode 100644 meta-oe/recipes-core/ell/ell/0001-dhcp-include-if_arp.h-from-libc-instead-of-linux-hea.patch
diff --git a/meta-oe/recipes-core/ell/ell/0001-dhcp-include-if_arp.h-from-libc-instead-of-linux-hea.patch b/meta-oe/recipes-core/ell/ell/0001-dhcp-include-if_arp.h-from-libc-instead-of-linux-hea.patch
deleted file mode 100644
index ada65401a..000000000
--- a/meta-oe/recipes-core/ell/ell/0001-dhcp-include-if_arp.h-from-libc-instead-of-linux-hea.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From d8236d1d789f496a193dae5d2a15d706b81f6482 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= <martin@geanix.com>
-Date: Thu, 12 Jul 2018 10:19:50 +0200
-Subject: [PATCH] dhcp: include if_arp.h from libc instead of linux headers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-To: ell@lists.01.org
-
-Compilation with musl libc fails due to redefinition of 'struct
-arp{req,req_old,hdr}' in linux/if_arp.h, since it is already defined and
-included in net/if_arp.h (through net/ethernet.h -> net/if_ether.h).
-
-The only symbols used from if_arp.h is ARPHRD_ETHER, so it should be
-safe to avoid the compile error by including the if_arp.h header from
-the c-library instead.
-
-Upstream-Status: Backport [https://lists.01.org/pipermail/ell/2018-July/001244.html]
-Signed-off-by: Martin Hundebøll <martin@geanix.com>
----
- ell/dhcp.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ell/dhcp.c b/ell/dhcp.c
-index 6c90370..0d99f74 100644
---- a/ell/dhcp.c
-+++ b/ell/dhcp.c
-@@ -27,7 +27,7 @@
- #include <netinet/ip.h>
- #include <net/ethernet.h>
- #include <linux/types.h>
--#include <linux/if_arp.h>
-+#include <net/if_arp.h>
- #include <errno.h>
- #include <time.h>
-
---
-2.18.0
-
--
2.19.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [meta-oe][PATCH 2/3] ell: update to 0.15
2018-11-21 8:10 [meta-oe][PATCH 1/3] ell: remove unused patch Martin Hundebøll
@ 2018-11-21 8:10 ` Martin Hundebøll
2018-11-21 8:10 ` [meta-oe][PATCH 3/3] iwd: add version 0.12 Martin Hundebøll
1 sibling, 0 replies; 11+ messages in thread
From: Martin Hundebøll @ 2018-11-21 8:10 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Hundebøll <martin@geanix.com>
---
meta-oe/recipes-core/ell/{ell_0.8.bb => ell_0.15.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-core/ell/{ell_0.8.bb => ell_0.15.bb} (88%)
diff --git a/meta-oe/recipes-core/ell/ell_0.8.bb b/meta-oe/recipes-core/ell/ell_0.15.bb
similarity index 88%
rename from meta-oe/recipes-core/ell/ell_0.8.bb
rename to meta-oe/recipes-core/ell/ell_0.15.bb
index 0428cab28..5dbad50f3 100644
--- a/meta-oe/recipes-core/ell/ell_0.8.bb
+++ b/meta-oe/recipes-core/ell/ell_0.15.bb
@@ -7,7 +7,7 @@ SECTION = "libs"
inherit autotools pkgconfig
S = "${WORKDIR}/git"
-SRCREV = "d572281caedef357c392a7c9aa65a3b21a18cfdb"
+SRCREV = "ea0f5f42e3af3fad2b60ee87719cdd227fd89ab0"
SRC_URI = "git://git.kernel.org/pub/scm/libs/ell/ell.git"
do_configure_prepend () {
--
2.19.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [meta-oe][PATCH 3/3] iwd: add version 0.12
2018-11-21 8:10 [meta-oe][PATCH 1/3] ell: remove unused patch Martin Hundebøll
2018-11-21 8:10 ` [meta-oe][PATCH 2/3] ell: update to 0.15 Martin Hundebøll
@ 2018-11-21 8:10 ` Martin Hundebøll
2018-11-21 10:35 ` Peter Kjellerstedt
` (2 more replies)
1 sibling, 3 replies; 11+ messages in thread
From: Martin Hundebøll @ 2018-11-21 8:10 UTC (permalink / raw)
To: openembedded-devel
The iwd wireless daemon is an alternative to wpa_supplicant. It is
controlled using the iwctl command line client (or the dbus interface).
Signed-off-by: Martin Hundebøll <martin@geanix.com>
---
meta-oe/recipes-connectivity/iwd/iwd_0.12.bb | 24 ++++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 meta-oe/recipes-connectivity/iwd/iwd_0.12.bb
diff --git a/meta-oe/recipes-connectivity/iwd/iwd_0.12.bb b/meta-oe/recipes-connectivity/iwd/iwd_0.12.bb
new file mode 100644
index 000000000..a4261547e
--- /dev/null
+++ b/meta-oe/recipes-connectivity/iwd/iwd_0.12.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Wireless daemon for Linux"
+LICENSE = "LGPL-2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09"
+
+inherit autotools pkgconfig systemd
+
+DEPENDS = "ell readline dbus"
+
+SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git"
+SRCREV = "d7609915db4b57229f7dd4c04b4eabcce637872a"
+S = "${WORKDIR}/git"
+
+SYSTEMD_SERVICE_${PN} = "iwd.service"
+
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
+PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd-service,systemd"
+
+EXTRA_OECONF += "--enable-external-ell"
+
+do_configure_prepend () {
+ mkdir -p ${S}/build-aux
+}
+
+FILES_${PN} += "${datadir}/dbus-1"
--
2.19.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [meta-oe][PATCH 3/3] iwd: add version 0.12
2018-11-21 8:10 ` [meta-oe][PATCH 3/3] iwd: add version 0.12 Martin Hundebøll
@ 2018-11-21 10:35 ` Peter Kjellerstedt
2018-11-21 11:15 ` Burton, Ross
2018-11-22 12:48 ` [meta-oe][PATCHv2] " Martin Hundebøll
2 siblings, 0 replies; 11+ messages in thread
From: Peter Kjellerstedt @ 2018-11-21 10:35 UTC (permalink / raw)
To: Martin Hundebøll, openembedded-devel
> -----Original Message-----
> From: openembedded-devel-bounces@lists.openembedded.org <openembedded-
> devel-bounces@lists.openembedded.org> On Behalf Of Martin Hundebøll
> Sent: den 21 november 2018 09:10
> To: openembedded-devel@lists.openembedded.org
> Subject: [oe] [meta-oe][PATCH 3/3] iwd: add version 0.12
>
> The iwd wireless daemon is an alternative to wpa_supplicant. It is
> controlled using the iwctl command line client (or the dbus interface).
>
> Signed-off-by: Martin Hundebøll <martin@geanix.com>
> ---
> meta-oe/recipes-connectivity/iwd/iwd_0.12.bb | 24 ++++++++++++++++++++
> 1 file changed, 24 insertions(+)
> create mode 100644 meta-oe/recipes-connectivity/iwd/iwd_0.12.bb
>
> diff --git a/meta-oe/recipes-connectivity/iwd/iwd_0.12.bb b/meta-
> oe/recipes-connectivity/iwd/iwd_0.12.bb
> new file mode 100644
> index 000000000..a4261547e
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/iwd/iwd_0.12.bb
> @@ -0,0 +1,24 @@
> +DESCRIPTION = "Wireless daemon for Linux"
> +LICENSE = "LGPL-2.1"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09"
> +
> +inherit autotools pkgconfig systemd
> +
> +DEPENDS = "ell readline dbus"
Given that the readline library is GPLv3, it is probably a good idea
to be able to disable the part that uses it. I.e., something like:
PACKAGECONFIG[client] = "--enable-client, --disable-client, readline,"
and add "client" to PACKAGECONFIG by default.
> +
> +SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git"
> +SRCREV = "d7609915db4b57229f7dd4c04b4eabcce637872a"
> +S = "${WORKDIR}/git"
> +
> +SYSTEMD_SERVICE_${PN} = "iwd.service"
> +
> +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
> +PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd-service,systemd"
> +
> +EXTRA_OECONF += "--enable-external-ell"
> +
> +do_configure_prepend () {
> + mkdir -p ${S}/build-aux
> +}
> +
> +FILES_${PN} += "${datadir}/dbus-1"
> --
> 2.19.1
//Peter
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta-oe][PATCH 3/3] iwd: add version 0.12
2018-11-21 8:10 ` [meta-oe][PATCH 3/3] iwd: add version 0.12 Martin Hundebøll
2018-11-21 10:35 ` Peter Kjellerstedt
@ 2018-11-21 11:15 ` Burton, Ross
2018-11-22 12:48 ` [meta-oe][PATCHv2] " Martin Hundebøll
2 siblings, 0 replies; 11+ messages in thread
From: Burton, Ross @ 2018-11-21 11:15 UTC (permalink / raw)
To: martin; +Cc: OpenEmbedded Devel List
On Wed, 21 Nov 2018 at 08:19, Martin Hundebøll <martin@geanix.com> wrote:
> The iwd wireless daemon is an alternative to wpa_supplicant. It is
> controlled using the iwctl command line client (or the dbus interface).
>
> Signed-off-by: Martin Hundebøll <martin@geanix.com>
> ---
> meta-oe/recipes-connectivity/iwd/iwd_0.12.bb | 24 ++++++++++++++++++++
> 1 file changed, 24 insertions(+)
> create mode 100644 meta-oe/recipes-connectivity/iwd/iwd_0.12.bb
>
> diff --git a/meta-oe/recipes-connectivity/iwd/iwd_0.12.bb b/meta-oe/recipes-connectivity/iwd/iwd_0.12.bb
> new file mode 100644
> index 000000000..a4261547e
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/iwd/iwd_0.12.bb
> @@ -0,0 +1,24 @@
> +DESCRIPTION = "Wireless daemon for Linux"
> +LICENSE = "LGPL-2.1"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09"
> +
> +inherit autotools pkgconfig systemd
> +
> +DEPENDS = "ell readline dbus"
> +
> +SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git"
> +SRCREV = "d7609915db4b57229f7dd4c04b4eabcce637872a"
> +S = "${WORKDIR}/git"
> +
> +SYSTEMD_SERVICE_${PN} = "iwd.service"
> +
> +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
> +PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd-service,systemd"
> +
> +EXTRA_OECONF += "--enable-external-ell"
> +
> +do_configure_prepend () {
> + mkdir -p ${S}/build-aux
> +}
> +
> +FILES_${PN} += "${datadir}/dbus-1"
I started a recipe for this but never got around to submitting it.
You'll find it here:
http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=ross/mutwipargh&id=0e7d8a005540bdc36c7af68c0fdb8670ef74a0e0
I definitely think the PACKAGECONFIGs and ead.service need to be added
before merging. The ptest stuff wasn't tested so I don't know how
useful it was.
Ross
^ permalink raw reply [flat|nested] 11+ messages in thread
* [meta-oe][PATCHv2] iwd: add version 0.12
2018-11-21 8:10 ` [meta-oe][PATCH 3/3] iwd: add version 0.12 Martin Hundebøll
2018-11-21 10:35 ` Peter Kjellerstedt
2018-11-21 11:15 ` Burton, Ross
@ 2018-11-22 12:48 ` Martin Hundebøll
2018-11-22 13:20 ` Burton, Ross
2018-11-22 13:51 ` Martin Hundebøll
2 siblings, 2 replies; 11+ messages in thread
From: Martin Hundebøll @ 2018-11-22 12:48 UTC (permalink / raw)
To: openembedded-devel
The iwd wireless daemon is an alternative to wpa_supplicant. It is
controlled using the iwctl command line client (or the dbus interface).
Signed-off-by: Martin Hundebøll <martin@geanix.com>
---
Changes since v1:
- add packageconfig for client, ead, and ofono
- split out packages for iwctl, ead, and iwmon
- add ptest support
...ble-serial-tests-in-automake-to-supp.patch | 32 +++++++++
.../recipes-connectivity/iwd/iwd/run-ptest | 30 ++++++++
meta-oe/recipes-connectivity/iwd/iwd_0.12.bb | 68 +++++++++++++++++++
3 files changed, 130 insertions(+)
create mode 100644 meta-oe/recipes-connectivity/iwd/iwd/0001-configure.ac-enable-serial-tests-in-automake-to-supp.patch
create mode 100644 meta-oe/recipes-connectivity/iwd/iwd/run-ptest
create mode 100644 meta-oe/recipes-connectivity/iwd/iwd_0.12.bb
diff --git a/meta-oe/recipes-connectivity/iwd/iwd/0001-configure.ac-enable-serial-tests-in-automake-to-supp.patch b/meta-oe/recipes-connectivity/iwd/iwd/0001-configure.ac-enable-serial-tests-in-automake-to-supp.patch
new file mode 100644
index 000000000..f9f073056
--- /dev/null
+++ b/meta-oe/recipes-connectivity/iwd/iwd/0001-configure.ac-enable-serial-tests-in-automake-to-supp.patch
@@ -0,0 +1,32 @@
+From 06a21885b89675ba094b573d5af8aa74729111d6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= <martin@geanix.com>
+Date: Thu, 22 Nov 2018 10:03:09 +0100
+Subject: [PATCH] configure.ac: enable serial-tests in automake to support
+ ptest
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [OE-specific]
+Signed-off-by: Martin Hundebøll <martin@geanix.com>
+---
+ configure.ac | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8deb53a..1a5330b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -6,7 +6,8 @@ AC_CONFIG_AUX_DIR(build-aux)
+ AC_CONFIG_MACRO_DIR(build-aux)
+
+ AM_INIT_AUTOMAKE([foreign subdir-objects color-tests silent-rules
+- tar-pax no-dist-gzip dist-xz])
++ tar-pax no-dist-gzip dist-xz
++ serial-tests])
+
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+--
+2.19.1
+
diff --git a/meta-oe/recipes-connectivity/iwd/iwd/run-ptest b/meta-oe/recipes-connectivity/iwd/iwd/run-ptest
new file mode 100644
index 000000000..f2db136b1
--- /dev/null
+++ b/meta-oe/recipes-connectivity/iwd/iwd/run-ptest
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+run_test() {
+ test=$1
+ name=$(basename $1)
+
+ log=$(./$test)
+ res=$(echo $?)
+
+ # check for skipped test
+ case "$log" in
+ *skipping*)
+ echo "SKIP: $name"
+ return
+ ;;
+ esac
+
+ # check for passed / failed
+ if [[ "$res" -eq "0" ]]; then
+ echo "PASS: $name"
+ else
+ echo "FAIL: $name"
+ fi
+}
+
+for path in tests/*; do
+ run_test $path
+done
+
+exit 0
diff --git a/meta-oe/recipes-connectivity/iwd/iwd_0.12.bb b/meta-oe/recipes-connectivity/iwd/iwd_0.12.bb
new file mode 100644
index 000000000..321b1ca01
--- /dev/null
+++ b/meta-oe/recipes-connectivity/iwd/iwd_0.12.bb
@@ -0,0 +1,68 @@
+DESCRIPTION = "Wireless daemon for Linux"
+LICENSE = "LGPL-2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09"
+
+inherit autotools pkgconfig systemd ptest
+
+DEPENDS = "ell dbus"
+DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'readline', '', d)}"
+
+SRC_URI = " \
+ git://git.kernel.org/pub/scm/network/wireless/iwd.git \
+ file://0001-configure.ac-enable-serial-tests-in-automake-to-supp.patch \
+ file://run-ptest \
+"
+SRCREV = "d7609915db4b57229f7dd4c04b4eabcce637872a"
+S = "${WORKDIR}/git"
+
+PACKAGECONFIG ??= "client ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} wired ofono"
+PACKAGECONFIG[client] = "--enable-client,--disable-client,readline"
+PACKAGECONFIG[systemd] = "--enable-systemd-service,--disable-systemd-service,systemd"
+PACKAGECONFIG[wired] = "--enable-wired,--disable-wired"
+PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono"
+
+EXTRA_OECONF += "--enable-external-ell"
+
+do_configure_prepend () {
+ mkdir -p ${S}/build-aux
+}
+
+do_compile_ptest() {
+ oe_runmake buildtest-TESTS
+}
+
+do_install_ptest() {
+ # remove intermediate object files
+ rm -f ${B}/unit/*.o
+ install -D -t ${D}${PTEST_PATH}/tests ${B}/unit/*
+}
+
+HAVE_SYSTEMD = "${@bb.utils.contains('PACKAGECONFIG', 'systemd', True, False, d)}"
+
+# iwd service
+SYSTEMD_SERVICE_${PN} = "${@'iwd.service' if bb.utils.to_boolean(d.getVar('HAVE_SYSTEMD')) else ''}"
+FILES_${PN} += " \
+ ${datadir}/dbus-1/system.d/iwd-dbus.conf \
+ ${datadir}/dbus-1/system-services/net.connman.iwd.service \
+"
+
+# iwctl tool
+PN_CLIENT = "${@bb.utils.contains('PACKAGECONFIG', 'client', '${PN}-client', '', d)}"
+RRECOMMENDS_${PN} += "${PN_CLIENT}"
+PACKAGE_BEFORE_PN += "${PN_CLIENT}"
+FILES_${PN}-client += "${bindir}/iwctl"
+
+# ead service
+PN_WIRED = "${@bb.utils.contains('PACKAGECONFIG', 'wired', '${PN}-wired', '', d)}"
+PACKAGE_BEFORE_PN += "${PN_WIRED}"
+SYSTEMD_PACKAGES += "${PN_WIRED}"
+SYSTEMD_SERVICE_${PN}-wired = "${@'ead.service' if d.getVar('PN_WIRED') and bb.utils.to_boolean(d.getVar('HAVE_SYSTEMD')) else ''}"
+FILES_${PN}-wired += " \
+ ${libexecdir}/ead \
+ ${datadir}/dbus-1/system.d/ead-dbus.conf \
+ ${datadir}/dbus-1/system-services/net.connman.ead.service \
+"
+
+# iwmon tool
+PACKAGE_BEFORE_PN += "${PN}-monitor"
+FILES_${PN}-monitor += "${bindir}/iwmon"
--
2.19.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [meta-oe][PATCHv2] iwd: add version 0.12
2018-11-22 12:48 ` [meta-oe][PATCHv2] " Martin Hundebøll
@ 2018-11-22 13:20 ` Burton, Ross
2018-11-22 13:51 ` Martin Hundebøll
1 sibling, 0 replies; 11+ messages in thread
From: Burton, Ross @ 2018-11-22 13:20 UTC (permalink / raw)
To: martin; +Cc: OpenEmbedded Devel List
On Thu, 22 Nov 2018 at 12:48, Martin Hundebøll <martin@geanix.com> wrote:
> +DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'readline', '', d)}"
Better to fix the makefile so it doesn't build the client test if the
client is disabled?
> +SRC_URI = " \
> + git://git.kernel.org/pub/scm/network/wireless/iwd.git \
> + file://0001-configure.ac-enable-serial-tests-in-automake-to-supp.patch \
Oh, I've a patch to automake to make this redundant. I'll dig it out
and post to oe-core.
> +HAVE_SYSTEMD = "${@bb.utils.contains('PACKAGECONFIG', 'systemd', True, False, d)}"
> +
> +# iwd service
> +SYSTEMD_SERVICE_${PN} = "${@'iwd.service' if bb.utils.to_boolean(d.getVar('HAVE_SYSTEMD')) else ''}"
> +FILES_${PN} += " \
> + ${datadir}/dbus-1/system.d/iwd-dbus.conf \
> + ${datadir}/dbus-1/system-services/net.connman.iwd.service \
> +"
No need, if systemd is disabled then the class won't do anything.
> +# iwctl tool
> +PN_CLIENT = "${@bb.utils.contains('PACKAGECONFIG', 'client', '${PN}-client', '', d)}"
> +RRECOMMENDS_${PN} += "${PN_CLIENT}"
> +PACKAGE_BEFORE_PN += "${PN_CLIENT}"
> +FILES_${PN}-client += "${bindir}/iwctl"
I'm generally against massively splitting up recipes in the name of
modularity as it just complicates recipes. Unless there's a good
reason I'd say just put the daemon, the client, and the extra parts
(such as EAD) in the same package. It's not like anyone would want to
install the client but not the daemon, or installing the client
alongside the daemon would be a huge waste of space.
Ross
^ permalink raw reply [flat|nested] 11+ messages in thread
* [meta-oe][PATCHv2] iwd: add version 0.12
2018-11-22 12:48 ` [meta-oe][PATCHv2] " Martin Hundebøll
2018-11-22 13:20 ` Burton, Ross
@ 2018-11-22 13:51 ` Martin Hundebøll
2018-11-22 13:54 ` Martin Hundebøll
2018-11-22 14:12 ` [meta-oe][PATCHv4] " Martin Hundebøll
1 sibling, 2 replies; 11+ messages in thread
From: Martin Hundebøll @ 2018-11-22 13:51 UTC (permalink / raw)
To: openembedded-devel
The iwd wireless daemon is an alternative to wpa_supplicant. It is
controlled using the iwctl command line client (or the dbus interface).
Signed-off-by: Martin Hundebøll <martin@geanix.com>
---
Changes since v2:
- add patch to make client unit test depend on packageconfig
- remove split of packages
Changes since v1:
- add packageconfig for client, ead, and ofono
- split out packages for iwctl, ead, and iwmon
- add ptest support
...ient-unit-test-conditional-on-enable.patch | 59 +++++++++++++++++++
...ble-serial-tests-in-automake-to-supp.patch | 32 ++++++++++
.../recipes-connectivity/iwd/iwd/run-ptest | 30 ++++++++++
meta-oe/recipes-connectivity/iwd/iwd_0.12.bb | 43 ++++++++++++++
4 files changed, 164 insertions(+)
create mode 100644 meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile-make-client-unit-test-conditional-on-enable.patch
create mode 100644 meta-oe/recipes-connectivity/iwd/iwd/0001-configure.ac-enable-serial-tests-in-automake-to-supp.patch
create mode 100644 meta-oe/recipes-connectivity/iwd/iwd/run-ptest
create mode 100644 meta-oe/recipes-connectivity/iwd/iwd_0.12.bb
diff --git a/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile-make-client-unit-test-conditional-on-enable.patch b/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile-make-client-unit-test-conditional-on-enable.patch
new file mode 100644
index 000000000..bce87f66b
--- /dev/null
+++ b/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile-make-client-unit-test-conditional-on-enable.patch
@@ -0,0 +1,59 @@
+From b327b775db4e250d3448ab30ce97ca0acfea7603 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= <martin@geanix.com>
+Date: Thu, 22 Nov 2018 14:31:11 +0100
+Subject: [PATCH] Makefile: make client unit test conditional on
+ --{enable,disable}-client
+To: iwd@lists.01.org
+
+The iwctl client and its unit test depends on readline. If building on a
+host without readline installed, default make target succeeds when
+configured with --disable-client, but the following make check target
+fails.
+
+Fix this by making the test-client target conditional on the
+--{enable,disable}-client configure flag.
+
+Upstream-Status: Submitted [https://lists.01.org/pipermail/iwd/2018-November/005178.html]
+Signed-Off-By: Martin Hundebøll <martin@geanix.com>
+
+---
+ Makefile.am | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index db64c38..262e80d 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -297,9 +297,11 @@ unit_tests = unit/test-cmac-aes \
+ unit/test-crypto unit/test-eapol unit/test-mpdu \
+ unit/test-ie unit/test-ssid-to-utf8 unit/test-ssid-security \
+ unit/test-arc4 unit/test-wsc unit/test-eap-mschapv2 \
+- unit/test-eap-sim unit/test-client unit/test-ecc \
+- unit/test-sae
++ unit/test-eap-sim unit/test-ecc unit/test-sae
+
++if CLIENT
++unit_tests += unit/test-client
++endif
+
+ ell_pem_files = cert-ca-key.pem cert-client-key.pem cert-client-key-pkcs8.pem \
+ cert-server-key.pem cert-server-key-pkcs8.pem \
+@@ -404,6 +406,7 @@ unit_test_eap_mschapv2_SOURCES = src/eap-mschapv2.h src/eap-mschapv2.c \
+ unit/test-eap-mschapv2.c
+ unit_test_eap_mschapv2_LDADD = $(ell_ldadd)
+
++if CLIENT
+ unit_test_client_SOURCES = unit/test-client.c \
+ client/adapter.c \
+ client/agent.h client/agent.c \
+@@ -414,6 +417,7 @@ unit_test_client_SOURCES = unit/test-client.c \
+ client/network.h client/network.c \
+ client/properties.h client/properties.c
+ unit_test_client_LDADD = $(ell_ldadd) -lreadline
++endif
+
+ unit_test_ecc_SOURCES = unit/test-ecc.c src/ecc.c src/ecc.h
+ unit_test_ecc_LDADD = $(ell_ldadd)
+--
+2.19.1
+
diff --git a/meta-oe/recipes-connectivity/iwd/iwd/0001-configure.ac-enable-serial-tests-in-automake-to-supp.patch b/meta-oe/recipes-connectivity/iwd/iwd/0001-configure.ac-enable-serial-tests-in-automake-to-supp.patch
new file mode 100644
index 000000000..f9f073056
--- /dev/null
+++ b/meta-oe/recipes-connectivity/iwd/iwd/0001-configure.ac-enable-serial-tests-in-automake-to-supp.patch
@@ -0,0 +1,32 @@
+From 06a21885b89675ba094b573d5af8aa74729111d6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= <martin@geanix.com>
+Date: Thu, 22 Nov 2018 10:03:09 +0100
+Subject: [PATCH] configure.ac: enable serial-tests in automake to support
+ ptest
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [OE-specific]
+Signed-off-by: Martin Hundebøll <martin@geanix.com>
+---
+ configure.ac | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8deb53a..1a5330b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -6,7 +6,8 @@ AC_CONFIG_AUX_DIR(build-aux)
+ AC_CONFIG_MACRO_DIR(build-aux)
+
+ AM_INIT_AUTOMAKE([foreign subdir-objects color-tests silent-rules
+- tar-pax no-dist-gzip dist-xz])
++ tar-pax no-dist-gzip dist-xz
++ serial-tests])
+
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+--
+2.19.1
+
diff --git a/meta-oe/recipes-connectivity/iwd/iwd/run-ptest b/meta-oe/recipes-connectivity/iwd/iwd/run-ptest
new file mode 100644
index 000000000..f2db136b1
--- /dev/null
+++ b/meta-oe/recipes-connectivity/iwd/iwd/run-ptest
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+run_test() {
+ test=$1
+ name=$(basename $1)
+
+ log=$(./$test)
+ res=$(echo $?)
+
+ # check for skipped test
+ case "$log" in
+ *skipping*)
+ echo "SKIP: $name"
+ return
+ ;;
+ esac
+
+ # check for passed / failed
+ if [[ "$res" -eq "0" ]]; then
+ echo "PASS: $name"
+ else
+ echo "FAIL: $name"
+ fi
+}
+
+for path in tests/*; do
+ run_test $path
+done
+
+exit 0
diff --git a/meta-oe/recipes-connectivity/iwd/iwd_0.12.bb b/meta-oe/recipes-connectivity/iwd/iwd_0.12.bb
new file mode 100644
index 000000000..c9aec91ce
--- /dev/null
+++ b/meta-oe/recipes-connectivity/iwd/iwd_0.12.bb
@@ -0,0 +1,43 @@
+DESCRIPTION = "Wireless daemon for Linux"
+LICENSE = "LGPL-2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09"
+
+inherit autotools pkgconfig systemd ptest
+
+DEPENDS = "ell dbus"
+
+SRC_URI = " \
+ git://git.kernel.org/pub/scm/network/wireless/iwd.git \
+ file://0001-configure.ac-enable-serial-tests-in-automake-to-supp.patch \
+ file://0001-Makefile-make-client-unit-test-conditional-on-enable.patch \
+ file://run-ptest \
+"
+SRCREV = "d7609915db4b57229f7dd4c04b4eabcce637872a"
+S = "${WORKDIR}/git"
+
+PACKAGECONFIG ??= "client ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} wired ofono"
+PACKAGECONFIG[client] = "--enable-client,--disable-client,readline"
+PACKAGECONFIG[systemd] = "--enable-systemd-service,--disable-systemd-service,systemd"
+PACKAGECONFIG[wired] = "--enable-wired,--disable-wired"
+PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono"
+
+EXTRA_OECONF += "--enable-external-ell"
+
+do_configure_prepend () {
+ mkdir -p ${S}/build-aux
+}
+
+do_compile_ptest() {
+ oe_runmake buildtest-TESTS
+}
+
+do_install_ptest() {
+ # remove intermediate object files
+ rm -f ${B}/unit/*.o
+ install -D -t ${D}${PTEST_PATH}/tests ${B}/unit/*
+}
+
+# iwd service
+SYSTEMD_SERVICE_${PN} = "iwd.service"
+SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)}"
+FILES_${PN} += "${datadir}/dbus-1/"
--
2.19.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [meta-oe][PATCHv2] iwd: add version 0.12
2018-11-22 13:51 ` Martin Hundebøll
@ 2018-11-22 13:54 ` Martin Hundebøll
2018-11-22 14:12 ` [meta-oe][PATCHv4] " Martin Hundebøll
1 sibling, 0 replies; 11+ messages in thread
From: Martin Hundebøll @ 2018-11-22 13:54 UTC (permalink / raw)
To: openembedded-devel
Sorry, forgot to update patch version.
// Martin
On 22/11/2018 14.51, Martin Hundebøll wrote:
> The iwd wireless daemon is an alternative to wpa_supplicant. It is
> controlled using the iwctl command line client (or the dbus interface).
>
> Signed-off-by: Martin Hundebøll <martin@geanix.com>
> ---
>
> Changes since v2:
> - add patch to make client unit test depend on packageconfig
> - remove split of packages
>
> Changes since v1:
> - add packageconfig for client, ead, and ofono
> - split out packages for iwctl, ead, and iwmon
> - add ptest support
>
> ...ient-unit-test-conditional-on-enable.patch | 59 +++++++++++++++++++
> ...ble-serial-tests-in-automake-to-supp.patch | 32 ++++++++++
> .../recipes-connectivity/iwd/iwd/run-ptest | 30 ++++++++++
> meta-oe/recipes-connectivity/iwd/iwd_0.12.bb | 43 ++++++++++++++
> 4 files changed, 164 insertions(+)
> create mode 100644 meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile-make-client-unit-test-conditional-on-enable.patch
> create mode 100644 meta-oe/recipes-connectivity/iwd/iwd/0001-configure.ac-enable-serial-tests-in-automake-to-supp.patch
> create mode 100644 meta-oe/recipes-connectivity/iwd/iwd/run-ptest
> create mode 100644 meta-oe/recipes-connectivity/iwd/iwd_0.12.bb
>
> diff --git a/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile-make-client-unit-test-conditional-on-enable.patch b/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile-make-client-unit-test-conditional-on-enable.patch
> new file mode 100644
> index 000000000..bce87f66b
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile-make-client-unit-test-conditional-on-enable.patch
> @@ -0,0 +1,59 @@
> +From b327b775db4e250d3448ab30ce97ca0acfea7603 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= <martin@geanix.com>
> +Date: Thu, 22 Nov 2018 14:31:11 +0100
> +Subject: [PATCH] Makefile: make client unit test conditional on
> + --{enable,disable}-client
> +To: iwd@lists.01.org
> +
> +The iwctl client and its unit test depends on readline. If building on a
> +host without readline installed, default make target succeeds when
> +configured with --disable-client, but the following make check target
> +fails.
> +
> +Fix this by making the test-client target conditional on the
> +--{enable,disable}-client configure flag.
> +
> +Upstream-Status: Submitted [https://lists.01.org/pipermail/iwd/2018-November/005178.html]
> +Signed-Off-By: Martin Hundebøll <martin@geanix.com>
> +
> +---
> + Makefile.am | 8 ++++++--
> + 1 file changed, 6 insertions(+), 2 deletions(-)
> +
> +diff --git a/Makefile.am b/Makefile.am
> +index db64c38..262e80d 100644
> +--- a/Makefile.am
> ++++ b/Makefile.am
> +@@ -297,9 +297,11 @@ unit_tests = unit/test-cmac-aes \
> + unit/test-crypto unit/test-eapol unit/test-mpdu \
> + unit/test-ie unit/test-ssid-to-utf8 unit/test-ssid-security \
> + unit/test-arc4 unit/test-wsc unit/test-eap-mschapv2 \
> +- unit/test-eap-sim unit/test-client unit/test-ecc \
> +- unit/test-sae
> ++ unit/test-eap-sim unit/test-ecc unit/test-sae
> +
> ++if CLIENT
> ++unit_tests += unit/test-client
> ++endif
> +
> + ell_pem_files = cert-ca-key.pem cert-client-key.pem cert-client-key-pkcs8.pem \
> + cert-server-key.pem cert-server-key-pkcs8.pem \
> +@@ -404,6 +406,7 @@ unit_test_eap_mschapv2_SOURCES = src/eap-mschapv2.h src/eap-mschapv2.c \
> + unit/test-eap-mschapv2.c
> + unit_test_eap_mschapv2_LDADD = $(ell_ldadd)
> +
> ++if CLIENT
> + unit_test_client_SOURCES = unit/test-client.c \
> + client/adapter.c \
> + client/agent.h client/agent.c \
> +@@ -414,6 +417,7 @@ unit_test_client_SOURCES = unit/test-client.c \
> + client/network.h client/network.c \
> + client/properties.h client/properties.c
> + unit_test_client_LDADD = $(ell_ldadd) -lreadline
> ++endif
> +
> + unit_test_ecc_SOURCES = unit/test-ecc.c src/ecc.c src/ecc.h
> + unit_test_ecc_LDADD = $(ell_ldadd)
> +--
> +2.19.1
> +
> diff --git a/meta-oe/recipes-connectivity/iwd/iwd/0001-configure.ac-enable-serial-tests-in-automake-to-supp.patch b/meta-oe/recipes-connectivity/iwd/iwd/0001-configure.ac-enable-serial-tests-in-automake-to-supp.patch
> new file mode 100644
> index 000000000..f9f073056
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/iwd/iwd/0001-configure.ac-enable-serial-tests-in-automake-to-supp.patch
> @@ -0,0 +1,32 @@
> +From 06a21885b89675ba094b573d5af8aa74729111d6 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= <martin@geanix.com>
> +Date: Thu, 22 Nov 2018 10:03:09 +0100
> +Subject: [PATCH] configure.ac: enable serial-tests in automake to support
> + ptest
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +Upstream-Status: Inappropriate [OE-specific]
> +Signed-off-by: Martin Hundebøll <martin@geanix.com>
> +---
> + configure.ac | 3 ++-
> + 1 file changed, 2 insertions(+), 1 deletion(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index 8deb53a..1a5330b 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -6,7 +6,8 @@ AC_CONFIG_AUX_DIR(build-aux)
> + AC_CONFIG_MACRO_DIR(build-aux)
> +
> + AM_INIT_AUTOMAKE([foreign subdir-objects color-tests silent-rules
> +- tar-pax no-dist-gzip dist-xz])
> ++ tar-pax no-dist-gzip dist-xz
> ++ serial-tests])
> +
> + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
> +
> +--
> +2.19.1
> +
> diff --git a/meta-oe/recipes-connectivity/iwd/iwd/run-ptest b/meta-oe/recipes-connectivity/iwd/iwd/run-ptest
> new file mode 100644
> index 000000000..f2db136b1
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/iwd/iwd/run-ptest
> @@ -0,0 +1,30 @@
> +#!/bin/sh
> +
> +run_test() {
> + test=$1
> + name=$(basename $1)
> +
> + log=$(./$test)
> + res=$(echo $?)
> +
> + # check for skipped test
> + case "$log" in
> + *skipping*)
> + echo "SKIP: $name"
> + return
> + ;;
> + esac
> +
> + # check for passed / failed
> + if [[ "$res" -eq "0" ]]; then
> + echo "PASS: $name"
> + else
> + echo "FAIL: $name"
> + fi
> +}
> +
> +for path in tests/*; do
> + run_test $path
> +done
> +
> +exit 0
> diff --git a/meta-oe/recipes-connectivity/iwd/iwd_0.12.bb b/meta-oe/recipes-connectivity/iwd/iwd_0.12.bb
> new file mode 100644
> index 000000000..c9aec91ce
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/iwd/iwd_0.12.bb
> @@ -0,0 +1,43 @@
> +DESCRIPTION = "Wireless daemon for Linux"
> +LICENSE = "LGPL-2.1"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09"
> +
> +inherit autotools pkgconfig systemd ptest
> +
> +DEPENDS = "ell dbus"
> +
> +SRC_URI = " \
> + git://git.kernel.org/pub/scm/network/wireless/iwd.git \
> + file://0001-configure.ac-enable-serial-tests-in-automake-to-supp.patch \
> + file://0001-Makefile-make-client-unit-test-conditional-on-enable.patch \
> + file://run-ptest \
> +"
> +SRCREV = "d7609915db4b57229f7dd4c04b4eabcce637872a"
> +S = "${WORKDIR}/git"
> +
> +PACKAGECONFIG ??= "client ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} wired ofono"
> +PACKAGECONFIG[client] = "--enable-client,--disable-client,readline"
> +PACKAGECONFIG[systemd] = "--enable-systemd-service,--disable-systemd-service,systemd"
> +PACKAGECONFIG[wired] = "--enable-wired,--disable-wired"
> +PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono"
> +
> +EXTRA_OECONF += "--enable-external-ell"
> +
> +do_configure_prepend () {
> + mkdir -p ${S}/build-aux
> +}
> +
> +do_compile_ptest() {
> + oe_runmake buildtest-TESTS
> +}
> +
> +do_install_ptest() {
> + # remove intermediate object files
> + rm -f ${B}/unit/*.o
> + install -D -t ${D}${PTEST_PATH}/tests ${B}/unit/*
> +}
> +
> +# iwd service
> +SYSTEMD_SERVICE_${PN} = "iwd.service"
> +SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)}"
> +FILES_${PN} += "${datadir}/dbus-1/"
>
--
Kind regards,
Martin Hundebøll
Embedded Linux Consultant
+45 61 65 54 61
martin@geanix.com
Geanix IVS
https://geanix.com
DK39600706
^ permalink raw reply [flat|nested] 11+ messages in thread
* [meta-oe][PATCHv4] iwd: add version 0.12
2018-11-22 13:51 ` Martin Hundebøll
2018-11-22 13:54 ` Martin Hundebøll
@ 2018-11-22 14:12 ` Martin Hundebøll
2018-12-01 5:45 ` Khem Raj
1 sibling, 1 reply; 11+ messages in thread
From: Martin Hundebøll @ 2018-11-22 14:12 UTC (permalink / raw)
To: openembedded-devel
The iwd wireless daemon is an alternative to wpa_supplicant. It is
controlled using the iwctl command line client (or the dbus interface).
Signed-off-by: Martin Hundebøll <martin@geanix.com>
---
Changes since v3:
- Update patch upstream status to backport
Changes since v2:
- add patch to make client unit test depend on packageconfig
- remove split of packages
Changes since v1:
- add packageconfig for client, ead, and ofono
- split out packages for iwctl, ead, and iwmon
- add ptest support
...ient-unit-test-conditional-on-enable.patch | 59 +++++++++++++++++++
...ble-serial-tests-in-automake-to-supp.patch | 32 ++++++++++
.../recipes-connectivity/iwd/iwd/run-ptest | 30 ++++++++++
meta-oe/recipes-connectivity/iwd/iwd_0.12.bb | 43 ++++++++++++++
4 files changed, 164 insertions(+)
create mode 100644 meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile-make-client-unit-test-conditional-on-enable.patch
create mode 100644 meta-oe/recipes-connectivity/iwd/iwd/0001-configure.ac-enable-serial-tests-in-automake-to-supp.patch
create mode 100644 meta-oe/recipes-connectivity/iwd/iwd/run-ptest
create mode 100644 meta-oe/recipes-connectivity/iwd/iwd_0.12.bb
diff --git a/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile-make-client-unit-test-conditional-on-enable.patch b/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile-make-client-unit-test-conditional-on-enable.patch
new file mode 100644
index 000000000..7a39d05e5
--- /dev/null
+++ b/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile-make-client-unit-test-conditional-on-enable.patch
@@ -0,0 +1,59 @@
+From b327b775db4e250d3448ab30ce97ca0acfea7603 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= <martin@geanix.com>
+Date: Thu, 22 Nov 2018 14:31:11 +0100
+Subject: [PATCH] Makefile: make client unit test conditional on
+ --{enable,disable}-client
+To: iwd@lists.01.org
+
+The iwctl client and its unit test depends on readline. If building on a
+host without readline installed, default make target succeeds when
+configured with --disable-client, but the following make check target
+fails.
+
+Fix this by making the test-client target conditional on the
+--{enable,disable}-client configure flag.
+
+Upstream-Status: Backport [c4803d3b12010292d719cc3bcf694def5b6eeee8]
+Signed-Off-By: Martin Hundebøll <martin@geanix.com>
+
+---
+ Makefile.am | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index db64c38..262e80d 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -297,9 +297,11 @@ unit_tests = unit/test-cmac-aes \
+ unit/test-crypto unit/test-eapol unit/test-mpdu \
+ unit/test-ie unit/test-ssid-to-utf8 unit/test-ssid-security \
+ unit/test-arc4 unit/test-wsc unit/test-eap-mschapv2 \
+- unit/test-eap-sim unit/test-client unit/test-ecc \
+- unit/test-sae
++ unit/test-eap-sim unit/test-ecc unit/test-sae
+
++if CLIENT
++unit_tests += unit/test-client
++endif
+
+ ell_pem_files = cert-ca-key.pem cert-client-key.pem cert-client-key-pkcs8.pem \
+ cert-server-key.pem cert-server-key-pkcs8.pem \
+@@ -404,6 +406,7 @@ unit_test_eap_mschapv2_SOURCES = src/eap-mschapv2.h src/eap-mschapv2.c \
+ unit/test-eap-mschapv2.c
+ unit_test_eap_mschapv2_LDADD = $(ell_ldadd)
+
++if CLIENT
+ unit_test_client_SOURCES = unit/test-client.c \
+ client/adapter.c \
+ client/agent.h client/agent.c \
+@@ -414,6 +417,7 @@ unit_test_client_SOURCES = unit/test-client.c \
+ client/network.h client/network.c \
+ client/properties.h client/properties.c
+ unit_test_client_LDADD = $(ell_ldadd) -lreadline
++endif
+
+ unit_test_ecc_SOURCES = unit/test-ecc.c src/ecc.c src/ecc.h
+ unit_test_ecc_LDADD = $(ell_ldadd)
+--
+2.19.1
+
diff --git a/meta-oe/recipes-connectivity/iwd/iwd/0001-configure.ac-enable-serial-tests-in-automake-to-supp.patch b/meta-oe/recipes-connectivity/iwd/iwd/0001-configure.ac-enable-serial-tests-in-automake-to-supp.patch
new file mode 100644
index 000000000..f9f073056
--- /dev/null
+++ b/meta-oe/recipes-connectivity/iwd/iwd/0001-configure.ac-enable-serial-tests-in-automake-to-supp.patch
@@ -0,0 +1,32 @@
+From 06a21885b89675ba094b573d5af8aa74729111d6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= <martin@geanix.com>
+Date: Thu, 22 Nov 2018 10:03:09 +0100
+Subject: [PATCH] configure.ac: enable serial-tests in automake to support
+ ptest
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [OE-specific]
+Signed-off-by: Martin Hundebøll <martin@geanix.com>
+---
+ configure.ac | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8deb53a..1a5330b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -6,7 +6,8 @@ AC_CONFIG_AUX_DIR(build-aux)
+ AC_CONFIG_MACRO_DIR(build-aux)
+
+ AM_INIT_AUTOMAKE([foreign subdir-objects color-tests silent-rules
+- tar-pax no-dist-gzip dist-xz])
++ tar-pax no-dist-gzip dist-xz
++ serial-tests])
+
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+--
+2.19.1
+
diff --git a/meta-oe/recipes-connectivity/iwd/iwd/run-ptest b/meta-oe/recipes-connectivity/iwd/iwd/run-ptest
new file mode 100644
index 000000000..f2db136b1
--- /dev/null
+++ b/meta-oe/recipes-connectivity/iwd/iwd/run-ptest
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+run_test() {
+ test=$1
+ name=$(basename $1)
+
+ log=$(./$test)
+ res=$(echo $?)
+
+ # check for skipped test
+ case "$log" in
+ *skipping*)
+ echo "SKIP: $name"
+ return
+ ;;
+ esac
+
+ # check for passed / failed
+ if [[ "$res" -eq "0" ]]; then
+ echo "PASS: $name"
+ else
+ echo "FAIL: $name"
+ fi
+}
+
+for path in tests/*; do
+ run_test $path
+done
+
+exit 0
diff --git a/meta-oe/recipes-connectivity/iwd/iwd_0.12.bb b/meta-oe/recipes-connectivity/iwd/iwd_0.12.bb
new file mode 100644
index 000000000..c9aec91ce
--- /dev/null
+++ b/meta-oe/recipes-connectivity/iwd/iwd_0.12.bb
@@ -0,0 +1,43 @@
+DESCRIPTION = "Wireless daemon for Linux"
+LICENSE = "LGPL-2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09"
+
+inherit autotools pkgconfig systemd ptest
+
+DEPENDS = "ell dbus"
+
+SRC_URI = " \
+ git://git.kernel.org/pub/scm/network/wireless/iwd.git \
+ file://0001-configure.ac-enable-serial-tests-in-automake-to-supp.patch \
+ file://0001-Makefile-make-client-unit-test-conditional-on-enable.patch \
+ file://run-ptest \
+"
+SRCREV = "d7609915db4b57229f7dd4c04b4eabcce637872a"
+S = "${WORKDIR}/git"
+
+PACKAGECONFIG ??= "client ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} wired ofono"
+PACKAGECONFIG[client] = "--enable-client,--disable-client,readline"
+PACKAGECONFIG[systemd] = "--enable-systemd-service,--disable-systemd-service,systemd"
+PACKAGECONFIG[wired] = "--enable-wired,--disable-wired"
+PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono"
+
+EXTRA_OECONF += "--enable-external-ell"
+
+do_configure_prepend () {
+ mkdir -p ${S}/build-aux
+}
+
+do_compile_ptest() {
+ oe_runmake buildtest-TESTS
+}
+
+do_install_ptest() {
+ # remove intermediate object files
+ rm -f ${B}/unit/*.o
+ install -D -t ${D}${PTEST_PATH}/tests ${B}/unit/*
+}
+
+# iwd service
+SYSTEMD_SERVICE_${PN} = "iwd.service"
+SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)}"
+FILES_${PN} += "${datadir}/dbus-1/"
--
2.19.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [meta-oe][PATCHv4] iwd: add version 0.12
2018-11-22 14:12 ` [meta-oe][PATCHv4] " Martin Hundebøll
@ 2018-12-01 5:45 ` Khem Raj
0 siblings, 0 replies; 11+ messages in thread
From: Khem Raj @ 2018-12-01 5:45 UTC (permalink / raw)
To: martin; +Cc: openembeded-devel
Hi Martin
I merged an older version of this patch. Can you please send a followup
which addresses the changes up until v4 ?
On Thu, Nov 22, 2018 at 6:13 AM Martin Hundebøll <martin@geanix.com> wrote:
>
> The iwd wireless daemon is an alternative to wpa_supplicant. It is
> controlled using the iwctl command line client (or the dbus interface).
>
> Signed-off-by: Martin Hundebøll <martin@geanix.com>
> ---
>
> Changes since v3:
> - Update patch upstream status to backport
>
> Changes since v2:
> - add patch to make client unit test depend on packageconfig
> - remove split of packages
>
> Changes since v1:
> - add packageconfig for client, ead, and ofono
> - split out packages for iwctl, ead, and iwmon
> - add ptest support
>
> ...ient-unit-test-conditional-on-enable.patch | 59 +++++++++++++++++++
> ...ble-serial-tests-in-automake-to-supp.patch | 32 ++++++++++
> .../recipes-connectivity/iwd/iwd/run-ptest | 30 ++++++++++
> meta-oe/recipes-connectivity/iwd/iwd_0.12.bb | 43 ++++++++++++++
> 4 files changed, 164 insertions(+)
> create mode 100644 meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile-make-client-unit-test-conditional-on-enable.patch
> create mode 100644 meta-oe/recipes-connectivity/iwd/iwd/0001-configure.ac-enable-serial-tests-in-automake-to-supp.patch
> create mode 100644 meta-oe/recipes-connectivity/iwd/iwd/run-ptest
> create mode 100644 meta-oe/recipes-connectivity/iwd/iwd_0.12.bb
>
> diff --git a/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile-make-client-unit-test-conditional-on-enable.patch b/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile-make-client-unit-test-conditional-on-enable.patch
> new file mode 100644
> index 000000000..7a39d05e5
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile-make-client-unit-test-conditional-on-enable.patch
> @@ -0,0 +1,59 @@
> +From b327b775db4e250d3448ab30ce97ca0acfea7603 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= <martin@geanix.com>
> +Date: Thu, 22 Nov 2018 14:31:11 +0100
> +Subject: [PATCH] Makefile: make client unit test conditional on
> + --{enable,disable}-client
> +To: iwd@lists.01.org
> +
> +The iwctl client and its unit test depends on readline. If building on a
> +host without readline installed, default make target succeeds when
> +configured with --disable-client, but the following make check target
> +fails.
> +
> +Fix this by making the test-client target conditional on the
> +--{enable,disable}-client configure flag.
> +
> +Upstream-Status: Backport [c4803d3b12010292d719cc3bcf694def5b6eeee8]
> +Signed-Off-By: Martin Hundebøll <martin@geanix.com>
> +
> +---
> + Makefile.am | 8 ++++++--
> + 1 file changed, 6 insertions(+), 2 deletions(-)
> +
> +diff --git a/Makefile.am b/Makefile.am
> +index db64c38..262e80d 100644
> +--- a/Makefile.am
> ++++ b/Makefile.am
> +@@ -297,9 +297,11 @@ unit_tests = unit/test-cmac-aes \
> + unit/test-crypto unit/test-eapol unit/test-mpdu \
> + unit/test-ie unit/test-ssid-to-utf8 unit/test-ssid-security \
> + unit/test-arc4 unit/test-wsc unit/test-eap-mschapv2 \
> +- unit/test-eap-sim unit/test-client unit/test-ecc \
> +- unit/test-sae
> ++ unit/test-eap-sim unit/test-ecc unit/test-sae
> +
> ++if CLIENT
> ++unit_tests += unit/test-client
> ++endif
> +
> + ell_pem_files = cert-ca-key.pem cert-client-key.pem cert-client-key-pkcs8.pem \
> + cert-server-key.pem cert-server-key-pkcs8.pem \
> +@@ -404,6 +406,7 @@ unit_test_eap_mschapv2_SOURCES = src/eap-mschapv2.h src/eap-mschapv2.c \
> + unit/test-eap-mschapv2.c
> + unit_test_eap_mschapv2_LDADD = $(ell_ldadd)
> +
> ++if CLIENT
> + unit_test_client_SOURCES = unit/test-client.c \
> + client/adapter.c \
> + client/agent.h client/agent.c \
> +@@ -414,6 +417,7 @@ unit_test_client_SOURCES = unit/test-client.c \
> + client/network.h client/network.c \
> + client/properties.h client/properties.c
> + unit_test_client_LDADD = $(ell_ldadd) -lreadline
> ++endif
> +
> + unit_test_ecc_SOURCES = unit/test-ecc.c src/ecc.c src/ecc.h
> + unit_test_ecc_LDADD = $(ell_ldadd)
> +--
> +2.19.1
> +
> diff --git a/meta-oe/recipes-connectivity/iwd/iwd/0001-configure.ac-enable-serial-tests-in-automake-to-supp.patch b/meta-oe/recipes-connectivity/iwd/iwd/0001-configure.ac-enable-serial-tests-in-automake-to-supp.patch
> new file mode 100644
> index 000000000..f9f073056
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/iwd/iwd/0001-configure.ac-enable-serial-tests-in-automake-to-supp.patch
> @@ -0,0 +1,32 @@
> +From 06a21885b89675ba094b573d5af8aa74729111d6 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= <martin@geanix.com>
> +Date: Thu, 22 Nov 2018 10:03:09 +0100
> +Subject: [PATCH] configure.ac: enable serial-tests in automake to support
> + ptest
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +Upstream-Status: Inappropriate [OE-specific]
> +Signed-off-by: Martin Hundebøll <martin@geanix.com>
> +---
> + configure.ac | 3 ++-
> + 1 file changed, 2 insertions(+), 1 deletion(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index 8deb53a..1a5330b 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -6,7 +6,8 @@ AC_CONFIG_AUX_DIR(build-aux)
> + AC_CONFIG_MACRO_DIR(build-aux)
> +
> + AM_INIT_AUTOMAKE([foreign subdir-objects color-tests silent-rules
> +- tar-pax no-dist-gzip dist-xz])
> ++ tar-pax no-dist-gzip dist-xz
> ++ serial-tests])
> +
> + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
> +
> +--
> +2.19.1
> +
> diff --git a/meta-oe/recipes-connectivity/iwd/iwd/run-ptest b/meta-oe/recipes-connectivity/iwd/iwd/run-ptest
> new file mode 100644
> index 000000000..f2db136b1
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/iwd/iwd/run-ptest
> @@ -0,0 +1,30 @@
> +#!/bin/sh
> +
> +run_test() {
> + test=$1
> + name=$(basename $1)
> +
> + log=$(./$test)
> + res=$(echo $?)
> +
> + # check for skipped test
> + case "$log" in
> + *skipping*)
> + echo "SKIP: $name"
> + return
> + ;;
> + esac
> +
> + # check for passed / failed
> + if [[ "$res" -eq "0" ]]; then
> + echo "PASS: $name"
> + else
> + echo "FAIL: $name"
> + fi
> +}
> +
> +for path in tests/*; do
> + run_test $path
> +done
> +
> +exit 0
> diff --git a/meta-oe/recipes-connectivity/iwd/iwd_0.12.bb b/meta-oe/recipes-connectivity/iwd/iwd_0.12.bb
> new file mode 100644
> index 000000000..c9aec91ce
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/iwd/iwd_0.12.bb
> @@ -0,0 +1,43 @@
> +DESCRIPTION = "Wireless daemon for Linux"
> +LICENSE = "LGPL-2.1"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09"
> +
> +inherit autotools pkgconfig systemd ptest
> +
> +DEPENDS = "ell dbus"
> +
> +SRC_URI = " \
> + git://git.kernel.org/pub/scm/network/wireless/iwd.git \
> + file://0001-configure.ac-enable-serial-tests-in-automake-to-supp.patch \
> + file://0001-Makefile-make-client-unit-test-conditional-on-enable.patch \
> + file://run-ptest \
> +"
> +SRCREV = "d7609915db4b57229f7dd4c04b4eabcce637872a"
> +S = "${WORKDIR}/git"
> +
> +PACKAGECONFIG ??= "client ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} wired ofono"
> +PACKAGECONFIG[client] = "--enable-client,--disable-client,readline"
> +PACKAGECONFIG[systemd] = "--enable-systemd-service,--disable-systemd-service,systemd"
> +PACKAGECONFIG[wired] = "--enable-wired,--disable-wired"
> +PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono"
> +
> +EXTRA_OECONF += "--enable-external-ell"
> +
> +do_configure_prepend () {
> + mkdir -p ${S}/build-aux
> +}
> +
> +do_compile_ptest() {
> + oe_runmake buildtest-TESTS
> +}
> +
> +do_install_ptest() {
> + # remove intermediate object files
> + rm -f ${B}/unit/*.o
> + install -D -t ${D}${PTEST_PATH}/tests ${B}/unit/*
> +}
> +
> +# iwd service
> +SYSTEMD_SERVICE_${PN} = "iwd.service"
> +SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)}"
> +FILES_${PN} += "${datadir}/dbus-1/"
> --
> 2.19.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2018-12-01 5:46 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-21 8:10 [meta-oe][PATCH 1/3] ell: remove unused patch Martin Hundebøll
2018-11-21 8:10 ` [meta-oe][PATCH 2/3] ell: update to 0.15 Martin Hundebøll
2018-11-21 8:10 ` [meta-oe][PATCH 3/3] iwd: add version 0.12 Martin Hundebøll
2018-11-21 10:35 ` Peter Kjellerstedt
2018-11-21 11:15 ` Burton, Ross
2018-11-22 12:48 ` [meta-oe][PATCHv2] " Martin Hundebøll
2018-11-22 13:20 ` Burton, Ross
2018-11-22 13:51 ` Martin Hundebøll
2018-11-22 13:54 ` Martin Hundebøll
2018-11-22 14:12 ` [meta-oe][PATCHv4] " Martin Hundebøll
2018-12-01 5:45 ` Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.