| Message ID | 1534955436-729-4-git-send-email-ryan.harkin@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | Adding BCM43430 NVRAM files | expand |
The "cd ${D}${nonarch_base_libdir}/firmware/brcm/" doesn't seem to be
needed, just include the path in 2nd ln parameter.
On Wed, Aug 22, 2018 at 6:30 PM Ryan Harkin <ryan.harkin@linaro.org> wrote:
> The Linux kernel currently expects a single NVRAM file for BCM43430
> named brcmfmac43430-sdio.txt.
>
> Allow the machine to specify an override to link its module specific
> NVRAM to the filename expected by the kernel.
>
> Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
> ---
> meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 12
> ++++++++++++
> 1 file changed, 12 insertions(+)
>
> diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
> b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
> index 8c54f28..b647abc 100644
> --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
> +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
> @@ -226,6 +226,18 @@ do_install() {
> ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf
> ti-connectivity/* . )
> }
>
> +# Adding bcm43430-nvram-{module type} to MACHINEOVERRIDES will create a
> +# softlink for the module specific NVRAM file to the filename expected
> +# by the Linux kernel
> +FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-mur1dx = "
> ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt"
> +do_install_append_bcm43430-nvram-mur1dx() {
> + ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf
> brcmfmac43430-sdio.MUR1DX.txt brcmfmac43430-sdio.txt)
> +}
> +FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-ap6212 =
> "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt"
> +do_install_append_bcm43430-nvram-ap6212() {
> + ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf
> brcmfmac43430-sdio.AP6212.txt brcmfmac43430-sdio.txt)
> +}
> +
>
> PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \
> ${PN}-mt7601u-license ${PN}-mt7601u \
> --
> 2.7.4
>
>
<div dir="ltr">The "cd ${D}${nonarch_base_libdir}/firmware/brcm/" doesn't seem to be needed, just include the path in 2nd ln parameter.</div><br><div class="gmail_quote"><div dir="ltr">On Wed, Aug 22, 2018 at 6:30 PM Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org">ryan.harkin@linaro.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">The Linux kernel currently expects a single NVRAM file for BCM43430<br>
named brcmfmac43430-sdio.txt.<br>
<br>
Allow the machine to specify an override to link its module specific<br>
NVRAM to the filename expected by the kernel.<br>
<br>
Signed-off-by: Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org" target="_blank">ryan.harkin@linaro.org</a>><br>
---<br>
meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer" target="_blank">linux-firmware_git.bb</a> | 12 ++++++++++++<br>
1 file changed, 12 insertions(+)<br>
<br>
diff --git a/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer" target="_blank">linux-firmware_git.bb</a> b/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer" target="_blank">linux-firmware_git.bb</a><br>
index 8c54f28..b647abc 100644<br>
--- a/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer" target="_blank">linux-firmware_git.bb</a><br>
+++ b/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer" target="_blank">linux-firmware_git.bb</a><br>
@@ -226,6 +226,18 @@ do_install() {<br>
( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf ti-connectivity/* . )<br>
}<br>
<br>
+# Adding bcm43430-nvram-{module type} to MACHINEOVERRIDES will create a<br>
+# softlink for the module specific NVRAM file to the filename expected<br>
+# by the Linux kernel<br>
+FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-mur1dx = " ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt"<br>
+do_install_append_bcm43430-nvram-mur1dx() {<br>
+ ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf brcmfmac43430-sdio.MUR1DX.txt brcmfmac43430-sdio.txt)<br>
+}<br>
+FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-ap6212 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt"<br>
+do_install_append_bcm43430-nvram-ap6212() {<br>
+ ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf brcmfmac43430-sdio.AP6212.txt brcmfmac43430-sdio.txt)<br>
+}<br>
+<br>
<br>
PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \<br>
${PN}-mt7601u-license ${PN}-mt7601u \<br>
-- <br>
2.7.4<br>
<br>
</blockquote></div>
On 22 August 2018 at 17:41, Martin Jansa <martin.jansa@gmail.com> wrote: > The "cd ${D}${nonarch_base_libdir}/firmware/brcm/" doesn't seem to be > needed, just include the path in 2nd ln parameter. > I don't think that works, or at least, it doesn't work for me, so I may be doing something wrong. I'm also copying the example used in the do_install() a few lines up as I figured that would be the preferred style for this recipe. > On Wed, Aug 22, 2018 at 6:30 PM Ryan Harkin <ryan.harkin@linaro.org> > wrote: > >> The Linux kernel currently expects a single NVRAM file for BCM43430 >> named brcmfmac43430-sdio.txt. >> >> Allow the machine to specify an override to link its module specific >> NVRAM to the filename expected by the kernel. >> >> Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org> >> --- >> meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 12 >> ++++++++++++ >> 1 file changed, 12 insertions(+) >> >> diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb >> b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb >> index 8c54f28..b647abc 100644 >> --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb >> +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb >> @@ -226,6 +226,18 @@ do_install() { >> ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf >> ti-connectivity/* . ) >> } >> >> +# Adding bcm43430-nvram-{module type} to MACHINEOVERRIDES will create a >> +# softlink for the module specific NVRAM file to the filename expected >> +# by the Linux kernel >> +FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-mur1dx = " >> ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt" >> +do_install_append_bcm43430-nvram-mur1dx() { >> + ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf >> brcmfmac43430-sdio.MUR1DX.txt brcmfmac43430-sdio.txt) >> +} >> +FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-ap6212 = >> "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt" >> +do_install_append_bcm43430-nvram-ap6212() { >> + ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf >> brcmfmac43430-sdio.AP6212.txt brcmfmac43430-sdio.txt) >> +} >> + >> >> PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ >> ${PN}-mt7601u-license ${PN}-mt7601u \ >> -- >> 2.7.4 >> >> <div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On 22 August 2018 at 17:41, Martin Jansa <span dir="ltr"><<a href="mailto:martin.jansa@gmail.com" target="_blank">martin.jansa@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">The "cd ${D}${nonarch_base_libdir}/<wbr>firmware/brcm/" doesn't seem to be needed, just include the path in 2nd ln parameter.</div></blockquote><div><br></div><div>I don't think that works, or at least, it doesn't work for me, so I may be doing something wrong. I'm also copying the example used in the do_install() a few lines up as I figured that would be the preferred style for this recipe.</div><div><br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5"><br><div class="gmail_quote"><div dir="ltr">On Wed, Aug 22, 2018 at 6:30 PM Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org" target="_blank">ryan.harkin@linaro.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">The Linux kernel currently expects a single NVRAM file for BCM43430<br> named brcmfmac43430-sdio.txt.<br> <br> Allow the machine to specify an override to link its module specific<br> NVRAM to the filename expected by the kernel.<br> <br> Signed-off-by: Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org" target="_blank">ryan.harkin@linaro.org</a>><br> ---<br> meta/recipes-kernel/linux-<wbr>firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer" target="_blank">linux-firmware_git.bb</a> | 12 ++++++++++++<br> 1 file changed, 12 insertions(+)<br> <br> diff --git a/meta/recipes-kernel/linux-<wbr>firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer" target="_blank">linux-firmware_git.bb</a> b/meta/recipes-kernel/linux-<wbr>firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer" target="_blank">linux-firmware_git.bb</a><br> index 8c54f28..b647abc 100644<br> --- a/meta/recipes-kernel/linux-<wbr>firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer" target="_blank">linux-firmware_git.bb</a><br> +++ b/meta/recipes-kernel/linux-<wbr>firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer" target="_blank">linux-firmware_git.bb</a><br> @@ -226,6 +226,18 @@ do_install() {<br> ( cd ${D}${nonarch_base_libdir}/<wbr>firmware ; ln -sf ti-connectivity/* . )<br> }<br> <br> +# Adding bcm43430-nvram-{module type} to MACHINEOVERRIDES will create a<br> +# softlink for the module specific NVRAM file to the filename expected<br> +# by the Linux kernel<br> +FILES_${PN}-bcm43430-nvram_<wbr>append_bcm43430-nvram-mur1dx = " ${nonarch_base_libdir}/<wbr>firmware/brcm/brcmfmac43430-<wbr>sdio.txt"<br> +do_install_append_bcm43430-<wbr>nvram-mur1dx() {<br> + ( cd ${D}${nonarch_base_libdir}/<wbr>firmware/brcm/ ; ln -sf brcmfmac43430-sdio.MUR1DX.txt brcmfmac43430-sdio.txt)<br> +}<br> +FILES_${PN}-bcm43430-nvram_<wbr>append_bcm43430-nvram-ap6212 = "${nonarch_base_libdir}/<wbr>firmware/brcm/brcmfmac43430-<wbr>sdio.txt"<br> +do_install_append_bcm43430-<wbr>nvram-ap6212() {<br> + ( cd ${D}${nonarch_base_libdir}/<wbr>firmware/brcm/ ; ln -sf brcmfmac43430-sdio.AP6212.txt brcmfmac43430-sdio.txt)<br> +}<br> +<br> <br> PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \<br> ${PN}-mt7601u-license ${PN}-mt7601u \<br> -- <br> 2.7.4<br> <br> </blockquote></div> </div></div></blockquote></div><br></div></div>
cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf
brcmfmac43430-sdio.AP6212.txt brcmfmac43430-sdio.txt
is the same as
ln -sf brcmfmac43430-sdio.AP6212.txt ${D}${nonarch_base_libdir}/fir
mware/brcm/brcmfmac43430-sdio.txt
On Wed, Aug 22, 2018 at 6:47 PM Ryan Harkin <ryan.harkin@linaro.org> wrote:
>
>
> On 22 August 2018 at 17:41, Martin Jansa <martin.jansa@gmail.com> wrote:
>
>> The "cd ${D}${nonarch_base_libdir}/firmware/brcm/" doesn't seem to be
>> needed, just include the path in 2nd ln parameter.
>>
>
> I don't think that works, or at least, it doesn't work for me, so I may be
> doing something wrong. I'm also copying the example used in the
> do_install() a few lines up as I figured that would be the preferred style
> for this recipe.
>
>
>> On Wed, Aug 22, 2018 at 6:30 PM Ryan Harkin <ryan.harkin@linaro.org>
>> wrote:
>>
>>> The Linux kernel currently expects a single NVRAM file for BCM43430
>>> named brcmfmac43430-sdio.txt.
>>>
>>> Allow the machine to specify an override to link its module specific
>>> NVRAM to the filename expected by the kernel.
>>>
>>> Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
>>> ---
>>> meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 12
>>> ++++++++++++
>>> 1 file changed, 12 insertions(+)
>>>
>>> diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
>>> b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
>>> index 8c54f28..b647abc 100644
>>> --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
>>> +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
>>> @@ -226,6 +226,18 @@ do_install() {
>>> ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf
>>> ti-connectivity/* . )
>>> }
>>>
>>> +# Adding bcm43430-nvram-{module type} to MACHINEOVERRIDES will create a
>>> +# softlink for the module specific NVRAM file to the filename expected
>>> +# by the Linux kernel
>>> +FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-mur1dx = "
>>> ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt"
>>> +do_install_append_bcm43430-nvram-mur1dx() {
>>> + ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf
>>> brcmfmac43430-sdio.MUR1DX.txt brcmfmac43430-sdio.txt)
>>> +}
>>> +FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-ap6212 =
>>> "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt"
>>> +do_install_append_bcm43430-nvram-ap6212() {
>>> + ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf
>>> brcmfmac43430-sdio.AP6212.txt brcmfmac43430-sdio.txt)
>>> +}
>>> +
>>>
>>> PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \
>>> ${PN}-mt7601u-license ${PN}-mt7601u \
>>> --
>>> 2.7.4
>>>
>>>
>
<div dir="ltr"><span style="color:rgb(80,0,80)">cd ${D}${nonarch_base_libdir}/fir</span><span style="color:rgb(80,0,80)">mware/brcm/ ; ln -sf brcmfmac43430-sdio.AP6212.txt brcmfmac43430-sdio.txt</span><br><div><span style="color:rgb(80,0,80)"><br></span></div><div><span style="color:rgb(80,0,80)">is the same as</span></div><div><span style="color:rgb(80,0,80)"><br></span></div><div><span style="color:rgb(80,0,80)">ln -sf </span><span style="color:rgb(80,0,80)">brcmfmac43430-sdio.AP6212.txt </span><span style="color:rgb(80,0,80)">${D}${nonarch_base_libdir}/fir</span><span style="color:rgb(80,0,80)">mware/brcm/</span><span style="color:rgb(80,0,80)">brcmfmac43430-sdio.txt</span></div></div><br><div class="gmail_quote"><div dir="ltr">On Wed, Aug 22, 2018 at 6:47 PM Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org">ryan.harkin@linaro.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On 22 August 2018 at 17:41, Martin Jansa <span dir="ltr"><<a href="mailto:martin.jansa@gmail.com" target="_blank">martin.jansa@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">The "cd ${D}${nonarch_base_libdir}/firmware/brcm/" doesn't seem to be needed, just include the path in 2nd ln parameter.</div></blockquote><div><br></div><div>I don't think that works, or at least, it doesn't work for me, so I may be doing something wrong. I'm also copying the example used in the do_install() a few lines up as I figured that would be the preferred style for this recipe.</div><div><br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="m_-6311599830852990523HOEnZb"><div class="m_-6311599830852990523h5"><br><div class="gmail_quote"><div dir="ltr">On Wed, Aug 22, 2018 at 6:30 PM Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org" target="_blank">ryan.harkin@linaro.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">The Linux kernel currently expects a single NVRAM file for BCM43430<br>
named brcmfmac43430-sdio.txt.<br>
<br>
Allow the machine to specify an override to link its module specific<br>
NVRAM to the filename expected by the kernel.<br>
<br>
Signed-off-by: Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org" target="_blank">ryan.harkin@linaro.org</a>><br>
---<br>
meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer" target="_blank">linux-firmware_git.bb</a> | 12 ++++++++++++<br>
1 file changed, 12 insertions(+)<br>
<br>
diff --git a/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer" target="_blank">linux-firmware_git.bb</a> b/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer" target="_blank">linux-firmware_git.bb</a><br>
index 8c54f28..b647abc 100644<br>
--- a/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer" target="_blank">linux-firmware_git.bb</a><br>
+++ b/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer" target="_blank">linux-firmware_git.bb</a><br>
@@ -226,6 +226,18 @@ do_install() {<br>
( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf ti-connectivity/* . )<br>
}<br>
<br>
+# Adding bcm43430-nvram-{module type} to MACHINEOVERRIDES will create a<br>
+# softlink for the module specific NVRAM file to the filename expected<br>
+# by the Linux kernel<br>
+FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-mur1dx = " ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt"<br>
+do_install_append_bcm43430-nvram-mur1dx() {<br>
+ ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf brcmfmac43430-sdio.MUR1DX.txt brcmfmac43430-sdio.txt)<br>
+}<br>
+FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-ap6212 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt"<br>
+do_install_append_bcm43430-nvram-ap6212() {<br>
+ ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf brcmfmac43430-sdio.AP6212.txt brcmfmac43430-sdio.txt)<br>
+}<br>
+<br>
<br>
PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \<br>
${PN}-mt7601u-license ${PN}-mt7601u \<br>
-- <br>
2.7.4<br>
<br>
</blockquote></div>
</div></div></blockquote></div><br></div></div>
</blockquote></div>
This is curious! On 22 August 2018 at 17:56, Martin Jansa <martin.jansa@gmail.com> wrote: > cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf > brcmfmac43430-sdio.AP6212.txt brcmfmac43430-sdio.txt > > is the same as > > ln -sf brcmfmac43430-sdio.AP6212.txt ${D}${nonarch_base_libdir}/fir > mware/brcm/brcmfmac43430-sdio.txt > On my system, this is what happens when I'm in the root of the linux-firmware repo: $ ls -al brcm/*.txt -rw-rw-r-- 1 ryan ryan 875 Aug 22 18:08 brcm/brcmfmac43430-sdio.AP6212.txt -rw-rw-r-- 1 ryan ryan 831 Aug 21 14:48 brcm/brcmfmac43430-sdio.MUR1DX.txt $ ln -sf brcm/brcmfmac43430-sdio.AP6212.txt brcm/brcmfmac43430-sdio.txt $ ls -al brcm/*.txt -rw-rw-r-- 1 ryan ryan 875 Aug 22 18:08 brcm/brcmfmac43430-sdio.AP6212.txt -rw-rw-r-- 1 ryan ryan 831 Aug 21 14:48 brcm/brcmfmac43430-sdio.MUR1DX.txt lrwxrwxrwx 1 ryan ryan 34 Aug 22 18:08 brcm/brcmfmac43430-sdio.txt -> brcm/brcmfmac43430-sdio.AP6212.txt And the file is not valid. $ cat brcm/brcmfmac43430-sdio.txt cat: brcm/brcmfmac43430-sdio.txt: No such file or directory So perhaps I'm doing something wrong. I tried your suggestion originally and it didn't work for me. Maybe I made a typo or something? > On Wed, Aug 22, 2018 at 6:47 PM Ryan Harkin <ryan.harkin@linaro.org> > wrote: > >> >> >> On 22 August 2018 at 17:41, Martin Jansa <martin.jansa@gmail.com> wrote: >> >>> The "cd ${D}${nonarch_base_libdir}/firmware/brcm/" doesn't seem to be >>> needed, just include the path in 2nd ln parameter. >>> >> >> I don't think that works, or at least, it doesn't work for me, so I may >> be doing something wrong. I'm also copying the example used in the >> do_install() a few lines up as I figured that would be the preferred style >> for this recipe. >> >> >>> On Wed, Aug 22, 2018 at 6:30 PM Ryan Harkin <ryan.harkin@linaro.org> >>> wrote: >>> >>>> The Linux kernel currently expects a single NVRAM file for BCM43430 >>>> named brcmfmac43430-sdio.txt. >>>> >>>> Allow the machine to specify an override to link its module specific >>>> NVRAM to the filename expected by the kernel. >>>> >>>> Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org> >>>> --- >>>> meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 12 >>>> ++++++++++++ >>>> 1 file changed, 12 insertions(+) >>>> >>>> diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb >>>> b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb >>>> index 8c54f28..b647abc 100644 >>>> --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb >>>> +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb >>>> @@ -226,6 +226,18 @@ do_install() { >>>> ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf >>>> ti-connectivity/* . ) >>>> } >>>> >>>> +# Adding bcm43430-nvram-{module type} to MACHINEOVERRIDES will create a >>>> +# softlink for the module specific NVRAM file to the filename expected >>>> +# by the Linux kernel >>>> +FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-mur1dx = " >>>> ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt" >>>> +do_install_append_bcm43430-nvram-mur1dx() { >>>> + ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf >>>> brcmfmac43430-sdio.MUR1DX.txt brcmfmac43430-sdio.txt) >>>> +} >>>> +FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-ap6212 = >>>> "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt" >>>> +do_install_append_bcm43430-nvram-ap6212() { >>>> + ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf >>>> brcmfmac43430-sdio.AP6212.txt brcmfmac43430-sdio.txt) >>>> +} >>>> + >>>> >>>> PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ >>>> ${PN}-mt7601u-license ${PN}-mt7601u \ >>>> -- >>>> 2.7.4 >>>> >>>> >> <div dir="ltr">This is curious!<br><div class="gmail_extra"><br><div class="gmail_quote">On 22 August 2018 at 17:56, Martin Jansa <span dir="ltr"><<a href="mailto:martin.jansa@gmail.com" target="_blank">martin.jansa@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><span class="gmail-"><span style="color:rgb(80,0,80)">cd ${D}${nonarch_base_libdir}/fir</span><span style="color:rgb(80,0,80)"><wbr>mware/brcm/ ; ln -sf brcmfmac43430-sdio.AP6212.txt brcmfmac43430-sdio.txt</span><br><div><span style="color:rgb(80,0,80)"><br></span></div></span><div><span style="color:rgb(80,0,80)">is the same as</span></div><div><span style="color:rgb(80,0,80)"><br></span></div><div><span style="color:rgb(80,0,80)">ln -sf </span><span style="color:rgb(80,0,80)">brcmfmac43430-sdio.AP6212.<wbr>txt </span><span style="color:rgb(80,0,80)">${D}${nonarch_base_libdir}<wbr>/fir</span><span style="color:rgb(80,0,80)">mware/brcm/</span><span style="color:rgb(80,0,80)">brcmfmac43430-<wbr>sdio.txt</span></div></div></blockquote><div><br></div><div>On my system, this is what happens when I'm in the root of the linux-firmware repo:<br></div><div><br></div><div style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial">$ ls -al brcm/*.txt<br></div><div style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial">-rw-rw-r-- 1 ryan ryan 875 Aug 22 18:08 brcm/brcmfmac43430-sdio.AP6212.txt</div><div style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial">-rw-rw-r-- 1 ryan ryan 831 Aug 21 14:48 brcm/brcmfmac43430-sdio.MUR1DX.txt</div><br class="gmail-Apple-interchange-newline"><div>$ ln -sf brcm/brcmfmac43430-sdio.AP6212.txt brcm/brcmfmac43430-sdio.txt<br></div><div><br></div><div>$ ls -al brcm/*.txt<br></div><div>-rw-rw-r-- 1 ryan ryan 875 Aug 22 18:08 brcm/brcmfmac43430-sdio.AP6212.txt</div><div>-rw-rw-r-- 1 ryan ryan 831 Aug 21 14:48 brcm/brcmfmac43430-sdio.MUR1DX.txt</div><div>lrwxrwxrwx 1 ryan ryan 34 Aug 22 18:08 brcm/brcmfmac43430-sdio.txt -> brcm/brcmfmac43430-sdio.AP6212.txt</div><div><br></div><div>And the file is not valid.</div><div><br></div><div>$ cat brcm/brcmfmac43430-sdio.txt</div><div>cat: brcm/brcmfmac43430-sdio.txt: No such file or directory</div><div><br></div><div>So perhaps I'm doing something wrong. I tried your suggestion originally and it didn't work for me. Maybe I made a typo or something?</div><div><br></div><div><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div class="gmail-HOEnZb"><div class="gmail-h5"><br><div class="gmail_quote"><div dir="ltr">On Wed, Aug 22, 2018 at 6:47 PM Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org" target="_blank">ryan.harkin@linaro.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On 22 August 2018 at 17:41, Martin Jansa <span dir="ltr"><<a href="mailto:martin.jansa@gmail.com" target="_blank">martin.jansa@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr">The "cd ${D}${nonarch_base_libdir}/<wbr>firmware/brcm/" doesn't seem to be needed, just include the path in 2nd ln parameter.</div></blockquote><div><br></div><div>I don't think that works, or at least, it doesn't work for me, so I may be doing something wrong. I'm also copying the example used in the do_install() a few lines up as I figured that would be the preferred style for this recipe.</div><div><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div class="gmail-m_5502182029538994976m_-6311599830852990523HOEnZb"><div class="gmail-m_5502182029538994976m_-6311599830852990523h5"><br><div class="gmail_quote"><div dir="ltr">On Wed, Aug 22, 2018 at 6:30 PM Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org" target="_blank">ryan.harkin@linaro.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">The Linux kernel currently expects a single NVRAM file for BCM43430<br> named brcmfmac43430-sdio.txt.<br> <br> Allow the machine to specify an override to link its module specific<br> NVRAM to the filename expected by the kernel.<br> <br> Signed-off-by: Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org" target="_blank">ryan.harkin@linaro.org</a>><br> ---<br> meta/recipes-kernel/linux-<wbr>firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer" target="_blank">linux-firmware_git.bb</a> | 12 ++++++++++++<br> 1 file changed, 12 insertions(+)<br> <br> diff --git a/meta/recipes-kernel/linux-<wbr>firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer" target="_blank">linux-firmware_git.bb</a> b/meta/recipes-kernel/linux-<wbr>firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer" target="_blank">linux-firmware_git.bb</a><br> index 8c54f28..b647abc 100644<br> --- a/meta/recipes-kernel/linux-<wbr>firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer" target="_blank">linux-firmware_git.bb</a><br> +++ b/meta/recipes-kernel/linux-<wbr>firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer" target="_blank">linux-firmware_git.bb</a><br> @@ -226,6 +226,18 @@ do_install() {<br> ( cd ${D}${nonarch_base_libdir}/<wbr>firmware ; ln -sf ti-connectivity/* . )<br> }<br> <br> +# Adding bcm43430-nvram-{module type} to MACHINEOVERRIDES will create a<br> +# softlink for the module specific NVRAM file to the filename expected<br> +# by the Linux kernel<br> +FILES_${PN}-bcm43430-nvram_<wbr>append_bcm43430-nvram-mur1dx = " ${nonarch_base_libdir}/<wbr>firmware/brcm/brcmfmac43430-<wbr>sdio.txt"<br> +do_install_append_bcm43430-<wbr>nvram-mur1dx() {<br> + ( cd ${D}${nonarch_base_libdir}/<wbr>firmware/brcm/ ; ln -sf brcmfmac43430-sdio.MUR1DX.txt brcmfmac43430-sdio.txt)<br> +}<br> +FILES_${PN}-bcm43430-nvram_<wbr>append_bcm43430-nvram-ap6212 = "${nonarch_base_libdir}/<wbr>firmware/brcm/brcmfmac43430-<wbr>sdio.txt"<br> +do_install_append_bcm43430-<wbr>nvram-ap6212() {<br> + ( cd ${D}${nonarch_base_libdir}/<wbr>firmware/brcm/ ; ln -sf brcmfmac43430-sdio.AP6212.txt brcmfmac43430-sdio.txt)<br> +}<br> +<br> <br> PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \<br> ${PN}-mt7601u-license ${PN}-mt7601u \<br> -- <br> 2.7.4<br> <br> </blockquote></div> </div></div></blockquote></div><br></div></div> </blockquote></div> </div></div></blockquote></div><br></div></div>
Your 1st parameter is wrong, compare again with the example I gave you (don't include "brcm/" path in 1st param, because you want the symlink to point to just brcmfmac43430-sdio.AP6212.txt like you did in the version after cd). On Wed, Aug 22, 2018 at 7:11 PM Ryan Harkin <ryan.harkin@linaro.org> wrote: > This is curious! > > On 22 August 2018 at 17:56, Martin Jansa <martin.jansa@gmail.com> wrote: > >> cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf >> brcmfmac43430-sdio.AP6212.txt brcmfmac43430-sdio.txt >> >> is the same as >> >> ln -sf brcmfmac43430-sdio.AP6212.txt ${D}${nonarch_base_libdir}/fir >> mware/brcm/brcmfmac43430-sdio.txt >> > > On my system, this is what happens when I'm in the root of the > linux-firmware repo: > > $ ls -al brcm/*.txt > -rw-rw-r-- 1 ryan ryan 875 Aug 22 18:08 brcm/brcmfmac43430-sdio.AP6212.txt > -rw-rw-r-- 1 ryan ryan 831 Aug 21 14:48 brcm/brcmfmac43430-sdio.MUR1DX.txt > > $ ln -sf brcm/brcmfmac43430-sdio.AP6212.txt brcm/brcmfmac43430-sdio.txt > > $ ls -al brcm/*.txt > -rw-rw-r-- 1 ryan ryan 875 Aug 22 18:08 brcm/brcmfmac43430-sdio.AP6212.txt > -rw-rw-r-- 1 ryan ryan 831 Aug 21 14:48 brcm/brcmfmac43430-sdio.MUR1DX.txt > lrwxrwxrwx 1 ryan ryan 34 Aug 22 18:08 brcm/brcmfmac43430-sdio.txt -> > brcm/brcmfmac43430-sdio.AP6212.txt > > And the file is not valid. > > $ cat brcm/brcmfmac43430-sdio.txt > cat: brcm/brcmfmac43430-sdio.txt: No such file or directory > > So perhaps I'm doing something wrong. I tried your suggestion originally > and it didn't work for me. Maybe I made a typo or something? > > > >> On Wed, Aug 22, 2018 at 6:47 PM Ryan Harkin <ryan.harkin@linaro.org> >> wrote: >> >>> >>> >>> On 22 August 2018 at 17:41, Martin Jansa <martin.jansa@gmail.com> wrote: >>> >>>> The "cd ${D}${nonarch_base_libdir}/firmware/brcm/" doesn't seem to be >>>> needed, just include the path in 2nd ln parameter. >>>> >>> >>> I don't think that works, or at least, it doesn't work for me, so I may >>> be doing something wrong. I'm also copying the example used in the >>> do_install() a few lines up as I figured that would be the preferred style >>> for this recipe. >>> >>> >>>> On Wed, Aug 22, 2018 at 6:30 PM Ryan Harkin <ryan.harkin@linaro.org> >>>> wrote: >>>> >>>>> The Linux kernel currently expects a single NVRAM file for BCM43430 >>>>> named brcmfmac43430-sdio.txt. >>>>> >>>>> Allow the machine to specify an override to link its module specific >>>>> NVRAM to the filename expected by the kernel. >>>>> >>>>> Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org> >>>>> --- >>>>> meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 12 >>>>> ++++++++++++ >>>>> 1 file changed, 12 insertions(+) >>>>> >>>>> diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb >>>>> b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb >>>>> index 8c54f28..b647abc 100644 >>>>> --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb >>>>> +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb >>>>> @@ -226,6 +226,18 @@ do_install() { >>>>> ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf >>>>> ti-connectivity/* . ) >>>>> } >>>>> >>>>> +# Adding bcm43430-nvram-{module type} to MACHINEOVERRIDES will create >>>>> a >>>>> +# softlink for the module specific NVRAM file to the filename expected >>>>> +# by the Linux kernel >>>>> +FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-mur1dx = " >>>>> ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt" >>>>> +do_install_append_bcm43430-nvram-mur1dx() { >>>>> + ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf >>>>> brcmfmac43430-sdio.MUR1DX.txt brcmfmac43430-sdio.txt) >>>>> +} >>>>> +FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-ap6212 = >>>>> "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt" >>>>> +do_install_append_bcm43430-nvram-ap6212() { >>>>> + ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf >>>>> brcmfmac43430-sdio.AP6212.txt brcmfmac43430-sdio.txt) >>>>> +} >>>>> + >>>>> >>>>> PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ >>>>> ${PN}-mt7601u-license ${PN}-mt7601u \ >>>>> -- >>>>> 2.7.4 >>>>> >>>>> >>> > <div dir="ltr">Your 1st parameter is wrong, compare again with the example I gave you (don't include "brcm/" path in 1st param, because you want the symlink to point to just brcmfmac43430-sdio.AP6212.txt like you did in the version after cd).</div><br><div class="gmail_quote"><div dir="ltr">On Wed, Aug 22, 2018 at 7:11 PM Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org">ryan.harkin@linaro.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">This is curious!<br><div class="gmail_extra"><br><div class="gmail_quote">On 22 August 2018 at 17:56, Martin Jansa <span dir="ltr"><<a href="mailto:martin.jansa@gmail.com" target="_blank">martin.jansa@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><span class="m_8590662322490689065gmail-"><span style="color:rgb(80,0,80)">cd ${D}${nonarch_base_libdir}/fir</span><span style="color:rgb(80,0,80)">mware/brcm/ ; ln -sf brcmfmac43430-sdio.AP6212.txt brcmfmac43430-sdio.txt</span><br><div><span style="color:rgb(80,0,80)"><br></span></div></span><div><span style="color:rgb(80,0,80)">is the same as</span></div><div><span style="color:rgb(80,0,80)"><br></span></div><div><span style="color:rgb(80,0,80)">ln -sf </span><span style="color:rgb(80,0,80)">brcmfmac43430-sdio.AP6212.txt </span><span style="color:rgb(80,0,80)">${D}${nonarch_base_libdir}/fir</span><span style="color:rgb(80,0,80)">mware/brcm/</span><span style="color:rgb(80,0,80)">brcmfmac43430-sdio.txt</span></div></div></blockquote><div><br></div><div>On my system, this is what happens when I'm in the root of the linux-firmware repo:<br></div><div><br></div><div style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial">$ ls -al brcm/*.txt<br></div><div style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial">-rw-rw-r-- 1 ryan ryan 875 Aug 22 18:08 brcm/brcmfmac43430-sdio.AP6212.txt</div><div style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial">-rw-rw-r-- 1 ryan ryan 831 Aug 21 14:48 brcm/brcmfmac43430-sdio.MUR1DX.txt</div><br class="m_8590662322490689065gmail-Apple-interchange-newline"><div>$ ln -sf brcm/brcmfmac43430-sdio.AP6212.txt brcm/brcmfmac43430-sdio.txt<br></div><div><br></div><div>$ ls -al brcm/*.txt<br></div><div>-rw-rw-r-- 1 ryan ryan 875 Aug 22 18:08 brcm/brcmfmac43430-sdio.AP6212.txt</div><div>-rw-rw-r-- 1 ryan ryan 831 Aug 21 14:48 brcm/brcmfmac43430-sdio.MUR1DX.txt</div><div>lrwxrwxrwx 1 ryan ryan 34 Aug 22 18:08 brcm/brcmfmac43430-sdio.txt -> brcm/brcmfmac43430-sdio.AP6212.txt</div><div><br></div><div>And the file is not valid.</div><div><br></div><div>$ cat brcm/brcmfmac43430-sdio.txt</div><div>cat: brcm/brcmfmac43430-sdio.txt: No such file or directory</div><div><br></div><div>So perhaps I'm doing something wrong. I tried your suggestion originally and it didn't work for me. Maybe I made a typo or something?</div><div><br></div><div><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div class="m_8590662322490689065gmail-HOEnZb"><div class="m_8590662322490689065gmail-h5"><br><div class="gmail_quote"><div dir="ltr">On Wed, Aug 22, 2018 at 6:47 PM Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org" target="_blank">ryan.harkin@linaro.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On 22 August 2018 at 17:41, Martin Jansa <span dir="ltr"><<a href="mailto:martin.jansa@gmail.com" target="_blank">martin.jansa@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr">The "cd ${D}${nonarch_base_libdir}/firmware/brcm/" doesn't seem to be needed, just include the path in 2nd ln parameter.</div></blockquote><div><br></div><div>I don't think that works, or at least, it doesn't work for me, so I may be doing something wrong. I'm also copying the example used in the do_install() a few lines up as I figured that would be the preferred style for this recipe.</div><div><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div class="m_8590662322490689065gmail-m_5502182029538994976m_-6311599830852990523HOEnZb"><div class="m_8590662322490689065gmail-m_5502182029538994976m_-6311599830852990523h5"><br><div class="gmail_quote"><div dir="ltr">On Wed, Aug 22, 2018 at 6:30 PM Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org" target="_blank">ryan.harkin@linaro.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">The Linux kernel currently expects a single NVRAM file for BCM43430<br> named brcmfmac43430-sdio.txt.<br> <br> Allow the machine to specify an override to link its module specific<br> NVRAM to the filename expected by the kernel.<br> <br> Signed-off-by: Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org" target="_blank">ryan.harkin@linaro.org</a>><br> ---<br> meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer" target="_blank">linux-firmware_git.bb</a> | 12 ++++++++++++<br> 1 file changed, 12 insertions(+)<br> <br> diff --git a/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer" target="_blank">linux-firmware_git.bb</a> b/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer" target="_blank">linux-firmware_git.bb</a><br> index 8c54f28..b647abc 100644<br> --- a/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer" target="_blank">linux-firmware_git.bb</a><br> +++ b/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer" target="_blank">linux-firmware_git.bb</a><br> @@ -226,6 +226,18 @@ do_install() {<br> ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf ti-connectivity/* . )<br> }<br> <br> +# Adding bcm43430-nvram-{module type} to MACHINEOVERRIDES will create a<br> +# softlink for the module specific NVRAM file to the filename expected<br> +# by the Linux kernel<br> +FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-mur1dx = " ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt"<br> +do_install_append_bcm43430-nvram-mur1dx() {<br> + ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf brcmfmac43430-sdio.MUR1DX.txt brcmfmac43430-sdio.txt)<br> +}<br> +FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-ap6212 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt"<br> +do_install_append_bcm43430-nvram-ap6212() {<br> + ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf brcmfmac43430-sdio.AP6212.txt brcmfmac43430-sdio.txt)<br> +}<br> +<br> <br> PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \<br> ${PN}-mt7601u-license ${PN}-mt7601u \<br> -- <br> 2.7.4<br> <br> </blockquote></div> </div></div></blockquote></div><br></div></div> </blockquote></div> </div></div></blockquote></div><br></div></div> </blockquote></div>
On Wed, 22 Aug 2018, 20:02 Martin Jansa, <martin.jansa@gmail.com> wrote: > Your 1st parameter is wrong, compare again with the example I gave you > (don't include "brcm/" path in 1st param, because you want the symlink to > point to just brcmfmac43430-sdio.AP6212.txt like you did in the version > after cd). > That doesn't work either. I tried it with the same result, but didn't send a log of it. That works for you? On Wed, Aug 22, 2018 at 7:11 PM Ryan Harkin <ryan.harkin@linaro.org> wrote: > >> This is curious! >> >> On 22 August 2018 at 17:56, Martin Jansa <martin.jansa@gmail.com> wrote: >> >>> cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf >>> brcmfmac43430-sdio.AP6212.txt brcmfmac43430-sdio.txt >>> >>> is the same as >>> >>> ln -sf brcmfmac43430-sdio.AP6212.txt ${D}${nonarch_base_libdir}/fir >>> mware/brcm/brcmfmac43430-sdio.txt >>> >> >> On my system, this is what happens when I'm in the root of the >> linux-firmware repo: >> >> $ ls -al brcm/*.txt >> -rw-rw-r-- 1 ryan ryan 875 Aug 22 18:08 brcm/brcmfmac43430-sdio.AP6212.txt >> -rw-rw-r-- 1 ryan ryan 831 Aug 21 14:48 brcm/brcmfmac43430-sdio.MUR1DX.txt >> >> $ ln -sf brcm/brcmfmac43430-sdio.AP6212.txt brcm/brcmfmac43430-sdio.txt >> >> $ ls -al brcm/*.txt >> -rw-rw-r-- 1 ryan ryan 875 Aug 22 18:08 brcm/brcmfmac43430-sdio.AP6212.txt >> -rw-rw-r-- 1 ryan ryan 831 Aug 21 14:48 brcm/brcmfmac43430-sdio.MUR1DX.txt >> lrwxrwxrwx 1 ryan ryan 34 Aug 22 18:08 brcm/brcmfmac43430-sdio.txt -> >> brcm/brcmfmac43430-sdio.AP6212.txt >> >> And the file is not valid. >> >> $ cat brcm/brcmfmac43430-sdio.txt >> cat: brcm/brcmfmac43430-sdio.txt: No such file or directory >> >> So perhaps I'm doing something wrong. I tried your suggestion originally >> and it didn't work for me. Maybe I made a typo or something? >> >> >> >>> On Wed, Aug 22, 2018 at 6:47 PM Ryan Harkin <ryan.harkin@linaro.org> >>> wrote: >>> >>>> >>>> >>>> On 22 August 2018 at 17:41, Martin Jansa <martin.jansa@gmail.com> >>>> wrote: >>>> >>>>> The "cd ${D}${nonarch_base_libdir}/firmware/brcm/" doesn't seem to be >>>>> needed, just include the path in 2nd ln parameter. >>>>> >>>> >>>> I don't think that works, or at least, it doesn't work for me, so I may >>>> be doing something wrong. I'm also copying the example used in the >>>> do_install() a few lines up as I figured that would be the preferred style >>>> for this recipe. >>>> >>>> >>>>> On Wed, Aug 22, 2018 at 6:30 PM Ryan Harkin <ryan.harkin@linaro.org> >>>>> wrote: >>>>> >>>>>> The Linux kernel currently expects a single NVRAM file for BCM43430 >>>>>> named brcmfmac43430-sdio.txt. >>>>>> >>>>>> Allow the machine to specify an override to link its module specific >>>>>> NVRAM to the filename expected by the kernel. >>>>>> >>>>>> Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org> >>>>>> --- >>>>>> meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 12 >>>>>> ++++++++++++ >>>>>> 1 file changed, 12 insertions(+) >>>>>> >>>>>> diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb >>>>>> b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb >>>>>> index 8c54f28..b647abc 100644 >>>>>> --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb >>>>>> +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb >>>>>> @@ -226,6 +226,18 @@ do_install() { >>>>>> ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf >>>>>> ti-connectivity/* . ) >>>>>> } >>>>>> >>>>>> +# Adding bcm43430-nvram-{module type} to MACHINEOVERRIDES will >>>>>> create a >>>>>> +# softlink for the module specific NVRAM file to the filename >>>>>> expected >>>>>> +# by the Linux kernel >>>>>> +FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-mur1dx = " >>>>>> ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt" >>>>>> +do_install_append_bcm43430-nvram-mur1dx() { >>>>>> + ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf >>>>>> brcmfmac43430-sdio.MUR1DX.txt brcmfmac43430-sdio.txt) >>>>>> +} >>>>>> +FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-ap6212 = >>>>>> "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt" >>>>>> +do_install_append_bcm43430-nvram-ap6212() { >>>>>> + ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf >>>>>> brcmfmac43430-sdio.AP6212.txt brcmfmac43430-sdio.txt) >>>>>> +} >>>>>> + >>>>>> >>>>>> PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ >>>>>> ${PN}-mt7601u-license ${PN}-mt7601u \ >>>>>> -- >>>>>> 2.7.4 >>>>>> >>>>>> >>>> >> <div dir="auto"><div><br><br><div class="gmail_quote"><div dir="ltr">On Wed, 22 Aug 2018, 20:02 Martin Jansa, <<a href="mailto:martin.jansa@gmail.com">martin.jansa@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Your 1st parameter is wrong, compare again with the example I gave you (don't include "brcm/" path in 1st param, because you want the symlink to point to just brcmfmac43430-sdio.AP6212.txt like you did in the version after cd).</div></blockquote></div></div><div dir="auto"><br></div><div dir="auto">That doesn't work either. I tried it with the same result, but didn't send a log of it. That works for you?</div><div dir="auto"><br></div><div dir="auto"><br></div><div dir="auto"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="gmail_quote"><div dir="ltr">On Wed, Aug 22, 2018 at 7:11 PM Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org" target="_blank" rel="noreferrer">ryan.harkin@linaro.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">This is curious!<br><div class="gmail_extra"><br><div class="gmail_quote">On 22 August 2018 at 17:56, Martin Jansa <span dir="ltr"><<a href="mailto:martin.jansa@gmail.com" target="_blank" rel="noreferrer">martin.jansa@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><span class="m_5050295636052634530m_8590662322490689065gmail-"><span style="color:rgb(80,0,80)">cd ${D}${nonarch_base_libdir}/fir</span><span style="color:rgb(80,0,80)">mware/brcm/ ; ln -sf brcmfmac43430-sdio.AP6212.txt brcmfmac43430-sdio.txt</span><br><div><span style="color:rgb(80,0,80)"><br></span></div></span><div><span style="color:rgb(80,0,80)">is the same as</span></div><div><span style="color:rgb(80,0,80)"><br></span></div><div><span style="color:rgb(80,0,80)">ln -sf </span><span style="color:rgb(80,0,80)">brcmfmac43430-sdio.AP6212.txt </span><span style="color:rgb(80,0,80)">${D}${nonarch_base_libdir}/fir</span><span style="color:rgb(80,0,80)">mware/brcm/</span><span style="color:rgb(80,0,80)">brcmfmac43430-sdio.txt</span></div></div></blockquote><div><br></div><div>On my system, this is what happens when I'm in the root of the linux-firmware repo:<br></div><div><br></div><div style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial">$ ls -al brcm/*.txt<br></div><div style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial">-rw-rw-r-- 1 ryan ryan 875 Aug 22 18:08 brcm/brcmfmac43430-sdio.AP6212.txt</div><div style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial">-rw-rw-r-- 1 ryan ryan 831 Aug 21 14:48 brcm/brcmfmac43430-sdio.MUR1DX.txt</div><br class="m_5050295636052634530m_8590662322490689065gmail-Apple-interchange-newline"><div>$ ln -sf brcm/brcmfmac43430-sdio.AP6212.txt brcm/brcmfmac43430-sdio.txt<br></div><div><br></div><div>$ ls -al brcm/*.txt<br></div><div>-rw-rw-r-- 1 ryan ryan 875 Aug 22 18:08 brcm/brcmfmac43430-sdio.AP6212.txt</div><div>-rw-rw-r-- 1 ryan ryan 831 Aug 21 14:48 brcm/brcmfmac43430-sdio.MUR1DX.txt</div><div>lrwxrwxrwx 1 ryan ryan 34 Aug 22 18:08 brcm/brcmfmac43430-sdio.txt -> brcm/brcmfmac43430-sdio.AP6212.txt</div><div><br></div><div>And the file is not valid.</div><div><br></div><div>$ cat brcm/brcmfmac43430-sdio.txt</div><div>cat: brcm/brcmfmac43430-sdio.txt: No such file or directory</div><div><br></div><div>So perhaps I'm doing something wrong. I tried your suggestion originally and it didn't work for me. Maybe I made a typo or something?</div><div><br></div><div><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div class="m_5050295636052634530m_8590662322490689065gmail-HOEnZb"><div class="m_5050295636052634530m_8590662322490689065gmail-h5"><br><div class="gmail_quote"><div dir="ltr">On Wed, Aug 22, 2018 at 6:47 PM Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org" target="_blank" rel="noreferrer">ryan.harkin@linaro.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On 22 August 2018 at 17:41, Martin Jansa <span dir="ltr"><<a href="mailto:martin.jansa@gmail.com" target="_blank" rel="noreferrer">martin.jansa@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr">The "cd ${D}${nonarch_base_libdir}/firmware/brcm/" doesn't seem to be needed, just include the path in 2nd ln parameter.</div></blockquote><div><br></div><div>I don't think that works, or at least, it doesn't work for me, so I may be doing something wrong. I'm also copying the example used in the do_install() a few lines up as I figured that would be the preferred style for this recipe.</div><div><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div class="m_5050295636052634530m_8590662322490689065gmail-m_5502182029538994976m_-6311599830852990523HOEnZb"><div class="m_5050295636052634530m_8590662322490689065gmail-m_5502182029538994976m_-6311599830852990523h5"><br><div class="gmail_quote"><div dir="ltr">On Wed, Aug 22, 2018 at 6:30 PM Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org" target="_blank" rel="noreferrer">ryan.harkin@linaro.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">The Linux kernel currently expects a single NVRAM file for BCM43430<br> named brcmfmac43430-sdio.txt.<br> <br> Allow the machine to specify an override to link its module specific<br> NVRAM to the filename expected by the kernel.<br> <br> Signed-off-by: Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org" target="_blank" rel="noreferrer">ryan.harkin@linaro.org</a>><br> ---<br> meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer noreferrer" target="_blank">linux-firmware_git.bb</a> | 12 ++++++++++++<br> 1 file changed, 12 insertions(+)<br> <br> diff --git a/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer noreferrer" target="_blank">linux-firmware_git.bb</a> b/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer noreferrer" target="_blank">linux-firmware_git.bb</a><br> index 8c54f28..b647abc 100644<br> --- a/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer noreferrer" target="_blank">linux-firmware_git.bb</a><br> +++ b/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer noreferrer" target="_blank">linux-firmware_git.bb</a><br> @@ -226,6 +226,18 @@ do_install() {<br> ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf ti-connectivity/* . )<br> }<br> <br> +# Adding bcm43430-nvram-{module type} to MACHINEOVERRIDES will create a<br> +# softlink for the module specific NVRAM file to the filename expected<br> +# by the Linux kernel<br> +FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-mur1dx = " ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt"<br> +do_install_append_bcm43430-nvram-mur1dx() {<br> + ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf brcmfmac43430-sdio.MUR1DX.txt brcmfmac43430-sdio.txt)<br> +}<br> +FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-ap6212 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt"<br> +do_install_append_bcm43430-nvram-ap6212() {<br> + ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf brcmfmac43430-sdio.AP6212.txt brcmfmac43430-sdio.txt)<br> +}<br> +<br> <br> PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \<br> ${PN}-mt7601u-license ${PN}-mt7601u \<br> -- <br> 2.7.4<br> <br> </blockquote></div> </div></div></blockquote></div><br></div></div> </blockquote></div> </div></div></blockquote></div><br></div></div> </blockquote></div> </blockquote></div></div></div>
I wonder how it work with meta-raspverrypi now that it has its own packing for firmware On Wed, Aug 22, 2018 at 1:10 PM Ryan Harkin <ryan.harkin@linaro.org> wrote: > > > > On Wed, 22 Aug 2018, 20:02 Martin Jansa, <martin.jansa@gmail.com> wrote: >> >> Your 1st parameter is wrong, compare again with the example I gave you (don't include "brcm/" path in 1st param, because you want the symlink to point to just brcmfmac43430-sdio.AP6212.txt like you did in the version after cd). > > > That doesn't work either. I tried it with the same result, but didn't send a log of it. That works for you? > > >> On Wed, Aug 22, 2018 at 7:11 PM Ryan Harkin <ryan.harkin@linaro.org> wrote: >>> >>> This is curious! >>> >>> On 22 August 2018 at 17:56, Martin Jansa <martin.jansa@gmail.com> wrote: >>>> >>>> cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf brcmfmac43430-sdio.AP6212.txt brcmfmac43430-sdio.txt >>>> >>>> is the same as >>>> >>>> ln -sf brcmfmac43430-sdio.AP6212.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt >>> >>> >>> On my system, this is what happens when I'm in the root of the linux-firmware repo: >>> >>> $ ls -al brcm/*.txt >>> -rw-rw-r-- 1 ryan ryan 875 Aug 22 18:08 brcm/brcmfmac43430-sdio.AP6212.txt >>> -rw-rw-r-- 1 ryan ryan 831 Aug 21 14:48 brcm/brcmfmac43430-sdio.MUR1DX.txt >>> >>> $ ln -sf brcm/brcmfmac43430-sdio.AP6212.txt brcm/brcmfmac43430-sdio.txt >>> >>> $ ls -al brcm/*.txt >>> -rw-rw-r-- 1 ryan ryan 875 Aug 22 18:08 brcm/brcmfmac43430-sdio.AP6212.txt >>> -rw-rw-r-- 1 ryan ryan 831 Aug 21 14:48 brcm/brcmfmac43430-sdio.MUR1DX.txt >>> lrwxrwxrwx 1 ryan ryan 34 Aug 22 18:08 brcm/brcmfmac43430-sdio.txt -> brcm/brcmfmac43430-sdio.AP6212.txt >>> >>> And the file is not valid. >>> >>> $ cat brcm/brcmfmac43430-sdio.txt >>> cat: brcm/brcmfmac43430-sdio.txt: No such file or directory >>> >>> So perhaps I'm doing something wrong. I tried your suggestion originally and it didn't work for me. Maybe I made a typo or something? >>> >>> >>>> >>>> On Wed, Aug 22, 2018 at 6:47 PM Ryan Harkin <ryan.harkin@linaro.org> wrote: >>>>> >>>>> >>>>> >>>>> On 22 August 2018 at 17:41, Martin Jansa <martin.jansa@gmail.com> wrote: >>>>>> >>>>>> The "cd ${D}${nonarch_base_libdir}/firmware/brcm/" doesn't seem to be needed, just include the path in 2nd ln parameter. >>>>> >>>>> >>>>> I don't think that works, or at least, it doesn't work for me, so I may be doing something wrong. I'm also copying the example used in the do_install() a few lines up as I figured that would be the preferred style for this recipe. >>>>> >>>>>> >>>>>> On Wed, Aug 22, 2018 at 6:30 PM Ryan Harkin <ryan.harkin@linaro.org> wrote: >>>>>>> >>>>>>> The Linux kernel currently expects a single NVRAM file for BCM43430 >>>>>>> named brcmfmac43430-sdio.txt. >>>>>>> >>>>>>> Allow the machine to specify an override to link its module specific >>>>>>> NVRAM to the filename expected by the kernel. >>>>>>> >>>>>>> Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org> >>>>>>> --- >>>>>>> meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 12 ++++++++++++ >>>>>>> 1 file changed, 12 insertions(+) >>>>>>> >>>>>>> diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb >>>>>>> index 8c54f28..b647abc 100644 >>>>>>> --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb >>>>>>> +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb >>>>>>> @@ -226,6 +226,18 @@ do_install() { >>>>>>> ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf ti-connectivity/* . ) >>>>>>> } >>>>>>> >>>>>>> +# Adding bcm43430-nvram-{module type} to MACHINEOVERRIDES will create a >>>>>>> +# softlink for the module specific NVRAM file to the filename expected >>>>>>> +# by the Linux kernel >>>>>>> +FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-mur1dx = " ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt" >>>>>>> +do_install_append_bcm43430-nvram-mur1dx() { >>>>>>> + ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf brcmfmac43430-sdio.MUR1DX.txt brcmfmac43430-sdio.txt) >>>>>>> +} >>>>>>> +FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-ap6212 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt" >>>>>>> +do_install_append_bcm43430-nvram-ap6212() { >>>>>>> + ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf brcmfmac43430-sdio.AP6212.txt brcmfmac43430-sdio.txt) >>>>>>> +} >>>>>>> + >>>>>>> >>>>>>> PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ >>>>>>> ${PN}-mt7601u-license ${PN}-mt7601u \ >>>>>>> -- >>>>>>> 2.7.4 >>>>>>> >>>>> >>> > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core
On Wed, Aug 22, 2018 at 1:10 PM, Ryan Harkin <ryan.harkin@linaro.org> wrote: > On Wed, 22 Aug 2018, 20:02 Martin Jansa, <martin.jansa@gmail.com> wrote: >> >> Your 1st parameter is wrong, compare again with the example I gave you >> (don't include "brcm/" path in 1st param, because you want the symlink to >> point to just brcmfmac43430-sdio.AP6212.txt like you did in the version >> after cd). > > That doesn't work either. I tried it with the same result, but didn't send a > log of it. That works for you? Martin's example is correct so maybe check your tests again for typos. It it still doesn't work then please do send a log. The link will point to whatever you define via the first parameter, so if you changed the first parameter it shouldn't be possible to get "the same result". $ mkdir foo $ ln -sf test_target foo/test1 $ ln -sf brcm/test_target foo/test2 $ ls -l foo lrwxrwxrwx 1 andre andre 11 Aug 22 13:35 test1 -> test_target lrwxrwxrwx 1 andre andre 16 Aug 22 13:35 test2 -> brcm/test_target
On Wed, 22 Aug 2018, 21:36 Khem Raj, <raj.khem@gmail.com> wrote: > I wonder how it work with meta-raspverrypi now that it has its own > packing for firmware > Sorry Them, I don't understand your question. On Wed, Aug 22, 2018 at 1:10 PM Ryan Harkin <ryan.harkin@linaro.org> wrote: > > > > > > > > On Wed, 22 Aug 2018, 20:02 Martin Jansa, <martin.jansa@gmail.com> wrote: > >> > >> Your 1st parameter is wrong, compare again with the example I gave you > (don't include "brcm/" path in 1st param, because you want the symlink to > point to just brcmfmac43430-sdio.AP6212.txt like you did in the version > after cd). > > > > > > That doesn't work either. I tried it with the same result, but didn't > send a log of it. That works for you? > > > > > >> On Wed, Aug 22, 2018 at 7:11 PM Ryan Harkin <ryan.harkin@linaro.org> > wrote: > >>> > >>> This is curious! > >>> > >>> On 22 August 2018 at 17:56, Martin Jansa <martin.jansa@gmail.com> > wrote: > >>>> > >>>> cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf > brcmfmac43430-sdio.AP6212.txt brcmfmac43430-sdio.txt > >>>> > >>>> is the same as > >>>> > >>>> ln -sf brcmfmac43430-sdio.AP6212.txt > ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt > >>> > >>> > >>> On my system, this is what happens when I'm in the root of the > linux-firmware repo: > >>> > >>> $ ls -al brcm/*.txt > >>> -rw-rw-r-- 1 ryan ryan 875 Aug 22 18:08 > brcm/brcmfmac43430-sdio.AP6212.txt > >>> -rw-rw-r-- 1 ryan ryan 831 Aug 21 14:48 > brcm/brcmfmac43430-sdio.MUR1DX.txt > >>> > >>> $ ln -sf brcm/brcmfmac43430-sdio.AP6212.txt brcm/brcmfmac43430-sdio.txt > >>> > >>> $ ls -al brcm/*.txt > >>> -rw-rw-r-- 1 ryan ryan 875 Aug 22 18:08 > brcm/brcmfmac43430-sdio.AP6212.txt > >>> -rw-rw-r-- 1 ryan ryan 831 Aug 21 14:48 > brcm/brcmfmac43430-sdio.MUR1DX.txt > >>> lrwxrwxrwx 1 ryan ryan 34 Aug 22 18:08 brcm/brcmfmac43430-sdio.txt -> > brcm/brcmfmac43430-sdio.AP6212.txt > >>> > >>> And the file is not valid. > >>> > >>> $ cat brcm/brcmfmac43430-sdio.txt > >>> cat: brcm/brcmfmac43430-sdio.txt: No such file or directory > >>> > >>> So perhaps I'm doing something wrong. I tried your suggestion > originally and it didn't work for me. Maybe I made a typo or something? > >>> > >>> > >>>> > >>>> On Wed, Aug 22, 2018 at 6:47 PM Ryan Harkin <ryan.harkin@linaro.org> > wrote: > >>>>> > >>>>> > >>>>> > >>>>> On 22 August 2018 at 17:41, Martin Jansa <martin.jansa@gmail.com> > wrote: > >>>>>> > >>>>>> The "cd ${D}${nonarch_base_libdir}/firmware/brcm/" doesn't seem to > be needed, just include the path in 2nd ln parameter. > >>>>> > >>>>> > >>>>> I don't think that works, or at least, it doesn't work for me, so I > may be doing something wrong. I'm also copying the example used in the > do_install() a few lines up as I figured that would be the preferred style > for this recipe. > >>>>> > >>>>>> > >>>>>> On Wed, Aug 22, 2018 at 6:30 PM Ryan Harkin <ryan.harkin@linaro.org> > wrote: > >>>>>>> > >>>>>>> The Linux kernel currently expects a single NVRAM file for BCM43430 > >>>>>>> named brcmfmac43430-sdio.txt. > >>>>>>> > >>>>>>> Allow the machine to specify an override to link its module > specific > >>>>>>> NVRAM to the filename expected by the kernel. > >>>>>>> > >>>>>>> Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org> > >>>>>>> --- > >>>>>>> meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 12 > ++++++++++++ > >>>>>>> 1 file changed, 12 insertions(+) > >>>>>>> > >>>>>>> diff --git a/meta/recipes-kernel/linux-firmware/ > linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/ > linux-firmware_git.bb > >>>>>>> index 8c54f28..b647abc 100644 > >>>>>>> --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb > >>>>>>> +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb > >>>>>>> @@ -226,6 +226,18 @@ do_install() { > >>>>>>> ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf > ti-connectivity/* . ) > >>>>>>> } > >>>>>>> > >>>>>>> +# Adding bcm43430-nvram-{module type} to MACHINEOVERRIDES will > create a > >>>>>>> +# softlink for the module specific NVRAM file to the filename > expected > >>>>>>> +# by the Linux kernel > >>>>>>> +FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-mur1dx = " > ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt" > >>>>>>> +do_install_append_bcm43430-nvram-mur1dx() { > >>>>>>> + ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf > brcmfmac43430-sdio.MUR1DX.txt brcmfmac43430-sdio.txt) > >>>>>>> +} > >>>>>>> +FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-ap6212 = > "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt" > >>>>>>> +do_install_append_bcm43430-nvram-ap6212() { > >>>>>>> + ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf > brcmfmac43430-sdio.AP6212.txt brcmfmac43430-sdio.txt) > >>>>>>> +} > >>>>>>> + > >>>>>>> > >>>>>>> PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ > >>>>>>> ${PN}-mt7601u-license ${PN}-mt7601u \ > >>>>>>> -- > >>>>>>> 2.7.4 > >>>>>>> > >>>>> > >>> > > -- > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > <div dir="auto"><div><br><br><div class="gmail_quote"><div dir="ltr">On Wed, 22 Aug 2018, 21:36 Khem Raj, <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">I wonder how it work with meta-raspverrypi now that it has its own<br> packing for firmware<br></blockquote></div></div><div dir="auto"><br></div><div dir="auto">Sorry Them, I don't understand your question.</div><div dir="auto"><br></div><div dir="auto"><br></div><div dir="auto"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> On Wed, Aug 22, 2018 at 1:10 PM Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org" target="_blank" rel="noreferrer">ryan.harkin@linaro.org</a>> wrote:<br> ><br> ><br> ><br> > On Wed, 22 Aug 2018, 20:02 Martin Jansa, <<a href="mailto:martin.jansa@gmail.com" target="_blank" rel="noreferrer">martin.jansa@gmail.com</a>> wrote:<br> >><br> >> Your 1st parameter is wrong, compare again with the example I gave you (don't include "brcm/" path in 1st param, because you want the symlink to point to just brcmfmac43430-sdio.AP6212.txt like you did in the version after cd).<br> ><br> ><br> > That doesn't work either. I tried it with the same result, but didn't send a log of it. That works for you?<br> ><br> ><br> >> On Wed, Aug 22, 2018 at 7:11 PM Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org" target="_blank" rel="noreferrer">ryan.harkin@linaro.org</a>> wrote:<br> >>><br> >>> This is curious!<br> >>><br> >>> On 22 August 2018 at 17:56, Martin Jansa <<a href="mailto:martin.jansa@gmail.com" target="_blank" rel="noreferrer">martin.jansa@gmail.com</a>> wrote:<br> >>>><br> >>>> cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf brcmfmac43430-sdio.AP6212.txt brcmfmac43430-sdio.txt<br> >>>><br> >>>> is the same as<br> >>>><br> >>>> ln -sf brcmfmac43430-sdio.AP6212.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt<br> >>><br> >>><br> >>> On my system, this is what happens when I'm in the root of the linux-firmware repo:<br> >>><br> >>> $ ls -al brcm/*.txt<br> >>> -rw-rw-r-- 1 ryan ryan 875 Aug 22 18:08 brcm/brcmfmac43430-sdio.AP6212.txt<br> >>> -rw-rw-r-- 1 ryan ryan 831 Aug 21 14:48 brcm/brcmfmac43430-sdio.MUR1DX.txt<br> >>><br> >>> $ ln -sf brcm/brcmfmac43430-sdio.AP6212.txt brcm/brcmfmac43430-sdio.txt<br> >>><br> >>> $ ls -al brcm/*.txt<br> >>> -rw-rw-r-- 1 ryan ryan 875 Aug 22 18:08 brcm/brcmfmac43430-sdio.AP6212.txt<br> >>> -rw-rw-r-- 1 ryan ryan 831 Aug 21 14:48 brcm/brcmfmac43430-sdio.MUR1DX.txt<br> >>> lrwxrwxrwx 1 ryan ryan 34 Aug 22 18:08 brcm/brcmfmac43430-sdio.txt -> brcm/brcmfmac43430-sdio.AP6212.txt<br> >>><br> >>> And the file is not valid.<br> >>><br> >>> $ cat brcm/brcmfmac43430-sdio.txt<br> >>> cat: brcm/brcmfmac43430-sdio.txt: No such file or directory<br> >>><br> >>> So perhaps I'm doing something wrong. I tried your suggestion originally and it didn't work for me. Maybe I made a typo or something?<br> >>><br> >>><br> >>>><br> >>>> On Wed, Aug 22, 2018 at 6:47 PM Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org" target="_blank" rel="noreferrer">ryan.harkin@linaro.org</a>> wrote:<br> >>>>><br> >>>>><br> >>>>><br> >>>>> On 22 August 2018 at 17:41, Martin Jansa <<a href="mailto:martin.jansa@gmail.com" target="_blank" rel="noreferrer">martin.jansa@gmail.com</a>> wrote:<br> >>>>>><br> >>>>>> The "cd ${D}${nonarch_base_libdir}/firmware/brcm/" doesn't seem to be needed, just include the path in 2nd ln parameter.<br> >>>>><br> >>>>><br> >>>>> I don't think that works, or at least, it doesn't work for me, so I may be doing something wrong. I'm also copying the example used in the do_install() a few lines up as I figured that would be the preferred style for this recipe.<br> >>>>><br> >>>>>><br> >>>>>> On Wed, Aug 22, 2018 at 6:30 PM Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org" target="_blank" rel="noreferrer">ryan.harkin@linaro.org</a>> wrote:<br> >>>>>>><br> >>>>>>> The Linux kernel currently expects a single NVRAM file for BCM43430<br> >>>>>>> named brcmfmac43430-sdio.txt.<br> >>>>>>><br> >>>>>>> Allow the machine to specify an override to link its module specific<br> >>>>>>> NVRAM to the filename expected by the kernel.<br> >>>>>>><br> >>>>>>> Signed-off-by: Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org" target="_blank" rel="noreferrer">ryan.harkin@linaro.org</a>><br> >>>>>>> ---<br> >>>>>>> meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer noreferrer" target="_blank">linux-firmware_git.bb</a> | 12 ++++++++++++<br> >>>>>>> 1 file changed, 12 insertions(+)<br> >>>>>>><br> >>>>>>> diff --git a/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer noreferrer" target="_blank">linux-firmware_git.bb</a> b/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer noreferrer" target="_blank">linux-firmware_git.bb</a><br> >>>>>>> index 8c54f28..b647abc 100644<br> >>>>>>> --- a/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer noreferrer" target="_blank">linux-firmware_git.bb</a><br> >>>>>>> +++ b/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb" rel="noreferrer noreferrer" target="_blank">linux-firmware_git.bb</a><br> >>>>>>> @@ -226,6 +226,18 @@ do_install() {<br> >>>>>>> ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf ti-connectivity/* . )<br> >>>>>>> }<br> >>>>>>><br> >>>>>>> +# Adding bcm43430-nvram-{module type} to MACHINEOVERRIDES will create a<br> >>>>>>> +# softlink for the module specific NVRAM file to the filename expected<br> >>>>>>> +# by the Linux kernel<br> >>>>>>> +FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-mur1dx = " ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt"<br> >>>>>>> +do_install_append_bcm43430-nvram-mur1dx() {<br> >>>>>>> + ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf brcmfmac43430-sdio.MUR1DX.txt brcmfmac43430-sdio.txt)<br> >>>>>>> +}<br> >>>>>>> +FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-ap6212 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt"<br> >>>>>>> +do_install_append_bcm43430-nvram-ap6212() {<br> >>>>>>> + ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf brcmfmac43430-sdio.AP6212.txt brcmfmac43430-sdio.txt)<br> >>>>>>> +}<br> >>>>>>> +<br> >>>>>>><br> >>>>>>> PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \<br> >>>>>>> ${PN}-mt7601u-license ${PN}-mt7601u \<br> >>>>>>> --<br> >>>>>>> 2.7.4<br> >>>>>>><br> >>>>><br> >>><br> > --<br> > _______________________________________________<br> > Openembedded-core mailing list<br> > <a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank" rel="noreferrer">Openembedded-core@lists.openembedded.org</a><br> > <a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br> </blockquote></div></div></div>
On Wed, 22 Aug 2018, 21:42 Andre McCurdy, <armccurdy@gmail.com> wrote: > On Wed, Aug 22, 2018 at 1:10 PM, Ryan Harkin <ryan.harkin@linaro.org> > wrote: > > On Wed, 22 Aug 2018, 20:02 Martin Jansa, <martin.jansa@gmail.com> wrote: > >> > >> Your 1st parameter is wrong, compare again with the example I gave you > >> (don't include "brcm/" path in 1st param, because you want the symlink > to > >> point to just brcmfmac43430-sdio.AP6212.txt like you did in the version > >> after cd). > > > > That doesn't work either. I tried it with the same result, but didn't > send a > > log of it. That works for you? > > Martin's example is correct so maybe check your tests again for typos. > It it still doesn't work then please do send a log. > > The link will point to whatever you define via the first parameter, so > if you changed the first parameter it shouldn't be possible to get > "the same result". > > $ mkdir foo > $ ln -sf test_target foo/test1 > $ ln -sf brcm/test_target foo/test2 > $ ls -l foo > > lrwxrwxrwx 1 andre andre 11 Aug 22 13:35 test1 -> test_target > lrwxrwxrwx 1 andre andre 16 Aug 22 13:35 test2 -> brcm/test_target > Yes, that's essentially the same as what I'm getting. Now try "cat foo/test1" and what happens? There is no file called test_target in the foo directory. And neither is there a file called brcm/test_target in the foo directory. > <div dir="auto"><div><br><br><div class="gmail_quote"><div dir="ltr">On Wed, 22 Aug 2018, 21:42 Andre McCurdy, <<a href="mailto:armccurdy@gmail.com">armccurdy@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On Wed, Aug 22, 2018 at 1:10 PM, Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org" target="_blank" rel="noreferrer">ryan.harkin@linaro.org</a>> wrote:<br> > On Wed, 22 Aug 2018, 20:02 Martin Jansa, <<a href="mailto:martin.jansa@gmail.com" target="_blank" rel="noreferrer">martin.jansa@gmail.com</a>> wrote:<br> >><br> >> Your 1st parameter is wrong, compare again with the example I gave you<br> >> (don't include "brcm/" path in 1st param, because you want the symlink to<br> >> point to just brcmfmac43430-sdio.AP6212.txt like you did in the version<br> >> after cd).<br> ><br> > That doesn't work either. I tried it with the same result, but didn't send a<br> > log of it. That works for you?<br> <br> Martin's example is correct so maybe check your tests again for typos.<br> It it still doesn't work then please do send a log.<br> <br> The link will point to whatever you define via the first parameter, so<br> if you changed the first parameter it shouldn't be possible to get<br> "the same result".<br> <br> $ mkdir foo<br> $ ln -sf test_target foo/test1<br> $ ln -sf brcm/test_target foo/test2<br> $ ls -l foo<br> <br> lrwxrwxrwx 1 andre andre 11 Aug 22 13:35 test1 -> test_target<br> lrwxrwxrwx 1 andre andre 16 Aug 22 13:35 test2 -> brcm/test_target<br></blockquote></div></div><div dir="auto"><br></div><div dir="auto">Yes, that's essentially the same as what I'm getting.</div><div dir="auto"><br></div><div dir="auto">Now try "cat foo/test1" and what happens? </div><div dir="auto"><br></div><div dir="auto">There is no file called test_target in the foo directory. And neither is there a file called brcm/test_target in the foo directory.</div><div dir="auto"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> </blockquote></div></div></div>
On Wed, Aug 22, 2018 at 2:56 PM, Ryan Harkin <ryan.harkin@linaro.org> wrote: > On Wed, 22 Aug 2018, 21:42 Andre McCurdy, <armccurdy@gmail.com> wrote: >> On Wed, Aug 22, 2018 at 1:10 PM, Ryan Harkin <ryan.harkin@linaro.org> >> wrote: >> > On Wed, 22 Aug 2018, 20:02 Martin Jansa, <martin.jansa@gmail.com> wrote: >> >> >> >> Your 1st parameter is wrong, compare again with the example I gave you >> >> (don't include "brcm/" path in 1st param, because you want the symlink >> >> to >> >> point to just brcmfmac43430-sdio.AP6212.txt like you did in the version >> >> after cd). >> > >> > That doesn't work either. I tried it with the same result, but didn't >> > send a >> > log of it. That works for you? >> >> Martin's example is correct so maybe check your tests again for typos. >> It it still doesn't work then please do send a log. >> >> The link will point to whatever you define via the first parameter, so >> if you changed the first parameter it shouldn't be possible to get >> "the same result". >> >> $ mkdir foo >> $ ln -sf test_target foo/test1 >> $ ln -sf brcm/test_target foo/test2 >> $ ls -l foo >> >> lrwxrwxrwx 1 andre andre 11 Aug 22 13:35 test1 -> test_target >> lrwxrwxrwx 1 andre andre 16 Aug 22 13:35 test2 -> brcm/test_target > > Yes, that's essentially the same as what I'm getting. > > Now try "cat foo/test1" and what happens? > > There is no file called test_target in the foo directory. And neither is > there a file called brcm/test_target in the foo directory. Correct. The above was just an example to show that you can * create symlinks * in the foo directory without cd'ing into the foo directory first. If you'd like the symlinks in the example to point to valid targets then you need to create the targets too, e.g. $ mkdir -p foo/brcm $ echo hello > foo/test_target $ echo hello2 > foo/brcm/test_target But note that the process of creating a symlink is always the same, regardless of whether the symlink points to a valid target or not (so you can run these extra commands to create the targets before or after you create the symlinks).
On 22 August 2018 at 23:55, Andre McCurdy <armccurdy@gmail.com> wrote: > On Wed, Aug 22, 2018 at 2:56 PM, Ryan Harkin <ryan.harkin@linaro.org> > wrote: > > On Wed, 22 Aug 2018, 21:42 Andre McCurdy, <armccurdy@gmail.com> wrote: > >> On Wed, Aug 22, 2018 at 1:10 PM, Ryan Harkin <ryan.harkin@linaro.org> > >> wrote: > >> > On Wed, 22 Aug 2018, 20:02 Martin Jansa, <martin.jansa@gmail.com> > wrote: > >> >> > >> >> Your 1st parameter is wrong, compare again with the example I gave > you > >> >> (don't include "brcm/" path in 1st param, because you want the > symlink > >> >> to > >> >> point to just brcmfmac43430-sdio.AP6212.txt like you did in the > version > >> >> after cd). > >> > > >> > That doesn't work either. I tried it with the same result, but didn't > >> > send a > >> > log of it. That works for you? > >> > >> Martin's example is correct so maybe check your tests again for typos. > >> It it still doesn't work then please do send a log. > >> > >> The link will point to whatever you define via the first parameter, so > >> if you changed the first parameter it shouldn't be possible to get > >> "the same result". > >> > >> $ mkdir foo > >> $ ln -sf test_target foo/test1 > >> $ ln -sf brcm/test_target foo/test2 > >> $ ls -l foo > >> > >> lrwxrwxrwx 1 andre andre 11 Aug 22 13:35 test1 -> test_target > >> lrwxrwxrwx 1 andre andre 16 Aug 22 13:35 test2 -> brcm/test_target > > > > Yes, that's essentially the same as what I'm getting. > > > > Now try "cat foo/test1" and what happens? > > > > There is no file called test_target in the foo directory. And neither is > > there a file called brcm/test_target in the foo directory. > > Correct. The above was just an example to show that you can * create > symlinks * in the foo directory without cd'ing into the foo directory > first. > > If you'd like the symlinks in the example to point to valid targets > then you need to create the targets too, e.g. > > $ mkdir -p foo/brcm > $ echo hello > foo/test_target > $ echo hello2 > foo/brcm/test_target > > But note that the process of creating a symlink is always the same, > regardless of whether the symlink points to a valid target or not (so > you can run these extra commands to create the targets before or after > you create the symlinks). > So that doesn't work for me how I expect it to work. I must be missing something fundamental here. The recipe is trying to create a soft link from a file in the current directory to a file in the sub-directory. On my system, your example creates links from a file in the sub-directory to the another file in the sub-directory. So, to copy your example, but creating the file "test_target" from the start: $ mkdir -p /tmp/test $ cd /tmp/test $ mkdir foo $ echo 1 > test_target $ ln -sf test_target foo/test1 $ ln -sf brcm/test_target foo/test2 $ ls -l foo total 0 lrwxrwxrwx 1 ryan ryan 11 Aug 23 06:54 test1 -> test_target lrwxrwxrwx 1 ryan ryan 16 Aug 23 06:54 test2 -> brcm/test_target $ cat test_target 1 $ cat foo/test1 cat: foo/test1: No such file or directory $ cat foo/test2 cat: foo/test2: No such file or directory $ echo hello > foo/test_target $ echo hello2 > foo/brcm/test_target bash: foo/brcm/test_target: No such file or directory $ cat foo/test1 hello $ cat foo/test2 cat: foo/test2: No such file or directory $ cat test_target 1 $ tree . ├── foo │ ├── test1 -> test_target │ ├── test2 -> brcm/test_target │ └── test_target └── test_target 1 directory, 4 files So, neither test1 nor test2 are linked to /tmp/test/test_target. test1 is linked to /tmp/test/foo/test_target and test2 is linked to /tmp/test/brcm/test_target, which doesn't exist. AFAIK, when creating a softlink, you have to give it either an absolute path, or a path relative to the link being created. The path cannot be relative to the original file that you want to link to. So, this will work: $cd /tmp/test $ ln -sf ../test_target foo/test3 $ cat foo/test3 1 $ cat /tmp/test/foo/test3 1 But that is a strange way to create the soft link, IMO. AFAICT, for the recipe, to get rid of the "cd", I'd have to specify an absolute path to the original file: +do_install_append_bcm43430-nvram-mur1dx() { + ( ln -sf ${PWD}/brcmfmac43430-sdio.MUR1DX.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt) ... assuming PWD is available to the recipe. There will be a proper Yocto variable I can use, of course, but I can't think of it right now. Either way, Martin's example doesn't work for me. And adding the absolute path of the original file doesn't seem any neater or clearer than following the TI example from the do_install a few lines up in the recipe. But I'm happy to do it either way, so long as it works. <div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On 22 August 2018 at 23:55, Andre McCurdy <span dir="ltr"><<a href="mailto:armccurdy@gmail.com" target="_blank">armccurdy@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div class="gmail-HOEnZb"><div class="gmail-h5">On Wed, Aug 22, 2018 at 2:56 PM, Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org">ryan.harkin@linaro.org</a>> wrote:<br> > On Wed, 22 Aug 2018, 21:42 Andre McCurdy, <<a href="mailto:armccurdy@gmail.com">armccurdy@gmail.com</a>> wrote:<br> >> On Wed, Aug 22, 2018 at 1:10 PM, Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org">ryan.harkin@linaro.org</a>><br> >> wrote:<br> >> > On Wed, 22 Aug 2018, 20:02 Martin Jansa, <<a href="mailto:martin.jansa@gmail.com">martin.jansa@gmail.com</a>> wrote:<br> >> >><br> >> >> Your 1st parameter is wrong, compare again with the example I gave you<br> >> >> (don't include "brcm/" path in 1st param, because you want the symlink<br> >> >> to<br> >> >> point to just brcmfmac43430-sdio.AP6212.txt like you did in the version<br> >> >> after cd).<br> >> ><br> >> > That doesn't work either. I tried it with the same result, but didn't<br> >> > send a<br> >> > log of it. That works for you?<br> >><br> >> Martin's example is correct so maybe check your tests again for typos.<br> >> It it still doesn't work then please do send a log.<br> >><br> >> The link will point to whatever you define via the first parameter, so<br> >> if you changed the first parameter it shouldn't be possible to get<br> >> "the same result".<br> >><br> >> $ mkdir foo<br> >> $ ln -sf test_target foo/test1<br> >> $ ln -sf brcm/test_target foo/test2<br> >> $ ls -l foo<br> >><br> >> lrwxrwxrwx 1 andre andre 11 Aug 22 13:35 test1 -> test_target<br> >> lrwxrwxrwx 1 andre andre 16 Aug 22 13:35 test2 -> brcm/test_target<br> ><br> > Yes, that's essentially the same as what I'm getting.<br> ><br> > Now try "cat foo/test1" and what happens?<br> ><br> > There is no file called test_target in the foo directory. And neither is<br> > there a file called brcm/test_target in the foo directory.<br> <br> </div></div>Correct. The above was just an example to show that you can * create<br> symlinks * in the foo directory without cd'ing into the foo directory<br> first.<br> <br> If you'd like the symlinks in the example to point to valid targets<br> then you need to create the targets too, e.g.<br> <br> $ mkdir -p foo/brcm<br> $ echo hello > foo/test_target<br> $ echo hello2 > foo/brcm/test_target<br> <br> But note that the process of creating a symlink is always the same,<br> regardless of whether the symlink points to a valid target or not (so<br> you can run these extra commands to create the targets before or after<br> you create the symlinks).<br></blockquote><div><br></div><div>So that doesn't work for me how I expect it to work. I must be missing something fundamental here.</div></div><br></div><div class="gmail_extra">The recipe is trying to create a soft link from a file in the current directory to a file in the sub-directory. On my system, your example creates links from a file in the sub-directory to the another file in the sub-directory.</div><div class="gmail_extra"><br></div><div class="gmail_extra">So, to copy your example, but creating the file "test_target" from the start:</div><div class="gmail_extra"><br></div><div class="gmail_extra"><div class="gmail_extra">$ mkdir -p /tmp/test</div><div class="gmail_extra">$ cd /tmp/test<br></div><div class="gmail_extra">$ mkdir foo<br></div><div class="gmail_extra">$ echo 1 > test_target<br></div><div class="gmail_extra">$ ln -sf test_target foo/test1<br></div><div class="gmail_extra">$ ln -sf brcm/test_target foo/test2<br></div><div class="gmail_extra">$ ls -l foo<br></div><div class="gmail_extra">total 0</div><div class="gmail_extra">lrwxrwxrwx 1 ryan ryan 11 Aug 23 06:54 test1 -> test_target</div><div class="gmail_extra">lrwxrwxrwx 1 ryan ryan 16 Aug 23 06:54 test2 -> brcm/test_target</div><div class="gmail_extra">$ cat test_target<br></div><div class="gmail_extra">1</div><div class="gmail_extra">$ cat foo/test1<br></div><div class="gmail_extra">cat: foo/test1: No such file or directory</div><div class="gmail_extra">$ cat foo/test2<br></div><div class="gmail_extra">cat: foo/test2: No such file or directory</div><div class="gmail_extra">$ echo hello > foo/test_target<br></div><div class="gmail_extra">$ echo hello2 > foo/brcm/test_target<br></div><div class="gmail_extra">bash: foo/brcm/test_target: No such file or directory</div><div class="gmail_extra">$ cat foo/test1<br></div><div class="gmail_extra">hello</div><div class="gmail_extra">$ cat foo/test2<br></div><div class="gmail_extra">cat: foo/test2: No such file or directory</div><div class="gmail_extra">$ cat test_target<br></div><div class="gmail_extra">1</div><div><div>$ tree</div><div>.</div><div>├── foo</div><div>│ ├── test1 -> test_target</div><div>│ ├── test2 -> brcm/test_target</div><div>│ └── test_target</div><div>└── test_target</div><div><br></div><div>1 directory, 4 files</div></div><div><br></div><div>So, neither test1 nor test2 are linked to /tmp/test/test_target. test1 is linked to /tmp/test/foo/test_target and test2 is linked to /tmp/test/brcm/test_target, which doesn't exist.</div><div><br></div><div>AFAIK, when creating a softlink, you have to give it either an absolute path, or a path relative to the link being created. The path cannot be relative to the original file that you want to link to.</div><div><br></div><div>So, this will work:</div><div><br></div><div>$cd /tmp/test</div><div><div>$ ln -sf ../test_target foo/test3</div><div>$ cat foo/test3<br></div><div>1</div></div><div><div>$ cat /tmp/test/foo/test3</div><div>1</div></div><div><br></div><div>But that is a strange way to create the soft link, IMO.</div><div><br></div><div>AFAICT, for the recipe, to get rid of the "cd", I'd have to specify an absolute path to the original file:</div><div><br></div><div><div>+do_install_append_bcm43430-nvram-mur1dx() {</div><div>+ ( ln -sf ${PWD}/brcmfmac43430-sdio.MUR1DX.txt <span style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">${D}${nonarch_base_libdir}/firmware/brcm/</span>brcmfmac43430-sdio.txt)</div></div><div><br></div><div>... assuming PWD is available to the recipe. There will be a proper Yocto variable I can use, of course, but I can't think of it right now.</div><div><br></div><div>Either way, Martin's example doesn't work for me. And adding the absolute path of the original file doesn't seem any neater or clearer than following the TI example from the do_install a few lines up in the recipe. But I'm happy to do it either way, so long as it works.</div></div></div>
May I suggest using the '-r, --relative' flag from 'ln':
-r, --relative
create symbolic links relative to link location
My life felt considerably better after discovering that feature :)
// Martin
On 23/08/2018 08.12, Ryan Harkin wrote:
>
>
> On 22 August 2018 at 23:55, Andre McCurdy <armccurdy@gmail.com
> <mailto:armccurdy@gmail.com>> wrote:
>
> On Wed, Aug 22, 2018 at 2:56 PM, Ryan Harkin <ryan.harkin@linaro.org
> <mailto:ryan.harkin@linaro.org>> wrote:
> > On Wed, 22 Aug 2018, 21:42 Andre McCurdy, <armccurdy@gmail.com
> <mailto:armccurdy@gmail.com>> wrote:
> >> On Wed, Aug 22, 2018 at 1:10 PM, Ryan Harkin
> <ryan.harkin@linaro.org <mailto:ryan.harkin@linaro.org>>
> >> wrote:
> >> > On Wed, 22 Aug 2018, 20:02 Martin Jansa,
> <martin.jansa@gmail.com <mailto:martin.jansa@gmail.com>> wrote:
> >> >>
> >> >> Your 1st parameter is wrong, compare again with the example I
> gave you
> >> >> (don't include "brcm/" path in 1st param, because you want
> the symlink
> >> >> to
> >> >> point to just brcmfmac43430-sdio.AP6212.txt like you did in
> the version
> >> >> after cd).
> >> >
> >> > That doesn't work either. I tried it with the same result, but
> didn't
> >> > send a
> >> > log of it. That works for you?
> >>
> >> Martin's example is correct so maybe check your tests again for
> typos.
> >> It it still doesn't work then please do send a log.
> >>
> >> The link will point to whatever you define via the first
> parameter, so
> >> if you changed the first parameter it shouldn't be possible to get
> >> "the same result".
> >>
> >> $ mkdir foo
> >> $ ln -sf test_target foo/test1
> >> $ ln -sf brcm/test_target foo/test2
> >> $ ls -l foo
> >>
> >> lrwxrwxrwx 1 andre andre 11 Aug 22 13:35 test1 -> test_target
> >> lrwxrwxrwx 1 andre andre 16 Aug 22 13:35 test2 -> brcm/test_target
> >
> > Yes, that's essentially the same as what I'm getting.
> >
> > Now try "cat foo/test1" and what happens?
> >
> > There is no file called test_target in the foo directory. And
> neither is
> > there a file called brcm/test_target in the foo directory.
>
> Correct. The above was just an example to show that you can * create
> symlinks * in the foo directory without cd'ing into the foo directory
> first.
>
> If you'd like the symlinks in the example to point to valid targets
> then you need to create the targets too, e.g.
>
> $ mkdir -p foo/brcm
> $ echo hello > foo/test_target
> $ echo hello2 > foo/brcm/test_target
>
> But note that the process of creating a symlink is always the same,
> regardless of whether the symlink points to a valid target or not (so
> you can run these extra commands to create the targets before or after
> you create the symlinks).
>
>
> So that doesn't work for me how I expect it to work. I must be missing
> something fundamental here.
>
> The recipe is trying to create a soft link from a file in the current
> directory to a file in the sub-directory. On my system, your example
> creates links from a file in the sub-directory to the another file in
> the sub-directory.
>
> So, to copy your example, but creating the file "test_target" from the
> start:
>
> $ mkdir -p /tmp/test
> $ cd /tmp/test
> $ mkdir foo
> $ echo 1 > test_target
> $ ln -sf test_target foo/test1
> $ ln -sf brcm/test_target foo/test2
> $ ls -l foo
> total 0
> lrwxrwxrwx 1 ryan ryan 11 Aug 23 06:54 test1 -> test_target
> lrwxrwxrwx 1 ryan ryan 16 Aug 23 06:54 test2 -> brcm/test_target
> $ cat test_target
> 1
> $ cat foo/test1
> cat: foo/test1: No such file or directory
> $ cat foo/test2
> cat: foo/test2: No such file or directory
> $ echo hello > foo/test_target
> $ echo hello2 > foo/brcm/test_target
> bash: foo/brcm/test_target: No such file or directory
> $ cat foo/test1
> hello
> $ cat foo/test2
> cat: foo/test2: No such file or directory
> $ cat test_target
> 1
> $ tree
> .
> ├── foo
> │ ├── test1 -> test_target
> │ ├── test2 -> brcm/test_target
> │ └── test_target
> └── test_target
>
> 1 directory, 4 files
>
> So, neither test1 nor test2 are linked to /tmp/test/test_target. test1
> is linked to /tmp/test/foo/test_target and test2 is linked to
> /tmp/test/brcm/test_target, which doesn't exist.
>
> AFAIK, when creating a softlink, you have to give it either an absolute
> path, or a path relative to the link being created. The path cannot be
> relative to the original file that you want to link to.
>
> So, this will work:
>
> $cd /tmp/test
> $ ln -sf ../test_target foo/test3
> $ cat foo/test3
> 1
> $ cat /tmp/test/foo/test3
> 1
>
> But that is a strange way to create the soft link, IMO.
>
> AFAICT, for the recipe, to get rid of the "cd", I'd have to specify an
> absolute path to the original file:
>
> +do_install_append_bcm43430-nvram-mur1dx() {
> + ( ln -sf ${PWD}/brcmfmac43430-sdio.MUR1DX.txt
> ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt)
>
> ... assuming PWD is available to the recipe. There will be a proper
> Yocto variable I can use, of course, but I can't think of it right now.
>
> Either way, Martin's example doesn't work for me. And adding the
> absolute path of the original file doesn't seem any neater or clearer
> than following the TI example from the do_install a few lines up in the
> recipe. But I'm happy to do it either way, so long as it works.
>
--
Kind regards,
Martin Hundebøll
Embedded Linux Consultant
+45 61 65 54 61
martin@geanix.com
Geanix IVS
https://geanix.com
DK39600706
On Wed, Aug 22, 2018 at 11:12 PM, Ryan Harkin <ryan.harkin@linaro.org> wrote: > On 22 August 2018 at 23:55, Andre McCurdy <armccurdy@gmail.com> wrote: >> On Wed, Aug 22, 2018 at 2:56 PM, Ryan Harkin <ryan.harkin@linaro.org> >> wrote: >> > On Wed, 22 Aug 2018, 21:42 Andre McCurdy, <armccurdy@gmail.com> wrote: >> >> On Wed, Aug 22, 2018 at 1:10 PM, Ryan Harkin <ryan.harkin@linaro.org> >> >> wrote: >> >> > On Wed, 22 Aug 2018, 20:02 Martin Jansa, <martin.jansa@gmail.com> >> >> > wrote: >> >> >> >> >> >> Your 1st parameter is wrong, compare again with the example I gave >> >> >> you >> >> >> (don't include "brcm/" path in 1st param, because you want the >> >> >> symlink >> >> >> to >> >> >> point to just brcmfmac43430-sdio.AP6212.txt like you did in the >> >> >> version >> >> >> after cd). >> >> > >> >> > That doesn't work either. I tried it with the same result, but didn't >> >> > send a >> >> > log of it. That works for you? >> >> >> >> Martin's example is correct so maybe check your tests again for typos. >> >> It it still doesn't work then please do send a log. >> >> >> >> The link will point to whatever you define via the first parameter, so >> >> if you changed the first parameter it shouldn't be possible to get >> >> "the same result". >> >> >> >> $ mkdir foo >> >> $ ln -sf test_target foo/test1 >> >> $ ln -sf brcm/test_target foo/test2 >> >> $ ls -l foo >> >> >> >> lrwxrwxrwx 1 andre andre 11 Aug 22 13:35 test1 -> test_target >> >> lrwxrwxrwx 1 andre andre 16 Aug 22 13:35 test2 -> brcm/test_target >> > >> > Yes, that's essentially the same as what I'm getting. >> > >> > Now try "cat foo/test1" and what happens? >> > >> > There is no file called test_target in the foo directory. And neither is >> > there a file called brcm/test_target in the foo directory. >> >> Correct. The above was just an example to show that you can * create >> symlinks * in the foo directory without cd'ing into the foo directory >> first. >> >> If you'd like the symlinks in the example to point to valid targets >> then you need to create the targets too, e.g. >> >> $ mkdir -p foo/brcm >> $ echo hello > foo/test_target >> $ echo hello2 > foo/brcm/test_target >> >> But note that the process of creating a symlink is always the same, >> regardless of whether the symlink points to a valid target or not (so >> you can run these extra commands to create the targets before or after >> you create the symlinks). > > So that doesn't work for me how I expect it to work. I must be missing > something fundamental here. > > The recipe is trying to create a soft link from a file in the current > directory to a file in the sub-directory. On my system, your example creates > links from a file in the sub-directory to the another file in the > sub-directory. > > So, to copy your example, but creating the file "test_target" from the > start: > > $ mkdir -p /tmp/test > $ cd /tmp/test > $ mkdir foo > $ echo 1 > test_target Here you are creating "test_target" in the directory which contains foo, not inside foo. So a symlink inside foo pointing to "test_target" isn't going to work. > $ ln -sf test_target foo/test1 > $ ln -sf brcm/test_target foo/test2 > $ ls -l foo > total 0 > lrwxrwxrwx 1 ryan ryan 11 Aug 23 06:54 test1 -> test_target > lrwxrwxrwx 1 ryan ryan 16 Aug 23 06:54 test2 -> brcm/test_target > $ cat test_target > 1 > $ cat foo/test1 > cat: foo/test1: No such file or directory > $ cat foo/test2 > cat: foo/test2: No such file or directory All as expected given that none of the symlink targets exist yet. > $ echo hello > foo/test_target > $ echo hello2 > foo/brcm/test_target > bash: foo/brcm/test_target: No such file or directory You can't create a file within the foo/brcm subdirectory without creating that subdirectory first. You've somehow missed that step - although it was in my example. > $ cat foo/test1 > hello > $ cat foo/test2 > cat: foo/test2: No such file or directory > $ cat test_target > 1 > $ tree > . > ├── foo > │ ├── test1 -> test_target > │ ├── test2 -> brcm/test_target > │ └── test_target > └── test_target > > 1 directory, 4 files No real mysteries here. Everything looks as expected given the comments above about how you creating the target files. > So, neither test1 nor test2 are linked to /tmp/test/test_target. As expected. For a symlink which is in the foo subdirectory, the target would have to be "../test_target" to correctly point to your /tmp/test/test_target file. > test1 is > linked to /tmp/test/foo/test_target Not exactly. The test1 symlink in foo just points to "test_target", there's no absolute path. ie if you renamed the foo directory to something else then the test1 symlink would still point "test_target" and it would still be a valid link. > and test2 is linked to > /tmp/test/brcm/test_target, which doesn't exist. Again, test2 is a relative symlink, not absolute. The test2 symlink points to a target which doesn't exist due to a missing "mkdir -p foo/brcm" before you tried to create the target file. > AFAIK, when creating a softlink, you have to give it either an absolute > path, or a path relative to the link being created. The path cannot be > relative to the original file that you want to link to. The only real restriction when creating a symlink is that the directory which will contain the symlink must exist. If you want the symlink to point to something then it's up to you to arrange that the target exists and the symlink points to it correctly - but the symlink can still be created even if the target doesn't point to anything valid. > So, this will work: > > $cd /tmp/test > $ ln -sf ../test_target foo/test3 > $ cat foo/test3 > 1 > $ cat /tmp/test/foo/test3 > 1 > > But that is a strange way to create the soft link, IMO. What's strange about it? > AFAICT, for the recipe, to get rid of the "cd", I'd have to specify an > absolute path to the original file: > > +do_install_append_bcm43430-nvram-mur1dx() { > + ( ln -sf ${PWD}/brcmfmac43430-sdio.MUR1DX.txt > ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt) > > ... assuming PWD is available to the recipe. There will be a proper Yocto > variable I can use, of course, but I can't think of it right now. That definitely doesn't look right... > Either way, Martin's example doesn't work for me. And adding the absolute > path of the original file doesn't seem any neater or clearer than following > the TI example from the do_install a few lines up in the recipe. But I'm > happy to do it either way, so long as it works. Martin's example is basically saying (correctly) that this sequence: mkdir foo echo hello > foo/target cd foo ln -sf target link cd .. is equivalent to this one: mkdir foo echo hello > foo/target ln -sf target foo/link Notice that the first parameter to ln (the thing you want the symlink to point to) is the same in both cases. ie it isn't affected by which directory you are in when you create the symlink.
On 23 August 2018 at 07:39, Martin Hundebøll <martin@geanix.com> wrote: > May I suggest using the '-r, --relative' flag from 'ln': > > -r, --relative > create symbolic links relative to link location > > My life felt considerably better after discovering that feature :) > Thanks Martin Hundebøll! Yes, that works for me. So, Martin Jansa, I could make this change: - ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf brcmfmac43430-sdio.MUR1DX.txt brcmfmac43430-sdio.txt) + ( ln -sfr ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.MUR1DX.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt) Of course, if I'm not going to "cd" into the firmware repo, I'll have to use absolute paths on both sides of the "ln" command anyway. So I could drop the 'r' param and it should still work. Eg: - ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf brcmfmac43430-sdio.MUR1DX.txt brcmfmac43430-sdio.txt) + ( ln -sf ${D}${nonarch_base_libdir}/firmware/brcm/ brcmfmac43430-sdio.MUR1DX.txt ${D}${nonarch_base_libdir}/firmware/brcm/ brcmfmac43430-sdio.txt) I'm still not sure this is any neater, though, as it involves using the path twice. Is there a maintainer here who has a preference? FWIW, the TI line that I copied was added by Koen Kooi, who I've added to the CC: 8c7adb6 2011-10-09 linux-firmware: update, merge in OE classic updates, fix p.. [Koen Kooi] > // Martin > > On 23/08/2018 08.12, Ryan Harkin wrote: > >> >> >> On 22 August 2018 at 23:55, Andre McCurdy <armccurdy@gmail.com <mailto: >> armccurdy@gmail.com>> wrote: >> >> On Wed, Aug 22, 2018 at 2:56 PM, Ryan Harkin <ryan.harkin@linaro.org >> <mailto:ryan.harkin@linaro.org>> wrote: >> > On Wed, 22 Aug 2018, 21:42 Andre McCurdy, <armccurdy@gmail.com >> <mailto:armccurdy@gmail.com>> wrote: >> >> On Wed, Aug 22, 2018 at 1:10 PM, Ryan Harkin >> <ryan.harkin@linaro.org <mailto:ryan.harkin@linaro.org>> >> >> wrote: >> >> > On Wed, 22 Aug 2018, 20:02 Martin Jansa, >> <martin.jansa@gmail.com <mailto:martin.jansa@gmail.com>> wrote: >> >> >> >> >> >> Your 1st parameter is wrong, compare again with the example I >> gave you >> >> >> (don't include "brcm/" path in 1st param, because you want >> the symlink >> >> >> to >> >> >> point to just brcmfmac43430-sdio.AP6212.txt like you did in >> the version >> >> >> after cd). >> >> > >> >> > That doesn't work either. I tried it with the same result, but >> didn't >> >> > send a >> >> > log of it. That works for you? >> >> >> >> Martin's example is correct so maybe check your tests again for >> typos. >> >> It it still doesn't work then please do send a log. >> >> >> >> The link will point to whatever you define via the first >> parameter, so >> >> if you changed the first parameter it shouldn't be possible to get >> >> "the same result". >> >> >> >> $ mkdir foo >> >> $ ln -sf test_target foo/test1 >> >> $ ln -sf brcm/test_target foo/test2 >> >> $ ls -l foo >> >> >> >> lrwxrwxrwx 1 andre andre 11 Aug 22 13:35 test1 -> test_target >> >> lrwxrwxrwx 1 andre andre 16 Aug 22 13:35 test2 -> >> brcm/test_target >> > >> > Yes, that's essentially the same as what I'm getting. >> > >> > Now try "cat foo/test1" and what happens? >> > >> > There is no file called test_target in the foo directory. And >> neither is >> > there a file called brcm/test_target in the foo directory. >> >> Correct. The above was just an example to show that you can * create >> symlinks * in the foo directory without cd'ing into the foo directory >> first. >> >> If you'd like the symlinks in the example to point to valid targets >> then you need to create the targets too, e.g. >> >> $ mkdir -p foo/brcm >> $ echo hello > foo/test_target >> $ echo hello2 > foo/brcm/test_target >> >> But note that the process of creating a symlink is always the same, >> regardless of whether the symlink points to a valid target or not (so >> you can run these extra commands to create the targets before or after >> you create the symlinks). >> >> >> So that doesn't work for me how I expect it to work. I must be missing >> something fundamental here. >> >> The recipe is trying to create a soft link from a file in the current >> directory to a file in the sub-directory. On my system, your example >> creates links from a file in the sub-directory to the another file in the >> sub-directory. >> >> So, to copy your example, but creating the file "test_target" from the >> start: >> >> $ mkdir -p /tmp/test >> $ cd /tmp/test >> $ mkdir foo >> $ echo 1 > test_target >> $ ln -sf test_target foo/test1 >> $ ln -sf brcm/test_target foo/test2 >> $ ls -l foo >> total 0 >> lrwxrwxrwx 1 ryan ryan 11 Aug 23 06:54 test1 -> test_target >> lrwxrwxrwx 1 ryan ryan 16 Aug 23 06:54 test2 -> brcm/test_target >> $ cat test_target >> 1 >> $ cat foo/test1 >> cat: foo/test1: No such file or directory >> $ cat foo/test2 >> cat: foo/test2: No such file or directory >> $ echo hello > foo/test_target >> $ echo hello2 > foo/brcm/test_target >> bash: foo/brcm/test_target: No such file or directory >> $ cat foo/test1 >> hello >> $ cat foo/test2 >> cat: foo/test2: No such file or directory >> $ cat test_target >> 1 >> $ tree >> . >> ├── foo >> │ ├── test1 -> test_target >> │ ├── test2 -> brcm/test_target >> │ └── test_target >> └── test_target >> >> 1 directory, 4 files >> >> So, neither test1 nor test2 are linked to /tmp/test/test_target. test1 is >> linked to /tmp/test/foo/test_target and test2 is linked to >> /tmp/test/brcm/test_target, which doesn't exist. >> >> AFAIK, when creating a softlink, you have to give it either an absolute >> path, or a path relative to the link being created. The path cannot be >> relative to the original file that you want to link to. >> >> So, this will work: >> >> $cd /tmp/test >> $ ln -sf ../test_target foo/test3 >> $ cat foo/test3 >> 1 >> $ cat /tmp/test/foo/test3 >> 1 >> >> But that is a strange way to create the soft link, IMO. >> >> AFAICT, for the recipe, to get rid of the "cd", I'd have to specify an >> absolute path to the original file: >> >> +do_install_append_bcm43430-nvram-mur1dx() { >> + ( ln -sf ${PWD}/brcmfmac43430-sdio.MUR1DX.txt >> ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt) >> >> ... assuming PWD is available to the recipe. There will be a proper Yocto >> variable I can use, of course, but I can't think of it right now. >> >> Either way, Martin's example doesn't work for me. And adding the absolute >> path of the original file doesn't seem any neater or clearer than following >> the TI example from the do_install a few lines up in the recipe. But I'm >> happy to do it either way, so long as it works. >> >> > -- > Kind regards, > Martin Hundebøll > Embedded Linux Consultant > > +45 61 65 54 61 > martin@geanix.com > > Geanix IVS > https://geanix.com > DK39600706 > <div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On 23 August 2018 at 07:39, Martin Hundebøll <span dir="ltr"><<a href="mailto:martin@geanix.com" target="_blank">martin@geanix.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">May I suggest using the '-r, --relative' flag from 'ln':<br> <br> -r, --relative<br> create symbolic links relative to link location<br> <br> My life felt considerably better after discovering that feature :)<br></blockquote><div><br></div><div>Thanks Martin <span style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">Hundebøll</span>! Yes, that works for me.</div><div><br></div><div>So, Martin Jansa, I could make this change:</div><div><br></div><div><span style="color:rgb(80,0,80);font-size:11.2px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">- ( cd ${D}${nonarch_base_libdir}/</span><wbr style="color:rgb(80,0,80);font-size:11.2px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial"><span style="color:rgb(80,0,80);font-size:11.2px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">firmware/brcm/ ; ln -sf brcmfmac43430-sdio.MUR1DX.txt brcmfmac43430-sdio.txt)</span></div><div><span style="color:rgb(80,0,80);font-size:11.2px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">+ ( </span><span style="color:rgb(80,0,80);font-size:11.2px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">ln -sfr <span style="text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">${D}${nonarch_base_libdir}/</span><wbr style="text-decoration-style:initial;text-decoration-color:initial"><span style="text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">firmware/brcm/</span>brcmfmac43430-sdio.MUR1DX.txt <span style="text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">${D}${nonarch_base_libdir}/</span><wbr style="text-decoration-style:initial;text-decoration-color:initial"><span style="text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">firmware/brcm/</span>brcmfmac43430-sdio.txt)</span><br style="color:rgb(80,0,80);font-size:11.2px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial"><br style="color:rgb(80,0,80);font-size:11.2px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial"><span style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">Of course, if I'm not going to "cd" into the firmware repo, I'll have to use absolute paths on both sides of the "ln" command anyway. So I could drop the 'r' param and it should still work. Eg:</span></div><div><span style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline"><br></span></div><div><div style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial"><span style="color:rgb(80,0,80);font-size:11.2px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">- ( cd ${D}${nonarch_base_libdir}/</span><wbr style="color:rgb(80,0,80);font-size:11.2px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial"><span style="color:rgb(80,0,80);font-size:11.2px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">firmware/brcm/ ; ln -sf brcmfmac43430-sdio.MUR1DX.txt brcmfmac43430-sdio.txt)</span></div><div style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial"><span style="color:rgb(80,0,80);font-size:11.2px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">+ (<span> </span></span><span style="color:rgb(80,0,80);font-size:11.2px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">ln -sf <span style="text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">${D}${nonarch_base_libdir}/</span><wbr style="text-decoration-style:initial;text-decoration-color:initial"><span style="text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">firmware/brcm/</span>brcmfmac43430-sdio.MUR1DX.txt<span> </span><span style="text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">${D}${nonarch_base_libdir}/</span><wbr style="text-decoration-style:initial;text-decoration-color:initial"><span style="text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">firmware/brcm/</span>brcmfmac43430-sdio.txt)</span><br style="color:rgb(80,0,80);font-size:11.2px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial"></div></div><div><br></div><div>I'm still not sure this is any neater, though, as it involves using the path twice. Is there a maintainer here who has a preference?</div><div><br></div><div>FWIW, the TI line that I copied was added by Koen Kooi, who I've added to the CC:</div><div><br></div><div><div>8c7adb6 2011-10-09 linux-firmware: update, merge in OE classic updates, fix p.. [Koen Kooi]</div></div><div><br></div><div><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> <br> // Martin<br> <br> On 23/08/2018 08.12, Ryan Harkin wrote:<br> <blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><span class="gmail-"> <br> <br> On 22 August 2018 at 23:55, Andre McCurdy <<a href="mailto:armccurdy@gmail.com" target="_blank">armccurdy@gmail.com</a> <mailto:<a href="mailto:armccurdy@gmail.com" target="_blank">armccurdy@gmail.com</a>>> wrote:<br> <br> On Wed, Aug 22, 2018 at 2:56 PM, Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org" target="_blank">ryan.harkin@linaro.org</a><br></span><span class="gmail-"> <mailto:<a href="mailto:ryan.harkin@linaro.org" target="_blank">ryan.harkin@linaro.org</a><wbr>>> wrote:<br> > On Wed, 22 Aug 2018, 21:42 Andre McCurdy, <<a href="mailto:armccurdy@gmail.com" target="_blank">armccurdy@gmail.com</a><br></span><span class="gmail-"> <mailto:<a href="mailto:armccurdy@gmail.com" target="_blank">armccurdy@gmail.com</a>>> wrote:<br> >> On Wed, Aug 22, 2018 at 1:10 PM, Ryan Harkin<br></span> <<a href="mailto:ryan.harkin@linaro.org" target="_blank">ryan.harkin@linaro.org</a> <mailto:<a href="mailto:ryan.harkin@linaro.org" target="_blank">ryan.harkin@linaro.org</a><wbr>>><span class="gmail-"><br> >> wrote:<br> >> > On Wed, 22 Aug 2018, 20:02 Martin Jansa,<br></span><div><div class="gmail-h5"> <<a href="mailto:martin.jansa@gmail.com" target="_blank">martin.jansa@gmail.com</a> <mailto:<a href="mailto:martin.jansa@gmail.com" target="_blank">martin.jansa@gmail.com</a><wbr>>> wrote:<br> >> >><br> >> >> Your 1st parameter is wrong, compare again with the example I<br> gave you<br> >> >> (don't include "brcm/" path in 1st param, because you want<br> the symlink<br> >> >> to<br> >> >> point to just brcmfmac43430-sdio.AP6212.txt like you did in<br> the version<br> >> >> after cd).<br> >> ><br> >> > That doesn't work either. I tried it with the same result, but<br> didn't<br> >> > send a<br> >> > log of it. That works for you?<br> >><br> >> Martin's example is correct so maybe check your tests again for<br> typos.<br> >> It it still doesn't work then please do send a log.<br> >><br> >> The link will point to whatever you define via the first<br> parameter, so<br> >> if you changed the first parameter it shouldn't be possible to get<br> >> "the same result".<br> >><br> >> $ mkdir foo<br> >> $ ln -sf test_target foo/test1<br> >> $ ln -sf brcm/test_target foo/test2<br> >> $ ls -l foo<br> >><br> >> lrwxrwxrwx 1 andre andre 11 Aug 22 13:35 test1 -> test_target<br> >> lrwxrwxrwx 1 andre andre 16 Aug 22 13:35 test2 -> brcm/test_target<br> ><br> > Yes, that's essentially the same as what I'm getting.<br> ><br> > Now try "cat foo/test1" and what happens?<br> ><br> > There is no file called test_target in the foo directory. And<br> neither is<br> > there a file called brcm/test_target in the foo directory.<br> <br> Correct. The above was just an example to show that you can * create<br> symlinks * in the foo directory without cd'ing into the foo directory<br> first.<br> <br> If you'd like the symlinks in the example to point to valid targets<br> then you need to create the targets too, e.g.<br> <br> $ mkdir -p foo/brcm<br> $ echo hello > foo/test_target<br> $ echo hello2 > foo/brcm/test_target<br> <br> But note that the process of creating a symlink is always the same,<br> regardless of whether the symlink points to a valid target or not (so<br> you can run these extra commands to create the targets before or after<br> you create the symlinks).<br> <br> <br> So that doesn't work for me how I expect it to work. I must be missing something fundamental here.<br> <br> The recipe is trying to create a soft link from a file in the current directory to a file in the sub-directory. On my system, your example creates links from a file in the sub-directory to the another file in the sub-directory.<br> <br> So, to copy your example, but creating the file "test_target" from the start:<br> <br> $ mkdir -p /tmp/test<br> $ cd /tmp/test<br> $ mkdir foo<br> $ echo 1 > test_target<br> $ ln -sf test_target foo/test1<br> $ ln -sf brcm/test_target foo/test2<br> $ ls -l foo<br> total 0<br> lrwxrwxrwx 1 ryan ryan 11 Aug 23 06:54 test1 -> test_target<br> lrwxrwxrwx 1 ryan ryan 16 Aug 23 06:54 test2 -> brcm/test_target<br> $ cat test_target<br> 1<br> $ cat foo/test1<br> cat: foo/test1: No such file or directory<br> $ cat foo/test2<br> cat: foo/test2: No such file or directory<br> $ echo hello > foo/test_target<br> $ echo hello2 > foo/brcm/test_target<br> bash: foo/brcm/test_target: No such file or directory<br> $ cat foo/test1<br> hello<br> $ cat foo/test2<br> cat: foo/test2: No such file or directory<br> $ cat test_target<br> 1<br> $ tree<br> .<br> ├── foo<br> │ ├── test1 -> test_target<br> │ ├── test2 -> brcm/test_target<br> │ └── test_target<br> └── test_target<br> <br> 1 directory, 4 files<br> <br> So, neither test1 nor test2 are linked to /tmp/test/test_target. test1 is linked to /tmp/test/foo/test_target and test2 is linked to /tmp/test/brcm/test_target, which doesn't exist.<br> <br> AFAIK, when creating a softlink, you have to give it either an absolute path, or a path relative to the link being created. The path cannot be relative to the original file that you want to link to.<br> <br> So, this will work:<br> <br> $cd /tmp/test<br> $ ln -sf ../test_target foo/test3<br> $ cat foo/test3<br> 1<br> $ cat /tmp/test/foo/test3<br> 1<br> <br> But that is a strange way to create the soft link, IMO.<br> <br> AFAICT, for the recipe, to get rid of the "cd", I'd have to specify an absolute path to the original file:<br> <br> +do_install_append_bcm43430-nv<wbr>ram-mur1dx() {<br> + ( ln -sf ${PWD}/brcmfmac43430-sdio.MUR1<wbr>DX.txt ${D}${nonarch_base_libdir}/fir<wbr>mware/brcm/brcmfmac43430-sdio.<wbr>txt)<br> <br> ... assuming PWD is available to the recipe. There will be a proper Yocto variable I can use, of course, but I can't think of it right now.<br> <br> Either way, Martin's example doesn't work for me. And adding the absolute path of the original file doesn't seem any neater or clearer than following the TI example from the do_install a few lines up in the recipe. But I'm happy to do it either way, so long as it works.<br> <br> </div></div></blockquote><span class="gmail-HOEnZb"><font color="#888888"> <br> -- <br> Kind regards,<br> Martin Hundebøll<br> Embedded Linux Consultant<br> <br> +45 61 65 54 61<br> <a href="mailto:martin@geanix.com" target="_blank">martin@geanix.com</a><br> <br> Geanix IVS<br> <a href="https://geanix.com" rel="noreferrer" target="_blank">https://geanix.com</a><br> DK39600706<br> </font></span></blockquote></div><br></div></div>
On 23 August 2018 at 08:06, Andre McCurdy <armccurdy@gmail.com> wrote: > > On Wed, Aug 22, 2018 at 11:12 PM, Ryan Harkin <ryan.harkin@linaro.org> wrote: > > On 22 August 2018 at 23:55, Andre McCurdy <armccurdy@gmail.com> wrote: > >> On Wed, Aug 22, 2018 at 2:56 PM, Ryan Harkin <ryan.harkin@linaro.org> > >> wrote: > >> > On Wed, 22 Aug 2018, 21:42 Andre McCurdy, <armccurdy@gmail.com> wrote: > >> >> On Wed, Aug 22, 2018 at 1:10 PM, Ryan Harkin <ryan.harkin@linaro.org > > >> >> wrote: > >> >> > On Wed, 22 Aug 2018, 20:02 Martin Jansa, <martin.jansa@gmail.com> > >> >> > wrote: > >> >> >> > >> >> >> Your 1st parameter is wrong, compare again with the example I gave > >> >> >> you > >> >> >> (don't include "brcm/" path in 1st param, because you want the > >> >> >> symlink > >> >> >> to > >> >> >> point to just brcmfmac43430-sdio.AP6212.txt like you did in the > >> >> >> version > >> >> >> after cd). > >> >> > > >> >> > That doesn't work either. I tried it with the same result, but didn't > >> >> > send a > >> >> > log of it. That works for you? > >> >> > >> >> Martin's example is correct so maybe check your tests again for typos. > >> >> It it still doesn't work then please do send a log. > >> >> > >> >> The link will point to whatever you define via the first parameter, so > >> >> if you changed the first parameter it shouldn't be possible to get > >> >> "the same result". > >> >> > >> >> $ mkdir foo > >> >> $ ln -sf test_target foo/test1 > >> >> $ ln -sf brcm/test_target foo/test2 > >> >> $ ls -l foo > >> >> > >> >> lrwxrwxrwx 1 andre andre 11 Aug 22 13:35 test1 -> test_target > >> >> lrwxrwxrwx 1 andre andre 16 Aug 22 13:35 test2 -> brcm/test_target > >> > > >> > Yes, that's essentially the same as what I'm getting. > >> > > >> > Now try "cat foo/test1" and what happens? > >> > > >> > There is no file called test_target in the foo directory. And neither is > >> > there a file called brcm/test_target in the foo directory. > >> > >> Correct. The above was just an example to show that you can * create > >> symlinks * in the foo directory without cd'ing into the foo directory > >> first. > >> > >> If you'd like the symlinks in the example to point to valid targets > >> then you need to create the targets too, e.g. > >> > >> $ mkdir -p foo/brcm > >> $ echo hello > foo/test_target > >> $ echo hello2 > foo/brcm/test_target > >> > >> But note that the process of creating a symlink is always the same, > >> regardless of whether the symlink points to a valid target or not (so > >> you can run these extra commands to create the targets before or after > >> you create the symlinks). > > > > So that doesn't work for me how I expect it to work. I must be missing > > something fundamental here. > > > > The recipe is trying to create a soft link from a file in the current > > directory to a file in the sub-directory. On my system, your example creates > > links from a file in the sub-directory to the another file in the > > sub-directory. > > > > So, to copy your example, but creating the file "test_target" from the > > start: > > > > $ mkdir -p /tmp/test > > $ cd /tmp/test > > $ mkdir foo > > $ echo 1 > test_target > > Here you are creating "test_target" in the directory which contains > foo, not inside foo. So a symlink inside foo pointing to "test_target" > isn't going to work. Exactly my point! Martin asked me to do this: > ln -sf brcmfmac43430-sdio.AP6212.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt Which is in essence what I'm doing above. It won't work. The file "brcmfmac43430-sdio.AP6212.txt" doesn't exist in the current directory. That's why there's a "cd" command in there. I think, in hind sight, the problem is that there is no path specified for the original file. Hence, the email I've just sent, suggests I could make this mod: - ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf brcmfmac43430-sdio.MUR1DX.txt brcmfmac43430-sdio.txt) + ( ln -sf ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.MUR1DX.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt) > > > > $ ln -sf test_target foo/test1 > > $ ln -sf brcm/test_target foo/test2 > > $ ls -l foo > > total 0 > > lrwxrwxrwx 1 ryan ryan 11 Aug 23 06:54 test1 -> test_target > > lrwxrwxrwx 1 ryan ryan 16 Aug 23 06:54 test2 -> brcm/test_target > > $ cat test_target > > 1 > > $ cat foo/test1 > > cat: foo/test1: No such file or directory > > $ cat foo/test2 > > cat: foo/test2: No such file or directory > > All as expected given that none of the symlink targets exist yet. > > > $ echo hello > foo/test_target > > $ echo hello2 > foo/brcm/test_target > > bash: foo/brcm/test_target: No such file or directory > > You can't create a file within the foo/brcm subdirectory without > creating that subdirectory first. You've somehow missed that step - > although it was in my example. Well, your example said: > $ mkdir foo > $ ln -sf test_target foo/test1 > $ ln -sf brcm/test_target foo/test2 > $ ls -l foo ... and I was trying to show that it doesn't work. Although in fairness, you did add the "mkdir -p foo/brcm" command in a later email. So I think we're both arguing the same point and neither of us is making ourselves very clear. So I don't think we need to continue down this track. Martin's original suggestion won't work for the reasons we've both just discussed. If I add the absolute paths to the source and target, it should be fine. > > > $ cat foo/test1 > > hello > > $ cat foo/test2 > > cat: foo/test2: No such file or directory > > $ cat test_target > > 1 > > $ tree > > . > > ├── foo > > │ ├── test1 -> test_target > > │ ├── test2 -> brcm/test_target > > │ └── test_target > > └── test_target > > > > 1 directory, 4 files > > No real mysteries here. Everything looks as expected given the > comments above about how you creating the target files. > > > So, neither test1 nor test2 are linked to /tmp/test/test_target. > > As expected. For a symlink which is in the foo subdirectory, the > target would have to be "../test_target" to correctly point to your > /tmp/test/test_target file. > > > test1 is > > linked to /tmp/test/foo/test_target > > Not exactly. The test1 symlink in foo just points to "test_target", > there's no absolute path. > > ie if you renamed the foo directory to something else then the test1 > symlink would still point "test_target" and it would still be a valid > link. > > > and test2 is linked to > > /tmp/test/brcm/test_target, which doesn't exist. > > Again, test2 is a relative symlink, not absolute. The test2 symlink > points to a target which doesn't exist due to a missing "mkdir -p > foo/brcm" before you tried to create the target file. > > > AFAIK, when creating a softlink, you have to give it either an absolute > > path, or a path relative to the link being created. The path cannot be > > relative to the original file that you want to link to. > > The only real restriction when creating a symlink is that the > directory which will contain the symlink must exist. > > If you want the symlink to point to something then it's up to you to > arrange that the target exists and the symlink points to it correctly > - but the symlink can still be created even if the target doesn't > point to anything valid. > > > So, this will work: > > > > $cd /tmp/test > > $ ln -sf ../test_target foo/test3 > > $ cat foo/test3 > > 1 > > $ cat /tmp/test/foo/test3 > > 1 > > > > But that is a strange way to create the soft link, IMO. > > What's strange about it? > > > AFAICT, for the recipe, to get rid of the "cd", I'd have to specify an > > absolute path to the original file: > > > > +do_install_append_bcm43430-nvram-mur1dx() { > > + ( ln -sf ${PWD}/brcmfmac43430-sdio.MUR1DX.txt > > ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt) > > > > ... assuming PWD is available to the recipe. There will be a proper Yocto > > variable I can use, of course, but I can't think of it right now. > > That definitely doesn't look right... > > > Either way, Martin's example doesn't work for me. And adding the absolute > > path of the original file doesn't seem any neater or clearer than following > > the TI example from the do_install a few lines up in the recipe. But I'm > > happy to do it either way, so long as it works. > > Martin's example is basically saying (correctly) that this sequence: > > mkdir foo > echo hello > foo/target > cd foo > ln -sf target link > cd .. > > is equivalent to this one: > > mkdir foo > echo hello > foo/target > ln -sf target foo/link > > Notice that the first parameter to ln (the thing you want the symlink > to point to) is the same in both cases. ie it isn't affected by which > directory you are in when you create the symlink. <div dir="ltr"><br><br>On 23 August 2018 at 08:06, Andre McCurdy <<a href="mailto:armccurdy@gmail.com">armccurdy@gmail.com</a>> wrote:<br>><br>> On Wed, Aug 22, 2018 at 11:12 PM, Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org">ryan.harkin@linaro.org</a>> wrote:<br>> > On 22 August 2018 at 23:55, Andre McCurdy <<a href="mailto:armccurdy@gmail.com">armccurdy@gmail.com</a>> wrote:<br>> >> On Wed, Aug 22, 2018 at 2:56 PM, Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org">ryan.harkin@linaro.org</a>><br>> >> wrote:<br>> >> > On Wed, 22 Aug 2018, 21:42 Andre McCurdy, <<a href="mailto:armccurdy@gmail.com">armccurdy@gmail.com</a>> wrote:<br>> >> >> On Wed, Aug 22, 2018 at 1:10 PM, Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org">ryan.harkin@linaro.org</a>><br>> >> >> wrote:<br>> >> >> > On Wed, 22 Aug 2018, 20:02 Martin Jansa, <<a href="mailto:martin.jansa@gmail.com">martin.jansa@gmail.com</a>><br>> >> >> > wrote:<br>> >> >> >><br>> >> >> >> Your 1st parameter is wrong, compare again with the example I gave<br>> >> >> >> you<br>> >> >> >> (don't include "brcm/" path in 1st param, because you want the<br>> >> >> >> symlink<br>> >> >> >> to<br>> >> >> >> point to just brcmfmac43430-sdio.AP6212.txt like you did in the<br>> >> >> >> version<br>> >> >> >> after cd).<br>> >> >> ><br>> >> >> > That doesn't work either. I tried it with the same result, but didn't<br>> >> >> > send a<br>> >> >> > log of it. That works for you?<br>> >> >><br>> >> >> Martin's example is correct so maybe check your tests again for typos.<br>> >> >> It it still doesn't work then please do send a log.<br>> >> >><br>> >> >> The link will point to whatever you define via the first parameter, so<br>> >> >> if you changed the first parameter it shouldn't be possible to get<br>> >> >> "the same result".<br>> >> >><br>> >> >> $ mkdir foo<br>> >> >> $ ln -sf test_target foo/test1<br>> >> >> $ ln -sf brcm/test_target foo/test2<br>> >> >> $ ls -l foo<br>> >> >><br>> >> >> lrwxrwxrwx 1 andre andre 11 Aug 22 13:35 test1 -> test_target<br>> >> >> lrwxrwxrwx 1 andre andre 16 Aug 22 13:35 test2 -> brcm/test_target<br>> >> ><br>> >> > Yes, that's essentially the same as what I'm getting.<br>> >> ><br>> >> > Now try "cat foo/test1" and what happens?<br>> >> ><br>> >> > There is no file called test_target in the foo directory. And neither is<br>> >> > there a file called brcm/test_target in the foo directory.<br>> >><br>> >> Correct. The above was just an example to show that you can * create<br>> >> symlinks * in the foo directory without cd'ing into the foo directory<br>> >> first.<br>> >><br>> >> If you'd like the symlinks in the example to point to valid targets<br>> >> then you need to create the targets too, e.g.<br>> >><br>> >> $ mkdir -p foo/brcm<br>> >> $ echo hello > foo/test_target<br>> >> $ echo hello2 > foo/brcm/test_target<br>> >><br>> >> But note that the process of creating a symlink is always the same,<br>> >> regardless of whether the symlink points to a valid target or not (so<br>> >> you can run these extra commands to create the targets before or after<br>> >> you create the symlinks).<br>> ><br>> > So that doesn't work for me how I expect it to work. I must be missing<br>> > something fundamental here.<br>> ><br>> > The recipe is trying to create a soft link from a file in the current<br>> > directory to a file in the sub-directory. On my system, your example creates<br>> > links from a file in the sub-directory to the another file in the<br>> > sub-directory.<br>> ><br>> > So, to copy your example, but creating the file "test_target" from the<br>> > start:<br>> ><br>> > $ mkdir -p /tmp/test<br>> > $ cd /tmp/test<br>> > $ mkdir foo<br>> > $ echo 1 > test_target<br>><br>> Here you are creating "test_target" in the directory which contains<br>> foo, not inside foo. So a symlink inside foo pointing to "test_target"<br>> isn't going to work.<br><br>Exactly my point! Martin asked me to do this:<br><br>> ln -sf brcmfmac43430-sdio.AP6212.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt<br><br>Which is in essence what I'm doing above. It won't work. The file "brcmfmac43430-sdio.AP6212.txt" doesn't exist in the current directory. That's why there's a "cd" command in there.<br><br>I think, in hind sight, the problem is that there is no path specified for the original file. Hence, the email I've just sent, suggests I could make this mod:<br><br>- ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf brcmfmac43430-sdio.MUR1DX.txt brcmfmac43430-sdio.txt)<br>+ ( ln -sf ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.MUR1DX.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt)<br><br><br> <br>><br>><br>> > $ ln -sf test_target foo/test1<br>> > $ ln -sf brcm/test_target foo/test2<br>> > $ ls -l foo<br>> > total 0<br>> > lrwxrwxrwx 1 ryan ryan 11 Aug 23 06:54 test1 -> test_target<br>> > lrwxrwxrwx 1 ryan ryan 16 Aug 23 06:54 test2 -> brcm/test_target<br>> > $ cat test_target<br>> > 1<br>> > $ cat foo/test1<br>> > cat: foo/test1: No such file or directory<br>> > $ cat foo/test2<br>> > cat: foo/test2: No such file or directory<br>><br>> All as expected given that none of the symlink targets exist yet.<br>><br>> > $ echo hello > foo/test_target<br>> > $ echo hello2 > foo/brcm/test_target<br>> > bash: foo/brcm/test_target: No such file or directory<br>><br>> You can't create a file within the foo/brcm subdirectory without<br>> creating that subdirectory first. You've somehow missed that step -<br>> although it was in my example.<br><br>Well, your example said:<br><br>> $ mkdir foo<br>> $ ln -sf test_target foo/test1<br>> $ ln -sf brcm/test_target foo/test2<br>> $ ls -l foo<br><br>... and I was trying to show that it doesn't work. Although in fairness, you did add the "mkdir -p foo/brcm" command<span style="font-size:small;text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline"> in a later email. So I think we're both arguing the same point and neither of us is making ourselves very clear.</span><div><br></div><div>So I don't think we need to continue down this track. Martin's original suggestion won't work for the reasons we've both just discussed. If I add the absolute paths to the source and target, it should be fine.<br><br><br>><br>> > $ cat foo/test1<br>> > hello<br>> > $ cat foo/test2<br>> > cat: foo/test2: No such file or directory<br>> > $ cat test_target<br>> > 1<br>> > $ tree<br>> > .<br>> > ├── foo<br>> > │ ├── test1 -> test_target<br>> > │ ├── test2 -> brcm/test_target<br>> > │ └── test_target<br>> > └── test_target<br>> ><br>> > 1 directory, 4 files<br>><br>> No real mysteries here. Everything looks as expected given the<br>> comments above about how you creating the target files.<br>><br>> > So, neither test1 nor test2 are linked to /tmp/test/test_target.<br>><br>> As expected. For a symlink which is in the foo subdirectory, the<br>> target would have to be "../test_target" to correctly point to your<br>> /tmp/test/test_target file.<br>><br>> > test1 is<br>> > linked to /tmp/test/foo/test_target<br>><br>> Not exactly. The test1 symlink in foo just points to "test_target",<br>> there's no absolute path.<br>><br>> ie if you renamed the foo directory to something else then the test1<br>> symlink would still point "test_target" and it would still be a valid<br>> link.<br>><br>> > and test2 is linked to<br>> > /tmp/test/brcm/test_target, which doesn't exist.<br>><br>> Again, test2 is a relative symlink, not absolute. The test2 symlink<br>> points to a target which doesn't exist due to a missing "mkdir -p<br>> foo/brcm" before you tried to create the target file.<br>><br>> > AFAIK, when creating a softlink, you have to give it either an absolute<br>> > path, or a path relative to the link being created. The path cannot be<br>> > relative to the original file that you want to link to.<br>><br>> The only real restriction when creating a symlink is that the<br>> directory which will contain the symlink must exist.<br>><br>> If you want the symlink to point to something then it's up to you to<br>> arrange that the target exists and the symlink points to it correctly<br>> - but the symlink can still be created even if the target doesn't<br>> point to anything valid.<br>><br>> > So, this will work:<br>> ><br>> > $cd /tmp/test<br>> > $ ln -sf ../test_target foo/test3<br>> > $ cat foo/test3<br>> > 1<br>> > $ cat /tmp/test/foo/test3<br>> > 1<br>> ><br>> > But that is a strange way to create the soft link, IMO.<br>><br>> What's strange about it?<br>><br>> > AFAICT, for the recipe, to get rid of the "cd", I'd have to specify an<br>> > absolute path to the original file:<br>> ><br>> > +do_install_append_bcm43430-nvram-mur1dx() {<br>> > + ( ln -sf ${PWD}/brcmfmac43430-sdio.MUR1DX.txt<br>> > ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt)<br>> ><br>> > ... assuming PWD is available to the recipe. There will be a proper Yocto<br>> > variable I can use, of course, but I can't think of it right now.<br>><br>> That definitely doesn't look right...<br>><br>> > Either way, Martin's example doesn't work for me. And adding the absolute<br>> > path of the original file doesn't seem any neater or clearer than following<br>> > the TI example from the do_install a few lines up in the recipe. But I'm<br>> > happy to do it either way, so long as it works.<br>><br>> Martin's example is basically saying (correctly) that this sequence:<br>><br>> mkdir foo<br>> echo hello > foo/target<br>> cd foo<br>> ln -sf target link<br>> cd ..<br>><br>> is equivalent to this one:<br>><br>> mkdir foo<br>> echo hello > foo/target<br>> ln -sf target foo/link<br>><br>> Notice that the first parameter to ln (the thing you want the symlink<br>> to point to) is the same in both cases. ie it isn't affected by which<br>> directory you are in when you create the symlink.<br></div></div>
On Thu, Aug 23, 2018 at 12:08 AM, Ryan Harkin <ryan.harkin@linaro.org> wrote: > On 23 August 2018 at 07:39, Martin Hundebøll <martin@geanix.com> wrote: >> >> May I suggest using the '-r, --relative' flag from 'ln': >> >> -r, --relative >> create symbolic links relative to link location >> >> My life felt considerably better after discovering that feature :) > > Thanks Martin Hundebøll! Yes, that works for me. > > So, Martin Jansa, I could make this change: > > - ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf > brcmfmac43430-sdio.MUR1DX.txt brcmfmac43430-sdio.txt) > + ( ln -sfr > ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.MUR1DX.txt > ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt) This is kind of crazy - you are giving an absolute path and then asking ln to convert it into a relative path for you... but the conversion process is trivial: just remove the entire path! You don't need to ask ln to do that for you. > Of course, if I'm not going to "cd" into the firmware repo, I'll have to use > absolute paths on both sides of the "ln" command anyway. So I could drop the > 'r' param and it should still work. Eg: > > - ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf > brcmfmac43430-sdio.MUR1DX.txt brcmfmac43430-sdio.txt) > + ( ln -sf > ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.MUR1DX.txt > ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt) This will create a symlink which points to the target using an absolute path. ie it's not equivalent to the other examples given so far. > I'm still not sure this is any neater, though, as it involves using the path > twice. Is there a maintainer here who has a preference? > > FWIW, the TI line that I copied was added by Koen Kooi, who I've added to > the CC: > > 8c7adb6 2011-10-09 linux-firmware: update, merge in OE classic updates, > fix p.. [Koen Kooi] If you mean this line: ( cd ${D}/lib/firmware ; ln -sf ti-connectivity/* . ) then it's doing something quite different to what you're now trying to do. It's creating multiple symlinks, not one. >> >> // Martin >> >> On 23/08/2018 08.12, Ryan Harkin wrote: >>> >>> >>> >>> On 22 August 2018 at 23:55, Andre McCurdy <armccurdy@gmail.com >>> <mailto:armccurdy@gmail.com>> wrote: >>> >>> On Wed, Aug 22, 2018 at 2:56 PM, Ryan Harkin <ryan.harkin@linaro.org >>> <mailto:ryan.harkin@linaro.org>> wrote: >>> > On Wed, 22 Aug 2018, 21:42 Andre McCurdy, <armccurdy@gmail.com >>> <mailto:armccurdy@gmail.com>> wrote: >>> >> On Wed, Aug 22, 2018 at 1:10 PM, Ryan Harkin >>> <ryan.harkin@linaro.org <mailto:ryan.harkin@linaro.org>> >>> >> wrote: >>> >> > On Wed, 22 Aug 2018, 20:02 Martin Jansa, >>> <martin.jansa@gmail.com <mailto:martin.jansa@gmail.com>> wrote: >>> >> >> >>> >> >> Your 1st parameter is wrong, compare again with the example I >>> gave you >>> >> >> (don't include "brcm/" path in 1st param, because you want >>> the symlink >>> >> >> to >>> >> >> point to just brcmfmac43430-sdio.AP6212.txt like you did in >>> the version >>> >> >> after cd). >>> >> > >>> >> > That doesn't work either. I tried it with the same result, but >>> didn't >>> >> > send a >>> >> > log of it. That works for you? >>> >> >>> >> Martin's example is correct so maybe check your tests again for >>> typos. >>> >> It it still doesn't work then please do send a log. >>> >> >>> >> The link will point to whatever you define via the first >>> parameter, so >>> >> if you changed the first parameter it shouldn't be possible to >>> get >>> >> "the same result". >>> >> >>> >> $ mkdir foo >>> >> $ ln -sf test_target foo/test1 >>> >> $ ln -sf brcm/test_target foo/test2 >>> >> $ ls -l foo >>> >> >>> >> lrwxrwxrwx 1 andre andre 11 Aug 22 13:35 test1 -> test_target >>> >> lrwxrwxrwx 1 andre andre 16 Aug 22 13:35 test2 -> >>> brcm/test_target >>> > >>> > Yes, that's essentially the same as what I'm getting. >>> > >>> > Now try "cat foo/test1" and what happens? >>> > >>> > There is no file called test_target in the foo directory. And >>> neither is >>> > there a file called brcm/test_target in the foo directory. >>> >>> Correct. The above was just an example to show that you can * create >>> symlinks * in the foo directory without cd'ing into the foo directory >>> first. >>> >>> If you'd like the symlinks in the example to point to valid targets >>> then you need to create the targets too, e.g. >>> >>> $ mkdir -p foo/brcm >>> $ echo hello > foo/test_target >>> $ echo hello2 > foo/brcm/test_target >>> >>> But note that the process of creating a symlink is always the same, >>> regardless of whether the symlink points to a valid target or not (so >>> you can run these extra commands to create the targets before or >>> after >>> you create the symlinks). >>> >>> >>> So that doesn't work for me how I expect it to work. I must be missing >>> something fundamental here. >>> >>> The recipe is trying to create a soft link from a file in the current >>> directory to a file in the sub-directory. On my system, your example creates >>> links from a file in the sub-directory to the another file in the >>> sub-directory. >>> >>> So, to copy your example, but creating the file "test_target" from the >>> start: >>> >>> $ mkdir -p /tmp/test >>> $ cd /tmp/test >>> $ mkdir foo >>> $ echo 1 > test_target >>> $ ln -sf test_target foo/test1 >>> $ ln -sf brcm/test_target foo/test2 >>> $ ls -l foo >>> total 0 >>> lrwxrwxrwx 1 ryan ryan 11 Aug 23 06:54 test1 -> test_target >>> lrwxrwxrwx 1 ryan ryan 16 Aug 23 06:54 test2 -> brcm/test_target >>> $ cat test_target >>> 1 >>> $ cat foo/test1 >>> cat: foo/test1: No such file or directory >>> $ cat foo/test2 >>> cat: foo/test2: No such file or directory >>> $ echo hello > foo/test_target >>> $ echo hello2 > foo/brcm/test_target >>> bash: foo/brcm/test_target: No such file or directory >>> $ cat foo/test1 >>> hello >>> $ cat foo/test2 >>> cat: foo/test2: No such file or directory >>> $ cat test_target >>> 1 >>> $ tree >>> . >>> ├── foo >>> │ ├── test1 -> test_target >>> │ ├── test2 -> brcm/test_target >>> │ └── test_target >>> └── test_target >>> >>> 1 directory, 4 files >>> >>> So, neither test1 nor test2 are linked to /tmp/test/test_target. test1 is >>> linked to /tmp/test/foo/test_target and test2 is linked to >>> /tmp/test/brcm/test_target, which doesn't exist. >>> >>> AFAIK, when creating a softlink, you have to give it either an absolute >>> path, or a path relative to the link being created. The path cannot be >>> relative to the original file that you want to link to. >>> >>> So, this will work: >>> >>> $cd /tmp/test >>> $ ln -sf ../test_target foo/test3 >>> $ cat foo/test3 >>> 1 >>> $ cat /tmp/test/foo/test3 >>> 1 >>> >>> But that is a strange way to create the soft link, IMO. >>> >>> AFAICT, for the recipe, to get rid of the "cd", I'd have to specify an >>> absolute path to the original file: >>> >>> +do_install_append_bcm43430-nvram-mur1dx() { >>> + ( ln -sf ${PWD}/brcmfmac43430-sdio.MUR1DX.txt >>> ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt) >>> >>> ... assuming PWD is available to the recipe. There will be a proper Yocto >>> variable I can use, of course, but I can't think of it right now. >>> >>> Either way, Martin's example doesn't work for me. And adding the absolute >>> path of the original file doesn't seem any neater or clearer than following >>> the TI example from the do_install a few lines up in the recipe. But I'm >>> happy to do it either way, so long as it works. >>> >> >> -- >> Kind regards, >> Martin Hundebøll >> Embedded Linux Consultant >> >> +45 61 65 54 61 >> martin@geanix.com >> >> Geanix IVS >> https://geanix.com >> DK39600706 > >
On Thu, Aug 23, 2018 at 12:17 AM, Ryan Harkin <ryan.harkin@linaro.org> wrote: > On 23 August 2018 at 08:06, Andre McCurdy <armccurdy@gmail.com> wrote: >> On Wed, Aug 22, 2018 at 11:12 PM, Ryan Harkin <ryan.harkin@linaro.org> >> wrote: >> > On 22 August 2018 at 23:55, Andre McCurdy <armccurdy@gmail.com> wrote: >> >> On Wed, Aug 22, 2018 at 2:56 PM, Ryan Harkin <ryan.harkin@linaro.org> >> >> wrote: >> >> > On Wed, 22 Aug 2018, 21:42 Andre McCurdy, <armccurdy@gmail.com> >> >> > wrote: >> >> >> On Wed, Aug 22, 2018 at 1:10 PM, Ryan Harkin >> >> >> <ryan.harkin@linaro.org> >> >> >> wrote: >> >> >> > On Wed, 22 Aug 2018, 20:02 Martin Jansa, <martin.jansa@gmail.com> >> >> >> > wrote: >> >> >> >> >> >> >> >> Your 1st parameter is wrong, compare again with the example I >> >> >> >> gave >> >> >> >> you >> >> >> >> (don't include "brcm/" path in 1st param, because you want the >> >> >> >> symlink >> >> >> >> to >> >> >> >> point to just brcmfmac43430-sdio.AP6212.txt like you did in the >> >> >> >> version >> >> >> >> after cd). >> >> >> > >> >> >> > That doesn't work either. I tried it with the same result, but >> >> >> > didn't >> >> >> > send a >> >> >> > log of it. That works for you? >> >> >> >> >> >> Martin's example is correct so maybe check your tests again for >> >> >> typos. >> >> >> It it still doesn't work then please do send a log. >> >> >> >> >> >> The link will point to whatever you define via the first parameter, >> >> >> so >> >> >> if you changed the first parameter it shouldn't be possible to get >> >> >> "the same result". >> >> >> >> >> >> $ mkdir foo >> >> >> $ ln -sf test_target foo/test1 >> >> >> $ ln -sf brcm/test_target foo/test2 >> >> >> $ ls -l foo >> >> >> >> >> >> lrwxrwxrwx 1 andre andre 11 Aug 22 13:35 test1 -> test_target >> >> >> lrwxrwxrwx 1 andre andre 16 Aug 22 13:35 test2 -> brcm/test_target >> >> > >> >> > Yes, that's essentially the same as what I'm getting. >> >> > >> >> > Now try "cat foo/test1" and what happens? >> >> > >> >> > There is no file called test_target in the foo directory. And neither >> >> > is >> >> > there a file called brcm/test_target in the foo directory. >> >> >> >> Correct. The above was just an example to show that you can * create >> >> symlinks * in the foo directory without cd'ing into the foo directory >> >> first. >> >> >> >> If you'd like the symlinks in the example to point to valid targets >> >> then you need to create the targets too, e.g. >> >> >> >> $ mkdir -p foo/brcm >> >> $ echo hello > foo/test_target >> >> $ echo hello2 > foo/brcm/test_target >> >> >> >> But note that the process of creating a symlink is always the same, >> >> regardless of whether the symlink points to a valid target or not (so >> >> you can run these extra commands to create the targets before or after >> >> you create the symlinks). >> > >> > So that doesn't work for me how I expect it to work. I must be missing >> > something fundamental here. >> > >> > The recipe is trying to create a soft link from a file in the current >> > directory to a file in the sub-directory. On my system, your example >> > creates >> > links from a file in the sub-directory to the another file in the >> > sub-directory. >> > >> > So, to copy your example, but creating the file "test_target" from the >> > start: >> > >> > $ mkdir -p /tmp/test >> > $ cd /tmp/test >> > $ mkdir foo >> > $ echo 1 > test_target >> >> Here you are creating "test_target" in the directory which contains >> foo, not inside foo. So a symlink inside foo pointing to "test_target" >> isn't going to work. > > Exactly my point! Martin asked me to do this: > >> ln -sf brcmfmac43430-sdio.AP6212.txt >> ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt > > Which is in essence what I'm doing above. It won't work. The file > "brcmfmac43430-sdio.AP6212.txt" doesn't exist in the current directory. > That's why there's a "cd" command in there. I think you're really still quite confused about something here... You don't need to have any file existing in the current directory (or anywhere else) in order to create a symlink. The symlink exists on it's own. Creating the file that the symlink points to is an entirely separate step. > I think, in hind sight, the problem is that there is no path specified for > the original file. Hence, the email I've just sent, suggests I could make > this mod: > > - ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf > brcmfmac43430-sdio.MUR1DX.txt brcmfmac43430-sdio.txt) > + ( ln -sf > ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.MUR1DX.txt > ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt) > > > >> >> >> > $ ln -sf test_target foo/test1 >> > $ ln -sf brcm/test_target foo/test2 >> > $ ls -l foo >> > total 0 >> > lrwxrwxrwx 1 ryan ryan 11 Aug 23 06:54 test1 -> test_target >> > lrwxrwxrwx 1 ryan ryan 16 Aug 23 06:54 test2 -> brcm/test_target >> > $ cat test_target >> > 1 >> > $ cat foo/test1 >> > cat: foo/test1: No such file or directory >> > $ cat foo/test2 >> > cat: foo/test2: No such file or directory >> >> All as expected given that none of the symlink targets exist yet. >> >> > $ echo hello > foo/test_target >> > $ echo hello2 > foo/brcm/test_target >> > bash: foo/brcm/test_target: No such file or directory >> >> You can't create a file within the foo/brcm subdirectory without >> creating that subdirectory first. You've somehow missed that step - >> although it was in my example. > > Well, your example said: > >> $ mkdir foo >> $ ln -sf test_target foo/test1 >> $ ln -sf brcm/test_target foo/test2 >> $ ls -l foo > > ... and I was trying to show that it doesn't work. Although in fairness, you > did add the "mkdir -p foo/brcm" command in a later email. So I think we're > both arguing the same point and neither of us is making ourselves very > clear. > > So I don't think we need to continue down this track. Martin's original > suggestion won't work for the reasons we've both just discussed. If I add > the absolute paths to the source and target, it should be fine. If you make it down as far as the end of the previous email you'll find a simplified example of Martin's suggestion. Please try it. It does work. > >> >> > $ cat foo/test1 >> > hello >> > $ cat foo/test2 >> > cat: foo/test2: No such file or directory >> > $ cat test_target >> > 1 >> > $ tree >> > . >> > ├── foo >> > │ ├── test1 -> test_target >> > │ ├── test2 -> brcm/test_target >> > │ └── test_target >> > └── test_target >> > >> > 1 directory, 4 files >> >> No real mysteries here. Everything looks as expected given the >> comments above about how you creating the target files. >> >> > So, neither test1 nor test2 are linked to /tmp/test/test_target. >> >> As expected. For a symlink which is in the foo subdirectory, the >> target would have to be "../test_target" to correctly point to your >> /tmp/test/test_target file. >> >> > test1 is >> > linked to /tmp/test/foo/test_target >> >> Not exactly. The test1 symlink in foo just points to "test_target", >> there's no absolute path. >> >> ie if you renamed the foo directory to something else then the test1 >> symlink would still point "test_target" and it would still be a valid >> link. >> >> > and test2 is linked to >> > /tmp/test/brcm/test_target, which doesn't exist. >> >> Again, test2 is a relative symlink, not absolute. The test2 symlink >> points to a target which doesn't exist due to a missing "mkdir -p >> foo/brcm" before you tried to create the target file. >> >> > AFAIK, when creating a softlink, you have to give it either an absolute >> > path, or a path relative to the link being created. The path cannot be >> > relative to the original file that you want to link to. >> >> The only real restriction when creating a symlink is that the >> directory which will contain the symlink must exist. >> >> If you want the symlink to point to something then it's up to you to >> arrange that the target exists and the symlink points to it correctly >> - but the symlink can still be created even if the target doesn't >> point to anything valid. >> >> > So, this will work: >> > >> > $cd /tmp/test >> > $ ln -sf ../test_target foo/test3 >> > $ cat foo/test3 >> > 1 >> > $ cat /tmp/test/foo/test3 >> > 1 >> > >> > But that is a strange way to create the soft link, IMO. >> >> What's strange about it? >> >> > AFAICT, for the recipe, to get rid of the "cd", I'd have to specify an >> > absolute path to the original file: >> > >> > +do_install_append_bcm43430-nvram-mur1dx() { >> > + ( ln -sf ${PWD}/brcmfmac43430-sdio.MUR1DX.txt >> > ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt) >> > >> > ... assuming PWD is available to the recipe. There will be a proper >> > Yocto >> > variable I can use, of course, but I can't think of it right now. >> >> That definitely doesn't look right... >> >> > Either way, Martin's example doesn't work for me. And adding the >> > absolute >> > path of the original file doesn't seem any neater or clearer than >> > following >> > the TI example from the do_install a few lines up in the recipe. But I'm >> > happy to do it either way, so long as it works. >> >> Martin's example is basically saying (correctly) that this sequence: >> >> mkdir foo >> echo hello > foo/target >> cd foo >> ln -sf target link >> cd .. >> >> is equivalent to this one: >> >> mkdir foo >> echo hello > foo/target >> ln -sf target foo/link >> >> Notice that the first parameter to ln (the thing you want the symlink >> to point to) is the same in both cases. ie it isn't affected by which >> directory you are in when you create the symlink.
On 23 August 2018 at 08:34, Andre McCurdy <armccurdy@gmail.com> wrote: > On Thu, Aug 23, 2018 at 12:17 AM, Ryan Harkin <ryan.harkin@linaro.org> > wrote: > > On 23 August 2018 at 08:06, Andre McCurdy <armccurdy@gmail.com> wrote: > >> On Wed, Aug 22, 2018 at 11:12 PM, Ryan Harkin <ryan.harkin@linaro.org> > >> wrote: > >> > On 22 August 2018 at 23:55, Andre McCurdy <armccurdy@gmail.com> > wrote: > >> >> On Wed, Aug 22, 2018 at 2:56 PM, Ryan Harkin <ryan.harkin@linaro.org > > > >> >> wrote: > >> >> > On Wed, 22 Aug 2018, 21:42 Andre McCurdy, <armccurdy@gmail.com> > >> >> > wrote: > >> >> >> On Wed, Aug 22, 2018 at 1:10 PM, Ryan Harkin > >> >> >> <ryan.harkin@linaro.org> > >> >> >> wrote: > >> >> >> > On Wed, 22 Aug 2018, 20:02 Martin Jansa, < > martin.jansa@gmail.com> > >> >> >> > wrote: > >> >> >> >> > >> >> >> >> Your 1st parameter is wrong, compare again with the example I > >> >> >> >> gave > >> >> >> >> you > >> >> >> >> (don't include "brcm/" path in 1st param, because you want the > >> >> >> >> symlink > >> >> >> >> to > >> >> >> >> point to just brcmfmac43430-sdio.AP6212.txt like you did in the > >> >> >> >> version > >> >> >> >> after cd). > >> >> >> > > >> >> >> > That doesn't work either. I tried it with the same result, but > >> >> >> > didn't > >> >> >> > send a > >> >> >> > log of it. That works for you? > >> >> >> > >> >> >> Martin's example is correct so maybe check your tests again for > >> >> >> typos. > >> >> >> It it still doesn't work then please do send a log. > >> >> >> > >> >> >> The link will point to whatever you define via the first > parameter, > >> >> >> so > >> >> >> if you changed the first parameter it shouldn't be possible to get > >> >> >> "the same result". > >> >> >> > >> >> >> $ mkdir foo > >> >> >> $ ln -sf test_target foo/test1 > >> >> >> $ ln -sf brcm/test_target foo/test2 > >> >> >> $ ls -l foo > >> >> >> > >> >> >> lrwxrwxrwx 1 andre andre 11 Aug 22 13:35 test1 -> test_target > >> >> >> lrwxrwxrwx 1 andre andre 16 Aug 22 13:35 test2 -> > brcm/test_target > >> >> > > >> >> > Yes, that's essentially the same as what I'm getting. > >> >> > > >> >> > Now try "cat foo/test1" and what happens? > >> >> > > >> >> > There is no file called test_target in the foo directory. And > neither > >> >> > is > >> >> > there a file called brcm/test_target in the foo directory. > >> >> > >> >> Correct. The above was just an example to show that you can * create > >> >> symlinks * in the foo directory without cd'ing into the foo directory > >> >> first. > >> >> > >> >> If you'd like the symlinks in the example to point to valid targets > >> >> then you need to create the targets too, e.g. > >> >> > >> >> $ mkdir -p foo/brcm > >> >> $ echo hello > foo/test_target > >> >> $ echo hello2 > foo/brcm/test_target > >> >> > >> >> But note that the process of creating a symlink is always the same, > >> >> regardless of whether the symlink points to a valid target or not (so > >> >> you can run these extra commands to create the targets before or > after > >> >> you create the symlinks). > >> > > >> > So that doesn't work for me how I expect it to work. I must be missing > >> > something fundamental here. > >> > > >> > The recipe is trying to create a soft link from a file in the current > >> > directory to a file in the sub-directory. On my system, your example > >> > creates > >> > links from a file in the sub-directory to the another file in the > >> > sub-directory. > >> > > >> > So, to copy your example, but creating the file "test_target" from the > >> > start: > >> > > >> > $ mkdir -p /tmp/test > >> > $ cd /tmp/test > >> > $ mkdir foo > >> > $ echo 1 > test_target > >> > >> Here you are creating "test_target" in the directory which contains > >> foo, not inside foo. So a symlink inside foo pointing to "test_target" > >> isn't going to work. > > > > Exactly my point! Martin asked me to do this: > > > >> ln -sf brcmfmac43430-sdio.AP6212.txt > >> ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt > > > > Which is in essence what I'm doing above. It won't work. The file > > "brcmfmac43430-sdio.AP6212.txt" doesn't exist in the current directory. > > That's why there's a "cd" command in there. > > I think you're really still quite confused about something here... > > You don't need to have any file existing in the current directory (or > anywhere else) in order to create a symlink. The symlink exists on > it's own. Creating the file that the symlink points to is an entirely > separate step. > > > I think, in hind sight, the problem is that there is no path specified > for > > the original file. Hence, the email I've just sent, suggests I could make > > this mod: > > > > - ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf > > brcmfmac43430-sdio.MUR1DX.txt brcmfmac43430-sdio.txt) > > + ( ln -sf > > ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.MUR1DX.txt > > ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt) > > > > > > > >> > >> > >> > $ ln -sf test_target foo/test1 > >> > $ ln -sf brcm/test_target foo/test2 > >> > $ ls -l foo > >> > total 0 > >> > lrwxrwxrwx 1 ryan ryan 11 Aug 23 06:54 test1 -> test_target > >> > lrwxrwxrwx 1 ryan ryan 16 Aug 23 06:54 test2 -> brcm/test_target > >> > $ cat test_target > >> > 1 > >> > $ cat foo/test1 > >> > cat: foo/test1: No such file or directory > >> > $ cat foo/test2 > >> > cat: foo/test2: No such file or directory > >> > >> All as expected given that none of the symlink targets exist yet. > >> > >> > $ echo hello > foo/test_target > >> > $ echo hello2 > foo/brcm/test_target > >> > bash: foo/brcm/test_target: No such file or directory > >> > >> You can't create a file within the foo/brcm subdirectory without > >> creating that subdirectory first. You've somehow missed that step - > >> although it was in my example. > > > > Well, your example said: > > > >> $ mkdir foo > >> $ ln -sf test_target foo/test1 > >> $ ln -sf brcm/test_target foo/test2 > >> $ ls -l foo > > > > ... and I was trying to show that it doesn't work. Although in fairness, > you > > did add the "mkdir -p foo/brcm" command in a later email. So I think > we're > > both arguing the same point and neither of us is making ourselves very > > clear. > > > > So I don't think we need to continue down this track. Martin's original > > suggestion won't work for the reasons we've both just discussed. If I add > > the absolute paths to the source and target, it should be fine. > > If you make it down as far as the end of the previous email you'll > find a simplified example of Martin's suggestion. Please try it. It > does work. > I think you're right. As was Martin. I was starting to respond to your previous email but I'll cut it short and just say that I apologise for the confusion and distraction and I'll make the mod Martin suggested and test it works. > > > >> > >> > $ cat foo/test1 > >> > hello > >> > $ cat foo/test2 > >> > cat: foo/test2: No such file or directory > >> > $ cat test_target > >> > 1 > >> > $ tree > >> > . > >> > ├── foo > >> > │ ├── test1 -> test_target > >> > │ ├── test2 -> brcm/test_target > >> > │ └── test_target > >> > └── test_target > >> > > >> > 1 directory, 4 files > >> > >> No real mysteries here. Everything looks as expected given the > >> comments above about how you creating the target files. > >> > >> > So, neither test1 nor test2 are linked to /tmp/test/test_target. > >> > >> As expected. For a symlink which is in the foo subdirectory, the > >> target would have to be "../test_target" to correctly point to your > >> /tmp/test/test_target file. > >> > >> > test1 is > >> > linked to /tmp/test/foo/test_target > >> > >> Not exactly. The test1 symlink in foo just points to "test_target", > >> there's no absolute path. > >> > >> ie if you renamed the foo directory to something else then the test1 > >> symlink would still point "test_target" and it would still be a valid > >> link. > >> > >> > and test2 is linked to > >> > /tmp/test/brcm/test_target, which doesn't exist. > >> > >> Again, test2 is a relative symlink, not absolute. The test2 symlink > >> points to a target which doesn't exist due to a missing "mkdir -p > >> foo/brcm" before you tried to create the target file. > >> > >> > AFAIK, when creating a softlink, you have to give it either an > absolute > >> > path, or a path relative to the link being created. The path cannot be > >> > relative to the original file that you want to link to. > >> > >> The only real restriction when creating a symlink is that the > >> directory which will contain the symlink must exist. > >> > >> If you want the symlink to point to something then it's up to you to > >> arrange that the target exists and the symlink points to it correctly > >> - but the symlink can still be created even if the target doesn't > >> point to anything valid. > >> > >> > So, this will work: > >> > > >> > $cd /tmp/test > >> > $ ln -sf ../test_target foo/test3 > >> > $ cat foo/test3 > >> > 1 > >> > $ cat /tmp/test/foo/test3 > >> > 1 > >> > > >> > But that is a strange way to create the soft link, IMO. > >> > >> What's strange about it? > >> > >> > AFAICT, for the recipe, to get rid of the "cd", I'd have to specify an > >> > absolute path to the original file: > >> > > >> > +do_install_append_bcm43430-nvram-mur1dx() { > >> > + ( ln -sf ${PWD}/brcmfmac43430-sdio.MUR1DX.txt > >> > ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt) > >> > > >> > ... assuming PWD is available to the recipe. There will be a proper > >> > Yocto > >> > variable I can use, of course, but I can't think of it right now. > >> > >> That definitely doesn't look right... > >> > >> > Either way, Martin's example doesn't work for me. And adding the > >> > absolute > >> > path of the original file doesn't seem any neater or clearer than > >> > following > >> > the TI example from the do_install a few lines up in the recipe. But > I'm > >> > happy to do it either way, so long as it works. > >> > >> Martin's example is basically saying (correctly) that this sequence: > >> > >> mkdir foo > >> echo hello > foo/target > >> cd foo > >> ln -sf target link > >> cd .. > >> > >> is equivalent to this one: > >> > >> mkdir foo > >> echo hello > foo/target > >> ln -sf target foo/link > >> > >> Notice that the first parameter to ln (the thing you want the symlink > >> to point to) is the same in both cases. ie it isn't affected by which > >> directory you are in when you create the symlink. > <div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On 23 August 2018 at 08:34, Andre McCurdy <span dir="ltr"><<a href="mailto:armccurdy@gmail.com" target="_blank">armccurdy@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5">On Thu, Aug 23, 2018 at 12:17 AM, Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org">ryan.harkin@linaro.org</a>> wrote:<br> > On 23 August 2018 at 08:06, Andre McCurdy <<a href="mailto:armccurdy@gmail.com">armccurdy@gmail.com</a>> wrote:<br> >> On Wed, Aug 22, 2018 at 11:12 PM, Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org">ryan.harkin@linaro.org</a>><br> >> wrote:<br> >> > On 22 August 2018 at 23:55, Andre McCurdy <<a href="mailto:armccurdy@gmail.com">armccurdy@gmail.com</a>> wrote:<br> >> >> On Wed, Aug 22, 2018 at 2:56 PM, Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org">ryan.harkin@linaro.org</a>><br> >> >> wrote:<br> >> >> > On Wed, 22 Aug 2018, 21:42 Andre McCurdy, <<a href="mailto:armccurdy@gmail.com">armccurdy@gmail.com</a>><br> >> >> > wrote:<br> >> >> >> On Wed, Aug 22, 2018 at 1:10 PM, Ryan Harkin<br> >> >> >> <<a href="mailto:ryan.harkin@linaro.org">ryan.harkin@linaro.org</a>><br> >> >> >> wrote:<br> >> >> >> > On Wed, 22 Aug 2018, 20:02 Martin Jansa, <<a href="mailto:martin.jansa@gmail.com">martin.jansa@gmail.com</a>><br> >> >> >> > wrote:<br> >> >> >> >><br> >> >> >> >> Your 1st parameter is wrong, compare again with the example I<br> >> >> >> >> gave<br> >> >> >> >> you<br> >> >> >> >> (don't include "brcm/" path in 1st param, because you want the<br> >> >> >> >> symlink<br> >> >> >> >> to<br> >> >> >> >> point to just brcmfmac43430-sdio.AP6212.txt like you did in the<br> >> >> >> >> version<br> >> >> >> >> after cd).<br> >> >> >> ><br> >> >> >> > That doesn't work either. I tried it with the same result, but<br> >> >> >> > didn't<br> >> >> >> > send a<br> >> >> >> > log of it. That works for you?<br> >> >> >><br> >> >> >> Martin's example is correct so maybe check your tests again for<br> >> >> >> typos.<br> >> >> >> It it still doesn't work then please do send a log.<br> >> >> >><br> >> >> >> The link will point to whatever you define via the first parameter,<br> >> >> >> so<br> >> >> >> if you changed the first parameter it shouldn't be possible to get<br> >> >> >> "the same result".<br> >> >> >><br> >> >> >> $ mkdir foo<br> >> >> >> $ ln -sf test_target foo/test1<br> >> >> >> $ ln -sf brcm/test_target foo/test2<br> >> >> >> $ ls -l foo<br> >> >> >><br> >> >> >> lrwxrwxrwx 1 andre andre 11 Aug 22 13:35 test1 -> test_target<br> >> >> >> lrwxrwxrwx 1 andre andre 16 Aug 22 13:35 test2 -> brcm/test_target<br> >> >> ><br> >> >> > Yes, that's essentially the same as what I'm getting.<br> >> >> ><br> >> >> > Now try "cat foo/test1" and what happens?<br> >> >> ><br> >> >> > There is no file called test_target in the foo directory. And neither<br> >> >> > is<br> >> >> > there a file called brcm/test_target in the foo directory.<br> >> >><br> >> >> Correct. The above was just an example to show that you can * create<br> >> >> symlinks * in the foo directory without cd'ing into the foo directory<br> >> >> first.<br> >> >><br> >> >> If you'd like the symlinks in the example to point to valid targets<br> >> >> then you need to create the targets too, e.g.<br> >> >><br> >> >> $ mkdir -p foo/brcm<br> >> >> $ echo hello > foo/test_target<br> >> >> $ echo hello2 > foo/brcm/test_target<br> >> >><br> >> >> But note that the process of creating a symlink is always the same,<br> >> >> regardless of whether the symlink points to a valid target or not (so<br> >> >> you can run these extra commands to create the targets before or after<br> >> >> you create the symlinks).<br> >> ><br> >> > So that doesn't work for me how I expect it to work. I must be missing<br> >> > something fundamental here.<br> >> ><br> >> > The recipe is trying to create a soft link from a file in the current<br> >> > directory to a file in the sub-directory. On my system, your example<br> >> > creates<br> >> > links from a file in the sub-directory to the another file in the<br> >> > sub-directory.<br> >> ><br> >> > So, to copy your example, but creating the file "test_target" from the<br> >> > start:<br> >> ><br> >> > $ mkdir -p /tmp/test<br> >> > $ cd /tmp/test<br> >> > $ mkdir foo<br> >> > $ echo 1 > test_target<br> >><br> >> Here you are creating "test_target" in the directory which contains<br> >> foo, not inside foo. So a symlink inside foo pointing to "test_target"<br> >> isn't going to work.<br> ><br> > Exactly my point! Martin asked me to do this:<br> ><br> >> ln -sf brcmfmac43430-sdio.AP6212.txt<br> >> ${D}${nonarch_base_libdir}/<wbr>firmware/brcm/brcmfmac43430-<wbr>sdio.txt<br> ><br> > Which is in essence what I'm doing above. It won't work. The file<br> > "brcmfmac43430-sdio.AP6212.<wbr>txt" doesn't exist in the current directory.<br> > That's why there's a "cd" command in there.<br> <br> </div></div>I think you're really still quite confused about something here...<br> <br> You don't need to have any file existing in the current directory (or<br> anywhere else) in order to create a symlink. The symlink exists on<br> it's own. Creating the file that the symlink points to is an entirely<br> separate step.<br> <div><div class="h5"><br> > I think, in hind sight, the problem is that there is no path specified for<br> > the original file. Hence, the email I've just sent, suggests I could make<br> > this mod:<br> ><br> > - ( cd ${D}${nonarch_base_libdir}/<wbr>firmware/brcm/ ; ln -sf<br> > brcmfmac43430-sdio.MUR1DX.txt brcmfmac43430-sdio.txt)<br> > + ( ln -sf<br> > ${D}${nonarch_base_libdir}/<wbr>firmware/brcm/brcmfmac43430-<wbr>sdio.MUR1DX.txt<br> > ${D}${nonarch_base_libdir}/<wbr>firmware/brcm/brcmfmac43430-<wbr>sdio.txt)<br> ><br> ><br> ><br> >><br> >><br> >> > $ ln -sf test_target foo/test1<br> >> > $ ln -sf brcm/test_target foo/test2<br> >> > $ ls -l foo<br> >> > total 0<br> >> > lrwxrwxrwx 1 ryan ryan 11 Aug 23 06:54 test1 -> test_target<br> >> > lrwxrwxrwx 1 ryan ryan 16 Aug 23 06:54 test2 -> brcm/test_target<br> >> > $ cat test_target<br> >> > 1<br> >> > $ cat foo/test1<br> >> > cat: foo/test1: No such file or directory<br> >> > $ cat foo/test2<br> >> > cat: foo/test2: No such file or directory<br> >><br> >> All as expected given that none of the symlink targets exist yet.<br> >><br> >> > $ echo hello > foo/test_target<br> >> > $ echo hello2 > foo/brcm/test_target<br> >> > bash: foo/brcm/test_target: No such file or directory<br> >><br> >> You can't create a file within the foo/brcm subdirectory without<br> >> creating that subdirectory first. You've somehow missed that step -<br> >> although it was in my example.<br> ><br> > Well, your example said:<br> ><br> >> $ mkdir foo<br> >> $ ln -sf test_target foo/test1<br> >> $ ln -sf brcm/test_target foo/test2<br> >> $ ls -l foo<br> ><br> > ... and I was trying to show that it doesn't work. Although in fairness, you<br> > did add the "mkdir -p foo/brcm" command in a later email. So I think we're<br> > both arguing the same point and neither of us is making ourselves very<br> > clear.<br> ><br> > So I don't think we need to continue down this track. Martin's original<br> > suggestion won't work for the reasons we've both just discussed. If I add<br> > the absolute paths to the source and target, it should be fine.<br> <br> </div></div>If you make it down as far as the end of the previous email you'll<br> find a simplified example of Martin's suggestion. Please try it. It<br> does work.<br></blockquote><div><br></div><div>I think you're right. As was Martin.</div><div><br></div><div>I was starting to respond to your previous email but I'll cut it short and just say that I apologise for the confusion and distraction and I'll make the mod Martin suggested and test it works.</div><div><br></div><div><br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> <div class="HOEnZb"><div class="h5"><br> ><br> >><br> >> > $ cat foo/test1<br> >> > hello<br> >> > $ cat foo/test2<br> >> > cat: foo/test2: No such file or directory<br> >> > $ cat test_target<br> >> > 1<br> >> > $ tree<br> >> > .<br> >> > ├── foo<br> >> > │ ├── test1 -> test_target<br> >> > │ ├── test2 -> brcm/test_target<br> >> > │ └── test_target<br> >> > └── test_target<br> >> ><br> >> > 1 directory, 4 files<br> >><br> >> No real mysteries here. Everything looks as expected given the<br> >> comments above about how you creating the target files.<br> >><br> >> > So, neither test1 nor test2 are linked to /tmp/test/test_target.<br> >><br> >> As expected. For a symlink which is in the foo subdirectory, the<br> >> target would have to be "../test_target" to correctly point to your<br> >> /tmp/test/test_target file.<br> >><br> >> > test1 is<br> >> > linked to /tmp/test/foo/test_target<br> >><br> >> Not exactly. The test1 symlink in foo just points to "test_target",<br> >> there's no absolute path.<br> >><br> >> ie if you renamed the foo directory to something else then the test1<br> >> symlink would still point "test_target" and it would still be a valid<br> >> link.<br> >><br> >> > and test2 is linked to<br> >> > /tmp/test/brcm/test_target, which doesn't exist.<br> >><br> >> Again, test2 is a relative symlink, not absolute. The test2 symlink<br> >> points to a target which doesn't exist due to a missing "mkdir -p<br> >> foo/brcm" before you tried to create the target file.<br> >><br> >> > AFAIK, when creating a softlink, you have to give it either an absolute<br> >> > path, or a path relative to the link being created. The path cannot be<br> >> > relative to the original file that you want to link to.<br> >><br> >> The only real restriction when creating a symlink is that the<br> >> directory which will contain the symlink must exist.<br> >><br> >> If you want the symlink to point to something then it's up to you to<br> >> arrange that the target exists and the symlink points to it correctly<br> >> - but the symlink can still be created even if the target doesn't<br> >> point to anything valid.<br> >><br> >> > So, this will work:<br> >> ><br> >> > $cd /tmp/test<br> >> > $ ln -sf ../test_target foo/test3<br> >> > $ cat foo/test3<br> >> > 1<br> >> > $ cat /tmp/test/foo/test3<br> >> > 1<br> >> ><br> >> > But that is a strange way to create the soft link, IMO.<br> >><br> >> What's strange about it?<br> >><br> >> > AFAICT, for the recipe, to get rid of the "cd", I'd have to specify an<br> >> > absolute path to the original file:<br> >> ><br> >> > +do_install_append_bcm43430-<wbr>nvram-mur1dx() {<br> >> > + ( ln -sf ${PWD}/brcmfmac43430-sdio.<wbr>MUR1DX.txt<br> >> > ${D}${nonarch_base_libdir}/<wbr>firmware/brcm/brcmfmac43430-<wbr>sdio.txt)<br> >> ><br> >> > ... assuming PWD is available to the recipe. There will be a proper<br> >> > Yocto<br> >> > variable I can use, of course, but I can't think of it right now.<br> >><br> >> That definitely doesn't look right...<br> >><br> >> > Either way, Martin's example doesn't work for me. And adding the<br> >> > absolute<br> >> > path of the original file doesn't seem any neater or clearer than<br> >> > following<br> >> > the TI example from the do_install a few lines up in the recipe. But I'm<br> >> > happy to do it either way, so long as it works.<br> >><br> >> Martin's example is basically saying (correctly) that this sequence:<br> >><br> >> mkdir foo<br> >> echo hello > foo/target<br> >> cd foo<br> >> ln -sf target link<br> >> cd ..<br> >><br> >> is equivalent to this one:<br> >><br> >> mkdir foo<br> >> echo hello > foo/target<br> >> ln -sf target foo/link<br> >><br> >> Notice that the first parameter to ln (the thing you want the symlink<br> >> to point to) is the same in both cases. ie it isn't affected by which<br> >> directory you are in when you create the symlink.<br> </div></div></blockquote></div><br></div></div>
On 22 August 2018 at 17:41, Martin Jansa <martin.jansa@gmail.com> wrote: > > The "cd ${D}${nonarch_base_libdir}/firmware/brcm/" doesn't seem to be needed, just include the path in 2nd ln parameter. Thanks Martin, and sorry for being so dumb. I'll send another series at some point, but for now, the patch looks like this: diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb index 8c54f28..70d4f6a 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb @@ -226,6 +226,18 @@ do_install() { ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf ti-connectivity/* . ) } +# Adding bcm43430-nvram-{module type} to MACHINEOVERRIDES will create a +# softlink for the module specific NVRAM file to the filename expected +# by the Linux kernel +FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-mur1dx = " ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt" +do_install_append_bcm43430-nvram-mur1dx() { + ln -sf brcmfmac43430-sdio.MUR1DX.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt +} +FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-ap6212 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt" +do_install_append_bcm43430-nvram-ap6212() { + ln -sf brcmfmac43430-sdio.AP6212.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt +} + So now the ln issue is resolved, I'm not convinced my MACHINEOVERRIDES is the correct approach. Does anyone have any feedback on how I can improve that? As per my cover letter, I originally wanted to be able to provide a MACHINE_EXTRA_RRECOMMENDS, or similar, but I'm not familiar with how to get an _append to apply based on that variable, unless I tested it incorrectly (again). If I add, say, "linux-firmware-bcm43430-nvram-mur1dx" to MACHINE_EXTRA_RRECOMMENDS, should this work: +FILES_${PN}-bcm43430-nvram_append_${PN}-bcm43430-nvram-mur1dx = " ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt" +do_install_append_${PN}-bcm43430-nvram-mur1dx() { + ln -sf brcmfmac43430-sdio.MUR1DX.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt +} Or is there a better way of achieving this? > > > On Wed, Aug 22, 2018 at 6:30 PM Ryan Harkin <ryan.harkin@linaro.org> wrote: >> >> The Linux kernel currently expects a single NVRAM file for BCM43430 >> named brcmfmac43430-sdio.txt. >> >> Allow the machine to specify an override to link its module specific >> NVRAM to the filename expected by the kernel. >> >> Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org> >> --- >> meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 12 ++++++++++++ >> 1 file changed, 12 insertions(+) >> >> diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb >> index 8c54f28..b647abc 100644 >> --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb >> +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb >> @@ -226,6 +226,18 @@ do_install() { >> ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf ti-connectivity/* . ) >> } >> >> +# Adding bcm43430-nvram-{module type} to MACHINEOVERRIDES will create a >> +# softlink for the module specific NVRAM file to the filename expected >> +# by the Linux kernel >> +FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-mur1dx = " ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt" >> +do_install_append_bcm43430-nvram-mur1dx() { >> + ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf brcmfmac43430-sdio.MUR1DX.txt brcmfmac43430-sdio.txt) >> +} >> +FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-ap6212 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt" >> +do_install_append_bcm43430-nvram-ap6212() { >> + ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf brcmfmac43430-sdio.AP6212.txt brcmfmac43430-sdio.txt) >> +} >> + >> >> PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ >> ${PN}-mt7601u-license ${PN}-mt7601u \ >> -- >> 2.7.4 >> <div dir="ltr"><br><br>On 22 August 2018 at 17:41, Martin Jansa <<a href="mailto:martin.jansa@gmail.com">martin.jansa@gmail.com</a>> wrote:<br>><br>> The "cd ${D}${nonarch_base_libdir}/firmware/brcm/" doesn't seem to be needed, just include the path in 2nd ln parameter.<br><br>Thanks Martin, and sorry for being so dumb. I'll send another series at some point, but for now, the patch looks like this:<br><br>diff --git a/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb">linux-firmware_git.bb</a> b/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb">linux-firmware_git.bb</a><br>index 8c54f28..70d4f6a 100644<br>--- a/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb">linux-firmware_git.bb</a><br>+++ b/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb">linux-firmware_git.bb</a><br>@@ -226,6 +226,18 @@ do_install() {<br> ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf ti-connectivity/* . )<br> }<br> <br>+# Adding bcm43430-nvram-{module type} to MACHINEOVERRIDES will create a<br>+# softlink for the module specific NVRAM file to the filename expected<br>+# by the Linux kernel<br>+FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-mur1dx = " ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt"<br>+do_install_append_bcm43430-nvram-mur1dx() {<br>+ ln -sf brcmfmac43430-sdio.MUR1DX.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt<br>+}<br>+FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-ap6212 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt"<br>+do_install_append_bcm43430-nvram-ap6212() {<br>+ ln -sf brcmfmac43430-sdio.AP6212.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt<br>+}<br>+<br><br>So now the ln issue is resolved, I'm not convinced my MACHINEOVERRIDES is the correct approach. Does anyone have any feedback on how I can improve that?<br><br>As per my cover letter, I originally wanted to be able to provide a MACHINE_EXTRA_RRECOMMENDS, or similar, but I'm not familiar with how to get an _append to apply based on that variable, unless I tested it incorrectly (again).<div><br></div><div>If I add, say, "linux-firmware-bcm43430-nvram-mur1dx" to <span style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">MACHINE_EXTRA_RRECOMMENDS, should this work:</span></div><div><br></div><div><span style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">+FILES_${PN}-bcm43430-nvram_append_${PN}-bcm43430-nvram-mur1dx = " ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt"</span><br style="font-size:small;text-decoration-style:initial;text-decoration-color:initial"><span style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">+do_install_append_${PN}-bcm43430-nvram-mur1dx() {</span><br style="font-size:small;text-decoration-style:initial;text-decoration-color:initial"><span style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">+ ln -sf brcmfmac43430-sdio.MUR1DX.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt</span><br style="font-size:small;text-decoration-style:initial;text-decoration-color:initial"><span style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">+}</span><br> </div><div>Or is there a better way of achieving this?</div><div><br></div><div><br>><br>><br>> On Wed, Aug 22, 2018 at 6:30 PM Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org">ryan.harkin@linaro.org</a>> wrote:<br>>><br>>> The Linux kernel currently expects a single NVRAM file for BCM43430<br>>> named brcmfmac43430-sdio.txt.<br>>><br>>> Allow the machine to specify an override to link its module specific<br>>> NVRAM to the filename expected by the kernel.<br>>><br>>> Signed-off-by: Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org">ryan.harkin@linaro.org</a>><br>>> ---<br>>> meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb">linux-firmware_git.bb</a> | 12 ++++++++++++<br>>> 1 file changed, 12 insertions(+)<br>>><br>>> diff --git a/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb">linux-firmware_git.bb</a> b/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb">linux-firmware_git.bb</a><br>>> index 8c54f28..b647abc 100644<br>>> --- a/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb">linux-firmware_git.bb</a><br>>> +++ b/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb">linux-firmware_git.bb</a><br>>> @@ -226,6 +226,18 @@ do_install() {<br>>> ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf ti-connectivity/* . )<br>>> }<br>>><br>>> +# Adding bcm43430-nvram-{module type} to MACHINEOVERRIDES will create a<br>>> +# softlink for the module specific NVRAM file to the filename expected<br>>> +# by the Linux kernel<br>>> +FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-mur1dx = " ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt"<br>>> +do_install_append_bcm43430-nvram-mur1dx() {<br>>> + ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf brcmfmac43430-sdio.MUR1DX.txt brcmfmac43430-sdio.txt)<br>>> +}<br>>> +FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-ap6212 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt"<br>>> +do_install_append_bcm43430-nvram-ap6212() {<br>>> + ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf brcmfmac43430-sdio.AP6212.txt brcmfmac43430-sdio.txt)<br>>> +}<br>>> +<br>>><br>>> PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \<br>>> ${PN}-mt7601u-license ${PN}-mt7601u \<br>>> --<br>>> 2.7.4<br>>><br></div></div>
On Wed, Aug 22, 2018 at 11:40 PM Martin Hundebøll <martin@geanix.com> wrote: > > May I suggest using the '-r, --relative' flag from 'ln': > > -r, --relative > create symbolic links relative to link location > > My life felt considerably better after discovering that feature :) > ln -r is not available everywhere, but we do have lnr implemented as part of metadata see scripts/lnr so feel free to use that > // Martin > > On 23/08/2018 08.12, Ryan Harkin wrote: > > > > > > On 22 August 2018 at 23:55, Andre McCurdy <armccurdy@gmail.com > > <mailto:armccurdy@gmail.com>> wrote: > > > > On Wed, Aug 22, 2018 at 2:56 PM, Ryan Harkin <ryan.harkin@linaro.org > > <mailto:ryan.harkin@linaro.org>> wrote: > > > On Wed, 22 Aug 2018, 21:42 Andre McCurdy, <armccurdy@gmail.com > > <mailto:armccurdy@gmail.com>> wrote: > > >> On Wed, Aug 22, 2018 at 1:10 PM, Ryan Harkin > > <ryan.harkin@linaro.org <mailto:ryan.harkin@linaro.org>> > > >> wrote: > > >> > On Wed, 22 Aug 2018, 20:02 Martin Jansa, > > <martin.jansa@gmail.com <mailto:martin.jansa@gmail.com>> wrote: > > >> >> > > >> >> Your 1st parameter is wrong, compare again with the example I > > gave you > > >> >> (don't include "brcm/" path in 1st param, because you want > > the symlink > > >> >> to > > >> >> point to just brcmfmac43430-sdio.AP6212.txt like you did in > > the version > > >> >> after cd). > > >> > > > >> > That doesn't work either. I tried it with the same result, but > > didn't > > >> > send a > > >> > log of it. That works for you? > > >> > > >> Martin's example is correct so maybe check your tests again for > > typos. > > >> It it still doesn't work then please do send a log. > > >> > > >> The link will point to whatever you define via the first > > parameter, so > > >> if you changed the first parameter it shouldn't be possible to get > > >> "the same result". > > >> > > >> $ mkdir foo > > >> $ ln -sf test_target foo/test1 > > >> $ ln -sf brcm/test_target foo/test2 > > >> $ ls -l foo > > >> > > >> lrwxrwxrwx 1 andre andre 11 Aug 22 13:35 test1 -> test_target > > >> lrwxrwxrwx 1 andre andre 16 Aug 22 13:35 test2 -> brcm/test_target > > > > > > Yes, that's essentially the same as what I'm getting. > > > > > > Now try "cat foo/test1" and what happens? > > > > > > There is no file called test_target in the foo directory. And > > neither is > > > there a file called brcm/test_target in the foo directory. > > > > Correct. The above was just an example to show that you can * create > > symlinks * in the foo directory without cd'ing into the foo directory > > first. > > > > If you'd like the symlinks in the example to point to valid targets > > then you need to create the targets too, e.g. > > > > $ mkdir -p foo/brcm > > $ echo hello > foo/test_target > > $ echo hello2 > foo/brcm/test_target > > > > But note that the process of creating a symlink is always the same, > > regardless of whether the symlink points to a valid target or not (so > > you can run these extra commands to create the targets before or after > > you create the symlinks). > > > > > > So that doesn't work for me how I expect it to work. I must be missing > > something fundamental here. > > > > The recipe is trying to create a soft link from a file in the current > > directory to a file in the sub-directory. On my system, your example > > creates links from a file in the sub-directory to the another file in > > the sub-directory. > > > > So, to copy your example, but creating the file "test_target" from the > > start: > > > > $ mkdir -p /tmp/test > > $ cd /tmp/test > > $ mkdir foo > > $ echo 1 > test_target > > $ ln -sf test_target foo/test1 > > $ ln -sf brcm/test_target foo/test2 > > $ ls -l foo > > total 0 > > lrwxrwxrwx 1 ryan ryan 11 Aug 23 06:54 test1 -> test_target > > lrwxrwxrwx 1 ryan ryan 16 Aug 23 06:54 test2 -> brcm/test_target > > $ cat test_target > > 1 > > $ cat foo/test1 > > cat: foo/test1: No such file or directory > > $ cat foo/test2 > > cat: foo/test2: No such file or directory > > $ echo hello > foo/test_target > > $ echo hello2 > foo/brcm/test_target > > bash: foo/brcm/test_target: No such file or directory > > $ cat foo/test1 > > hello > > $ cat foo/test2 > > cat: foo/test2: No such file or directory > > $ cat test_target > > 1 > > $ tree > > . > > ├── foo > > │ ├── test1 -> test_target > > │ ├── test2 -> brcm/test_target > > │ └── test_target > > └── test_target > > > > 1 directory, 4 files > > > > So, neither test1 nor test2 are linked to /tmp/test/test_target. test1 > > is linked to /tmp/test/foo/test_target and test2 is linked to > > /tmp/test/brcm/test_target, which doesn't exist. > > > > AFAIK, when creating a softlink, you have to give it either an absolute > > path, or a path relative to the link being created. The path cannot be > > relative to the original file that you want to link to. > > > > So, this will work: > > > > $cd /tmp/test > > $ ln -sf ../test_target foo/test3 > > $ cat foo/test3 > > 1 > > $ cat /tmp/test/foo/test3 > > 1 > > > > But that is a strange way to create the soft link, IMO. > > > > AFAICT, for the recipe, to get rid of the "cd", I'd have to specify an > > absolute path to the original file: > > > > +do_install_append_bcm43430-nvram-mur1dx() { > > + ( ln -sf ${PWD}/brcmfmac43430-sdio.MUR1DX.txt > > ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt) > > > > ... assuming PWD is available to the recipe. There will be a proper > > Yocto variable I can use, of course, but I can't think of it right now. > > > > Either way, Martin's example doesn't work for me. And adding the > > absolute path of the original file doesn't seem any neater or clearer > > than following the TI example from the do_install a few lines up in the > > recipe. But I'm happy to do it either way, so long as it works. > > > > -- > Kind regards, > Martin Hundebøll > Embedded Linux Consultant > > +45 61 65 54 61 > martin@geanix.com > > Geanix IVS > https://geanix.com > DK39600706 > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core
On Thu, Aug 23, 2018 at 1:15 AM, Ryan Harkin <ryan.harkin@linaro.org> wrote: > > So now the ln issue is resolved, I'm not convinced my MACHINEOVERRIDES is > the correct approach. Does anyone have any feedback on how I can improve > that? If you want to make a configurable symlink then perhaps the more usual approach would be to just use a variable in the linux-firmware recipe to weakly define a default target for the symlink. Machine config files could then either do nothing (ie use the default) or provide their own value. For example, in the linux-firmware recipe: BCM43430_NVRAM_SYMLINK ?= "brcmfmac43430-sdio.AP6212.txt" FILES_${PN}-bcm43430-nvram = " \ ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt \ ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.AP6212.txt \ ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.MUR1DX.txt \ " do_install() { ... ln -sf ${BCM43430_NVRAM_SYMLINK} ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt } And then in the machine config files of machines which need the MUR1DX firmware instead of the default, add: BCM43430_NVRAM_SYMLINK = "brcmfmac43430-sdio.MUR1DX.txt" However... note that currently the linux-firmware recipe is architecture independent (ie it won't be rebuilt if the target is changed). Adding a machine specific symlink is going to cause problems with that, so the above is still not a full solution.
One way to keep it allarch would be to package
${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.AP6212.txt
${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.MUR1DX.txt
in 2 separate packages and handle
${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt
symlink with update-alternatives
most MACHINEs won't install either of these packages and those which need
it will pull the right one (e.g. through MACHINE_EXTRA_RRECOMMENDS).
In worst case someone will try to install both packages and based on u-a
priority one of them will win (use higher priority for the more common
version).
Cheers,
On Fri, Aug 24, 2018 at 4:53 AM Andre McCurdy <armccurdy@gmail.com> wrote:
> On Thu, Aug 23, 2018 at 1:15 AM, Ryan Harkin <ryan.harkin@linaro.org>
> wrote:
> >
> > So now the ln issue is resolved, I'm not convinced my MACHINEOVERRIDES is
> > the correct approach. Does anyone have any feedback on how I can improve
> > that?
>
> If you want to make a configurable symlink then perhaps the more usual
> approach would be to just use a variable in the linux-firmware recipe
> to weakly define a default target for the symlink. Machine config
> files could then either do nothing (ie use the default) or provide
> their own value. For example, in the linux-firmware recipe:
>
> BCM43430_NVRAM_SYMLINK ?= "brcmfmac43430-sdio.AP6212.txt"
>
> FILES_${PN}-bcm43430-nvram = " \
> ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt \
> ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.AP6212.txt \
> ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.MUR1DX.txt \
> "
>
> do_install() {
> ...
> ln -sf ${BCM43430_NVRAM_SYMLINK}
> ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt
> }
>
> And then in the machine config files of machines which need the MUR1DX
> firmware instead of the default, add:
>
> BCM43430_NVRAM_SYMLINK = "brcmfmac43430-sdio.MUR1DX.txt"
>
> However... note that currently the linux-firmware recipe is
> architecture independent (ie it won't be rebuilt if the target is
> changed). Adding a machine specific symlink is going to cause problems
> with that, so the above is still not a full solution.
>
<div dir="ltr">One way to keep it allarch would be to package<div>${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.AP6212.txt<br>${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.MUR1DX.txt<br></div><div>in 2 separate packages and handle</div><div>${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt<br></div><div>symlink with update-alternatives</div><div><br></div><div>most MACHINEs won't install either of these packages and those which need it will pull the right one (e.g. through MACHINE_EXTRA_RRECOMMENDS).</div><div><br></div><div>In worst case someone will try to install both packages and based on u-a priority one of them will win (use higher priority for the more common version).</div><div><br></div><div>Cheers,</div></div><br><div class="gmail_quote"><div dir="ltr">On Fri, Aug 24, 2018 at 4:53 AM Andre McCurdy <<a href="mailto:armccurdy@gmail.com">armccurdy@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On Thu, Aug 23, 2018 at 1:15 AM, Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org" target="_blank">ryan.harkin@linaro.org</a>> wrote:<br>
><br>
> So now the ln issue is resolved, I'm not convinced my MACHINEOVERRIDES is<br>
> the correct approach. Does anyone have any feedback on how I can improve<br>
> that?<br>
<br>
If you want to make a configurable symlink then perhaps the more usual<br>
approach would be to just use a variable in the linux-firmware recipe<br>
to weakly define a default target for the symlink. Machine config<br>
files could then either do nothing (ie use the default) or provide<br>
their own value. For example, in the linux-firmware recipe:<br>
<br>
BCM43430_NVRAM_SYMLINK ?= "brcmfmac43430-sdio.AP6212.txt"<br>
<br>
FILES_${PN}-bcm43430-nvram = " \<br>
${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt \<br>
${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.AP6212.txt \<br>
${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.MUR1DX.txt \<br>
"<br>
<br>
do_install() {<br>
...<br>
ln -sf ${BCM43430_NVRAM_SYMLINK}<br>
${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt<br>
}<br>
<br>
And then in the machine config files of machines which need the MUR1DX<br>
firmware instead of the default, add:<br>
<br>
BCM43430_NVRAM_SYMLINK = "brcmfmac43430-sdio.MUR1DX.txt"<br>
<br>
However... note that currently the linux-firmware recipe is<br>
architecture independent (ie it won't be rebuilt if the target is<br>
changed). Adding a machine specific symlink is going to cause problems<br>
with that, so the above is still not a full solution.<br>
</blockquote></div>
I think this should be solved in the driver actually. It probably "knows" which variant is there (or could be taught using devicetree or so). On 24-08-18 11:04, Martin Jansa wrote: > One way to keep it allarch would be to package > ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.AP6212.txt > ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.MUR1DX.txt > in 2 separate packages and handle > ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt > symlink with update-alternatives > > most MACHINEs won't install either of these packages and those which need it > will pull the right one (e.g. through MACHINE_EXTRA_RRECOMMENDS). > > In worst case someone will try to install both packages and based on u-a > priority one of them will win (use higher priority for the more common version). > > Cheers, > > On Fri, Aug 24, 2018 at 4:53 AM Andre McCurdy <armccurdy@gmail.com > <mailto:armccurdy@gmail.com>> wrote: > > On Thu, Aug 23, 2018 at 1:15 AM, Ryan Harkin <ryan.harkin@linaro.org > <mailto:ryan.harkin@linaro.org>> wrote: > > > > So now the ln issue is resolved, I'm not convinced my MACHINEOVERRIDES is > > the correct approach. Does anyone have any feedback on how I can improve > > that? > > If you want to make a configurable symlink then perhaps the more usual > approach would be to just use a variable in the linux-firmware recipe > to weakly define a default target for the symlink. Machine config > files could then either do nothing (ie use the default) or provide > their own value. For example, in the linux-firmware recipe: > > BCM43430_NVRAM_SYMLINK ?= "brcmfmac43430-sdio.AP6212.txt" > > FILES_${PN}-bcm43430-nvram = " \ > ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt \ > ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.AP6212.txt \ > ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.MUR1DX.txt \ > " > > do_install() { > ... > ln -sf ${BCM43430_NVRAM_SYMLINK} > ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt > } > > And then in the machine config files of machines which need the MUR1DX > firmware instead of the default, add: > > BCM43430_NVRAM_SYMLINK = "brcmfmac43430-sdio.MUR1DX.txt" > > However... note that currently the linux-firmware recipe is > architecture independent (ie it won't be rebuilt if the target is > changed). Adding a machine specific symlink is going to cause problems > with that, so the above is still not a full solution. > > >
Hi Martin, On 24 August 2018 at 10:04, Martin Jansa <martin.jansa@gmail.com> wrote: > One way to keep it allarch would be to package > ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.AP6212.txt > ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.MUR1DX.txt > in 2 separate packages and handle > ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt > symlink with update-alternatives > > most MACHINEs won't install either of these packages and those which need > it will pull the right one (e.g. through MACHINE_EXTRA_RRECOMMENDS). > > In worst case someone will try to install both packages and based on u-a > priority one of them will win (use higher priority for the more common > version). > Thanks, this sounds like a good approach. I'll experiment with update-alternatives as I haven't used it before and see if I can come up with something sensible. > Cheers, > > On Fri, Aug 24, 2018 at 4:53 AM Andre McCurdy <armccurdy@gmail.com> wrote: > >> On Thu, Aug 23, 2018 at 1:15 AM, Ryan Harkin <ryan.harkin@linaro.org> >> wrote: >> > >> > So now the ln issue is resolved, I'm not convinced my MACHINEOVERRIDES >> is >> > the correct approach. Does anyone have any feedback on how I can improve >> > that? >> >> If you want to make a configurable symlink then perhaps the more usual >> approach would be to just use a variable in the linux-firmware recipe >> to weakly define a default target for the symlink. Machine config >> files could then either do nothing (ie use the default) or provide >> their own value. For example, in the linux-firmware recipe: >> >> BCM43430_NVRAM_SYMLINK ?= "brcmfmac43430-sdio.AP6212.txt" >> >> FILES_${PN}-bcm43430-nvram = " \ >> ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt \ >> ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.AP6212.txt \ >> ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.MUR1DX.txt \ >> " >> >> do_install() { >> ... >> ln -sf ${BCM43430_NVRAM_SYMLINK} >> ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt >> } >> >> And then in the machine config files of machines which need the MUR1DX >> firmware instead of the default, add: >> >> BCM43430_NVRAM_SYMLINK = "brcmfmac43430-sdio.MUR1DX.txt" >> >> However... note that currently the linux-firmware recipe is >> architecture independent (ie it won't be rebuilt if the target is >> changed). Adding a machine specific symlink is going to cause problems >> with that, so the above is still not a full solution. >> > Thanks Andre. It looks like it would work, but unless you see a problem, I'll look at Martin's idea first. Cheers, Ryan. <div dir="ltr">Hi Martin,<br><div class="gmail_extra"><br><div class="gmail_quote">On 24 August 2018 at 10:04, Martin Jansa <span dir="ltr"><<a href="mailto:martin.jansa@gmail.com" target="_blank">martin.jansa@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">One way to keep it allarch would be to package<span class=""><div>${nonarch_base_libdir}/<wbr>firmware/brcm/brcmfmac43430-<wbr>sdio.AP6212.txt<br>${nonarch_base_libdir}/<wbr>firmware/brcm/brcmfmac43430-<wbr>sdio.MUR1DX.txt<br></div></span><div>in 2 separate packages and handle</div><div>${nonarch_base_libdir}/<wbr>firmware/brcm/brcmfmac43430-<wbr>sdio.txt<br></div><div>symlink with update-alternatives</div><div><br></div><div>most MACHINEs won't install either of these packages and those which need it will pull the right one (e.g. through MACHINE_EXTRA_<wbr>RRECOMMENDS).</div><div><br></div><div>In worst case someone will try to install both packages and based on u-a priority one of them will win (use higher priority for the more common version).</div></div></blockquote><div><br></div>Thanks, this sounds like a good approach. I'll experiment with update-alternatives as I haven't used it before and see if I can come up with something sensible.<div><br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div><br></div><div>Cheers,</div></div><div class="HOEnZb"><div class="h5"><br><div class="gmail_quote"><div dir="ltr">On Fri, Aug 24, 2018 at 4:53 AM Andre McCurdy <<a href="mailto:armccurdy@gmail.com" target="_blank">armccurdy@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On Thu, Aug 23, 2018 at 1:15 AM, Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org" target="_blank">ryan.harkin@linaro.org</a>> wrote:<br> ><br> > So now the ln issue is resolved, I'm not convinced my MACHINEOVERRIDES is<br> > the correct approach. Does anyone have any feedback on how I can improve<br> > that?<br> <br> If you want to make a configurable symlink then perhaps the more usual<br> approach would be to just use a variable in the linux-firmware recipe<br> to weakly define a default target for the symlink. Machine config<br> files could then either do nothing (ie use the default) or provide<br> their own value. For example, in the linux-firmware recipe:<br> <br> BCM43430_NVRAM_SYMLINK ?= "brcmfmac43430-sdio.AP6212.<wbr>txt"<br> <br> FILES_${PN}-bcm43430-nvram = " \<br> ${nonarch_base_libdir}/<wbr>firmware/brcm/brcmfmac43430-<wbr>sdio.txt \<br> ${nonarch_base_libdir}/<wbr>firmware/brcm/brcmfmac43430-<wbr>sdio.AP6212.txt \<br> ${nonarch_base_libdir}/<wbr>firmware/brcm/brcmfmac43430-<wbr>sdio.MUR1DX.txt \<br> "<br> <br> do_install() {<br> ...<br> ln -sf ${BCM43430_NVRAM_SYMLINK}<br> ${D}${nonarch_base_libdir}/<wbr>firmware/brcm/brcmfmac43430-<wbr>sdio.txt<br> }<br> <br> And then in the machine config files of machines which need the MUR1DX<br> firmware instead of the default, add:<br> <br> BCM43430_NVRAM_SYMLINK = "brcmfmac43430-sdio.MUR1DX.<wbr>txt"<br> <br> However... note that currently the linux-firmware recipe is<br> architecture independent (ie it won't be rebuilt if the target is<br> changed). Adding a machine specific symlink is going to cause problems<br> with that, so the above is still not a full solution.<br> </blockquote></div> </div></div></blockquote></div><br></div><div class="gmail_extra">Thanks Andre. It looks like it would work, but unless you see a problem, I'll look at Martin's idea first.</div><div class="gmail_extra"><br></div><div class="gmail_extra">Cheers,</div><div class="gmail_extra">Ryan.</div><div class="gmail_extra"><br></div></div>
On 24 August 2018 at 11:43, Mike Looijmans <mike.looijmans@topic.nl> wrote: > I think this should be solved in the driver actually. It probably "knows" > which variant is there (or could be taught using devicetree or so). I agree. That's a longer term change that will take quite some time to filter through, if at all. The device doesn't know which variant it is, but I'm *hoping* to add a device tree attribute to cover this, but there has been resistance this in the past, so it may not be an easy change to get accepted. > > On 24-08-18 11:04, Martin Jansa wrote: > >> One way to keep it allarch would be to package >> ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.AP6212.txt >> ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.MUR1DX.txt >> in 2 separate packages and handle >> ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt >> symlink with update-alternatives >> >> most MACHINEs won't install either of these packages and those which need >> it will pull the right one (e.g. through MACHINE_EXTRA_RRECOMMENDS). >> >> In worst case someone will try to install both packages and based on u-a >> priority one of them will win (use higher priority for the more common >> version). >> >> Cheers, >> >> On Fri, Aug 24, 2018 at 4:53 AM Andre McCurdy <armccurdy@gmail.com >> <mailto:armccurdy@gmail.com>> wrote: >> >> On Thu, Aug 23, 2018 at 1:15 AM, Ryan Harkin <ryan.harkin@linaro.org >> <mailto:ryan.harkin@linaro.org>> wrote: >> > >> > So now the ln issue is resolved, I'm not convinced my >> MACHINEOVERRIDES is >> > the correct approach. Does anyone have any feedback on how I can >> improve >> > that? >> >> If you want to make a configurable symlink then perhaps the more usual >> approach would be to just use a variable in the linux-firmware recipe >> to weakly define a default target for the symlink. Machine config >> files could then either do nothing (ie use the default) or provide >> their own value. For example, in the linux-firmware recipe: >> >> BCM43430_NVRAM_SYMLINK ?= "brcmfmac43430-sdio.AP6212.txt" >> >> FILES_${PN}-bcm43430-nvram = " \ >> ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt \ >> ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.AP6212.txt >> \ >> ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.MUR1DX.txt >> \ >> " >> >> do_install() { >> ... >> ln -sf ${BCM43430_NVRAM_SYMLINK} >> ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt >> } >> >> And then in the machine config files of machines which need the MUR1DX >> firmware instead of the default, add: >> >> BCM43430_NVRAM_SYMLINK = "brcmfmac43430-sdio.MUR1DX.txt" >> >> However... note that currently the linux-firmware recipe is >> architecture independent (ie it won't be rebuilt if the target is >> changed). Adding a machine specific symlink is going to cause problems >> with that, so the above is still not a full solution. >> >> >> >> > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > <div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On 24 August 2018 at 11:43, Mike Looijmans <span dir="ltr"><<a href="mailto:mike.looijmans@topic.nl" target="_blank">mike.looijmans@topic.nl</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">I think this should be solved in the driver actually. It probably "knows" which variant is there (or could be taught using devicetree or so).</blockquote><div><br></div><div>I agree. That's a longer term change that will take quite some time to filter through, if at all.</div><div><br></div><div>The device doesn't know which variant it is, but I'm *hoping* to add a device tree attribute to cover this, but there has been resistance this in the past, so it may not be an easy change to get accepted.</div><div><br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class=""><br> <br> On 24-08-18 11:04, Martin Jansa wrote:<br> </span><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class=""> One way to keep it allarch would be to package<br> ${nonarch_base_libdir}/firmwar<wbr>e/brcm/brcmfmac43430-sdio.<wbr>AP6212.txt<br> ${nonarch_base_libdir}/firmwar<wbr>e/brcm/brcmfmac43430-sdio.<wbr>MUR1DX.txt<br> in 2 separate packages and handle<br> ${nonarch_base_libdir}/firmwar<wbr>e/brcm/brcmfmac43430-sdio.txt<br> symlink with update-alternatives<br> <br> most MACHINEs won't install either of these packages and those which need it will pull the right one (e.g. through MACHINE_EXTRA_RRECOMME<wbr>NDS).<br> <br> In worst case someone will try to install both packages and based on u-a priority one of them will win (use higher priority for the more common version).<br> <br> Cheers,<br> <br></span><span class=""> On Fri, Aug 24, 2018 at 4:53 AM Andre McCurdy <<a href="mailto:armccurdy@gmail.com" target="_blank">armccurdy@gmail.com</a> <mailto:<a href="mailto:armccurdy@gmail.com" target="_blank">armccurdy@gmail.com</a>>> wrote:<br> <br> On Thu, Aug 23, 2018 at 1:15 AM, Ryan Harkin <<a href="mailto:ryan.harkin@linaro.org" target="_blank">ryan.harkin@linaro.org</a><br></span><div><div class="h5"> <mailto:<a href="mailto:ryan.harkin@linaro.org" target="_blank">ryan.harkin@linaro.org</a><wbr>>> wrote:<br> ><br> > So now the ln issue is resolved, I'm not convinced my MACHINEOVERRIDES is<br> > the correct approach. Does anyone have any feedback on how I can improve<br> > that?<br> <br> If you want to make a configurable symlink then perhaps the more usual<br> approach would be to just use a variable in the linux-firmware recipe<br> to weakly define a default target for the symlink. Machine config<br> files could then either do nothing (ie use the default) or provide<br> their own value. For example, in the linux-firmware recipe:<br> <br> BCM43430_NVRAM_SYMLINK ?= "brcmfmac43430-sdio.AP6212.txt<wbr>"<br> <br> FILES_${PN}-bcm43430-nvram = " \<br> ${nonarch_base_libdir}/firmwar<wbr>e/brcm/brcmfmac43430-sdio.txt \<br> ${nonarch_base_libdir}/firmwar<wbr>e/brcm/brcmfmac43430-sdio.<wbr>AP6212.txt \<br> ${nonarch_base_libdir}/firmwar<wbr>e/brcm/brcmfmac43430-sdio.<wbr>MUR1DX.txt \<br> "<br> <br> do_install() {<br> ...<br> ln -sf ${BCM43430_NVRAM_SYMLINK}<br> ${D}${nonarch_base_libdir}/fir<wbr>mware/brcm/brcmfmac43430-sdio.<wbr>txt<br> }<br> <br> And then in the machine config files of machines which need the MUR1DX<br> firmware instead of the default, add:<br> <br> BCM43430_NVRAM_SYMLINK = "brcmfmac43430-sdio.MUR1DX.txt<wbr>"<br> <br> However... note that currently the linux-firmware recipe is<br> architecture independent (ie it won't be rebuilt if the target is<br> changed). Adding a machine specific symlink is going to cause problems<br> with that, so the above is still not a full solution.<br> <br> <br> <br> </div></div></blockquote><div class="HOEnZb"><div class="h5"> <br> -- <br> ______________________________<wbr>_________________<br> Openembedded-core mailing list<br> <a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openem<wbr>bedded.org</a><br> <a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br> </div></div></blockquote></div><br></div></div>
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb index 8c54f28..b647abc 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb @@ -226,6 +226,18 @@ do_install() { ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf ti-connectivity/* . ) } +# Adding bcm43430-nvram-{module type} to MACHINEOVERRIDES will create a +# softlink for the module specific NVRAM file to the filename expected +# by the Linux kernel +FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-mur1dx = " ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt" +do_install_append_bcm43430-nvram-mur1dx() { + ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf brcmfmac43430-sdio.MUR1DX.txt brcmfmac43430-sdio.txt) +} +FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-ap6212 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt" +do_install_append_bcm43430-nvram-ap6212() { + ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf brcmfmac43430-sdio.AP6212.txt brcmfmac43430-sdio.txt) +} + PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-mt7601u-license ${PN}-mt7601u \
The Linux kernel currently expects a single NVRAM file for BCM43430 named brcmfmac43430-sdio.txt. Allow the machine to specify an override to link its module specific NVRAM to the filename expected by the kernel. Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org> --- meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) -- 2.7.4