diff options
author | Maxin B. John <maxin.john@intel.com> | 2017-11-10 14:00:24 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-21 12:56:23 +0000 |
commit | 0fb3d1fa1af5a2ff7bbc4ef1c84e4135f119d701 (patch) | |
tree | 4520239295b75869359e9599666073c21f85df70 /meta/recipes-extended/quota/quota/0002-Allow-building-on-systems-that-do-not-have-rpc-heade.patch | |
parent | bbc18d587d2f9283e7f503f82764849d3a3e55cf (diff) | |
download | openembedded-core-contrib-0fb3d1fa1af5a2ff7bbc4ef1c84e4135f119d701.tar.gz |
quota: upgrade to 4.04
4.03 -> 4.04
Removed the following backported patches:
1. 0001-Do-not-accidentaly-override-commandline-passed-CFLAG.patch
2. 0001-Fix-build-with-disabled-ldap.patch
3. 0001-Use-NGROUPS_MAX-instead-of-NGROUPS.patch
4. 0003-Don-t-build-rpc.rquotad-when-disable-rpc-was-request.patch
5. 0004-Fix-warnings-due-to-missing-stdlib.h.patch
Refreshed the following patch:
1. replace_getrpcbynumber_r.patch
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-extended/quota/quota/0002-Allow-building-on-systems-that-do-not-have-rpc-heade.patch')
-rw-r--r-- | meta/recipes-extended/quota/quota/0002-Allow-building-on-systems-that-do-not-have-rpc-heade.patch | 153 |
1 files changed, 0 insertions, 153 deletions
diff --git a/meta/recipes-extended/quota/quota/0002-Allow-building-on-systems-that-do-not-have-rpc-heade.patch b/meta/recipes-extended/quota/quota/0002-Allow-building-on-systems-that-do-not-have-rpc-heade.patch deleted file mode 100644 index 6cea548edc..0000000000 --- a/meta/recipes-extended/quota/quota/0002-Allow-building-on-systems-that-do-not-have-rpc-heade.patch +++ /dev/null @@ -1,153 +0,0 @@ -Upstream-Status: Backport - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- -From f30e1ada8326463cc0af048afa058bc2f1dc9370 Mon Sep 17 00:00:00 2001 -From: Theodore Ts'o <tytso@mit.edu> -Date: Tue, 29 Mar 2016 20:48:04 -0400 -Subject: [PATCH] Allow building on systems that do not have rpc header files - -Android's bionic C library doesn't have Sun RPC support. - -Signed-off-by: Theodore Ts'o <tytso@mit.edu> -Signed-off-by: Jan Kara <jack@suse.cz> ---- - Makefile.am | 30 ++++++++++++++++-------------- - quotaops.c | 2 ++ - setquota.c | 2 ++ - 3 files changed, 20 insertions(+), 14 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 6d7ea0e..82db99f 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,7 +1,5 @@ - ACLOCAL_AMFLAGS = -I m4 - --BUILT_SOURCES = rquota.h rquota.c rquota_clnt.c -- - docdir = $(datadir)/doc/@PACKAGE@ - doc_DATA = \ - README.mailserver \ -@@ -12,11 +10,6 @@ doc_DATA = \ - doc/quotas.preformated \ - doc/quotas-1.eps - --rpcsvcdir = $(includedir)/rpcsvc --rpcsvc_DATA = \ -- rquota.h \ -- rquota.x -- - sysconf_DATA = \ - warnquota.conf \ - quotatab \ -@@ -35,15 +28,12 @@ man_MANS = \ - quota.1 \ - quot.8 \ - repquota.8 \ -- rpc.rquotad.8 \ - rquota.3 \ - setquota.8 \ - warnquota.conf.5 \ - warnquota.8 \ - xqmstats.8 - --CLEANFILES = rquota.c rquota.h rquota_clnt.c -- - SUBDIRS = po - - EXTRA_DIST = \ -@@ -55,9 +45,15 @@ EXTRA_DIST = \ - Changelog \ - ldap-scripts - --noinst_LIBRARIES = \ -- libquota.a \ -- librpcclient.a -+noinst_LIBRARIES = libquota.a -+ -+if WITH_RPC -+rpcsvcdir = $(includedir)/rpcsvc -+rpcsvc_DATA = \ -+ rquota.h \ -+ rquota.x -+ -+noinst_LIBRARIES += librpcclient.a - - librpcclient_a_SOURCES = \ - rquota.c \ -@@ -67,8 +63,10 @@ librpcclient_a_SOURCES = \ - rquota_clnt.c - librpcclient_a_CFLAGS = -Wno-unused - --if WITH_RPC - RPCLIBS = librpcclient.a -+BUILT_SOURCES = rquota.h rquota.c rquota_clnt.c -+CLEANFILES = rquota.c rquota.h rquota_clnt.c -+man_MANS += rpc.rquotad.8 - endif - - libquota_a_SOURCES = \ -@@ -217,6 +215,7 @@ convertquota_LDADD = \ - libquota.a \ - $(RPCLIBS) - -+if WITH_RPC - rpc_rquotad_SOURCES = \ - rquota_server.c \ - rquota_svc.c \ -@@ -225,6 +224,7 @@ rpc_rquotad_LDADD = \ - libquota.a \ - $(WRAP_LIBS) \ - $(RPCLIBS) -+endif - - quota_nld_SOURCES = quota_nld.c - quota_nld_CFLAGS = \ -@@ -236,6 +236,7 @@ quota_nld_LDADD = \ - $(DBUS_LIBS) \ - $(LIBNL3_LIBS) - -+if WITH_RPC - # ------------------ - # Rpcgen conversions - # ------------------ -@@ -250,6 +251,7 @@ quota_nld_LDADD = \ - rquota_clnt.c: rquota.x - @rm -f $@ - @$(RPCGEN) -l -o $@ $< -+endif - - # -------- - # Quotaoff -diff --git a/quotaops.c b/quotaops.c -index 47ef9a7..136aec3 100644 ---- a/quotaops.c -+++ b/quotaops.c -@@ -34,7 +34,9 @@ - - #include "config.h" - -+#if defined(RPC) - #include <rpc/rpc.h> -+#endif - #include <sys/types.h> - #include <sys/stat.h> - #include <sys/file.h> -diff --git a/setquota.c b/setquota.c -index 51d7b3c..8ecd9c3 100644 ---- a/setquota.c -+++ b/setquota.c -@@ -7,7 +7,9 @@ - - #include "config.h" - -+#if defined(RPC) - #include <rpc/rpc.h> -+#endif - #include <sys/types.h> - #include <errno.h> - #include <stdio.h> --- -2.6.1 - |