diff --git a/SysBuild/multimedia/alsa-firmware b/SysBuild/multimedia/alsa-firmware index ec14272..96f68e9 100644 --- a/SysBuild/multimedia/alsa-firmware +++ b/SysBuild/multimedia/alsa-firmware @@ -91,5 +91,5 @@ mk() { } postmk() { - mv $TMPROOT/$LIBDIR $TMPROOT/usr/ + mv $TMPROOT/lib $TMPROOT/usr/$LIBDIR } diff --git a/SysBuild/tools/wlan_intel_fw b/SysBuild/tools/wlan_intel_fw index 229821c..e6b7390 100644 --- a/SysBuild/tools/wlan_intel_fw +++ b/SysBuild/tools/wlan_intel_fw @@ -77,17 +77,17 @@ SRCPATH=Tools/System VERSION=0.0.l premk() { - mkdir -p $TMPROOT/usr/lib/{firmware,hotplug} - ln -s /usr/lib/firmware $TMPROOT/usr/lib/hotplug/firmware - mkdir -P $TMPROOT/lib - ln -s /usr/lib/firmware $TMPROOT/lib/firmware + mkdir -p $TMPROOT/usr/$LIBDIR/{firmware,hotplug} + ln -s /usr/$LIBDIR/firmware $TMPROOT/usr/$LIBDIR/hotplug/firmware + mkdir -P $TMPROOT/$LIBDIR + ln -s /usr/$LIBDIR/firmware $TMPROOT/$LIBDIR/firmware } mk() { - tar -C $TMPROOT/usr/lib/firmware -xvf $LFSSOURCE/$SRCPATH/ipw2100-fw*.tgz + tar -C $TMPROOT/usr/$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/lib/firmware + cp *.fw $TMPROOT/usr/$LIBDIR/firmware cd .. rm -r ipw2200-fw* for i in 1000 3945 4965 5000 5150 6000; do @@ -96,7 +96,7 @@ mk() { done for j in iwlwifi-$i-ucode*; do cd $j - cp iwlwifi-$i-*.ucode $TMPROOT/usr/lib/firmware + cp iwlwifi-$i-*.ucode $TMPROOT/usr/$LIBDIR/firmware cd .. done rm -r iwlwifi-$i-ucode*