2023-08-01 12:48:17

by Masahiro Yamada

[permalink] [raw]

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

---

debian/rules is generated by shell, 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.

Signed-off-by: Masahiro Yamada <[email protected]>
---

Changes in v2:
- Change ${MAKE} to $(MAKE) for consistency
- Fix shellcheck warning

scripts/package/debian/rules | 28 ++++++++++++++++++++++++++++
scripts/package/mkdebian | 34 +++++-----------------------------
2 files changed, 33 insertions(+), 29 deletions(-)
create mode 100755 scripts/package/debian/rules

diff --git a/scripts/package/debian/rules b/scripts/package/debian/rules
new file mode 100755
index 000000000000..226e127efd63
--- /dev/null
+++ b/scripts/package/debian/rules
@@ -0,0 +1,28 @@
+#!/usr/bin/make -f
+# SPDX-License-Identifier: GPL-2.0-only
+
+include debian/rules.vars
+
+srctree ?= .
+
+.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
diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
index 2829f5b8aea6..5044224cf671 100755
--- a/scripts/package/mkdebian
+++ b/scripts/package/mkdebian
@@ -263,35 +263,11 @@ Description: Linux kernel debugging symbols for $version
EOF
fi

-cat <<EOF > debian/rules
-#!/usr/bin/make -f
-
-srctree ?= .
-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
+cat <<EOF > debian/rules.vars
+ARCH := ${ARCH}
+KERNELRELEASE := ${KERNELRELEASE}
EOF
-chmod +x debian/rules
+
+cp "${srctree}/scripts/package/debian/rules" debian/

exit 0
--
2.39.2

2023-08-01 17:04:55

by Nathan Chancellor

[permalink] [raw]

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

---

On Tue, Aug 01, 2023 at 09:19:26PM +0900, Masahiro Yamada wrote:
> debian/rules is generated by shell, 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.
>
> Signed-off-by: Masahiro Yamada <[email protected]>

Tested-by: Nathan Chancellor <[email protected]>

> ---
>
> Changes in v2:
> - Change ${MAKE} to $(MAKE) for consistency
> - Fix shellcheck warning
>
> scripts/package/debian/rules | 28 ++++++++++++++++++++++++++++
> scripts/package/mkdebian | 34 +++++-----------------------------
> 2 files changed, 33 insertions(+), 29 deletions(-)
> create mode 100755 scripts/package/debian/rules
>
> diff --git a/scripts/package/debian/rules b/scripts/package/debian/rules
> new file mode 100755
> index 000000000000..226e127efd63
> --- /dev/null
> +++ b/scripts/package/debian/rules
> @@ -0,0 +1,28 @@
> +#!/usr/bin/make -f
> +# SPDX-License-Identifier: GPL-2.0-only
> +
> +include debian/rules.vars
> +
> +srctree ?= .
> +
> +.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
> diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
> index 2829f5b8aea6..5044224cf671 100755
> --- a/scripts/package/mkdebian
> +++ b/scripts/package/mkdebian
> @@ -263,35 +263,11 @@ Description: Linux kernel debugging symbols for $version
> EOF
> fi
>
> -cat <<EOF > debian/rules
> -#!/usr/bin/make -f
> -
> -srctree ?= .
> -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
> +cat <<EOF > debian/rules.vars
> +ARCH := ${ARCH}
> +KERNELRELEASE := ${KERNELRELEASE}
> EOF
> -chmod +x debian/rules
> +
> +cp "${srctree}/scripts/package/debian/rules" debian/
>
> exit 0
> --
> 2.39.2
>

2023-08-01 21:21:00

by Nicolas Schier

[permalink] [raw]

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

---

On Tue, Aug 01, 2023 at 09:19:26PM +0900 Masahiro Yamada wrote:
> debian/rules is generated by shell, 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.
>
> Signed-off-by: Masahiro Yamada <[email protected]>
> ---
>
> Changes in v2:
> - Change ${MAKE} to $(MAKE) for consistency
> - Fix shellcheck warning
>

Reviewed-by: Nicolas Schier <[email protected]>

---

Attachments:

(No filename) (566.00 B)
signature.asc (849.00 B)
Download all attachments