From 55faa488b84ecd744b3d65200e44ed4ce0d91c67 Mon Sep 17 00:00:00 2001 From: Ismo Puustinen Date: Mon, 27 Mar 2017 15:14:45 +0300 Subject: [PATCH 1/2] python3: make readline, gdbm, and db support conditional. The three libraries' (readline, gdbm, and db) licenses belong to the GPLv3 family. Add them to to PACKAGECONFIG so they can be switched off if the licensing doesn't allow using them. Python build system autodetects the dependencies but doesn't allow them to be explicitly disabled, so just deal with the dependencies. The defaults in PACKAGECONFIG are the same as before, so there should be no change to current users. Signed-off-by: Ismo Puustinen --- .../recipes-devtools/python/python3_%.bbappend | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 meta-refkit/recipes-devtools/python/python3_%.bbappend diff --git a/meta-refkit/recipes-devtools/python/python3_%.bbappend b/meta-refkit/recipes-devtools/python/python3_%.bbappend new file mode 100644 index 0000000000..90d258eb28 --- /dev/null +++ b/meta-refkit/recipes-devtools/python/python3_%.bbappend @@ -0,0 +1,13 @@ +DEPENDS_remove = "readline gdbm db" + +PACKAGECONFIG ??= "readline gdbm db" +PACKAGECONFIG[readline] = ",,readline" +PACKAGECONFIG[gdbm] = ",,gdbm" +PACKAGECONFIG[db] = ",,db" + +RRECOMMENDS_${PN}-core = "${@bb.utils.contains('PACKAGECONFIG', 'readline', '${PN}-readline', '', d)}" + +# if readline is not there, don't create python3-readline package +PACKAGES_remove += "${@bb.utils.contains('PACKAGECONFIG', 'readline', '', '${PN}-readline', d)}" +PROVIDES_remove += "${@bb.utils.contains('PACKAGECONFIG', 'readline', '', '${PN}-readline', d)}" +RDEPENDS_${PN}-modules_remove += "${@bb.utils.contains('PACKAGECONFIG', 'readline', '', '${PN}-readline', d)}" From 8e76c4e567ed5c1ab779fc83358446a2e9284469 Mon Sep 17 00:00:00 2001 From: Ismo Puustinen Date: Mon, 27 Mar 2017 15:45:38 +0300 Subject: [PATCH 2/2] config: remove Python3 configuration options. Signed-off-by: Ismo Puustinen --- meta-refkit/conf/distro/refkit.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-refkit/conf/distro/refkit.conf b/meta-refkit/conf/distro/refkit.conf index 4f6acf2dce..7d66bfa2fd 100644 --- a/meta-refkit/conf/distro/refkit.conf +++ b/meta-refkit/conf/distro/refkit.conf @@ -71,6 +71,9 @@ PACKAGECONFIG_remove_pn-gstreamer1.0-plugins-base = "pango" PACKAGECONFIG_remove_pn-pulseaudio = "avahi" +# leave out readline, gdbm, and db +PACKAGECONFIG_pn-python3 = "" + # since we have OpenCL support, turn it on PACKAGECONFIG_append_pn-opencv = " opencl" PREFERRED_PROVIDER_virtual/opencl-headers = "opencl-headers"