diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2020-02-25 20:36:15 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-02-26 07:17:58 -0800 |
commit | e92cbff942b9ef6c50d7a7cbfb7ee4d2be656e2e (patch) | |
tree | 72032d9c3182d18a055536581ff2966791a35e81 | |
parent | c66896149c8b6bea524a8b518ea8b704ce7a9fd0 (diff) | |
download | meta-openembedded-contrib-e92cbff942b9ef6c50d7a7cbfb7ee4d2be656e2e.tar.gz |
c-ares: move from meta-networking to meta-oe
* nodejs from meta-oe depends on this since:
commit 76dd3dac1f1e67a5c44ad732b8e827cc36ded641
Author: André Draszik <git@andred.net>
Date: Tue Oct 29 16:42:24 2019 +0000
nodejs: allow use of system c-ares (and make default)
Use system c-ares via PACKAGECONFIG by default. So far,
nodejs had been built using its embedded copy of c-ares,
which we generally try to avoid, for the known reasons
(independent updates, cve & license checks, etc).
Notes:
* otherwise nodejs uses its bundled version of c-ares
* the PACKAGECONFIG variable is 'ares' so as to be in
line with other uses of this (wget & curl recipes in
OE core)
Signed-off-by: André Draszik <git@andred.net>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch (renamed from meta-networking/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-support/c-ares/c-ares_1.15.0.bb (renamed from meta-networking/recipes-support/c-ares/c-ares_1.15.0.bb) | 0 |
4 files changed, 2 insertions, 2 deletions
diff --git a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb index fa9bf2db52..103c99bb17 100644 --- a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb +++ b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb @@ -107,7 +107,7 @@ RDEPENDS_packagegroup-meta-networking-support = "\ tunctl dovecot ipvsadm stunnel chrony spice-protocol \ usbredir ntop wireshark tnftp lksctp-tools \ cim-schema-docs cim-schema-final cim-schema-exper \ - libmemcached smcroute libtevent ipcalc c-ares uftp \ + libmemcached smcroute libtevent ipcalc uftp \ ntimed linux-atm ssmtp openvpn rdma-core \ iftop aoetools tcpslice tcpdump libtalloc memcached nuttcp netcat \ netcat-openbsd fetchmail yp-tools ypbind-mt yp-tools \ diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 0bda9469f4..d09653901c 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -238,7 +238,7 @@ NE10_armv7a = "ne10" NE10_armv7ve = "ne10" RDEPENDS_packagegroup-meta-oe-support ="\ - anthy asio atop augeas avro-c bdwgc frame grail \ + anthy asio atop augeas avro-c bdwgc frame grail c-ares \ ccid ceres-solver ckermit cpprest ctapi-common daemonize \ daemontools debsums devmem2 dfu-util dfu-util-native digitemp \ dstat eject enca epeg espeak fbset fbset-modes \ diff --git a/meta-networking/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch b/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch index 8cadb2bbab..8cadb2bbab 100644 --- a/meta-networking/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch +++ b/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch diff --git a/meta-networking/recipes-support/c-ares/c-ares_1.15.0.bb b/meta-oe/recipes-support/c-ares/c-ares_1.15.0.bb index d437529dc4..d437529dc4 100644 --- a/meta-networking/recipes-support/c-ares/c-ares_1.15.0.bb +++ b/meta-oe/recipes-support/c-ares/c-ares_1.15.0.bb |