[OE-core][kirkstone][PATCH] libpng: Add ptest for libpng
libpng is a platform-independent library which
supports all PNG features.
This ptest executes the below binaries, parses
the png image and prints the image features.
1. pngfix - provides information about PNG image
copyrights details.
2. pngtest - tests, optimizes and optionally fixes
the zlib header in PNG files.
3. pngstest - verifies the integrity of PNG image by
dumping chunk level information.
4. timepng - provides details about PNG image chunks.
Signed-off-by: Nikhil R
---
.../distro/include/ptest-packagelists.inc | 1 +
.../recipes-multimedia/libpng/files/run-ptest | 29 +++
.../libpng/libpng_1.6.39.bb | 16 --
3 files changed, 44 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-multimedia/libpng/files/run-ptest
diff --git a/meta/conf/distro/include/ptest-packagelists.inc
b/meta/conf/distro/include/ptest-packagelists.inc
index 5bcff83093..5c6a30635f 100644
--- a/meta/conf/distro/include/ptest-packagelists.inc
+++ b/meta/conf/distro/include/ptest-packagelists.inc
@@ -29,6 +29,7 @@ PTESTS_FAST = "\
libnl-ptest \
libmodule-build-perl-ptest \
libpcre-ptest \
+libpng-ptest \
libssh2-ptest \
libtimedate-perl-ptest \
libtest-needs-perl-ptest \
diff --git a/meta/recipes-multimedia/libpng/files/run-ptest
b/meta/recipes-multimedia/libpng/files/run-ptest
new file mode 100644
index 00..9ab5d0c1f4
--- /dev/null
+++ b/meta/recipes-multimedia/libpng/files/run-ptest
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+set -eux
+
+./pngfix pngtest.png &> log.txt 2>&1
+
+if grep -i "OK" log.txt 2>&1 ; then
+ echo "PASS: pngfix passed"
+else
+ echo "FAIL: pngfix failed"
+fi
+rm -f log.txt
+
+./pngtest pngtest.png &> log.txt 2>&1
+
+if grep -i "PASS" log.txt 2>&1 ; then
+ echo "PASS: pngtest passed"
+else
+ echo "FAIL: pngtest failed"
+fi
+rm -f log.txt
+
+for i in pngstest timepng; do
+if "./${i}" pngtest.png 2>&1; then
+echo "PASS: $i"
+else
+echo "FAIL: $i"
+fi
+done
diff --git a/meta/recipes-multimedia/libpng/libpng_1.6.39.bb
b/meta/recipes-multimedia/libpng/libpng_1.6.39.bb
index d9dcf379e9..94db1d3f6b 100644
--- a/meta/recipes-multimedia/libpng/libpng_1.6.39.bb
+++ b/meta/recipes-multimedia/libpng/libpng_1.6.39.bb
@@ -10,7 +10,11 @@ DEPENDS = "zlib"
LIBV = "16"
-SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}${LIBV}/${BP}.tar.xz"
+SRC_URI = "\
+ ${SOURCEFORGE_MIRROR}/${BPN}/${BPN}${LIBV}/${BP}.tar.xz \
+ file://run-ptest \
+ "
+
SRC_URI[sha256sum] =
"1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937"
MIRRORS += "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}${LIBV}/
${SOURCEFORGE_MIRROR}/${BPN}/${BPN}${LIBV}/older-releases/"
@@ -19,7 +23,7 @@ UPSTREAM_CHECK_URI = "http://libpng.org/pub/png/libpng.html;
BINCONFIG = "${bindir}/libpng-config ${bindir}/libpng16-config"
-inherit autotools binconfig-disabled pkgconfig
+inherit autotools binconfig-disabled pkgconfig ptest
# Work around missing symbols
EXTRA_OECONF:append:class-target = " ${@bb.utils.contains("TUNE_FEATURES",
"neon", "--enable-arm-neon=on", "--enable-arm-neon=off", d)}"
@@ -32,3 +36,11 @@ BBCLASSEXTEND = "native nativesdk"
# CVE-2019-17371 is actually a memory leak in gif2png 2.x
CVE_CHECK_IGNORE += "CVE-2019-17371"
+
+do_install_ptest() {
+install -m644 "${S}/pngtest.png" "${D}${PTEST_PATH}"
+install -m755 "${B}/.libs/pngfix" "${D}${PTEST_PATH}"
+install -m755 "${B}/.libs/pngtest" "${D}${PTEST_PATH}"
+install -m755 "${B}/.libs/pngstest" "${D}${PTEST_PATH}"
+install -m755 "${B}/.libs/timepng" "${D}${PTEST_PATH}"
+}
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#183911):
https://lists.openembedded.org/g/openembedded-core/message/183911
Mute This Topic: https://lists.openembedded.org/mt/99980052/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] qemu: fix typo
From: Etienne Cordonnier Signed-off-by: Etienne Cordonnier --- meta/recipes-devtools/qemu/qemu.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 6acda61425..5b0b95c289 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -215,7 +215,7 @@ PACKAGECONFIG[seccomp] = "--enable-seccomp,--disable-seccomp,libseccomp" # libnfs is currently provided by meta-kodi PACKAGECONFIG[libnfs] = "--enable-libnfs,--disable-libnfs,libnfs" PACKAGECONFIG[pmem] = "--enable-libpmem,--disable-libpmem,pmdk" -PACKAGECONFIG[pulsedio] = "--enable-pa,--disable-pa,pulseaudio" +PACKAGECONFIG[pulseaudio] = "--enable-pa,--disable-pa,pulseaudio" PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux" PACKAGECONFIG[bpf] = "--enable-bpf,--disable-bpf,libbpf" PACKAGECONFIG[capstone] = "--enable-capstone,--disable-capstone" -- 2.36.1.vfs.0.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#183909): https://lists.openembedded.org/g/openembedded-core/message/183909 Mute This Topic: https://lists.openembedded.org/mt/99972727/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] qemu: fix typo
From: Etienne Cordonnier Signed-off-by: Etienne Cordonnier --- meta/recipes-devtools/qemu/qemu.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 6acda61425..5b0b95c289 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -215,7 +215,7 @@ PACKAGECONFIG[seccomp] = "--enable-seccomp,--disable-seccomp,libseccomp" # libnfs is currently provided by meta-kodi PACKAGECONFIG[libnfs] = "--enable-libnfs,--disable-libnfs,libnfs" PACKAGECONFIG[pmem] = "--enable-libpmem,--disable-libpmem,pmdk" -PACKAGECONFIG[pulsedio] = "--enable-pa,--disable-pa,pulseaudio" +PACKAGECONFIG[pulseaudio] = "--enable-pa,--disable-pa,pulseaudio" PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux" PACKAGECONFIG[bpf] = "--enable-bpf,--disable-bpf,libbpf" PACKAGECONFIG[capstone] = "--enable-capstone,--disable-capstone" -- 2.36.1.vfs.0.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#183910): https://lists.openembedded.org/g/openembedded-core/message/183910 Mute This Topic: https://lists.openembedded.org/mt/99972727/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] qemu: fix typo
From: Etienne Cordonnier Signed-off-by: Etienne Cordonnier --- meta/recipes-devtools/qemu/qemu.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 6acda61425..5b0b95c289 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -215,7 +215,7 @@ PACKAGECONFIG[seccomp] = "--enable-seccomp,--disable-seccomp,libseccomp" # libnfs is currently provided by meta-kodi PACKAGECONFIG[libnfs] = "--enable-libnfs,--disable-libnfs,libnfs" PACKAGECONFIG[pmem] = "--enable-libpmem,--disable-libpmem,pmdk" -PACKAGECONFIG[pulsedio] = "--enable-pa,--disable-pa,pulseaudio" +PACKAGECONFIG[pulseaudio] = "--enable-pa,--disable-pa,pulseaudio" PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux" PACKAGECONFIG[bpf] = "--enable-bpf,--disable-bpf,libbpf" PACKAGECONFIG[capstone] = "--enable-capstone,--disable-capstone" -- 2.36.1.vfs.0.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#183908): https://lists.openembedded.org/g/openembedded-core/message/183908 Mute This Topic: https://lists.openembedded.org/mt/99972727/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 v2 2/2] openssl: fix the PERLEXTERNAL path
The Text-Template was updated from 1.46 to 1.56
| ERROR: openssl-native-3.1.1-r0 do_configure: PERLEXTERNAL
'/build/tmp/work/x86_64-linux/openssl-native/3.1.1-r0/openssl-3.1.1/external/perl/Text-Template-1.46/lib'
not found!
Signed-off-by: Jose Quaresma
---
meta/recipes-connectivity/openssl/openssl_3.1.1.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/openssl/openssl_3.1.1.bb
b/meta/recipes-connectivity/openssl/openssl_3.1.1.bb
index b849f9ca79..5f30a37c8a 100644
--- a/meta/recipes-connectivity/openssl/openssl_3.1.1.bb
+++ b/meta/recipes-connectivity/openssl/openssl_3.1.1.bb
@@ -137,7 +137,7 @@ do_configure () {
fi
# WARNING: do not set compiler/linker flags (-I/-D etc.) in
EXTRA_OECONF, as they will fully replace the
# environment variables set by bitbake. Adjust the environment
variables instead.
- PERLEXTERNAL="${S}/external/perl/Text-Template-1.46/lib"
+ PERLEXTERNAL="${S}/external/perl/Text-Template-1.56/lib"
test -d "$PERLEXTERNAL" || bberror "PERLEXTERNAL '$PERLEXTERNAL' not
found!"
HASHBANGPERL="/usr/bin/env perl" PERL=perl PERL5LIB="$PERLEXTERNAL" \
perl ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS}
${DEPRECATED_CRYPTO_FLAGS} --prefix=$useprefix --openssldir=${libdir}/ssl-3
--libdir=${libdir} $target
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#183907):
https://lists.openembedded.org/g/openembedded-core/message/183907
Mute This Topic: https://lists.openembedded.org/mt/99971149/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 v2 1/2] openssl: check the existence of the PERL5LIB path
When upstream change is better to fail or removing the PERL5LIB
if they are nott need anymore.
Signed-off-by: Jose Quaresma
---
meta/recipes-connectivity/openssl/openssl_3.1.1.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/openssl/openssl_3.1.1.bb
b/meta/recipes-connectivity/openssl/openssl_3.1.1.bb
index f5f3f32a97..b849f9ca79 100644
--- a/meta/recipes-connectivity/openssl/openssl_3.1.1.bb
+++ b/meta/recipes-connectivity/openssl/openssl_3.1.1.bb
@@ -137,7 +137,9 @@ do_configure () {
fi
# WARNING: do not set compiler/linker flags (-I/-D etc.) in
EXTRA_OECONF, as they will fully replace the
# environment variables set by bitbake. Adjust the environment
variables instead.
- HASHBANGPERL="/usr/bin/env perl" PERL=perl
PERL5LIB="${S}/external/perl/Text-Template-1.46/lib/" \
+ PERLEXTERNAL="${S}/external/perl/Text-Template-1.46/lib"
+ test -d "$PERLEXTERNAL" || bberror "PERLEXTERNAL '$PERLEXTERNAL' not
found!"
+ HASHBANGPERL="/usr/bin/env perl" PERL=perl PERL5LIB="$PERLEXTERNAL" \
perl ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS}
${DEPRECATED_CRYPTO_FLAGS} --prefix=$useprefix --openssldir=${libdir}/ssl-3
--libdir=${libdir} $target
perl ${B}/configdata.pm --dump
}
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#183906):
https://lists.openembedded.org/g/openembedded-core/message/183906
Mute This Topic: https://lists.openembedded.org/mt/99971147/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] [mickledore][PATCH] systemd: fix a dead link under /var/log
Sigh, I missed the RP's comment. Thanks for catching this!
I'll revert this patch in mickledore prior to the release.
Steve
On Wed, Jul 5, 2023 at 8:32 AM Martin Jansa wrote:
>
> This was merged in mickledore recently, but isn't the same needed for master
> branch where it was rejected with alternative fix proposed by RP?
>
> On Thu, Jun 29, 2023 at 11:12 AM Changqing Li
> wrote:
>>
>> From: Changqing Li
>>
>> Commit 6fe23ff31c0 changed README to a symlink to README.logs, and
>> install README.logs under systemd doc dir.
>>
>> But for OE, systemd doc dir is splited into package systemd-doc, when it
>> is not installed on the target, there will be an dead link:
>> Eg:
>> root@intel-x86-64:/var/log# ls -l README
>> lrwxrwxrwx 1 root root 39 Jun 20 08:57 README ->
>> ../../usr/share/doc/systemd/README.logs
>> root@intel-x86-64:/var/log# ls -l ../../usr/share/doc/systemd/README.logs
>> ls: cannot access '../../usr/share/doc/systemd/README.logs': No such file or
>> directory
>>
>> Meantime, relative path for a symlink also will meet issue like
>> "No such file or directory"
>>
>> So remove this symlink from package systemd, and create legacy-doc.conf,
>> only create the symlink when systemd-doc is installed.
>>
>> Signed-off-by: Changqing Li
>> ---
>> ...on-t-create-symlink-README-in-this-f.patch | 42 +++
>> in-split-out-the-doc-related-config.patch | 41 ++
>> meta/recipes-core/systemd/systemd_253.1.bb| 4 ++
>> 3 files changed, 87 insertions(+)
>> create mode 100644
>> meta/recipes-core/systemd/systemd/0001-legacy.conf.in-Don-t-create-symlink-README-in-this-f.patch
>> create mode 100644
>> meta/recipes-core/systemd/systemd/0002-legacy-doc.conf.in-split-out-the-doc-related-config.patch
>>
>> diff --git
>> a/meta/recipes-core/systemd/systemd/0001-legacy.conf.in-Don-t-create-symlink-README-in-this-f.patch
>>
>> b/meta/recipes-core/systemd/systemd/0001-legacy.conf.in-Don-t-create-symlink-README-in-this-f.patch
>> new file mode 100644
>> index 00..a2644bba8e
>> --- /dev/null
>> +++
>> b/meta/recipes-core/systemd/systemd/0001-legacy.conf.in-Don-t-create-symlink-README-in-this-f.patch
>> @@ -0,0 +1,42 @@
>> +From b17826490c1db2051dda23550ebdcd7f10e23479 Mon Sep 17 00:00:00 2001
>> +From: Changqing Li
>> +Date: Wed, 28 Jun 2023 13:49:41 +0800
>> +Subject: [PATCH 1/2] legacy.conf.in: Don't create symlink README in this
>> file
>> +
>> +Commit 6fe23ff31c0 changed README to an symlink to README.logs, and
>> +install README.logs under systemd doc dir.
>> +
>> +But for OE, systemd doc dir is splited into package systemd-doc, when it
>> +is not installed on the target, there will be an dead link:
>> +Eg:
>> +root@intel-x86-64:/var/log# ls -l README
>> +lrwxrwxrwx 1 root root 39 Jun 20 08:57 README ->
>> ../../usr/share/doc/systemd/README.logs
>> +root@intel-x86-64:/var/log# ls -l ../../usr/share/doc/systemd/README.logs
>> +ls: cannot access '../../usr/share/doc/systemd/README.logs': No such file
>> or directory
>> +
>> +So remove this symlink from package systemd
>> +
>> +Upstream-Status: Inappropriate [oe specific]
>> +
>> +Signed-off-by: Changqing Li
>> +---
>> + tmpfiles.d/legacy.conf.in | 3 ---
>> + 1 file changed, 3 deletions(-)
>> +
>> +diff --git a/tmpfiles.d/legacy.conf.in b/tmpfiles.d/legacy.conf.in
>> +index 4f2c0d7c43..62e2ae0986 100644
>> +--- a/tmpfiles.d/legacy.conf.in
>> b/tmpfiles.d/legacy.conf.in
>> +@@ -12,9 +12,6 @@
>> +
>> + d /run/lock 0755 root root -
>> + L /var/lock - - - - ../run/lock
>> +-{% if CREATE_LOG_DIRS %}
>> +-L /var/log/README - - - - ../..{{DOC_DIR}}/README.logs
>> +-{% endif %}
>> +
>> + # /run/lock/subsys is used for serializing SysV service execution, and
>> + # hence without use on SysV-less systems.
>> +--
>> +2.25.1
>> +
>> diff --git
>> a/meta/recipes-core/systemd/systemd/0002-legacy-doc.conf.in-split-out-the-doc-related-config.patch
>>
>> b/meta/recipes-core/systemd/systemd/0002-legacy-doc.conf.in-split-out-the-doc-related-config.patch
>> new file mode 100644
>> index 00..47af64f12f
>> --- /dev/null
>> +++
>> b/meta/recipes-core/systemd/systemd/0002-legacy-doc.conf.in-split-out-the-doc-related-config.patch
>> @@ -0,0 +1,41 @@
>> +From 865974a2f268ae6b4dab4f37ba39d86e6600180d Mon Sep 17 00:00:00 2001
>> +From: Changqing Li
>> +Date: Wed, 28 Jun 2023 16:00:13 +0800
>> +Subject: [PATCH 2/2] legacy-doc.conf.in: split out the doc related config
>> +
>> +split out the doc related config, only install this when
>> +package systemd-doc is installed.
>> +
>> +Upstream-Status: Inappropriate [oe specific]
>> +
>> +Signed-off-by: Changqing Li
>> +---
>> + tmpfiles.d/legacy-doc.conf.in | 3 +++
>> + tmpfiles.d/meson.build| 1 +
>> + 2 files changed, 4 insertions(+)
>> + create mode 100644 tmpfiles.d/legacy-doc.conf.in
>> +
>> +diff --git a/tmpfiles.d/legacy-doc.conf.in b/tmpfiles.d/legacy-doc.conf.in
>> +new file mode 100644
>> +index 00..9b1cef5a18
>> +--- /dev/null
>>
Re: [OE-core] [mickledore][PATCH] systemd: fix a dead link under /var/log
This was merged in mickledore recently, but isn't the same needed for
master branch where it was rejected with alternative fix proposed by RP?
On Thu, Jun 29, 2023 at 11:12 AM Changqing Li <
changqing...@eng.windriver.com> wrote:
> From: Changqing Li
>
> Commit 6fe23ff31c0 changed README to a symlink to README.logs, and
> install README.logs under systemd doc dir.
>
> But for OE, systemd doc dir is splited into package systemd-doc, when it
> is not installed on the target, there will be an dead link:
> Eg:
> root@intel-x86-64:/var/log# ls -l README
> lrwxrwxrwx 1 root root 39 Jun 20 08:57 README ->
> ../../usr/share/doc/systemd/README.logs
> root@intel-x86-64:/var/log# ls -l ../../usr/share/doc/systemd/README.logs
> ls: cannot access '../../usr/share/doc/systemd/README.logs': No such file
> or directory
>
> Meantime, relative path for a symlink also will meet issue like
> "No such file or directory"
>
> So remove this symlink from package systemd, and create legacy-doc.conf,
> only create the symlink when systemd-doc is installed.
>
> Signed-off-by: Changqing Li
> ---
> ...on-t-create-symlink-README-in-this-f.patch | 42 +++
> in-split-out-the-doc-related-config.patch | 41 ++
> meta/recipes-core/systemd/systemd_253.1.bb| 4 ++
> 3 files changed, 87 insertions(+)
> create mode 100644
> meta/recipes-core/systemd/systemd/0001-legacy.conf.in-Don-t-create-symlink-README-in-this-f.patch
> create mode 100644
> meta/recipes-core/systemd/systemd/0002-legacy-doc.conf.in-split-out-the-doc-related-config.patch
>
> diff --git
> a/meta/recipes-core/systemd/systemd/0001-legacy.conf.in-Don-t-create-symlink-README-in-this-f.patch
> b/meta/recipes-core/systemd/systemd/0001-legacy.conf.in-Don-t-create-symlink-README-in-this-f.patch
> new file mode 100644
> index 00..a2644bba8e
> --- /dev/null
> +++
> b/meta/recipes-core/systemd/systemd/0001-legacy.conf.in-Don-t-create-symlink-README-in-this-f.patch
> @@ -0,0 +1,42 @@
> +From b17826490c1db2051dda23550ebdcd7f10e23479 Mon Sep 17 00:00:00 2001
> +From: Changqing Li
> +Date: Wed, 28 Jun 2023 13:49:41 +0800
> +Subject: [PATCH 1/2] legacy.conf.in: Don't create symlink README in this
> file
> +
> +Commit 6fe23ff31c0 changed README to an symlink to README.logs, and
> +install README.logs under systemd doc dir.
> +
> +But for OE, systemd doc dir is splited into package systemd-doc, when it
> +is not installed on the target, there will be an dead link:
> +Eg:
> +root@intel-x86-64:/var/log# ls -l README
> +lrwxrwxrwx 1 root root 39 Jun 20 08:57 README ->
> ../../usr/share/doc/systemd/README.logs
> +root@intel-x86-64:/var/log# ls -l ../../usr/share/doc/systemd/README.logs
> +ls: cannot access '../../usr/share/doc/systemd/README.logs': No such file
> or directory
> +
> +So remove this symlink from package systemd
> +
> +Upstream-Status: Inappropriate [oe specific]
> +
> +Signed-off-by: Changqing Li
> +---
> + tmpfiles.d/legacy.conf.in | 3 ---
> + 1 file changed, 3 deletions(-)
> +
> +diff --git a/tmpfiles.d/legacy.conf.in b/tmpfiles.d/legacy.conf.in
> +index 4f2c0d7c43..62e2ae0986 100644
> +--- a/tmpfiles.d/legacy.conf.in
> b/tmpfiles.d/legacy.conf.in
> +@@ -12,9 +12,6 @@
> +
> + d /run/lock 0755 root root -
> + L /var/lock - - - - ../run/lock
> +-{% if CREATE_LOG_DIRS %}
> +-L /var/log/README - - - - ../..{{DOC_DIR}}/README.logs
> +-{% endif %}
> +
> + # /run/lock/subsys is used for serializing SysV service execution, and
> + # hence without use on SysV-less systems.
> +--
> +2.25.1
> +
> diff --git
> a/meta/recipes-core/systemd/systemd/0002-legacy-doc.conf.in-split-out-the-doc-related-config.patch
> b/meta/recipes-core/systemd/systemd/0002-legacy-doc.conf.in-split-out-the-doc-related-config.patch
> new file mode 100644
> index 00..47af64f12f
> --- /dev/null
> +++
> b/meta/recipes-core/systemd/systemd/0002-legacy-doc.conf.in-split-out-the-doc-related-config.patch
> @@ -0,0 +1,41 @@
> +From 865974a2f268ae6b4dab4f37ba39d86e6600180d Mon Sep 17 00:00:00 2001
> +From: Changqing Li
> +Date: Wed, 28 Jun 2023 16:00:13 +0800
> +Subject: [PATCH 2/2] legacy-doc.conf.in: split out the doc related config
> +
> +split out the doc related config, only install this when
> +package systemd-doc is installed.
> +
> +Upstream-Status: Inappropriate [oe specific]
> +
> +Signed-off-by: Changqing Li
> +---
> + tmpfiles.d/legacy-doc.conf.in | 3 +++
> + tmpfiles.d/meson.build| 1 +
> + 2 files changed, 4 insertions(+)
> + create mode 100644 tmpfiles.d/legacy-doc.conf.in
> +
> +diff --git a/tmpfiles.d/legacy-doc.conf.in b/tmpfiles.d/
> legacy-doc.conf.in
> +new file mode 100644
> +index 00..9b1cef5a18
> +--- /dev/null
> b/tmpfiles.d/legacy-doc.conf.in
> +@@ -0,0 +1,3 @@
> ++{% if CREATE_LOG_DIRS %}
> ++L /var/log/README - - - - {{DOC_DIR}}/README.logs
> ++{% endif %}
> +diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build
> +index 4d94e3743f..f78bddf136 100644
> +--- a/tmpfiles.d/meson.build
>
Re: [OE-core][PATCH 1/2] openssl: check the existence of the PERL5LIB path
Alexander Kanavin escreveu no dia quarta,
5/07/2023 à(s) 19:24:
> There is no need to export the other two variables, they can stay as they
> were.
>
I can add another one just to store the external path and do the check like
PERLEXTERNAL and use it on
PERL5LIB=$PERLEXTERNAL to be less invasive.
In fact we don't even need the PERL5LIB anymore because everything is
working without it as it
currently have a wrong value.
Jose
> Alex
>
>
> On Wed, 5 Jul 2023 at 20:04, Jose Quaresma
> wrote:
> >
> > When upstream change is better to fail or removing the PERL5LIB
> > if they are nott need anymore.
> >
> > Signed-off-by: Jose Quaresma
> > ---
> > meta/recipes-connectivity/openssl/openssl_3.1.1.bb | 5 -
> > 1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-connectivity/openssl/openssl_3.1.1.bb
> b/meta/recipes-connectivity/openssl/openssl_3.1.1.bb
> > index f5f3f32a97..0dce7f71bc 100644
> > --- a/meta/recipes-connectivity/openssl/openssl_3.1.1.bb
> > +++ b/meta/recipes-connectivity/openssl/openssl_3.1.1.bb
> > @@ -137,7 +137,10 @@ do_configure () {
> > fi
> > # WARNING: do not set compiler/linker flags (-I/-D etc.) in
> EXTRA_OECONF, as they will fully replace the
> > # environment variables set by bitbake. Adjust the environment
> variables instead.
> > - HASHBANGPERL="/usr/bin/env perl" PERL=perl
> PERL5LIB="${S}/external/perl/Text-Template-1.46/lib/" \
> > + export HASHBANGPERL="/usr/bin/env perl"
> > + export PERL=perl
> > + export PERL5LIB="${S}/external/perl/Text-Template-1.46/lib"
> > + test -d "$PERL5LIB" || bberror "PERL5LIB '$PERL5LIB' not found!"
> > perl ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS}
> ${DEPRECATED_CRYPTO_FLAGS} --prefix=$useprefix --openssldir=${libdir}/ssl-3
> --libdir=${libdir} $target
> > perl ${B}/configdata.pm --dump
> > }
> > --
> > 2.34.1
> >
> >
> >
> >
>
--
Best regards,
José Quaresma
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#183903):
https://lists.openembedded.org/g/openembedded-core/message/183903
Mute This Topic: https://lists.openembedded.org/mt/99970131/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 1/2] openssl: check the existence of the PERL5LIB path
There is no need to export the other two variables, they can stay as they were.
Alex
On Wed, 5 Jul 2023 at 20:04, Jose Quaresma wrote:
>
> When upstream change is better to fail or removing the PERL5LIB
> if they are nott need anymore.
>
> Signed-off-by: Jose Quaresma
> ---
> meta/recipes-connectivity/openssl/openssl_3.1.1.bb | 5 -
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-connectivity/openssl/openssl_3.1.1.bb
> b/meta/recipes-connectivity/openssl/openssl_3.1.1.bb
> index f5f3f32a97..0dce7f71bc 100644
> --- a/meta/recipes-connectivity/openssl/openssl_3.1.1.bb
> +++ b/meta/recipes-connectivity/openssl/openssl_3.1.1.bb
> @@ -137,7 +137,10 @@ do_configure () {
> fi
> # WARNING: do not set compiler/linker flags (-I/-D etc.) in
> EXTRA_OECONF, as they will fully replace the
> # environment variables set by bitbake. Adjust the environment
> variables instead.
> - HASHBANGPERL="/usr/bin/env perl" PERL=perl
> PERL5LIB="${S}/external/perl/Text-Template-1.46/lib/" \
> + export HASHBANGPERL="/usr/bin/env perl"
> + export PERL=perl
> + export PERL5LIB="${S}/external/perl/Text-Template-1.46/lib"
> + test -d "$PERL5LIB" || bberror "PERL5LIB '$PERL5LIB' not found!"
> perl ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS}
> ${DEPRECATED_CRYPTO_FLAGS} --prefix=$useprefix --openssldir=${libdir}/ssl-3
> --libdir=${libdir} $target
> perl ${B}/configdata.pm --dump
> }
> --
> 2.34.1
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#183902):
https://lists.openembedded.org/g/openembedded-core/message/183902
Mute This Topic: https://lists.openembedded.org/mt/99970131/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 2/2] openssl: fix the PERL5LIB path
The Text-Template was updated from 1.46 to 1.56
| ERROR: openssl-native-3.1.1-r0 do_configure: PERL5LIB
'/build/tmp/work/x86_64-linux/openssl-native/3.1.1-r0/openssl-3.1.1/external/perl/Text-Template-1.46/lib'
not found!
Signed-off-by: Jose Quaresma
---
meta/recipes-connectivity/openssl/openssl_3.1.1.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/openssl/openssl_3.1.1.bb
b/meta/recipes-connectivity/openssl/openssl_3.1.1.bb
index 0dce7f71bc..ffb962a53f 100644
--- a/meta/recipes-connectivity/openssl/openssl_3.1.1.bb
+++ b/meta/recipes-connectivity/openssl/openssl_3.1.1.bb
@@ -139,7 +139,7 @@ do_configure () {
# environment variables set by bitbake. Adjust the environment
variables instead.
export HASHBANGPERL="/usr/bin/env perl"
export PERL=perl
- export PERL5LIB="${S}/external/perl/Text-Template-1.46/lib"
+ export PERL5LIB="${S}/external/perl/Text-Template-1.56/lib"
test -d "$PERL5LIB" || bberror "PERL5LIB '$PERL5LIB' not found!"
perl ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS}
${DEPRECATED_CRYPTO_FLAGS} --prefix=$useprefix --openssldir=${libdir}/ssl-3
--libdir=${libdir} $target
perl ${B}/configdata.pm --dump
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#183901):
https://lists.openembedded.org/g/openembedded-core/message/183901
Mute This Topic: https://lists.openembedded.org/mt/99970133/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 1/2] openssl: check the existence of the PERL5LIB path
When upstream change is better to fail or removing the PERL5LIB
if they are nott need anymore.
Signed-off-by: Jose Quaresma
---
meta/recipes-connectivity/openssl/openssl_3.1.1.bb | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/openssl/openssl_3.1.1.bb
b/meta/recipes-connectivity/openssl/openssl_3.1.1.bb
index f5f3f32a97..0dce7f71bc 100644
--- a/meta/recipes-connectivity/openssl/openssl_3.1.1.bb
+++ b/meta/recipes-connectivity/openssl/openssl_3.1.1.bb
@@ -137,7 +137,10 @@ do_configure () {
fi
# WARNING: do not set compiler/linker flags (-I/-D etc.) in
EXTRA_OECONF, as they will fully replace the
# environment variables set by bitbake. Adjust the environment
variables instead.
- HASHBANGPERL="/usr/bin/env perl" PERL=perl
PERL5LIB="${S}/external/perl/Text-Template-1.46/lib/" \
+ export HASHBANGPERL="/usr/bin/env perl"
+ export PERL=perl
+ export PERL5LIB="${S}/external/perl/Text-Template-1.46/lib"
+ test -d "$PERL5LIB" || bberror "PERL5LIB '$PERL5LIB' not found!"
perl ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS}
${DEPRECATED_CRYPTO_FLAGS} --prefix=$useprefix --openssldir=${libdir}/ssl-3
--libdir=${libdir} $target
perl ${B}/configdata.pm --dump
}
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#183900):
https://lists.openembedded.org/g/openembedded-core/message/183900
Mute This Topic: https://lists.openembedded.org/mt/99970131/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] libjpeg-turbo: upgrade to 3.0.0
On 5 Jul 2023, at 17:42, Khem Raj wrote: > Looks like you want to backport > https://gitlab.freedesktop.org/poppler/poppler/-/commit/2986f06c7cc9d64a506ebe861b8bf38f73386e86 > to poppler. > > Right that seems to be the fix. So should I be expecting a patch :) I suspect you’re actually also testing a new clang and that is to blame, but patch on the list :) Ross -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#183899): https://lists.openembedded.org/g/openembedded-core/message/183899 Mute This Topic: https://lists.openembedded.org/mt/99943765/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] libjpeg-turbo: upgrade to 3.0.0
On Wed, Jul 5, 2023 at 8:19 AM Ross Burton wrote: > On 5 Jul 2023, at 15:48, Khem Raj via lists.openembedded.org gmail@lists.openembedded.org> wrote: > > > > I wonder of this failure is related to this > > https://errors.yoctoproject.org/Errors/Details/711770/ > > TOPDIR/build/tmp/work/cortexa72-cortexa53-crypto-mx8-yoe-linux/poppler/23.04.0-r0/recipe-sysroot/usr/include/jpeglib.h:968:52: > error: unknown type name 'FILE' > 968 | EXTERN(void) jpeg_stdio_dest(j_compress_ptr cinfo, FILE *outfile); > | ^ > > > Quite possibly, but poppler should be including stdio.h: > > “”" > Applications using the JPEG library should include the header file > jpeglib.h > to obtain declarations of data types and routines. Before including > jpeglib.h, include system headers that define at least the typedefs FILE > and > size_t. On ANSI-conforming systems, including is sufficient; on > older Unix systems, you may need to define size_t. > “”” > > Looks like you want to backport > https://gitlab.freedesktop.org/poppler/poppler/-/commit/2986f06c7cc9d64a506ebe861b8bf38f73386e86 > to poppler. Right that seems to be the fix. So should I be expecting a patch :) > > > Ross -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#183898): https://lists.openembedded.org/g/openembedded-core/message/183898 Mute This Topic: https://lists.openembedded.org/mt/99943765/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 2/3] libxcrypt: Limit to enabling strong hash algos only
On 05/07/2023 11:08:32+, Ross Burton wrote:
> On 30 Jun 2023, at 14:30, Alexandre Belloni via lists.openembedded.org
> wrote:
> >
> > Hello Khem,
> >
> > This causes python ptest failures:
> >
> > {'python3': ['test_crypt', 'test_methods', 'test_sha2_rounds']}
> >
> > We should probably disable those
>
> Guessing this is also the cause of the perl failures:
>
> {'perl': ['t/op/crypt']}
>
> and apr-util:
>
> {'apr-util': ['testpass_3_of_6']}
>
> Test 3 of 6 is test_shapass using SHA1.
>
Yes it is, I should have added that. I dropped the patch for now.
> If we want to do this then some effort will be needed to make all the test
> suites adapt to what algorithms are actually available.
>
> Ross
>
>
>
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#183897):
https://lists.openembedded.org/g/openembedded-core/message/183897
Mute This Topic: https://lists.openembedded.org/mt/99749300/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 0/1] Add ptest for less
Hi Julien, > On 5 Jul 2023, at 16:31, Julien Stephan via lists.openembedded.org > wrote: > So before test code gets bundled into the release tarballs, switch to > github URI. > Please split this into a separate commit, so we can review the change to git separately from the addition of ptest. > FAIL: chinese1.lt > FAIL: utf8-2.txt.lt If there’s a way to make the tests more verbose when they fail then that’s really useful, being able to see what the error actually is helps a lot. As you say, these are locale issues, so you _probably_ need to RDEPEND on the right packages. For example, glib-2.0-ptest RDEPENDS on glibc-gconv-utf-32 and locale-base-fr-fr to pull in UTF-32 encoding and fr_FR locale support. Ross -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#183896): https://lists.openembedded.org/g/openembedded-core/message/183896 Mute This Topic: https://lists.openembedded.org/mt/99967074/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] rootfs_rpm: don't depend on opkg-native for update-alternatives
From: Ross Burton
opkg-native hasn't provided update-alternatives since 2014[1] so this is
the wrong dependency, and image.bbclass depends on the virtual provider
virtual/update-alternatives-native already.
[1] oe-core 1e2c38ce13f8e4b25d8656d237343380cbc970aa
Signed-off-by: Ross Burton
---
meta/classes-recipe/rootfs_rpm.bbclass | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/meta/classes-recipe/rootfs_rpm.bbclass
b/meta/classes-recipe/rootfs_rpm.bbclass
index 6eccd5a9599..55f1cc92ca9 100644
--- a/meta/classes-recipe/rootfs_rpm.bbclass
+++ b/meta/classes-recipe/rootfs_rpm.bbclass
@@ -20,11 +20,9 @@ IMAGE_ROOTFS_EXTRA_SPACE:append =
"${@bb.utils.contains("PACKAGE_INSTALL", "dnf"
# Dnf is python based, so be sure python3-native is available to us.
EXTRANATIVEPATH += "python3-native"
-# opkg is needed for update-alternatives
RPMROOTFSDEPENDS = "rpm-native:do_populate_sysroot \
dnf-native:do_populate_sysroot \
-createrepo-c-native:do_populate_sysroot \
-opkg-native:do_populate_sysroot"
+createrepo-c-native:do_populate_sysroot"
do_rootfs[depends] += "${RPMROOTFSDEPENDS}"
do_populate_sdk[depends] += "${RPMROOTFSDEPENDS}"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#183895):
https://lists.openembedded.org/g/openembedded-core/message/183895
Mute This Topic: https://lists.openembedded.org/mt/99967086/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 0/1] Add ptest for less
Hi all, This series is adding ptest support for less. As of today, release tarball are fetched from http://www.greenwoodsoftware.com/ but the less test code is not bundled within these releases. A github issue has been opened asking for maintainer to add the test code into the release [1]. So before test code gets bundled into the release tarballs, switch to github URI. Here is the output when running the ptest on the target: FAIL: chinese1.lt PASS: colorbars.lt PASS: github216.lt PASS: github265.lt PASS: github329.lt PASS: hdr-unicode1.lt PASS: hdr-unicode.lt PASS: proc-special.lt PASS: seq200.lt PASS: table-50x200.lt FAIL: utf8-2.txt.lt PASS: version.c.lt Testsuite summary for less # TOTAL: 12 # PASS: 10 # FAIL: 2 I am building a core-image-minimal image with poky DISTRO and run it into qemu. I have 2 FAIL. All tests PASS on my computer. I suspect a locale issue here but I may need some help on this. I opened a pull request on less for Makefile modification [2] And I also opened a github issue [3] to ask a reformating of the less test summary to follow Automake simple test format to simplify the run-ptest script. My branch is available on poky-contrib repository [4] [YOCTO #15073] Best Julien [1]: https://github.com/gwsw/less/issues/344 [2]: https://github.com/gwsw/less/pull/398 [3]: https://github.com/gwsw/less/issues/399 [4]: https://git.yoctoproject.org/poky-contrib/log/?h=jstephan/add-ptest-for-less Julien Stephan (1): less: add ptest support .../distro/include/ptest-packagelists.inc | 1 + ...akefile-allow-CFLAGS-to-be-overitten.patch | 28 + ...esstest-Makefile-add-LDFLAGS-support.patch | 41 +++ meta/recipes-extended/less/files/run-ptest| 25 +++ meta/recipes-extended/less/less_633.bb| 37 ++--- 5 files changed, 127 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-extended/less/files/0001-lesstest-Makefile-allow-CFLAGS-to-be-overitten.patch create mode 100644 meta/recipes-extended/less/files/0002-lesstest-Makefile-add-LDFLAGS-support.patch create mode 100644 meta/recipes-extended/less/files/run-ptest -- 2.41.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#183893): https://lists.openembedded.org/g/openembedded-core/message/183893 Mute This Topic: https://lists.openembedded.org/mt/99967074/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 1/1] less: add ptest support
as of today, release tarball are fetched from http://www.greenwoodsoftware.com/ but the less test code is not bundled within these releases. A github issue has been opened asking for maintainer to add the test code into the release [1]. So before test code gets bundled into the release tarballs, switch to github URI. [YOCTO #15073] [1]: https://github.com/gwsw/less/issues/344 Signed-off-by: Julien Stephan --- .../distro/include/ptest-packagelists.inc | 1 + ...akefile-allow-CFLAGS-to-be-overitten.patch | 28 + ...esstest-Makefile-add-LDFLAGS-support.patch | 41 +++ meta/recipes-extended/less/files/run-ptest| 25 +++ meta/recipes-extended/less/less_633.bb| 37 ++--- 5 files changed, 127 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-extended/less/files/0001-lesstest-Makefile-allow-CFLAGS-to-be-overitten.patch create mode 100644 meta/recipes-extended/less/files/0002-lesstest-Makefile-add-LDFLAGS-support.patch create mode 100644 meta/recipes-extended/less/files/run-ptest diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index da9153b998c..6f4b6912013 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -95,6 +95,7 @@ PTESTS_SLOW = "\ glib-2.0 \ gnutls \ gstreamer1.0 \ +less \ libevent \ libgcrypt \ libmodule-build-perl \ diff --git a/meta/recipes-extended/less/files/0001-lesstest-Makefile-allow-CFLAGS-to-be-overitten.patch b/meta/recipes-extended/less/files/0001-lesstest-Makefile-allow-CFLAGS-to-be-overitten.patch new file mode 100644 index 000..f7f6efb7718 --- /dev/null +++ b/meta/recipes-extended/less/files/0001-lesstest-Makefile-allow-CFLAGS-to-be-overitten.patch @@ -0,0 +1,28 @@ +From 6499e388a0af8c4531f845ccc58f30ffb1a03c51 Mon Sep 17 00:00:00 2001 +From: Julien Stephan +Date: Tue, 4 Jul 2023 11:43:14 +0200 +Subject: [PATCH 1/2] lesstest: Makefile: allow CFLAGS to be overitten + +use weak assignment for CFLAGS so user can set its CFLAGS and still have +a sane default value + +Upstream-Status: Submitted [https://github.com/gwsw/less/pull/398] + +Signed-off-by: Julien Stephan +--- + lesstest/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lesstest/Makefile b/lesstest/Makefile +index 387b7ae..a231900 100644 +--- a/lesstest/Makefile b/lesstest/Makefile +@@ -1,5 +1,5 @@ + CC ?= gcc +-CFLAGS = -Wall -O2 ++CFLAGS ?= -Wall -O2 + TERMLIB = -lncurses + + all: lesstest lt_screen +-- +2.41.0 diff --git a/meta/recipes-extended/less/files/0002-lesstest-Makefile-add-LDFLAGS-support.patch b/meta/recipes-extended/less/files/0002-lesstest-Makefile-add-LDFLAGS-support.patch new file mode 100644 index 000..ec5f6d82d52 --- /dev/null +++ b/meta/recipes-extended/less/files/0002-lesstest-Makefile-add-LDFLAGS-support.patch @@ -0,0 +1,41 @@ +From e7a0b9cce9c2b9e90b25f502c272e63de37e7def Mon Sep 17 00:00:00 2001 +From: Julien Stephan +Date: Tue, 4 Jul 2023 11:48:52 +0200 +Subject: [PATCH 2/2] lesstest: Makefile: add LDFLAGS support + +add LDFLAGS support. By default LDFLAGS will be empty so no functionnal +change is expected + +Upstream-Status: Submitted [https://github.com/gwsw/less/pull/398] + +Signed-off-by: Julien Stephan +--- + lesstest/Makefile | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/lesstest/Makefile b/lesstest/Makefile +index a231900..8fc0d49 100644 +--- a/lesstest/Makefile b/lesstest/Makefile +@@ -1,16 +1,17 @@ + CC ?= gcc + CFLAGS ?= -Wall -O2 ++LDFLAGS ?= + TERMLIB = -lncurses + + all: lesstest lt_screen + + LESSTEST_OBJ = display.o env.o lesstest.o parse.o pipeline.o log.o run.o term.o wchar.o + lesstest: $(LESSTEST_OBJ) +- $(CC) $(CFLAGS) -o lesstest $(LESSTEST_OBJ) $(TERMLIB) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o lesstest $(LESSTEST_OBJ) $(TERMLIB) + + LT_SCREEN_OBJ = lt_screen.o unicode.o wchar.o + lt_screen: $(LT_SCREEN_OBJ) +- $(CC) $(CFLAGS) -o lt_screen $(LT_SCREEN_OBJ) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o lt_screen $(LT_SCREEN_OBJ) + + *.o: lesstest.h lt_types.h wchar.h + +-- +2.41.0 diff --git a/meta/recipes-extended/less/files/run-ptest b/meta/recipes-extended/less/files/run-ptest new file mode 100644 index 000..4cca02392a1 --- /dev/null +++ b/meta/recipes-extended/less/files/run-ptest @@ -0,0 +1,25 @@ +#! /bin/sh + +fail=0 +pass=0 + +for i in lt/*; do + ./runtest -l /usr/bin/less -t lesstest $i &> /dev/null + + if [[ $? -eq 0 ]]; then + echo "PASS: $(basename $i)" + pass=$((pass+1)) + else + echo "FAIL: $(basename $i)" + fail=$((fail+1)) + fi +done + +echo "" +echo Testsuite summary for less +echo ""
[OE-core] [PATCH v2] oeqa/selftest/devtool: add unit test for "devtool add -b"
Fix [Yocto #15085]
Co-authored-by: Fawzi KHABER
Signed-off-by: Yoann Congal
---
meta/lib/oeqa/selftest/cases/devtool.py | 32 +
1 file changed, 32 insertions(+)
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py
b/meta/lib/oeqa/selftest/cases/devtool.py
index 4c8e375d00..14a80d5ff4 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -366,6 +366,38 @@ class DevtoolAddTests(DevtoolBase):
bindir = bindir[1:]
self.assertTrue(os.path.isfile(os.path.join(installdir, bindir,
'pv')), 'pv binary not found in D')
+def test_devtool_add_binary(self):
+# Create a binary package containing a known test file
+tempdir = tempfile.mkdtemp(prefix='devtoolqa')
+self.track_for_cleanup(tempdir)
+pn = 'tst-bin'
+pv = '1.0'
+test_file_dir = "var/lib/%s/" % pn
+test_file_name= "test_file"
+test_file_content = "TEST CONTENT"
+test_file_package_root = os.path.join(tempdir, pn)
+test_file_dir_full = os.path.join(test_file_package_root,
test_file_dir)
+bb.utils.mkdirhier(test_file_dir_full)
+with open(os.path.join(test_file_dir_full, test_file_name), "w") as f:
+ f.write(test_file_content)
+bin_package_path = os.path.join(tempdir, "%s.tar.gz" % pn)
+runCmd("tar czf %s -C %s ." % (bin_package_path,
test_file_package_root))
+
+# Test devtool add -b on the binary package
+self.track_for_cleanup(self.workspacedir)
+self.add_command_to_tearDown('bitbake -c cleansstate %s' % pn)
+self.add_command_to_tearDown('bitbake-layers remove-layer */workspace')
+result = runCmd('devtool add -b %s %s' % (pn, bin_package_path))
+self.assertExists(os.path.join(self.workspacedir, 'conf',
'layer.conf'), 'Workspace directory not created')
+
+# Build the resulting recipe
+result = runCmd('devtool build %s' % pn)
+installdir = get_bb_var('D', pn)
+self.assertTrue(installdir, 'Could not query installdir variable')
+
+# Check that a known file from the binary package has indeed been
installed
+self.assertTrue(os.path.isfile(os.path.join(installdir, test_file_dir,
test_file_name)), '%s not found in D' % test_file_name)
+
def test_devtool_add_git_local(self):
# We need dbus built so that DEPENDS recognition works
bitbake('dbus')
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#183892):
https://lists.openembedded.org/g/openembedded-core/message/183892
Mute This Topic: https://lists.openembedded.org/mt/99967050/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] cml1: add showconfig task to easily find the generated .config file
From: Ross Burton
It's not that unusual to want to manually review the generated .config file
after do_configure has ran. Add a new 'showconfig' task that simply
prints the full path to the .config file, so the user can open it in an
editor.
Signed-off-by: Ross Burton
---
meta/classes-recipe/cml1.bbclass | 6 ++
1 file changed, 6 insertions(+)
diff --git a/meta/classes-recipe/cml1.bbclass b/meta/classes-recipe/cml1.bbclass
index d87d8204e44..d83c636e486 100644
--- a/meta/classes-recipe/cml1.bbclass
+++ b/meta/classes-recipe/cml1.bbclass
@@ -109,3 +109,9 @@ python do_diffconfig() {
do_diffconfig[nostamp] = "1"
do_diffconfig[dirs] = "${KCONFIG_CONFIG_ROOTDIR}"
addtask diffconfig
+
+do_showconfig() {
+bbplain "Config file written to ${KCONFIG_CONFIG_ROOTDIR}/.config"
+}
+do_showconfig[nostamp] = "1"
+addtask showconfig after do_configure
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#183891):
https://lists.openembedded.org/g/openembedded-core/message/183891
Mute This Topic: https://lists.openembedded.org/mt/99966860/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] libjpeg-turbo: upgrade to 3.0.0
On 5 Jul 2023, at 15:48, Khem Raj via lists.openembedded.org wrote: > > I wonder of this failure is related to this > https://errors.yoctoproject.org/Errors/Details/711770/ TOPDIR/build/tmp/work/cortexa72-cortexa53-crypto-mx8-yoe-linux/poppler/23.04.0-r0/recipe-sysroot/usr/include/jpeglib.h:968:52: error: unknown type name 'FILE' 968 | EXTERN(void) jpeg_stdio_dest(j_compress_ptr cinfo, FILE *outfile); | ^ Quite possibly, but poppler should be including stdio.h: “”" Applications using the JPEG library should include the header file jpeglib.h to obtain declarations of data types and routines. Before including jpeglib.h, include system headers that define at least the typedefs FILE and size_t. On ANSI-conforming systems, including is sufficient; on older Unix systems, you may need to define size_t. “”” Looks like you want to backport https://gitlab.freedesktop.org/poppler/poppler/-/commit/2986f06c7cc9d64a506ebe861b8bf38f73386e86 to poppler. Ross -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#183890): https://lists.openembedded.org/g/openembedded-core/message/183890 Mute This Topic: https://lists.openembedded.org/mt/99943765/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] libjpeg-turbo: upgrade to 3.0.0
I wonder of this failure is related to this
https://errors.yoctoproject.org/Errors/Details/711770/
On Tue, Jul 4, 2023 at 3:23 AM Ross Burton wrote:
>
> From: Ross Burton
>
> Remove 0001-libjpeg-turbo-fix-package_qa-error.patch, doesn't appear to
> be needed anymore.
>
> Use the full upstream license for LICENSE, and change LIC_FILES_CHKSUM
> to point at just the license overview in LICENSE.md.
>
> Signed-off-by: Ross Burton
> ---
> ...1-libjpeg-turbo-fix-package_qa-error.patch | 32 ---
> ...urbo_2.1.5.1.bb => libjpeg-turbo_3.0.0.bb} | 14 +++-
> 2 files changed, 5 insertions(+), 41 deletions(-)
> delete mode 100644
> meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch
> rename meta/recipes-graphics/jpeg/{libjpeg-turbo_2.1.5.1.bb =>
> libjpeg-turbo_3.0.0.bb} (83%)
>
> diff --git
> a/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch
>
> b/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch
> deleted file mode 100644
> index fab5109f831..000
> ---
> a/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -From 5cf847b5bef8dc3f9f89bd09dd5af4e6603f393c Mon Sep 17 00:00:00 2001
> -From: Changqing Li
> -Date: Mon, 27 Aug 2018 16:10:55 +0800
> -Subject: [PATCH] libjpeg-turbo: fix package_qa error
> -
> -Fix package qa errors like below:
> -libjpeg.so.62.3.0 contains probably-redundant RPATH /usr/lib [useless-rpaths]
> -usr/bin/cjpeg contains probably-redundant RPATH /usr/lib
> -
> -Upstream-Status: Inappropriate [oe-specific]
> -
> -Signed-off-by: Changqing Li
> -Signed-off-by: Anuj Mittal
>
> - CMakeLists.txt | 4
> - 1 file changed, 4 deletions(-)
> -
> -diff --git a/CMakeLists.txt b/CMakeLists.txt
> -index 2bc3458..ea3041e 100644
> a/CMakeLists.txt
> -+++ b/CMakeLists.txt
> -@@ -191,10 +191,6 @@ endif()
> - report_option(ENABLE_SHARED "Shared libraries")
> - report_option(ENABLE_STATIC "Static libraries")
> -
> --if(ENABLE_SHARED)
> -- set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR})
> --endif()
> --
> - if(WITH_JPEG8 OR WITH_JPEG7)
> - set(WITH_ARITH_ENC 1)
> - set(WITH_ARITH_DEC 1)
> diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.1.bb
> b/meta/recipes-graphics/jpeg/libjpeg-turbo_3.0.0.bb
> similarity index 83%
> rename from meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.1.bb
> rename to meta/recipes-graphics/jpeg/libjpeg-turbo_3.0.0.bb
> index e086830c021..146d80008c5 100644
> --- a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.1.bb
> +++ b/meta/recipes-graphics/jpeg/libjpeg-turbo_3.0.0.bb
> @@ -2,19 +2,15 @@ SUMMARY = "Hardware accelerated JPEG
> compression/decompression library"
> DESCRIPTION = "libjpeg-turbo is a derivative of libjpeg that uses SIMD
> instructions (MMX, SSE2, NEON) to accelerate baseline JPEG compression and
> decompression"
> HOMEPAGE = "http://libjpeg-turbo.org/;
>
> -LICENSE = "BSD-3-Clause"
> -LIC_FILES_CHKSUM =
> "file://cdjpeg.h;endline=13;md5=8a61af33cc1c681cd5cc297150bbb5bd \
> -
> file://jpeglib.h;endline=16;md5=52b5eaade8d5b6a452a7693dfe52c084 \
> -
> file://djpeg.c;endline=11;md5=510b386442ab6a27ee241fc5669bc5ea \
> -"
> +LICENSE = "IJG & BSD-3-Clause & Zlib"
> +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=2a8e0d8226a102f07ab63ed7fd6ce155"
> +
> DEPENDS:append:x86-64:class-target = " nasm-native"
> DEPENDS:append:x86:class-target = " nasm-native"
>
> -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
> - file://0001-libjpeg-turbo-fix-package_qa-error.patch \
> - "
> +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
>
> -SRC_URI[sha256sum] =
> "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf"
> +SRC_URI[sha256sum] =
> "c77c65fcce3d33417b2e90432e7a0eb05f59a7fff884022a9d931775d583bfaa"
> UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/;
> UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P(\d+[\.\-_]*)+)/"
>
> --
> 2.34.1
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#183889):
https://lists.openembedded.org/g/openembedded-core/message/183889
Mute This Topic: https://lists.openembedded.org/mt/99943765/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core][kirkstone][PATCH] cups: fix CVE-2023-34241 use-after-free in cupsdAcceptClient() in scheduler/client.c
Signed-off-by: Vivek Kumbhar
---
meta/recipes-extended/cups/cups.inc | 1 +
.../cups/cups/CVE-2023-34241.patch| 68 +++
2 files changed, 69 insertions(+)
create mode 100644 meta/recipes-extended/cups/cups/CVE-2023-34241.patch
diff --git a/meta/recipes-extended/cups/cups.inc
b/meta/recipes-extended/cups/cups.inc
index 1b87d47a49..87f220590f 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -16,6 +16,7 @@ SRC_URI =
"https://github.com/OpenPrinting/cups/releases/download/v${PV}/cups-${
file://volatiles.99_cups \
file://cups-volatiles.conf \
file://CVE-2023-32324.patch \
+ file://CVE-2023-34241.patch \
"
UPSTREAM_CHECK_URI = "https://github.com/OpenPrinting/cups/releases;
diff --git a/meta/recipes-extended/cups/cups/CVE-2023-34241.patch
b/meta/recipes-extended/cups/cups/CVE-2023-34241.patch
new file mode 100644
index 00..95b3925b36
--- /dev/null
+++ b/meta/recipes-extended/cups/cups/CVE-2023-34241.patch
@@ -0,0 +1,68 @@
+From ffd290b4ab247f82722927ba9b21358daa16dbf1 Mon Sep 17 00:00:00 2001
+From: Rose <83477269+ataridre...@users.noreply.github.com>
+Date: Thu, 1 Jun 2023 11:33:39 -0400
+Subject: [PATCH] Log result of httpGetHostname BEFORE closing the connection
+
+httpClose frees the memory of con->http. This is problematic because
httpGetHostname then tries to access the memory it points to.
+
+We have to log the hostname first.
+
+Upstream-Status: Backport
[https://github.com/OpenPrinting/cups/commit/9809947a959e18409dcf562a3466ef246cb90cb2]
+CVE: CVE-2023-34241
+Signed-off-by: Vivek Kumbhar
+---
+ scheduler/client.c | 16 +++-
+ 1 file changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/scheduler/client.c b/scheduler/client.c
+index e7e419f..441c1d7 100644
+--- a/scheduler/client.c
b/scheduler/client.c
+@@ -193,13 +193,11 @@ cupsdAcceptClient(cupsd_listener_t *lis)/* I - Listener
socket */
+/*
+ * Can't have an unresolved IP address with double-lookups enabled...
+ */
+-
+-httpClose(con->http);
+-
+ cupsdLogClient(con, CUPSD_LOG_WARN,
+-"Name lookup failed - connection from %s closed!",
++"Name lookup failed - closing connection from %s!",
+ httpGetHostname(con->http, NULL, 0));
+
++httpClose(con->http);
+ free(con);
+ return;
+ }
+@@ -235,11 +233,11 @@ cupsdAcceptClient(cupsd_listener_t *lis)/* I - Listener
socket */
+ * with double-lookups enabled...
+ */
+
+- httpClose(con->http);
+-
+ cupsdLogClient(con, CUPSD_LOG_WARN,
+- "IP lookup failed - connection from %s closed!",
++ "IP lookup failed - closing connection from %s!",
+ httpGetHostname(con->http, NULL, 0));
++
++ httpClose(con->http);
+ free(con);
+ return;
+ }
+@@ -256,11 +254,11 @@ cupsdAcceptClient(cupsd_listener_t *lis)/* I - Listener
socket */
+
+ if (!hosts_access(_req))
+ {
+-httpClose(con->http);
+-
+ cupsdLogClient(con, CUPSD_LOG_WARN,
+ "Connection from %s refused by /etc/hosts.allow and "
+ "/etc/hosts.deny rules.", httpGetHostname(con->http, NULL,
0));
++
++httpClose(con->http);
+ free(con);
+ return;
+ }
+--
+2.25.1
+
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#183888):
https://lists.openembedded.org/g/openembedded-core/message/183888
Mute This Topic: https://lists.openembedded.org/mt/99966146/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 2/3] libxcrypt: Limit to enabling strong hash algos only
On 30 Jun 2023, at 14:30, Alexandre Belloni via lists.openembedded.org
wrote:
>
> Hello Khem,
>
> This causes python ptest failures:
>
> {'python3': ['test_crypt', 'test_methods', 'test_sha2_rounds']}
>
> We should probably disable those
Guessing this is also the cause of the perl failures:
{'perl': ['t/op/crypt']}
and apr-util:
{'apr-util': ['testpass_3_of_6']}
Test 3 of 6 is test_shapass using SHA1.
If we want to do this then some effort will be needed to make all the test
suites adapt to what algorithms are actually available.
Ross
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#183887):
https://lists.openembedded.org/g/openembedded-core/message/183887
Mute This Topic: https://lists.openembedded.org/mt/99749300/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] oeqa/runtime/cases/rpm: fix wait_for_no_process_for_user failure case
From: Ross Burton
str.format() doesn't use % notation, update the formatting to work.
assertTrue() is a member of self not a global, and assertTrue(True) will
always pass. Change this to just self.fail() as this is the failure case.
Signed-off-by: Ross Burton
---
meta/lib/oeqa/runtime/cases/rpm.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/lib/oeqa/runtime/cases/rpm.py
b/meta/lib/oeqa/runtime/cases/rpm.py
index fa86eb05373..a4ba4e67698 100644
--- a/meta/lib/oeqa/runtime/cases/rpm.py
+++ b/meta/lib/oeqa/runtime/cases/rpm.py
@@ -59,8 +59,8 @@ class RpmBasicTest(OERuntimeTestCase):
return
time.sleep(1)
user_pss = [ps for ps in output.split("\n") if u + ' ' in ps]
-msg = "There're %s 's process(es) still running: %s".format(u,
"\n".join(user_pss))
-assertTrue(True, msg=msg)
+msg = "User %s has processes still running: %s" % (u,
"\n".join(user_pss))
+self.fail(msg=msg)
def unset_up_test_user(u):
# ensure no test1 process in running
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#183886):
https://lists.openembedded.org/g/openembedded-core/message/183886
Mute This Topic: https://lists.openembedded.org/mt/99962571/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] oeqa/runtime/cases/rpm: fix unqualified assertTrue() call
Ignore this, more problems with the same code block.
Ross
> On 5 Jul 2023, at 11:50, Ross Burton via lists.openembedded.org
> wrote:
>
> From: Ross Burton
>
> assertTrue() is a member of self, not a global.
>
> Signed-off-by: Ross Burton
> ---
> meta/lib/oeqa/runtime/cases/rpm.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/lib/oeqa/runtime/cases/rpm.py
> b/meta/lib/oeqa/runtime/cases/rpm.py
> index fa86eb05373..7ab71851b44 100644
> --- a/meta/lib/oeqa/runtime/cases/rpm.py
> +++ b/meta/lib/oeqa/runtime/cases/rpm.py
> @@ -60,7 +60,7 @@ class RpmBasicTest(OERuntimeTestCase):
> time.sleep(1)
> user_pss = [ps for ps in output.split("\n") if u + ' ' in ps]
> msg = "There're %s 's process(es) still running: %s".format(u,
> "\n".join(user_pss))
> -assertTrue(True, msg=msg)
> +self.assertTrue(True, msg=msg)
>
> def unset_up_test_user(u):
> # ensure no test1 process in running
> --
> 2.34.1
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#183885):
https://lists.openembedded.org/g/openembedded-core/message/183885
Mute This Topic: https://lists.openembedded.org/mt/99962465/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] oeqa/runtime/cases/rpm: fix unqualified assertTrue() call
From: Ross Burton
assertTrue() is a member of self, not a global.
Signed-off-by: Ross Burton
---
meta/lib/oeqa/runtime/cases/rpm.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/runtime/cases/rpm.py
b/meta/lib/oeqa/runtime/cases/rpm.py
index fa86eb05373..7ab71851b44 100644
--- a/meta/lib/oeqa/runtime/cases/rpm.py
+++ b/meta/lib/oeqa/runtime/cases/rpm.py
@@ -60,7 +60,7 @@ class RpmBasicTest(OERuntimeTestCase):
time.sleep(1)
user_pss = [ps for ps in output.split("\n") if u + ' ' in ps]
msg = "There're %s 's process(es) still running: %s".format(u,
"\n".join(user_pss))
-assertTrue(True, msg=msg)
+self.assertTrue(True, msg=msg)
def unset_up_test_user(u):
# ensure no test1 process in running
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#183884):
https://lists.openembedded.org/g/openembedded-core/message/183884
Mute This Topic: https://lists.openembedded.org/mt/99962465/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] python3: fix missing comma in get_module_deps3.py
From: Ross Burton
Wes Tarro noticed a missing comma in a
preplace() call, add it.
That said, calling replace() with one argument results in a TypeError,
so this is obviously dead code.
Signed-off-by: Ross Burton
---
meta/recipes-devtools/python/python3/get_module_deps3.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/python/python3/get_module_deps3.py
b/meta/recipes-devtools/python/python3/get_module_deps3.py
index 0ca687d2eb3..8e432b49af8 100644
--- a/meta/recipes-devtools/python/python3/get_module_deps3.py
+++ b/meta/recipes-devtools/python/python3/get_module_deps3.py
@@ -32,7 +32,7 @@ def fix_path(dep_path):
dep_path = dep_path[dep_path.find(pivot)+len(pivot):]
if '/usr/bin' in dep_path:
-dep_path = dep_path.replace('/usr/bin''${bindir}')
+dep_path = dep_path.replace('/usr/bin','${bindir}')
# Handle multilib, is there a better way?
if '/usr/lib32' in dep_path:
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#183883):
https://lists.openembedded.org/g/openembedded-core/message/183883
Mute This Topic: https://lists.openembedded.org/mt/99962304/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 1/2] python3-jsonpointer: upgrade to 2.4
From: Ross Burton
Drop the merged patch.
Signed-off-by: Ross Burton
---
.../0001-Clean-up-test-runner.patch | 62 ---
...nter_2.3.bb => python3-jsonpointer_2.4.bb} | 4 +-
2 files changed, 1 insertion(+), 65 deletions(-)
delete mode 100644
meta/recipes-devtools/python/python3-jsonpointer/0001-Clean-up-test-runner.patch
rename meta/recipes-devtools/python/{python3-jsonpointer_2.3.bb =>
python3-jsonpointer_2.4.bb} (79%)
diff --git
a/meta/recipes-devtools/python/python3-jsonpointer/0001-Clean-up-test-runner.patch
b/meta/recipes-devtools/python/python3-jsonpointer/0001-Clean-up-test-runner.patch
deleted file mode 100644
index 4121834dbfb..000
---
a/meta/recipes-devtools/python/python3-jsonpointer/0001-Clean-up-test-runner.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 04a864f33848da6af1dea906ba4922770022ef66 Mon Sep 17 00:00:00 2001
-From: Ross Burton
-Date: Thu, 16 Mar 2023 14:21:32 +
-Subject: [PATCH] Clean up test runner
-
-Test code doesn't need to manually construct a TestSuite and a
-TextTestRunner, the unittest module has a discovery function that does
-all this for you.
-
-Delete all of the manual logic from tests.py, replace it with the two
-lines to bring in the doctest unit tests, and update the makefile to
-run the unittest discovery.
-
-Upstream-Status: Submitted
[https://github.com/stefankoegl/python-json-pointer/pull/54]
-Signed-off-by: Ross Burton
- makefile | 2 +-
- tests.py | 24
- 2 files changed, 5 insertions(+), 21 deletions(-)
-
-diff --git a/tests.py b/tests.py
-index 9252369..6b4b8cc 100755
a/tests.py
-+++ b/tests.py
-@@ -7,6 +7,7 @@ import doctest
- import unittest
- import sys
- import copy
-+import jsonpointer
- from jsonpointer import resolve_pointer, EndOfList, JsonPointerException, \
- JsonPointer, set_pointer
-
-@@ -410,23 +411,6 @@ class AltTypesTests(unittest.TestCase):
- self.assertRaises(JsonPointerException, resolve_pointer, doc,
'/root/1/2/3/4')
-
-
--
--suite = unittest.TestSuite()
--suite.addTest(unittest.makeSuite(SpecificationTests))
--suite.addTest(unittest.makeSuite(ComparisonTests))
--suite.addTest(unittest.makeSuite(WrongInputTests))
--suite.addTest(unittest.makeSuite(ToLastTests))
--suite.addTest(unittest.makeSuite(SetTests))
--suite.addTest(unittest.makeSuite(AltTypesTests))
--
--modules = ['jsonpointer']
--
--for module in modules:
--m = __import__(module, fromlist=[module])
--suite.addTest(doctest.DocTestSuite(m))
--
--runner = unittest.TextTestRunner(verbosity=1)
--result = runner.run(suite)
--
--if not result.wasSuccessful():
--sys.exit(1)
-+def load_tests(loader, tests, ignore):
-+tests.addTests(doctest.DocTestSuite(jsonpointer))
-+return tests
---
-2.34.1
-
diff --git a/meta/recipes-devtools/python/python3-jsonpointer_2.3.bb
b/meta/recipes-devtools/python/python3-jsonpointer_2.4.bb
similarity index 79%
rename from meta/recipes-devtools/python/python3-jsonpointer_2.3.bb
rename to meta/recipes-devtools/python/python3-jsonpointer_2.4.bb
index 0ec4de055c5..d7a1fea70ae 100644
--- a/meta/recipes-devtools/python/python3-jsonpointer_2.3.bb
+++ b/meta/recipes-devtools/python/python3-jsonpointer_2.4.bb
@@ -5,9 +5,7 @@ LIC_FILES_CHKSUM =
"file://LICENSE.txt;md5=32b15c843b7a329130f4e266a281ebb3"
inherit pypi ptest setuptools3
-SRC_URI += "file://0001-Clean-up-test-runner.patch"
-
-SRC_URI[sha256sum] =
"97cba51526c829282218feb99dab1b1e6bdf8efd1c43dc9d57be093c0d69c99a"
+SRC_URI[sha256sum] =
"585cee82b70211fa9e6043b7bb89db6e1aa49524340dde8ad6b63206ea689d88"
RDEPENDS:${PN} += " \
${PYTHON_PN}-json \
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#183881):
https://lists.openembedded.org/g/openembedded-core/message/183881
Mute This Topic: https://lists.openembedded.org/mt/99962046/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 2/2] pkgconf: update SRC_URI
From: Ross Burton
dereferenced.org is now longer controlled by the pkgconf maintainers[1],
so use the the new hosting location.
[1]
https://github.com/pkgconf/pkgconf/commit/437c2a3218bfcb1cae7fa38a4ccd0cb29575ff07
Signed-off-by: Ross Burton
---
meta/recipes-devtools/pkgconf/pkgconf_1.9.5.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/pkgconf/pkgconf_1.9.5.bb
b/meta/recipes-devtools/pkgconf/pkgconf_1.9.5.bb
index 4bdf03c574c..ab1d1c84e8f 100644
--- a/meta/recipes-devtools/pkgconf/pkgconf_1.9.5.bb
+++ b/meta/recipes-devtools/pkgconf/pkgconf_1.9.5.bb
@@ -15,7 +15,7 @@ LICENSE = "pkgconf"
LIC_FILES_CHKSUM = "file://COPYING;md5=2214222ec1a820bd6cc75167a56925e0"
SRC_URI = "\
-https://distfiles.dereferenced.org/pkgconf/pkgconf-${PV}.tar.xz \
+https://distfiles.ariadne.space/pkgconf/pkgconf-${PV}.tar.xz \
file://pkg-config-wrapper \
file://pkg-config-native.in \
file://pkg-config-esdk.in \
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#183882):
https://lists.openembedded.org/g/openembedded-core/message/183882
Mute This Topic: https://lists.openembedded.org/mt/99962047/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] python3-pygments: upgrade to 2.15.1
On Wed, Jul 5, 2023 at 11:45 AM Sudip Mukherjee
wrote:
> On Wed, 5 Jul 2023 at 10:23, Sudip Mukherjee via
> lists.openembedded.org
> wrote:
> >
> > On Wed, 5 Jul 2023 at 08:45, Tim Orling wrote:
> > >
> > >
> > >
> > > On Tue, Jul 4, 2023 at 10:09 PM Sudip Mukherjee <
> sudipm.mukher...@gmail.com> wrote:
> > >>
> > >> Upstream has removed setup.py and started using pyproject.toml
> > >>
> > >> Signed-off-by: Sudip Mukherjee
> > >> ---
> > >> ...ython3-pygments_2.14.0.bb => python3-pygments_2.15.1.bb} | 6
> +-
> > >> 1 file changed, 5 insertions(+), 1 deletion(-)
> > >> rename meta/recipes-devtools/python/{python3-pygments_2.14.0.bb =>
> python3-pygments_2.15.1.bb} (76%)
> > >>
> > >> diff --git a/meta/recipes-devtools/python/python3-pygments_2.14.0.bb
> b/meta/recipes-devtools/python/python3-pygments_2.15.1.bb
> > >> similarity index 76%
> > >> rename from meta/recipes-devtools/python/python3-pygments_2.14.0.bb
> > >> rename to meta/recipes-devtools/python/python3-pygments_2.15.1.bb
> > >> index 16769e9263..7e3b286f41 100644
> > >> --- a/meta/recipes-devtools/python/python3-pygments_2.14.0.bb
> > >> +++ b/meta/recipes-devtools/python/python3-pygments_2.15.1.bb
> > >> @@ -5,7 +5,7 @@ LICENSE = "BSD-2-Clause"
> > >> LIC_FILES_CHKSUM =
> "file://LICENSE;md5=36a13c90514e2899f1eba7f41c3ee592"
> > >>
> > >> inherit setuptools3
> > >
> > >
> > > instead of setuptools3, inherit python_setuptools_build_meta
> > > Look at the build.backend variable in pyproject.toml for hints
> > > https://github.com/pygments/pygments/blob/master/pyproject.toml#L4
> >
> > Thanks Tim. I was going through all the python*.bbclass to find a
> > suitable one but obviously I missed it.
> > Will update, test and send a v2.
>
> nm, I can see you have already sent a patch for this.
>
> I decided to maintain it. Thank you for your contribution and bringing it
to my attention.
> --
> Regards
> Sudip
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#183880):
https://lists.openembedded.org/g/openembedded-core/message/183880
Mute This Topic: https://lists.openembedded.org/mt/99953624/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] python3-pygments: upgrade to 2.15.1
On Wed, 5 Jul 2023 at 10:23, Sudip Mukherjee via
lists.openembedded.org
wrote:
>
> On Wed, 5 Jul 2023 at 08:45, Tim Orling wrote:
> >
> >
> >
> > On Tue, Jul 4, 2023 at 10:09 PM Sudip Mukherjee
> > wrote:
> >>
> >> Upstream has removed setup.py and started using pyproject.toml
> >>
> >> Signed-off-by: Sudip Mukherjee
> >> ---
> >> ...ython3-pygments_2.14.0.bb => python3-pygments_2.15.1.bb} | 6 +-
> >> 1 file changed, 5 insertions(+), 1 deletion(-)
> >> rename meta/recipes-devtools/python/{python3-pygments_2.14.0.bb =>
> >> python3-pygments_2.15.1.bb} (76%)
> >>
> >> diff --git a/meta/recipes-devtools/python/python3-pygments_2.14.0.bb
> >> b/meta/recipes-devtools/python/python3-pygments_2.15.1.bb
> >> similarity index 76%
> >> rename from meta/recipes-devtools/python/python3-pygments_2.14.0.bb
> >> rename to meta/recipes-devtools/python/python3-pygments_2.15.1.bb
> >> index 16769e9263..7e3b286f41 100644
> >> --- a/meta/recipes-devtools/python/python3-pygments_2.14.0.bb
> >> +++ b/meta/recipes-devtools/python/python3-pygments_2.15.1.bb
> >> @@ -5,7 +5,7 @@ LICENSE = "BSD-2-Clause"
> >> LIC_FILES_CHKSUM = "file://LICENSE;md5=36a13c90514e2899f1eba7f41c3ee592"
> >>
> >> inherit setuptools3
> >
> >
> > instead of setuptools3, inherit python_setuptools_build_meta
> > Look at the build.backend variable in pyproject.toml for hints
> > https://github.com/pygments/pygments/blob/master/pyproject.toml#L4
>
> Thanks Tim. I was going through all the python*.bbclass to find a
> suitable one but obviously I missed it.
> Will update, test and send a v2.
nm, I can see you have already sent a patch for this.
--
Regards
Sudip
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#183879):
https://lists.openembedded.org/g/openembedded-core/message/183879
Mute This Topic: https://lists.openembedded.org/mt/99953624/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] python3-pygments: upgrade to 2.15.1
On Wed, 5 Jul 2023 at 08:45, Tim Orling wrote:
>
>
>
> On Tue, Jul 4, 2023 at 10:09 PM Sudip Mukherjee
> wrote:
>>
>> Upstream has removed setup.py and started using pyproject.toml
>>
>> Signed-off-by: Sudip Mukherjee
>> ---
>> ...ython3-pygments_2.14.0.bb => python3-pygments_2.15.1.bb} | 6 +-
>> 1 file changed, 5 insertions(+), 1 deletion(-)
>> rename meta/recipes-devtools/python/{python3-pygments_2.14.0.bb =>
>> python3-pygments_2.15.1.bb} (76%)
>>
>> diff --git a/meta/recipes-devtools/python/python3-pygments_2.14.0.bb
>> b/meta/recipes-devtools/python/python3-pygments_2.15.1.bb
>> similarity index 76%
>> rename from meta/recipes-devtools/python/python3-pygments_2.14.0.bb
>> rename to meta/recipes-devtools/python/python3-pygments_2.15.1.bb
>> index 16769e9263..7e3b286f41 100644
>> --- a/meta/recipes-devtools/python/python3-pygments_2.14.0.bb
>> +++ b/meta/recipes-devtools/python/python3-pygments_2.15.1.bb
>> @@ -5,7 +5,7 @@ LICENSE = "BSD-2-Clause"
>> LIC_FILES_CHKSUM = "file://LICENSE;md5=36a13c90514e2899f1eba7f41c3ee592"
>>
>> inherit setuptools3
>
>
> instead of setuptools3, inherit python_setuptools_build_meta
> Look at the build.backend variable in pyproject.toml for hints
> https://github.com/pygments/pygments/blob/master/pyproject.toml#L4
Thanks Tim. I was going through all the python*.bbclass to find a
suitable one but obviously I missed it.
Will update, test and send a v2.
--
Regards
Sudip
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#183878):
https://lists.openembedded.org/g/openembedded-core/message/183878
Mute This Topic: https://lists.openembedded.org/mt/99953624/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] python3-pygments: upgrade 2.14.0 -> 2.15.1
* Upstream has dropped setup.py
* Inherit python_setuptools_build_meta instead of setuptools3
* Add self as maintainer, as this is a dependency for python3-sphinx
Adds some new lexers, updates a few others. A handful of bug fixes.
https://github.com/pygments/pygments/blob/2.15.1/CHANGES#L6
https://github.com/pygments/pygments/blob/2.15.1/CHANGES#L18
Signed-off-by: Tim Orling
---
meta/conf/distro/include/maintainers.inc | 2 +-
...{python3-pygments_2.14.0.bb => python3-pygments_2.15.1.bb} | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-devtools/python/{python3-pygments_2.14.0.bb =>
python3-pygments_2.15.1.bb} (76%)
diff --git a/meta/conf/distro/include/maintainers.inc
b/meta/conf/distro/include/maintainers.inc
index 232107cd242..fafa8eeb2ca 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -663,7 +663,7 @@ RECIPE_MAINTAINER:pn-python3-pyasn1 = "Tim Orling
"
RECIPE_MAINTAINER:pn-python3-pycairo = "Zang Ruochen "
RECIPE_MAINTAINER:pn-python3-pycparser = "Tim Orling "
RECIPE_MAINTAINER:pn-python3-pyelftools = "Joshua Watt "
-RECIPE_MAINTAINER:pn-python3-pygments = "Unassigned
"
+RECIPE_MAINTAINER:pn-python3-pygments = "Tim Orling "
RECIPE_MAINTAINER:pn-python3-pygobject = "Zang Ruochen
"
RECIPE_MAINTAINER:pn-python3-pyopenssl = "Tim Orling "
RECIPE_MAINTAINER:pn-python3-pyparsing = "Unassigned
"
diff --git a/meta/recipes-devtools/python/python3-pygments_2.14.0.bb
b/meta/recipes-devtools/python/python3-pygments_2.15.1.bb
similarity index 76%
rename from meta/recipes-devtools/python/python3-pygments_2.14.0.bb
rename to meta/recipes-devtools/python/python3-pygments_2.15.1.bb
index 16769e92635..e0e477100eb 100644
--- a/meta/recipes-devtools/python/python3-pygments_2.14.0.bb
+++ b/meta/recipes-devtools/python/python3-pygments_2.15.1.bb
@@ -4,8 +4,8 @@ HOMEPAGE = "http://pygments.org/;
LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=36a13c90514e2899f1eba7f41c3ee592"
-inherit setuptools3
-SRC_URI[sha256sum] =
"b3ed06a9e8ac9a9aae5a6f5dbe78a8a58655d17b43b93c078f094ddc476ae297"
+inherit python_setuptools_build_meta
+SRC_URI[sha256sum] =
"8ace4d3c1dd481894b2005f560ead0f9f19ee64fe983366be1a21e171d12775c"
DEPENDS += "\
${PYTHON_PN} \
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#183877):
https://lists.openembedded.org/g/openembedded-core/message/183877
Mute This Topic: https://lists.openembedded.org/mt/99961493/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] python3-pygments: upgrade to 2.15.1
On Tue, Jul 4, 2023 at 10:09 PM Sudip Mukherjee
wrote:
> Upstream has removed setup.py and started using pyproject.toml
>
> Signed-off-by: Sudip Mukherjee
> ---
> ...ython3-pygments_2.14.0.bb => python3-pygments_2.15.1.bb} | 6 +-
> 1 file changed, 5 insertions(+), 1 deletion(-)
> rename meta/recipes-devtools/python/{python3-pygments_2.14.0.bb =>
> python3-pygments_2.15.1.bb} (76%)
>
> diff --git a/meta/recipes-devtools/python/python3-pygments_2.14.0.bb
> b/meta/recipes-devtools/python/python3-pygments_2.15.1.bb
> similarity index 76%
> rename from meta/recipes-devtools/python/python3-pygments_2.14.0.bb
> rename to meta/recipes-devtools/python/python3-pygments_2.15.1.bb
> index 16769e9263..7e3b286f41 100644
> --- a/meta/recipes-devtools/python/python3-pygments_2.14.0.bb
> +++ b/meta/recipes-devtools/python/python3-pygments_2.15.1.bb
> @@ -5,7 +5,7 @@ LICENSE = "BSD-2-Clause"
> LIC_FILES_CHKSUM = "file://LICENSE;md5=36a13c90514e2899f1eba7f41c3ee592"
>
> inherit setuptools3
instead of setuptools3, inherit python_setuptools_build_meta
Look at the build.backend variable in pyproject.toml for hints
https://github.com/pygments/pygments/blob/master/pyproject.toml#L4
>
> -SRC_URI[sha256sum] =
> "b3ed06a9e8ac9a9aae5a6f5dbe78a8a58655d17b43b93c078f094ddc476ae297"
> +SRC_URI[sha256sum] =
> "8ace4d3c1dd481894b2005f560ead0f9f19ee64fe983366be1a21e171d12775c"
>
> DEPENDS += "\
> ${PYTHON_PN} \
> @@ -15,5 +15,9 @@ PYPI_PACKAGE = "Pygments"
>
> inherit pypi
>
> +do_compile () {
> +python_pep517_do_compile
> +}
> +
inheriting the proper class will do this
>
> BBCLASSEXTEND = "native nativesdk"
>
> --
> 2.30.2
>
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#183876):
https://lists.openembedded.org/g/openembedded-core/message/183876
Mute This Topic: https://lists.openembedded.org/mt/99953624/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] systemd-systemctl: fix errors in instance name expansion
If the instance name indicated by %i begins with a number, the meaning of the
replacement string "\\1{}".format(instance) is ambiguous.
To indicate group number 1 regardless of the instance name, use "\g<1>".
Signed-off-by: Yuta Hayama
---
meta/recipes-core/systemd/systemd-systemctl/systemctl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/systemd/systemd-systemctl/systemctl
b/meta/recipes-core/systemd/systemd-systemctl/systemctl
index 514f747fe6..7fe751b397 100755
--- a/meta/recipes-core/systemd/systemd-systemctl/systemctl
+++ b/meta/recipes-core/systemd/systemd-systemctl/systemctl
@@ -202,7 +202,7 @@ class SystemdUnit():
try:
for dependent in config.get('Install', prop):
# expand any %i to instance (ignoring escape sequence %%)
-dependent = re.sub("([^%](%%)*)%i", "\\1{}".format(instance),
dependent)
+dependent = re.sub("([^%](%%)*)%i",
"\\g<1>{}".format(instance), dependent)
wants = systemdir / "{}.{}".format(dependent, dirstem) /
service
add_link(wants, target)
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#183875):
https://lists.openembedded.org/g/openembedded-core/message/183875
Mute This Topic: https://lists.openembedded.org/mt/99960048/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
