diff mbox series

asciidoc: use Python 3 port

Message ID 20190327142005.17453-1-ross.burton@intel.com
State Accepted
Commit 266a13139ea45e28deb167f077917f04c3bdb7e6
Headers show
Series asciidoc: use Python 3 port | expand

Commit Message

Ross Burton March 27, 2019, 2:20 p.m. UTC
There's a sort-of-official port of asciidoc to Python 3.  Whilst the official
replacement is asciidoctor which is rewritten in Ruby, this is a fairly trivial
swap and removes Python 2 from core-image-sato builds entirely.

Moving forward we should evaluate asciidoctor, but that can wait.

Change the RDEPENDS so that python3 is only a dependency for target and
nativesdk builds, for native this can use the host python3.

Remove redundant DESTDIR export that isn't needed.

Signed-off-by: Ross Burton <ross.burton@intel.com>

---
 meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

-- 
2.11.0

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Comments

Khem Raj March 30, 2019, 2 a.m. UTC | #1
On Wed, Mar 27, 2019 at 7:20 AM Ross Burton <ross.burton@intel.com> wrote:
>

> There's a sort-of-official port of asciidoc to Python 3.  Whilst the official

> replacement is asciidoctor which is rewritten in Ruby, this is a fairly trivial

> swap and removes Python 2 from core-image-sato builds entirely.

>

> Moving forward we should evaluate asciidoctor, but that can wait.

>

> Change the RDEPENDS so that python3 is only a dependency for target and

> nativesdk builds, for native this can use the host python3.

>

> Remove redundant DESTDIR export that isn't needed.

>


its failing on my archlinux builder, ideas ?

https://errors.yoctoproject.org/Errors/Details/234833/
https://errors.yoctoproject.org/Errors/Details/234829/

> Signed-off-by: Ross Burton <ross.burton@intel.com>

> ---

>  meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb | 21 ++++++++++++---------

>  1 file changed, 12 insertions(+), 9 deletions(-)

>

> diff --git a/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb b/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb

> index 38164d55735..d0d15171ac4 100644

> --- a/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb

> +++ b/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb

> @@ -8,17 +8,20 @@ LICENSE = "GPLv2"

>  LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \

>                      file://COPYRIGHT;md5=029ad5428ba5efa20176b396222d4069"

>

> -SRC_URI = "http://downloads.sourceforge.net/project/${BPN}/${BPN}/${PV}/${BP}.tar.gz"

> -SRC_URI[md5sum] = "c59018f105be8d022714b826b0be130a"

> -SRC_URI[sha256sum] = "78db9d0567c8ab6570a6eff7ffdf84eadd91f2dfc0a92a2d0105d323cab4e1f0"

> +SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https"

> +SRCREV = "618f6e6f6b558ed1e5f2588cd60a5a6b4f881ca0"

> +PV .= "+py3-git${SRCPV}"

>

> -UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/asciidoc/files/"

> +DEPENDS = "libxml2-native libxslt-native docbook-xml-dtd4-native"

>

> +S = "${WORKDIR}/git"

> +

> +# Not using automake

>  inherit autotools-brokensep

> +CLEANBROKEN = "1"

>

> -export DESTDIR = "${D}"

> -DEPENDS_class-native = "docbook-xml-dtd4-native"

> -RDEPENDS_${PN} += "python"

> -BBCLASSEXTEND = "native"

> +# target and nativesdk needs python3, but for native we can use the host.

> +RDEPENDS_${PN} += "python3"

> +RDEPENDS_remove_class-native = "python3"

>

> -CLEANBROKEN = "1"

> +BBCLASSEXTEND = "native nativesdk"

> --

> 2.11.0

>

> --

> _______________________________________________

> Openembedded-core mailing list

> Openembedded-core@lists.openembedded.org

> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Ross Burton April 1, 2019, 2 p.m. UTC | #2
Error 4 is 'validation error', can you recover the file that is failing?

Ross

On Sat, 30 Mar 2019 at 02:01, Khem Raj <raj.khem@gmail.com> wrote:
>

> On Wed, Mar 27, 2019 at 7:20 AM Ross Burton <ross.burton@intel.com> wrote:

> >

