diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-03-03 13:01:40 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-03-03 13:01:40 +0000 |
| commit | b7caa30bb8addbaa6b84baf9ebf4e2a3e885da86 (patch) | |
| tree | 08781bd80196dfc656872f3a5cb20122f71fce54 | |
| parent | 8053bcc1004ccc74b736c1d33145c3552d42b4e1 (diff) | |
| download | alpine-iso-b7caa30bb8addbaa6b84baf9ebf4e2a3e885da86.tar.bz2 alpine-iso-b7caa30bb8addbaa6b84baf9ebf4e2a3e885da86.tar.xz | |
fix firmware location in modloop
modloop init.d script expects the firmware in /lib/modules/firmware.
This fixes regression introduced with commit 93bdebeb7b8a (include only
needed firmware files in the .iso modloop)
| -rwxr-xr-x | Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -89,10 +89,9 @@ $(MODLOOP_KERNELSTAMP): $(MODLOOP_PKGS) $(UBOOT_PKGS) @mv "$(MODLOOP_DIR)"/tmp/lib/modules/* "$(MODLOOP_DIR)"/lib/modules/ @if [ -d "$(MODLOOP_DIR)"/tmp/lib/firmware ]; then \ - mkdir -p "$(MODLOOP_DIR)"/lib/firmware/; \ find "$(MODLOOP_DIR)"/lib/modules -type f -name "*.ko" | xargs modinfo -F firmware | sort -u | while read FW; do \ if [ -e "$(MODLOOP_DIR)/tmp/lib/firmware/$${FW}" ]; then \ - install -pD "$(MODLOOP_DIR)/tmp/lib/firmware/$${FW}" "$(MODLOOP_DIR)/lib/firmware/$${FW}"; \ + install -pD "$(MODLOOP_DIR)/tmp/lib/firmware/$${FW}" "$(MODLOOP_DIR)/lib/modules/firmware/$${FW}"; \ fi \ done \ fi |