* [PATCH] kbuild: deb-pkg: remove firmware package support
@ 2017-09-18 9:22 Masahiro Yamada
2017-09-18 9:28 ` Riku Voipio
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Masahiro Yamada @ 2017-09-18 9:22 UTC (permalink / raw)
To: linux-kbuild
Cc: Greg Kroah-Hartman, Markus Trippelsdorf, Ben Hutchings,
Riku Voipio, Masahiro Yamada, Michal Marek, linux-kernel
Commit 5620a0d1aacd ("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 <yamada.masahiro@socionext.com>
---
scripts/package/builddeb | 22 +---------------------
1 file changed, 1 insertion(+), 21 deletions(-)
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index aad6700..0bc8747 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -92,12 +92,10 @@ else
fi
sourcename=$KDEB_SOURCENAME
tmpdir="$objtree/debian/tmp"
-fwdir="$objtree/debian/fwtmp"
kernel_headers_dir="$objtree/debian/hdrtmp"
libc_headers_dir="$objtree/debian/headertmp"
dbg_dir="$objtree/debian/dbgtmp"
packagename=linux-image-$version
-fwpackagename=linux-firmware-image-$version
kernel_headers_packagename=linux-headers-$version
libc_headers_packagename=linux-libc-dev
dbg_packagename=$packagename-dbg
@@ -126,10 +124,9 @@ esac
BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)"
# Setup the directory structure
-rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" $objtree/debian/files
+rm -rf "$tmpdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" $objtree/debian/files
mkdir -m 755 -p "$tmpdir/DEBIAN"
mkdir -p "$tmpdir/lib" "$tmpdir/boot"
-mkdir -p "$fwdir/lib/firmware/$version/"
mkdir -p "$kernel_headers_dir/lib/modules/$version/"
# Build and install the kernel
@@ -306,7 +303,6 @@ else
cat <<EOF >> debian/control
Package: $packagename
-Suggests: $fwpackagename
Architecture: any
Description: Linux kernel, version $version
This package contains the Linux kernel, modules and corresponding other
@@ -345,22 +341,6 @@ Description: Linux kernel headers for $KERNELRELEASE on \${kernel:debarch}
This is useful for people who need to build external modules
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/firmware/$version/"
- rmdir "$tmpdir/lib/firmware"
-
- cat <<EOF >> debian/control
-
-Package: $fwpackagename
-Architecture: all
-Description: Linux kernel firmware, version $version
- This package contains firmware from the Linux kernel, version $version.
-EOF
-
- create_package "$fwpackagename" "$fwdir"
-fi
-
cat <<EOF >> debian/control
Package: $libc_headers_packagename
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] kbuild: deb-pkg: remove firmware package support
2017-09-18 9:22 [PATCH] kbuild: deb-pkg: remove firmware package support Masahiro Yamada
@ 2017-09-18 9:28 ` Riku Voipio
2017-09-18 9:30 ` Greg Kroah-Hartman
2017-09-20 15:54 ` Masahiro Yamada
2 siblings, 0 replies; 4+ messages in thread
From: Riku Voipio @ 2017-09-18 9:28 UTC (permalink / raw)
To: Masahiro Yamada
Cc: linux-kbuild, Greg Kroah-Hartman, Markus Trippelsdorf,
Ben Hutchings, Michal Marek, LKML
On 18 September 2017 at 12:22, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> Commit 5620a0d1aacd ("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 <yamada.masahiro@socionext.com>
Reviewed-by: Riku Voipio <riku.voipio@linaro.org>
> ---
>
> scripts/package/builddeb | 22 +---------------------
> 1 file changed, 1 insertion(+), 21 deletions(-)
>
> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
> index aad6700..0bc8747 100755
> --- a/scripts/package/builddeb
> +++ b/scripts/package/builddeb
> @@ -92,12 +92,10 @@ else
> fi
> sourcename=$KDEB_SOURCENAME
> tmpdir="$objtree/debian/tmp"
> -fwdir="$objtree/debian/fwtmp"
> kernel_headers_dir="$objtree/debian/hdrtmp"
> libc_headers_dir="$objtree/debian/headertmp"
> dbg_dir="$objtree/debian/dbgtmp"
> packagename=linux-image-$version
> -fwpackagename=linux-firmware-image-$version
> kernel_headers_packagename=linux-headers-$version
> libc_headers_packagename=linux-libc-dev
> dbg_packagename=$packagename-dbg
> @@ -126,10 +124,9 @@ esac
> BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)"
>
> # Setup the directory structure
> -rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" $objtree/debian/files
> +rm -rf "$tmpdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" $objtree/debian/files
> mkdir -m 755 -p "$tmpdir/DEBIAN"
> mkdir -p "$tmpdir/lib" "$tmpdir/boot"
> -mkdir -p "$fwdir/lib/firmware/$version/"
> mkdir -p "$kernel_headers_dir/lib/modules/$version/"
>
> # Build and install the kernel
> @@ -306,7 +303,6 @@ else
> cat <<EOF >> debian/control
>
> Package: $packagename
> -Suggests: $fwpackagename
> Architecture: any
> Description: Linux kernel, version $version
> This package contains the Linux kernel, modules and corresponding other
> @@ -345,22 +341,6 @@ Description: Linux kernel headers for $KERNELRELEASE on \${kernel:debarch}
> This is useful for people who need to build external modules
> 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/firmware/$version/"
> - rmdir "$tmpdir/lib/firmware"
> -
> - cat <<EOF >> debian/control
> -
> -Package: $fwpackagename
> -Architecture: all
> -Description: Linux kernel firmware, version $version
> - This package contains firmware from the Linux kernel, version $version.
> -EOF
> -
> - create_package "$fwpackagename" "$fwdir"
> -fi
> -
> cat <<EOF >> debian/control
>
> Package: $libc_headers_packagename
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] kbuild: deb-pkg: remove firmware package support
2017-09-18 9:22 [PATCH] kbuild: deb-pkg: remove firmware package support Masahiro Yamada
2017-09-18 9:28 ` Riku Voipio
@ 2017-09-18 9:30 ` Greg Kroah-Hartman
2017-09-20 15:54 ` Masahiro Yamada
2 siblings, 0 replies; 4+ messages in thread
From: Greg Kroah-Hartman @ 2017-09-18 9:30 UTC (permalink / raw)
To: Masahiro Yamada
Cc: linux-kbuild, Markus Trippelsdorf, Ben Hutchings, Riku Voipio,
Michal Marek, linux-kernel
On Mon, Sep 18, 2017 at 06:22:19PM +0900, Masahiro Yamada wrote:
> Commit 5620a0d1aacd ("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 <yamada.masahiro@socionext.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] kbuild: deb-pkg: remove firmware package support
2017-09-18 9:22 [PATCH] kbuild: deb-pkg: remove firmware package support Masahiro Yamada
2017-09-18 9:28 ` Riku Voipio
2017-09-18 9:30 ` Greg Kroah-Hartman
@ 2017-09-20 15:54 ` Masahiro Yamada
2 siblings, 0 replies; 4+ messages in thread
From: Masahiro Yamada @ 2017-09-20 15:54 UTC (permalink / raw)
To: Linux Kbuild mailing list
Cc: Greg Kroah-Hartman, Markus Trippelsdorf, Ben Hutchings,
Riku Voipio, Masahiro Yamada, Michal Marek,
Linux Kernel Mailing List
2017-09-18 18:22 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>:
> Commit 5620a0d1aacd ("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 <yamada.masahiro@socionext.com>
> ---
>
Applied to linux-kbuild/fixes.
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-09-20 15:55 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-18 9:22 [PATCH] kbuild: deb-pkg: remove firmware package support Masahiro Yamada
2017-09-18 9:28 ` Riku Voipio
2017-09-18 9:30 ` Greg Kroah-Hartman
2017-09-20 15:54 ` Masahiro Yamada
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).