| Message ID | 20210411101422.7092-2-bage@linutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | builddeb: make deb building more flexible | expand |
On Sun, Apr 11, 2021 at 7:14 PM <bage@linutronix.de> wrote: > > 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 Please add .clang-format, .cocciconfig, .mailmap, CREDITS, MAINTAINERS, README to TAR_CONTENTS. These are real source files. > > echo $debarch > debian/arch > extra_build_depends=", $(if_enabled_echo CONFIG_UNWINDER_ORC libelf-dev:native)" > -- > 2.30.2 >
On Sat, Apr 17, 2021 at 5:29 PM Masahiro Yamada <masahiroy@kernel.org> wrote: > > On Sun, Apr 11, 2021 at 7:14 PM <bage@linutronix.de> wrote: > > > > 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 > > Please add > .clang-format, .cocciconfig, .mailmap, CREDITS, MAINTAINERS, README > to TAR_CONTENTS. > > These are real source files. > .*ignore is difficult to understand. Please add .gitignore to TAR_CONTENTS and .git to diff-ignore.
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)"