All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] usbutils: Split out lsusb.py
@ 2018-02-05 12:25 Martin Hundebøll
  2018-02-05 12:25 ` [PATCH] bind: add packageconfig for python-support Martin Hundebøll
  0 siblings, 1 reply; 7+ messages in thread
From: Martin Hundebøll @ 2018-02-05 12:25 UTC (permalink / raw)
  To: OE-core; +Cc: Alexander Kanavin

The pretty-printing "lsusb.py" script shipped by usbutils is currently
useless, as it doesn't runtime depend on python, and has unversioned
python in the shebang.

Avoid adding a python dependency to current configurations with usbutils
buy splitting lsusb.py into a usbutils-python package, and make it
runtime depend on python3-core.

Make the script usable by replacing the shebang with a direct call to
${bindir}/python3.

Signed-off-by: Martin Hundebøll <mnhu@prevas.dk>
---
 meta/recipes-bsp/usbutils/usbutils_009.bb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/meta/recipes-bsp/usbutils/usbutils_009.bb b/meta/recipes-bsp/usbutils/usbutils_009.bb
index 30522fd0f1..a7cbe45406 100644
--- a/meta/recipes-bsp/usbutils/usbutils_009.bb
+++ b/meta/recipes-bsp/usbutils/usbutils_009.bb
@@ -22,3 +22,11 @@ FILES_${PN}-dev += "${datadir}/pkgconfig"
 
 RRECOMMENDS_${PN} = "udev-hwdb"
 RDEPENDS_${PN}-ptest = "libboost-system libboost-thread"
+
+PACKAGE_BEFORE_PN =+ "${PN}-python"
+FILES_${PN}-python += "${bindir}/lsusb.py"
+RDEPENDS_${PN}-python = "python3-core"
+
+do_install_append() {
+    sed -i -E '1s,#!.+python,#!${bindir}/python3,' ${D}${bindir}/lsusb.py
+}
-- 
2.16.1



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH] bind: add packageconfig for python-support
  2018-02-05 12:25 [PATCH] usbutils: Split out lsusb.py Martin Hundebøll
@ 2018-02-05 12:25 ` Martin Hundebøll
  2018-02-05 12:49   ` Richard Purdie
  2018-02-13  6:21   ` Martin Hundebøll
  0 siblings, 2 replies; 7+ messages in thread
From: Martin Hundebøll @ 2018-02-05 12:25 UTC (permalink / raw)
  To: OE-core; +Cc: Armin Kuster

Break the hard runtime dependency on python3-core by adding a
(default-on) packageconfig option for python.

Signed-off-by: Martin Hundebøll <mnhu@prevas.dk>
---
 meta/recipes-connectivity/bind/bind_9.10.6.bb | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-connectivity/bind/bind_9.10.6.bb b/meta/recipes-connectivity/bind/bind_9.10.6.bb
index 8b8835ba80..2ec7ab44f0 100644
--- a/meta/recipes-connectivity/bind/bind_9.10.6.bb
+++ b/meta/recipes-connectivity/bind/bind_9.10.6.bb
@@ -38,16 +38,19 @@ EXTRA_OECONF = " ${ENABLE_IPV6} --with-libtool --enable-threads \
                  --with-openssl=${STAGING_LIBDIR}/.. \
                "
 
-inherit autotools update-rc.d systemd useradd pkgconfig python3-dir
+inherit autotools update-rc.d systemd useradd pkgconfig
 
 export PYTHON_SITEPACKAGES_DIR
 
 # PACKAGECONFIGs readline and libedit should NOT be set at same time
-PACKAGECONFIG ?= "readline"
+PACKAGECONFIG ?= "readline python"
 PACKAGECONFIG[httpstats] = "--with-libxml2,--without-libxml2,libxml2"
 PACKAGECONFIG[readline] = "--with-readline=-lreadline,,readline"
 PACKAGECONFIG[libedit] = "--with-readline=-ledit,,libedit"
 PACKAGECONFIG[urandom] = "--with-randomdev=/dev/urandom,--with-randomdev=/dev/random,,"
+PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python3-core,python3-core"
+
+inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)}
 
 USERADD_PACKAGES = "${PN}"
 USERADD_PARAM_${PN} = "--system --home ${localstatedir}/cache/bind --no-create-home \
@@ -60,7 +63,6 @@ SYSTEMD_SERVICE_${PN} = "named.service"
 
 PARALLEL_MAKE = ""
 
