NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
dd7346f415
kumquat-buildroot/package/nfs-utils/0002-Patch-taken-from-Gentoo.patch

85 lines
2.5 KiB
Diff
Raw Normal View History

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>
2012-11-10 12:42:42 +01:00
From 971389625c9602085d399d8ae7fc42b75efcfb7c Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sat, 10 Nov 2012 18:56:12 +0100
Subject: [PATCH] Patch taken from Gentoo
nfs-utils: bump to version 1.2.6 Bump nfs-utils to version 1.2.6 Portmap or rpcbind (which we don't have) is required so select it. Remove nfsiostat if there's no target python. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-05-29 20:13:21 +02:00
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
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>
2012-11-10 12:42:42 +01:00
---
tools/locktest/Makefile.am | 7 +++----
tools/rpcdebug/Makefile.am | 7 +++----
tools/rpcgen/Makefile.am | 8 +++-----
3 files changed, 9 insertions(+), 13 deletions(-)
nfs-utils: bump to version 1.2.6 Bump nfs-utils to version 1.2.6 Portmap or rpcbind (which we don't have) is required so select it. Remove nfsiostat if there's no target python. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-05-29 20:13:21 +02:00
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>
2012-11-10 12:42:42 +01:00
diff --git a/tools/locktest/Makefile.am b/tools/locktest/Makefile.am
index 3156815..efe6fcd 100644
nfs-utils: bump to version 1.2.6 Bump nfs-utils to version 1.2.6 Portmap or rpcbind (which we don't have) is required so select it. Remove nfsiostat if there's no target python. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-05-29 20:13:21 +02:00
--- a/tools/locktest/Makefile.am
+++ b/tools/locktest/Makefile.am
@@ -1,12 +1,11 @@
## Process this file with automake to produce Makefile.in
CC=$(CC_FOR_BUILD)
-LIBTOOL = @LIBTOOL@ --tag=CC
+CFLAGS=$(CFLAGS_FOR_BUILD)
+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+LDFLAGS=$(LDFLAGS_FOR_BUILD)
noinst_PROGRAMS = testlk
testlk_SOURCES = testlk.c
-testlk_CFLAGS=$(CFLAGS_FOR_BUILD)
-testlk_CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
-testlk_LDFLAGS=$(LDFLAGS_FOR_BUILD)
MAINTAINERCLEANFILES = Makefile.in
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>
2012-11-10 12:42:42 +01:00
diff --git a/tools/rpcdebug/Makefile.am b/tools/rpcdebug/Makefile.am
index 39b70c9..0056597 100644
nfs-utils: bump to version 1.2.6 Bump nfs-utils to version 1.2.6 Portmap or rpcbind (which we don't have) is required so select it. Remove nfsiostat if there's no target python. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-05-29 20:13:21 +02:00
--- a/tools/rpcdebug/Makefile.am
+++ b/tools/rpcdebug/Makefile.am
@@ -1,15 +1,14 @@
## Process this file with automake to produce Makefile.in
CC=$(CC_FOR_BUILD)
-LIBTOOL = @LIBTOOL@ --tag=CC
+CFLAGS=$(CFLAGS_FOR_BUILD)
+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+LDFLAGS=$(LDFLAGS_FOR_BUILD)
man8_MANS = rpcdebug.man
EXTRA_DIST = $(man8_MANS)
sbin_PROGRAMS = rpcdebug
rpcdebug_SOURCES = rpcdebug.c
-rpcdebug_CFLAGS=$(CFLAGS_FOR_BUILD)
-rpcdebug_CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -I$(top_srcdir)/support/include
-rpcdebug_LDFLAGS=$(LDFLAGS_FOR_BUILD)
MAINTAINERCLEANFILES = Makefile.in
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>
2012-11-10 12:42:42 +01:00
diff --git a/tools/rpcgen/Makefile.am b/tools/rpcgen/Makefile.am
index 8a9ec89..5a5b4d3 100644
nfs-utils: bump to version 1.2.6 Bump nfs-utils to version 1.2.6 Portmap or rpcbind (which we don't have) is required so select it. Remove nfsiostat if there's no target python. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-05-29 20:13:21 +02:00
--- a/tools/rpcgen/Makefile.am
+++ b/tools/rpcgen/Makefile.am
@@ -1,7 +1,9 @@
## Process this file with automake to produce Makefile.in
CC=$(CC_FOR_BUILD)
-LIBTOOL = @LIBTOOL@ --tag=CC
+CFLAGS=$(CFLAGS_FOR_BUILD)
+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+LDFLAGS=$(LDFLAGS_FOR_BUILD)
noinst_PROGRAMS = rpcgen
rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \
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>
2012-11-10 12:42:42 +01:00
@@ -9,10 +11,6 @@ rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \
nfs-utils: bump to version 1.2.6 Bump nfs-utils to version 1.2.6 Portmap or rpcbind (which we don't have) is required so select it. Remove nfsiostat if there's no target python. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-05-29 20:13:21 +02:00
rpc_util.c rpc_sample.c rpc_output.h rpc_parse.h \
rpc_scan.h rpc_util.h
-rpcgen_CFLAGS=$(CFLAGS_FOR_BUILD)
-rpcgen_CPPLAGS=$(CPPFLAGS_FOR_BUILD)
-rpcgen_LDFLAGS=$(LDFLAGS_FOR_BUILD)
-rpcgen_LDADD=$(LIBTIRPC)
MAINTAINERCLEANFILES = Makefile.in
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>
2012-11-10 12:42:42 +01:00
--
1.7.9.5
Reference in New Issue Copy Permalink