From 3a8e2babed63d3631c2a0c3821e4e13daed7f155 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 10 Feb 2017 13:05:00 +0000 Subject: [PATCH] contrib: Sort patches into alphabetical order and add to EXTRA_DIST. We also have to use AM_INIT_AUTOMAKE(tar-pax), since otherwise automake uses some ancient tar format that doesn't support a filename this long. (See: https://noiselabs.io/2010/02/27/tar-file-name-is-too-long-max-99/ for a clear explanation) Fixes commit b702ec19e859f6f3333b129a8b0a7fc278ed400f. --- Makefile.am | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index d27806717..7054dbd35 100644 --- a/Makefile.am +++ b/Makefile.am @@ -217,8 +217,8 @@ EXTRA_DIST = \ contrib/intro/win7.xml \ contrib/p2v/aux-scripts/do-build.sh \ contrib/p2v/build-p2v-iso.sh \ - contrib/p2v/patches/0002-RHEL-5-ONLY-QEMU-NBD-1.4-HAS-NO-f-OPTION.patch \ contrib/p2v/patches/0001-RHEL-5-ONLY-DISABLE-AUTOMATIC-REMOTE-PORT-ALLOCATION.patch \ + contrib/p2v/patches/0002-RHEL-5-ONLY-QEMU-NBD-1.4-HAS-NO-f-OPTION.patch \ contrib/p2v/test-p2v-iso.sh \ contrib/README \ contrib/visualize-alignment/.gitignore \ diff --git a/configure.ac b/configure.ac index afd559ad7..8788e3e87 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,7 @@ AC_CONFIG_AUX_DIR([build-aux]) AC_REQUIRE_AUX_FILE([guestfs-test-driver]) dnl Initialize automake. -AM_INIT_AUTOMAKE(foreign subdir-objects) dnl NB: Do not [quote] this parameter. +AM_INIT_AUTOMAKE(foreign subdir-objects tar-pax) dnl NB: Do not [quote] this parameter. m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])]) AM_SILENT_RULES([yes]) # make --enable-silent-rules the default.