> > There's a sort-of-official port of asciidoc to Python 3.  Whilst the official

> > replacement is asciidoctor which is rewritten in Ruby, this is a fairly trivial

> > swap and removes Python 2 from core-image-sato builds entirely.

> >

> > Moving forward we should evaluate asciidoctor, but that can wait.

> >

> > Change the RDEPENDS so that python3 is only a dependency for target and

> > nativesdk builds, for native this can use the host python3.

> >

> > Remove redundant DESTDIR export that isn't needed.

> >

>

> its failing on my archlinux builder, ideas ?

>

> https://errors.yoctoproject.org/Errors/Details/234833/

> https://errors.yoctoproject.org/Errors/Details/234829/

>

> > Signed-off-by: Ross Burton <ross.burton@intel.com>

> > ---

> >  meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb | 21 ++++++++++++---------

> >  1 file changed, 12 insertions(+), 9 deletions(-)

> >

> > diff --git a/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb b/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb

> > index 38164d55735..d0d15171ac4 100644

> > --- a/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb

> > +++ b/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb

> > @@ -8,17 +8,20 @@ LICENSE = "GPLv2"

> >  LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \

> >                      file://COPYRIGHT;md5=029ad5428ba5efa20176b396222d4069"

> >

> > -SRC_URI = "http://downloads.sourceforge.net/project/${BPN}/${BPN}/${PV}/${BP}.tar.gz"

> > -SRC_URI[md5sum] = "c59018f105be8d022714b826b0be130a"

> > -SRC_URI[sha256sum] = "78db9d0567c8ab6570a6eff7ffdf84eadd91f2dfc0a92a2d0105d323cab4e1f0"

> > +SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https"

> > +SRCREV = "618f6e6f6b558ed1e5f2588cd60a5a6b4f881ca0"

> > +PV .= "+py3-git${SRCPV}"

> >

> > -UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/asciidoc/files/"

> > +DEPENDS = "libxml2-native libxslt-native docbook-xml-dtd4-native"

> >

> > +S = "${WORKDIR}/git"

> > +

> > +# Not using automake

> >  inherit autotools-brokensep

> > +CLEANBROKEN = "1"

> >

> > -export DESTDIR = "${D}"

> > -DEPENDS_class-native = "docbook-xml-dtd4-native"

> > -RDEPENDS_${PN} += "python"

> > -BBCLASSEXTEND = "native"

> > +# target and nativesdk needs python3, but for native we can use the host.

> > +RDEPENDS_${PN} += "python3"

> > +RDEPENDS_remove_class-native = "python3"

> >

> > -CLEANBROKEN = "1"

> > +BBCLASSEXTEND = "native nativesdk"

> > --

> > 2.11.0

> >

> > --

> > _______________________________________________

> > Openembedded-core mailing list

> > Openembedded-core@lists.openembedded.org

> > http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Khem Raj April 2, 2019, 2:34 a.m. UTC | #3
I find many posts reporting similar issue also I see it happen on
ubuntu 18.04 host as well

https://groups.google.com/forum/#!topic/asciidoc/FC-eOwU8rYg
https://groups.google.com/forum/#!topic/asciidoc/N4boYdQ3Zik

On Mon, Apr 1, 2019 at 7:01 AM Burton, Ross <ross.burton@intel.com> wrote:
>

> Error 4 is 'validation error', can you recover the file that is failing?

>

> Ross

>

> On Sat, 30 Mar 2019 at 02:01, Khem Raj <raj.khem@gmail.com> wrote:

> >

> > On Wed, Mar 27, 2019 at 7:20 AM Ross Burton <ross.burton@intel.com> wrote:

> > >

> > > There's a sort-of-official port of asciidoc to Python 3.  Whilst the official

> > > replacement is asciidoctor which is rewritten in Ruby, this is a fairly trivial

> > > swap and removes Python 2 from core-image-sato builds entirely.

> > >

> > > Moving forward we should evaluate asciidoctor, but that can wait.

> > >

> > > Change the RDEPENDS so that python3 is only a dependency for target and

> > > nativesdk builds, for native this can use the host python3.

> > >

> > > Remove redundant DESTDIR export that isn't needed.

