linux-kernel - Re: [PATCH 3/3] kbuild: deb-pkg: use more debhelper commands

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <ZYWc2dBxEIx5N0JE@buildd.core.avm.de>
Date: Fri, 22 Dec 2023 15:27:37 +0100
From: Nicolas Schier <n.schier@....de>
To: Masahiro Yamada <masahiroy@...nel.org>
Cc: linux-kbuild@...r.kernel.org, Ben Hutchings <ben@...adent.org.uk>,
	Nathan Chancellor <nathan@...nel.org>,
	Nick Desaulniers <ndesaulniers@...gle.com>,
	Nicolas Schier <nicolas@...sle.eu>, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 3/3] kbuild: deb-pkg: use more debhelper commands

On Wed, Dec 20, 2023 at 03:19:57AM +0900, Masahiro Yamada wrote:
> Commit 36862e14e316 ("kbuild: deb-pkg: use dh_listpackages to know
> enabled packages") started to require the debhelper tool suite.
> 
> Use more dh_* commands in create_package():
> 
>  - dh_installdocs to install copyright
>  - dh_installchangelogs to install changelog
>  - dh_compress to compress changelog
>  - dh_fixperms to replace the raw chmod command
>  - dh_gencontrol to replace the raw dpkg-gencontrol command
>  - dh_md5sums to record the md5sum of included files
>  - dh_builddeb to replace the raw dpkg-deb command
> 
> Signed-off-by: Masahiro Yamada <masahiroy@...nel.org>
> ---
> 
>  scripts/package/builddeb | 23 ++++++++---------------
>  scripts/package/mkdebian |  2 +-
>  2 files changed, 9 insertions(+), 16 deletions(-)
> 
> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
> index 2eb4910f0ef3..436d55a83ab0 100755
> --- a/scripts/package/builddeb
> +++ b/scripts/package/builddeb
> @@ -26,23 +26,16 @@ if_enabled_echo() {
>  
>  create_package() {
>  	local pname="$1" pdir="$2"
> -	local dpkg_deb_opts
>  
> -	mkdir -m 755 -p "$pdir/DEBIAN"
> -	mkdir -p "$pdir/usr/share/doc/$pname"
> -	cp debian/copyright "$pdir/usr/share/doc/$pname/"
> -	cp debian/changelog "$pdir/usr/share/doc/$pname/changelog.Debian"
> -	gzip -n -9 "$pdir/usr/share/doc/$pname/changelog.Debian"
> -	sh -c "cd '$pdir'; find . -type f ! -path './DEBIAN/*' -printf '%P\0' \
> -		| xargs -r0 md5sum > DEBIAN/md5sums"
> +	export DH_OPTIONS="-p${pname} -P${pdir}"
>  
> -	# a+rX in case we are in a restrictive umask environment like 0077
> -	# ug-s in case we build in a setuid/setgid directory
> -	chmod -R go-w,a+rX,ug-s "$pdir"
> -
> -	# Create the package
> -	dpkg-gencontrol -p$pname -P"$pdir"
> -	dpkg-deb --root-owner-group ${KDEB_COMPRESS:+-Z$KDEB_COMPRESS} --build "$pdir" ..
> +	dh_installdocs
> +	dh_installchangelogs
> +	dh_compress
> +	dh_fixperms
> +	dh_gencontrol
> +	dh_md5sums
> +	dh_builddeb -- ${KDEB_COMPRESS:+-Z$KDEB_COMPRESS}
>  }

That looks much cleaner, thanks!

Reviewed-by: Nicolas Schier <n.schier@....de>