* [Buildroot] [PATCH 0/2] packages; fix last remnants of hard-coded BR2_DL_DIR
@ 2018-05-11 16:29 Yann E. MORIN
2018-05-11 16:29 ` [Buildroot] [PATCH 1/2] package/asterisk: use package's DL_DIR Yann E. MORIN
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Yann E. MORIN @ 2018-05-11 16:29 UTC (permalink / raw)
To: buildroot
Hello All!
Two packages, asterisk and dahdi-linux, were overlooked when we did the
transition to a per-package download directory, which means they are now
failing because they can't find their extra files.
This series fixes that.
Regards,
Yann E. MORIN.
The following changes since commit 72703d02b96bb1f7f94f705d3a7199599b1bc980
support/dependencies: check that PATH does not contain CWD (2018-05-09 23:26:18 +0200)
are available in the git repository at:
git://git.buildroot.org/~ymorin/git/buildroot.git
for you to fetch changes up to 7cf1082497a62fa2ea47b0357101efa33b453aac
package/dahdi-linux: use package's DL_DIR (2018-05-11 18:10:20 +0200)
----------------------------------------------------------------
Yann E. MORIN (2):
package/asterisk: use package's DL_DIR
package/dahdi-linux: use package's DL_DIR
package/asterisk/asterisk.mk | 2 +-
package/dahdi-linux/dahdi-linux.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] package/asterisk: use package's DL_DIR
2018-05-11 16:29 [Buildroot] [PATCH 0/2] packages; fix last remnants of hard-coded BR2_DL_DIR Yann E. MORIN
@ 2018-05-11 16:29 ` Yann E. MORIN
2018-05-11 17:12 ` Carlos Santos
2018-05-11 16:29 ` [Buildroot] [PATCH 2/2] package/dahdi-linux: " Yann E. MORIN
2018-05-11 20:00 ` [Buildroot] [PATCH 0/2] packages; fix last remnants of hard-coded BR2_DL_DIR Thomas Petazzoni
2 siblings, 1 reply; 6+ messages in thread
From: Yann E. MORIN @ 2018-05-11 16:29 UTC (permalink / raw)
To: buildroot
Sicne we reworked the download infra, the location for packages to look
for their files has moved to a per-package directory.
For systems where a download of the asterisk sound files was already
done in a version prior to the rework, all was working fine so far,
because the files were indeed in the main DL directory.
But for systems where the download is first attempted after the rework,
the files are not found (even though they are properly downloaded).
Fix the location where asterisk looks for its extra files.
Reported-by: ***** ***** <zyama.abel@mail.ru>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: ***** ***** <zyama.abel@mail.ru>
Cc: Carlos Santos <casantos@datacom.ind.br>
Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
---
package/asterisk/asterisk.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk
index 28b85da562..f2f210b524 100644
--- a/package/asterisk/asterisk.mk
+++ b/package/asterisk/asterisk.mk
@@ -102,7 +102,7 @@ ASTERISK_CONF_OPTS = \
--with-libxml2 \
--with-ncurses="$(STAGING_DIR)/usr" \
--with-sqlite3="$(STAGING_DIR)/usr" \
- --with-sounds-cache=$(BR2_DL_DIR)
+ --with-sounds-cache=$(ASTERISK_DL_DIR)
# avcodec are from ffmpeg. There is virtually zero chance this could
# even work; asterisk is looking for ffmpeg/avcodec.h which has not
--
2.14.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/2] package/dahdi-linux: use package's DL_DIR
2018-05-11 16:29 [Buildroot] [PATCH 0/2] packages; fix last remnants of hard-coded BR2_DL_DIR Yann E. MORIN
2018-05-11 16:29 ` [Buildroot] [PATCH 1/2] package/asterisk: use package's DL_DIR Yann E. MORIN
@ 2018-05-11 16:29 ` Yann E. MORIN
2018-05-11 17:13 ` Carlos Santos
2018-05-11 20:00 ` [Buildroot] [PATCH 0/2] packages; fix last remnants of hard-coded BR2_DL_DIR Thomas Petazzoni
2 siblings, 1 reply; 6+ messages in thread
From: Yann E. MORIN @ 2018-05-11 16:29 UTC (permalink / raw)
To: buildroot
Sicne we reworked the download infra, the location for packages to look
for their files has moved to a per-package directory.
For systems where a download of the dahdi firmware files was already
done in a version prior to the rework, all was working fine so far,
because the files were indeed in the main DL directory.
But for systems where the download is first attempted after the rework,
the files are not found (even though they are properly downloaded).
Fix the location where dahdi-linux looks for its extra files.
Reported-by: ***** ***** <zyama.abel@mail.ru>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: ***** ***** <zyama.abel@mail.ru>
Cc: Carlos Santos <casantos@datacom.ind.br>
Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
---
package/dahdi-linux/dahdi-linux.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/dahdi-linux/dahdi-linux.mk b/package/dahdi-linux/dahdi-linux.mk
index c042a14e53..6ac1e88943 100644
--- a/package/dahdi-linux/dahdi-linux.mk
+++ b/package/dahdi-linux/dahdi-linux.mk
@@ -56,7 +56,7 @@ DAHDI_LINUX_MODULE_MAKE_OPTS = \
define DAHDI_LINUX_EXTRACT_FW
$(foreach f,$(DAHDI_LINUX_FW_FILES),\
- cp $(BR2_DL_DIR)/$(f) $(@D)/drivers/dahdi/firmware/$(f)$(sep))
+ cp $(DAHDI_LINUX_DL_DIR)/$(f) $(@D)/drivers/dahdi/firmware/$(f)$(sep))
endef
DAHDI_LINUX_POST_EXTRACT_HOOKS += DAHDI_LINUX_EXTRACT_FW
--
2.14.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] package/asterisk: use package's DL_DIR
2018-05-11 16:29 ` [Buildroot] [PATCH 1/2] package/asterisk: use package's DL_DIR Yann E. MORIN
@ 2018-05-11 17:12 ` Carlos Santos
0 siblings, 0 replies; 6+ messages in thread
From: Carlos Santos @ 2018-05-11 17:12 UTC (permalink / raw)
To: buildroot
> From: "Yann Morin" <yann.morin.1998@free.fr>
> To: "buildroot" <buildroot@buildroot.org>
> Cc: "Yann Morin" <yann.morin.1998@free.fr>, "***** *****" <zyama.abel@mail.ru>, "Carlos Santos"
> <casantos@datacom.ind.br>, "Maxime Hadjinlian" <maxime.hadjinlian@gmail.com>
> Sent: Friday, May 11, 2018 1:29:56 PM
> Subject: [PATCH 1/2] package/asterisk: use package's DL_DIR
> Sicne we reworked the download infra, the location for packages to look
Since
[...]
--
Carlos Santos (Casantos) - DATACOM, P&D
?Marched towards the enemy, spear upright, armed with the certainty
that only the ignorant can have.? ? Epitaph of a volunteer
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/2] package/dahdi-linux: use package's DL_DIR
2018-05-11 16:29 ` [Buildroot] [PATCH 2/2] package/dahdi-linux: " Yann E. MORIN
@ 2018-05-11 17:13 ` Carlos Santos
0 siblings, 0 replies; 6+ messages in thread
From: Carlos Santos @ 2018-05-11 17:13 UTC (permalink / raw)
To: buildroot
> From: "Yann Morin" <yann.morin.1998@free.fr>
> To: "buildroot" <buildroot@buildroot.org>
> Cc: "Yann Morin" <yann.morin.1998@free.fr>, "***** *****" <zyama.abel@mail.ru>, "Carlos Santos"
> <casantos@datacom.ind.br>, "Maxime Hadjinlian" <maxime.hadjinlian@gmail.com>
> Sent: Friday, May 11, 2018 1:29:57 PM
> Subject: [PATCH 2/2] package/dahdi-linux: use package's DL_DIR
> Sicne we reworked the download infra, the location for packages to look
Since
[...]
--
Carlos Santos (Casantos) - DATACOM, P&D
?Marched towards the enemy, spear upright, armed with the certainty
that only the ignorant can have.? ? Epitaph of a volunteer
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 0/2] packages; fix last remnants of hard-coded BR2_DL_DIR
2018-05-11 16:29 [Buildroot] [PATCH 0/2] packages; fix last remnants of hard-coded BR2_DL_DIR Yann E. MORIN
2018-05-11 16:29 ` [Buildroot] [PATCH 1/2] package/asterisk: use package's DL_DIR Yann E. MORIN
2018-05-11 16:29 ` [Buildroot] [PATCH 2/2] package/dahdi-linux: " Yann E. MORIN
@ 2018-05-11 20:00 ` Thomas Petazzoni
2 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2018-05-11 20:00 UTC (permalink / raw)
To: buildroot
Hello,
On Fri, 11 May 2018 18:29:54 +0200, Yann E. MORIN wrote:
> Yann E. MORIN (2):
> package/asterisk: use package's DL_DIR
> package/dahdi-linux: use package's DL_DIR
Applied, after fixing the "Since" typo in the commit log, as noticed by
Carlos.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-05-11 20:00 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-11 16:29 [Buildroot] [PATCH 0/2] packages; fix last remnants of hard-coded BR2_DL_DIR Yann E. MORIN
2018-05-11 16:29 ` [Buildroot] [PATCH 1/2] package/asterisk: use package's DL_DIR Yann E. MORIN
2018-05-11 17:12 ` Carlos Santos
2018-05-11 16:29 ` [Buildroot] [PATCH 2/2] package/dahdi-linux: " Yann E. MORIN
2018-05-11 17:13 ` Carlos Santos
2018-05-11 20:00 ` [Buildroot] [PATCH 0/2] packages; fix last remnants of hard-coded BR2_DL_DIR Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.