> > >

> >

> > its failing on my archlinux builder, ideas ?

> >

> > https://errors.yoctoproject.org/Errors/Details/234833/

> > https://errors.yoctoproject.org/Errors/Details/234829/

> >

> > > Signed-off-by: Ross Burton <ross.burton@intel.com>

> > > ---

> > >  meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb | 21 ++++++++++++---------

> > >  1 file changed, 12 insertions(+), 9 deletions(-)

> > >

> > > diff --git a/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb b/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb

> > > index 38164d55735..d0d15171ac4 100644

> > > --- a/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb

> > > +++ b/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb

> > > @@ -8,17 +8,20 @@ LICENSE = "GPLv2"

> > >  LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \

> > >                      file://COPYRIGHT;md5=029ad5428ba5efa20176b396222d4069"

> > >

> > > -SRC_URI = "http://downloads.sourceforge.net/project/${BPN}/${BPN}/${PV}/${BP}.tar.gz"

> > > -SRC_URI[md5sum] = "c59018f105be8d022714b826b0be130a"

> > > -SRC_URI[sha256sum] = "78db9d0567c8ab6570a6eff7ffdf84eadd91f2dfc0a92a2d0105d323cab4e1f0"

> > > +SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https"

> > > +SRCREV = "618f6e6f6b558ed1e5f2588cd60a5a6b4f881ca0"

> > > +PV .= "+py3-git${SRCPV}"

> > >

> > > -UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/asciidoc/files/"

> > > +DEPENDS = "libxml2-native libxslt-native docbook-xml-dtd4-native"

> > >

> > > +S = "${WORKDIR}/git"

> > > +

> > > +# Not using automake

> > >  inherit autotools-brokensep

> > > +CLEANBROKEN = "1"

> > >

> > > -export DESTDIR = "${D}"

> > > -DEPENDS_class-native = "docbook-xml-dtd4-native"

> > > -RDEPENDS_${PN} += "python"

> > > -BBCLASSEXTEND = "native"

> > > +# target and nativesdk needs python3, but for native we can use the host.

> > > +RDEPENDS_${PN} += "python3"

> > > +RDEPENDS_remove_class-native = "python3"

> > >

> > > -CLEANBROKEN = "1"

> > > +BBCLASSEXTEND = "native nativesdk"

> > > --

> > > 2.11.0

> > >

> > > --

> > > _______________________________________________

> > > Openembedded-core mailing list

> > > Openembedded-core@lists.openembedded.org

> > > http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Ross Burton April 2, 2019, 7:48 a.m. UTC | #4
Ah so it looks like it's ignoring the XML stuff we're installing and
using the host, and you don't have the right versions.  Shall look
into this today.

Ross

On Tue, 2 Apr 2019 at 03:34, Khem Raj <raj.khem@gmail.com> wrote:
>

> I find many posts reporting similar issue also I see it happen on

> ubuntu 18.04 host as well

>

> https://groups.google.com/forum/#!topic/asciidoc/FC-eOwU8rYg

> https://groups.google.com/forum/#!topic/asciidoc/N4boYdQ3Zik

>

> On Mon, Apr 1, 2019 at 7:01 AM Burton, Ross <ross.burton@intel.com> wrote:

> >

> > Error 4 is 'validation error', can you recover the file that is failing?

> >

> > Ross

> >

> > On Sat, 30 Mar 2019 at 02:01, Khem Raj <raj.khem@gmail.com> wrote:

> > >

> > > On Wed, Mar 27, 2019 at 7:20 AM Ross Burton <ross.burton@intel.com> wrote:

> > > >

> > > > There's a sort-of-official port of asciidoc to Python 3.  Whilst the official

> > > > replacement is asciidoctor which is rewritten in Ruby, this is a fairly trivial

> > > > swap and removes Python 2 from core-image-sato builds entirely.

> > > >

> > > > Moving forward we should evaluate asciidoctor, but that can wait.

> > > >

> > > > Change the RDEPENDS so that python3 is only a dependency for target and

> > > > nativesdk builds, for native this can use the host python3.

> > > >

> > > > Remove redundant DESTDIR export that isn't needed.

> > > >

> > >

