kbuild: deb-pkg: get rid of |flex:native workaround from Build-Depends

[PATCH] kbuild: deb-pkg: get rid of |flex:native workaround from Build-Depends

Posted by Masahiro Yamada 2 years, 5 months ago

"| flex:native" was a workaround (suggested by Ben, see Link) because
"MultiArch: foreign" was missing in the flex package on some old distros
when commit e3a22850664f ("deb-pkg: generate correct build dependencies")
was applied.

It seems fixing the flex package has been completed. Get rid of the
workaround.

Link: https://lore.kernel.org/linux-kbuild/ab49b0582ef12b14b1a68877263b81813e2492a2.camel@decadent.org.uk/
Link: https://wiki.debian.org/CrossBuildPackagingGuidelines
Cc: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 scripts/package/mkdebian | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
index 60a2a63a5e90..852d13e738c5 100755
--- a/scripts/package/mkdebian
+++ b/scripts/package/mkdebian
@@ -175,7 +175,7 @@ Section: kernel
 Priority: optional
 Maintainer: $maintainer
 Rules-Requires-Root: no
-Build-Depends: bc, rsync, kmod, cpio, bison, flex | flex:native $extra_build_depends
+Build-Depends: bc, rsync, kmod, cpio, bison, flex $extra_build_depends
 Homepage: https://www.kernel.org/
 
 Package: $packagename-$version
-- 
2.34.1

Re: [PATCH] kbuild: deb-pkg: get rid of |flex:native workaround from Build-Depends

Posted by Ben Hutchings 2 years, 5 months ago

On Thu, 2022-11-17 at 10:30 +0900, Masahiro Yamada wrote:
> "| flex:native" was a workaround (suggested by Ben, see Link) because
> "MultiArch: foreign" was missing in the flex package on some old distros
> when commit e3a22850664f ("deb-pkg: generate correct build dependencies")
> was applied.
> 
> It seems fixing the flex package has been completed. Get rid of the
> workaround.
> 
> Link: https://lore.kernel.org/linux-kbuild/ab49b0582ef12b14b1a68877263b81813e2492a2.camel@decadent.org.uk/
> Link: https://wiki.debian.org/CrossBuildPackagingGuidelines
> Cc: Ben Hutchings <ben@decadent.org.uk>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

Reviewed-by: Ben Hutchings <ben@decadent.org.uk>

> ---
> 
>  scripts/package/mkdebian | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
> index 60a2a63a5e90..852d13e738c5 100755
> --- a/scripts/package/mkdebian
> +++ b/scripts/package/mkdebian
> @@ -175,7 +175,7 @@ Section: kernel
>  Priority: optional
>  Maintainer: $maintainer
>  Rules-Requires-Root: no
> -Build-Depends: bc, rsync, kmod, cpio, bison, flex | flex:native $extra_build_depends
> +Build-Depends: bc, rsync, kmod, cpio, bison, flex $extra_build_depends
>  Homepage: https://www.kernel.org/
>  
>  Package: $packagename-$version

-- 
Ben Hutchings
Larkinson's Law: All laws are basically false.