From: Masahiro Yamada <masahiroy@kernel.org>
To: linux-kbuild@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
Nathan Chancellor <nathan@kernel.org>,
Nick Desaulniers <ndesaulniers@google.com>,
Nicolas Schier <nicolas@fjasle.eu>,
Masahiro Yamada <masahiroy@kernel.org>
Subject: [PATCH v2 5/5] kbuild: deb-pkg: hide KDEB_SOURCENAME from Makefile
Date: Mon, 30 Jan 2023 03:46:02 +0900 [thread overview]
Message-ID: <20230129184602.3974058-5-masahiroy@kernel.org> (raw)
In-Reply-To: <20230129184602.3974058-1-masahiroy@kernel.org>
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>
---
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 0e16ecfddad6..2ee39e0f24ee 100644
--- a/scripts/Makefile.package
+++ b/scripts/Makefile.package
@@ -3,9 +3,7 @@
include $(srctree)/scripts/Kbuild.include
-KDEB_SOURCENAME ?= linux-upstream
KBUILD_PKG_ROOTCMD ?="fakeroot -u"
-export KDEB_SOURCENAME
MKSPEC := $(srctree)/scripts/package/mkspec
# Source Tarball
@@ -52,19 +50,28 @@ binrpm-pkg:
+rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \
$(UTS_MACHINE)-linux -bb $(objtree)/binkernel.spec
+# deb-pkg, bindeb-pkg
+# ---------------------------------------------------------------------------
+
PHONY += deb-pkg
-deb-pkg:
- $(CONFIG_SHELL) $(srctree)/scripts/package/mkdebian
- $(Q)origversion=$$(dpkg-parsechangelog -SVersion |sed 's/-[^-]*$$//');\
- $(MAKE) -f $(srctree)/scripts/Makefile.package ../$(KDEB_SOURCENAME)_$${origversion}.orig.tar.gz
+deb-pkg: source = $(shell dpkg-parsechangelog -S Source)
+deb-pkg: orig-version = $(shell dpkg-parsechangelog -S Version | sed 's/-[^-]*$$//')
+deb-pkg: debian
+ $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.package ../$(source)_$(orig-version).orig.tar.gz
+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
+quiet_cmd_debianize = GEN $@
+ cmd_debianize = $(srctree)/scripts/package/mkdebian
+
+PHONY += debian
+debian:
+ $(call cmd,debianize)
+
PHONY += intdeb-pkg
intdeb-pkg:
+$(CONFIG_SHELL) $(srctree)/scripts/package/builddeb
diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
index 2f612617cbcf..0c1ed6215a02 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
prev parent reply other threads:[~2023-01-29 18:46 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-29 18:45 [PATCH v2 1/5] kbuild: add a tool to generate a list of files ignored by git Masahiro Yamada
2023-01-29 18:45 ` [PATCH v2 2/5] kbuild: deb-pkg: create source package without cleaning Masahiro Yamada
2023-01-29 18:46 ` [PATCH v2 3/5] kbuild: rpm-pkg: build binary packages from source rpm Masahiro Yamada
2023-01-29 18:46 ` [PATCH v2 4/5] kbuild: srcrpm-pkg: create source package without cleaning Masahiro Yamada
2023-01-29 23:20 ` Miguel Ojeda
2023-01-30 1:28 ` Masahiro Yamada
2023-01-30 12:00 ` Miguel Ojeda
2023-01-31 16:29 ` Masahiro Yamada
2023-01-29 18:46 ` Masahiro Yamada [this message]
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=20230129184602.3974058-5-masahiroy@kernel.org \
--to=masahiroy@kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=nicolas@fjasle.eu \
/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
all inboxes | Powered by JetHome®