diff --git a/0001-skip-kernel-buildin-modules.patch b/0001-skip-kernel-buildin-modules.patch deleted file mode 100644 index c7d07f5..0000000 --- a/0001-skip-kernel-buildin-modules.patch +++ /dev/null @@ -1,47 +0,0 @@ -From df5e18b8d7c8359b48bc133bfa29734934d18160 Mon Sep 17 00:00:00 2001 -From: Johannes Meixner -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: diff --git a/2.7.tar.gz b/2.7.tar.gz new file mode 100644 index 0000000..5d7cd2f Binary files /dev/null and b/2.7.tar.gz differ diff --git a/rear-2.6.tar.gz b/rear-2.6.tar.gz deleted file mode 100644 index adabc69..0000000 Binary files a/rear-2.6.tar.gz and /dev/null differ diff --git a/rear.spec b/rear.spec index 7682009..aade605 100644 --- a/rear.spec +++ b/rear.spec @@ -1,18 +1,16 @@ %define debug_package %{nil} Name: rear -Version: 2.6 +Version: 2.7 Release: 1 License: GPLv3 Summary: Relax-and-Recover is a setup-and-forget Linux bare metal disaster recovery solution 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 Source1: rear.cron Source2: rear.service Source3: rear.timer -# https://github.com/rear/rear/commit/df5e18b8d7c8359b48bc133bfa29734934d18160 -Patch0: 0001-skip-kernel-buildin-modules.patch ExclusiveArch: x86_64 loongarch64 Requires: binutils ethtool gzip iputils parted tar openssl gawk attr bc crontabs iproute Requires: genisoimage util-linux @@ -74,6 +72,9 @@ rm -rf %{buildroot} %doc %{_mandir}/man8/rear.8* %changelog +* Thu Jan 04 2024 Paul Thomas - 2.7-1 +- update to version 2.7 + * Tue Oct 17 2023 yaoxin - 2.6-1 - Upgrade to 2.6