From 7adb1a61d26d14132f98c5373d2cee2e91b84361 Mon Sep 17 00:00:00 2001 From: Liu Yiding Date: Sat, 28 Feb 2026 09:44:39 +0800 Subject: btrfsmaintenance: upgrade 0.5 -> 0.5.2 1.Changelog: fix syntax error in run_task, preventing jobs to start start scrub jobs sequentially if RAID5 or RAID6 data profile is found fix btrfsmaintenance-refresh.service description 2.Update 0001-change-sysconfig-path-to-etc-default.patch for 0.5.2 Signed-off-by: Liu Yiding Signed-off-by: Khem Raj --- .../btrfsmaintenance/btrfsmaintenance_0.5.2.bb | 57 ++++++++++++++++++++++ .../btrfsmaintenance/btrfsmaintenance_0.5.bb | 57 ---------------------- ...0001-change-sysconfig-path-to-etc-default.patch | 18 +++---- 3 files changed, 66 insertions(+), 66 deletions(-) create mode 100644 meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.2.bb delete mode 100644 meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.bb (limited to 'meta-filesystems') diff --git a/meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.2.bb b/meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.2.bb new file mode 100644 index 0000000000..6722b63c10 --- /dev/null +++ b/meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.2.bb @@ -0,0 +1,57 @@ + +SUMMARY = "Services for periodic btrfs maintenance tasks" +DESCRIPTION = "A set of scripts supplementing the btrfs filesystem and aims \ + to automate a few maintenance tasks. This means the scrub, balance, trim \ + or defragmentation." +HOMEPAGE = "https://github.com/kdave/btrfsmaintenance" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" + +SECTION = "base" + +SRC_URI = "git://github.com/kdave/${BPN};branch=master;protocol=https;tag=v${PV} \ + file://0001-change-sysconfig-path-to-etc-default.patch \ + file://0002-add-WantedBy-directive-to-btrfsmaintenance-refresh.s.patch \ +" +SRCREV = "beb9e2d166cbd856297fe8d28e89e8b36961a723" + +UPSTREAM_CHECK_URI = "https://github.com/kdave/${BPN}/tags" +UPSTREAM_CHECK_REGEX = "${BPN}/releases/tag/v(?P\d+(?:\.\d+)*)" + +RDEPENDS:${PN} = "bash btrfs-tools" + + +do_configure[noexec] = "1" +do_compile[noexec] = "1" + +do_install() { + install -Dm0644 ${S}/btrfsmaintenance-refresh.path \ + ${D}${systemd_system_unitdir}/btrfsmaintenance-refresh.path + install -Dm0644 ${S}/*.timer \ + ${D}${systemd_system_unitdir} + install -Dm0644 ${S}/*.service \ + ${D}${systemd_system_unitdir} + + install -Dm0644 ${S}/btrfsmaintenance-functions \ + ${D}${datadir}/${BPN}/btrfsmaintenance-functions + install -Dm0755 ${S}/*.sh \ + ${D}${datadir}/${BPN} + + install -Dm0644 ${S}/sysconfig.btrfsmaintenance \ + ${D}${sysconfdir}/default/btrfsmaintenance +} + +inherit systemd +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = " \ + btrfs-scrub.timer \ + btrfs-scrub.service \ + btrfs-trim.timer \ + btrfs-trim.service \ + btrfs-balance.timer \ + btrfs-balance.service \ + btrfs-defrag.timer \ + btrfs-defrag.service \ + btrfsmaintenance-refresh.service \ + btrfsmaintenance-refresh.path \ +" diff --git a/meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.bb b/meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.bb deleted file mode 100644 index 645e38ca49..0000000000 --- a/meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.bb +++ /dev/null @@ -1,57 +0,0 @@ - -SUMMARY = "Services for periodic btrfs maintenance tasks" -DESCRIPTION = "A set of scripts supplementing the btrfs filesystem and aims \ - to automate a few maintenance tasks. This means the scrub, balance, trim \ - or defragmentation." -HOMEPAGE = "https://github.com/kdave/btrfsmaintenance" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" - -SECTION = "base" - -SRC_URI = "git://github.com/kdave/${BPN};branch=master;protocol=https \ - file://0001-change-sysconfig-path-to-etc-default.patch \ - file://0002-add-WantedBy-directive-to-btrfsmaintenance-refresh.s.patch \ -" -SRCREV = "be42cb6267055d125994abd6927cf3a26deab74c" - -UPSTREAM_CHECK_URI = "https://github.com/kdave/${BPN}/tags" -UPSTREAM_CHECK_REGEX = "${BPN}/releases/tag/v(?P\d+(?:\.\d+)*)" - -RDEPENDS:${PN} = "bash btrfs-tools" - - -do_configure[noexec] = "1" -do_compile[noexec] = "1" - -do_install() { - install -Dm0644 ${S}/btrfsmaintenance-refresh.path \ - ${D}${systemd_system_unitdir}/btrfsmaintenance-refresh.path - install -Dm0644 ${S}/*.timer \ - ${D}${systemd_system_unitdir} - install -Dm0644 ${S}/*.service \ - ${D}${systemd_system_unitdir} - - install -Dm0644 ${S}/btrfsmaintenance-functions \ - ${D}${datadir}/${BPN}/btrfsmaintenance-functions - install -Dm0755 ${S}/*.sh \ - ${D}${datadir}/${BPN} - - install -Dm0644 ${S}/sysconfig.btrfsmaintenance \ - ${D}${sysconfdir}/default/btrfsmaintenance -} - -inherit systemd -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE:${PN} = " \ - btrfs-scrub.timer \ - btrfs-scrub.service \ - btrfs-trim.timer \ - btrfs-trim.service \ - btrfs-balance.timer \ - btrfs-balance.service \ - btrfs-defrag.timer \ - btrfs-defrag.service \ - btrfsmaintenance-refresh.service \ - btrfsmaintenance-refresh.path \ -" diff --git a/meta-filesystems/recipes-utils/btrfsmaintenance/files/0001-change-sysconfig-path-to-etc-default.patch b/meta-filesystems/recipes-utils/btrfsmaintenance/files/0001-change-sysconfig-path-to-etc-default.patch index d425206f0e..b064adcc86 100644 --- a/meta-filesystems/recipes-utils/btrfsmaintenance/files/0001-change-sysconfig-path-to-etc-default.patch +++ b/meta-filesystems/recipes-utils/btrfsmaintenance/files/0001-change-sysconfig-path-to-etc-default.patch @@ -1,6 +1,3 @@ -From b49dbe17e0d9ae463e5a34e6991aa2d3c70d2fb1 Mon Sep 17 00:00:00 2001 -From: Claudius Heine -Date: Wed, 11 May 2022 14:33:13 +0200 Subject: [PATCH] change sysconfig path to /etc/default OE uses /etc/default for service configuration, not /etc/sysconfig which @@ -11,6 +8,9 @@ Change the files accordingly Upstream-Status: Inappropriate [OE specific] Signed-off-by: Claudius Heine + +Update for 0.5.2 +Signed-off-by: Liu Yiding --- btrfsmaintenance-refresh.path | 4 ++-- btrfsmaintenance-refresh.service | 2 +- @@ -32,16 +32,16 @@ index d56ad11..f0b4132 100644 [Install] WantedBy=multi-user.target diff --git a/btrfsmaintenance-refresh.service b/btrfsmaintenance-refresh.service -index 4ed1eb4..d6225a6 100644 +index 19e51c0..223fca9 100644 --- a/btrfsmaintenance-refresh.service +++ b/btrfsmaintenance-refresh.service @@ -1,5 +1,5 @@ [Unit] --Description=Update cron periods from /etc/sysconfig/btrfsmaintenance -+Description=Update cron periods from /etc/default/btrfsmaintenance +-Description=Configure systemd timer schedule according to /etc/sysconfig/btrfsmaintenance ++Description=Configure systemd timer schedule according to /etc/default/btrfsmaintenance + Documentation="file:/usr/share/doc/btrfsmaintenance/README.man" + Documentation="file:/usr/share/doc/packages/btrfsmaintenance/README.man" - [Service] - ExecStart=/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer -- -2.33.3 +2.43.0 -- cgit v1.2.3-54-g00ecf