diff options
author | Khem Raj <raj.khem@gmail.com> | 2015-09-12 17:08:28 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-23 09:53:02 +0100 |
commit | 0df9b98d31e96f87f1482f4665ff75412719fe9d (patch) | |
tree | 0e17e1f56f412b74f83fc24ccd203a105033db4e | |
parent | 433a7a0e37761a9bc30027d6670695fbce9675b9 (diff) | |
download | poky-0df9b98d31e96f87f1482f4665ff75412719fe9d.tar.gz |
quota: Replace using -I= with STAGING_INCDIR
-I= is gcc specific, using STAGING_INCDIR makes it compiler independent
Update posix types patch to include new u_int -> uint32_t changes
(From OE-Core rev: 5ad4131421193eab1f78ab42ada13977168f7973)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-extended/quota/quota/remove_non_posix_types.patch | 13 | ||||
-rw-r--r-- | meta/recipes-extended/quota/quota_4.02.bb | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/meta/recipes-extended/quota/quota/remove_non_posix_types.patch b/meta/recipes-extended/quota/quota/remove_non_posix_types.patch index 5442d9854d..06ff13cb98 100644 --- a/meta/recipes-extended/quota/quota/remove_non_posix_types.patch +++ b/meta/recipes-extended/quota/quota/remove_non_posix_types.patch | |||
@@ -183,3 +183,16 @@ Index: quota-tools/quot.h | |||
183 | } du_t; | 183 | } du_t; |
184 | 184 | ||
185 | #define NDU 60000 | 185 | #define NDU 60000 |
186 | Index: quota-tools/rquota_server.c | ||
187 | =================================================================== | ||
188 | --- quota-tools.orig/rquota_server.c | ||
189 | +++ quota-tools/rquota_server.c | ||
190 | @@ -60,7 +60,7 @@ extern char nfs_pseudoroot[PATH_MAX]; | ||
191 | */ | ||
192 | extern struct authunix_parms *unix_cred; | ||
193 | |||
194 | -int in_group(gid_t * gids, u_int len, gid_t gid) | ||
195 | +int in_group(gid_t * gids, uint32_t len, gid_t gid) | ||
196 | { | ||
197 | gid_t *gidsp = gids + len; | ||
198 | |||
diff --git a/meta/recipes-extended/quota/quota_4.02.bb b/meta/recipes-extended/quota/quota_4.02.bb index 124b0a3691..673d58428a 100644 --- a/meta/recipes-extended/quota/quota_4.02.bb +++ b/meta/recipes-extended/quota/quota_4.02.bb | |||
@@ -23,7 +23,7 @@ DEPENDS = "gettext-native e2fsprogs" | |||
23 | 23 | ||
24 | inherit autotools-brokensep gettext pkgconfig | 24 | inherit autotools-brokensep gettext pkgconfig |
25 | 25 | ||
26 | CFLAGS += "-I=${includedir}/tirpc" | 26 | CFLAGS += "-I${STAGING_INCDIR}/tirpc" |
27 | LDFLAGS += "-ltirpc" | 27 | LDFLAGS += "-ltirpc" |
28 | ASNEEDED = "" | 28 | ASNEEDED = "" |
29 | EXTRA_OEMAKE += 'STRIP=""' | 29 | EXTRA_OEMAKE += 'STRIP=""' |