Skip to contentSkip to conversation

kbuild: deb-pkg: use Debian compliant shebang for debian/rules

PATCH Superseded Masahiro Yamada 2 participants 5 messages Jul 29, 2023 – Aug 1, 2023 Kbuild

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 kbuild: deb-pkg: use Debian compliant shebang for debian/rules

Debian Policy "4.9. Main building script: debian/rules" requires "debian/rules must start with the line #!/usr/bin/make -f". [1]

Currently, Kbuild does not follow this policy.

When Kbuild generates debian/rules, "#!$(command -v $MAKE) -f" is expanded by shell. The result may not be "#!/usr/bin/make -f".

There was a reason to opt out the Debian policy.

If you run '/path/to/my/custom/make deb-pkg', debian/rules must also be invoked by the same Make program. If #!/usr/bin/make were hard-coded in debian/rules, the sub-make would be executed by a possibly different Make version.

This is problematic due to the MAKEFLAGS incompatibility, especially the job server flag. Old Make versions used --jobserver-fds to propagate job server file descriptors, but Make >= 4.2 uses --jobserver-auth. The flag disagreement between the parent and the child Make would result in a process fork explosion.

However, having a non-standard path in the shebang causes another issue; the generated source package is not portable as such a path does not exist in other build environments.

This commit solves those conflicting demands.

Hard-code '#!/usr/bin/make -f' in debian/rules to create a portable and Debian-compliant source package.

Pass '--rules-file=$(MAKE) -f debian/rules' when dpkg-buildpackage is invoked from Makefile so that debian/rules is executed by the same Make program as used to start Kbuild.

[1] https://www.debian.org/doc/debian-policy/ch-source.html#main-building-script-debian-rules

---

 scripts/Makefile.package | 2 +-
 scripts/package/mkdebian | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
scripts/Makefile.package +1 -1
index 85beab0363d7..f8a948ec2c6b 100644
@@ -148,7 +148,7 @@ deb-pkg srcdeb-pkg bindeb-pkg:
 	$(if $(findstring source, $(build-type)), \
 		--unsigned-source --compression=$(KDEB_SOURCE_COMPRESS)) \
 	$(if $(findstring binary, $(build-type)), \
-		-r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch), \
+		--rules-file='$(MAKE) -f debian/rules' -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch), \
 		--no-check-builddeps) \
 	$(DPKG_FLAGS))
 
scripts/package/mkdebian +1 -1
index 9105abab9728..2829f5b8aea6 100755
@@ -264,7 +264,7 @@ EOF
 fi
 
 cat <<EOF > debian/rules
-#!$(command -v $MAKE) -f
+#!/usr/bin/make -f
 
 srctree ?= .
 KERNELRELEASE = ${KERNELRELEASE}
Signature · 1 line
2.39.2
#1 lore raw

PATCH 2/2 kbuild: deb-pkg: split debian/rules

debian/rules is generated by shell scripting, but the escape sequence (\$) is unreadable.

debian/rules embeds only two variables (ARCH and KERNELRELEASE).

Split them out to debian/rules.vars, and check-in the rest of Makefile code to scripts/package/debian/rules.

---

 scripts/package/debian/rules | 28 ++++++++++++++++++++++++++++
 scripts/package/mkdebian     | 32 ++++----------------------------
 2 files changed, 32 insertions(+), 28 deletions(-)
 create mode 100755 scripts/package/debian/rules
scripts/package/debian/rules new file +28 -0
new file mode 100755
index 000000000000..a4e5ab5abdd9
@@ -0,0 +1,28 @@
+#!/usr/bin/make -f
+# SPDX-License-Identifier: GPL-2.0-only
+
+srctree ?= .
+
+include debian/rules.vars
+
+.PHONY: binary binary-indep binary-arch
+binary: binary-arch binary-indep
+binary-indep: build-indep
+binary-arch: build-arch
+	$(MAKE) -f $(srctree)/Makefile ARCH=$(ARCH) \
+	KERNELRELEASE=$(KERNELRELEASE) \
+	run-command KBUILD_RUN_COMMAND=+$(srctree)/scripts/package/builddeb
+
+.PHONY: build build-indep build-arch
+build: build-arch build-indep
+build-indep:
+build-arch:
+	$(MAKE) -f $(srctree)/Makefile ARCH=$(ARCH) \
+	KERNELRELEASE=$(KERNELRELEASE) \
+	$(shell $(srctree)/scripts/package/deb-build-option) \
+	olddefconfig all
+
+.PHONY: clean
+clean:
+	rm -rf debian/files debian/linux-*
+	$(MAKE) -f $(srctree)/Makefile ARCH=${ARCH} clean
scripts/package/mkdebian +4 -28
index 2829f5b8aea6..498b579c6320 100755
@@ -263,35 +263,11 @@ Description: Linux kernel debugging symbols for $version
 EOF
 fi
 
-cat <<EOF > debian/rules
-#!/usr/bin/make -f
-
-srctree ?= .
+cat <<EOF > debian/rules.vars
+ARCH = ${ARCH}
 KERNELRELEASE = ${KERNELRELEASE}
