diff options
| author | maximilian attems <max@stro.at> | 2012-06-08 00:21:15 +0200 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2012-06-28 10:46:25 +0200 |
| commit | 6607ddadf93d19c7f64139f1475c342152f39fe5 (patch) | |
| tree | c7cd59113644a8c14987cb73b3e597253f8fc118 /scripts/package | |
| parent | scripts/config: add option to undef a symbol (diff) | |
| download | linux-6607ddadf93d19c7f64139f1475c342152f39fe5.tar.xz linux-6607ddadf93d19c7f64139f1475c342152f39fe5.zip | |
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: Michael Prokop <mika@debian.org>
Signed-off-by: maximilian attems <max@stro.at>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts/package')
| -rw-r--r-- | scripts/package/builddeb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/package/builddeb b/scripts/package/builddeb index c95fdda58414..6505ecd3050e 100644 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -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 |