xfs
[Top] [All Lists]

Re: [patch] xfsprogs build tweaks for Debian

To: Nathan Scott <nscott@xxxxxxxxxx>
Subject: Re: [patch] xfsprogs build tweaks for Debian
From: Christoph Hellwig <hch@xxxxxxxxxxxxx>
Date: Tue, 22 Sep 2009 07:57:07 -0400
Cc: xfs@xxxxxxxxxxx
In-reply-to: <1527800797.273701253228929936.JavaMail.root@xxxxxxxxxxxxxxxxxx>
References: <777659823.265181253164106522.JavaMail.root@xxxxxxxxxxxxxxxxxx> <1527800797.273701253228929936.JavaMail.root@xxxxxxxxxxxxxxxxxx>
User-agent: Mutt/1.5.19 (2009-01-05)
On Fri, Sep 18, 2009 at 09:08:49AM +1000, Nathan Scott wrote:
> Hi all,
> 
> This patch allows deb packages to be generated more cleanly by Makepkgs
> than it currently allows.  In particular, it handles the issue of having
> .git files in the generated tarball, and also puts the debs in build/deb
> when they're built, which is a bit more convenient and consistent.

The tarball generated by Makepks does not contain .git.  Do you create
a tarball in a different way for debian?

> +++ b/Makefile
> @@ -9,9 +9,7 @@ ifeq ($(HAVE_BUILDDEFS), yes)
>  include $(TOPDIR)/include/builddefs
>  endif
>  
> -CONFIGURE = aclocal.m4 configure config.guess config.sub configure 
> install-sh \
> -         ltmain.sh m4/libtool.m4 m4/ltoptions.m4 m4/ltsugar.m4 \
> -         m4/ltversion.m4 m4/lt~obsolete.m4
> +CONFIGURE = aclocal.m4 configure config.guess config.sub install-sh ltmain.sh

So configure was mentioned twice which is an obvious bug.  But why do we
want to remove the m4/* files from the list of files to package?

[Ah, they're added inside the m4 directory, ok]

>  type=rpm
> +[ -f /etc/debian_version ] && type=debian

would be cleaner as

#
# If we're on a Debian or Debian-derived system generate deb packages by
# default, else RPM packages.
#
if [ -f /etc/debian_version ]
    type=debian
else
    type=rpm
fi

> diff --git a/VERSION b/VERSION
> index b3a880e..6018818 100644
> --- a/VERSION
> +++ b/VERSION
> @@ -3,5 +3,5 @@
>  #
>  PKG_MAJOR=3
>  PKG_MINOR=0
> -PKG_REVISION=3
> +PKG_REVISION=4
>  PKG_BUILD=1

Note that when you bump package version please always also tag the
result in git.

> +     - Debian packaging updates, esp. readline6 dependency.

Btw, didn't readline move to GPLv3 while we have GPLv2 code in libxfs?

<Prev in Thread] Current Thread [Next in Thread>