> > > its failing on my archlinux builder, ideas ?

> > >

> > > https://errors.yoctoproject.org/Errors/Details/234833/

> > > https://errors.yoctoproject.org/Errors/Details/234829/

> > >

> > > > Signed-off-by: Ross Burton <ross.burton@intel.com>

> > > > ---

> > > >  meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb | 21 ++++++++++++---------

> > > >  1 file changed, 12 insertions(+), 9 deletions(-)

> > > >

> > > > diff --git a/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb b/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb

> > > > index 38164d55735..d0d15171ac4 100644

> > > > --- a/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb

> > > > +++ b/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb

> > > > @@ -8,17 +8,20 @@ LICENSE = "GPLv2"

> > > >  LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \

> > > >                      file://COPYRIGHT;md5=029ad5428ba5efa20176b396222d4069"

> > > >

> > > > -SRC_URI = "http://downloads.sourceforge.net/project/${BPN}/${BPN}/${PV}/${BP}.tar.gz"

> > > > -SRC_URI[md5sum] = "c59018f105be8d022714b826b0be130a"

> > > > -SRC_URI[sha256sum] = "78db9d0567c8ab6570a6eff7ffdf84eadd91f2dfc0a92a2d0105d323cab4e1f0"

> > > > +SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https"

> > > > +SRCREV = "618f6e6f6b558ed1e5f2588cd60a5a6b4f881ca0"

> > > > +PV .= "+py3-git${SRCPV}"

> > > >

> > > > -UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/asciidoc/files/"

> > > > +DEPENDS = "libxml2-native libxslt-native docbook-xml-dtd4-native"

> > > >

> > > > +S = "${WORKDIR}/git"

> > > > +

> > > > +# Not using automake

> > > >  inherit autotools-brokensep

> > > > +CLEANBROKEN = "1"

> > > >

> > > > -export DESTDIR = "${D}"

> > > > -DEPENDS_class-native = "docbook-xml-dtd4-native"

> > > > -RDEPENDS_${PN} += "python"

> > > > -BBCLASSEXTEND = "native"

> > > > +# target and nativesdk needs python3, but for native we can use the host.

> > > > +RDEPENDS_${PN} += "python3"

> > > > +RDEPENDS_remove_class-native = "python3"

> > > >

> > > > -CLEANBROKEN = "1"

> > > > +BBCLASSEXTEND = "native nativesdk"

> > > > --

> > > > 2.11.0

> > > >

> > > > --

> > > > _______________________________________________

> > > > Openembedded-core mailing list

> > > > Openembedded-core@lists.openembedded.org

> > > > http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
diff mbox series

Patch

diff --git a/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb b/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb
index 38164d55735..d0d15171ac4 100644
--- a/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb
+++ b/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb
@@ -8,17 +8,20 @@  LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \
                     file://COPYRIGHT;md5=029ad5428ba5efa20176b396222d4069"
 
-SRC_URI = "http://downloads.sourceforge.net/project/${BPN}/${BPN}/${PV}/${BP}.tar.gz"
-SRC_URI[md5sum] = "c59018f105be8d022714b826b0be130a"
-SRC_URI[sha256sum] = "78db9d0567c8ab6570a6eff7ffdf84eadd91f2dfc0a92a2d0105d323cab4e1f0"
+SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https"
+SRCREV = "618f6e6f6b558ed1e5f2588cd60a5a6b4f881ca0"
+PV .= "+py3-git${SRCPV}"
 
-UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/asciidoc/files/"
+DEPENDS = "libxml2-native libxslt-native docbook-xml-dtd4-native"
 
+S = "${WORKDIR}/git"
+
+# Not using automake
 inherit autotools-brokensep
+CLEANBROKEN = "1"
 
-export DESTDIR = "${D}"
-DEPENDS_class-native = "docbook-xml-dtd4-native"
-RDEPENDS_${PN} += "python" 
-BBCLASSEXTEND = "native"
+# target and nativesdk needs python3, but for native we can use the host.
+RDEPENDS_${PN} += "python3"
+RDEPENDS_remove_class-native = "python3"
 
-CLEANBROKEN = "1"
+BBCLASSEXTEND = "native nativesdk"