[meta-python][PATCH 1/3] python-six: remove duplicated recipe

[meta-python][PATCH 1/3] python-six: remove duplicated recipe

[Hongxu Jia]

Since commit [e3392ec python-six: put python2/3 variant together] applied,
python-six recipe was moved to meta-oe, but not remove the duplicated one

The python3-six recipe and python-six.inc is in oe-core

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 meta-python/recipes-devtools/python/python-six.inc    | 19 -------------------
 .../recipes-devtools/python/python-six_1.12.0.bb      |  2 --
 2 files changed, 21 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python-six.inc
 delete mode 100644 meta-python/recipes-devtools/python/python-six_1.12.0.bb

diff --git a/meta-python/recipes-devtools/python/python-six.inc b/meta-python/recipes-devtools/python/python-six.inc
deleted file mode 100644
index 4712925..0000000
--- a/meta-python/recipes-devtools/python/python-six.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "Python 2 and 3 compatibility library"
-HOMEPAGE = "http://pypi.python.org/pypi/six/"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=83e0f622bd5ac7d575dbd83d094d69b5"
-
-SRC_URI[md5sum] = "9ae5d1feed8c0215f4ae4adcd9207fcb"
-SRC_URI[sha256sum] = "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73"
-
-do_compile_append() {
-    ${PYTHON} setup.py -q bdist_egg --dist-dir ./
-}
-do_install_append() {
-    install -m 0644 ${S}/*.egg ${D}/${PYTHON_SITEPACKAGES_DIR}/
-}
-
-RDEPENDS_${PN} += "${PYTHON_PN}-io"
-
-BBCLASSEXTEND = "native nativesdk"
-
diff --git a/meta-python/recipes-devtools/python/python-six_1.12.0.bb b/meta-python/recipes-devtools/python/python-six_1.12.0.bb
deleted file mode 100644
index 9075745..0000000
--- a/meta-python/recipes-devtools/python/python-six_1.12.0.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-inherit pypi setuptools
-require python-six.inc
-- 
2.7.4

[meta-perl][PATCH 2/3] libauthen-radius-perl: ptest requires meta-networking to be present

[Hongxu Jia]

Since commit [d7ea637 recipes-devtools: Move back from
meta-networking to meta-perl] applied, but freeradius
locates in meta-networking

If meta-networking not present and ptest enable, skip it

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 meta-perl/recipes-perl/libauthen/libauthen-radius-perl_0.22.bb | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/meta-perl/recipes-perl/libauthen/libauthen-radius-perl_0.22.bb b/meta-perl/recipes-perl/libauthen/libauthen-radius-perl_0.22.bb
index fb18fe2..7118dc0 100644
--- a/meta-perl/recipes-perl/libauthen/libauthen-radius-perl_0.22.bb
+++ b/meta-perl/recipes-perl/libauthen/libauthen-radius-perl_0.22.bb
@@ -34,6 +34,14 @@ RDEPENDS_${PN} += "\
     perl-module-io-select \
     perl-module-io-socket \
 "
-RDEPENDS_${PN}-ptest += "freeradius"
+RDEPENDS_${PN}-ptest += " \
+    ${@bb.utils.contains('PTEST_ENABLED', '1', 'freeradius', '', d)} \
+"
 
 BBCLASSEXTEND = "native"
+
+python() {
+    if bb.utils.contains('PTEST_ENABLED', '1', 'True', 'False', d) and \
+       'networking-layer' not in d.getVar('BBFILE_COLLECTIONS').split():
+        raise bb.parse.SkipRecipe('ptest requires meta-networking to be present.')
+}
-- 
2.7.4

[meta-multimedia][PATCH V3 3/3] tvheadend: do not inherit gitpkgv

[Hongxu Jia]

Do not inherit gitpkgv in meta-oe, since meta-multimedia
does not depends on meta-oe.

The pkg version will be minor changed

Before the fix:
tvheadend-4.3+git10478+bdc2ae9-r0.core2_64.rpm

After the fix:
tvheadend-4.3+git20+bdc2ae9e19-r0.core2_64.rpm
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb b/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb
index dc6cd46..e3875a2 100644
--- a/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb
+++ b/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Tvheadend: TV streaming server and recorder"
 HOMEPAGE = "https://tvheadend.org/"
 
-inherit autotools-brokensep gettext gitpkgv pkgconfig
+inherit autotools-brokensep gettext pkgconfig
 
 DEPENDS = "avahi cmake-native dvb-apps libdvbcsa libpcre2 openssl uriparser zlib"
 
@@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=9cae5acac2e9ee2fc3aec01ac88ce5db"
 SRC_URI = "git://github.com/tvheadend/tvheadend.git"
 
 SRCREV = "bdc2ae9e19520a10cdf0bec0fcc0050b32bc75ff"
-PV = "4.3+git${SRCPV}"
-PKGV = "4.3+git${GITPKGV}"
+PV = "4.3+git2${SRCPV}"
+PE = "1"
 
 S = "${WORKDIR}/git"
 
-- 
2.7.4

Re: [meta-multimedia][PATCH V3 3/3] tvheadend: do not inherit gitpkgv

[Martin Jansa]

> After the fix:
> tvheadend-4.3+git20+bdc2ae9e19-r0.core2_64.rpm

This is no longer matching the code with the PE bump.

On Thu, Jun 27, 2019 at 6:03 PM Hongxu Jia <hongxu.jia@windriver.com> wrote:

> Do not inherit gitpkgv in meta-oe, since meta-multimedia
> does not depends on meta-oe.
>
> The pkg version will be minor changed
>
> Before the fix:
> tvheadend-4.3+git10478+bdc2ae9-r0.core2_64.rpm
>
> After the fix:
> tvheadend-4.3+git20+bdc2ae9e19-r0.core2_64.rpm
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---
>  meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb
> b/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb
> index dc6cd46..e3875a2 100644
> --- a/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb
> +++ b/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb
> @@ -1,7 +1,7 @@
>  SUMMARY = "Tvheadend: TV streaming server and recorder"
>  HOMEPAGE = "https://tvheadend.org/"
>
> -inherit autotools-brokensep gettext gitpkgv pkgconfig
> +inherit autotools-brokensep gettext pkgconfig
>
>  DEPENDS = "avahi cmake-native dvb-apps libdvbcsa libpcre2 openssl
> uriparser zlib"
>
> @@ -11,8 +11,8 @@ LIC_FILES_CHKSUM =
> "file://LICENSE.md;md5=9cae5acac2e9ee2fc3aec01ac88ce5db"
>  SRC_URI = "git://github.com/tvheadend/tvheadend.git"
>
>  SRCREV = "bdc2ae9e19520a10cdf0bec0fcc0050b32bc75ff"
> -PV = "4.3+git${SRCPV}"
> -PKGV = "4.3+git${GITPKGV}"
> +PV = "4.3+git2${SRCPV}"
> +PE = "1"
>
>  S = "${WORKDIR}/git"
>
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>

Re: [meta-multimedia][PATCH V3 3/3] tvheadend: do not inherit gitpkgv

[Hongxu Jia]

On 6/28/19 12:05 AM, Martin Jansa wrote:
> > After the fix:
> > tvheadend-4.3+git20+bdc2ae9e19-r0.core2_64.rpm
>
> This is no longer matching the code with the PE bump.
>
I am afraid PE does not work, that's why 2 is added

//Hongxu

> On Thu, Jun 27, 2019 at 6:03 PM Hongxu Jia <hongxu.jia@windriver.com 
> <mailto:hongxu.jia@windriver.com>> wrote:
>
>     Do not inherit gitpkgv in meta-oe, since meta-multimedia
>     does not depends on meta-oe.
>
>     The pkg version will be minor changed
>
>     Before the fix:
>     tvheadend-4.3+git10478+bdc2ae9-r0.core2_64.rpm
>
>     After the fix:
>     tvheadend-4.3+git20+bdc2ae9e19-r0.core2_64.rpm
>     Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com
>     <mailto:hongxu.jia@windriver.com>>
>     ---
>      meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb
>     <http://tvheadend_git.bb> | 6 +++---
>      1 file changed, 3 insertions(+), 3 deletions(-)
>
>     diff --git
>     a/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb
>     <http://tvheadend_git.bb>
>     b/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb
>     <http://tvheadend_git.bb>
>     index dc6cd46..e3875a2 100644
>     --- a/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb
>     <http://tvheadend_git.bb>
>     +++ b/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb
>     <http://tvheadend_git.bb>
>     @@ -1,7 +1,7 @@
>      SUMMARY = "Tvheadend: TV streaming server and recorder"
>      HOMEPAGE = "https://tvheadend.org/"
>
>     -inherit autotools-brokensep gettext gitpkgv pkgconfig
>     +inherit autotools-brokensep gettext pkgconfig
>
>      DEPENDS = "avahi cmake-native dvb-apps libdvbcsa libpcre2 openssl
>     uriparser zlib"
>
>     @@ -11,8 +11,8 @@ LIC_FILES_CHKSUM =
>     "file://LICENSE.md;md5=9cae5acac2e9ee2fc3aec01ac88ce5db"
>      SRC_URI = "git://github.com/tvheadend/tvheadend.git
>     <http://github.com/tvheadend/tvheadend.git>"
>
>      SRCREV = "bdc2ae9e19520a10cdf0bec0fcc0050b32bc75ff"
>     -PV = "4.3+git${SRCPV}"
>     -PKGV = "4.3+git${GITPKGV}"
>     +PV = "4.3+git2${SRCPV}"
>     +PE = "1"
>
>      S = "${WORKDIR}/git"
>
>     -- 
>     2.7.4
>
>     -- 
>     _______________________________________________
>     Openembedded-devel mailing list
>     Openembedded-devel@lists.openembedded.org
>     <mailto:Openembedded-devel@lists.openembedded.org>
>     http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>

Re: [meta-multimedia][PATCH V3 3/3] tvheadend: do not inherit gitpkgv

[Hongxu Jia]

Please drop this fix, since meta-multimedia depends on meta-python,
and meta-python depends on meta-oe, the fix is not necessary

//Hongxu

On 6/28/19 12:02 AM, Hongxu Jia wrote:
> Do not inherit gitpkgv in meta-oe, since meta-multimedia
> does not depends on meta-oe.
>
> The pkg version will be minor changed
>
> Before the fix:
> tvheadend-4.3+git10478+bdc2ae9-r0.core2_64.rpm
>
> After the fix:
> tvheadend-4.3+git20+bdc2ae9e19-r0.core2_64.rpm
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---
>   meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb b/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb
> index dc6cd46..e3875a2 100644
> --- a/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb
> +++ b/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb
> @@ -1,7 +1,7 @@
>   SUMMARY = "Tvheadend: TV streaming server and recorder"
>   HOMEPAGE = "https://tvheadend.org/"
>   
> -inherit autotools-brokensep gettext gitpkgv pkgconfig
> +inherit autotools-brokensep gettext pkgconfig
>   
>   DEPENDS = "avahi cmake-native dvb-apps libdvbcsa libpcre2 openssl uriparser zlib"
>   
> @@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=9cae5acac2e9ee2fc3aec01ac88ce5db"
>   SRC_URI = "git://github.com/tvheadend/tvheadend.git"
>   
>   SRCREV = "bdc2ae9e19520a10cdf0bec0fcc0050b32bc75ff"
> -PV = "4.3+git${SRCPV}"
> -PKGV = "4.3+git${GITPKGV}"
> +PV = "4.3+git2${SRCPV}"
> +PE = "1"
>   
>   S = "${WORKDIR}/git"
>