From 09ee530d7fbf4e9a9a956c96a07d08ebab3104c6 Mon Sep 17 00:00:00 2001 From: Dirk Neukirchen Date: Wed, 3 Mar 2021 14:23:01 +0100 Subject: [PATCH] backuppc: fix build with host detected par2 Makefile does not overwrite par2 path if par2 is available on build-host it is detected and then the patch with fixup-config-pl.patch in install fails because hunk 2 cannot be applied hunk 2 has $Conf{ParPath} = ''; - so provide an empty path Signed-off-by: Dirk Neukirchen --- admin/backuppc/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/admin/backuppc/Makefile b/admin/backuppc/Makefile index 431e34bbf4..1217eb27d1 100644 --- a/admin/backuppc/Makefile +++ b/admin/backuppc/Makefile @@ -54,7 +54,8 @@ define Package/backuppc/install --bin-path smbclient=/usr/sbin/smbclient --bin-path nmblookup=/usr/sbin/nmblookup \ --bin-path rsync=/usr/bin/rsync --bin-path ping=/usr/bin/ping --bin-path df=/bin/df \ --bin-path ssh=/usr/bin/ssh --bin-path gzip=/bin/gzip \ - --bin-path sendmail=/usr/sbin/sendmail --bin-path bzip2=/usr/bin/bzip2 + --bin-path sendmail=/usr/sbin/sendmail --bin-path bzip2=/usr/bin/bzip2 \ + --bin-path par2= $(INSTALL_DIR) $(strip $(1))/usr/share/backuppc/conf chmod 755 $(strip $(1))/data mv $(strip $(1))/data/backuppc/conf/config.pl $(strip $(1))/usr/share/backuppc/conf/config.pl