diff mbox series

[3/3] debian: replace libreadline with libedit

Message ID 158984955088.623441.1505969186471077833.stgit@magnolia (mailing list archive)
State Accepted
Headers show
Series xfsprogs: random fixes | expand

Commit Message

Darrick J. Wong May 19, 2020, 12:52 a.m. UTC 
From: Darrick J. Wong <darrick.wong@oracle.com>

Now that upstream has dropped libreadline support entirely, switch the
debian package over to libedit.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 debian/control |    2 +-
 debian/rules   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Eric Sandeen May 19, 2020, 1:58 a.m. UTC | #1 
On 5/18/20 7:52 PM, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
> 
> Now that upstream has dropped libreadline support entirely, switch the
> debian package over to libedit.
> 
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

I don't really speak Debian, but this seems sane.

Reviewed-by: Eric Sandeen <sandeen@redhat.com>

> ---
>  debian/control |    2 +-
>  debian/rules   |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> 
> diff --git a/debian/control b/debian/control
> index 0b3205f5..ddd17850 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -3,7 +3,7 @@ Section: admin
>  Priority: optional
>  Maintainer: XFS Development Team <linux-xfs@vger.kernel.org>
>  Uploaders: Nathan Scott <nathans@debian.org>, Anibal Monsalve Salazar <anibal@debian.org>
> -Build-Depends: uuid-dev, dh-autoreconf, debhelper (>= 5), gettext, libtool, libreadline-gplv2-dev, libblkid-dev (>= 2.17), linux-libc-dev, libdevmapper-dev, libattr1-dev, libicu-dev, dh-python, pkg-config
> +Build-Depends: uuid-dev, dh-autoreconf, debhelper (>= 5), gettext, libtool, libedit-dev, libblkid-dev (>= 2.17), linux-libc-dev, libdevmapper-dev, libattr1-dev, libicu-dev, dh-python, pkg-config
>  Standards-Version: 4.0.0
>  Homepage: https://xfs.wiki.kernel.org/
>  
> diff --git a/debian/rules b/debian/rules
> index e8509fb3..7304222c 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -25,7 +25,7 @@ stdenv = @GZIP=-q; export GZIP;
>  
>  options = export DEBUG=-DNDEBUG DISTRIBUTION=debian \
>  	  INSTALL_USER=root INSTALL_GROUP=root \
> -	  LOCAL_CONFIGURE_OPTIONS="--enable-readline=yes --enable-blkid=yes --disable-ubsan --disable-addrsan --disable-threadsan --enable-lto" ;
> +	  LOCAL_CONFIGURE_OPTIONS="--enable-editline=yes --enable-blkid=yes --disable-ubsan --disable-addrsan --disable-threadsan --enable-lto" ;
>  diopts  = $(options) \
>  	  export OPTIMIZER=-Os LOCAL_CONFIGURE_OPTIONS="--enable-gettext=no --disable-ubsan --disable-addrsan --disable-threadsan --enable-lto" ;
>  checkdir = test -f debian/rules
>
Christoph Hellwig May 20, 2020, 5:37 p.m. UTC | #2 
On Mon, May 18, 2020 at 05:52:30PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
> 
> Now that upstream has dropped libreadline support entirely, switch the
> debian package over to libedit.

Looks good:

Reviewed-by: Christoph Hellwig <hch@lst.de>

Do we need to resync with the real Debian packaging?  That has switched
over quite a while ago.
Darrick J. Wong May 20, 2020, 6:18 p.m. UTC | #3 
On Wed, May 20, 2020 at 10:37:13AM -0700, Christoph Hellwig wrote:
> On Mon, May 18, 2020 at 05:52:30PM -0700, Darrick J. Wong wrote:
> > From: Darrick J. Wong <darrick.wong@oracle.com>
> > 
> > Now that upstream has dropped libreadline support entirely, switch the
> > debian package over to libedit.
> 
> Looks good:
> 
> Reviewed-by: Christoph Hellwig <hch@lst.de>
> 
> Do we need to resync with the real Debian packaging?  That has switched
> over quite a while ago.

It did?  It looks to me like debian uses the upstream packaging, even
though they occasionally curse us for doing so.

Now, Ubuntu seems to be doing some sort of valueadd thing around blkid
and "broken configure" but AFAICT they're not sending whatever they
fixed back to us.  Party like it's 2005 again.

--D
diff mbox series

Patch

diff --git a/debian/control b/debian/control
index 0b3205f5..ddd17850 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@  Section: admin
 Priority: optional
 Maintainer: XFS Development Team <linux-xfs@vger.kernel.org>
 Uploaders: Nathan Scott <nathans@debian.org>, Anibal Monsalve Salazar <anibal@debian.org>
-Build-Depends: uuid-dev, dh-autoreconf, debhelper (>= 5), gettext, libtool, libreadline-gplv2-dev, libblkid-dev (>= 2.17), linux-libc-dev, libdevmapper-dev, libattr1-dev, libicu-dev, dh-python, pkg-config
+Build-Depends: uuid-dev, dh-autoreconf, debhelper (>= 5), gettext, libtool, libedit-dev, libblkid-dev (>= 2.17), linux-libc-dev, libdevmapper-dev, libattr1-dev, libicu-dev, dh-python, pkg-config
 Standards-Version: 4.0.0
 Homepage: https://xfs.wiki.kernel.org/
 
diff --git a/debian/rules b/debian/rules
index e8509fb3..7304222c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@  stdenv = @GZIP=-q; export GZIP;
 
 options = export DEBUG=-DNDEBUG DISTRIBUTION=debian \
 	  INSTALL_USER=root INSTALL_GROUP=root \
-	  LOCAL_CONFIGURE_OPTIONS="--enable-readline=yes --enable-blkid=yes --disable-ubsan --disable-addrsan --disable-threadsan --enable-lto" ;
+	  LOCAL_CONFIGURE_OPTIONS="--enable-editline=yes --enable-blkid=yes --disable-ubsan --disable-addrsan --disable-threadsan --enable-lto" ;
 diopts  = $(options) \
 	  export OPTIMIZER=-Os LOCAL_CONFIGURE_OPTIONS="--enable-gettext=no --disable-ubsan --disable-addrsan --disable-threadsan --enable-lto" ;
 checkdir = test -f debian/rules