Accepting request 1137697 from home:smolsheep:upgrades
- Add use_libexec_not_lib.patch
- Update to v1.4.0:
* bugfix release
* Split brain detection
* BCH_IOCTL_OFFLINE_FSCK, and numerous other features and
bugfixes.
OBS-URL: https://build.opensuse.org/request/show/1137697
OBS-URL: https://build.opensuse.org/package/show/filesystems/bcachefs-tools?expand=0&rev=7
This commit is contained in:
Git OBS Bridge
parent
f9c9f7815a
commit
87d03f8d13
4
_service
4
_service
@ -2,8 +2,8 @@
|
||||
<service name="tar_scm" mode="manual">
|
||||
<param name="scm">git</param>
|
||||
<param name="url">https://evilpiepirate.org/git/bcachefs-tools.git</param>
|
||||
<param name="revision">v1.3.5</param>
|
||||
<param name="version">1.3.5</param>
|
||||
<param name="revision">v1.4.0</param>
|
||||
<param name="version">1.4.0</param>
|
||||
</service>
|
||||
<service name="recompress" mode="manual">
|
||||
<param name="file">*.tar</param>
|
||||
|
||||
BIN
bcachefs-tools-1.3.5.tar.xz
(Stored with Git LFS)
BIN
bcachefs-tools-1.3.5.tar.xz
(Stored with Git LFS)
Binary file not shown.
BIN
bcachefs-tools-1.4.0.tar.xz
(Stored with Git LFS)
Normal file
BIN
bcachefs-tools-1.4.0.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 9 03:46:53 UTC 2024 - Joshua Smith <jsmithfpv@gmail.com>
|
||||
|
||||
- Add use_libexec_not_lib.patch
|
||||
- Update to v1.4.0:
|
||||
* bugfix release
|
||||
* Split brain detection
|
||||
* BCH_IOCTL_OFFLINE_FSCK, and numerous other features and
|
||||
bugfixes.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Dec 3 02:10:44 UTC 2023 - Joshua Smith <jsmithfpv@gmail.com>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package bcachefs-tools
|
||||
#
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -17,14 +17,14 @@
|
||||
|
||||
|
||||
Name: bcachefs-tools
|
||||
Version: 1.3.5
|
||||
Version: 1.4.0
|
||||
Release: 0
|
||||
Summary: Configuration utilities for bcachefs
|
||||
License: GPL-2.0-or-later
|
||||
Group: System/Filesystems
|
||||
URL: https://bcachefs.org/
|
||||
|
||||
Source: %name-%version.tar.xz
|
||||
Patch0: use_libexec_not_lib.patch
|
||||
BuildRequires: libaio-devel
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: xz
|
||||
@ -35,6 +35,7 @@ BuildRequires: pkgconfig(libsodium)
|
||||
BuildRequires: pkgconfig(libudev)
|
||||
BuildRequires: pkgconfig(liburcu)
|
||||
BuildRequires: pkgconfig(libzstd)
|
||||
BuildRequires: pkgconfig(udev)
|
||||
BuildRequires: pkgconfig(uuid)
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
|
||||
@ -65,8 +66,24 @@ This package contains utilities for creating and mounting bcachefs.
|
||||
# this ain't no debian
|
||||
rm -Rf "%buildroot/etc/initramfs-tools" "%buildroot/%_datadir/initramfs-tools"
|
||||
|
||||
%pre
|
||||
%service_add_pre bcachefsck_all.service bcachefsck_all_fail.service
|
||||
|
||||
%post
|
||||
%service_add_post bcachefsck_all.service bcachefsck_all_fail.service
|
||||
|
||||
%preun
|
||||
%service_del_preun bcachefsck_all.service bcachefsck_all_fail.service
|
||||
|
||||
%postun
|
||||
%service_del_postun bcachefsck_all.service bcachefsck_all_fail.service
|
||||
|
||||
%files
|
||||
%_sbindir/*bcache*
|
||||
%_unitdir/bcachefsck*
|
||||
%_unitdir/system-bcachefsck*
|
||||
%_libexecdir/bcachefsck*
|
||||
%_udevrulesdir/64-bcachefs.rules
|
||||
%_mandir/man8/*.8*
|
||||
%license COPYING
|
||||
|
||||
|
||||
89
use_libexec_not_lib.patch
Normal file
89
use_libexec_not_lib.patch
Normal file
@ -0,0 +1,89 @@
|
||||
From 89abdd87271e237141a9d4f44d531f7c53353b83 Mon Sep 17 00:00:00 2001
|
||||
From: Neal Gompa <neal@gompa.dev>
|
||||
Date: Sun, 24 Dec 2023 08:34:16 -0500
|
||||
Subject: [PATCH] Makefile, fsck: Use libexec instead of lib
|
||||
|
||||
These are executables that need to be installed in a non-path location.
|
||||
Most distributions now install these into /usr/libexec, and the
|
||||
path variable for this is LIBEXECDIR, so use that instead.
|
||||
---
|
||||
Makefile | 12 ++++++------
|
||||
fsck/bcachefsck_all_fail.service.in | 2 +-
|
||||
fsck/bcachefsck_fail@.service.in | 2 +-
|
||||
3 files changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 0e5cf6e0..a38f0742 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -105,14 +105,14 @@ else
|
||||
ROOT_SBINDIR?=$(PREFIX)/sbin
|
||||
INITRAMFS_DIR=/etc/initramfs-tools
|
||||
endif
|
||||
-LIBDIR=$(PREFIX)/lib
|
||||
+LIBEXECDIR=$(PREFIX)/libexec
|
||||
|
||||
PKGCONFIG_SERVICEDIR:=$(shell $(PKG_CONFIG) --variable=systemdsystemunitdir systemd)
|
||||
ifeq (,$(PKGCONFIG_SERVICEDIR))
|
||||
$(warning skipping systemd integration)
|
||||
else
|
||||
BCACHEFSCK_ARGS=-f -n
|
||||
-systemd_libfiles=\
|
||||
+systemd_libexecfiles=\
|
||||
fsck/bcachefsck_fail \
|
||||
fsck/bcachefsck_all
|
||||
|
||||
@@ -133,14 +133,14 @@ built_scripts+=\
|
||||
|
||||
%.service: %.service.in
|
||||
@echo " [SED] $@"
|
||||
- $(Q)sed -e "s|@libdir@|$(LIBDIR)|g" \
|
||||
+ $(Q)sed -e "s|@libexecdir@|$(LIBEXECDIR)|g" \
|
||||
-e "s|@bcachefsck_args@|$(BCACHEFSCK_ARGS)|g" < $< > $@
|
||||
|
||||
fsck/bcachefsck_all: fsck/bcachefsck_all.in
|
||||
@echo " [SED] $@"
|
||||
$(Q)sed -e "s|@bcachefsck_args@|$(BCACHEFSCK_ARGS)|g" < $< > $@
|
||||
|
||||
-optional_build+=$(systemd_libfiles) $(systemd_services)
|
||||
+optional_build+=$(systemd_libexecfiles) $(systemd_services)
|
||||
optional_install+=install_systemd
|
||||
endif # PKGCONFIG_SERVICEDIR
|
||||
|
||||
@@ -226,8 +226,8 @@ install: bcachefs $(optional_install)
|
||||
echo "copy_exec $(ROOT_SBINDIR)/bcachefs /sbin/bcachefs" >> $(DESTDIR)$(INITRAMFS_HOOK)
|
||||
|
||||
.PHONY: install_systemd
|
||||
-install_systemd: $(systemd_services) $(systemd_libfiles)
|
||||
- $(INSTALL) -m0755 -D $(systemd_libfiles) -t $(DESTDIR)$(LIBDIR)
|
||||
+install_systemd: $(systemd_services) $(systemd_libexecfiles)
|
||||
+ $(INSTALL) -m0755 -D $(systemd_libexecfiles) -t $(DESTDIR)$(LIBEXECDIR)
|
||||
$(INSTALL) -m0644 -D $(systemd_services) -t $(DESTDIR)$(PKGCONFIG_SERVICEDIR)
|
||||
|
||||
.PHONY: clean
|
||||
diff --git a/fsck/bcachefsck_all_fail.service.in b/fsck/bcachefsck_all_fail.service.in
|
||||
index b79f8196..fe584514 100644
|
||||
--- a/fsck/bcachefsck_all_fail.service.in
|
||||
+++ b/fsck/bcachefsck_all_fail.service.in
|
||||
@@ -10,7 +10,7 @@ Documentation=man:bcachefsck_all(8)
|
||||
[Service]
|
||||
Type=oneshot
|
||||
Environment=EMAIL_ADDR=root
|
||||
-ExecStart=@libdir@/bcachefsck_fail "${EMAIL_ADDR}" bcachefsck_all
|
||||
+ExecStart=@libexecdir@/bcachefsck_fail "${EMAIL_ADDR}" bcachefsck_all
|
||||
User=mail
|
||||
Group=mail
|
||||
SupplementaryGroups=systemd-journal
|
||||
diff --git a/fsck/bcachefsck_fail@.service.in b/fsck/bcachefsck_fail@.service.in
|
||||
index 369a809a..8d5ed4c6 100644
|
||||
--- a/fsck/bcachefsck_fail@.service.in
|
||||
+++ b/fsck/bcachefsck_fail@.service.in
|
||||
@@ -10,7 +10,7 @@ Documentation=man:bcachefs(8)
|
||||
[Service]
|
||||
Type=oneshot
|
||||
Environment=EMAIL_ADDR=root
|
||||
-ExecStart=@libdir@/bcachefsck_fail "${EMAIL_ADDR}" bcachefs %f
|
||||
+ExecStart=@libexecdir@/bcachefsck_fail "${EMAIL_ADDR}" bcachefs %f
|
||||
User=mail
|
||||
Group=mail
|
||||
SupplementaryGroups=systemd-journal
|
||||
Loading…
Reference in New Issue
Block a user