From: Nicolas Schier <nicolas@fjasle.eu>
To: Masahiro Yamada <masahiroy@kernel.org>
Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
Ben Hutchings <ben@decadent.org.uk>,
Nathan Chancellor <nathan@kernel.org>,
Nick Desaulniers <ndesaulniers@google.com>
Subject: Re: [PATCH v6 05/12] kbuild: deb-pkg: hide KDEB_SOURCENAME from Makefile
Date: Fri, 24 Feb 2023 23:33:56 +0100 [thread overview]
Message-ID: <Y/k7VA2z6MdgfS/v@fjasle.eu> (raw)
In-Reply-To: <20230215012034.403356-5-masahiroy@kernel.org>
[-- Attachment #1: Type: text/plain, Size: 3225 bytes --]
On Wed, Feb 15, 2023 at 10:20:27AM +0900 Masahiro Yamada wrote:
> scripts/Makefile.package does not need to know the value of
> KDEB_SOURCENAME because the source name can be taken from
> debian/changelog by using dpkg-parsechangelog.
>
> Move the default of KDEB_SOURCENAME (i.e. linux-upstream) to
> scripts/package/mkdebian.
>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---
>
> (no changes since v5)
>
> Changes in v5:
> - Copy linux.tar.gz to .orig tarball
>
> Changes in v3:
> - Move cmd_debianize
>
> Changes in v2:
> - New patch
>
> scripts/Makefile.package | 23 +++++++++++++++--------
> scripts/package/mkdebian | 2 +-
> 2 files changed, 16 insertions(+), 9 deletions(-)
>
> diff --git a/scripts/Makefile.package b/scripts/Makefile.package
> index 7266a11855f4..c207f4ec47ac 100644
> --- a/scripts/Makefile.package
> +++ b/scripts/Makefile.package
> @@ -4,9 +4,7 @@
> include $(srctree)/scripts/Kbuild.include
>
> KERNELPATH := kernel-$(subst -,_,$(KERNELRELEASE))
> -KDEB_SOURCENAME ?= linux-upstream
> KBUILD_PKG_ROOTCMD ?="fakeroot -u"
> -export KDEB_SOURCENAME
> # Include only those top-level files that are needed by make, plus the GPL copy
> TAR_CONTENT := Documentation LICENSES arch block certs crypto drivers fs \
> include init io_uring ipc kernel lib mm net rust \
> @@ -87,17 +85,26 @@ binrpm-pkg:
> +rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \
> $(UTS_MACHINE)-linux -bb $(objtree)/binkernel.spec
>
> +quiet_cmd_debianize = GEN $@
> + cmd_debianize = $(srctree)/scripts/package/mkdebian
> +
> +debian: FORCE
> + $(call cmd,debianize)
> +
> +PHONY += debian-orig
> +debian-orig: private source = $(shell dpkg-parsechangelog -S Source)
> +debian-orig: private version = $(shell dpkg-parsechangelog -S Version | sed 's/-[^-]*$$//')
> +debian-orig: private orig-name = $(source)_$(version).orig.tar.gz
> +debian-orig: linux.tar.gz debian
> + $(Q)cp $< ../$(orig-name)
> +
> PHONY += deb-pkg
> -deb-pkg: linux.tar.gz
> - $(CONFIG_SHELL) $(srctree)/scripts/package/mkdebian
> - origversion=$$(dpkg-parsechangelog -SVersion |sed 's/-[^-]*$$//');\
> - cp linux.tar.gz ../$(KDEB_SOURCENAME)_$${origversion}.orig.tar.gz
> +deb-pkg: debian-orig
> +dpkg-buildpackage -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch) $(DPKG_FLAGS) \
> --build=source,binary --source-option=-sP -nc -us -uc
>
> PHONY += bindeb-pkg
> -bindeb-pkg:
> - $(CONFIG_SHELL) $(srctree)/scripts/package/mkdebian
> +bindeb-pkg: debian
> +dpkg-buildpackage -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch) $(DPKG_FLAGS) -b -nc -uc
>
> PHONY += intdeb-pkg
> diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
> index 68b13ef590ba..534e9713761a 100755
> --- a/scripts/package/mkdebian
> +++ b/scripts/package/mkdebian
> @@ -95,7 +95,7 @@ else
> revision=$($srctree/init/build-version)
> packageversion=$version-$revision
> fi
> -sourcename=$KDEB_SOURCENAME
> +sourcename=${KDEB_SOURCENAME:-linux-upstream}
>
> if [ "$ARCH" = "um" ] ; then
> packagename=user-mode-linux
> --
> 2.34.1
Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2023-02-24 22:34 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-15 1:20 [PATCH v6 01/12] kbuild: add a tool to list files ignored by git Masahiro Yamada
2023-02-15 1:20 ` [PATCH v6 02/12] kbuild: deb-pkg: create source package without cleaning Masahiro Yamada
2023-02-24 22:28 ` Nicolas Schier
2023-02-15 1:20 ` [PATCH v6 03/12] kbuild: rpm-pkg: build binary packages from source rpm Masahiro Yamada
2023-02-15 1:20 ` [PATCH v6 04/12] kbuild: srcrpm-pkg: create source package without cleaning Masahiro Yamada
2023-02-15 1:20 ` [PATCH v6 05/12] kbuild: deb-pkg: hide KDEB_SOURCENAME from Makefile Masahiro Yamada
2023-02-24 22:33 ` Nicolas Schier [this message]
2023-02-15 1:20 ` [PATCH v6 06/12] kbuild: deb-pkg: make .orig tarball a hard link if possible Masahiro Yamada
2023-02-24 22:37 ` Nicolas Schier
2023-02-15 1:20 ` [PATCH v6 07/12] kbuild: deb-pkg: switch over to source format 3.0 (quilt) Masahiro Yamada
2023-02-24 22:42 ` Nicolas Schier
2023-02-25 8:54 ` Masahiro Yamada
2023-02-15 1:20 ` [PATCH v6 08/12] kbuild: make perf-tar*-src-pkg work without relying on git Masahiro Yamada
2023-02-15 1:20 ` [PATCH v6 09/12] kbuild: tar-pkg: use tar rules in scripts/Makefile.package Masahiro Yamada
2023-02-15 1:20 ` [PATCH v6 10/12] kbuild: deb-pkg: fix binary-arch and clean in debian/rules Masahiro Yamada
2023-02-15 1:20 ` [PATCH v6 11/12] kbuild: deb-pkg: improve the usability of source package Masahiro Yamada
2023-03-08 12:29 ` Péter Ujfalusi
2023-03-08 17:01 ` Masahiro Yamada
2023-02-15 1:20 ` [PATCH v6 12/12] kbuild: add srcdeb-pkg target Masahiro Yamada
2023-02-24 22:48 ` Nicolas Schier
2023-02-25 10:14 ` Masahiro Yamada
2023-03-01 20:41 ` Nicolas Schier
2023-02-26 8:01 ` [PATCH v6 01/12] kbuild: add a tool to list files ignored by git Masahiro Yamada
2023-03-06 14:27 ` Nicolas Schier
2023-02-27 8:24 ` Rasmus Villemoes
2023-02-27 9:51 ` Masahiro Yamada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y/k7VA2z6MdgfS/v@fjasle.eu \
--to=nicolas@fjasle.eu \
--cc=ben@decadent.org.uk \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox