Skip to contentSkip to conversation

package/asterisk: fix parallel install

PATCH New Yann E. MORIN 3 participants 3 messages Dec 1, 2017 – Dec 27, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/asterisk: fix parallel install

Fixes:

    http://autobuild.buildroot.org/results/7c92fb71d0aee211c8e0ef9d646da477fd97fb4c/
    http://autobuild.buildroot.org/results/2b8c810bd8775413fd4567b2f8495be70b7bb808/
    ...
---
 .../0006-install-samples-need-the-data-files.patch | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 package/asterisk/0006-install-samples-need-the-data-files.patch
package/asterisk/0006-install-samples-need-the-data-files.patch new file +35 -0
new file mode 100644
index 0000000000..a9560e82e0
@@ -0,0 +1,35 @@
+From 05680ea9899c2246c23d11860c2c8e10aa8f80c7 Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <[email protected]>
+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: "Yann E. MORIN" <[email protected]>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index f29c07f680..b58f707b61 100644
+--- a/Makefile
++++ b/Makefile
+@@ -779,7 +779,7 @@ adsi:
+ 		$(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
+ 	done
+ 
+-samples: adsi
++samples: adsi datafiles
+ 	@echo Installing other config files...
+ 	$(call INSTALL_CONFIGS,samples,.sample)
+ 	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX"
+-- 
+2.11.0
+
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 package/asterisk: fix parallel install

Hello,

Quoted 10 lines · Yann E. MORIN

Fixes:

    http://autobuild.buildroot.org/results/7c92fb71d0aee211c8e0ef9d646da477fd97fb4c/
    http://autobuild.buildroot.org/results/2b8c810bd8775413fd4567b2f8495be70b7bb808/
    ...
---
 .../0006-install-samples-need-the-data-files.patch | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 package/asterisk/0006-install-samples-need-the-data-files.patch

Applied to master, thanks! Please don't forget to submit upstream.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#2 lore raw

PATCH 1/1 package/asterisk: fix parallel install

In reply to Yann E. MORIN
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

Fixes:

    http://autobuild.buildroot.org/results/7c92fb71d0aee211c8e0ef9d646da477fd97fb4c/
    http://autobuild.buildroot.org/results/2b8c810bd8775413fd4567b2f8495be70b7bb808/
    ...

Committed to 2017.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard