diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2019-04-15 22:07:51 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-23 23:30:20 +0100 |
| commit | 4f9318adae792b67f26026cb3173e1b74329f535 (patch) | |
| tree | 4171ae2b5246fe3778c2f70b13dbb5d67f9d9063 /meta | |
| parent | ac45fd87935d25391c2d56a66f5ddfef23c00098 (diff) | |
| download | poky-4f9318adae792b67f26026cb3173e1b74329f535.tar.gz | |
connman: add PACKAGECONFIG for nfc, fix MACHINE_ARCH signature when l2tp is enabled
* import 2 fixes from LuneOS
* with l2tp PACKAGECONFIG enabled connman depends on MACHINE_ARCH xl2tpd:
=== Comparing signatures for task do_package_write_ipk.sigdata between hammerhead and mako ===
ERROR: connman different signature for task do_package_write_ipk.sigdata between hammerhead and mako
NOTE: Starting bitbake server...
Hash for dependent task xl2tpd/xl2tpd_git.bb.do_packagedata changed from 6312d5711b5c2c1a85ee235d09bf37a8ec00f7ad9e7248c087bb83ef1d5bd078 to c0d3ef52b37bda945d8b2a015980ddb8fe7b4b3dca3d82d71a84176cc5125142
Unable to find matching sigdata for /OE/build/luneos-master/webos-ports/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb.do_packagedata with hashes 6312d5711b5c2c1a85ee235d09bf37a8ec00f7ad9e7248c087bb83ef1d5bd078 or c0d3ef52b37bda945d8b2a015980ddb8fe7b4b3dca3d82d71a84176cc5125142
(From OE-Core rev: ba89fea0e443e1492000b7114f32edf15819a151)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/conf/layer.conf | 1 | ||||
| -rw-r--r-- | meta/recipes-connectivity/connman/connman.inc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index 9d63b5b24d..6590e80700 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf | |||
| @@ -76,6 +76,7 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ | |||
| 76 | weston->weston-conf \ | 76 | weston->weston-conf \ |
| 77 | weston-init->weston \ | 77 | weston-init->weston \ |
| 78 | weston-init->kbd \ | 78 | weston-init->kbd \ |
| 79 | connman->xl2tpd \ | ||
| 79 | " | 80 | " |
| 80 | 81 | ||
| 81 | # Avoid adding bison-native to the sysroot without a specific | 82 | # Avoid adding bison-native to the sysroot without a specific |
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index 0a117e44a4..ae67079c71 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc | |||
| @@ -53,6 +53,7 @@ PACKAGECONFIG[pptp] = "--enable-pptp --with-pptp=${sbindir}/pptp,--disable-pptp, | |||
| 53 | PACKAGECONFIG[wispr] = "--enable-wispr,--disable-wispr,gnutls," | 53 | PACKAGECONFIG[wispr] = "--enable-wispr,--disable-wispr,gnutls," |
| 54 | PACKAGECONFIG[nftables] = "--with-firewall=nftables ,,libmnl libnftnl,,kernel-module-nf-tables-ipv4 kernel-module-nft-chain-nat-ipv4 kernel-module-nft-chain-route-ipv4 kernel-module-nft-meta kernel-module-nft-masq-ipv4 kernel-module-nft-nat" | 54 | PACKAGECONFIG[nftables] = "--with-firewall=nftables ,,libmnl libnftnl,,kernel-module-nf-tables-ipv4 kernel-module-nft-chain-nat-ipv4 kernel-module-nft-chain-route-ipv4 kernel-module-nft-meta kernel-module-nft-masq-ipv4 kernel-module-nft-nat" |
| 55 | PACKAGECONFIG[iptables] = "--with-firewall=iptables ,,iptables,iptables" | 55 | PACKAGECONFIG[iptables] = "--with-firewall=iptables ,,iptables,iptables" |
| 56 | PACKAGECONFIG[nfc] = "--enable-neard, --disable-neard, neard, neard" | ||
| 56 | 57 | ||
| 57 | INITSCRIPT_NAME = "connman" | 58 | INITSCRIPT_NAME = "connman" |
| 58 | INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ." | 59 | INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ." |