|
92 | 92 | fi |
93 | 93 | sourcename=$KDEB_SOURCENAME |
94 | 94 | tmpdir="$objtree/debian/tmp" |
95 | | -fwdir="$objtree/debian/fwtmp" |
96 | 95 | kernel_headers_dir="$objtree/debian/hdrtmp" |
97 | 96 | libc_headers_dir="$objtree/debian/headertmp" |
98 | 97 | dbg_dir="$objtree/debian/dbgtmp" |
99 | 98 | packagename=linux-image-$version |
100 | | -fwpackagename=linux-firmware-image-$version |
101 | 99 | kernel_headers_packagename=linux-headers-$version |
102 | 100 | libc_headers_packagename=linux-libc-dev |
103 | 101 | dbg_packagename=$packagename-dbg |
@@ -126,10 +124,9 @@ esac |
126 | 124 | BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)" |
127 | 125 |
|
128 | 126 | # 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 |
130 | 128 | mkdir -m 755 -p "$tmpdir/DEBIAN" |
131 | 129 | mkdir -p "$tmpdir/lib" "$tmpdir/boot" |
132 | | -mkdir -p "$fwdir/lib/firmware/$version/" |
133 | 130 | mkdir -p "$kernel_headers_dir/lib/modules/$version/" |
134 | 131 |
|
135 | 132 | # Build and install the kernel |
|
306 | 303 | cat <<EOF >> debian/control |
307 | 304 |
|
308 | 305 | Package: $packagename |
309 | | -Suggests: $fwpackagename |
310 | 306 | Architecture: any |
311 | 307 | Description: Linux kernel, version $version |
312 | 308 | This package contains the Linux kernel, modules and corresponding other |
@@ -345,22 +341,6 @@ Description: Linux kernel headers for $KERNELRELEASE on \${kernel:debarch} |
345 | 341 | This is useful for people who need to build external modules |
346 | 342 | EOF |
347 | 343 |
|
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 | | - |
364 | 344 | cat <<EOF >> debian/control |
365 | 345 |
|
366 | 346 | Package: $libc_headers_packagename |
|
0 commit comments