From b7caa30bb8addbaa6b84baf9ebf4e2a3e885da86 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 3 Mar 2016 13:01:40 +0000 Subject: 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) --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0cfd3dd..7cae2d9 100755 --- a/Makefile +++ b/Makefile @@ -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 -- cgit v1.2.3