Skip to content

Commit cc18abb

Browse files
committed
kbuild: deb-pkg: remove firmware package support
Commit 5620a0d ("firmware: delete in-kernel firmware") deleted in-kernel firmware support, including the firmware install command. So, the firmware package does not make sense any more. Remove it. Signed-off-by: Masahiro Yamada <[email protected]> Reviewed-by: Riku Voipio <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]>
1 parent 9e09007 commit cc18abb

File tree

1 file changed

+1
-21
lines changed

1 file changed

+1
-21
lines changed

scripts/package/builddeb

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,10 @@ else
9292
fi
9393
sourcename=$KDEB_SOURCENAME
9494
tmpdir="$objtree/debian/tmp"
95-
fwdir="$objtree/debian/fwtmp"
9695
kernel_headers_dir="$objtree/debian/hdrtmp"
9796
libc_headers_dir="$objtree/debian/headertmp"
9897
dbg_dir="$objtree/debian/dbgtmp"
9998
packagename=linux-image-$version
100-
fwpackagename=linux-firmware-image-$version
10199
kernel_headers_packagename=linux-headers-$version
102100
libc_headers_packagename=linux-libc-dev
103101
dbg_packagename=$packagename-dbg
@@ -126,10 +124,9 @@ esac
126124
BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)"
127125

128126
# Setup the directory structure
129-
rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" $objtree/debian/files
127+
rm -rf "$tmpdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" $objtree/debian/files
130128
mkdir -m 755 -p "$tmpdir/DEBIAN"
131129
mkdir -p "$tmpdir/lib" "$tmpdir/boot"
132-
mkdir -p "$fwdir/lib/firmware/$version/"
133130
mkdir -p "$kernel_headers_dir/lib/modules/$version/"
134131

135132
# Build and install the kernel
@@ -306,7 +303,6 @@ else
306303
cat <<EOF >> debian/control
307304
308305
Package: $packagename
309-
Suggests: $fwpackagename
310306
Architecture: any
311307
Description: Linux kernel, version $version
312308
This package contains the Linux kernel, modules and corresponding other
@@ -345,22 +341,6 @@ Description: Linux kernel headers for $KERNELRELEASE on \${kernel:debarch}
345341
This is useful for people who need to build external modules
346342
EOF
347343

348-
# Do we have firmware? Move it out of the way and build it into a package.
349-
if [ -e "$tmpdir/lib/firmware" ]; then
350-
mv "$tmpdir/lib/firmware"/* "$fwdir/lib/firmware/$version/"
351-
rmdir "$tmpdir/lib/firmware"
352-
353-
cat <<EOF >> debian/control
354-
355-
Package: $fwpackagename
356-
Architecture: all
357-
Description: Linux kernel firmware, version $version
358-
This package contains firmware from the Linux kernel, version $version.
359-
EOF
360-
361-
create_package "$fwpackagename" "$fwdir"
362-
fi
363-
364344
cat <<EOF >> debian/control
365345
366346
Package: $libc_headers_packagename

0 commit comments

Comments
 (0)