| Message ID | 20260227092309.1381-1-liuyd.fnst@fujitsu.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-filesystems] btrfsmaintenance: upgrade 0.5 -> 0.5.2 | expand |
On 2/27/26 10:23, Yiding Liu (Fujitsu) via lists.openembedded.org wrote: > 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 <liuyd.fnst@fujitsu.com> > --- > ...nance_0.5.bb => btrfsmaintenance_0.5.2.bb} | 4 +- > ...change-sysconfig-path-to-etc-default.patch | 39 ++++++++++--------- > 2 files changed, 23 insertions(+), 20 deletions(-) > rename meta-filesystems/recipes-utils/btrfsmaintenance/{btrfsmaintenance_0.5.bb => btrfsmaintenance_0.5.2.bb} (96%) > > diff --git a/meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.bb b/meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.2.bb > similarity index 96% > rename from meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.bb > rename to meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.2.bb > index 645e38ca49..6722b63c10 100644 > --- a/meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.bb > +++ b/meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.2.bb > @@ -9,11 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" > > SECTION = "base" > > -SRC_URI = "git://github.com/kdave/${BPN};branch=master;protocol=https \ > +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 = "be42cb6267055d125994abd6927cf3a26deab74c" > +SRCREV = "beb9e2d166cbd856297fe8d28e89e8b36961a723" > > UPSTREAM_CHECK_URI = "https://github.com/kdave/${BPN}/tags" > UPSTREAM_CHECK_REGEX = "${BPN}/releases/tag/v(?P<pver>\d+(?:\.\d+)*)" > 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..eeb64b29b0 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,7 +1,7 @@ > -From b49dbe17e0d9ae463e5a34e6991aa2d3c70d2fb1 Mon Sep 17 00:00:00 2001 > -From: Claudius Heine <ch@denx.de> > -Date: Wed, 11 May 2022 14:33:13 +0200 > -Subject: [PATCH] change sysconfig path to /etc/default > +From 5354785858fb990e1ba863c41786be5534ef869f Mon Sep 17 00:00:00 2001 > +From: Wang Mingyu <wangmy@fujitsu.com> > +Date: Thu, 26 Feb 2026 10:15:33 +0000 > +Subject: [PATCH] [PATCH] change sysconfig path to /etc/default > > OE uses /etc/default for service configuration, not /etc/sysconfig which > is used by SUSE and RedHat based distributions. > @@ -11,37 +11,40 @@ Change the files accordingly > Upstream-Status: Inappropriate [OE specific] > > Signed-off-by: Claudius Heine <ch@denx.de> > + > +Update for 0.5.2 > +Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> > --- > - btrfsmaintenance-refresh.path | 4 ++-- > - btrfsmaintenance-refresh.service | 2 +- > - 2 files changed, 3 insertions(+), 3 deletions(-) > + btrfsmaintenance-refresh.path | 2 ++ > + btrfsmaintenance-refresh.service | 1 + > + 2 files changed, 3 insertions(+) > > diff --git a/btrfsmaintenance-refresh.path b/btrfsmaintenance-refresh.path > -index d56ad11..f0b4132 100644 > +index d56ad11..8e4fa18 100644 > --- a/btrfsmaintenance-refresh.path > +++ b/btrfsmaintenance-refresh.path > -@@ -1,8 +1,8 @@ > +@@ -1,8 +1,10 @@ > [Unit] > --Description=Watch /etc/sysconfig/btrfsmaintenance > + Description=Watch /etc/sysconfig/btrfsmaintenance > +Description=Watch /etc/default/btrfsmaintenance > > [Path] > --PathChanged=/etc/sysconfig/btrfsmaintenance > + PathChanged=/etc/sysconfig/btrfsmaintenance > +PathChanged=/etc/default/btrfsmaintenance > > [Install] > WantedBy=multi-user.target > diff --git a/btrfsmaintenance-refresh.service b/btrfsmaintenance-refresh.service > -index 4ed1eb4..d6225a6 100644 > +index 19e51c0..e3984d7 100644 > --- a/btrfsmaintenance-refresh.service > +++ b/btrfsmaintenance-refresh.service > -@@ -1,5 +1,5 @@ > +@@ -1,5 +1,6 @@ > [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 > > Just for confirmation, does this patch change intended the way they looks now? Previously these patches changed existing lines. Now the original lines stay in place, and the new lines added as extra - so for example the "Description" is duplicated with the new version.
diff --git a/meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.bb b/meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.2.bb similarity index 96% rename from meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.bb rename to meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.2.bb index 645e38ca49..6722b63c10 100644 --- a/meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.bb +++ b/meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.2.bb @@ -9,11 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" SECTION = "base" -SRC_URI = "git://github.com/kdave/${BPN};branch=master;protocol=https \ +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 = "be42cb6267055d125994abd6927cf3a26deab74c" +SRCREV = "beb9e2d166cbd856297fe8d28e89e8b36961a723" UPSTREAM_CHECK_URI = "https://github.com/kdave/${BPN}/tags" UPSTREAM_CHECK_REGEX = "${BPN}/releases/tag/v(?P<pver>\d+(?:\.\d+)*)" 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..eeb64b29b0 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,7 +1,7 @@ -From b49dbe17e0d9ae463e5a34e6991aa2d3c70d2fb1 Mon Sep 17 00:00:00 2001 -From: Claudius Heine <ch@denx.de> -Date: Wed, 11 May 2022 14:33:13 +0200 -Subject: [PATCH] change sysconfig path to /etc/default +From 5354785858fb990e1ba863c41786be5534ef869f Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@fujitsu.com> +Date: Thu, 26 Feb 2026 10:15:33 +0000 +Subject: [PATCH] [PATCH] change sysconfig path to /etc/default OE uses /etc/default for service configuration, not /etc/sysconfig which is used by SUSE and RedHat based distributions. @@ -11,37 +11,40 @@ Change the files accordingly Upstream-Status: Inappropriate [OE specific] Signed-off-by: Claudius Heine <ch@denx.de> + +Update for 0.5.2 +Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> --- - btrfsmaintenance-refresh.path | 4 ++-- - btrfsmaintenance-refresh.service | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) + btrfsmaintenance-refresh.path | 2 ++ + btrfsmaintenance-refresh.service | 1 + + 2 files changed, 3 insertions(+) diff --git a/btrfsmaintenance-refresh.path b/btrfsmaintenance-refresh.path -index d56ad11..f0b4132 100644 +index d56ad11..8e4fa18 100644 --- a/btrfsmaintenance-refresh.path +++ b/btrfsmaintenance-refresh.path -@@ -1,8 +1,8 @@ +@@ -1,8 +1,10 @@ [Unit] --Description=Watch /etc/sysconfig/btrfsmaintenance + Description=Watch /etc/sysconfig/btrfsmaintenance +Description=Watch /etc/default/btrfsmaintenance [Path] --PathChanged=/etc/sysconfig/btrfsmaintenance + PathChanged=/etc/sysconfig/btrfsmaintenance +PathChanged=/etc/default/btrfsmaintenance [Install] WantedBy=multi-user.target diff --git a/btrfsmaintenance-refresh.service b/btrfsmaintenance-refresh.service -index 4ed1eb4..d6225a6 100644 +index 19e51c0..e3984d7 100644 --- a/btrfsmaintenance-refresh.service +++ b/btrfsmaintenance-refresh.service -@@ -1,5 +1,5 @@ +@@ -1,5 +1,6 @@ [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
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 <liuyd.fnst@fujitsu.com> --- ...nance_0.5.bb => btrfsmaintenance_0.5.2.bb} | 4 +- ...change-sysconfig-path-to-etc-default.patch | 39 ++++++++++--------- 2 files changed, 23 insertions(+), 20 deletions(-) rename meta-filesystems/recipes-utils/btrfsmaintenance/{btrfsmaintenance_0.5.bb => btrfsmaintenance_0.5.2.bb} (96%)