From 65e30309ac66bdd7785eb3790b91245a9ac5277a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 15 Apr 2015 19:00:24 -0700 Subject: libnfsidmap: Include sys/types.h for u_int32_t Exposed using musl Change-Id: Ia155850b3dfe62cd7d10b207b94ff3cc1f0244fc Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- .../nfs-utils/files/Set_nobody_user_group.patch | 18 --------------- .../nfs-utils/files/fix-ac-prereq.patch | 13 ----------- ...clude-sys-types.h-for-getting-u_-typedefs.patch | 27 ++++++++++++++++++++++ .../libnfsidmap/Set_nobody_user_group.patch | 18 +++++++++++++++ .../nfs-utils/libnfsidmap/fix-ac-prereq.patch | 13 +++++++++++ .../nfs-utils/libnfsidmap_0.25.bb | 1 + 6 files changed, 59 insertions(+), 31 deletions(-) delete mode 100644 meta/recipes-connectivity/nfs-utils/files/Set_nobody_user_group.patch delete mode 100644 meta/recipes-connectivity/nfs-utils/files/fix-ac-prereq.patch create mode 100644 meta/recipes-connectivity/nfs-utils/libnfsidmap/0001-include-sys-types.h-for-getting-u_-typedefs.patch create mode 100644 meta/recipes-connectivity/nfs-utils/libnfsidmap/Set_nobody_user_group.patch create mode 100644 meta/recipes-connectivity/nfs-utils/libnfsidmap/fix-ac-prereq.patch (limited to 'meta/recipes-connectivity/nfs-utils') diff --git a/meta/recipes-connectivity/nfs-utils/files/Set_nobody_user_group.patch b/meta/recipes-connectivity/nfs-utils/files/Set_nobody_user_group.patch deleted file mode 100644 index 4633da919e..0000000000 --- a/meta/recipes-connectivity/nfs-utils/files/Set_nobody_user_group.patch +++ /dev/null @@ -1,18 +0,0 @@ -Set nobody user and group - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Roy.Li ---- a/idmapd.conf -+++ b/idmapd.conf -@@ -17,8 +17,8 @@ - - [Mapping] - --#Nobody-User = nobody --#Nobody-Group = nobody -+Nobody-User = nobody -+Nobody-Group = nogroup - - [Translation] - diff --git a/meta/recipes-connectivity/nfs-utils/files/fix-ac-prereq.patch b/meta/recipes-connectivity/nfs-utils/files/fix-ac-prereq.patch deleted file mode 100644 index d81c7c5f32..0000000000 --- a/meta/recipes-connectivity/nfs-utils/files/fix-ac-prereq.patch +++ /dev/null @@ -1,13 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - ---- a/configure.in -+++ b/configure.in -@@ -1,7 +1,7 @@ - # -*- Autoconf -*- - # Process this file with autoconf to produce a configure script. - --AC_PREREQ([2.68]) -+AC_PREREQ([2.65]) - AC_INIT([libnfsidmap],[0.25],[linux-nfs@vger.kernel.org]) - AC_CONFIG_SRCDIR([nfsidmap.h]) - AC_CONFIG_MACRO_DIR([m4]) diff --git a/meta/recipes-connectivity/nfs-utils/libnfsidmap/0001-include-sys-types.h-for-getting-u_-typedefs.patch b/meta/recipes-connectivity/nfs-utils/libnfsidmap/0001-include-sys-types.h-for-getting-u_-typedefs.patch new file mode 100644 index 0000000000..4ac5290440 --- /dev/null +++ b/meta/recipes-connectivity/nfs-utils/libnfsidmap/0001-include-sys-types.h-for-getting-u_-typedefs.patch @@ -0,0 +1,27 @@ +From a5e95a42e7bceddc9ecad06694c1a0588f4bafc8 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 14 Apr 2015 07:22:47 -0700 +Subject: [PATCH] include sys/types.h for getting u_* typedefs + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + cfg.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/cfg.h b/cfg.h +index d4d4cab..fe49e8f 100644 +--- a/cfg.h ++++ b/cfg.h +@@ -33,6 +33,7 @@ + #ifndef _CONF_H_ + #define _CONF_H_ + ++#include + #include "queue.h" + + struct conf_list_node { +-- +2.1.4 + diff --git a/meta/recipes-connectivity/nfs-utils/libnfsidmap/Set_nobody_user_group.patch b/meta/recipes-connectivity/nfs-utils/libnfsidmap/Set_nobody_user_group.patch new file mode 100644 index 0000000000..4633da919e --- /dev/null +++ b/meta/recipes-connectivity/nfs-utils/libnfsidmap/Set_nobody_user_group.patch @@ -0,0 +1,18 @@ +Set nobody user and group + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Roy.Li +--- a/idmapd.conf ++++ b/idmapd.conf +@@ -17,8 +17,8 @@ + + [Mapping] + +-#Nobody-User = nobody +-#Nobody-Group = nobody ++Nobody-User = nobody ++Nobody-Group = nogroup + + [Translation] + diff --git a/meta/recipes-connectivity/nfs-utils/libnfsidmap/fix-ac-prereq.patch b/meta/recipes-connectivity/nfs-utils/libnfsidmap/fix-ac-prereq.patch new file mode 100644 index 0000000000..d81c7c5f32 --- /dev/null +++ b/meta/recipes-connectivity/nfs-utils/libnfsidmap/fix-ac-prereq.patch @@ -0,0 +1,13 @@ +Upstream-Status: Inappropriate [configuration] + +--- a/configure.in ++++ b/configure.in +@@ -1,7 +1,7 @@ + # -*- Autoconf -*- + # Process this file with autoconf to produce a configure script. + +-AC_PREREQ([2.68]) ++AC_PREREQ([2.65]) + AC_INIT([libnfsidmap],[0.25],[linux-nfs@vger.kernel.org]) + AC_CONFIG_SRCDIR([nfsidmap.h]) + AC_CONFIG_MACRO_DIR([m4]) diff --git a/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb b/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb index fcc9e87db5..5b578e9a1c 100644 --- a/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb +++ b/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d9c6a2a0ca6017fda7cd905ed2739b37" SRC_URI = "http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${BPN}-${PV}.tar.gz \ file://fix-ac-prereq.patch \ file://Set_nobody_user_group.patch \ + file://0001-include-sys-types.h-for-getting-u_-typedefs.patch \ " SRC_URI[md5sum] = "2ac4893c92716add1a1447ae01df77ab" -- cgit 1.2.3-korg