[oe] [meta-oe][meta-networking][PATCH] c-ares: move from meta-networking to meta-oe

Martin Jansa martin.jansa at gmail.com
Tue Feb 25 19:36:15 UTC 2020


* nodejs from meta-oe depends on this since:
  commit 76dd3dac1f1e67a5c44ad732b8e827cc36ded641
  Author: André Draszik <git at 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 at andred.net>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 .../recipes-core/packagegroups/packagegroup-meta-networking.bb  | 2 +-
 meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb      | 2 +-
 .../c-ares/c-ares/cmake-install-libcares.pc.patch               | 0
 .../recipes-support/c-ares/c-ares_1.15.0.bb                     | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename {meta-networking => meta-oe}/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch (100%)
 rename {meta-networking => meta-oe}/recipes-support/c-ares/c-ares_1.15.0.bb (100%)

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 d2e8ea4af8..4ae71b5c7b 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
similarity index 100%
rename from meta-networking/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch
rename to 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
similarity index 100%
rename from meta-networking/recipes-support/c-ares/c-ares_1.15.0.bb
rename to meta-oe/recipes-support/c-ares/c-ares_1.15.0.bb
-- 
2.20.1



More information about the Openembedded-devel mailing list