diff options
Diffstat (limited to 'app-backup/rear/files')
-rw-r--r-- | app-backup/rear/files/rear-1.15-add-support-for-gentoo-kernels.patch | 19 | ||||
-rw-r--r-- | app-backup/rear/files/rear-2.6-Makefile.patch | 34 |
2 files changed, 34 insertions, 19 deletions
diff --git a/app-backup/rear/files/rear-1.15-add-support-for-gentoo-kernels.patch b/app-backup/rear/files/rear-1.15-add-support-for-gentoo-kernels.patch deleted file mode 100644 index 608685418676..000000000000 --- a/app-backup/rear/files/rear-1.15-add-support-for-gentoo-kernels.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/usr/share/rear/pack/Linux-i386/30_copy_kernel.sh b/usr/share/rear/pack/Linux-i386/30_copy_kernel.sh -index 6816f37..ec437e4 100644 ---- a/usr/share/rear/pack/Linux-i386/30_copy_kernel.sh -+++ b/usr/share/rear/pack/Linux-i386/30_copy_kernel.sh -@@ -50,6 +50,14 @@ if [ ! -s "$KERNEL_FILE" ]; then - else - Error "Could not find Arch kernel /boot/vmlinuz[-linux|26]" - fi -+ elif [ -f /etc/gentoo-release ]; then -+ if [ -f "/boot/kernel-genkernel-${REAL_MACHINE}-${KERNEL_VERSION}" ]; then -+ KERNEL_FILE="/boot/kernel-genkernel-${REAL_MACHINE}-${KERNEL_VERSION}" -+ elif [ -f "/boot/kernel-${KERNEL_VERSION}" ]; then -+ KERNEL_FILE="/boot/kernel-${KERNEL_VERSION}" -+ else -+ Error "Could not find Gentoo kernel" -+ fi - else - Error "Could not find a matching kernel in /boot !" - fi diff --git a/app-backup/rear/files/rear-2.6-Makefile.patch b/app-backup/rear/files/rear-2.6-Makefile.patch new file mode 100644 index 000000000000..800dcf69cee3 --- /dev/null +++ b/app-backup/rear/files/rear-2.6-Makefile.patch @@ -0,0 +1,34 @@ +--- rear-2.6/Makefile.orig 2020-09-09 20:04:39.357666685 +0200 ++++ rear-2.6/Makefile 2020-09-09 20:06:12.537313922 +0200 +@@ -84,7 +84,7 @@ + clean: + rm -Rf dist build + rm -f build-stamp +- make -C doc clean ++ $(MAKE) -C doc clean + + ### You can call 'make validate' directly from your .git/hooks/pre-commit script + validate: +@@ -107,11 +107,11 @@ + + man: + @echo -e "\033[1m== Prepare manual ==\033[0;0m" +- make -C doc man ++ $(MAKE) -C doc man + + doc: + @echo -e "\033[1m== Prepare documentation ==\033[0;0m" +- make -C doc docs ++ $(MAKE) -C doc docs + + install-config: + @echo -e "\033[1m== Installing configuration ==\033[0;0m" +@@ -144,7 +144,7 @@ + + install-doc: + @echo -e "\033[1m== Installing documentation ==\033[0;0m" +- make -C doc install ++ $(MAKE) -C doc install + sed -i -e 's,/etc,$(sysconfdir),' \ + -e 's,/usr/sbin,$(sbindir),' \ + -e 's,/usr/share,$(datadir),' \ |