package/linux-firmware: fix special cases of symlinks
PATCH v2 1/1 package/linux-firmware: fix special cases of symlinks
From: Antoine Tenart <[email protected]>
Some symlinks were not created correctly when installing the Linux-firmware package. This patch fixes the support for all symlinks of the form:
a/foo -> bar
a/foo -> b/bar
a/foo -> ../b/bar
With this patch all forms of symlinks described in the WHENCE file should be supported, whether they are in nested directories, or in non-existing ones.
As some symlinks could be in directories that do not exist, we must maje sure to canonicalize the path before testing the linked-to file.
We compared the symlinks installed pre-20200122 to what we have now, and it seems we're handling all of them with this patch.
[yann.morin.1998 at free.fr:
- use readlink in canonicalize-missing mode, to avoid creating-then-removing directories
]
--- package/linux-firmware/linux-firmware.mk | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
package/linux-firmware/linux-firmware.mk +9 -3
@@ -609,12 +609,18 @@ endif # automatically by its copy-firmware.sh script during the installation, which # parses the WHENCE file where symlinks are described. We follow the same logic # here, adding symlink only for firmwares installed in the target directory. -# The grep/sed parsing is taken from the script mentioned before. +# +# For testing the presence of firmwares in the target directory we first make +# sure we canonicalize the pointed-to file, to cover the symlinks of the form +# a/foo -> ../b/foo where a/ (the directory where to put the symlink) does +# not yet exist. define LINUX_FIRMWARE_CREATE_SYMLINKS + cd $(TARGET_DIR)/lib/firmware/ ; \ sed -r -e '/^Link: (.+) -> (.+)$$/!d; s//\1 \2/' $(@D)/WHENCE | \ while read f d; do \ - if test -f $(TARGET_DIR)/lib/firmware/$$d; then \ - ln -sf $$d $(TARGET_DIR)/lib/firmware/$$f || exit 1; \ + if test -f $$(readlink -m $$(dirname $$f)/$$d); then \ + mkdir -p $$(dirname $$f) || exit 1; \ + ln -sf $$d $$f || exit 1; \ fi ; \ done endef
Signature · 1 line
2.20.1
PATCH v2 1/1 package/linux-firmware: fix special cases of symlinks
Hi Yann,
Quoted 20 lines · Yann E. MORIN
From: Antoine Tenart <[email protected]>
Some symlinks were not created correctly when installing the Linux-firmware package. This patch fixes the support for all symlinks of the form:
a/foo -> bar
a/foo -> b/bar
a/foo -> ../b/barWith this patch all forms of symlinks described in the WHENCE file should be supported, whether they are in nested directories, or in non-existing ones.
As some symlinks could be in directories that do not exist, we must maje sure to canonicalize the path before testing the linked-to file.
We compared the symlinks installed pre-20200122 to what we have now, and it seems we're handling all of them with this patch.
Quoted 7 lines
Fixes 55df4059d24b ("package/linux-firmware: fix symlink support")Signed-off-by Antoine Tenart <[email protected]>[yann.morin.1998 at free.fr:
- use readlink in canonicalize-missing mode, to avoid creating-then-removing directories
]Signed-off-by Yann E. MORIN <[email protected]>
I tested it and it looks good.
Thanks,
Antoine
Quoted 33 lines
--- package/linux-firmware/linux-firmware.mk | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)package/linux-firmware/linux-firmware.mk +9
-3@@ -609,12 +609,18 @@ endif # automatically by its copy-firmware.sh script during the installation, which # parses the WHENCE file where symlinks are described. We follow the same logic # here, adding symlink only for firmwares installed in the target directory. -# The grep/sed parsing is taken from the script mentioned before. +# +# For testing the presence of firmwares in the target directory we first make +# sure we canonicalize the pointed-to file, to cover the symlinks of the form +# a/foo -> ../b/foo where a/ (the directory where to put the symlink) does +# not yet exist. define LINUX_FIRMWARE_CREATE_SYMLINKS + cd $(TARGET_DIR)/lib/firmware/ ; \ sed -r -e '/^Link: (.+) -> (.+)$$/!d; s//\1 \2/' $(@D)/WHENCE | \ while read f d; do \ - if test -f $(TARGET_DIR)/lib/firmware/$$d; then \ - ln -sf $$d $(TARGET_DIR)/lib/firmware/$$f || exit 1; \ + if test -f $$(readlink -m $$(dirname $$f)/$$d); then \ + mkdir -p $$(dirname $$f) || exit 1; \ + ln -sf $$d $$f || exit 1; \ fi ; \ done endefSignature · 1 line
2.20.1
Signature · 3 lines
Antoine T?nart, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Yann E. MORIN
AppliedPATCH v2 1/1 package/linux-firmware: fix special cases of symlinks
Antoine, All,
On 2020-03-04 21:26 +0100, Antoine Tenart spake thusly:
Quoted 29 lines · Yann E. MORIN
Quoted 20 lines
From: Antoine Tenart <[email protected]>
Some symlinks were not created correctly when installing the Linux-firmware package. This patch fixes the support for all symlinks of the form:
a/foo -> bar
a/foo -> b/bar
a/foo -> ../b/barWith this patch all forms of symlinks described in the WHENCE file should be supported, whether they are in nested directories, or in non-existing ones.
As some symlinks could be in directories that do not exist, we must maje sure to canonicalize the path before testing the linked-to file.
We compared the symlinks installed pre-20200122 to what we have now, and it seems we're handling all of them with this patch.
Quoted 7 lines
Fixes 55df4059d24b ("package/linux-firmware: fix symlink support")Signed-off-by Antoine Tenart <[email protected]>[yann.morin.1998 at free.fr:
- use readlink in canonicalize-missing mode, to avoid creating-then-removing directories
]Signed-off-by Yann E. MORIN <[email protected]>
Quoted 1 line
I tested it and it looks good.
I took that as a hint to add your Tested-by: and Reviewed-by: tags to the commit.
Applied to next. Thanks!
Regards,
Yann E. MORIN.
Quoted 41 lines
Thanks,
AntoineQuoted 33 lines
--- package/linux-firmware/linux-firmware.mk | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)package/linux-firmware/linux-firmware.mk +9
-3@@ -609,12 +609,18 @@ endif # automatically by its copy-firmware.sh script during the installation, which # parses the WHENCE file where symlinks are described. We follow the same logic # here, adding symlink only for firmwares installed in the target directory. -# The grep/sed parsing is taken from the script mentioned before. +# +# For testing the presence of firmwares in the target directory we first make +# sure we canonicalize the pointed-to file, to cover the symlinks of the form +# a/foo -> ../b/foo where a/ (the directory where to put the symlink) does +# not yet exist. define LINUX_FIRMWARE_CREATE_SYMLINKS + cd $(TARGET_DIR)/lib/firmware/ ; \ sed -r -e '/^Link: (.+) -> (.+)$$/!d; s//\1 \2/' $(@D)/WHENCE | \ while read f d; do \ - if test -f $(TARGET_DIR)/lib/firmware/$$d; then \ - ln -sf $$d $(TARGET_DIR)/lib/firmware/$$f || exit 1; \ + if test -f $$(readlink -m $$(dirname $$f)/$$d); then \ + mkdir -p $$(dirname $$f) || exit 1; \ + ln -sf $$d $$f || exit 1; \ fi ; \ done endefSignature · 1 line
2.20.1Signature · 3 lines
Antoine T?nart, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'