mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-13 09:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

mtd-utils: add optional systemd service for ubihealthd

Browse Source 
Add support for deploying a ubihealthd.service systemd unit through a
new 'ubihealthd-service' PACKAGECONFIG option.

This change allows systems using systemd to easily enable and manage the
UBI health monitoring daemon as a background service.

(From OE-Core rev: cdf5b47cb640a0a981783d1078625ccacf3b8948)

Signed-off-by: Hiago De Franco <hiago.franco@toradex.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Hiago De Franco
2025-07-14 14:32:40 -03:00
committed by Richard Purdie
parent da1033ecfb
commit 57fde8fce9
2 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
meta/recipes-devtools/mtd/files/ubihealthd.service Normal file
View File

@@ -0,0 +1,10 @@
[Unit]
Description=UBI health daemon
After=multi-user.target
[Service]
Type=forking
ExecStart=@SBINDIR@/ubihealthd
[Install]
WantedBy=multi-user.target

21
meta/recipes-devtools/mtd/mtd-utils_2.3.0.bb
View File

@@ -6,7 +6,7 @@ LICENSE = "GPL-2.0-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c" file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c"
inherit autotools pkgconfig update-alternatives inherit autotools pkgconfig systemd update-alternatives
DEPENDS = "zlib e2fsprogs util-linux" DEPENDS = "zlib e2fsprogs util-linux"
RDEPENDS:mtd-utils-tests += "bash" RDEPENDS:mtd-utils-tests += "bash"
@@ -17,7 +17,8 @@ SRC_URI = "git://git.infradead.org/mtd-utils.git;branch=master \
file://0002-ubifs-utils-journal-Include-sys-stat.h.patch \ file://0002-ubifs-utils-journal-Include-sys-stat.h.patch \
file://0003-ubifs-utils-link-libmissing.a-in-case-execinfo.h-isn.patch \ file://0003-ubifs-utils-link-libmissing.a-in-case-execinfo.h-isn.patch \
file://0004-ubifs-utils-extract_files-Include-linux-limits.h.patch \ file://0004-ubifs-utils-extract_files-Include-linux-limits.h.patch \
file://0001-Improve-check-for-GCC-compiler-version.patch" file://0001-Improve-check-for-GCC-compiler-version.patch \
file://ubihealthd.service"
# xattr support creates an additional compile-time dependency on acl because # xattr support creates an additional compile-time dependency on acl because
# the sys/acl.h header is needed. libacl is not needed and thus enabling xattr # the sys/acl.h header is needed. libacl is not needed and thus enabling xattr
@@ -29,6 +30,7 @@ PACKAGECONFIG[crypto] = "--with-crypto,--without-crypto,openssl"
PACKAGECONFIG[jffs] = "--with-jffs,--without-jffs" PACKAGECONFIG[jffs] = "--with-jffs,--without-jffs"
PACKAGECONFIG[ubifs] = "--with-ubifs,--without-ubifs" PACKAGECONFIG[ubifs] = "--with-ubifs,--without-ubifs"
PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd" PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd"
PACKAGECONFIG[ubihealthd-service] = ",,"
CPPFLAGS:append:riscv64 = " -pthread -D_REENTRANT" CPPFLAGS:append:riscv64 = " -pthread -D_REENTRANT"
@@ -54,6 +56,9 @@ ALTERNATIVE_LINK_NAME[flash_lock] = "${sbindir}/flash_lock"
ALTERNATIVE_LINK_NAME[flash_unlock] = "${sbindir}/flash_unlock" ALTERNATIVE_LINK_NAME[flash_unlock] = "${sbindir}/flash_unlock"
ALTERNATIVE_LINK_NAME[flashcp] = "${sbindir}/flashcp" ALTERNATIVE_LINK_NAME[flashcp] = "${sbindir}/flashcp"
SYSTEMD_SERVICE:${PN}-ubifs = "${@bb.utils.contains('PACKAGECONFIG', 'ubihealthd-service', 'ubihealthd.service', '', d)}"
SYSTEMD_AUTO_ENABLE = "disable"
do_install () { do_install () {
oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} INCLUDEDIR=${includedir} oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} INCLUDEDIR=${includedir}
install -d ${D}${includedir}/mtd install -d ${D}${includedir}/mtd
@@ -64,6 +69,12 @@ do_install () {
install -m 0644 ${S}/include/libubigen.h ${D}${includedir} install -m 0644 ${S}/include/libubigen.h ${D}${includedir}
oe_libinstall -a libubi ${D}${libdir}/ oe_libinstall -a libubi ${D}${libdir}/
oe_libinstall -a libmtd ${D}${libdir}/ oe_libinstall -a libmtd ${D}${libdir}/
if ${@bb.utils.contains('PACKAGECONFIG', 'ubihealthd-service', 'true', 'false', d)}; then
install -d ${D}${systemd_system_unitdir}
install -m 0644 ${UNPACKDIR}/ubihealthd.service ${D}${systemd_system_unitdir}
sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/ubihealthd.service
fi
} }
PACKAGES =+ "mtd-utils-misc mtd-utils-tests" PACKAGES =+ "mtd-utils-misc mtd-utils-tests"
@@ -71,7 +82,11 @@ PACKAGES =+ "${@bb.utils.contains("PACKAGECONFIG", "jffs", "mtd-utils-jffs2", ""
PACKAGES =+ "${@bb.utils.contains("PACKAGECONFIG", "ubifs", "mtd-utils-ubifs", "", d)}" PACKAGES =+ "${@bb.utils.contains("PACKAGECONFIG", "ubifs", "mtd-utils-ubifs", "", d)}"
FILES:mtd-utils-jffs2 = "${sbindir}/mkfs.jffs2 ${sbindir}/jffs2dump ${sbindir}/jffs2reader ${sbindir}/sumtool" FILES:mtd-utils-jffs2 = "${sbindir}/mkfs.jffs2 ${sbindir}/jffs2dump ${sbindir}/jffs2reader ${sbindir}/sumtool"
FILES:mtd-utils-ubifs = "${sbindir}/mkfs.ubifs ${sbindir}/ubi*" FILES:mtd-utils-ubifs = "\
${sbindir}/mkfs.ubifs \
${sbindir}/ubi* \
${@bb.utils.contains('PACKAGECONFIG', 'ubihealthd-service', '${systemd_system_unitdir}/ubihealthd.service', '', d)} \
"
FILES:mtd-utils-misc = "${sbindir}/nftl* ${sbindir}/ftl* ${sbindir}/rfd* ${sbindir}/doc* ${sbindir}/serve_image ${sbindir}/recv_image" FILES:mtd-utils-misc = "${sbindir}/nftl* ${sbindir}/ftl* ${sbindir}/rfd* ${sbindir}/doc* ${sbindir}/serve_image ${sbindir}/recv_image"
FILES:mtd-utils-tests = "${libexecdir}/mtd-utils/*" FILES:mtd-utils-tests = "${libexecdir}/mtd-utils/*"