From 9c90c006937058850613baef1ff4dcd959aba8f5 Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Wed, 19 May 2010 10:40:58 +0000
Subject: [PATCH] =?UTF-8?q?Firmware=20Pfad=20in=20/lib{64}/firmware=20ge?=
 =?UTF-8?q?=C3=83=E2=82=ACndert=20-=20da=20ansonsten=20u.U.=20die=20firmwa?=
 =?UTF-8?q?re=20nicht=20geladen=20werden=20kann.=20/usr/lib{64}/firmware?=
 =?UTF-8?q?=20bzw.=20/usr/lib{64}/hotplug/firmware=20sind=20jetzt=20nur=20?=
 =?UTF-8?q?noch=20softlinks?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@5622 504e572c-2e33-0410-9681-be2bf7408885
---
 SysBuild/multimedia/alsa-firmware |  6 +++++-
 SysBuild/tools/bluez-firmware     |  6 +++++-
 SysBuild/tools/wlan_intel_fw      | 14 +++++++-------
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/SysBuild/multimedia/alsa-firmware b/SysBuild/multimedia/alsa-firmware
index 96f68e9..924aae7 100644
--- a/SysBuild/multimedia/alsa-firmware
+++ b/SysBuild/multimedia/alsa-firmware
@@ -91,5 +91,9 @@ mk() {
 }
 
 postmk() {
-	mv $TMPROOT/lib $TMPROOT/usr/$LIBDIR
+	if [ $MK64BIT == "true"  ]; then
+		mv $TMPROOT/lib $TMPROOT/$LIBDIR
+	fi
+	mkdir $TMPROOT/usr/$LIBDIR
+	ln -s /$LIBDIR/firmware $TMPROOT/usr/$LIBDIR/firmware
 }
diff --git a/SysBuild/tools/bluez-firmware b/SysBuild/tools/bluez-firmware
index da25d4a..1b6533b 100644
--- a/SysBuild/tools/bluez-firmware
+++ b/SysBuild/tools/bluez-firmware
@@ -90,5 +90,9 @@ mk() {
 }
 
 postmk() {
-	echo "Nothing to do for postmk()"
+	if [ -d $TMPROOT/usr/$LIBDIR/firmware ]; then
+		mkdir -p $TMPROOT/$LIBDIR
+		mv $TMPROOT/usr/$LIBDIR/firmware $TMPROOT/$LIBDIR
+		ln -s /$LIBDIR/firmware $TMPROOT/usr/$LIBDIR/firmware
+	fi
 }
diff --git a/SysBuild/tools/wlan_intel_fw b/SysBuild/tools/wlan_intel_fw
index 285be9c..128737e 100644
--- a/SysBuild/tools/wlan_intel_fw
+++ b/SysBuild/tools/wlan_intel_fw
@@ -81,14 +81,14 @@ premk() {
 }
 
 mk() {
-	mkdir -vp $TMPROOT/usr/$LIBDIR/{firmware,hotplug}
-	mkdir -vp $TMPROOT/$LIBDIR
-	ln -vsf /usr/$LIBDIR/firmware $TMPROOT/usr/$LIBDIR/hotplug/firmware
-	ln -vsf /usr/$LIBDIR/firmware $TMPROOT/$LIBDIR/firmware
-	tar -C $TMPROOT/usr/$LIBDIR/firmware -xvf $LFSSOURCE/$SRCPATH/ipw2100-fw*.tgz
+	mkdir -vp $TMPROOT/usr/$LIBDIR/hotplug
+	mkdir -vp $TMPROOT/$LIBDIR/firmware
+	ln -vsf /$LIBDIR/firmware $TMPROOT/usr/$LIBDIR/hotplug/firmware
+	ln -vsf /$LIBDIR/firmware $TMPROOT/usr/$LIBDIR/firmware
+	tar -C $TMPROOT/$LIBDIR/firmware -xvf $LFSSOURCE/$SRCPATH/ipw2100-fw*.tgz
 	tar -C $MAKEDIR -xvf $LFSSOURCE/$SRCPATH/ipw2200-fw*.tgz
 	cd $MAKEDIR/ipw2200-fw*
-	cp *.fw $TMPROOT/usr/$LIBDIR/firmware
+	cp *.fw $TMPROOT/$LIBDIR/firmware
 	cd ..
 	rm -r ipw2200-fw*
 	for i in 1000 3945 4965 5000 5150 6000; do
@@ -97,7 +97,7 @@ mk() {
 		done
 		for j in iwlwifi-$i-ucode*; do
 			cd $j
-			cp iwlwifi-$i-*.ucode $TMPROOT/usr/$LIBDIR/firmware
+			cp iwlwifi-$i-*.ucode $TMPROOT/$LIBDIR/firmware
 			cd ..
 		done
 		rm -r iwlwifi-$i-ucode*