summary refs log tree commit diff
path: root/scripts
diff options
context:
space:
mode:
authorSven Joachim <svenjoac@gmx.de>2020-10-26 20:32:16 +0100
committerMasahiro Yamada <masahiroy@kernel.org>2020-11-02 11:31:00 +0900
commitd1889589a4f54b2d1d7075d608b596d6fcfd3d96 (patch)
tree65359c7b6065c19ac8bd31661fd18cbc4fa683b1 /scripts
parentd9b5665fb3c822730857ba9119ead8b5e5ff967d (diff)
downloadlinux-d1889589a4f54b2d1d7075d608b596d6fcfd3d96.tar.gz
builddeb: Fix rootless build in setuid/setgid directory
Building 5.10-rc1 in a setgid directory failed with the following
error:

dpkg-deb: error: control directory has bad permissions 2755 (must be
>=0755 and <=0775)

When building with fakeroot, the earlier chown call would have removed
the setgid bits, but in a rootless build they remain.

Fixes: 3e8541803624 ("builddeb: Enable rootless builds")
Cc: Guillem Jover <guillem@hadrons.org>
Signed-off-by: Sven Joachim <svenjoac@gmx.de>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/package/builddeb2
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 1b11f8993629..91a502bb97e8 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -45,6 +45,8 @@ create_package() {
 	chmod -R go-w "$pdir"
 	# in case we are in a restrictive umask environment like 0077
 	chmod -R a+rX "$pdir"
+	# in case we build in a setuid/setgid directory
+	chmod -R ug-s "$pdir"
 
 	# Create the package
 	dpkg-gencontrol -p$pname -P"$pdir"