From 513e194fde7b411f0c90a1d667393f6e5a3ba646 Mon Sep 17 00:00:00 2001 From: Sergey Bolshakov Date: Thu, 1 Apr 2010 17:32:10 +0400 Subject: [PATCH] 20090301-alt1 released --- mkmodpack | 9 ++++++++- propagator.spec | 5 ++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/mkmodpack b/mkmodpack index ede0922..cc5a189 100644 --- a/mkmodpack +++ b/mkmodpack @@ -120,7 +120,7 @@ AddModuleFirmware() { local mod_name="$1" && shift local mod_path="$1" && shift - local fw_list fw_name fw_dir fw_file + local fw_list fw_name fw_dir fw_file fw_privdir fw_list="$(modinfo -F firmware "$mod_path")" || return [ -n "$fw_list" ] || return @@ -136,6 +136,13 @@ AddModuleFirmware() Warning "Firmware file \"$fw_name\" for module \"$mod_name\" not found" continue } + [ "$fw_name" = "${fw_name##*/}" ] || { + [ -n "$fw_privdir" ] || { + fw_privdir="${fw_name%/*}" + FILES="$FILES +dir /lib/firmware/$fw_privdir 0755 0 0" + } + } FILES="$FILES file /lib/firmware/$fw_name $fw_file 0644 0 0" done diff --git a/propagator.spec b/propagator.spec index 0937dcb..e4f76b3 100644 --- a/propagator.spec +++ b/propagator.spec @@ -3,7 +3,7 @@ Name: propagator Version: 20090301 -Release: alt6 +Release: alt7 Summary: 'Early userspace' set of binaries License: GPL @@ -39,6 +39,9 @@ make %{?_with_shell:WITH_SHELL=t} %{?_with_splash:WITH_SPLASH=t} libdir=%_libdir %_libdir/%name %changelog +* Thu Apr 1 2010 Sergey Bolshakov 20090301-alt7 +- mkmodpack: fixed firmware extraction resident in own directory + * Wed Sep 9 2009 Sergey Bolshakov 20090301-alt6 - workaround for (#21416)