[oe] [meta-oe][PATCH V3] fuse3: remove sysv init script and install fuse kernel module explictly
From: Changqing Li
For systemd, there is not a fuse.service since systemd provides
sys-fs-fuse-connections.mount to mount the fuse control filesystem, so
instead, only fuse3.conf is added to modules-load.d to load the required
fuse kernel module.
Signed-off-by: Changqing Li
---
meta-oe/recipes-support/fuse/fuse3/fuse3.conf | 1 +
meta-oe/recipes-support/fuse/fuse3_3.16.2.bb | 15 +++
2 files changed, 16 insertions(+)
create mode 100644 meta-oe/recipes-support/fuse/fuse3/fuse3.conf
diff --git a/meta-oe/recipes-support/fuse/fuse3/fuse3.conf
b/meta-oe/recipes-support/fuse/fuse3/fuse3.conf
new file mode 100644
index 0..a517c488f
--- /dev/null
+++ b/meta-oe/recipes-support/fuse/fuse3/fuse3.conf
@@ -0,0 +1 @@
+fuse
diff --git a/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb
b/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb
index 307544bf3..47b070557 100644
--- a/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb
+++ b/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb
@@ -27,6 +27,7 @@ inherit meson pkgconfig ptest
SRC_URI += " \
file://run-ptest \
+file://fuse3.conf \
"
RDEPENDS:${PN}-ptest += " \
@@ -78,6 +79,20 @@ FILES:fuse3-utils = "${bindir} ${base_sbindir}"
DEBIAN_NOAUTONAME:fuse3-utils = "1"
DEBIAN_NOAUTONAME:${PN}-dbg = "1"
+SYSTEMD_SERVICE:${PN} = ""
+
do_install:append() {
rm -rf ${D}${base_prefix}/dev
+
+# systemd class remove the sysv_initddir only if systemd_system_unitdir
+# contains anything, but it's not needed if sysvinit is not in
DISTRO_FEATURES
+if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'false', 'true',
d)}; then
+rm -rf ${D}${sysconfdir}/init.d/
+fi
+
+# Install systemd related configuration file
+if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false',
d)}; then
+install -d ${D}${sysconfdir}/modules-load.d
+install -m 0644 ${UNPACKDIR}/fuse3.conf
${D}${sysconfdir}/modules-load.d
+fi
}
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#110495):
https://lists.openembedded.org/g/openembedded-devel/message/110495
Mute This Topic: https://lists.openembedded.org/mt/106257769/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [master][meta-oe][PATCH V2] fuse3: remove sysv init script and install fuse kernel module explictly
On 5/23/24 09:56, Khem Raj wrote:
CAUTION: This email comes from a non Wind River email account!
Do not click links or open attachments unless you recognize the sender and know
the content is safe.
On Wed, May 22, 2024 at 6:55 PM Changqing Li via
lists.openembedded.org
wrote:
From: Changqing Li
For systemd, there is not a fuse.service since systemd provides
sys-fs-fuse-connections.mount to mount the fuse control filesystem, so
instead, only fuse3.conf is added to modules-load.d to load the required
fuse kernel module.
Signed-off-by: Changqing Li
---
meta-oe/recipes-support/fuse/fuse3/fuse3.conf | 1 +
meta-oe/recipes-support/fuse/fuse3_3.16.2.bb | 15 +++
2 files changed, 16 insertions(+)
create mode 100644 meta-oe/recipes-support/fuse/fuse3/fuse3.conf
diff --git a/meta-oe/recipes-support/fuse/fuse3/fuse3.conf
b/meta-oe/recipes-support/fuse/fuse3/fuse3.conf
new file mode 100644
index 0..a517c488f
--- /dev/null
+++ b/meta-oe/recipes-support/fuse/fuse3/fuse3.conf
@@ -0,0 +1 @@
+fuse
diff --git a/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb
b/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb
index 307544bf3..b799b2c6b 100644
--- a/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb
+++ b/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb
@@ -27,6 +27,7 @@ inherit meson pkgconfig ptest
SRC_URI += " \
file://run-ptest \
+file://fuse3.conf \
"
RDEPENDS:${PN}-ptest += " \
@@ -78,6 +79,20 @@ FILES:fuse3-utils = "${bindir} ${base_sbindir}"
DEBIAN_NOAUTONAME:fuse3-utils = "1"
DEBIAN_NOAUTONAME:${PN}-dbg = "1"
+SYSTEMD_SERVICE:${PN} = ""
+
do_install:append() {
rm -rf ${D}${base_prefix}/dev
+
+# systemd class remove the sysv_initddir only if systemd_system_unitdir
+# contains anything, but it's not needed if sysvinit is not in
DISTRO_FEATURES
+if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'false', 'true',
d)}; then
+rm -rf ${D}${sysconfdir}/init.d/
+fi
+
+# Install systemd related configuration file
+if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false',
d)}; then
+install -d ${D}${sysconfdir}/modules-load.d
+install -m 0644 ${WORKDIR}/fuse3.conf ${D}${sysconfdir}/modules-load.d
This should be UNPACKDIR instead of WORKDIR here.
Thanks. Will send a V3 and fix this.
Regards
Sandy
+fi
}
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#110494):
https://lists.openembedded.org/g/openembedded-devel/message/110494
Mute This Topic: https://lists.openembedded.org/mt/106255586/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [master][meta-oe][PATCH V2] fuse3: remove sysv init script and install fuse kernel module explictly
On Wed, May 22, 2024 at 6:55 PM Changqing Li via
lists.openembedded.org
wrote:
>
> From: Changqing Li
>
> For systemd, there is not a fuse.service since systemd provides
> sys-fs-fuse-connections.mount to mount the fuse control filesystem, so
> instead, only fuse3.conf is added to modules-load.d to load the required
> fuse kernel module.
>
> Signed-off-by: Changqing Li
> ---
> meta-oe/recipes-support/fuse/fuse3/fuse3.conf | 1 +
> meta-oe/recipes-support/fuse/fuse3_3.16.2.bb | 15 +++
> 2 files changed, 16 insertions(+)
> create mode 100644 meta-oe/recipes-support/fuse/fuse3/fuse3.conf
>
> diff --git a/meta-oe/recipes-support/fuse/fuse3/fuse3.conf
> b/meta-oe/recipes-support/fuse/fuse3/fuse3.conf
> new file mode 100644
> index 0..a517c488f
> --- /dev/null
> +++ b/meta-oe/recipes-support/fuse/fuse3/fuse3.conf
> @@ -0,0 +1 @@
> +fuse
> diff --git a/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb
> b/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb
> index 307544bf3..b799b2c6b 100644
> --- a/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb
> +++ b/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb
> @@ -27,6 +27,7 @@ inherit meson pkgconfig ptest
>
> SRC_URI += " \
> file://run-ptest \
> +file://fuse3.conf \
> "
>
> RDEPENDS:${PN}-ptest += " \
> @@ -78,6 +79,20 @@ FILES:fuse3-utils = "${bindir} ${base_sbindir}"
> DEBIAN_NOAUTONAME:fuse3-utils = "1"
> DEBIAN_NOAUTONAME:${PN}-dbg = "1"
>
> +SYSTEMD_SERVICE:${PN} = ""
> +
> do_install:append() {
> rm -rf ${D}${base_prefix}/dev
> +
> +# systemd class remove the sysv_initddir only if systemd_system_unitdir
> +# contains anything, but it's not needed if sysvinit is not in
> DISTRO_FEATURES
> +if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'false', 'true',
> d)}; then
> +rm -rf ${D}${sysconfdir}/init.d/
> +fi
> +
> +# Install systemd related configuration file
> +if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false',
> d)}; then
> +install -d ${D}${sysconfdir}/modules-load.d
> +install -m 0644 ${WORKDIR}/fuse3.conf
> ${D}${sysconfdir}/modules-load.d
This should be UNPACKDIR instead of WORKDIR here.
> +fi
> }
> --
> 2.25.1
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#110493):
https://lists.openembedded.org/g/openembedded-devel/message/110493
Mute This Topic: https://lists.openembedded.org/mt/106255586/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [master][meta-oe][PATCH V2] fuse3: remove sysv init script and install fuse kernel module explictly
From: Changqing Li
For systemd, there is not a fuse.service since systemd provides
sys-fs-fuse-connections.mount to mount the fuse control filesystem, so
instead, only fuse3.conf is added to modules-load.d to load the required
fuse kernel module.
Signed-off-by: Changqing Li
---
meta-oe/recipes-support/fuse/fuse3/fuse3.conf | 1 +
meta-oe/recipes-support/fuse/fuse3_3.16.2.bb | 15 +++
2 files changed, 16 insertions(+)
create mode 100644 meta-oe/recipes-support/fuse/fuse3/fuse3.conf
diff --git a/meta-oe/recipes-support/fuse/fuse3/fuse3.conf
b/meta-oe/recipes-support/fuse/fuse3/fuse3.conf
new file mode 100644
index 0..a517c488f
--- /dev/null
+++ b/meta-oe/recipes-support/fuse/fuse3/fuse3.conf
@@ -0,0 +1 @@
+fuse
diff --git a/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb
b/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb
index 307544bf3..b799b2c6b 100644
--- a/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb
+++ b/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb
@@ -27,6 +27,7 @@ inherit meson pkgconfig ptest
SRC_URI += " \
file://run-ptest \
+file://fuse3.conf \
"
RDEPENDS:${PN}-ptest += " \
@@ -78,6 +79,20 @@ FILES:fuse3-utils = "${bindir} ${base_sbindir}"
DEBIAN_NOAUTONAME:fuse3-utils = "1"
DEBIAN_NOAUTONAME:${PN}-dbg = "1"
+SYSTEMD_SERVICE:${PN} = ""
+
do_install:append() {
rm -rf ${D}${base_prefix}/dev
+
+# systemd class remove the sysv_initddir only if systemd_system_unitdir
+# contains anything, but it's not needed if sysvinit is not in
DISTRO_FEATURES
+if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'false', 'true',
d)}; then
+rm -rf ${D}${sysconfdir}/init.d/
+fi
+
+# Install systemd related configuration file
+if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false',
d)}; then
+install -d ${D}${sysconfdir}/modules-load.d
+install -m 0644 ${WORKDIR}/fuse3.conf ${D}${sysconfdir}/modules-load.d
+fi
}
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#110492):
https://lists.openembedded.org/g/openembedded-devel/message/110492
Mute This Topic: https://lists.openembedded.org/mt/106255586/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] nodejs-oe-cache-native: use UNPACKDIR
* oe-npm-cache is now in UNPACKDIR not WORKDIR
* fixes:
http://errors.yoctoproject.org/Errors/Details/771012/
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/nodejs-oe-cache-native/20.13/temp/run.do_configure.1268826:
line 142:
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/nodejs-oe-cache-native/20.13/oe-npm-cache:
No such file or directory
* set S and UNPACKDIR to avoid this as well:
WARNING: nodejs-oe-cache-native-20.13-r0 do_unpack: nodejs-oe-cache-native:
the directory ${WORKDIR}/${BP}
(/OE/build/oe-core/tmp-glibc/work/x86_64-linux/nodejs-oe-cache-native/20.13/nodejs-oe-cache-20.13)
pointed to by the S variable doesn't exist - please set S within the recipe to
point to where the source has been unpacked to
Signed-off-by: Martin Jansa
---
.../recipes-devtools/nodejs/nodejs-oe-cache-native_20.13.bb | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.13.bb
b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.13.bb
index a61dd5018f..d4b818f967 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.13.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.13.bb
@@ -8,10 +8,13 @@ SRC_URI = "\
inherit native
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
+
B = "${WORKDIR}/build"
do_configure() {
-sed -e 's!@@libdir@@!${libdir}!g' < '${WORKDIR}/oe-npm-cache' >
'${B}/oe-npm-cache'
+sed -e 's!@@libdir@@!${libdir}!g' < '${UNPACKDIR}/oe-npm-cache' >
'${B}/oe-npm-cache'
}
do_install() {
--
2.45.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#110491):
https://lists.openembedded.org/g/openembedded-devel/message/110491
Mute This Topic: https://lists.openembedded.org/mt/106252386/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe] [PATCH 44/44] uriparser: upgrade 0.9.7 -> 0.9.8
Please take this also to scarthgap. This contains fixes for two CVEs: CVE-2024-34402 and CVE-2024-34403. Thanks, Peter -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110490): https://lists.openembedded.org/g/openembedded-devel/message/110490 Mute This Topic: https://lists.openembedded.org/mt/106091335/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][master][scarthgap][PATCH v2] jemalloc: add +git to version
From: Peter Marko
jemalloc was switched from tag to development branch
171 commit ahead.
Adapt PV accordingly.
Signed-off-by: Peter Marko
---
meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb
b/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb
index 7e0272f89..cc21c8bea 100644
--- a/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb
+++ b/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb
@@ -17,6 +17,8 @@ SRC_URI =
"git://github.com/jemalloc/jemalloc.git;branch=dev;protocol=https \
file://run-ptest \
"
SRCREV = "630434bb0ac619f7beec927569782d924c459385"
+PV_LONG := "${PV}-171-g${SRCREV}"
+PV .= "+git"
S = "${WORKDIR}/git"
@@ -27,7 +29,7 @@ EXTRA_AUTORECONF += "--exclude=autoheader"
EXTRA_OECONF:append:libc-musl = " --with-jemalloc-prefix=je_"
# For some reason VERSION file populated only in tarball distribution.
# Adding jemalloc version since this recipe is using source code from git tag
-EXTRA_OECONF:append = " --with-version=${PV}-0-g${SRCREV} --enable-xmalloc"
+EXTRA_OECONF:append = " --with-version=${PV_LONG} --enable-xmalloc"
do_install:append() {
sed -i -e 's@${STAGING_DIR_HOST}@@g' \
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#110489):
https://lists.openembedded.org/g/openembedded-devel/message/110489
Mute This Topic: https://lists.openembedded.org/mt/106249865/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][master][scarthgap][PATCH] jemalloc: add +git to version
I am seeing configure errors
| checking for x86_64-yoe-linux-nm... x86_64-yoe-linux-gcc-nm
| checking for gawk... gawk
| configure: error:
5.3.0+git-0-g630434bb0ac619f7beec927569782d924c459385 does not match
..--g or VERSION
| NOTE: The following config.log files may provide further information.
| NOTE:
/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/jemalloc/5.3.0+git/build/config.log
On Tue, May 21, 2024 at 2:19 PM Peter Marko via lists.openembedded.org
wrote:
>
> Gentle ping
>
> -Original Message-
> From: Marko, Peter (ADV D EU SK BFS1)
> Sent: Wednesday, April 17, 2024 8:35
> To: openembedded-devel@lists.openembedded.org
> Cc: Marko, Peter (ADV D EU SK BFS1)
> Subject: [meta-oe][master][scarthgap][PATCH] jemalloc: add +git to version
>
> > From: Peter Marko
> >
> > jemalloc was switched from tag to development branch
> > 171 commits ahead.
> > Adapt PV accordingly.
> >
> > Signed-off-by: Peter Marko
> > ---
> > meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb
> > b/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb
> > index 7e0272f89..dca8de461 100644
> > --- a/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb
> > +++ b/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb
> > @@ -17,6 +17,7 @@ SRC_URI =
> > "git://github.com/jemalloc/jemalloc.git;branch=dev;protocol=https \
> > file://run-ptest \
> > "
> > SRCREV = "630434bb0ac619f7beec927569782d924c459385"
> > +PV .= "+git"
> >
> > S = "${WORKDIR}/git"
> >
> > --
> > 2.30.2
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#110488):
https://lists.openembedded.org/g/openembedded-devel/message/110488
Mute This Topic: https://lists.openembedded.org/mt/105572435/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-multimedia][PATCH] oscam: Upgrade to 1.20
Switch SRC_URI away from svn and use git fetcher
streamboard.tv svn server seems to be not accessible
all the time reliably
Signed-off-by: Khem Raj
---
.../recipes-dvb/oscam/{oscam_svn.bb => oscam_1.20.bb} | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
rename meta-multimedia/recipes-dvb/oscam/{oscam_svn.bb => oscam_1.20.bb} (74%)
diff --git a/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb
b/meta-multimedia/recipes-dvb/oscam/oscam_1.20.bb
similarity index 74%
rename from meta-multimedia/recipes-dvb/oscam/oscam_svn.bb
rename to meta-multimedia/recipes-dvb/oscam/oscam_1.20.bb
index 0a9a7499ac..e20358955a 100644
--- a/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb
+++ b/meta-multimedia/recipes-dvb/oscam/oscam_1.20.bb
@@ -6,12 +6,10 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
DEPENDS = "libusb1 openssl pcsc-lite"
-SRC_URI = "svn://www.streamboard.tv/svn/oscam;module=trunk;protocol=http \
- "
-SRCREV = "11718"
-PV = "1.10+"
+SRCREV = "190d6dee96ca70f8b614932b1498332b1504632b"
+SRC_URI = "git://repo.or.cz/oscam.git;protocol=https;nobranch=1"
-S = "${UNPACKDIR}/trunk"
+S = "${UNPACKDIR}/git"
inherit cmake
--
2.45.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#110487):
https://lists.openembedded.org/g/openembedded-devel/message/110487
Mute This Topic: https://lists.openembedded.org/mt/106246839/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [PATCH 1/2] iniparser: upgrade 4.2 -> 4.2.1
From: Lars Möllendorf
Hompage-Upgrade: upstream iniparser moved to Gitlab
Add-CMake-support.patch
removed since CMake support is now provided upstream
0001-iniparser.pc-Make-libpath-a-variable.patch
removed since pkg-config file is now generated by CMake
Signed-off-by: Lars Möllendorf
---
...iniparser.pc-Make-libpath-a-variable.patch | 23 ---
.../iniparser/Add-CMake-support.patch | 65 ---
.../iniparser/iniparser_4.2.2.bb | 16 +
.../iniparser/iniparser_4.2.bb| 27
4 files changed, 16 insertions(+), 115 deletions(-)
delete mode 100644
meta-oe/recipes-support/iniparser/iniparser/0001-iniparser.pc-Make-libpath-a-variable.patch
delete mode 100644
meta-oe/recipes-support/iniparser/iniparser/Add-CMake-support.patch
create mode 100644 meta-oe/recipes-support/iniparser/iniparser_4.2.2.bb
delete mode 100644 meta-oe/recipes-support/iniparser/iniparser_4.2.bb
diff --git
a/meta-oe/recipes-support/iniparser/iniparser/0001-iniparser.pc-Make-libpath-a-variable.patch
b/meta-oe/recipes-support/iniparser/iniparser/0001-iniparser.pc-Make-libpath-a-variable.patch
deleted file mode 100644
index 4824344f0..0
---
a/meta-oe/recipes-support/iniparser/iniparser/0001-iniparser.pc-Make-libpath-a-variable.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 1761298b73c759c07e4652ada307f68512a75ff1 Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Fri, 25 Mar 2022 20:44:41 -0700
-Subject: [PATCH] iniparser.pc: Make libpath a variable
-
-Will set according to baselib that yocto exports.
-
-Upstream-Status: Inappropriate [OE-specific]
-Signed-off-by: Khem Raj
- iniparser.pc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
a/iniparser.pc
-+++ b/iniparser.pc
-@@ -1,6 +1,6 @@
- prefix=/usr
- exec_prefix=/usr
--libdir=${exec_prefix}/lib
-+libdir=${exec_prefix}/@baselib@
- includedir=${prefix}/include
- datarootdir=${prefix}/share
- datadir=${datarootdir}
diff --git
a/meta-oe/recipes-support/iniparser/iniparser/Add-CMake-support.patch
b/meta-oe/recipes-support/iniparser/iniparser/Add-CMake-support.patch
deleted file mode 100644
index 46c1b0f7a..0
--- a/meta-oe/recipes-support/iniparser/iniparser/Add-CMake-support.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Origin: Debian packaging
-From: Klee Dienes
-Date: Thu, 13 Feb 2014 07:03:26 -0500
-Subject: Add CMake support.
-
-Upstream-Status: Pending
-
- CMakeLists.txt | 44
- 1 file changed, 44 insertions(+)
- create mode 100644 CMakeLists.txt
-
/dev/null
-+++ b/CMakeLists.txt
-@@ -0,0 +1,50 @@
-+cmake_minimum_required (VERSION 2.8.8)
-+
-+project (iniparser)
-+include (GNUInstallDirs)
-+
-+include_directories (src)
-+
-+set(INIPARSER_SRCS src/dictionary.c src/iniparser.c)
-+set(INIPARSER_HDRS src/dictionary.h src/iniparser.h)
-+
-+add_library(iniparser-shared SHARED ${INIPARSER_SRCS} ${INIPARSER_HDRS})
-+add_library(iniparser-static STATIC ${INIPARSER_SRCS} ${INIPARSER_HDRS})
-+
-+set_target_properties(iniparser-shared PROPERTIES SOVERSION 1)
-+set_target_properties(iniparser-shared PROPERTIES OUTPUT_NAME iniparser)
-+set_target_properties(iniparser-static PROPERTIES OUTPUT_NAME iniparser)
-+
-+install (TARGETS iniparser-shared
-+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+
-+install (TARGETS iniparser-static
-+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+
-+find_package(Doxygen)
-+if (NOT DOXYGEN_FOUND)
-+message(FATAL_ERROR "Doxygen is needed to build the documentation. Please
install it correctly")
-+endif()
-+
-+file (WRITE ${CMAKE_CURRENT_BINARY_DIR}/iniparser.dox
-+ "@INCLUDE = ${CMAKE_CURRENT_SOURCE_DIR}/doc/iniparser.dox\n"
-+ "OUTPUT_DIRECTORY = ${CMAKE_CURRENT_BINARY_DIR}\n"
-+ )
-+
-+add_custom_target (doc ALL
-+ COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/iniparser.dox
-+ SOURCES doc/iniparser.dox)
-+
-+enable_testing()
-+
-+add_test(NAME testsuite
-+ COMMAND make
-+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
-+
-+install (FILES ${INIPARSER_HDRS} DESTINATION
${CMAKE_INSTALL_INCLUDEDIR}/iniparser)
-+
-+install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION
${CMAKE_INSTALL_DOCDIR})
diff --git a/meta-oe/recipes-support/iniparser/iniparser_4.2.2.bb
b/meta-oe/recipes-support/iniparser/iniparser_4.2.2.bb
new file mode 100644
index 0..a8f7947c8
--- /dev/null
+++ b/meta-oe/recipes-support/iniparser/iniparser_4.2.2.bb
@@ -0,0 +1,16 @@
+SUMMARY = "The iniParser library is a simple C library offering INI file
parsing services (both reading and writing)."
+SECTION = "libs"
+HOMEPAGE = "https://gitlab.com/iniparser/iniparser";
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=8474d3b745f77e203f1fc82fb0bb7678"
+SRCBRANCH = "main"
+SRCREV = "v${PV}"
+
+DEPENDS = "doxygen-native"
+
+SRC_URI =
"git
[oe] [PATCH 2/2] iniparser: remove dependency on doxygen-native
From: Lars Möllendorf
This is an extra commit since I am not sure if documentation is wanted or
not.
Signed-off-by: Lars Möllendorf
---
meta-oe/recipes-support/iniparser/iniparser_4.2.2.bb | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-support/iniparser/iniparser_4.2.2.bb
b/meta-oe/recipes-support/iniparser/iniparser_4.2.2.bb
index a8f7947c8..4a1c6db15 100644
--- a/meta-oe/recipes-support/iniparser/iniparser_4.2.2.bb
+++ b/meta-oe/recipes-support/iniparser/iniparser_4.2.2.bb
@@ -6,11 +6,13 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=8474d3b745f77e203f1fc82fb0bb7678"
SRCBRANCH = "main"
SRCREV = "v${PV}"
-DEPENDS = "doxygen-native"
-
SRC_URI =
"git://gitlab.com/iniparser/iniparser.git;protocol=https;branch=${SRCBRANCH}"
S = "${WORKDIR}/git"
inherit cmake
+EXTRA_OECMAKE = " \
+ -DBUILD_DOCS=OFF \
+ "
+
FILES_${PN}-staticdev +=
"${libdir}/cmake/iniparser/iniparser-staticTargets*.cmake"
--
2.43.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#110486):
https://lists.openembedded.org/g/openembedded-devel/message/110486
Mute This Topic: https://lists.openembedded.org/mt/106240920/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [PATCH 0/2] iniparser upgrade
I am the new upstream iniparser maintainer as [announced by @ndevilla](https://github.com/ndevilla/iniparser/issues/125#issuecomment-2016557686) As you can read in the project's [README](https://github.com/ndevilla/iniparser/blob/main/README.md) we moved to [Gitlab](https://gitlab.com/iniparser/iniparser) Lars Möllendorf (2): iniparser: upgrade 4.2 -> 4.2.1 iniparser: remove dependency on doxygen-native ...iniparser.pc-Make-libpath-a-variable.patch | 23 --- .../iniparser/Add-CMake-support.patch | 65 --- .../iniparser/iniparser_4.2.2.bb | 18 + .../iniparser/iniparser_4.2.bb| 27 4 files changed, 18 insertions(+), 115 deletions(-) delete mode 100644 meta-oe/recipes-support/iniparser/iniparser/0001-iniparser.pc-Make-libpath-a-variable.patch delete mode 100644 meta-oe/recipes-support/iniparser/iniparser/Add-CMake-support.patch create mode 100644 meta-oe/recipes-support/iniparser/iniparser_4.2.2.bb delete mode 100644 meta-oe/recipes-support/iniparser/iniparser_4.2.bb -- 2.43.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110484): https://lists.openembedded.org/g/openembedded-devel/message/110484 Mute This Topic: https://lists.openembedded.org/mt/106240918/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] packagegroup-meta-oe: fix lvgl inclusion
Since commit f7fedd156374 ("lvgl: Upgrade to LVGL 9 series"):
* lv-drivers and lv-lib-png packages do not exist anymore
* lvgl does not depend on "wayland" being in DISTRO_FEATURES
This fixes these warnings (e.g. from AB[0]):
Nothing RPROVIDES 'lv-lib-png' (but [...]/packagegroup-meta-oe.bb RDEPENDS on
or otherwise requires it)
Nothing RPROVIDES 'lv-drivers' (but [...]/packagegroup-meta-oe.bb RDEPENDS on
or otherwise requires it)
[0]:
https://autobuilder.yoctoproject.org/typhoon/#/builders/156/builds/367/steps/12/logs/warnings
Signed-off-by: Yoann Congal
Reviewed-by: Alexandre Truong
---
meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index c5f8dce97..19242ba54 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
@@ -511,7 +511,7 @@ RDEPENDS:packagegroup-meta-oe-graphics ="\
libsdl2-net \
${@bb.utils.contains("DISTRO_FEATURES", "opengl", "libsdl2-ttf", "", d)} \
libsdl \
-${@bb.utils.contains("DISTRO_FEATURES", "wayland", "lv-drivers lvgl
lv-lib-png", "", d)} \
+lvgl \
ttf-arphic-uming \
ttf-droid-sans ttf-droid-sans-mono ttf-droid-sans-fallback
ttf-droid-sans-japanese ttf-droid-serif \
ttf-abyssinica \
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#110483):
https://lists.openembedded.org/g/openembedded-devel/message/110483
Mute This Topic: https://lists.openembedded.org/mt/106240317/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-java][master][scarthgap][PATCH] openjdk-8: improve patch for different architecure
The mailing list was recently updated (see https://lists.yoctoproject.org/g/yocto-patches/message/9), so this should be sent to yocto-patc...@lists.yoctoproject.org. Sincerely, Jermain Horsman -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110482): https://lists.openembedded.org/g/openembedded-devel/message/110482 Mute This Topic: https://lists.openembedded.org/mt/106201347/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe] [PATCH] nana: Fix buildpaths warning.
From: Wang Mingyu
WARNING: nana-2.5+git-r0 do_package_qa: QA Issue: File /usr/bin/nana-c++lg in
package nana contains reference to TMPDIR
File /usr/bin/nana-clg in package nana contains reference to TMPDIR
File /usr/bin/nana in package nana contains reference to TMPDIR [buildpaths]
Signed-off-by: Wang Mingyu
---
meta-oe/recipes-extended/nana/nana_git.bb | 6 ++
1 file changed, 6 insertions(+)
diff --git a/meta-oe/recipes-extended/nana/nana_git.bb
b/meta-oe/recipes-extended/nana/nana_git.bb
index 7c748bc49..d292bb882 100644
--- a/meta-oe/recipes-extended/nana/nana_git.bb
+++ b/meta-oe/recipes-extended/nana/nana_git.bb
@@ -42,3 +42,9 @@ do_configure:prepend:class-nativesdk() {
}
BBCLASSEXTEND = "native nativesdk"
+
+do_install:append() {
+sed -i -e 's,--sysroot=${STAGING_DIR_TARGET},,g' ${D}${bindir}/nana-c++lg
+sed -i -e 's,--sysroot=${STAGING_DIR_TARGET},,g' ${D}${bindir}/nana-clg
+sed -i -e 's,--sysroot=${STAGING_DIR_TARGET},,g' ${D}${bindir}/nana
+}
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#110481):
https://lists.openembedded.org/g/openembedded-devel/message/110481
Mute This Topic: https://lists.openembedded.org/mt/106239417/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-networking] [PATCH] fetchmail: Fix buildpaths warning.
From: Wang Mingyu
WARNING: fetchmail-6.4.38-r0 do_package_qa: QA Issue: File /usr/bin/fetchmail
in package fetchmail contains reference to TMPDIR [buildpaths]
Signed-off-by: Wang Mingyu
---
meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb
b/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb
index 587a47949..6cde94b20 100644
--- a/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb
+++ b/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb
@@ -18,8 +18,11 @@ inherit autotools gettext pkgconfig python3-dir python3native
EXTRA_OECONF = "--with-ssl=${STAGING_DIR_HOST}${prefix}"
+INSANE_SKIP:${PN} = "already-stripped"
+
do_install:append() {
sed -i 's,${RECIPE_SYSROOT_NATIVE},,g' ${D}${bindir}/fetchmailconf
+sed -i 's,${RECIPE_SYSROOT},,g' ${D}${bindir}/fetchmail
}
PACKAGES =+ "fetchmail-python"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#110480):
https://lists.openembedded.org/g/openembedded-devel/message/110480
Mute This Topic: https://lists.openembedded.org/mt/106239416/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-webserver][PATCH v4] apache2: fix multilib file conflicts
From: Kai Kang
There are file conflicts of apache2 when multilib enabled:
Error: Transaction test error:
file /usr/share/apache2/build/config.nice conflicts between attempted
installs of apache2-dev-2.4.58-r0.cortexa57 and
lib32-apache2-dev-2.4.58-r0.armv7vet2hf_vfp
file /usr/share/apache2/build/config_vars.mk conflicts between
attempted installs of apache2-dev-2.4.58-r0.cortexa57 and
lib32-apache2-dev-2.4.58-r0.armv7vet2hf_vfp
Install the 'build' directory to ${libexecdir} by setting
'installbuilddir' to fix the conflicts. ${libexecdir} is not populated
to sysroot by default, but command apxs requires these files, then add
the dir to SYSROOT_DIRS to populate them.
And inherit bbclasses multilib_script and multilib_header to fix
follow-up conflicts:
file /usr/bin/apxs conflicts between attempted installs of
apache2-dev-2.4.58-r0.cortexa57 and
lib32-apache2-dev-2.4.58-r0.armv7vet2hf_vfp
file /usr/include/apache2/ap_config_layout.h conflicts between
attempted installs of apache2-dev-2.4.58-r0.cortexa57 and
lib32-apache2-dev-2.4.58-r0.armv7vet2hf_vfp
Since multilib_script inherits update-alternatives, remove it from
inherit line for beautification.
Fix buildpaths warning as well:
WARNING: lib32-apache2-2.4.58-r0 do_package_qa: QA Issue: File
/usr/share/apache2/build/config.nice
in package lib32-apache2-dev contains reference to TMPDIR
[buildpaths]
Signed-off-by: Kai Kang
---
v4:
* revoke the modification for existing sed pattern in do_configure
.../recipes-httpd/apache2/apache2_2.4.59.bb | 37 ---
1 file changed, 23 insertions(+), 14 deletions(-)
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb
b/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb
index b96e8b4e1..637add007 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb
@@ -31,7 +31,7 @@ SRC_URI[sha256sum] =
"ec51501ec480284ff52f637258135d333230a7d229c3afa6f6c2f9040e
S = "${WORKDIR}/httpd-${PV}"
-inherit autotools update-rc.d pkgconfig systemd update-alternatives
+inherit autotools update-rc.d pkgconfig systemd multilib_script multilib_header
DEPENDS = "openssl expat pcre apr apr-util apache2-native "
@@ -80,7 +80,9 @@ EXTRA_OECONF:class-native = "\
"
do_configure:prepend() {
-sed -i -e 's:$''{prefix}/usr/lib/cgi-bin:$''{libexecdir}/cgi-bin:g'
${S}/config.layout
+sed -i -e 's:$''{prefix}/usr/lib/cgi-bin:$''{libexecdir}/cgi-bin:g' \
+ -e 's#\(installbuilddir:\s*\).*#\1${libexecdir}/${PN}/build#' \
+ ${S}/config.layout
}
do_install:append:class-target() {
@@ -119,14 +121,15 @@ do_install:append:class-target() {
-e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g;
s,-ffile-prefix-map[^ ]*,,g' \
-e 's,${HOSTTOOLS_DIR}/,,g' \
-e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \
- -e 's,APU_CONFIG = .*,APU_CONFIG = ,g'
${D}${datadir}/apache2/build/config_vars.mk
+ -e 's,APU_CONFIG = .*,APU_CONFIG = ,g'
${D}${libexecdir}/${PN}/build/config_vars.mk
sed -i -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \
-e 's,${DEBUG_PREFIX_MAP},,g' \
-e 's,${RECIPE_SYSROOT},,g' \
-e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g;
s,-fmacro-prefix-map[^ ]*,,g' \
-e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \
- -e 's,".*/configure","configure",g'
${D}${datadir}/apache2/build/config.nice
+ -e 's,${WORKDIR}/recipe-sysroot/,,g' \
+ -e 's,".*/configure","configure",g'
${D}${libexecdir}/${PN}/build/config.nice
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false',
d)}; then
install -d ${D}${sysconfdir}/tmpfiles.d/
@@ -143,6 +146,8 @@ do_install:append:class-target() {
rm -rf ${D}${localstatedir} ${D}${sbindir}/envvars*
chown -R root:root ${D}
+
+oe_multilib_header apache2/ap_config_layout.h
}
do_install:append:class-native() {
@@ -152,20 +157,22 @@ do_install:append:class-native() {
SYSROOT_PREPROCESS_FUNCS:append:class-target = " apache_sysroot_preprocess"
+SYSROOT_DIRS += "${libexecdir}/${PN}/build"
+
apache_sysroot_preprocess() {
install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}
install -m 755 ${D}${bindir}/apxs ${SYSROOT_DESTDIR}${bindir_crossscripts}
install -d ${SYSROOT_DESTDIR}${sbindir}
install -m 755 ${D}${sbindir}/apachectl ${SYSROOT_DESTDIR}${sbindir}
-sed -i 's!my $installbuilddir = .*!my $installbuilddir =
"${STAGING_DIR_HOST}/${datadir}/${BPN}/build";!'
${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs
-
-sed -i 's!^APR_CONFIG = .*!APR_CONFIG =
${STAGING_BINDIR_CROSS}/apr-1-config!'
${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
-sed -i 's!^APU_CONFIG = .*!APU_CONFIG =
${STAGING_BINDIR_CROSS}/apu-1-config!'
${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
-sed -i 's!^inclu
