From c425aa044b9438f60a66ac5d2f89efae4ed16c6c Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Thu, 1 Apr 2010 11:35:31 +0200 Subject: [PATCH] linux26: improved to only remove 'lib/firmware' from the file list if the fhs package is enabled --- base/linux26/linux-conf.in | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/base/linux26/linux-conf.in b/base/linux26/linux-conf.in index 1f681260c..f45aa31c9 100644 --- a/base/linux26/linux-conf.in +++ b/base/linux26/linux-conf.in @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../linux26/linux-conf.in -# Copyright (C) 2006 - 2009 The OpenSDE Project +# Copyright (C) 2006 - 2010 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -306,5 +306,8 @@ pkg_linux_brokenfiles="$base/architecture/$arch/kernel$treever-disable.lst \ $base/package/*/linux$treever/disable-broken.lst \ $pkg_linux_brokenfiles" -# removing lib/firmware from file list because it belongs to the fhs package -var_append flistdel "|" "lib/firmware" +# if the fhs package is enabled, remove 'lib/firmware' from file list because +# then this directory belongs to the fhs package +if pkginstalled fhs; then + var_append flistdel "|" "lib/firmware" +fi