summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Barker <paul@paulbarker.me.uk>2013-11-20 16:41:09 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-24 12:25:32 +0000
commit9339da20dba6e6c7867b4fb33d0eb7693f5784c1 (patch)
tree1ddd1aa3ad73a816877daa9a563da4a8488b37e5
parent4fe0af5e60ce37857c1daed80d22a8c1142a0b27 (diff)
downloadpoky-9339da20dba6e6c7867b4fb33d0eb7693f5784c1.tar.gz
opkg: Add PACKAGECONFIG options
Instead of hardcoding EXTRA_OECONF to disable things, we add PACKAGECONFIG options for gpg, curl, ssl-curl, openssl, sha256 and pathfinder. By default all these options are disabled. (From OE-Core rev: 7d227c5764d71f21432a6a56dc4616c5b917c42c) Signed-off-by: Paul Barker <paul@paulbarker.me.uk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/opkg/opkg.inc17
1 files changed, 10 insertions, 7 deletions
diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
index 6bfdbd78b6..416fb549f7 100644
--- a/meta/recipes-devtools/opkg/opkg.inc
+++ b/meta/recipes-devtools/opkg/opkg.inc
@@ -26,15 +26,18 @@ python () {
26target_localstatedir := "${localstatedir}" 26target_localstatedir := "${localstatedir}"
27OPKGLIBDIR = "${target_localstatedir}/lib" 27OPKGLIBDIR = "${target_localstatedir}/lib"
28 28
29SHARED_EXTRA_OECONF = "\ 29PACKAGECONFIG ??= ""
30
31PACKAGECONFIG[gpg] = "--enable-gpg,--disable-gpg,gpgme libgpg-error"
32PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl"
33PACKAGECONFIG[ssl-curl] = "--enable-ssl-curl,--disable-ssl-curl,curl openssl"
34PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl"
35PACKAGECONFIG[sha256] = "--enable-sha256,--disable-sha256"
36PACKAGECONFIG[pathfinder] = "--enable-pathfinder,--disable-pathfinder,pathfinder"
37
38EXTRA_OECONF = "\
30 --with-opkglibdir=${OPKGLIBDIR} \ 39 --with-opkglibdir=${OPKGLIBDIR} \
31 --disable-gpg \
32 --disable-curl \
33 --disable-openssl \
34" 40"
35EXTRA_OECONF_class-target = "${SHARED_EXTRA_OECONF} --disable-ssl-curl --disable-sha256"
36EXTRA_OECONF_class-native = "${SHARED_EXTRA_OECONF}"
37EXTRA_OECONF_class-nativesdk = "${SHARED_EXTRA_OECONF}"
38 41
39PROVIDES += "virtual/update-alternatives" 42PROVIDES += "virtual/update-alternatives"
40RPROVIDES_update-alternatives-cworth += "update-alternatives" 43RPROVIDES_update-alternatives-cworth += "update-alternatives"