Commit Graph

25 Commits

Author SHA1 Message Date
Alexander Kanavin
152f5d23ea xmlto: check upstream version tags, not new commits
With 0.0.29 upstream is tagging versions again.

(From OE-Core rev: 5250f021d73ba78ade312734b42fdbbe347cca03)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2024-08-28 09:14:26 +01:00
hongxu
c4c681cdd7 xmlto: 0.0.28 -> 0.0.29
* Do not tweak var-PV in recipe
* Rename variable BASH to XMLTO_BASH_PATH [1]

[1] https://pagure.io/xmlto/c/5030f081b0e2d94d791b62ee6da0831026cf57e0?branch=master

(From OE-Core rev: 7b603b7c2613993bcad3038af0dfd131a38972d3)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2024-08-23 22:43:27 +01:00
Richard Purdie
65318019cd recipes/classes/scripts: Drop SRCPV usage in OE-Core
Now that SRCPV isn't needed we can simplify things in a few places...

(From OE-Core rev: 843f82a246a535c353e08072f252d1dc78217872)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2023-08-24 16:50:24 +01:00
Ross Burton
1e73562ea7 xmlto: remove redundant patches
0001-Skip-validating-xmlto-output isn't needed as xmllint will use the
local catalogues correctly now[1].

configure.in-drop-the-test-of-xmllint-and-xsltproc can be dropped if we
pre-load the result of AC_PATH_PROG with ac_cv_path_XMLLINT.

[1] oe-core 8159b47e7ddddaca57ade2ecf24d8ff9a0abf26a

(From OE-Core rev: 0fecb0c86303cb0b54c0f3986176b27f0647d6a3)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-09-08 14:59:39 +01:00
Khem Raj
09483d2981 xmlto: Update to use upstream tip of trunk
There are several fixes which are done to fix builds with newer
compilers after 0.0.28 was releases in 2015 a long time ago.

Add a patch to fix manpages builds not trying to access network during
build

Add UPSTREAM_CHECK_COMMITS = "1"

Regenerate xmlif from lex files, before configuring the build.
Run lex from sourcedir to avoid emitting absolute source paths via #line
directive into generated c source file which ends up causing
reproducability isssue

(From OE-Core rev: 27a5000724e4f4df274279bcd801d1dc2830208e)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-09-03 08:51:57 +01:00
Richard Purdie
b0130fcf91 meta/meta-selftest/meta-skeleton: Update LICENSE variable to use SPDX license identifiers
An automated conversion using scripts/contrib/convert-spdx-licenses.py to
convert to use the standard SPDX license identifiers. Two recipes in meta-selftest
were not converted as they're that way specifically for testing. A change in
linux-firmware was also skipped and may need a more manual tweak.

(From OE-Core rev: ceda3238cdbf1beb216ae9ddb242470d5dfc25e0)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-02-20 16:45:25 +00:00
Richard Purdie
bb6ddc3691 Convert to new override syntax
This is the result of automated script conversion:

scripts/contrib/convert-overrides.py <oe-core directory>

converting the metadata to use ":" as the override character instead of "_".

