From 36f544e86bea808bf6a89b2aba17625073591bdd Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 28 Aug 2007 13:42:59 +0000 Subject: nfs-utils: do not check for nfsd kernel module as it can be built-in into kernel. (Taken from Poky - r1395) --- packages/nfs-utils/files/nfsserver | 2 -- packages/nfs-utils/nfs-utils_1.0.6.bb | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/nfs-utils/files/nfsserver b/packages/nfs-utils/files/nfsserver index 4ff75916d0..bb16806ed9 100644 --- a/packages/nfs-utils/files/nfsserver +++ b/packages/nfs-utils/files/nfsserver @@ -2,8 +2,6 @@ # # Startup script for nfs-utils # -# The nfsd kernel module must exist along with its dependencies -modprobe -n nfsd || exit 0 # # The environment variable NFS_SERVERS may be set in /etc/default/nfsd # Other control variables may be overridden here too diff --git a/packages/nfs-utils/nfs-utils_1.0.6.bb b/packages/nfs-utils/nfs-utils_1.0.6.bb index a941843488..5a15da463c 100644 --- a/packages/nfs-utils/nfs-utils_1.0.6.bb +++ b/packages/nfs-utils/nfs-utils_1.0.6.bb @@ -2,7 +2,7 @@ DESCRIPTION = "userspace utilities for kernel nfs" PRIORITY = "optional" SECTION = "console/network" LICENSE = "GPL" -PR = "r9" +PR = "r10" SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \ file://acinclude-lossage.patch;patch=1 \ @@ -10,6 +10,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \ file://stat-include.patch;patch=1 \ file://nfs-utils-1.0.6-uclibc.patch;patch=1 \ file://kernel-2.6.18+.patch;patch=1 \ + file://uclibc_bzero_fix.patch;patch=1 \ file://nfsserver \ file://forgotten-defines" -- cgit v1.2.3 From aa58b8e74004d3e3f14d0572d3655d703d125926 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 28 Aug 2007 13:45:04 +0000 Subject: disapproval of revision 'a8eed6047c4764f6f475a519b127e6c00f07442e' --- packages/nfs-utils/files/nfsserver | 2 ++ packages/nfs-utils/nfs-utils_1.0.6.bb | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/nfs-utils/files/nfsserver b/packages/nfs-utils/files/nfsserver index bb16806ed9..4ff75916d0 100644 --- a/packages/nfs-utils/files/nfsserver +++ b/packages/nfs-utils/files/nfsserver @@ -2,6 +2,8 @@ # # Startup script for nfs-utils # +# The nfsd kernel module must exist along with its dependencies +modprobe -n nfsd || exit 0 # # The environment variable NFS_SERVERS may be set in /etc/default/nfsd # Other control variables may be overridden here too diff --git a/packages/nfs-utils/nfs-utils_1.0.6.bb b/packages/nfs-utils/nfs-utils_1.0.6.bb index 5a15da463c..a941843488 100644 --- a/packages/nfs-utils/nfs-utils_1.0.6.bb +++ b/packages/nfs-utils/nfs-utils_1.0.6.bb @@ -2,7 +2,7 @@ DESCRIPTION = "userspace utilities for kernel nfs" PRIORITY = "optional" SECTION = "console/network" LICENSE = "GPL" -PR = "r10" +PR = "r9" SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \ file://acinclude-lossage.patch;patch=1 \ @@ -10,7 +10,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \ file://stat-include.patch;patch=1 \ file://nfs-utils-1.0.6-uclibc.patch;patch=1 \ file://kernel-2.6.18+.patch;patch=1 \ - file://uclibc_bzero_fix.patch;patch=1 \ file://nfsserver \ file://forgotten-defines" -- cgit v1.2.3