From 98e8146553c912e869c174674c53e96d8ff01e57 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 10 Jul 2018 13:45:05 +0100 Subject: [PATCH] nfs-utils: remove libnfsidmap As of nfs-utils 2.2.1 libnfsidmap has been integrated and isn't an external requirement anymore. Also consolidate nfs-utils patches into a single directory. Signed-off-by: Ross Burton --- meta/conf/distro/include/maintainers.inc | 1 - ...-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 | 27 ------------------- .../bugfix-adjust-statd-service-name.patch | 0 .../nfs-utils-debianize-start-statd.patch | 0 .../nfs-utils/nfs-utils_2.3.1.bb | 2 +- 8 files changed, 1 insertion(+), 87 deletions(-) delete mode 100644 meta/recipes-connectivity/nfs-utils/libnfsidmap/0001-include-sys-types.h-for-getting-u_-typedefs.patch delete mode 100644 meta/recipes-connectivity/nfs-utils/libnfsidmap/Set_nobody_user_group.patch delete mode 100644 meta/recipes-connectivity/nfs-utils/libnfsidmap/fix-ac-prereq.patch delete mode 100644 meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb rename meta/recipes-connectivity/nfs-utils/{files => nfs-utils}/bugfix-adjust-statd-service-name.patch (100%) rename meta/recipes-connectivity/nfs-utils/{files => nfs-utils}/nfs-utils-debianize-start-statd.patch (100%) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index c44f2b804a..4d58766451 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -326,7 +326,6 @@ RECIPE_MAINTAINER_pn-libmnl = "Khem Raj " RECIPE_MAINTAINER_pn-libmpc = "Khem Raj " RECIPE_MAINTAINER_pn-libnewt = "Hongxu Jia " RECIPE_MAINTAINER_pn-libnewt-python = "Hongxu Jia " -RECIPE_MAINTAINER_pn-libnfsidmap = "Maxin B. John " RECIPE_MAINTAINER_pn-libnl = "Alexander Kanavin " RECIPE_MAINTAINER_pn-libnotify = "Maxin B. John " RECIPE_MAINTAINER_pn-libnsl2 = "Khem Raj " 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 deleted file mode 100644 index 4ac5290440..0000000000 --- a/meta/recipes-connectivity/nfs-utils/libnfsidmap/0001-include-sys-types.h-for-getting-u_-typedefs.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 deleted file mode 100644 index 4633da919e..0000000000 --- a/meta/recipes-connectivity/nfs-utils/libnfsidmap/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/libnfsidmap/fix-ac-prereq.patch b/meta/recipes-connectivity/nfs-utils/libnfsidmap/fix-ac-prereq.patch deleted file mode 100644 index d81c7c5f32..0000000000 --- a/meta/recipes-connectivity/nfs-utils/libnfsidmap/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_0.25.bb b/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb deleted file mode 100644 index 2565771006..0000000000 --- a/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "NFS id mapping library" -HOMEPAGE = "http://www.citi.umich.edu/projects/nfsv4/linux/" -SECTION = "libs" - -LICENSE = "BSD" -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" -SRC_URI[sha256sum] = "656d245d84400e1030f8f40a5a27da76370690c4a932baf249110f047fe7efcf" - -UPSTREAM_CHECK_URI = "http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/" - -inherit autotools - -EXTRA_OECONF = "--disable-ldap" - -do_install_append () { - install -d ${D}${sysconfdir}/ - install -m 0644 ${WORKDIR}/${BPN}-${PV}/idmapd.conf ${D}${sysconfdir}/idmapd.conf -} - diff --git a/meta/recipes-connectivity/nfs-utils/files/bugfix-adjust-statd-service-name.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/bugfix-adjust-statd-service-name.patch similarity index 100% rename from meta/recipes-connectivity/nfs-utils/files/bugfix-adjust-statd-service-name.patch rename to meta/recipes-connectivity/nfs-utils/nfs-utils/bugfix-adjust-statd-service-name.patch diff --git a/meta/recipes-connectivity/nfs-utils/files/nfs-utils-debianize-start-statd.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-debianize-start-statd.patch similarity index 100% rename from meta/recipes-connectivity/nfs-utils/files/nfs-utils-debianize-start-statd.patch rename to meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-debianize-start-statd.patch diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb index 6390c324f8..6d450c7510 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb @@ -8,7 +8,7 @@ LICENSE = "MIT & GPLv2+ & BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=95f3a93a5c3c7888de623b46ea085a84" # util-linux for libblkid -DEPENDS = "libcap libnfsidmap libevent util-linux sqlite3 libtirpc" +DEPENDS = "libcap libevent util-linux sqlite3 libtirpc" RDEPENDS_${PN} = "${PN}-client bash" RRECOMMENDS_${PN} = "kernel-module-nfsd" -- 2.40.1