(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-08-02 15:44:10 +01:00
Dorinda
8e4567bd5f meta/recipes-devtools: Add HOMEPAGE / DESCRIPTION
Added HOMEPAGE and DESCRIPTION for recipes with missing decriptions or homepage

[YOCTO #13471]

(From OE-Core rev: bb05814335e7101bfd8df0a11dc18a044e867bed)

Signed-off-by: Dorinda Bassey <dorindabassey@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-02-26 15:21:21 +00:00
Richard Purdie
b47421e745 xmlto: Fix reproducibility
Don't hardcode the host's grep path into xmlto.

(From OE-Core rev: a7d78971df193c321c309481749fc30cae77788c)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-02-16 11:28:17 +00:00
Hongxu Jia
e9e1aa199b xmlto: set CLEANBROKEN = "1"
While rebuilding xmlto or xmlto-native, `make clean' in do_configure
will remove man/man1/xmlif.1 which triger failure in do_compile

$ bitbake xmlto-native
$ bitbake xmlto-native -cconfigure -f
$ bitbake xmlto-native -ccompile -f
...
|FORMAT_DIR=./format /bin/bash ./xmlto -o man/man1 man doc/xmlif.xml
|xmlto: tmp-glibc/work/x86_64-linux/xmlto-native/0.0.28-r0/xmlto-0.0.28/
doc/xmlif.xml does not validate (status 3)
|xmlto: Fix document syntax or use --skip-validation option
I/O error : Attempt to load network entity http://www.oasis-open.org/
docbook/xml/4.2/docbookx.dtd
...

(From OE-Core rev: 08a77b751a07389cf97342b210472be8ebcd8c9d)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-01-27 16:48:08 +00:00
Ross Burton
d541a30726 xmlto: clean up RDEPENDS
Because of differences in how RDEPENDS works for native/target, add libxml2 and
libxslt to RDEPENDS (so that native dependencies work), but also add
libxml2-utils (for xmllint) and libxslt-bin (for xsltproc) to target RDEPENDS.

Also add libxml2-native to DEPENDS as that is needed for the
docbook-(xml,xsl)-native catalog to be generated.

(From OE-Core rev: b571315acb59f61335c20849d2ce7f5059258c1a)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-04-05 17:32:50 +01:00
Ross Burton
6422a7f8ed xmlto: remove XML catalog
Now that docbook-xml and docbook-xsl use the xmlcatalog class, xmlto can stop
shipping a hand-coded catalogue.

It still needs to keep the wrapper so that the sysroot catalog is used instead
of /etc/xml/catalog.  The wrapper is native-specific so mark it as such.

Note that this does effectively break xmlto on the target as the xmlcatalog
class doesn't write a catalog for the target yet, but I'm hoping that nobody
actually uses it on target.

(From OE-Core rev: b12686ecdd0b0bdb36c8d1a2baeeb66aadff1b8c)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-04-05 17:32:50 +01:00
Choong YinThong
54aab227e1 xmlto: replace fedorahosted.org SRC_URI with pagure.io source
fedorahosted.org was retired on March 1st, 2017. This is to
update the SRC_URI to point to pagure.io. pagure.io is a
replacement for fedorahosted.

[YOCTO #11226]

(From OE-Core rev: 79ae1e98a7c3fd4c732ea4cd0b3099d4e319a111)

Signed-off-by: Choong YinThong <yin.thong.choong@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-04-05 23:22:12 +01:00
Richard Purdie
ec3d83f9a9 xmlto: Don't hardcode the path to tail
We don't need to hardcode a path to tail, follow the other tools examples and
don't specify a path since PATH is good enough for us.

(From OE-Core rev: 1a1e70304932cce5ad194e0a7ebb495da7b24c2e)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-01-31 23:47:33 +00:00
Saul Wold
e96af0c0b9 xmlto: Add libxslt to native DEPENDS
xmlto requires xsltproc to work correctly, it was being included
for the target, but may have been finding host contamination.

[YOCTO #10366]

(From OE-Core rev: b7e5b9ec4f71a3b8dcb4fe56aa1b971383a6fa27)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-10-07 16:43:57 +01:00
Robert Yang
61577c5e4c xmlto: only target requires coreutils
The coreutils added to RDEPENDS was for tail command which is everywhere
on the build host, so only add it to target. There was a side effect if
coreutils-native was build, when its commands install to sysroots, they
would be removed during rebuild, and cause other recipes fail to build:

/path/to/tmp/sysroots/x86_64-linux/usr/bin/mkdir -p lib/sys
make: /path/to/tmp/sysroots/x86_64-linux/usr/bin/mkdir: Command not found

(From OE-Core rev: 4a0e3ca3733e2b6f3f20065421dbb9da2058014c)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-07-20 10:28:51 +01:00
Roy Li
3a81a3d8c3 xmlto: xmlto needs tail to run
(From OE-Core rev: 5c70c799643f9c62c58d6fb1fe97e2e6ee7ccf0f)

Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-05-30 15:58:13 +01:00
Ross Burton
9ac029bd4a xmlto: tell xmlto where cp is
xmlto looks for a cp binary, and on e.g. Fedora 23 will find it at /usr/bin/cp
but most other distros have it at /bin/cp.  This causing problems with sharing
sstate between distributions, but as /bin is a symlink on F23 we can safely
force the path to /bin/cp.

(From OE-Core rev: 46baed0fc22ab33c6481ec1cb1697f85593b4794)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-03-09 16:58:13 +00:00
Ross Burton
ce5a9df3c4 xmlto: ensure /bin/bash is used as bash
The xmlto script uses bashisms and checks at configure time to find a bash
binary.  If the build host has /bin/sh as bash then this gets detected, which
causes problems in native builds if the sstate is then shared to a machine with
/bin/sh as dash.

(From OE-Core rev: e89cd308792f613e5b4765dc0f7f21569aaaab6f)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-03-07 00:11:39 +00:00
Hongxu Jia
372c23d188 xmlto: 0.0.26 -> 0.0.28
(From OE-Core rev: a88be02e893fc98404e205b04b5a1aad1e4ab0ee)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-15 11:54:49 +00:00
Ross Burton
1c914a844b meta: Fix Upstream-Status statements
Fix a variety of problems such as typos, bad punctuations, or incorrect
Upstream-Status values.

(From OE-Core rev: bd220fe6ce8c3a0805f13a14706d3130ea872604)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-09-12 23:01:53 +01:00
Alejandro Hernandez
4cc8614cba xmlto-native: fixes slow creation of yocto docs
Forces native RDEPENDS of xmlto-native to be built and installed
since those files are required when creating yocto-docs
if not found, they are downloaded from upstream everytime
significant time difference is achieved.

[YOCTO #7148]

(From OE-Core rev: 928d41cb7343c23f586a2a1a5e6f81569d9c261b)

Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-02-03 14:53:54 +00:00
Hongxu Jia
e758eb535c xmlto: upgrade to 0.0.25
Drop obsolete_automake_macros.patch, it has been merged to 0.0.25

(From OE-Core rev: fc96d1443213f189b5fbfb25f2c1d23d6fbd6d92)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-01-23 11:36:30 +00:00
Robert Yang
919a8e25e8 xmlto: add bash to RDEPENDS_xmlto
Bash scripts:
xmlto/usr/bin/xmlto.real

(From OE-Core rev: b19c8990ef064a95b18784443be7e7e6a921ec23)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-08-23 09:26:10 +01:00
Hongxu Jia
c95dec0b93 xmlto: add version 0.0.25
It moved from meta-oe and fixed the defect that xmlto/xsltproc
stylesheets cannot be found even when they are installed in
sysroot.

About the config files (catalog.xml), we refered what Ubuntu
13.04 did, so it could correctly search the xsl stylesheets
and xml dtds.

Assigned the environment variable XML_CATALOG_FILES, so the
xmlto will use oe-core's config as priority to avoid the
the search from build system.

[YOCTO #2416]

(From OE-Core rev: 6eccf7940e90dd06568f7a2da36ce2d5d090aed5)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-07-16 10:20:50 +01:00