-RDEPENDS_${PN} = "python3-core"
 RDEPENDS_${PN}-dev = ""
 
 PACKAGE_BEFORE_PN += "${PN}-utils"
@@ -88,7 +90,11 @@ do_install_append() {
 	install -d "${D}${sysconfdir}/init.d"
 	install -m 644 ${S}/conf/* "${D}${sysconfdir}/bind/"
 	install -m 755 "${S}/init.d" "${D}${sysconfdir}/init.d/bind"
-	sed -i -e '1s,#!.*python3,#! /usr/bin/python3,' ${D}${sbindir}/dnssec-coverage ${D}${sbindir}/dnssec-checkds
+
+	if [ -n "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}" ]; then
+		sed -i -e '1s,#!.*python3,#! /usr/bin/python3,' \
+			${D}${sbindir}/dnssec-coverage ${D}${sbindir}/dnssec-checkds
+	fi
 
 	# Install systemd related files
 	install -d ${D}${sbindir}
-- 
2.16.1



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH] bind: add packageconfig for python-support
  2018-02-05 12:25 ` [PATCH] bind: add packageconfig for python-support Martin Hundebøll
@ 2018-02-05 12:49   ` Richard Purdie
  2018-02-05 12:51     ` Martin Hundebøll
  2018-02-13  6:21   ` Martin Hundebøll
  1 sibling, 1 reply; 7+ messages in thread
From: Richard Purdie @ 2018-02-05 12:49 UTC (permalink / raw)
  To: Martin Hundebøll, OE-core; +Cc: Armin Kuster

On Mon, 2018-02-05 at 13:25 +0100, Martin Hundebøll wrote:
> Break the hard runtime dependency on python3-core by adding a
> (default-on) packageconfig option for python.
> 
> Signed-off-by: Martin Hundebøll <mnhu@prevas.dk>
> ---
>  meta/recipes-connectivity/bind/bind_9.10.6.bb | 14 ++++++++++----
>  1 file changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/meta/recipes-connectivity/bind/bind_9.10.6.bb
> b/meta/recipes-connectivity/bind/bind_9.10.6.bb
> index 8b8835ba80..2ec7ab44f0 100644
> --- a/meta/recipes-connectivity/bind/bind_9.10.6.bb
> +++ b/meta/recipes-connectivity/bind/bind_9.10.6.bb
> @@ -38,16 +38,19 @@ EXTRA_OECONF = " ${ENABLE_IPV6} --with-libtool --
> enable-threads \
>                   --with-openssl=${STAGING_LIBDIR}/.. \
>                 "
>  
> -inherit autotools update-rc.d systemd useradd pkgconfig python3-dir
> +inherit autotools update-rc.d systemd useradd pkgconfig
>  
>  export PYTHON_SITEPACKAGES_DIR
>  
>  # PACKAGECONFIGs readline and libedit should NOT be set at same time
> -PACKAGECONFIG ?= "readline"
> +PACKAGECONFIG ?= "readline python"
>  PACKAGECONFIG[httpstats] = "--with-libxml2,--without-
> libxml2,libxml2"
>  PACKAGECONFIG[readline] = "--with-readline=-lreadline,,readline"
>  PACKAGECONFIG[libedit] = "--with-readline=-ledit,,libedit"
>  PACKAGECONFIG[urandom] = "--with-randomdev=/dev/urandom,--with-
> randomdev=/dev/random,,"
> +PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-
> python,python3-core,python3-core"
> +
> +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python',
> 'python3native', '', d)}
>  
>  USERADD_PACKAGES = "${PN}"
>  USERADD_PARAM_${PN} = "--system --home ${localstatedir}/cache/bind
> --no-create-home \
> @@ -60,7 +63,6 @@ SYSTEMD_SERVICE_${PN} = "named.service"
>  
>  PARALLEL_MAKE = ""
>  
> -RDEPENDS_${PN} = "python3-core"
>  RDEPENDS_${PN}-dev = ""
>  
>  PACKAGE_BEFORE_PN += "${PN}-utils"
> @@ -88,7 +90,11 @@ do_install_append() {
>  	install -d "${D}${sysconfdir}/init.d"
>  	install -m 644 ${S}/conf/* "${D}${sysconfdir}/bind/"
>  	install -m 755 "${S}/init.d" "${D}${sysconfdir}/init.d/bind"
> -	sed -i -e '1s,#!.*python3,#! /usr/bin/python3,'
> ${D}${sbindir}/dnssec-coverage ${D}${sbindir}/dnssec-checkds
> +
> +	if [ -n "${@bb.utils.contains('PACKAGECONFIG', 'python',
> 'python', '', d)}" ]; then
> +		sed -i -e '1s,#!.*python3,#! /usr/bin/python3,' \
> +			${D}${sbindir}/dnssec-coverage
> ${D}${sbindir}/dnssec-checkds
> +	fi

Rather than having a broken file, shouldn't it be deleted in the "no
python" case?

Cheers,

Richard
 





^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] bind: add packageconfig for python-support
  2018-02-05 12:49   ` Richard Purdie
@ 2018-02-05 12:51     ` Martin Hundebøll
  0 siblings, 0 replies; 7+ messages in thread
From: Martin Hundebøll @ 2018-02-05 12:51 UTC (permalink / raw)
  To: Richard Purdie, OE-core; +Cc: Armin Kuster



On 2018-02-05 13:49, Richard Purdie wrote:
> On Mon, 2018-02-05 at 13:25 +0100, Martin Hundebøll wrote:
>> Break the hard runtime dependency on python3-core by adding a
>> (default-on) packageconfig option for python.
>>
>> Signed-off-by: Martin Hundebøll <mnhu@prevas.dk>
>> ---
>>   meta/recipes-connectivity/bind/bind_9.10.6.bb | 14 ++++++++++----
>>   1 file changed, 10 insertions(+), 4 deletions(-)
>>
>> diff --git a/meta/recipes-connectivity/bind/bind_9.10.6.bb
>> b/meta/recipes-connectivity/bind/bind_9.10.6.bb
>> index 8b8835ba80..2ec7ab44f0 100644
>> --- a/meta/recipes-connectivity/bind/bind_9.10.6.bb
>> +++ b/meta/recipes-connectivity/bind/bind_9.10.6.bb
>> @@ -38,16 +38,19 @@ EXTRA_OECONF = " ${ENABLE_IPV6} --with-libtool --
>> enable-threads \
>>                    --with-openssl=${STAGING_LIBDIR}/.. \
>>                  "
>>   
>> -inherit autotools update-rc.d systemd useradd pkgconfig python3-dir
>> +inherit autotools update-rc.d systemd useradd pkgconfig
>>   
>>   export PYTHON_SITEPACKAGES_DIR
>>   
>>   # PACKAGECONFIGs readline and libedit should NOT be set at same time
>> -PACKAGECONFIG ?= "readline"
>> +PACKAGECONFIG ?= "readline python"
>>   PACKAGECONFIG[httpstats] = "--with-libxml2,--without-
>> libxml2,libxml2"
>>   PACKAGECONFIG[readline] = "--with-readline=-lreadline,,readline"
>>   PACKAGECONFIG[libedit] = "--with-readline=-ledit,,libedit"
>>   PACKAGECONFIG[urandom] = "--with-randomdev=/dev/urandom,--with-
>> randomdev=/dev/random,,"
>> +PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-
>> python,python3-core,python3-core"
>> +
>> +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python',
>> 'python3native', '', d)}
>>   
>>   USERADD_PACKAGES = "${PN}"
>>   USERADD_PARAM_${PN} = "--system --home ${localstatedir}/cache/bind
>> --no-create-home \
>> @@ -60,7 +63,6 @@ SYSTEMD_SERVICE_${PN} = "named.service"
>>   
>>   PARALLEL_MAKE = ""
>>   
>> -RDEPENDS_${PN} = "python3-core"
>>   RDEPENDS_${PN}-dev = ""
>>   
>>   PACKAGE_BEFORE_PN += "${PN}-utils"
>> @@ -88,7 +90,11 @@ do_install_append() {
>>   	install -d "${D}${sysconfdir}/init.d"
>>   	install -m 644 ${S}/conf/* "${D}${sysconfdir}/bind/"
>>   	install -m 755 "${S}/init.d" "${D}${sysconfdir}/init.d/bind"
>> -	sed -i -e '1s,#!.*python3,#! /usr/bin/python3,'
>> ${D}${sbindir}/dnssec-coverage ${D}${sbindir}/dnssec-checkds
>> +
>> +	if [ -n "${@bb.utils.contains('PACKAGECONFIG', 'python',
>> 'python', '', d)}" ]; then
>> +		sed -i -e '1s,#!.*python3,#! /usr/bin/python3,' \
>> +			${D}${sbindir}/dnssec-coverage
>> ${D}${sbindir}/dnssec-checkds
>> +	fi
> 
> Rather than having a broken file, shouldn't it be deleted in the "no
> python" case?

Bind is clever enough to avoid installing it in that case...

// Martin


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] bind: add packageconfig for python-support
  2018-02-05 12:25 ` [PATCH] bind: add packageconfig for python-support Martin Hundebøll
  2018-02-05 12:49   ` Richard Purdie
@ 2018-02-13  6:21   ` Martin Hundebøll
  2018-02-21 14:22     ` Burton, Ross
  1 sibling, 1 reply; 7+ messages in thread
From: Martin Hundebøll @ 2018-02-13  6:21 UTC (permalink / raw)
  To: OE-core; +Cc: Armin Kuster

Ping

On 2018-02-05 13:25, Martin Hundebøll wrote:
> Break the hard runtime dependency on python3-core by adding a
> (default-on) packageconfig option for python.
> 
> Signed-off-by: Martin Hundebøll <mnhu@prevas.dk>
> ---
>   meta/recipes-connectivity/bind/bind_9.10.6.bb | 14 ++++++++++----
>   1 file changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/meta/recipes-connectivity/bind/bind_9.10.6.bb b/meta/recipes-connectivity/bind/bind_9.10.6.bb
> index 8b8835ba80..2ec7ab44f0 100644
> --- a/meta/recipes-connectivity/bind/bind_9.10.6.bb
> +++ b/meta/recipes-connectivity/bind/bind_9.10.6.bb
> @@ -38,16 +38,19 @@ EXTRA_OECONF = " ${ENABLE_IPV6} --with-libtool --enable-threads \
>                    --with-openssl=${STAGING_LIBDIR}/.. \
>                  "
>   
> -inherit autotools update-rc.d systemd useradd pkgconfig python3-dir
> +inherit autotools update-rc.d systemd useradd pkgconfig
>   
>   export PYTHON_SITEPACKAGES_DIR
>   
>   # PACKAGECONFIGs readline and libedit should NOT be set at same time
> -PACKAGECONFIG ?= "readline"
> +PACKAGECONFIG ?= "readline python"
>   PACKAGECONFIG[httpstats] = "--with-libxml2,--without-libxml2,libxml2"
>   PACKAGECONFIG[readline] = "--with-readline=-lreadline,,readline"
>   PACKAGECONFIG[libedit] = "--with-readline=-ledit,,libedit"
>   PACKAGECONFIG[urandom] = "--with-randomdev=/dev/urandom,--with-randomdev=/dev/random,,"
> +PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python3-core,python3-core"
> +
> +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)}
>   
>   USERADD_PACKAGES = "${PN}"
>   USERADD_PARAM_${PN} = "--system --home ${localstatedir}/cache/bind --no-create-home \
> @@ -60,7 +63,6 @@ SYSTEMD_SERVICE_${PN} = "named.service"
>   
>   PARALLEL_MAKE = ""
>   
> -RDEPENDS_${PN} = "python3-core"
>   RDEPENDS_${PN}-dev = ""
>   
>   PACKAGE_BEFORE_PN += "${PN}-utils"
> @@ -88,7 +90,11 @@ do_install_append() {
>   	install -d "${D}${sysconfdir}/init.d"
>   	install -m 644 ${S}/conf/* "${D}${sysconfdir}/bind/"
>   	install -m 755 "${S}/init.d" "${D}${sysconfdir}/init.d/bind"
> -	sed -i -e '1s,#!.*python3,#! /usr/bin/python3,' ${D}${sbindir}/dnssec-coverage ${D}${sbindir}/dnssec-checkds
> +
> +	if [ -n "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}" ]; then
> +		sed -i -e '1s,#!.*python3,#! /usr/bin/python3,' \
> +			${D}${sbindir}/dnssec-coverage ${D}${sbindir}/dnssec-checkds
> +	fi
>   
>   	# Install systemd related files
>   	install -d ${D}${sbindir}
> 


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] bind: add packageconfig for python-support
  2018-02-13  6:21   ` Martin Hundebøll
@ 2018-02-21 14:22     ` Burton, Ross
  2018-02-22 13:40       ` [PATCH v2] " Martin Hundebøll
  0 siblings, 1 reply; 7+ messages in thread
From: Burton, Ross @ 2018-02-21 14:22 UTC (permalink / raw)
  To: Martin Hundebøll; +Cc: Armin Kuster, OE-core

[-- Attachment #1: Type: text/plain, Size: 3341 bytes --]

Did you test this?

+PACKAGECONFIG[python] = "--with-python=${PYTHON},--
without-python,python3-core,python3-core"

python3-core isn't a recipe so if Python is enabled:

ERROR: Nothing PROVIDES 'python3-core' (but
/home/ross/Yocto/poky/meta/recipes-connectivity/bind/bind_9.10.6.bb DEPENDS
on or otherwise requires it).

Ross

On 13 February 2018 at 06:21, Martin Hundebøll <mnhu@prevas.dk> wrote:

> Ping
>
>
> On 2018-02-05 13:25, Martin Hundebøll wrote:
>
>> Break the hard runtime dependency on python3-core by adding a
>> (default-on) packageconfig option for python.
>>
>> Signed-off-by: Martin Hundebøll <mnhu@prevas.dk>
>> ---
>>   meta/recipes-connectivity/bind/bind_9.10.6.bb | 14 ++++++++++----
>>   1 file changed, 10 insertions(+), 4 deletions(-)
>>
>> diff --git a/meta/recipes-connectivity/bind/bind_9.10.6.bb
>> b/meta/recipes-connectivity/bind/bind_9.10.6.bb
>> index 8b8835ba80..2ec7ab44f0 100644
>> --- a/meta/recipes-connectivity/bind/bind_9.10.6.bb
>> +++ b/meta/recipes-connectivity/bind/bind_9.10.6.bb
>> @@ -38,16 +38,19 @@ EXTRA_OECONF = " ${ENABLE_IPV6} --with-libtool
>> --enable-threads \
>>                    --with-openssl=${STAGING_LIBDIR}/.. \
>>                  "
>>   -inherit autotools update-rc.d systemd useradd pkgconfig python3-dir
>> +inherit autotools update-rc.d systemd useradd pkgconfig
>>     export PYTHON_SITEPACKAGES_DIR
>>     # PACKAGECONFIGs readline and libedit should NOT be set at same time
>> -PACKAGECONFIG ?= "readline"
>> +PACKAGECONFIG ?= "readline python"
>>   PACKAGECONFIG[httpstats] = "--with-libxml2,--without-libxml2,libxml2"
>>   PACKAGECONFIG[readline] = "--with-readline=-lreadline,,readline"
>>   PACKAGECONFIG[libedit] = "--with-readline=-ledit,,libedit"
>>   PACKAGECONFIG[urandom] = "--with-randomdev=/dev/urandom
>> ,--with-randomdev=/dev/random,,"
>> +PACKAGECONFIG[python] = "--with-python=${PYTHON},--wit
>> hout-python,python3-core,python3-core"
>> +
>> +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python',
>> 'python3native', '', d)}
>>     USERADD_PACKAGES = "${PN}"
>>   USERADD_PARAM_${PN} = "--system --home ${localstatedir}/cache/bind
>> --no-create-home \
>> @@ -60,7 +63,6 @@ SYSTEMD_SERVICE_${PN} = "named.service"
>>     PARALLEL_MAKE = ""
>>   -RDEPENDS_${PN} = "python3-core"
>>   RDEPENDS_${PN}-dev = ""
>>     PACKAGE_BEFORE_PN += "${PN}-utils"
>> @@ -88,7 +90,11 @@ do_install_append() {
>>         install -d "${D}${sysconfdir}/init.d"
>>         install -m 644 ${S}/conf/* "${D}${sysconfdir}/bind/"
>>         install -m 755 "${S}/init.d" "${D}${sysconfdir}/init.d/bind"
>> -       sed -i -e '1s,#!.*python3,#! /usr/bin/python3,'
>> ${D}${sbindir}/dnssec-coverage ${D}${sbindir}/dnssec-checkds
>> +
>> +       if [ -n "${@bb.utils.contains('PACKAGECONFIG', 'python',
>> 'python', '', d)}" ]; then
>> +               sed -i -e '1s,#!.*python3,#! /usr/bin/python3,' \
>> +                       ${D}${sbindir}/dnssec-coverage
>> ${D}${sbindir}/dnssec-checkds
>> +       fi
>>         # Install systemd related files
>>         install -d ${D}${sbindir}
>>
>> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

[-- Attachment #2: Type: text/html, Size: 5567 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH v2] bind: add packageconfig for python-support
  2018-02-21 14:22     ` Burton, Ross
@ 2018-02-22 13:40       ` Martin Hundebøll
  0 siblings, 0 replies; 7+ messages in thread
From: Martin Hundebøll @ 2018-02-22 13:40 UTC (permalink / raw)
  To: OE-core

From: Martin Hundeboll <mnhu@prevas.dk>

Break the hard runtime dependency on python3-core by adding a
(default-on) packageconfig option for python.

Signed-off-by: Martin Hundebøll <mnhu@prevas.dk>

---
Changes in v2:

- Remove broken and unneeded build-dependency on python3(-core)

 meta/recipes-connectivity/bind/bind_9.10.6.bb | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-connectivity/bind/bind_9.10.6.bb b/meta/recipes-connectivity/bind/bind_9.10.6.bb
index 8b8835ba803..7af92a4fdab 100644
--- a/meta/recipes-connectivity/bind/bind_9.10.6.bb
+++ b/meta/recipes-connectivity/bind/bind_9.10.6.bb
@@ -38,16 +38,19 @@ EXTRA_OECONF = " ${ENABLE_IPV6} --with-libtool --enable-threads \
                  --with-openssl=${STAGING_LIBDIR}/.. \
                "
 
-inherit autotools update-rc.d systemd useradd pkgconfig python3-dir
+inherit autotools update-rc.d systemd useradd pkgconfig
 
 export PYTHON_SITEPACKAGES_DIR
 
 # PACKAGECONFIGs readline and libedit should NOT be set at same time
-PACKAGECONFIG ?= "readline"
+PACKAGECONFIG ?= "readline python"
 PACKAGECONFIG[httpstats] = "--with-libxml2,--without-libxml2,libxml2"
 PACKAGECONFIG[readline] = "--with-readline=-lreadline,,readline"
 PACKAGECONFIG[libedit] = "--with-readline=-ledit,,libedit"
 PACKAGECONFIG[urandom] = "--with-randomdev=/dev/urandom,--with-randomdev=/dev/random,,"
+PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,,python3-core"
+
+inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)}
 
 USERADD_PACKAGES = "${PN}"
 USERADD_PARAM_${PN} = "--system --home ${localstatedir}/cache/bind --no-create-home \
@@ -60,7 +63,6 @@ SYSTEMD_SERVICE_${PN} = "named.service"
 
 PARALLEL_MAKE = ""
 
-RDEPENDS_${PN} = "python3-core"
 RDEPENDS_${PN}-dev = ""
 
 PACKAGE_BEFORE_PN += "${PN}-utils"
@@ -88,7 +90,11 @@ do_install_append() {
 	install -d "${D}${sysconfdir}/init.d"
 	install -m 644 ${S}/conf/* "${D}${sysconfdir}/bind/"
 	install -m 755 "${S}/init.d" "${D}${sysconfdir}/init.d/bind"
-	sed -i -e '1s,#!.*python3,#! /usr/bin/python3,' ${D}${sbindir}/dnssec-coverage ${D}${sbindir}/dnssec-checkds
+
+	if [ -n "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}" ]; then
+		sed -i -e '1s,#!.*python3,#! /usr/bin/python3,' \
+			${D}${sbindir}/dnssec-coverage ${D}${sbindir}/dnssec-checkds
+	fi
 
 	# Install systemd related files
 	install -d ${D}${sbindir}
-- 
2.16.2



^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2018-02-23  3:10 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-05 12:25 [PATCH] usbutils: Split out lsusb.py Martin Hundebøll
2018-02-05 12:25 ` [PATCH] bind: add packageconfig for python-support Martin Hundebøll
2018-02-05 12:49   ` Richard Purdie
2018-02-05 12:51     ` Martin Hundebøll
2018-02-13  6:21   ` Martin Hundebøll
2018-02-21 14:22     ` Burton, Ross
2018-02-22 13:40       ` [PATCH v2] " Martin Hundebøll

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.