-
-.PHONY: clean build build-arch build-indep binary binary-arch binary-indep
-
-build-indep:
-build-arch:
-	\$(MAKE) -f \$(srctree)/Makefile ARCH=${ARCH} \
-	KERNELRELEASE=\$(KERNELRELEASE) \
-	\$(shell \$(srctree)/scripts/package/deb-build-option) \
-	olddefconfig all
-
-build: build-arch
-
-binary-indep:
-binary-arch: build-arch
-	\$(MAKE) -f \$(srctree)/Makefile ARCH=${ARCH} \
-	KERNELRELEASE=\$(KERNELRELEASE) \
-	run-command KBUILD_RUN_COMMAND=+\$(srctree)/scripts/package/builddeb
-
-clean:
-	rm -rf debian/files debian/linux-*
-	\$(MAKE) -f \$(srctree)/Makefile ARCH=${ARCH} clean
-
-binary: binary-arch
 EOF
-chmod +x debian/rules
+
+cp ${srctree}/scripts/package/debian/rules debian/
 
 exit 0
Signature · 1 line
2.39.2
Tested-by Reviewed-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] kbuild: deb-pkg: split debian/rules

Quoted 40 lines · Masahiro Yamada

debian/rules is generated by shell scripting, but the escape sequence (\$) is unreadable.

debian/rules embeds only two variables (ARCH and KERNELRELEASE).

Split them out to debian/rules.vars, and check-in the rest of Makefile code to scripts/package/debian/rules.

---

 scripts/package/debian/rules | 28 ++++++++++++++++++++++++++++
 scripts/package/mkdebian     | 32 ++++----------------------------
 2 files changed, 32 insertions(+), 28 deletions(-)
 create mode 100755 scripts/package/debian/rules
scripts/package/debian/rules new file +18 -0
new file mode 100755
index 000000000000..a4e5ab5abdd9
@@ -0,0 +1,28 @@
+#!/usr/bin/make -f
+# SPDX-License-Identifier: GPL-2.0-only
+
+srctree ?= .
+
+include debian/rules.vars
+
+.PHONY: binary binary-indep binary-arch
+binary: binary-arch binary-indep
+binary-indep: build-indep
+binary-arch: build-arch
+	$(MAKE) -f $(srctree)/Makefile ARCH=$(ARCH) \
+	KERNELRELEASE=$(KERNELRELEASE) \
+	run-command KBUILD_RUN_COMMAND=+$(srctree)/scripts/package/builddeb
+
+.PHONY: build build-indep build-arch
+build: build-arch build-indep
+build-indep:

scripts/package/debian/rules line 28

Quoted 10 lines
scripts/package/debian/rules new file +10 -0
+build-arch:
+	$(MAKE) -f $(srctree)/Makefile ARCH=$(ARCH) \
+	KERNELRELEASE=$(KERNELRELEASE) \
+	$(shell $(srctree)/scripts/package/deb-build-option) \
+	olddefconfig all
+
+.PHONY: clean
+clean:
+	rm -rf debian/files debian/linux-*
+	$(MAKE) -f $(srctree)/Makefile ARCH=${ARCH} clean

possibly use '$(ARCH)' instead of '${ARCH}' here, too?

Quoted 46 lines
scripts/package/mkdebian +4 -28
index 2829f5b8aea6..498b579c6320 100755
@@ -263,35 +263,11 @@ Description: Linux kernel debugging symbols for $version
 EOF
 fi
 
-cat <<EOF > debian/rules
-#!/usr/bin/make -f
-
-srctree ?= .
+cat <<EOF > debian/rules.vars
+ARCH = ${ARCH}
 KERNELRELEASE = ${KERNELRELEASE}
-
-.PHONY: clean build build-arch build-indep binary binary-arch binary-indep
-
-build-indep:
-build-arch:
-	\$(MAKE) -f \$(srctree)/Makefile ARCH=${ARCH} \
-	KERNELRELEASE=\$(KERNELRELEASE) \
-	\$(shell \$(srctree)/scripts/package/deb-build-option) \
-	olddefconfig all
-
-build: build-arch
-
-binary-indep:
-binary-arch: build-arch
-	\$(MAKE) -f \$(srctree)/Makefile ARCH=${ARCH} \
-	KERNELRELEASE=\$(KERNELRELEASE) \
-	run-command KBUILD_RUN_COMMAND=+\$(srctree)/scripts/package/builddeb
-
-clean:
-	rm -rf debian/files debian/linux-*
-	\$(MAKE) -f \$(srctree)/Makefile ARCH=${ARCH} clean
-
-binary: binary-arch
 EOF
-chmod +x debian/rules
+
+cp ${srctree}/scripts/package/debian/rules debian/
 
 exit 0
Signature · 1 line
2.39.2
Signature · 5 lines
Nicolas Schier
 
epost|xmpp: [email protected]          irc://oftc.net/nsc
↳ gpg: 18ed 52db e34f 860e e9fb  c82b 7d97 0932 55a0 ce7f
     -- frykten for herren er opphav til kunnskap --
#3 lore raw

Re: [PATCH 2/2] kbuild: deb-pkg: split debian/rules

