Re: [PATCH 2/2] kbuild: Only build linux-image package for UML

[Ben Hutchings <ben@decadent.org.uk>]

[-- Attachment #1: Type: text/plain, Size: 2326 bytes --]

On Wed, 2012-02-15 at 17:38 +0100, Joerg Roedel wrote:
> For user-mode Linux the other packages are not required. So
> only build the package with the linux-image in it.
> 
> Cc: Michal Marek <mmarek@suse.cz>
> Cc: maximilian attems <max@stro.at>
> Cc: Ben Hutchings <ben@decadent.org.uk>
> Cc: debian-kernel@lists.debian.org
> Cc: linux-kbuild@vger.kernel.org
> Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Tested-by: Ben Hutchings <ben@decadent.org.uk>

But I've never touched UML either so we should get confirmation that
this really is the right thing to do.

Ben.

> ---
>  scripts/package/builddeb |   14 +++++++++-----
>  1 files changed, 9 insertions(+), 5 deletions(-)
> 
> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
> index 39e3f30..0db889f 100644
> --- a/scripts/package/builddeb
> +++ b/scripts/package/builddeb
> @@ -130,8 +130,10 @@ if grep -q '^CONFIG_MODULES=y' .config ; then
>  	fi
>  fi
>  
> -make headers_check
> -make headers_install INSTALL_HDR_PATH="$libc_headers_dir/usr"
> +if [ "$ARCH" != "um" ]; then
> +	make headers_check
> +	make headers_install INSTALL_HDR_PATH="$libc_headers_dir/usr"
> +fi
>  
>  # Install the maintainer scripts
>  # Note: hook scripts under /etc/kernel are also executed by official Debian
> @@ -263,8 +265,6 @@ Description: Linux kernel headers for $KERNELRELEASE on $arch
>   This is useful for people who need to build external modules
>  EOF
>  
> -create_package "$kernel_headers_packagename" "$kernel_headers_dir"
> -
>  # 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/"
> @@ -291,7 +291,11 @@ Description: Linux support headers for userspace development
>   are used by the installed headers for GNU glibc and other system libraries.
>  EOF
>  
> -create_package "$libc_headers_packagename" "$libc_headers_dir"
> +if [ "$ARCH" != "um" ]; then
> +	create_package "$kernel_headers_packagename" "$kernel_headers_dir"
> +	create_package "$libc_headers_packagename" "$libc_headers_dir"
> +fi
> +
>  create_package "$packagename" "$tmpdir"
>  
>  exit 0
> -- 
> 1.7.5.4
> 
> 
> 

-- 
Ben Hutchings
Beware of programmers who carry screwdrivers. - Leonard Brandwein

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]