package/linux-firmware: fix special cases of symlinks
PATCH 1/1 package/linux-firmware: fix special cases of symlinks
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 make sure those directories are created before testing the presence of the target firmwares, as we'll end up testing files like:
a/foo -> ../b/foo : test -f a/../b/foo
where a/ did not exist prior to our symlink creation logic. We then remove the created directories, if they're empty (that would mean the target firmware wasn't installed). As we could have nested empty directories (think of the following link: a/b/c/foo -> ../../../foo), we need to also remove empty parent directories. To avoid removing more than we created, we change directory to $(TARGET_DIR)/lib/firmware/ before doing anything.
I compared the symlinks installed pre-20200122 to what we have now, and it seems we're handling all of them with this patch.
--- package/linux-firmware/linux-firmware.mk | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
package/linux-firmware/linux-firmware.mk +14 -3
@@ -609,13 +609,24 @@ 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 the directories under which the symlinks could be created exist, to +# handle symlinks of the form a/foo -> ../b/foo where a/ doesn't exist. We then +# remove any previously created empty directory. As the symlinks could be in +# nested (empty) directories, we use the --parents option of rmdir; this is why +# we're changing the current directory to $(TARGET_DIR)/lib/firmware/ before +# doing anything. 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; \ + dir=$$(dirname $$f) ; \ + mkdir -p $$dir ; \ + if test -f $$dir/$$d; then \ + ln -sf $$d $$f || exit 1; \ fi ; \ + test "$$dir" != "." && rmdir --parents --ignore-fail-on-non-empty $$dir ; \ done endef
Signature · 1 line
2.24.1
PATCH 1/1 package/linux-firmware: fix special cases of symlinks
Antoine, All,
On 2020-03-04 11:53 +0100, Antoine Tenart spake thusly:
Quoted 26 lines
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 make sure those directories are created before testing the presence of the target firmwares, as we'll end up testing files like:
a/foo -> ../b/foo : test -f a/../b/foo
where a/ did not exist prior to our symlink creation logic. We then remove the created directories, if they're empty (that would mean the target firmware wasn't installed). As we could have nested empty directories (think of the following link: a/b/c/foo -> ../../../foo), we need to also remove empty parent directories. To avoid removing more than we created, we change directory to $(TARGET_DIR)/lib/firmware/ before doing anything.
Quoted 5 lines
I compared the symlinks installed pre-20200122 to what we have now, and it seems we're handling all of them with this patch.
Fixes 55df4059d24b ("package/linux-firmware: fix symlink support")Signed-off-by Antoine Tenart <[email protected]>
Thanks for this quick new iteration! :-)
I have some comments, below...
Quoted 23 lines
--- package/linux-firmware/linux-firmware.mk | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)package/linux-firmware/linux-firmware.mk +9
-1@@ -609,13 +609,24 @@ 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 the directories under which the symlinks could be created exist, to +# handle symlinks of the form a/foo -> ../b/foo where a/ doesn't exist. We then +# remove any previously created empty directory. As the symlinks could be in +# nested (empty) directories, we use the --parents option of rmdir; this is why +# we're changing the current directory to $(TARGET_DIR)/lib/firmware/ before +# doing anything. define LINUX_FIRMWARE_CREATE_SYMLINKS + cd $(TARGET_DIR)/lib/firmware/ ; \
package/linux-firmware/linux-firmware.mk endif · line 629
Quoted 10 lines
package/linux-firmware/linux-firmware.mk +5
-2sed -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; \ + dir=$$(dirname $$f) ; \ + mkdir -p $$dir ; \ + if test -f $$dir/$$d; then \ + ln -sf $$d $$f || exit 1; \ fi ; \ + test "$$dir" != "." && rmdir --parents --ignore-fail-on-non-empty $$dir ; \
I was not too happy about this create-a-directory-then-remove-it-if-it-turned- out-we-did-not-need-it dance.
So, I hacked it, using readlink -m, and come up with something that I think is simpler and easier to grok:
https://patchwork.ozlabs.org/patch/1249126/
I think even the cd into the firmware directory was not even needed, but I firgit to remove it to test...
Regards,
Yann E. MORIN.
Quoted 6 lines
package/linux-firmware/linux-firmware.mk +0
-0done endefSignature · 1 line
2.24.1
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. | '------------------------------^-------^------------------^--------------------'
PATCH 1/1 package/linux-firmware: fix special cases of symlinks
Hi Yann,
Quoted 34 lines · Yann E. MORIN
On 2020-03-04 11:53 +0100, Antoine Tenart spake thusly:
Quoted 19 lines
package/linux-firmware/linux-firmware.mk +9
-1@@ -609,13 +609,24 @@ 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 the directories under which the symlinks could be created exist, to +# handle symlinks of the form a/foo -> ../b/foo where a/ doesn't exist. We then +# remove any previously created empty directory. As the symlinks could be in +# nested (empty) directories, we use the --parents option of rmdir; this is why +# we're changing the current directory to $(TARGET_DIR)/lib/firmware/ before +# doing anything. define LINUX_FIRMWARE_CREATE_SYMLINKS + cd $(TARGET_DIR)/lib/firmware/ ; \package/linux-firmware/linux-firmware.mk endif · line 629
Quoted 10 lines
package/linux-firmware/linux-firmware.mk +5
-2sed -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; \ + dir=$$(dirname $$f) ; \ + mkdir -p $$dir ; \ + if test -f $$dir/$$d; then \ + ln -sf $$d $$f || exit 1; \ fi ; \ + test "$$dir" != "." && rmdir --parents --ignore-fail-on-non-empty $$dir ; \I was not too happy about this create-a-directory-then-remove-it-if-it-turned- out-we-did-not-need-it dance.
Quoted 4 lines
So, I hacked it, using readlink -m, and come up with something that I think is simpler and easier to grok:
https://patchwork.ozlabs.org/patch/1249126/
I considered readlink -m, but its man pages says: "Note realpath(1) is the preferred command to use for canonicalization functionality". So I could have used realpath, but to use it I would have to define a dependency on host-coreutils... which seemed a bit overkill. That's why I move to a create-then-remove solution which I agree isn't perfect :-)
Quoted 2 lines
I think even the cd into the firmware directory was not even needed, but I firgit to remove it to test...
Right, you can drop the cd statement (you have to use the full path in the ln command then).
Thanks,
Antoine
Signature · 3 lines
Antoine T?nart, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/linux-firmware: fix special cases of symlinks
Antoine, All,
On 2020-03-04 19:37 +0100, Antoine Tenart spake thusly:
Quoted 35 lines · Yann E. MORIN
Quoted 34 lines
On 2020-03-04 11:53 +0100, Antoine Tenart spake thusly:
Quoted 19 lines
package/linux-firmware/linux-firmware.mk +9
-1@@ -609,13 +609,24 @@ 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 the directories under which the symlinks could be created exist, to +# handle symlinks of the form a/foo -> ../b/foo where a/ doesn't exist. We then +# remove any previously created empty directory. As the symlinks could be in +# nested (empty) directories, we use the --parents option of rmdir; this is why +# we're changing the current directory to $(TARGET_DIR)/lib/firmware/ before +# doing anything. define LINUX_FIRMWARE_CREATE_SYMLINKS + cd $(TARGET_DIR)/lib/firmware/ ; \package/linux-firmware/linux-firmware.mk endif · line 629
Quoted 10 lines
package/linux-firmware/linux-firmware.mk +5
-2sed -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; \ + dir=$$(dirname $$f) ; \ + mkdir -p $$dir ; \ + if test -f $$dir/$$d; then \ + ln -sf $$d $$f || exit 1; \ fi ; \ + test "$$dir" != "." && rmdir --parents --ignore-fail-on-non-empty $$dir ; \I was not too happy about this create-a-directory-then-remove-it-if-it-turned- out-we-did-not-need-it dance.
Quoted 7 lines
Quoted 4 lines
So, I hacked it, using readlink -m, and come up with something that I think is simpler and easier to grok:
https://patchwork.ozlabs.org/patch/1249126/I considered
readlink -m, but its man pages says: "Note realpath(1) is the preferred command to use for canonicalization functionality". So I
Yeah, but we already use readlink elsewhere. Besides, it does the job we're asking it to, so...
Quoted 9 lines
could have used realpath, but to use it I would have to define a dependency on host-coreutils... which seemed a bit overkill. That's why I move to a create-then-remove solution which I agree isn't perfect :-)
Quoted 2 lines
I think even the cd into the firmware directory was not even needed, but I firgit to remove it to test...
Right, you can drop the cd statement (you have to use the full path in the ln command then).
I did, but the code is uglier now: $(TARGET_DIR)/lib/firmware/ has to be repeated in three places now (for readlink, test, and ln), and it makes the lines too long...
Care to send a proper reviewd-by or acked-by if you feel like it, then, please?
Regards,
Yann E. MORIN.
Quoted 7 lines
Thanks,
AntoineSignature · 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. | '------------------------------^-------^------------------^--------------------'