diff mbox series

[1/4] debian: Drop trying to create upstream distribution

Message ID 20210220121610.3982-2-bastiangermann@fishpost.de (mailing list archive)
State New
Headers show
Series debian: Integrate Debian/Ubuntu changes | expand

Commit Message

Bastian Germann Feb. 20, 2021, 12:16 p.m. UTC
This is a change introduced in 4.3.0+nmu1ubuntu1.

Reported-by: Dimitri John Ledkov <xnox@ubuntu.com>
Signed-off-by: Bastian Germann <bastiangermann@fishpost.de>
---
 debian/changelog | 7 +++++++
 debian/rules     | 1 -
 2 files changed, 7 insertions(+), 1 deletion(-)

Comments

Dave Chinner Feb. 21, 2021, 4:01 a.m. UTC | #1
On Sat, Feb 20, 2021 at 01:16:06PM +0100, Bastian Germann wrote:
> This is a change introduced in 4.3.0+nmu1ubuntu1.

Why? When the change was made is not important, explaining why the
change needs to be made is what should be in the commit message.
i.e. Tell us why this isn't needed any more...

Cheers,

Dave.
Darrick J. Wong Feb. 23, 2021, 3:07 a.m. UTC | #2
On Sun, Feb 21, 2021 at 03:01:29PM +1100, Dave Chinner wrote:
> On Sat, Feb 20, 2021 at 01:16:06PM +0100, Bastian Germann wrote:
> > This is a change introduced in 4.3.0+nmu1ubuntu1.
> 
> Why? When the change was made is not important, explaining why the
> change needs to be made is what should be in the commit message.
> i.e. Tell us why this isn't needed any more...

Yes, this is vital information to have in the commit message.

I'm guessing it has something to do with the fact that 'make dist' tries
to create source tarballs, which is a strange thing to do during the
binary build, and in any case it ultimately fails because tarball
generation now requires .gitcensus, which is cleaned out and then
requires git to regeneration, which you can't do when you're building
from a source tarball?

<shrug> Hm?

--D

> Cheers,
> 
> Dave.
> -- 
> Dave Chinner
> david@fromorbit.com
diff mbox series

Patch

diff --git a/debian/changelog b/debian/changelog
index 5421aed6..8320a2e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@ 
+xfsprogs (5.11.0-rc0-1) experimental; urgency=medium
+
+  [ Dimitri John Ledkov ]
+  * Drop trying to create upstream distribution
+
+ -- Bastian Germann <bastiangermann@fishpost.de>  Sat, 20 Feb 2021 11:57:31 +0100
+
 xfsprogs (5.10.0-3) unstable; urgency=medium
 
   * Drop unused dh-python from Build-Depends (Closes: #981361)
diff --git a/debian/rules b/debian/rules
index c6ca5491..8a3345b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,7 +81,6 @@  binary-arch: checkroot built
 	$(pkgme)  $(MAKE) -C . install
 	$(pkgdev) $(MAKE) -C . install-dev
 	$(pkgdi)  $(MAKE) -C debian install-d-i
-	$(pkgme)  $(MAKE) dist
 	install -D -m 0755 debian/local/initramfs.hook debian/xfsprogs/usr/share/initramfs-tools/hooks/xfs
 	rmdir debian/xfslibs-dev/usr/share/doc/xfsprogs
 	rm -f debian/xfslibs-dev/lib/libhandle.la