Message ID | 20231113-gnomebaseclass-switch-to-meson-v1-9-111dd5d0fe68@gmail.com |
---|---|
State | New |
Headers | show |
Series | Recipe updates | expand |
After this change I'm getting a systemd error when including gstd in my image. 2023-11-30T12:51:42+0000 SUBDEBUG Installed: gstd-1.0+really0.15.00+a011affa67-r0.0.cortexa72_cortexa53 2023-11-30T12:51:42+0000 INFO %post(gstd-1.0+really0.15.00+a011affa67-r0.0.cortexa72_cortexa53): scriptlet start %post(gstd-1.0+really0.15.00+a011affa67-r0.0.cortexa72_cortexa53): execv(/bin/sh) pid 3485514 + set -e + systemctl + OPTS= + [ -n /scratch/mhatle/git/internal/master/build-11-30/tmp/work/zynqmp_generic-xilinx-linux/petalinux-image-minimal/1.0/rootfs ] + OPTS=--root=/scratch/mhatle/git/internal/master/build-11-30/tmp/work/zynqmp_generic-xilinx-linux/petalinux-image-minimal/1.0/rootfs + [ enable = enable ] + systemctl --root=/scratch/mhatle/git/internal/master/build-11-30/tmp/work/zynqmp_generic-xilinx-linux/petalinux-image-minimal/1.0/rootfs enable gstd.service Error: Systemctl main enable issue in gstd.service (gstd.service) %post(gstd-1.0+really0.15.00+a011affa67-r0.0.cortexa72_cortexa53): waitpid(3485514) rc 3485514 status 100 warning: %post(gstd-1.0+really0.15.00+a011affa67-r0.0.cortexa72_cortexa53) scriptlet failed, exit status 1 2023-11-30T12:51:42+0000 ERROR Error in POSTIN scriptlet in rpm package gstd 2023-11-30T12:51:42+0000 SUBDEBUG Installed: meson-1.2.2-r0.0.cortexa72_cortexa53 2023-11-30T12:51:42+0000 SUBDEBUG Installed: can-utils-2023.03-r0.0.cortexa72_cortexa53 2023-11-30T12:51:42+0000 INFO %post(can-utils-2023.03-r0.0.cortexa72_cortexa53): scriptlet start %post(can-utils-2023.03-r0.0.cortexa72_cortexa53): execv(/bin/sh) pid 3485517 --Mark On 11/13/23 9:08 PM, Khem Raj wrote: > License-Update: Switch to LGPL-2.1 [1] > > Drop rpath patch its not needed anymore with meson build system > Switch to using meson build system > Fix packaging for python pieces and systemd > > [1] https://github.com/RidgeRun/gstd-1.x/commit/76d9fb61a05973b30220fcae5ff87de9d618ea49 > Signed-off-by: Khem Raj <raj.khem@gmail.com> > --- > .../gstd/0001-gstd-yocto-compatibility.patch | 22 ---------------- > .../recipes-multimedia/gstreamer-1.0/gstd_git.bb | 29 ++++++++++++++-------- > 2 files changed, 18 insertions(+), 33 deletions(-) > > diff --git a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch > deleted file mode 100644 > index 64fd578a96..0000000000 > --- a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch > +++ /dev/null > @@ -1,22 +0,0 @@ > -From eaf51d6420c63713f62025583681007c3502d387 Mon Sep 17 00:00:00 2001 > -From: Carlos <carlos.rodriguez@ridgerun.com> > -Date: Fri, 15 Dec 2017 10:14:05 -0600 > -Subject: [PATCH] gstd:yocto compatibility > - > -Upstream-Status: Pending > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > ---- > - gstd/Makefile.am | 2 +- > - 3 files changed, 9 insertions(+), 3 deletions(-) > - > ---- a/gstd/Makefile.am > -+++ b/gstd/Makefile.am > -@@ -74,7 +74,7 @@ gstd_CFLAGS = $(GST_CFLAGS) \ > - -DGSTD_LOG_STATE_DIR=\"$(gstdlogstatedir)\" \ > - -DGSTD_RUN_STATE_DIR=\"$(gstdrunstatedir)\" > - > --gstd_LDFLAGS = $(GST_LIBS) $(GIO_LIBS) $(GIO_UNIX_LIBS) $(GJSON_LIBS) $(LIBD_LIBS) -Wl,-rpath -Wl,$(libdir) > -+gstd_LDFLAGS = $(GST_LIBS) $(GIO_LIBS) $(GIO_UNIX_LIBS) $(GJSON_LIBS) $(LIBD_LIBS) > - gstd_LDADD = libgstd-core.la > - > - gstdincludedir = $(includedir)/gstd > diff --git a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb > index 38fafe82e4..88acdb190e 100644 > --- a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb > +++ b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb > @@ -2,26 +2,27 @@ DESCRIPTION = "Gstreamer Daemon" > SUMMARY = "GStreamer framework for controlling audio and video streaming using TCP connection messages" > HOMEPAGE = "https://developer.ridgerun.com/wiki/index.php?title=Gstd-1.0" > SECTION = "multimedia" > -LICENSE = "GPL-2.0-or-later" > -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" > +LICENSE = "LGPL-2.1-or-later" > +LIC_FILES_CHKSUM = "file://COPYING;md5=c71b653a0f608a58cdc5693ae57126bc" > > -DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gstreamer1.0-rtsp-server json-glib libdaemon jansson" > +DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gstreamer1.0-rtsp-server json-glib libdaemon libsoup-2.4 jansson" > > SRCBRANCH ?= "master" > -SRCREV = "a6621a5778b234651aa2adbbe304d906a3fa64d1" > -SRC_URI = "git://git@github.com/RidgeRun/gstd-1.x.git;protocol=https;branch=${SRCBRANCH} \ > - file://0001-gstd-yocto-compatibility.patch \ > - " > +SRCREV = "a011affa67f240cbc7aaff5b00fdfd6124bdaece" > +SRC_URI = "git://git@github.com/RidgeRun/gstd-1.x.git;protocol=https;branch=${SRCBRANCH}" > S = "${WORKDIR}/git" > > # Remove the +really when upstream version is > 1.0 > -PV = "1.0+really0.8.0" > +PV = "1.0+really0.15.0" > > -inherit autotools pkgconfig gettext gtk-doc > +GTKDOC_MESON_OPTION = "enable-gtk-doc" > + > +inherit meson pkgconfig gettext gtk-doc systemd python3native python3-dir python3targetconfig > > do_install:append() { > - rmdir ${D}${localstatedir}/run/${BPN} ${D}${localstatedir}/run \ > - ${D}${localstatedir}/log/${BPN} ${D}${localstatedir}/log > + rmdir ${D}${root_prefix}${localstatedir}/run/${BPN} ${D}${root_prefix}${localstatedir}/run \ > + ${D}${root_prefix}${localstatedir}/log/${BPN} ${D}${root_prefix}${localstatedir}/log \ > + ${D}${root_prefix}${localstatedir} > rm -f ${D}${bindir}/gst-client ${D}${bindir}/gstd-client > if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then > install -d ${D}${sysconfdir}/tmpfiles.d > @@ -33,3 +34,9 @@ do_install:append() { > ln -sf gst-client-1.0 ${D}${bindir}/gst-client > ln -sf gst-client-1.0 ${D}${bindir}/gstd-client > } > +PACKAGES =+ "${PN}-python" > + > +FILES:${PN} += "${systemd_user_unitdir}" > +FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*" > + > +SYSTEMD_SERVICE:${PN} = "gstd.service" > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#106696): https://lists.openembedded.org/g/openembedded-devel/message/106696 > Mute This Topic: https://lists.openembedded.org/mt/102577253/3616948 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [mark.hatle@kernel.crashing.org] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch deleted file mode 100644 index 64fd578a96..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch +++ /dev/null @@ -1,22 +0,0 @@ -From eaf51d6420c63713f62025583681007c3502d387 Mon Sep 17 00:00:00 2001 -From: Carlos <carlos.rodriguez@ridgerun.com> -Date: Fri, 15 Dec 2017 10:14:05 -0600 -Subject: [PATCH] gstd:yocto compatibility - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - gstd/Makefile.am | 2 +- - 3 files changed, 9 insertions(+), 3 deletions(-) - ---- a/gstd/Makefile.am -+++ b/gstd/Makefile.am -@@ -74,7 +74,7 @@ gstd_CFLAGS = $(GST_CFLAGS) \ - -DGSTD_LOG_STATE_DIR=\"$(gstdlogstatedir)\" \ - -DGSTD_RUN_STATE_DIR=\"$(gstdrunstatedir)\" - --gstd_LDFLAGS = $(GST_LIBS) $(GIO_LIBS) $(GIO_UNIX_LIBS) $(GJSON_LIBS) $(LIBD_LIBS) -Wl,-rpath -Wl,$(libdir) -+gstd_LDFLAGS = $(GST_LIBS) $(GIO_LIBS) $(GIO_UNIX_LIBS) $(GJSON_LIBS) $(LIBD_LIBS) - gstd_LDADD = libgstd-core.la - - gstdincludedir = $(includedir)/gstd diff --git a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb index 38fafe82e4..88acdb190e 100644 --- a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb +++ b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb @@ -2,26 +2,27 @@ DESCRIPTION = "Gstreamer Daemon" SUMMARY = "GStreamer framework for controlling audio and video streaming using TCP connection messages" HOMEPAGE = "https://developer.ridgerun.com/wiki/index.php?title=Gstd-1.0" SECTION = "multimedia" -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=c71b653a0f608a58cdc5693ae57126bc" -DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gstreamer1.0-rtsp-server json-glib libdaemon jansson" +DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gstreamer1.0-rtsp-server json-glib libdaemon libsoup-2.4 jansson" SRCBRANCH ?= "master" -SRCREV = "a6621a5778b234651aa2adbbe304d906a3fa64d1" -SRC_URI = "git://git@github.com/RidgeRun/gstd-1.x.git;protocol=https;branch=${SRCBRANCH} \ - file://0001-gstd-yocto-compatibility.patch \ - " +SRCREV = "a011affa67f240cbc7aaff5b00fdfd6124bdaece" +SRC_URI = "git://git@github.com/RidgeRun/gstd-1.x.git;protocol=https;branch=${SRCBRANCH}" S = "${WORKDIR}/git" # Remove the +really when upstream version is > 1.0 -PV = "1.0+really0.8.0" +PV = "1.0+really0.15.0" -inherit autotools pkgconfig gettext gtk-doc +GTKDOC_MESON_OPTION = "enable-gtk-doc" + +inherit meson pkgconfig gettext gtk-doc systemd python3native python3-dir python3targetconfig do_install:append() { - rmdir ${D}${localstatedir}/run/${BPN} ${D}${localstatedir}/run \ - ${D}${localstatedir}/log/${BPN} ${D}${localstatedir}/log + rmdir ${D}${root_prefix}${localstatedir}/run/${BPN} ${D}${root_prefix}${localstatedir}/run \ + ${D}${root_prefix}${localstatedir}/log/${BPN} ${D}${root_prefix}${localstatedir}/log \ + ${D}${root_prefix}${localstatedir} rm -f ${D}${bindir}/gst-client ${D}${bindir}/gstd-client if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d @@ -33,3 +34,9 @@ do_install:append() { ln -sf gst-client-1.0 ${D}${bindir}/gst-client ln -sf gst-client-1.0 ${D}${bindir}/gstd-client } +PACKAGES =+ "${PN}-python" + +FILES:${PN} += "${systemd_user_unitdir}" +FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*" + +SYSTEMD_SERVICE:${PN} = "gstd.service"
License-Update: Switch to LGPL-2.1 [1] Drop rpath patch its not needed anymore with meson build system Switch to using meson build system Fix packaging for python pieces and systemd [1] https://github.com/RidgeRun/gstd-1.x/commit/76d9fb61a05973b30220fcae5ff87de9d618ea49 Signed-off-by: Khem Raj <raj.khem@gmail.com> --- .../gstd/0001-gstd-yocto-compatibility.patch | 22 ---------------- .../recipes-multimedia/gstreamer-1.0/gstd_git.bb | 29 ++++++++++++++-------- 2 files changed, 18 insertions(+), 33 deletions(-) -- 2.42.1