[OE-core][dunfell][PATCH v2] wireless-regdb: Upgrade 2019.06.03 -> 2020.04.29
From: Adrian Bunk
(From OE-Core rev: 5b71a3f3d1bca6b52f53b97971131a6771618420)
Signed-off-by: Adrian Bunk
Signed-off-by: Richard Purdie
---
This is regulatory data containing the legal wifi frequencies
for most countries.
---
...reless-regdb_2019.06.03.bb => wireless-regdb_2020.04.29.bb} | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
rename meta/recipes-kernel/wireless-regdb/{wireless-regdb_2019.06.03.bb =>
wireless-regdb_2020.04.29.bb} (91%)
diff --git a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2019.06.03.bb
b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2020.04.29.bb
similarity index 91%
rename from meta/recipes-kernel/wireless-regdb/wireless-regdb_2019.06.03.bb
rename to meta/recipes-kernel/wireless-regdb/wireless-regdb_2020.04.29.bb
index 9076d94601..a5827b9ef0 100644
--- a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2019.06.03.bb
+++ b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2020.04.29.bb
@@ -5,8 +5,7 @@ LICENSE = "ISC"
LIC_FILES_CHKSUM = "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c"
SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz;
-SRC_URI[md5sum] = "4b5ba3f089db7fdb7b9daae6a7c1f2cb"
-SRC_URI[sha256sum] =
"cd917ed86b63ce8d93947979f1f18948f03a4ac0ad89ec25227b36ac00dc54bf"
+SRC_URI[sha256sum] =
"89fd031aed5977c219a71501e144375a10e7c90d1005d5d086ea7972886a2c7a"
inherit bin_package allarch
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138634):
https://lists.openembedded.org/g/openembedded-core/message/138634
Mute This Topic: https://lists.openembedded.org/mt/74427825/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core][dunfell][PATCH v2] git: Upgrade 2.24.1 -> 2.24.3
This includes the fixes for CVE-2020-5260 and CVE-2020-11008.
Signed-off-by: Adrian Bunk
---
meta/recipes-devtools/git/git_2.24.1.bb | 11 ---
meta/recipes-devtools/git/git_2.24.3.bb | 9 +
2 files changed, 9 insertions(+), 11 deletions(-)
delete mode 100644 meta/recipes-devtools/git/git_2.24.1.bb
create mode 100644 meta/recipes-devtools/git/git_2.24.3.bb
diff --git a/meta/recipes-devtools/git/git_2.24.1.bb
b/meta/recipes-devtools/git/git_2.24.1.bb
deleted file mode 100644
index daea31eab2..00
--- a/meta/recipes-devtools/git/git_2.24.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require git.inc
-
-EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
-
ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
- "
-EXTRA_OEMAKE += "NO_GETTEXT=1"
-
-SRC_URI[tarball.md5sum] = "166bde96adbbc11c8843d4f8f4f9811b"
-SRC_URI[tarball.sha256sum] =
"ad5334956301c86841eb1e5b1bb20884a6bad89a10a6762c958220c7cf64da02"
-SRC_URI[manpages.md5sum] = "31c2272a8979022497ba3d4202df145d"
-SRC_URI[manpages.sha256sum] =
"9a7ae3a093bea39770eb96ca3e5b40bff7af0b9f6123f089d7821d0e5b8e1230"
diff --git a/meta/recipes-devtools/git/git_2.24.3.bb
b/meta/recipes-devtools/git/git_2.24.3.bb
new file mode 100644
index 00..ddd875f07b
--- /dev/null
+++ b/meta/recipes-devtools/git/git_2.24.3.bb
@@ -0,0 +1,9 @@
+require git.inc
+
+EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
+
ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
+ "
+EXTRA_OEMAKE += "NO_GETTEXT=1"
+
+SRC_URI[tarball.sha256sum] =
"ef6d1d1de1d7921a54d23d07479bd2766f050d6435cea5d3b5322aa4897cb3d7"
+SRC_URI[manpages.sha256sum] =
"325795ba33c0be02370de79636f32ad3b447665c1f2b5b4de65181fa804bed31"
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138633):
https://lists.openembedded.org/g/openembedded-core/message/138633
Mute This Topic: https://lists.openembedded.org/mt/74427824/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] docbook-xml: update recipe to stick with the upstream
Thanks, this looks fine now. Alex On Sat, 23 May 2020 at 21:12, 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 > > 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 @@ > -+ > -+ V1.0//EN" > -+"http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd > "> > -+ > -+ > -+ > -+ > -+ > -+ > -+ > -+ > -+ > -+ > -+ > -+ > -+ > -+ > -+ -+uri="docbookx.dtd"/> > -+ > -+ > -+ -+uri="docbookx.dtd"/> > -+ > -+http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd > " > -+uri="docbookx.dtd"/> > -+ > -+ > -+ > -+ > -+ -+uri="dbnotnx.mod"/> > -+ > -+ -+uri="dbcentx.mod"/> > -+ > -+ -+uri="dbpoolx.mod"/> > -+ > -+ -+uri="dbhierx.mod"/> > -+ > -+ -+uri="dbgenent.mod"/> > -+ > -+ -+uri="calstblx.dtd"/> > -+ > -+ > -+ > -+ -+uri="soextblx.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 @@ > -+ > -+ V1.0//EN" > -+"http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd > "> > -+ > -+ > -+ > -+ > -+ > -+ > -+ > -+ > -+ > -+ > -+ > -+ > -+ > -+ > -+ -+uri="docbookx.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"/> > -+ > -+ > -+ > -+ > -+ -+uri="calstblx.dtd"/> > -+ > -+ > -+ > -+ -+uri="dbpoolx.mod"/> > -+ > -+ -+uri="dbhierx.mod"/> > -+ > -+ -+uri="dbgenent.mod"/> > -+ > -+ -+uri="dbnotnx.mod"/> > -+ > -+ -+uri="dbcentx.mod"/> > -+ > -+ > -+ > -+ > -+ > -+ > -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 @@ > - > -+ V1.0//EN" > -+"http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd > "> > -+ > - > - > - > -@@ -25,6 +28,12 @@ > - - uri="docbookx.dtd"/> > - > -+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 @@ > - - 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"/> > -- > -- --uri="ent/iso-amsa.ent"/> > -- > -- --uri="ent/iso-amsb.ent"/> > -- > -- --uri="ent/iso-amsc.ent"/> > -- > -- --uri="ent/iso-amsn.ent"/> > -- > -- --uri="ent/iso-amso.ent"/> > -- > -- --uri="ent/iso-amsr.ent"/> > -- > -- --uri="ent/iso-box.ent"/> > -- > -- --uri="ent/iso-cyr1.ent"/> > -- > -- --uri="ent/iso-cyr2.ent"/> > -- > - > -
[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 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
Re: [OE-core] [PATCH] sanity.bbclass: Detect and fail if 'inherit' is used in conf file
On Sat, 23 May 2020, Gregor Zatko wrote: > 'inherit' directive may not be used in conf files as it's supposed > to be used for the inheritance of recipes. no, it's for the inheritance of class files. rday -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138630): https://lists.openembedded.org/g/openembedded-core/message/138630 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 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 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
[OE-core] ✗ patchtest: failure for Detect and fail if 'inherit' is used in conf file
== Series Details == Series: Detect and fail if 'inherit' is used in conf file Revision: 1 URL : https://patchwork.openembedded.org/series/24289/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * PatchDetect and fail if 'inherit' is used in conf file Issue Shortlog does not follow expected format [test_shortlog_format] Suggested fixCommit shortlog (first line of commit message) should follow the format ": " * PatchDetect and fail if 'inherit' is used in conf file Issue Patch is missing Signed-off-by [test_signed_off_by_presence] Suggested fixSign off the patch (either manually or with "git commit --amend -s") If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138628): https://lists.openembedded.org/g/openembedded-core/message/138628 Mute This Topic: https://lists.openembedded.org/mt/74426553/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] 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] [zeus/dunfell PATCH] avahi: Don't advertise example services by default
The example service files are placed into /etc/avahi/services when we
run `make install` for avahi. This results in ssh and sftp-ssh services
being announced by default even if no ssh server is installed in an
image.
These example files should be moved away to another location such as
/usr/share/doc/avahi (taking inspiration from Arch Linux).
Signed-off-by: Paul Barker
---
meta/recipes-connectivity/avahi/avahi.inc | 5 +
1 file changed, 5 insertions(+)
diff --git a/meta/recipes-connectivity/avahi/avahi.inc
b/meta/recipes-connectivity/avahi/avahi.inc
index 94fe6a16b6..6acedb5412 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -77,6 +77,11 @@ do_install() {
rm -rf ${D}${datadir}/dbus-1/interfaces
test -d ${D}${datadir}/dbus-1 && rmdir --ignore-fail-on-non-empty
${D}${datadir}/dbus-1
rm -rf ${D}${libdir}/avahi
+
+ # Move example service files out of /etc/avahi/services so we don't
+ # advertise ssh & sftp-ssh by default
+ install -d ${D}${docdir}/avahi
+ mv ${D}${sysconfdir}/avahi/services/* ${D}${docdir}/avahi
}
PACKAGES =+ "${@bb.utils.contains("PACKAGECONFIG", "libdns_sd",
"libavahi-compat-libdnssd", "", d)}"
--
2.26.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138626):
https://lists.openembedded.org/g/openembedded-core/message/138626
Mute This Topic: https://lists.openembedded.org/mt/74425792/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] 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/docbook-xml-dtd4_4.5.bb @@ -1,9 +1,10 @@ SUMMARY = "Document type definitions for verification of XML data files"
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"/> > > > > + > > > > + > > > +uri="ent/iso-amsa.ent"/> > > > > + > > > > + > > > +uri="ent/iso-amsb.ent"/> > > > > + > > > > + > > > +uri="ent/iso-amsc.ent"/> > > > > + > > > > + > > > +uri="ent/iso-amsn.ent"/> > > > > + > > > > + > > > +uri="ent/iso-amso.ent"/> > > > > + > > > > + > > > +uri="ent/iso-amsr.ent"/> > > > > + > > > > + > > > +uri="ent/iso-box.ent"/> > > > > + > > > > + > > > +uri="ent/iso-cyr1.ent"/> > > > > + > > > > + > > > +uri="ent/iso-cyr2.ent"/> > > > > + > > > > + > > > > + > > > > + > > > > + > > > > 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 @@ > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > > + > > > +uri="docbookx.dtd"/> > > > > + > > > > + > > > > + > > > > + > > > > + > > > +uri="calstblx.dtd"/> > > > > + > > > > + > > > +uri="soextblx.dtd"/> > > > > + > > > > + > > > +uri="dbpoolx.mod"/> > > > > + > > > > + > > > +uri="dbhierx.mod"/> > > > > + > > >
Re: [OE-core] [PATCH] docbook-xml: update recipe to stick with the upstream
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"/> > + > + +uri="ent/iso-amsa.ent"/> > + > + +uri="ent/iso-amsb.ent"/> > + > + +uri="ent/iso-amsc.ent"/> > + > + +uri="ent/iso-amsn.ent"/> > + > + +uri="ent/iso-amso.ent"/> > + > + +uri="ent/iso-amsr.ent"/> > + > + +uri="ent/iso-box.ent"/> > + > + +uri="ent/iso-cyr1.ent"/> > + > + +uri="ent/iso-cyr2.ent"/> > + > + > + > + > + > 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 @@ > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + +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"/> > + > + +uri="ent/iso-amsa.ent"/> > + > + +uri="ent/iso-amsb.ent"/> > + > + +uri="ent/iso-amsc.ent"/> > + > + +uri="ent/iso-amsn.ent"/> > + > + +uri="ent/iso-amso.ent"/> > + > + +uri="ent/iso-amsr.ent"/> > + > + +uri="ent/iso-box.ent"/> > + > + +uri="ent/iso-cyr1.ent"/> > + > + +uri="ent/iso-cyr2.ent"/> > + > + > + > + > + > 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 @@ > + > + prefer="public"> > + > + > + > + > + > + > + > + > + > + > + > + > + +uri="docbookx.dtd"/> > + > +http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd; > + uri="docbookx.dtd"/> > + >
Re: [OE-core] [meta-oe][PATCH] 2/2] package_{ipk, deb, rpm}.bbclass: support per package user-defined metadata.
I was in the middle of making a test set based on Alexander suggestion
but it seems i need to redo all my workspace every time i run the
tests, which is terrible for iteration. Am i missing something?
oe-selftest -r package.PackageTests.test_custom_metadata_is_in_package_indexcd
../poky-selftest-st/
2020-05-22 23:27:52,286 - oe-selftest - ERROR - Not found
package.PackageTests.test_custom_metadata_is_in_package_indexcd in
loaded test cases
On Fri, May 22, 2020 at 9:31 PM Michael Ho wrote:
>
> Hi Paulo,
>
> Yes, this is handled by the bitbake data handlers automatically. You can
> check this by trying the following:
>
> python do_test() {
> d.setVar("HELLO", "world!")
> d.setVar("HELLO_space", "space!")
> bb.warn("HELLO: %s" % d.getVar("HELLO", True))
> d.setVar("OVERRIDES", "space")
> bb.warn("HELLO: %s" % d.getVar("HELLO", True))
> }
> addtask test
>
> Then calling this task with bitbake:
>
> $ bitbake zip -c test | tee
> ...
> WARNING: zip-3.0-r2 do_test: HELLO: world!
> WARNING: zip-3.0-r2 do_test: HELLO: space!
>
> I don't know the code or tests in oe that implement this functionality off
> the top of my head so I can't point you to the oe.selftest coverage.
>
> Kind regards,
> Michael
>
> On Fri, May 22, 2020 at 8:09 PM Paulo Neves wrote:
>>
>> Hello Michael,
>>
>> The behavior you describe is indeed what i wanted. If you say this is
>> already working then my patches are redundant. Even so i am surprised
>> it is working. Is it done automatically by the getVar function?
>>
>> def get_package_additional_metadata (pkg_type, d):
>> base_key = "PACKAGE_ADD_METADATA"
>> for key in ("%s_%s" % (base_key, pkg_type.upper()), base_key):
>> if d.getVar(key, False) is None:
>> continue
>> d.setVarFlag(key, "type", "list")
>> if d.getVarFlag(key, "separator") is None:
>> d.setVarFlag(key, "separator", "\\n")
>> metadata_fields = [field.strip() for field in
>> oe.data.typed_value(key, d)]
>> return "\n".join(metadata_fields).strip()
>>
>> From my understanding, i do not see how the per package override
>> happens. Do you have the test for this functionality in oe-selftest?
>>
>> Grateful for the feedback
>> Paulo Neves
>>
>> On Fri, May 22, 2020 at 8:00 PM Michael Ho wrote:
>> >
>> > Hi Paulo,
>> >
>> > I actually have some patches in my "to send upstream list" to address the
>> > documentation and some sstate-caching bugs with these variables so it's
>> > fresh to me at the moment.
>> > Correct me if I'm wrong but I think this is already available in the code
>> > (applying metadata specific to a certain package in a recipe, that is).
>> >
>> > eg.
>> > http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_ipk.bbclass
>> > at line 72 sets the local overrides so if PACKAGE_ADD_METADATA_IPK_xxx is
>> > set, it overrides PACKAGE_ADD_METADATA_IPK.
>> >
>> > For rpm, see
>> > http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n298
>> > where the recipe wide variable is fetched
>> > http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n338
>> > where the local override is also set
>> > http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n354
>> > where the package specific variables are fetched
>> > http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n436
>> > where the package specific variables are applied to rpm packages
>> >
>> > I tested the zip recipe by applying these two lines:
>> > PACKAGE_ADD_METADATA_RPM = "Vendor: None"
>> > PACKAGE_ADD_METADATA_RPM_zip-dbg = "Vendor: Not you!"
>> > and could see differing results in the two rpm files produced.
>> >
>> > I think this covers the use case you're showing in your patches already,
>> > what do you think?
>> >
>> > Kind regards,
>> > Michael
>> >
>> > (sorry if this shows up as a triple email, my mail client wasn't
>> > cooperating).
>> >
>> > On Fri, May 22, 2020 at 5:29 PM Paulo Neve wrote:
>> >>
>> >> Is ./meta/lib/oeqa/selftest/cases/package.py the right place?
>> >> If yes i can work on it. Note that this functionality is not used
>> >> anywhere in poky and is not documented at all. It just happened to
>> >> exist for a long time and be useful for my case.
>> >>
>> >> On Fri, May 22, 2020 at 5:22 PM Alexander Kanavin
>> >> wrote:
>> >> >
>> >> > Should there be a test for this functionality? Somewhere in oe-selftest
>> >> > perhaps where various package manager features are tested?
>> >> >
>> >> > Alex
>> >> >
>> >> > On Fri, 22 May 2020 at 17:13, Paulo Neve wrote:
>> >> >>
>> >> >> Up to now the user defined metadata was set recipe wide,
>> >> >> meaning all the packages generated in a recipe where the
>> >> >> variable was set would get the same metadata. That is not
>> >> >> always ideal and is counter to the per package control that
>> >> >> is usually available.
>> >> >>
>> >> >> Keep
[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/docbook/xml/4.0/docbookx.dtd; -+uri="docbookx.dtd"/> -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+
Re: [OE-core] can't create boost_context lib for boost-native
The problematic bit is: # only supported by x86 and powerpc BOOST_LIBS_append_x86 = " context coroutine" BOOST_LIBS_append_x86-64 = " context coroutine" BOOST_LIBS_append_powerpc = " context coroutine" BOOST_LIBS_append_arm = " context coroutine" BOOST_LIBS_append_aarch64 = " context coroutine" # need consistent settings for native builds (x86 override not applied for native) BOOST_LIBS_remove_class-native = " context coroutine" I'd just drop this all, and always enable the two; if they're still not supported by some targets, then target-specific _remove can be used. Alex On Sat, 23 May 2020 at 10:49, Konrad Weihmann wrote: > Hi all, > > For reasons that are beyond my control I need to have boost_context > available from boost-native. > Unfortunately I didn't found a way of enabling it by a bbappend, only a > full fork of the recipe would help. > > It seems to be caused by that single line > > BOOST_LIBS_remove_class-native = " context coroutine" (from boost.inc) > > as remove-operation is always the last in the chain of processing any > attempt to add won't work here. > > Any ideas how to add it without forking the whole recipe? > > Also this is another example for the ongoing discussion about remove, > ??= and ?= operators in architecture list and that there might be an > alternative needed > > Regards > Konrad > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138620): https://lists.openembedded.org/g/openembedded-core/message/138620 Mute This Topic: https://lists.openembedded.org/mt/74416620/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] can't create boost_context lib for boost-native
Hi all, For reasons that are beyond my control I need to have boost_context available from boost-native. Unfortunately I didn't found a way of enabling it by a bbappend, only a full fork of the recipe would help. It seems to be caused by that single line BOOST_LIBS_remove_class-native = " context coroutine" (from boost.inc) as remove-operation is always the last in the chain of processing any attempt to add won't work here. Any ideas how to add it without forking the whole recipe? Also this is another example for the ongoing discussion about remove, ??= and ?= operators in architecture list and that there might be an alternative needed Regards Konrad -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138619): https://lists.openembedded.org/g/openembedded-core/message/138619 Mute This Topic: https://lists.openembedded.org/mt/74416620/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] sysstat: upgrade 12.2.1 -> 12.2.2
Signed-off-by: Zheng Ruoqin
---
.../sysstat/{sysstat_12.2.1.bb => sysstat_12.2.2.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/sysstat/{sysstat_12.2.1.bb => sysstat_12.2.2.bb}
(54%)
diff --git a/meta/recipes-extended/sysstat/sysstat_12.2.1.bb
b/meta/recipes-extended/sysstat/sysstat_12.2.2.bb
similarity index 54%
rename from meta/recipes-extended/sysstat/sysstat_12.2.1.bb
rename to meta/recipes-extended/sysstat/sysstat_12.2.2.bb
index 2a90f89d25..333d10295a 100644
--- a/meta/recipes-extended/sysstat/sysstat_12.2.1.bb
+++ b/meta/recipes-extended/sysstat/sysstat_12.2.2.bb
@@ -4,5 +4,5 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=a23a74b3f4caf9616230789d94217acb"
SRC_URI += "file://0001-configure.in-remove-check-for-chkconfig.patch"
-SRC_URI[md5sum] = "9dfff5fac24e35bd92fb7896debf2ffb"
-SRC_URI[sha256sum] =
"8edb0e19b514ac560a098a02933a4735b881296d61014db89bf80f05dd7a4732"
+SRC_URI[md5sum] = "1073fdf7bba58483a467a8a0681beeda"
+SRC_URI[sha256sum] =
"78388b64acec81378b962e66b40e57acd4b18ff17a849bc9308f95d290248c9c"
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138618):
https://lists.openembedded.org/g/openembedded-core/message/138618
Mute This Topic: https://lists.openembedded.org/mt/74415824/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