Quoted 46 lines · Nicolas Schier
Quoted 44 lines · Masahiro Yamada

debian/rules is generated by shell scripting, but the escape sequence (\$) is unreadable.

debian/rules embeds only two variables (ARCH and KERNELRELEASE).

Split them out to debian/rules.vars, and check-in the rest of Makefile code to scripts/package/debian/rules.

---

 scripts/package/debian/rules | 28 ++++++++++++++++++++++++++++
 scripts/package/mkdebian     | 32 ++++----------------------------
 2 files changed, 32 insertions(+), 28 deletions(-)
 create mode 100755 scripts/package/debian/rules
scripts/package/debian/rules new file +22 -0
new file mode 100755
index 000000000000..a4e5ab5abdd9
@@ -0,0 +1,28 @@
+#!/usr/bin/make -f
+# SPDX-License-Identifier: GPL-2.0-only
+
+srctree ?= .
+
+include debian/rules.vars
+
+.PHONY: binary binary-indep binary-arch
+binary: binary-arch binary-indep
+binary-indep: build-indep
+binary-arch: build-arch
+     $(MAKE) -f $(srctree)/Makefile ARCH=$(ARCH) \
+     KERNELRELEASE=$(KERNELRELEASE) \
+     run-command KBUILD_RUN_COMMAND=+$(srctree)/scripts/package/builddeb
+
+.PHONY: build build-indep build-arch
+build: build-arch build-indep
+build-indep:
+build-arch:
+     $(MAKE) -f $(srctree)/Makefile ARCH=$(ARCH) \
+     KERNELRELEASE=$(KERNELRELEASE) \
+     $(shell $(srctree)/scripts/package/deb-build-option) \
Quoted 8 lines

scripts/package/debian/rules line 28

Quoted 6 lines
scripts/package/debian/rules new file +6 -0
+     olddefconfig all
+
+.PHONY: clean
+clean:
+     rm -rf debian/files debian/linux-*
+     $(MAKE) -f $(srctree)/Makefile ARCH=${ARCH} clean

possibly use '$(ARCH)' instead of '${ARCH}' here, too?

Thanks, I will fix it in v2.

Signature · 2 lines
Best Regards
Masahiro Yamada
Tested-by Reviewed-by on v1 1/2
#4 lore raw
In reply to Masahiro Yamada
Quoted 30 lines · Masahiro Yamada

Debian Policy "4.9. Main building script: debian/rules" requires "debian/rules must start with the line #!/usr/bin/make -f". [1]

Currently, Kbuild does not follow this policy.

When Kbuild generates debian/rules, "#!$(command -v $MAKE) -f" is expanded by shell. The result may not be "#!/usr/bin/make -f".

There was a reason to opt out the Debian policy.

If you run '/path/to/my/custom/make deb-pkg', debian/rules must also be invoked by the same Make program. If #!/usr/bin/make were hard-coded in debian/rules, the sub-make would be executed by a possibly different Make version.

This is problematic due to the MAKEFLAGS incompatibility, especially the job server flag. Old Make versions used --jobserver-fds to propagate job server file descriptors, but Make >= 4.2 uses --jobserver-auth. The flag disagreement between the parent and the child Make would result in a process fork explosion.

However, having a non-standard path in the shebang causes another issue; the generated source package is not portable as such a path does not exist in other build environments.

This commit solves those conflicting demands.

Hard-code '#!/usr/bin/make -f' in debian/rules to create a portable and Debian-compliant source package.

Quoted 8 lines

Pass '--rules-file=$(MAKE) -f debian/rules' when dpkg-buildpackage is invoked from Makefile so that debian/rules is executed by the same Make program as used to start Kbuild.

[1] https://www.debian.org/doc/debian-policy/ch-source.html#main-building-script-debian-rules

---

LGTM, thanks!

Quoted 33 lines
 scripts/Makefile.package | 2 +-
 scripts/package/mkdebian | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
scripts/Makefile.package +1 -1
index 85beab0363d7..f8a948ec2c6b 100644
@@ -148,7 +148,7 @@ deb-pkg srcdeb-pkg bindeb-pkg:
 	$(if $(findstring source, $(build-type)), \
 		--unsigned-source --compression=$(KDEB_SOURCE_COMPRESS)) \
 	$(if $(findstring binary, $(build-type)), \
-		-r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch), \
+		--rules-file='$(MAKE) -f debian/rules' -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch), \
 		--no-check-builddeps) \
 	$(DPKG_FLAGS))
 
scripts/package/mkdebian +1 -1
index 9105abab9728..2829f5b8aea6 100755
@@ -264,7 +264,7 @@ EOF
 fi
 
 cat <<EOF > debian/rules
-#!$(command -v $MAKE) -f
+#!/usr/bin/make -f
 
 srctree ?= .
 KERNELRELEASE = ${KERNELRELEASE}
Signature · 1 line
2.39.2
Signature · 5 lines
Nicolas Schier
 
epost|xmpp: [email protected]          irc://oftc.net/nsc
↳ gpg: 18ed 52db e34f 860e e9fb  c82b 7d97 0932 55a0 ce7f
     -- frykten for herren er opphav til kunnskap --