diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2022-11-17 14:54:07 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2022-11-17 15:50:38 +0000 |
| commit | 2504097d53ca26b8db307a4351b3e8ab0a946a7b (patch) | |
| tree | 6bd8ec7df30031ba917ad17420f7dee025953346 | |
| parent | 5ee337ce35ed30a630128090fc54e30778a115a8 (diff) | |
| download | alpine-conf-2504097d53ca26b8db307a4351b3e8ab0a946a7b.zip | |
Revert "update-kernel: fix modloop construction"
This was broken.
ref https://gitlab.alpinelinux.org/alpine/alpine-conf/-/merge_requests/124#note_274593
This reverts commit 1e1ac71fc0e6efe8c6bacc5ff3ba6429a97330cd.
| -rw-r--r-- | update-kernel.in | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/update-kernel.in b/update-kernel.in index 46b920d..dd764a0 100644 --- a/update-kernel.in +++ b/update-kernel.in @@ -296,16 +296,13 @@ mkdir $MODLOOP $STAGING cp -a $ROOTFS/lib/modules $MODLOOP mkdir -p $MODLOOP/modules/firmware find $ROOTFS/lib/modules -type f -name "*.ko*" | xargs modinfo -k $KVER -F firmware | sort -u | while read FW; do - # eventually expand $FW containing * wildcard in name - for _FW in $( basename "$ROOTFS/lib/firmware/$FW" ); do - if [ -e "$ROOTFS/lib/firmware/$_FW" ]; then - install -pD $ROOTFS/lib/firmware/$_FW $MODLOOP/modules/firmware/$_FW - # copy also all potentially associated files - for _file in "$ROOTFS"/lib/firmware/"${_FW%.*}".*; do - install -pD "$_file" "$MODLOOP/modules/firmware/${_file#*/lib/firmware/}" - done - fi - done + if [ -e "$ROOTFS/lib/firmware/$FW" ]; then + install -pD $ROOTFS/lib/firmware/$FW $MODLOOP/modules/firmware/$FW + # copy also all potentially associated files + for _file in "$ROOTFS"/lib/firmware/"${FW%.*}".*; do + install -pD "$_file" "$MODLOOP/modules/firmware/${_file#*/lib/firmware/}" + done + fi done # install extra firmware files in modloop (i.e. not detected by modinfo) |