Fix inclusion of libgcc_s.so on Void #6715
Conversation
On Void Linux (x86_64 musl) libgcc_s.so is located in "/usr/lib" so it is not found by dracut and it produces an error. - Add a simple additional path check for "/usr/lib/libgcc_s.so*" and install it in the initramfs.
| @@ -46,6 +46,9 @@ install() { | |||
| # On systems with gcc-config (Gentoo, Funtoo, etc.): | |||
| # Use the current profile to resolve the appropriate path | |||
| dracut_install "/usr/lib/gcc/$(s=$(gcc-config -c); echo ${s%-*}/${s##*-})/libgcc_s.so.1" | |||
| elif [[ -n "$(ls /usr/lib/libgcc_s.so*)" ]]; then | |||
There was a problem hiding this comment.
Let's redirect stderr to /dev/null to get rid of the error message when it doesn't exist.
elif [[ -n "$(ls /usr/lib/libgcc_s.so* 2>/dev/null)" ]]; then
Codecov Report
@@ Coverage Diff @@
## master #6715 +/- ##
==========================================
- Coverage 74.09% 74.07% -0.02%
==========================================
Files 295 295
Lines 93882 93882
==========================================
- Hits 69558 69540 -18
- Misses 24324 24342 +18
Continue to review full report at Codecov.
|
|
@privb0x23 please add your signed-off-by to the commit as well so we can accept it, |
Only output was:
"Unescaped left brace in regex is deprecated here (and will be fatal in Perl 5.30), passed through in regex; marked by <-- HERE in m/(?:(?:\b(?:enum|struct|union)\s*[^\{]*)|(?:\s+=\s*)){ <-- HERE / at scripts/cstyle.pl line 830."
(Using Perl v5.26.0)
Signed-off-by: privb0x23 <privb0x23@users.noreply.github.com>
|
Greetings, I'm not sure why the automated "buildbot/Ubuntu 17.10 x86_64 (STYLE)" check is failing. Perhaps it has something to do with the commit message rather than the actual code/style, as the output includes: error: commit message body contains line over 72 characters My proposed changes are to a few lines in the dracut 90zfs module, so should not affect any failures in "real" ZFS code. The make checkstyle returned 0, with the only output related to a Perl warning. The failure in the automated "buildbot/Fedora 26 x86_64 (TEST)" build seems to be related to "chattr", so also should not be affected by the dracut module. Thanks |
|
@privb0x23 yes, the style warning is pertaining to the commit message. To keep the commits readable for everyone individual lines should be under 72 characters. I'll go ahead and fix this when I squash and merge it. The rest of the patch looks good, thanks! |
On Void Linux (x86_64 musl) libgcc_s.so is located in "/usr/lib" so it is not found by dracut and it produces an error. Add a simple additional path check for "/usr/lib/libgcc_s.so*" and install it in the initramfs. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: privb0x23 <privb0x23@users.noreply.github.com> Closes openzfs#6715
On Void Linux (x86_64 musl) libgcc_s.so is located in "/usr/lib" so it is not found by dracut and it produces an error. Add a simple additional path check for "/usr/lib/libgcc_s.so*" and install it in the initramfs. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: privb0x23 <privb0x23@users.noreply.github.com> Closes #6715
Description
Add a simple additional path check for "/usr/lib/libgcc_s.so*" and install it in the initramfs.
Motivation and Context
On Void Linux (x86_64 musl) libgcc_s.so is located in "/usr/lib" so it is not found by dracut (in the fallback case) and it produces an error.
How Has This Been Tested?
Changes result in the successful inclusion of "/usr/lib/libgcc_s.so" within the initramfs and no error is seen.
Void Linux x86_64 musl
Kernel 4.12.13_1
Zfs 0.7.1_1
Spl 0.7.1_1
Libgcc 6.3.0_5
Dracut 046_1
Types of changes
Checklist: