Attachment 608259 Details for Bug 853198 – spec file patch

[patch] spec file patch

lf.diff (text/plain), 3.37 KB, created by Daniel Drake on 2012-08-30 17:17:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Drake

Created: 2012-08-30 17:17:23 UTC

Size: 3.37 KB

patch

obsolete

>diff --git a/linux-firmware.spec b/linux-firmware.spec
>index ee01347..2e7b42f 100644
>--- a/linux-firmware.spec
>+++ b/linux-firmware.spec
>@@ -180,6 +180,33 @@ This package contains the firmware required by the iwlagn driver
> for Linux.  Usage of the firmware is subject to the terms and conditions
> contained inside the provided LICENSE file. Please read it carefully.
> 
>+%package -n libertas-usb8388-firmware
>+Summary:	Firmware for Marvell Libertas USB 8388 Network Adapter
>+License:	Redistributable, no modification permitted
>+Obsoletes:	libertas-usb8388-firmware < 5.110.22.p23-8
>+%description -n libertas-usb8388-firmware
>+Firmware for Marvell Libertas USB 8388 Network Adapter
>+
>+%package -n libertas-usb8388-olpc-firmware
>+Summary:	OLPC firmware for Marvell Libertas USB 8388 Network Adapter
>+License:	Redistributable, no modification permitted
>+%description -n libertas-usb8388-olpc-firmware
>+Firmware for Marvell Libertas USB 8388 Network Adapter with OLPC mesh network
>+support.
>+
>+%package -n libertas-sd8686-firmware
>+Summary:	Firmware for Marvell Libertas SD 8686 Network Adapter
>+License:	Redistributable, no modification permitted
>+Obsoletes:	libertas-sd8686-firmware < 9.70.20.p0-4
>+%description -n libertas-sd8686-firmware
>+Firmware for Marvell Libertas SD 8686 Network Adapter
>+
>+%package -n libertas-sd8787-firmware
>+Summary:	Firmware for Marvell Libertas SD 8787 Network Adapter
>+License:	Redistributable, no modification permitted
>+%description -n libertas-sd8787-firmware
>+Firmware for Marvell Libertas SD 8787 Network Adapter
>+
> %prep
> %setup -q -n linux-firmware-%{checkout}
> git init .
>@@ -205,16 +232,29 @@ rm phanfw.bin LICENCE.phanfw
> # Remove source files we don't need to install
> rm -f usbdux/*dux */*.asm
> 
>+# No need to install old firmware versions where we also provide newer versions
>+# which are preferred and support the same (or more) hardware
>+rm -f libertas/sd8686_v8*
>+rm -f libertas/usb8388_v5.bin
>+
> %install
> rm -rf $RPM_BUILD_ROOT
> mkdir -p $RPM_BUILD_ROOT/lib/firmware
> cp -r * $RPM_BUILD_ROOT/lib/firmware
> rm $RPM_BUILD_ROOT/lib/firmware/{WHENCE,LICENCE.*,LICENSE.*}
>+
>+# Create file list but exclude firmwares that we place in subpackages
> FILEDIR=`pwd`
> pushd $RPM_BUILD_ROOT/lib/firmware
>-find . \! -type d \! -name iwlwifi\* > $FILEDIR/linux-firmware.files.tmp
>+find . \! -type d > $FILEDIR/linux-firmware.files
> popd
>-sed -e 's/\./\/lib\/firmware\//' linux-firmware.files.tmp > linux-firmware.files
>+sed -i -e 's:^./::' linux-firmware.files
>+sed -i -e '/^iwlwifi/d' \
>+	-i -e '/^libertas\/sd8686/d' \
>+	-i -e '/^libertas\/usb8388/d' \
>+	-i -e '/^mrvl\/sd8787/d' \
>+	linux-firmware.files
>+sed -i -e 's/^/\/lib\/firmware\//' linux-firmware.files
> 
> %clean
> rm -rf $RPM_BUILD_ROOT
>@@ -289,6 +329,26 @@ rm -rf $RPM_BUILD_ROOT
> %doc WHENCE LICENCE.iwlwifi_firmware
> /lib/firmware/iwlwifi-6050-*.ucode
> 
>+%files -n libertas-usb8388-firmware
>+%defattr(-,root,root,-)
>+%doc WHENCE LICENCE.Marvell
>+/lib/firmware/libertas/usb8388_v9.bin
>+
>+%files -n libertas-usb8388-olpc-firmware
>+%defattr(-,root,root,-)
>+%doc WHENCE LICENCE.Marvell
>+/lib/firmware/libertas/usb8388_olpc.bin
>+
>+%files -n libertas-sd8686-firmware
>+%defattr(-,root,root,-)
>+%doc WHENCE LICENCE.Marvell
>+/lib/firmware/libertas/sd8686*
>+
>+%files -n libertas-sd8787-firmware
>+%defattr(-,root,root,-)
>+%doc WHENCE LICENCE.Marvell
>+/lib/firmware/mrvl/sd8787*
>+
> %files -f linux-firmware.files
> %defattr(-,root,root,-)
> %doc WHENCE LICENCE.* LICENSE.*

Actions: View | Diff

Attachments on bug 853198: 608259