diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-11-10 11:42:42 +0000 |
---|---|---|
committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-11-14 23:00:16 +0100 |
commit | 9f0c314674cb8f9d79d30540359d1df7f564d37e (patch) | |
tree | 49a314d978c8d5b55499676bdf0570661dbc7ef4 /package/nfs-utils/nfs-utils-conditionals.patch | |
parent | c54af0a294de09ecb8699d0d9a0fca8b39247a79 (diff) | |
download | buildroot-novena-9f0c314674cb8f9d79d30540359d1df7f564d37e.tar.gz buildroot-novena-9f0c314674cb8f9d79d30540359d1df7f564d37e.zip |
nfs-utils: reformat patch set as git patches
As we will need to add more patches to nfs-utils, we need a correct
ordering when applying patches. Therefore, reformat the patches to use
a git format and git naming.
The nfs-utils-dont-mix-flags.patch is no longer needed as it was
patching Makefile.in files that were being regenerated due to the
package having _AUTORECONF = YES. The Makefile.in are properly
regenerated thanks to the nfs-utils-0002-Patch-taken-from-Gentoo.patch
patch.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/nfs-utils/nfs-utils-conditionals.patch')
-rw-r--r-- | package/nfs-utils/nfs-utils-conditionals.patch | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/package/nfs-utils/nfs-utils-conditionals.patch b/package/nfs-utils/nfs-utils-conditionals.patch deleted file mode 100644 index a2342b36b..000000000 --- a/package/nfs-utils/nfs-utils-conditionals.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 869d37a16d1e409cedd95b03cea29a6db65f9276 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu> -Date: Thu, 17 May 2012 16:26:44 -0700 -Subject: [nfs-utils PATCH] build: avoid AM_CONDITIONAL in conditional - execution. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Automake does not support conditional AM_CONDITIONAL calls; what that -means is that you always have to execute AM_CONDITIONAL one way or the -other. Both the libsqlite3.m4 file and the nfsdcld conditionals are -executed only when NFSv4 is enabled, which breaks building with ---disable-nfsv4. - -Remove the SQLite3 conditional altogether as it's never used, and move -the nfsdcld conditional outside of the conditional code. - -Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu> ---- - aclocal/libsqlite3.m4 | 1 - - configure.ac | 3 +-- - 2 files changed, 1 insertions(+), 3 deletions(-) - -diff --git a/aclocal/libsqlite3.m4 b/aclocal/libsqlite3.m4 -index 73d1e46..8c38993 100644 ---- a/aclocal/libsqlite3.m4 -+++ b/aclocal/libsqlite3.m4 -@@ -29,5 +29,4 @@ AC_DEFUN([AC_SQLITE3_VERS], [ - LIBS="$saved_LIBS"]) - - AC_MSG_RESULT($libsqlite3_cv_is_recent) -- AM_CONDITIONAL(CONFIG_SQLITE3, [test "$libsqlite3_cv_is_recent" = "yes"]) - ])dnl -diff --git a/configure.ac b/configure.ac -index 9ba53e2..b408f1b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -278,8 +278,6 @@ if test "$enable_nfsv4" = yes; then - fi - fi - -- AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ]) -- - dnl librpcsecgss already has a dependency on libgssapi, - dnl but we need to make sure we get the right version - if test "$enable_gss" = yes; then -@@ -293,6 +291,7 @@ if test "$enable_nfsv41" = yes; then - fi - - dnl enable nfsidmap when its support by libnfsidmap -+AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ]) - AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"]) - - --- -1.7.8.6 - |