Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6607ddad authored by maximilian attems's avatar maximilian attems Committed by Michal Marek
Browse files

deb-pkg: Install linux-firmware-image in versioned dir 



That way they don't file conflict with official firmware package:
 trying to overwrite '/lib/firmware/qlogic/1040.bin', which is
               also in package firmware-qlogic 0.35
..

Reported-by: default avatarMichael Prokop <mika@debian.org>
Signed-off-by: default avatarmaximilian attems <max@stro.at>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent d5bfb6b3

scripts/package/builddeb

+3 −2
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" 
mkdir -m 755 -p "$tmpdir/DEBIAN"

mkdir -p  "$tmpdir/lib" "$tmpdir/boot" "$tmpdir/usr/share/doc/$packagename"

mkdir -m 755 -p "$fwdir/DEBIAN"

mkdir -p "$fwdir/lib" "$fwdir/usr/share/doc/$fwpackagename"

mkdir -p "$fwdir/lib/firmware/$version/" "$fwdir/usr/share/doc/$fwpackagename"

mkdir -m 755 -p "$libc_headers_dir/DEBIAN"

mkdir -p "$libc_headers_dir/usr/share/doc/$libc_headers_packagename"

mkdir -m 755 -p "$kernel_headers_dir/DEBIAN"
@@ -267,7 +267,8 @@ EOF 


# Do we have firmware? Move it out of the way and build it into a package.

if [ -e "$tmpdir/lib/firmware" ]; then

	mv "$tmpdir/lib/firmware" "$fwdir/lib/"

	mv "$tmpdir/lib/firmware"/* "$fwdir/lib/firmware/$version/"

	rmdir "$tmpdir/lib/firmware"



	cat <<EOF >> debian/control