Re: [OE-core] [PATCH] update-alternatives: introduce new package as a opkg-utils spin-off
On Tue, 2020-06-02 at 21:43 +0200, Andreas Oberritter wrote: > Hello Gregor, > On Tue, 2 Jun 2020 21:09:25 +0200"Gregor Zatko" > wrote: > > In some cases there is a need for update-alternatives script which > > gets builtwithin opkg-utils recipe into a standalone package. > > However, this causes tomany unnecessary dependencies, including > > Python, bc, OpenSSL etc. to be built. > > In this commit a standalone lightweight recipe for update- > > alternatives thatshouldn't be dependent on nothing other than bash. > > https://bugzilla.yoctoproject.org/show_bug.cgi?id=8879 > > > > Signed-off-by: Gregor Zatko --- > > .../conf/distro/include/default-providers.inc | 6 +-- > > meta/conf/layer.conf | 3 +- > > .../packagegroups/packagegroup-self-hosted.bb | 1 + .../opkg- > > utils/opkg-utils_0.4.2.bb| 25 +- .../update- > > alternatives_0.4.2.bb | 49 +++ > > why did you change the name from update-alternatives-opkg to update- > alternatives? I would prefer to keep the suffix in order to be able > to distinguish it more easily from other implementations, e.g. > dpkg's. > Best regards,Andreas I have no problem to revert the name back to original. However, I'm not sure whether this patch will be accepted because it seems to solve only a minimal part of the problem or nothing at all :-) -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139116): https://lists.openembedded.org/g/openembedded-core/message/139116 Mute This Topic: https://lists.openembedded.org/mt/74635039/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] update-alternatives: introduce new package as a opkg-utils spin-off
On Tue, 2020-06-02 at 15:27 -0400, Denys Dmytriyenko wrote: > On Tue, Jun 02, 2020 at 09:09:25PM +0200, Gregor Zatko wrote: > > In some cases there is a need for update-alternatives script which gets > > built > > within opkg-utils recipe into a standalone package. However, this causes to > > many unnecessary dependencies, including Python, bc, OpenSSL etc. to be > > built. > > > > In this commit a standalone lightweight recipe for update-alternatives that > > shouldn't be dependent on nothing other than bash. > > (R)Depending on bash doesn't make it lightweight anymore. This means you > cannot do tiny bash-less images with alternatives? Well, if I understand everyting correct then yes, it's not possible. However, I've mostly been a user of Yocto so please check my reasoning: - first, I made a comment here https://bugzilla.yoctoproject.org/show_bug.cgi?id=8879#c4 - if you take a look at http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/tree/update-alternatives you'll simply see it's a shellscript; if we wanted to have it without bash we'd need a C++ implementation, am I right? -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139115): https://lists.openembedded.org/g/openembedded-core/message/139115 Mute This Topic: https://lists.openembedded.org/mt/74635039/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] update-alternatives: introduce new package as a opkg-utils spin-off
In some cases there is a need for update-alternatives script which gets built
within opkg-utils recipe into a standalone package. However, this causes to
many unnecessary dependencies, including Python, bc, OpenSSL etc. to be built.
In this commit a standalone lightweight recipe for update-alternatives that
shouldn't be dependent on nothing other than bash.
https://bugzilla.yoctoproject.org/show_bug.cgi?id=8879
Signed-off-by: Gregor Zatko
---
.../conf/distro/include/default-providers.inc | 6 +--
meta/conf/layer.conf | 3 +-
.../packagegroups/packagegroup-self-hosted.bb | 1 +
.../opkg-utils/opkg-utils_0.4.2.bb| 25 +-
.../update-alternatives_0.4.2.bb | 49 +++
5 files changed, 56 insertions(+), 28 deletions(-)
create mode 100644
meta/recipes-devtools/update-alternatives/update-alternatives_0.4.2.bb
diff --git a/meta/conf/distro/include/default-providers.inc
b/meta/conf/distro/include/default-providers.inc
index ea88bd4876..035877af59 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -10,8 +10,8 @@ PREFERRED_PROVIDER_virtual/nativesdk-libgl ?= "nativesdk-mesa"
PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
PREFERRED_PROVIDER_virtual/mesa ?= "mesa"
-PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg-utils"
-PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-utils-native"
+PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives"
+PREFERRED_PROVIDER_virtual/update-alternatives-native ?=
"update-alternatives-native"
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
PREFERRED_PROVIDER_virtual/base-utils ?= "busybox"
PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel"
@@ -21,7 +21,7 @@ PREFERRED_PROVIDER_virtual/make-native ?= "make-native"
#
# Default virtual runtime providers
#
-VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-opkg"
+VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives"
VIRTUAL-RUNTIME_apm ?= "apm"
VIRTUAL-RUNTIME_alsa-state ?= "alsa-state"
VIRTUAL-RUNTIME_getopt ?= "util-linux-getopt"
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index da93d64e0a..85fb945f11 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -19,7 +19,6 @@ BBLAYERS_LAYERINDEX_NAME_core = "openembedded-core"
# Set a variable to get to the top of the metadata location
COREBASE = '${@os.path.normpath("${LAYERDIR}/../")}'
-# opkg-utils is for update-alternatives :(
SIGGEN_EXCLUDERECIPES_ABISAFE += " \
sysvinit-inittab \
busybox-inittab \
@@ -40,7 +39,7 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \
shadow \
shadow-sysroot \
base-passwd \
- opkg-utils \
+ update-alternatives \
gstreamer1.0-meta-base \
ca-certificates \
shared-mime-info \
diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
index 9a70b189a4..4a494f1578 100644
--- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
@@ -166,6 +166,7 @@ RDEPENDS_packagegroup-self-hosted-extended = "\
tcl \
texinfo \
unzip \
+update-alternatives \
usbutils \
watchdog \
wget \
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb
b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb
index 9315240190..5ebe3d8e60 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb
@@ -1,13 +1,11 @@
SUMMARY = "Additional utilities for the opkg package manager"
-SUMMARY_update-alternatives-opkg = "Utility for managing the alternatives
system"
SECTION = "base"
HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils;
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://opkg.py;beginline=2;endline=18;md5=ffa11ff3c15eb31c6a7ceaa00cc9f986"
-PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives',
'virtual/update-alternatives', '', d)}"
-SRC_URI =
"http://git.yoctoproject.org/cgit/cgit.cgi/${BPN}/snapshot/${BPN}-${PV}.tar.gz
\
+SRC_URI =
"http://git.yoctoproject.org/cgit/cgit.cgi/${BPN}/snapshot/${BPN}-${PV}.tar.gz \
file://fix-reproducibility.patch \
"
UPSTREAM_CHECK_URI =
"http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/refs/;
@@ -25,42 +23,23 @@ inherit perlnative
PYTHONRDEPS = "python3 python3-shell python3-io python3-math python3-crypt
python3-logging python3-fcntl python3-pickle python3-compr
[OE-core] [PATCH] [PATCH v3] docbook-xml: update recipe to stick with the upstream
Until now a Debian package has been used as a source. This change just switches it to project's upstream. https://bugzilla.yoctoproject.org/show_bug.cgi?id=13270 Signed-off-by: Gregor Zatko --- .../docbook-xml-dtd4/catalog-4.0.xml | 72 +++ .../docbook-xml-dtd4/catalog-4.1.2.xml| 66 +++ .../docbook-xml-update-catalog.xml.patch | 515 -- .../docbook-xml/docbook-xml-dtd4_4.5.bb | 68 ++- 4 files changed, 177 insertions(+), 544 deletions(-) create mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalog-4.0.xml create mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalog-4.1.2.xml delete mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalog-4.0.xml b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalog-4.0.xml new file mode 100644 index 00..aecf9c9f27 --- /dev/null +++ b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalog-4.0.xml @@ -0,0 +1,72 @@ + +http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd;> + + + + + + + + + + + + + + + + + + + +http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd; +uri="docbookx.dtd"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalog-4.1.2.xml b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalog-4.1.2.xml new file mode 100644 index 00..4cca2700a1 --- /dev/null +++ b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalog-4.1.2.xml @@ -0,0 +1,66 @@ + +http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd;> + + + + + + + + + + + + + + + + +http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd; +uri="docbookx.dtd"/> + +http://docbook.org/xml/4.1.2/docbookx.dtd; +uri="docbookx.dtd"/> + + + + + + + + + + + + + + + + + + + + + + + diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch deleted file mode 100644 index 59703609ca..00 --- a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch +++ /dev/null @@ -1,515 +0,0 @@ -docbook-xml: update catalog.xml - -Refer Ubuntu 13.04 to update catalog.xml - -Upstream-Status: Pending -Signed-off-by: Hongxu Jia - docbook-4.0/catalog.xml | 72 +++ - docbook-4.1.2/catalog.xml | 66 +++ - docbook-4.2/catalog.xml | 69 ++--- - docbook-4.3/catalog.xml | 72 --- - docbook-4.4/catalog.xml | 63 ++--- - docbook-4.5/catalog.xml | 63 ++--- - 6 files changed, 165 insertions(+), 240 deletions(-) - create mode 100644 docbook-4.0/catalog.xml - create mode 100644 docbook-4.1.2/catalog.xml - -diff --git a/docbook-4.0/catalog.xml b/docbook-4.0/catalog.xml -new file mode 100644 /dev/null -+++ b/docbook-4.0/catalog.xml -@@ -0,0 +1,72 @@ -+ -+http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd;> -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd; -+uri="docbookx.dtd"/> -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/docbook-4.1.2/catalog.xml b/docbook-4.1.2/catalog.xml -new file mode 100644 /dev/null -+++ b/docbook-4.1.2/catalog.xml -@@ -0,0 +1,66 @@ -+ -+http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd;> -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd; -+uri="docbookx.dtd"/> -+ -+http://docbook.org/xml/4.1.2/docbookx.dtd; -+uri="docbookx.dtd"/> -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/docbook-4.2/catalog.xml b/docbook-4.2/catalog.xml a/docbook-4.2/catalog.xml -+++ b/docbook-4.2/catalog.xml -@@ -1,4 +1,7 @@ - -+http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd;> -+ - - - -@@ -25,6 +28,12 @@ - - -+http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd; -+uri="docbookx.dtd"/> -+ -+http://docbook.org/xml/4.2/docbookx.dtd; -+uri="docbookx.dtd"/> -+ - - - -@@ -49,66 +58,6 @@ - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - -diff --git a/docbook-4.3/catalog.xml b/docbook-4.3/catalog.xml a/docbook-4.3/catalog.xml -+++ b/docbook-4.3/catalog.xml -@@ -1,4 +1,7 @@ - -+http://www.oasis-open.org/committees/entity/release/1.0/catal
Re: [OE-core] [PATCH] docbook-xml: update recipe to stick with the upstream
On Sun, 2020-05-24 at 16:24 +0100, Richard Purdie wrote: > On Sat, 2020-05-23 at 21:12 +0200, Gregor Zatko wrote: > > From: Gregor Zatko > > Until now a Debian package has been used as a source.This change > > just switches it to project's upstream. > > https://bugzilla.yoctoproject.org/show_bug.cgi?id=13270 > > > > Signed-off-by: Gregor Zatko --- .../docbook-xml- > > update-catalog.xml.patch | 515 -- .../docbook- > > xml/docbook-xml-dtd4_4.5.bb | 65 ++- 2 files changed, 36 > > insertions(+), 544 deletions(-) delete mode 100644 meta/recipes- > > devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update- > > catalog.xml.patch > > Unfortunately test builds failed: > https://autobuilder.yoctoproject.org/typhoon/#/builders/23/builds/2176 > > Cheers, > Richard The catalogs of versions 4.0 and 4.1.2 are not present standalone in the docbook.org page.A question is what is the best choice to include them into the file tree:1) add them directly2) add them as a patch3) extract from a Ubuntu/Debian package where they are present -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138863): https://lists.openembedded.org/g/openembedded-core/message/138863 Mute This Topic: https://lists.openembedded.org/mt/74423806/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] sanity.bbclass: Detect and fail if 'inherit' is used in conf file
Ok, thanks for the info.I shall read the guidelines again as I started
to contribute in the beginning of the year but was 3 months off then.
I'll add that next time.
On Sun, 2020-05-24 at 11:27 +0100, Paul Barker wrote:
> On Sun, 24 May 2020 at 11:24, Gregor Zatko wrote:
> > 'inherit' directive may not be used in conf files as it's
> > supposedto be used for the inheritance of classes.Correct form in
> > conf file is INHERIT.
> > This commit adds:- a sanity check to find whether the wrong case
> > exists- fail the build if so- tell user about the difference in
> > directives
> > https://bugzilla.yoctoproject.org/show_bug.cgi?id=5426
> >
> > Signed-off-by: Gregor Zatko ---
> > meta/classes/sanity.bbclass | 6 ++ 1 file changed, 6
> > insertions(+)
> > diff --git a/meta/classes/sanity.bbclass
> > b/meta/classes/sanity.bbclassindex 292c5591dd..e021b9d240 100644---
> > a/meta/classes/sanity.bbclass+++ b/meta/classes/sanity.bbclass@@
> > -784,6 +784,12 @@ def check_sanity_everybuild(status, d): if
> > "." in paths or "./" in paths or "" in
> > paths: status.addresult("PATH contains '.', './' or ''
> > (empty element), which will break the build, please remove
> > this.\nParsed PATH is " + str(paths) + "\n")
> > +# Check whether 'inherit' directive is found (used for a class
> > to inherit)+# in conf file it's supposed to be uppercase
> > INHERIT+inherit = d.getVar('inherit')+if
> > inherit:+status.addresult("Please don't use inherit
> > directive in your local.conf. The directive is supposed to be used
> > in classes and recipes only to inherit of bbclasses. Here INHERIT
> > should be used.\n")+ # Check that the DISTRO is valid, if
> > set # need to take into account DISTRO renaming
> > DISTRO distro = d.getVar('DISTRO')--2.26.2
>
> From
> https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded:Please
> substitute "PATCH" with "PATCH v2" if you are submitting arevised
> version after addressing feedback (or v3, v4 etc.).
> I've seen several versions of this patch today and it would be easy
> tolose track of which one is the latest if they arrive in
> someone'sinbox out-of-order.
> No need to re-send just for this but please add a version next time.
> Thanks,
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138641):
https://lists.openembedded.org/g/openembedded-core/message/138641
Mute This Topic: https://lists.openembedded.org/mt/74426802/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] sanity.bbclass: Detect and fail if 'inherit' is used in conf file
'inherit' directive may not be used in conf files as it's supposed
to be used for the inheritance of classes.
Correct form in conf file is INHERIT.
This commit adds:
- a sanity check to find whether the wrong case exists
- fail the build if so
- tell user about the difference in directives
https://bugzilla.yoctoproject.org/show_bug.cgi?id=5426
Signed-off-by: Gregor Zatko
---
meta/classes/sanity.bbclass | 6 ++
1 file changed, 6 insertions(+)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 292c5591dd..e021b9d240 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -784,6 +784,12 @@ def check_sanity_everybuild(status, d):
if "." in paths or "./" in paths or "" in paths:
status.addresult("PATH contains '.', './' or '' (empty element), which
will break the build, please remove this.\nParsed PATH is " + str(paths) + "\n")
+# Check whether 'inherit' directive is found (used for a class to inherit)
+# in conf file it's supposed to be uppercase INHERIT
+inherit = d.getVar('inherit')
+if inherit:
+status.addresult("Please don't use inherit directive in your
local.conf. The directive is supposed to be used in classes and recipes only to
inherit of bbclasses. Here INHERIT should be used.\n")
+
# Check that the DISTRO is valid, if set
# need to take into account DISTRO renaming DISTRO
distro = d.getVar('DISTRO')
--
2.26.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138639):
https://lists.openembedded.org/g/openembedded-core/message/138639
Mute This Topic: https://lists.openembedded.org/mt/74426802/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] 'inherit' directive may not be used in conf files as it's supposed to be used for the inheritance of classes. Correct form in conf file is INHERIT.
This commit adds:
- a sanity check to find whether the wrong case exists
- fail the build if so
- tell user about the difference in directives
https://bugzilla.yoctoproject.org/show_bug.cgi?id=5426
Signed-off-by: Gregor Zatko
---
meta/classes/sanity.bbclass | 6 ++
1 file changed, 6 insertions(+)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 292c5591dd..e021b9d240 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -784,6 +784,12 @@ def check_sanity_everybuild(status, d):
if "." in paths or "./" in paths or "" in paths:
status.addresult("PATH contains '.', './' or '' (empty element), which
will break the build, please remove this.\nParsed PATH is " + str(paths) + "\n")
+# Check whether 'inherit' directive is found (used for a class to inherit)
+# in conf file it's supposed to be uppercase INHERIT
+inherit = d.getVar('inherit')
+if inherit:
+status.addresult("Please don't use inherit directive in your
local.conf. The directive is supposed to be used in classes and recipes only to
inherit of bbclasses. Here INHERIT should be used.\n")
+
# Check that the DISTRO is valid, if set
# need to take into account DISTRO renaming DISTRO
distro = d.getVar('DISTRO')
--
2.26.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138638):
https://lists.openembedded.org/g/openembedded-core/message/138638
Mute This Topic: https://lists.openembedded.org/mt/74434832/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] file: add bzip2-replacement-native to DEPENDS to fix sstate issue
From: Jan-Simon Moeller
file-native when built on a Debian 10 host will embed a dependency to
'libbz2.so.1.0' (instead of 'libbz2.so.1'). This can cause issues
when sharing the sstate between hosts e.g.:
recipe-sysroot-native/usr/lib/rpm/rpmdeps:
error while loading shared libraries: libbz2.so.1.0: \
cannot open shared object file: No such file or directory
To avoid this situation, let's add the bzip2-replacement-native to the
file recipe's DEPENDS_class-native .
Details in https://bugzilla.yoctoproject.org/show_bug.cgi?id=13915 .
(From OE-Core rev: 4a996574464028bd5d57b90920d0887d1a81e9e9)
Signed-off-by: Jan-Simon Moeller
Signed-off-by: Richard Purdie
---
meta/classes/sanity.bbclass | 6 ++
1 file changed, 6 insertions(+)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 292c5591dd..e021b9d240 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -784,6 +784,12 @@ def check_sanity_everybuild(status, d):
if "." in paths or "./" in paths or "" in paths:
status.addresult("PATH contains '.', './' or '' (empty element), which
will break the build, please remove this.\nParsed PATH is " + str(paths) + "\n")
+# Check whether 'inherit' directive is found (used for a class to inherit)
+# in conf file it's supposed to be uppercase INHERIT
+inherit = d.getVar('inherit')
+if inherit:
+status.addresult("Please don't use inherit directive in your
local.conf. The directive is supposed to be used in classes and recipes only to
inherit of bbclasses. Here INHERIT should be used.\n")
+
# Check that the DISTRO is valid, if set
# need to take into account DISTRO renaming DISTRO
distro = d.getVar('DISTRO')
--
2.26.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138636):
https://lists.openembedded.org/g/openembedded-core/message/138636
Mute This Topic: https://lists.openembedded.org/mt/74434698/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] sanity.bbclass: Detect and fail if 'inherit' is used in conf file
'inherit' directive may not be used in conf files as it's supposed
to be used for the inheritance of classes.
Correct form in conf file is INHERIT.
This commit adds:
- a sanity check to find whether the wrong case exists
- fail the build if so
- tell user about the difference in directives
https://bugzilla.yoctoproject.org/show_bug.cgi?id=5426
Signed-off-by: Gregor Zatko
---
meta/classes/sanity.bbclass | 48 +
1 file changed, 27 insertions(+), 21 deletions(-)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 292c5591dd..b6b3d0c71d 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -25,7 +25,7 @@ def sanity_conf_update(fn, lines, version_var_name,
new_version):
with open(fn, "w") as f:
f.write(''.join(lines))
-# Functions added to this variable MUST throw a NotImplementedError exception
unless
+# Functions added to this variable MUST throw a NotImplementedError exception
unless
# they successfully changed the config version in the config file. Exceptions
# are used since exec_func doesn't handle return values.
BBLAYERS_CONF_UPDATE_FUNCS += " \
@@ -42,13 +42,13 @@ python oecore_update_localconf() {
current_conf = d.getVar('CONF_VERSION')
conf_version = d.getVar('LOCALCONF_VERSION')
-failmsg = """Your version of local.conf was generated from an older/newer
version of
-local.conf.sample and there have been updates made to this file. Please
compare the two
+failmsg = """Your version of local.conf was generated from an older/newer
version of
+local.conf.sample and there have been updates made to this file. Please
compare the two
files and merge any changes before continuing.
Matching the version numbers will remove this message.
-\"${SANITY_DIFF_TOOL} conf/local.conf ${SANITY_LOCALCONF_SAMPLE}\"
+\"${SANITY_DIFF_TOOL} conf/local.conf ${SANITY_LOCALCONF_SAMPLE}\"
is a good way to visualise the changes."""
failmsg = d.expand(failmsg)
@@ -62,13 +62,13 @@ python oecore_update_siteconf() {
current_sconf = d.getVar('SCONF_VERSION')
sconf_version = d.getVar('SITE_CONF_VERSION')
-failmsg = """Your version of site.conf was generated from an older version
of
-site.conf.sample and there have been updates made to this file. Please compare
the two
+failmsg = """Your version of site.conf was generated from an older version
of
+site.conf.sample and there have been updates made to this file. Please compare
the two
files and merge any changes before continuing.
Matching the version numbers will remove this message.
-\"${SANITY_DIFF_TOOL} conf/site.conf ${SANITY_SITECONF_SAMPLE}\"
+\"${SANITY_DIFF_TOOL} conf/site.conf ${SANITY_SITECONF_SAMPLE}\"
is a good way to visualise the changes."""
failmsg = d.expand(failmsg)
@@ -85,7 +85,7 @@ python oecore_update_bblayers() {
failmsg = """Your version of bblayers.conf has the wrong LCONF_VERSION
(has ${LCONF_VERSION}, expecting ${LAYER_CONF_VERSION}).
Please compare your file against bblayers.conf.sample and merge any changes
before continuing.
-"${SANITY_DIFF_TOOL} conf/bblayers.conf ${SANITY_BBLAYERCONF_SAMPLE}"
+"${SANITY_DIFF_TOOL} conf/bblayers.conf ${SANITY_BBLAYERCONF_SAMPLE}"
is a good way to visualise the changes."""
failmsg = d.expand(failmsg)
@@ -182,7 +182,7 @@ def raise_sanity_error(msg, d, network_error=False):
bb.fatal(""" OE-core's config sanity checker detected a potential
misconfiguration.
Either fix the cause of this error or at your own risk disable the checker
(see sanity.conf).
Following is the list of potential problems / advisories:
-
+
%s""" % msg)
# Check flags associated with a tuning.
@@ -538,7 +538,7 @@ def check_wsl(d):
def check_gcc_version(sanity_data):
from distutils.version import LooseVersion
import subprocess
-
+
build_cc, version = oe.utils.get_host_compiler_version(sanity_data)
if build_cc.strip() == "gcc":
if LooseVersion(version) < LooseVersion("6.0"):
@@ -561,7 +561,7 @@ def check_tar_version(sanity_data):
return None
# We use git parameters and functionality only found in 1.7.8 or later
-# The kernel tools assume git >= 1.8.3.1 (verified needed > 1.7.9.5) see #6162
+# The kernel tools assume git >= 1.8.3.1 (verified needed > 1.7.9.5) see #6162
# The git fetcher also had workarounds for git < 1.7.9.2 which we've dropped
def check_git_version(sanity_data):
from distutils.version import LooseVersion
@@ -644,7 +644,7 @@ def check_sanity_sstate_dir_change(sstate_dir, data):
def check_sanity_version_change(status, d):
# Sanity checks to be done when SANITY_VERSION or NATIVELSBSTRING change
[OE-core] [PATCH] sanity.bbclass: Detect and fail if 'inherit' is used in conf file
'inherit' directive may not be used in conf files as it's supposed
to be used for the inheritance of recipes.
Correct form in conf file is INHERIT.
This commit adds:
- a sanity check to find whether the wrong case exists
- fail the build if so
- tell user about the difference in directives
https://bugzilla.yoctoproject.org/show_bug.cgi?id=5426
Signed-off-by: Gregor Zatko
---
meta/classes/sanity.bbclass | 48 +
1 file changed, 27 insertions(+), 21 deletions(-)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 292c5591dd..8367842af0 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -25,7 +25,7 @@ def sanity_conf_update(fn, lines, version_var_name,
new_version):
with open(fn, "w") as f:
f.write(''.join(lines))
-# Functions added to this variable MUST throw a NotImplementedError exception
unless
+# Functions added to this variable MUST throw a NotImplementedError exception
unless
# they successfully changed the config version in the config file. Exceptions
# are used since exec_func doesn't handle return values.
BBLAYERS_CONF_UPDATE_FUNCS += " \
@@ -42,13 +42,13 @@ python oecore_update_localconf() {
current_conf = d.getVar('CONF_VERSION')
conf_version = d.getVar('LOCALCONF_VERSION')
-failmsg = """Your version of local.conf was generated from an older/newer
version of
-local.conf.sample and there have been updates made to this file. Please
compare the two
+failmsg = """Your version of local.conf was generated from an older/newer
version of
+local.conf.sample and there have been updates made to this file. Please
compare the two
files and merge any changes before continuing.
Matching the version numbers will remove this message.
-\"${SANITY_DIFF_TOOL} conf/local.conf ${SANITY_LOCALCONF_SAMPLE}\"
+\"${SANITY_DIFF_TOOL} conf/local.conf ${SANITY_LOCALCONF_SAMPLE}\"
is a good way to visualise the changes."""
failmsg = d.expand(failmsg)
@@ -62,13 +62,13 @@ python oecore_update_siteconf() {
current_sconf = d.getVar('SCONF_VERSION')
sconf_version = d.getVar('SITE_CONF_VERSION')
-failmsg = """Your version of site.conf was generated from an older version
of
-site.conf.sample and there have been updates made to this file. Please compare
the two
+failmsg = """Your version of site.conf was generated from an older version
of
+site.conf.sample and there have been updates made to this file. Please compare
the two
files and merge any changes before continuing.
Matching the version numbers will remove this message.
-\"${SANITY_DIFF_TOOL} conf/site.conf ${SANITY_SITECONF_SAMPLE}\"
+\"${SANITY_DIFF_TOOL} conf/site.conf ${SANITY_SITECONF_SAMPLE}\"
is a good way to visualise the changes."""
failmsg = d.expand(failmsg)
@@ -85,7 +85,7 @@ python oecore_update_bblayers() {
failmsg = """Your version of bblayers.conf has the wrong LCONF_VERSION
(has ${LCONF_VERSION}, expecting ${LAYER_CONF_VERSION}).
Please compare your file against bblayers.conf.sample and merge any changes
before continuing.
-"${SANITY_DIFF_TOOL} conf/bblayers.conf ${SANITY_BBLAYERCONF_SAMPLE}"
+"${SANITY_DIFF_TOOL} conf/bblayers.conf ${SANITY_BBLAYERCONF_SAMPLE}"
is a good way to visualise the changes."""
failmsg = d.expand(failmsg)
@@ -182,7 +182,7 @@ def raise_sanity_error(msg, d, network_error=False):
bb.fatal(""" OE-core's config sanity checker detected a potential
misconfiguration.
Either fix the cause of this error or at your own risk disable the checker
(see sanity.conf).
Following is the list of potential problems / advisories:
-
+
%s""" % msg)
# Check flags associated with a tuning.
@@ -538,7 +538,7 @@ def check_wsl(d):
def check_gcc_version(sanity_data):
from distutils.version import LooseVersion
import subprocess
-
+
build_cc, version = oe.utils.get_host_compiler_version(sanity_data)
if build_cc.strip() == "gcc":
if LooseVersion(version) < LooseVersion("6.0"):
@@ -561,7 +561,7 @@ def check_tar_version(sanity_data):
return None
# We use git parameters and functionality only found in 1.7.8 or later
-# The kernel tools assume git >= 1.8.3.1 (verified needed > 1.7.9.5) see #6162
+# The kernel tools assume git >= 1.8.3.1 (verified needed > 1.7.9.5) see #6162
# The git fetcher also had workarounds for git < 1.7.9.2 which we've dropped
def check_git_version(sanity_data):
from distutils.version import LooseVersion
@@ -644,7 +644,7 @@ def check_sanity_sstate_dir_change(sstate_dir, data):
def check_sanity_version_change(status, d):
# Sanity checks to be done when SANITY_VERSION or NATIVELSBSTRING change
[OE-core] [PATCH] Detect and fail if 'inherit' is used in conf file
'inherit' directive may not be used in conf files as it's supposed
to be used for the inheritance of recipes.
Correct form in conf file is INHERIT.
This commit adds:
- a sanity check to find whether the wrong case exists
- fail the build if so
- tell user about the difference in directives
https://bugzilla.yoctoproject.org/show_bug.cgi?id=5426
---
meta/classes/sanity.bbclass | 48 +
1 file changed, 27 insertions(+), 21 deletions(-)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 292c5591dd..8367842af0 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -25,7 +25,7 @@ def sanity_conf_update(fn, lines, version_var_name,
new_version):
with open(fn, "w") as f:
f.write(''.join(lines))
-# Functions added to this variable MUST throw a NotImplementedError exception
unless
+# Functions added to this variable MUST throw a NotImplementedError exception
unless
# they successfully changed the config version in the config file. Exceptions
# are used since exec_func doesn't handle return values.
BBLAYERS_CONF_UPDATE_FUNCS += " \
@@ -42,13 +42,13 @@ python oecore_update_localconf() {
current_conf = d.getVar('CONF_VERSION')
conf_version = d.getVar('LOCALCONF_VERSION')
-failmsg = """Your version of local.conf was generated from an older/newer
version of
-local.conf.sample and there have been updates made to this file. Please
compare the two
+failmsg = """Your version of local.conf was generated from an older/newer
version of
+local.conf.sample and there have been updates made to this file. Please
compare the two
files and merge any changes before continuing.
Matching the version numbers will remove this message.
-\"${SANITY_DIFF_TOOL} conf/local.conf ${SANITY_LOCALCONF_SAMPLE}\"
+\"${SANITY_DIFF_TOOL} conf/local.conf ${SANITY_LOCALCONF_SAMPLE}\"
is a good way to visualise the changes."""
failmsg = d.expand(failmsg)
@@ -62,13 +62,13 @@ python oecore_update_siteconf() {
current_sconf = d.getVar('SCONF_VERSION')
sconf_version = d.getVar('SITE_CONF_VERSION')
-failmsg = """Your version of site.conf was generated from an older version
of
-site.conf.sample and there have been updates made to this file. Please compare
the two
+failmsg = """Your version of site.conf was generated from an older version
of
+site.conf.sample and there have been updates made to this file. Please compare
the two
files and merge any changes before continuing.
Matching the version numbers will remove this message.
-\"${SANITY_DIFF_TOOL} conf/site.conf ${SANITY_SITECONF_SAMPLE}\"
+\"${SANITY_DIFF_TOOL} conf/site.conf ${SANITY_SITECONF_SAMPLE}\"
is a good way to visualise the changes."""
failmsg = d.expand(failmsg)
@@ -85,7 +85,7 @@ python oecore_update_bblayers() {
failmsg = """Your version of bblayers.conf has the wrong LCONF_VERSION
(has ${LCONF_VERSION}, expecting ${LAYER_CONF_VERSION}).
Please compare your file against bblayers.conf.sample and merge any changes
before continuing.
-"${SANITY_DIFF_TOOL} conf/bblayers.conf ${SANITY_BBLAYERCONF_SAMPLE}"
+"${SANITY_DIFF_TOOL} conf/bblayers.conf ${SANITY_BBLAYERCONF_SAMPLE}"
is a good way to visualise the changes."""
failmsg = d.expand(failmsg)
@@ -182,7 +182,7 @@ def raise_sanity_error(msg, d, network_error=False):
bb.fatal(""" OE-core's config sanity checker detected a potential
misconfiguration.
Either fix the cause of this error or at your own risk disable the checker
(see sanity.conf).
Following is the list of potential problems / advisories:
-
+
%s""" % msg)
# Check flags associated with a tuning.
@@ -538,7 +538,7 @@ def check_wsl(d):
def check_gcc_version(sanity_data):
from distutils.version import LooseVersion
import subprocess
-
+
build_cc, version = oe.utils.get_host_compiler_version(sanity_data)
if build_cc.strip() == "gcc":
if LooseVersion(version) < LooseVersion("6.0"):
@@ -561,7 +561,7 @@ def check_tar_version(sanity_data):
return None
# We use git parameters and functionality only found in 1.7.8 or later
-# The kernel tools assume git >= 1.8.3.1 (verified needed > 1.7.9.5) see #6162
+# The kernel tools assume git >= 1.8.3.1 (verified needed > 1.7.9.5) see #6162
# The git fetcher also had workarounds for git < 1.7.9.2 which we've dropped
def check_git_version(sanity_data):
from distutils.version import LooseVersion
@@ -644,7 +644,7 @@ def check_sanity_sstate_dir_change(sstate_dir, data):
def check_sanity_version_change(status, d):
# Sanity checks to be done when SANITY_VERSION or NATIVELSBSTRING changes
-# In other words, these tests run once in a given build directory and then
+# In other words, these tests run once in a given build directory and then
# never again until the sanity version or host distrubution id/version
changes.
# Check the python install is complete.
[OE-core] [PATCH] docbook-xml: update recipe to stick with the upstream
From: Gregor Zatko Until now a Debian package has been used as a source. This change just switches it to project's upstream. https://bugzilla.yoctoproject.org/show_bug.cgi?id=13270 Signed-off-by: Gregor Zatko --- .../docbook-xml-update-catalog.xml.patch | 515 -- .../docbook-xml/docbook-xml-dtd4_4.5.bb | 65 ++- 2 files changed, 36 insertions(+), 544 deletions(-) delete mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch deleted file mode 100644 index 59703609ca..00 --- a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch +++ /dev/null @@ -1,515 +0,0 @@ -docbook-xml: update catalog.xml - -Refer Ubuntu 13.04 to update catalog.xml - -Upstream-Status: Pending -Signed-off-by: Hongxu Jia - docbook-4.0/catalog.xml | 72 +++ - docbook-4.1.2/catalog.xml | 66 +++ - docbook-4.2/catalog.xml | 69 ++--- - docbook-4.3/catalog.xml | 72 --- - docbook-4.4/catalog.xml | 63 ++--- - docbook-4.5/catalog.xml | 63 ++--- - 6 files changed, 165 insertions(+), 240 deletions(-) - create mode 100644 docbook-4.0/catalog.xml - create mode 100644 docbook-4.1.2/catalog.xml - -diff --git a/docbook-4.0/catalog.xml b/docbook-4.0/catalog.xml -new file mode 100644 /dev/null -+++ b/docbook-4.0/catalog.xml -@@ -0,0 +1,72 @@ -+ -+http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd;> -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd; -+uri="docbookx.dtd"/> -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/docbook-4.1.2/catalog.xml b/docbook-4.1.2/catalog.xml -new file mode 100644 /dev/null -+++ b/docbook-4.1.2/catalog.xml -@@ -0,0 +1,66 @@ -+ -+http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd;> -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd; -+uri="docbookx.dtd"/> -+ -+http://docbook.org/xml/4.1.2/docbookx.dtd; -+uri="docbookx.dtd"/> -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/docbook-4.2/catalog.xml b/docbook-4.2/catalog.xml a/docbook-4.2/catalog.xml -+++ b/docbook-4.2/catalog.xml -@@ -1,4 +1,7 @@ - -+http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd;> -+ - - - -@@ -25,6 +28,12 @@ - - -+http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd; -+uri="docbookx.dtd"/> -+ -+http://docbook.org/xml/4.2/docbookx.dtd; -+uri="docbookx.dtd"/> -+ - - - -@@ -49,66 +58,6 @@ - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - -diff --git a/docbook-4.3/catalog.xml b/docbook-4.3/catalog.xml a/docbook-4.3/catalog.xml -+++ b/docbook-4.3/catalog.xml -@@ -1,4 +1,7 @@ - -+http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd;> -+ - - - -@@ -25,12 +28,21 @@ - - -+http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd; -+uri="docbookx.dtd"/> -+ -+http://docbook.org/xml/4.3/docbookx.dtd; -+uri="docbookx.dtd"/> -+ - - - - - -+ -+ - - -@@ -49,66 +61,6 @@ - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - -diff --git a/docbook-4.4/catalog.xml b/docbook-4.4/catalog.xml a/docbook-4.4/catalog.xml -+++ b/docbook-4.4/catalog.xml -@@ -1,4 +1,7 @@ - -+http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd;> -+ - - - -@@ -58,66 +61,6 @@ - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - -diff --git a/docbook-4.5/catalog.xml b/docbook-4.5/catalog.xml a/docbook-4.5/catalog.xml -+++ b/docbook-4.5/catalog.xml -@@ -1,4 +1,7 @@ - -+http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd;> -+ - - - -@@ -58,66 +61,6 @@ - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - --- -1.8.1.2 - diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb index 6452c8d99f..39c4da418b 100644 --- a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb +++ b/meta/recipes-devtools/docbook-xml/docb
Re: [OE-core] [PATCH] docbook-xml: update recipe to stick with the upstream
Yes I think so. I supposed that if there's only 4 catalogs it can be done this way but if the policy is to download everything then OK - I'll rewrite the recipe, hope this time finally well. G. On Sat, 2020-05-23 at 20:50 +0200, Alexander Kanavin wrote: > Can the original source be fetched though? Copying things over into > the layer itself is not the best option. > > Alex > > > On Sat, 23 May 2020 at 19:20, Gregor Zatko wrote: > > From: Gregor Zatko > > > > > > > > Until now a Debian package has been used as a source. > > > > This change just switches it to project's upstream. > > > > > > > > https://bugzilla.yoctoproject.org/show_bug.cgi?id=13270 > > > > > > > > Signed-off-by: Gregor Zatko > > > > --- > > > > .../docbook-xml-dtd4/catalogs/catalog-4.2.xml | 115 > > > > .../docbook-xml-dtd4/catalogs/catalog-4.3.xml | 115 > > > > .../docbook-xml-dtd4/catalogs/catalog-4.4.xml | 124 + > > > > .../docbook-xml-dtd4/catalogs/catalog-4.5.xml | 124 + > > > > .../docbook-xml-update-catalog.xml.patch | 515 -- > > > > > > .../docbook-xml/docbook-xml-dtd4_4.5.bb | 52 +- > > > > 6 files changed, 502 insertions(+), 543 deletions(-) > > > > create mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml- > > dtd4/catalogs/catalog-4.2.xml > > > > create mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml- > > dtd4/catalogs/catalog-4.3.xml > > > > create mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml- > > dtd4/catalogs/catalog-4.4.xml > > > > create mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml- > > dtd4/catalogs/catalog-4.5.xml > > > > delete mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml- > > dtd4/docbook-xml-update-catalog.xml.patch > > > > > > > > diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml- > > dtd4/catalogs/catalog-4.2.xml b/meta/recipes-devtools/docbook- > > xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml > > > > new file mode 100644 > > > > index 00..6920c2f7e0 > > > > --- /dev/null > > > > +++ b/meta/recipes-devtools/docbook-xml/docbook-xml- > > dtd4/catalogs/catalog-4.2.xml > > > > @@ -0,0 +1,115 @@ > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > +uri="docbookx.dtd"/> > > > > + > > > > + > > > > + > > > > + > > > > + > > > +uri="calstblx.dtd"/> > > > > + > > > > + > > > +uri="soextblx.dtd"/> > > > > + > > > > + > > > +uri="dbpoolx.mod"/> > > > > + > > > > + > > > +uri="dbhierx.mod"/> > > > > + > > > > + > > > +uri="dbgenent.mod"/> > > > > + > > > > + > > > +uri="dbnotnx.mod"/> > > > > + > > > > + > > > +uri="dbcentx.mod"/> > > > > + > > > > + > > > > + > > > > + > > > > + > > > +uri="ent/iso-dia.ent"/> > > > > + > > > > + > > > +uri="ent/iso-num.ent"/> > > > > + > > > > + > > > +uri="ent/iso-pub.ent"/> > > > > + > > > > + > > > +uri="ent/iso-tech.ent"/> > > > > + > > > > + > > > +uri="ent/iso-lat1.ent"/> > > > > + > > > > + > > > +uri="ent/iso-lat2.ent"/> > > > > + > > > > + > > > +uri="ent/iso-grk1.ent"/> > > > > + > > > > + > > > +uri="ent/iso-grk2.ent"/> > > > > + > > > > + > > > +uri="ent/iso-grk3.ent"/> > > > > + > > > > + > > > +uri="ent/iso-grk4.ent"/> > > > > + &g
[OE-core] [PATCH] docbook-xml: update recipe to stick with the upstream
From: Gregor Zatko Until now a Debian package has been used as a source. This change just switches it to project's upstream. https://bugzilla.yoctoproject.org/show_bug.cgi?id=13270 Signed-off-by: Gregor Zatko --- .../docbook-xml-dtd4/catalogs/catalog-4.2.xml | 115 .../docbook-xml-dtd4/catalogs/catalog-4.3.xml | 115 .../docbook-xml-dtd4/catalogs/catalog-4.4.xml | 124 + .../docbook-xml-dtd4/catalogs/catalog-4.5.xml | 124 + .../docbook-xml-update-catalog.xml.patch | 515 -- .../docbook-xml/docbook-xml-dtd4_4.5.bb | 52 +- 6 files changed, 502 insertions(+), 543 deletions(-) create mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml create mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.3.xml create mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml create mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.5.xml delete mode 100644 meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml new file mode 100644 index 00..6920c2f7e0 --- /dev/null +++ b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.2.xml @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.3.xml b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.3.xml new file mode 100644 index 00..34d1afdd94 --- /dev/null +++ b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.3.xml @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml new file mode 100644 index 00..8d709ba102 --- /dev/null +++ b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.4.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + +http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd; + uri="docbookx.dtd"/> + +http://docbook.org/xml/4.4/docbookx.dtd; + uri="docbookx.dtd"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.5.xml b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.5.xml new file mode 100644 index 00..f75c1d764d --- /dev/null +++ b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/catalogs/catalog-4.5.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + +http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd; + uri="docbookx.dtd"/> + +http://docbook.org/xml/4.5/docbookx.dtd; + uri="docbookx.dtd"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch deleted file mode 100644 index 59703609ca..00 --- a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch +++ /dev/null @@ -1,515 +0,0 @@ -docbook-xml: update catalog.xml - -Refer Ubuntu 13.04 to update catalog.xml - -Upstream-Status: Pending -Signed-off-by: Hongxu Jia - docbook-4.0/catalog.xml | 72 +++ - docbook-4.1.2/catalog.xml | 66 +++ - docbook-4.2/catalog.xml | 69 ++--- - docbook-4.3/catalog.xml | 72 --- - docbook-4.4/catalog.xml | 63 ++--- - docbook-4.5/catalog.xml | 63 ++--- - 6 files changed, 165 insertions(+), 240 deletions(-) - create mode 100644 docbook-4.0/catalog.xml - create mode 100644 docbook-4.1.2/catalog.xml - -diff --git a/docbook-4.0/catalog.xml b/docbook-4.0/catalog.xml -new file mode 100644 /dev/null -+++ b/docbook-4.0/catalog.xml -@@ -0,0 +1,72 @@ -+ -+http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd;> -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+http://www.oasis-open.org/do
