Re: [PATCH] builddeb: remove unneeded explicit Architecture

Michal Marek
2012-08-31T13:50:17Z

Adding Max to CC.

On 14.8.2012 12:44, Tzafrir Cohen wrote:
> Architecture was set explicitly in debian/control for one of the three
> packages (linux-libc-dev) but not for the other two. When cross-building
> it gives me an error:
>
> dpkg-gencontrol: error: current host architecture 'armhf' does not
> appear in package's architecture list (amd64)
>
> Also note that if used, dpkg --print-architecture should have been
> replaced with dpkg-architecture.
>
> Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
> ---
> scripts/package/builddeb | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
> index acb8650..d9c71a6 100644
> --- a/scripts/package/builddeb
> +++ b/scripts/package/builddeb
> @@ -252,13 +252,12 @@ mkdir -p "$destdir"
> (cd $objtree; tar -c -f - -T "$objtree/debian/hdrobjfiles") | (cd $destdir; tar -xf -)
> ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build"
> rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
> -arch=$(dpkg --print-architecture)
>
> cat <<EOF >> debian/control
>
> Package: $kernel_headers_packagename
> Provides: linux-headers, linux-headers-2.6
> -Architecture: $arch
> +Architecture: any
> Description: Linux kernel headers for $KERNELRELEASE on $arch
> This package provides kernel header files for $KERNELRELEASE on $arch
> .

As the package contains files from arch/$SRCARCH/include, I doubt that
this is a valid change.

Michal