update to version 2.7
This commit is contained in:
parent
8df4814527
commit
e65b858ce5
@ -1,47 +0,0 @@
|
|||||||
From df5e18b8d7c8359b48bc133bfa29734934d18160 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Johannes Meixner <jsmeix@suse.com>
|
|
||||||
Date: Mon, 10 Aug 2020 16:20:38 +0200
|
|
||||||
Subject: [PATCH] Merge pull request #2469 from
|
|
||||||
rear/skip-kernel-builtin-modules-issue2414
|
|
||||||
|
|
||||||
In 400_copy_modules.sh skip copying kernel modules that are builtin modules.
|
|
||||||
The new behaviour is that when modules are listed in modules.builtin
|
|
||||||
and are also shown by modinfo then those modules are now skipped.
|
|
||||||
Before for such modules the modules file(s) would have been included
|
|
||||||
in the recovery system.
|
|
||||||
See https://github.com/rear/rear/issues/2414
|
|
||||||
---
|
|
||||||
usr/share/rear/build/GNU/Linux/400_copy_modules.sh | 12 ++++++++++--
|
|
||||||
1 file changed, 10 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/usr/share/rear/build/GNU/Linux/400_copy_modules.sh b/usr/share/rear/build/GNU/Linux/400_copy_modules.sh
|
|
||||||
index d8d733d2..641b7f83 100644
|
|
||||||
--- a/usr/share/rear/build/GNU/Linux/400_copy_modules.sh
|
|
||||||
+++ b/usr/share/rear/build/GNU/Linux/400_copy_modules.sh
|
|
||||||
@@ -133,8 +133,13 @@ for dummy in "once" ; do
|
|
||||||
module=${module#.o}
|
|
||||||
# Strip trailing ".ko" if there:
|
|
||||||
module=${module#.ko}
|
|
||||||
- # Continue with the next module if the current one does not exist:
|
|
||||||
+ # Continue with the next module if the current one does not exist as a module file:
|
|
||||||
modinfo $module 1>/dev/null || continue
|
|
||||||
+ # Continue with the next module if the current one is a kernel builtin module
|
|
||||||
+ # cf. https://github.com/rear/rear/issues/2414#issuecomment-668632798
|
|
||||||
+ # Quoting the grep search value is mandatory here ($module might be empty or blank),
|
|
||||||
+ # cf. "Beware of the emptiness" in https://github.com/rear/rear/wiki/Coding-Style
|
|
||||||
+ grep -q "$( echo $module | tr '_-' '..' )" /lib/modules/$KERNEL_VERSION/modules.builtin && continue
|
|
||||||
# Resolve module dependencies:
|
|
||||||
# Get the module file plus the module files of other needed modules.
|
|
||||||
# This is currently only a "best effort" attempt because
|
|
||||||
@@ -166,7 +171,10 @@ done
|
|
||||||
|
|
||||||
# Remove those modules that are specified in the EXCLUDE_MODULES array:
|
|
||||||
for exclude_module in "${EXCLUDE_MODULES[@]}" ; do
|
|
||||||
- # Continue with the next module if the current one does not exist:
|
|
||||||
+ # Continue with the next module only if the current one does not exist as a module file
|
|
||||||
+ # but do not continue with the next module if the current one is a kernel builtin module
|
|
||||||
+ # so when a module file exists that gets removed regardless if it is also a builtin module
|
|
||||||
+ # cf. https://github.com/rear/rear/issues/2414#issuecomment-669115481
|
|
||||||
modinfo $exclude_module 1>/dev/null || continue
|
|
||||||
# In this case it is ignored when a module exists but 'modinfo -F filename' cannot show its filename
|
|
||||||
# because then it is assumed that also no module file had been copied above:
|
|
||||||
BIN
2.7.tar.gz
Normal file
BIN
2.7.tar.gz
Normal file
Binary file not shown.
BIN
rear-2.6.tar.gz
BIN
rear-2.6.tar.gz
Binary file not shown.
@ -1,18 +1,16 @@
|
|||||||
%define debug_package %{nil}
|
%define debug_package %{nil}
|
||||||
|
|
||||||
Name: rear
|
Name: rear
|
||||||
Version: 2.6
|
Version: 2.7
|
||||||
Release: 1
|
Release: 1
|
||||||
License: GPLv3
|
License: GPLv3
|
||||||
Summary: Relax-and-Recover is a setup-and-forget Linux bare metal disaster recovery solution
|
Summary: Relax-and-Recover is a setup-and-forget Linux bare metal disaster recovery solution
|
||||||
URL: http://relax-and-recover.org/
|
URL: http://relax-and-recover.org/
|
||||||
Source0: https://sourceforge.net/projects/rear/files/rear/%{version}/rear-%{version}.tar.gz
|
Source0: https://github.com/rear/rear/archive/refs/tags/%{version}.tar.gz
|
||||||
# Add cronjob and systemd timer as documentation
|
# Add cronjob and systemd timer as documentation
|
||||||
Source1: rear.cron
|
Source1: rear.cron
|
||||||
Source2: rear.service
|
Source2: rear.service
|
||||||
Source3: rear.timer
|
Source3: rear.timer
|
||||||
# https://github.com/rear/rear/commit/df5e18b8d7c8359b48bc133bfa29734934d18160
|
|
||||||
Patch0: 0001-skip-kernel-buildin-modules.patch
|
|
||||||
ExclusiveArch: x86_64 loongarch64
|
ExclusiveArch: x86_64 loongarch64
|
||||||
Requires: binutils ethtool gzip iputils parted tar openssl gawk attr bc crontabs iproute
|
Requires: binutils ethtool gzip iputils parted tar openssl gawk attr bc crontabs iproute
|
||||||
Requires: genisoimage util-linux
|
Requires: genisoimage util-linux
|
||||||
@ -74,6 +72,9 @@ rm -rf %{buildroot}
|
|||||||
%doc %{_mandir}/man8/rear.8*
|
%doc %{_mandir}/man8/rear.8*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jan 04 2024 Paul Thomas <paulthomas100199@gmail.com> - 2.7-1
|
||||||
|
- update to version 2.7
|
||||||
|
|
||||||
* Tue Oct 17 2023 yaoxin <yao_xin001@hoperun.com> - 2.6-1
|
* Tue Oct 17 2023 yaoxin <yao_xin001@hoperun.com> - 2.6-1
|
||||||
- Upgrade to 2.6
|
- Upgrade to 2.6
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user