From: bage@linutronix.de
To: Masahiro Yamada <masahiroy@kernel.org>,
Michal Marek <michal.lkml@markovi.net>
Cc: Bastian Germann <bage@linutronix.de>,
linux-kbuild@vger.kernel.org, tglx@linutronix.de
Subject: [PATCH 1/6] builddeb: diff-ignore unexported top-level files
Date: Sun, 11 Apr 2021 12:14:17 +0200 [thread overview]
Message-ID: <20210411101422.7092-2-bage@linutronix.de> (raw)
In-Reply-To: <20210411101422.7092-1-bage@linutronix.de>
From: Bastian Germann <bage@linutronix.de>
scripts/Makefile.package's TAR_CONTENT lists the files to include in orig
tarballs while the deb-pkg make target only ignores .git. This results in
the other top-level files ending up in the .diff.gz.
Let dpkg-source ignore .git with the default diff-ignore and list the other
top-level files in extend-diff-ignore. Use the debian/source/options to
always have those available on building the package.
Signed-off-by: Bastian Germann <bage@linutronix.de>
---
scripts/Makefile.package | 2 +-
scripts/package/mkdebian | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/Makefile.package b/scripts/Makefile.package
index f952fb64789d..280f3a2fa334 100644
--- a/scripts/Makefile.package
+++ b/scripts/Makefile.package
@@ -75,7 +75,7 @@ deb-pkg:
$(call cmd,src_tar,$(KDEB_SOURCENAME))
origversion=$$(dpkg-parsechangelog -SVersion |sed 's/-[^-]*$$//');\
mv $(KDEB_SOURCENAME).tar.gz ../$(KDEB_SOURCENAME)_$${origversion}.orig.tar.gz
- +dpkg-buildpackage -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch) $(DPKG_FLAGS) -i.git -us -uc
+ +dpkg-buildpackage -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch) $(DPKG_FLAGS) -us -uc
PHONY += bindeb-pkg
bindeb-pkg:
diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
index 60a2a63a5e90..3d2d4b033e44 100755
--- a/scripts/package/mkdebian
+++ b/scripts/package/mkdebian
@@ -134,6 +134,8 @@ fi
mkdir -p debian/source/
echo "1.0" > debian/source/format
+echo diff-ignore > debian/source/options
+echo 'extend-diff-ignore = ".clang-format|.cocciconfig|.config.old|.*ignore|.mailmap|.version|CREDITS|MAINTAINERS|README"' >> debian/source/options
echo $debarch > debian/arch
extra_build_depends=", $(if_enabled_echo CONFIG_UNWINDER_ORC libelf-dev:native)"
--
2.30.2
next prev parent reply other threads:[~2021-04-11 10:14 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-11 10:14 [PATCH 0/6] builddeb: make deb building more flexible bage
2021-04-11 10:14 ` bage [this message]
2021-04-17 8:29 ` [PATCH 1/6] builddeb: diff-ignore unexported top-level files Masahiro Yamada
2021-04-17 8:34 ` Masahiro Yamada
2021-04-11 10:14 ` [PATCH 2/6] builddeb: set CC on cross build to prefixed gcc bage
2021-04-11 10:14 ` [PATCH 3/6] builddeb: clean generated package content bage
2021-04-19 6:07 ` Masahiro Yamada
2021-04-11 10:14 ` [PATCH 4/6] builddeb: use standard format for copyright file bage
2021-04-19 6:40 ` Masahiro Yamada
2021-04-11 10:14 ` [PATCH 5/6] builddeb: introduce profile excluding the dbg pkg bage
2021-04-11 10:14 ` [PATCH 6/6] kbuild: introduce srcdeb-pkg target bage
2021-04-17 16:58 ` 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=20210411101422.7092-2-bage@linutronix.de \
--to=bage@linutronix.de \
--cc=linux-kbuild@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=michal.lkml@markovi.net \
--cc=tglx@linutronix.de \
/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