From 1a7fe730e2a72f9a951937f85d505c6b08a4c138c48fc66347e202b28d8baccf Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 15 Nov 2020 16:59:43 +0000 Subject: [PATCH] Accepting request 848732 from home:colyli:branches:filesystems - Makefile: install bcache-status (jsc#SLE-9807, bsc#1178725) 0018-Makefile-install-bcache-status.patch - bcache-tools.spec: add '_sbindir/bcache-status' for the new added bcache-status python script (jsc#SLE-9807, bsc#1178725) OBS-URL: https://build.opensuse.org/request/show/848732 OBS-URL: https://build.opensuse.org/package/show/filesystems/bcache-tools?expand=0&rev=29 --- 0018-Makefile-install-bcache-status.patch | 31 +++++++++++++++++++++++ bcache-tools.changes | 8 ++++++ bcache-tools.spec | 2 ++ 3 files changed, 41 insertions(+) create mode 100644 0018-Makefile-install-bcache-status.patch diff --git a/0018-Makefile-install-bcache-status.patch b/0018-Makefile-install-bcache-status.patch new file mode 100644 index 0000000..29ec09b --- /dev/null +++ b/0018-Makefile-install-bcache-status.patch @@ -0,0 +1,31 @@ +From 096d205a9f1be8540cbc5a468c0da8203023de70 Mon Sep 17 00:00:00 2001 +From: Coly Li +Date: Sun, 15 Nov 2020 23:18:31 +0800 +Subject: [PATCH] Makefile: install bcache-status +Git-commit: 096d205a9f1be8540cbc5a468c0da8203023de70 +Patch-mainline: bcache-tools-1.1 +References: jsc#SLE-9807, bsc#1178725 + +This patch modifies Makefile to intall bcache-status into +$(DESTDIR)${PREFIX}/sbin/. + +Signed-off-by: Coly Li +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index df44085..d914200 100644 +--- a/Makefile ++++ b/Makefile +@@ -9,6 +9,7 @@ all: make-bcache probe-bcache bcache-super-show bcache-register bcache + + install: make-bcache probe-bcache bcache-super-show + $(INSTALL) -m0755 make-bcache bcache-super-show bcache $(DESTDIR)${PREFIX}/sbin/ ++ $(INSTALL) -m0755 bcache-status $(DESTDIR)${PREFIX}/sbin/ + $(INSTALL) -m0755 probe-bcache bcache-register bcache-export-cached $(DESTDIR)$(UDEVLIBDIR)/ + $(INSTALL) -m0644 69-bcache.rules $(DESTDIR)$(UDEVLIBDIR)/rules.d/ + $(INSTALL) -m0644 -- *.8 $(DESTDIR)${PREFIX}/share/man/man8/ +-- +2.26.2 + diff --git a/bcache-tools.changes b/bcache-tools.changes index 1369fdc..813d74a 100644 --- a/bcache-tools.changes +++ b/bcache-tools.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Nov 15 15:58:35 UTC 2020 - Coly Li + +- Makefile: install bcache-status (jsc#SLE-9807, bsc#1178725) + 0018-Makefile-install-bcache-status.patch +- bcache-tools.spec: add '_sbindir/bcache-status' for the new added + bcache-status python script (jsc#SLE-9807, bsc#1178725) + ------------------------------------------------------------------- Tue Oct 13 04:32:51 UTC 2020 - Coly Li diff --git a/bcache-tools.spec b/bcache-tools.spec index 441b8bc..4408e61 100644 --- a/bcache-tools.spec +++ b/bcache-tools.spec @@ -42,6 +42,7 @@ Patch14: 0014-bcache-tools-Remove-the-dependency-on-libsmartcols.patch Patch15: 0015-bcache-tools-make-permit-only-one-cache-device-to-be.patch Patch16: 0016-bcache-tools-add-bcache-status.patch Patch17: 0017-bcache-tools-add-man-page-bcache-status.8.patch +Patch18: 0018-Makefile-install-bcache-status.patch BuildRequires: pkg-config BuildRequires: xz BuildRequires: pkgconfig(blkid) @@ -76,6 +77,7 @@ mv "$b/lib/udev" "$b/%_prefix/lib/" %_sbindir/bcache-super-show %_sbindir/make-bcache %_sbindir/bcache +%_sbindir/bcache-status %_prefix/lib/dracut/ %_prefix/lib/udev %_mandir/man8/*.8*