a6fabd9610
Commit 8f88a644ed "support/scripts/apply-patches.sh: set the maximum
fuzz factor to 0" reduced the fuzz factor.
Due to this change, asterisk fails to build with output:
Applying 0004-install-samples-need-the-data-files.patch using patch:
patching file Makefile
Hunk #1 FAILED at 779.
1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej
This commit rebase the package patches on the current package version.
Note: the patch 0005 is unchanged, as it is correct in its current
state.
Fixes:
- http://autobuild.buildroot.org/results/92d/92d58ecb67f11a6eb74695bc1efcc672f69a57a9
Signed-off-by: Julien Olivain <ju.o@free.fr>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
From d347deb0376a3254d7cd8bbfe46dd645d1bf1061 Mon Sep 17 00:00:00 2001
|
|
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
|
Date: Fri, 1 Dec 2017 11:08:16 +0100
|
|
Subject: [PATCH] install: samples need the data files
|
|
|
|
When installing samples, "sample voicemail" is generated from the
|
|
already-installed sound files.
|
|
|
|
However, when doing the install and the samples at the same time in a
|
|
parallel install, it is possible that the sound files are not already
|
|
installed at the time we try to generate the voicemail data.
|
|
|
|
Ensure the needed dependency.
|
|
|
|
Signed-off-by: Julien Olivain <ju.o@free.fr>
|
|
[Julien: rebase patch on tag 20.7.0]
|
|
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
|
---
|
|
Makefile | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index 7ef73342cc..bb60f5e380 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -819,7 +819,7 @@ adsi:
|
|
$(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
|
|
done
|
|
|
|
-samples: adsi
|
|
+samples: adsi datafiles
|
|
@echo Installing other config files...
|
|
$(call INSTALL_CONFIGS,configs/samples,.sample)
|
|
$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX"
|
|
--
|
|
2.45.2
|
|
|