From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail1.windriver.com (mail1.windriver.com [147.11.146.13]) by mail.openembedded.org (Postfix) with ESMTP id 2E69A78C5F for ; Mon, 30 Jul 2018 02:22:16 +0000 (UTC) Received: from ALA-HCA.corp.ad.wrs.com ([147.11.189.40]) by mail1.windriver.com (8.15.2/8.15.1) with ESMTPS id w6U2MHE4019759 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL) for ; Sun, 29 Jul 2018 19:22:17 -0700 (PDT) Received: from [128.224.162.173] (128.224.162.173) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server (TLS) id 14.3.399.0; Sun, 29 Jul 2018 19:22:16 -0700 To: References: <20180712084613.14506-1-mingli.yu@windriver.com> From: "Yu, Mingli" Message-ID: <5B5E74D4.4000909@windriver.com> Date: Mon, 30 Jul 2018 10:15:48 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <20180712084613.14506-1-mingli.yu@windriver.com> X-Originating-IP: [128.224.162.173] Subject: Re: [PATCH] nfs-utils: fix build error under tests folder X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jul 2018 02:22:17 -0000 Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit Ping. Thanks, On 2018年07月12日 16:46, mingli.yu@windriver.com wrote: > From: Mingli Yu > > * When enable the test as below in nfs-utils recipe, > do_compile_append_class-target () { > oe_runmake -C tests statdb_dump > oe_runmake -C tests/nsm_client nsm_client > } > > There comes some build error as: > 1, > | make: *** No rule to make target '../support/nfs/libnfs.a', needed by 'statdb_dump'. Stop. > | make: *** No rule to make target '../../support/nfs/libnfs.a', needed by 'nsm_client'. Stop. > > 2, > | ../support/nsm/libnsm.a(file.o): In function `nsm_make_pathname': > | /usr/src/debug/nfs-utils/2.3.1-r0/nfs-utils-2.3.1/support/nsm/file.c:175: undefined reference to `generic_make_pathname' > | /usr/src/debug/nfs-utils/2.3.1-r0/nfs-utils-2.3.1/support/nsm/file.c:175: undefined reference to `generic_make_pathname' > | /usr/src/debug/nfs-utils/2.3.1-r0/nfs-utils-2.3.1/support/nsm/file.c:175: undefined reference to `generic_make_pathname' > | ../support/nsm/libnsm.a(file.o): In function `nsm_setup_pathnames': > | /usr/src/debug/nfs-utils/2.3.1-r0/nfs-utils-2.3.1/support/nsm/file.c:280: undefined reference to `generic_setup_basedir' > | collect2: error: ld returned 1 exit status > > * Redefine the reference path of libnfs.a to > ../support/nfs/.libs/libnfs.a to fix the error 1 as > above > > * The function generic_make_pathname is introduced in > nfs-utils 2.3.1 > Add the source file which defines function generic_make_pathname to > libnsm_a_SOURCES of libnsm.a to fix the undefined reference > error 2 as above > > Signed-off-by: Mingli Yu > --- > ...efile.am-update-the-path-of-libnfs.a.patch | 49 +++ > .../0001-fix-undefined-for-libnsm.a.patch | 293 ++++++++++++++++++ > .../nfs-utils/nfs-utils_2.3.1.bb | 2 + > 3 files changed, 344 insertions(+) > create mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-update-the-path-of-libnfs.a.patch > create mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-fix-undefined-for-libnsm.a.patch > > diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-update-the-path-of-libnfs.a.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-update-the-path-of-libnfs.a.patch > new file mode 100644 > index 0000000000..b756ef6c5a > --- /dev/null > +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-update-the-path-of-libnfs.a.patch > @@ -0,0 +1,49 @@ > +From fcece65d1b713eaeef41706898440302f8ce92d9 Mon Sep 17 00:00:00 2001 > +From: Mingli Yu > +Date: Thu, 12 Jul 2018 15:19:41 +0800 > +Subject: [PATCH] Makefile.am: update the path of libnfs.a > + > +The libnfs.a is under ../support/nfs/.libs/ now, > +update the reference path accordingly to fix below > +build error: > +| make: *** No rule to make target '../support/nfs/libnfs.a', needed by 'statdb_dump'. Stop. > + > +| make: *** No rule to make target '../../support/nfs/libnfs.a', needed by 'nsm_client'. Stop. > + > +Upstream-Status: Pending > + > +Signed-off-by: Mingli Yu > +--- > + tests/Makefile.am | 2 +- > + tests/nsm_client/Makefile.am | 2 +- > + 2 files changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/tests/Makefile.am b/tests/Makefile.am > +index 1f96264..74aa629 100644 > +--- a/tests/Makefile.am > ++++ b/tests/Makefile.am > +@@ -3,7 +3,7 @@ > + check_PROGRAMS = statdb_dump > + statdb_dump_SOURCES = statdb_dump.c > + > +-statdb_dump_LDADD = ../support/nfs/libnfs.a \ > ++statdb_dump_LDADD = ../support/nfs/.libs/libnfs.a \ > + ../support/nsm/libnsm.a $(LIBCAP) > + > + SUBDIRS = nsm_client > +diff --git a/tests/nsm_client/Makefile.am b/tests/nsm_client/Makefile.am > +index a8fc131..43db9c2 100644 > +--- a/tests/nsm_client/Makefile.am > ++++ b/tests/nsm_client/Makefile.am > +@@ -13,7 +13,7 @@ check_PROGRAMS = nsm_client > + nsm_client_SOURCES = $(GENFILES) nsm_client.c > + > + BUILT_SOURCES = $(GENFILES) > +-nsm_client_LDADD = ../../support/nfs/libnfs.a \ > ++nsm_client_LDADD = ../../support/nfs/.libs/libnfs.a \ > + ../../support/nsm/libnsm.a $(LIBCAP) $(LIBTIRPC) > + > + if CONFIG_RPCGEN > +-- > +2.7.4 > + > diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-fix-undefined-for-libnsm.a.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-fix-undefined-for-libnsm.a.patch > new file mode 100644 > index 0000000000..bb210dbd1b > --- /dev/null > +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-fix-undefined-for-libnsm.a.patch > @@ -0,0 +1,293 @@ > +From 7b945c3498b5f88640947c187460f8029a09751e Mon Sep 17 00:00:00 2001 > +From: Mingli Yu > +Date: Thu, 12 Jul 2018 14:57:53 +0800 > +Subject: [PATCH] fix undefined function for libnsm.a > + > +The source file file.c of libnsm.a uses some function > +in ../support/misc/file.c, add ../support/misc/file.c > +to libnsm_a_SOURCES to fix build error: > +| ../support/nsm/libnsm.a(file.o): In function `nsm_make_pathname': > +| /usr/src/debug/nfs-utils/2.3.1-r0/nfs-utils-2.3.1/support/nsm/file.c:175: undefined reference to `generic_make_pathname' > +| /usr/src/debug/nfs-utils/2.3.1-r0/nfs-utils-2.3.1/support/nsm/file.c:175: undefined reference to `generic_make_pathname' > +| /usr/src/debug/nfs-utils/2.3.1-r0/nfs-utils-2.3.1/support/nsm/file.c:175: undefined reference to `generic_make_pathname' > +| ../support/nsm/libnsm.a(file.o): In function `nsm_setup_pathnames': > +| /usr/src/debug/nfs-utils/2.3.1-r0/nfs-utils-2.3.1/support/nsm/file.c:280: undefined reference to `generic_setup_basedir' > +| collect2: error: ld returned 1 exit status > + > +As there is already one source file named file.c, so > +rename ../support/misc/file.c to ../support/misc/misc.c > + > +Upstream-Status: Pending > + > +Signed-off-by: Mingli Yu > +--- > + support/misc/Makefile.am | 2 +- > + support/misc/file.c | 111 ----------------------------------------------- > + support/misc/misc.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++ > + support/nsm/Makefile.am | 2 +- > + 4 files changed, 113 insertions(+), 113 deletions(-) > + delete mode 100644 support/misc/file.c > + create mode 100644 support/misc/misc.c > + > +diff --git a/support/misc/Makefile.am b/support/misc/Makefile.am > +index 8936b0d..d4c1f76 100644 > +--- a/support/misc/Makefile.am > ++++ b/support/misc/Makefile.am > +@@ -1,6 +1,6 @@ > + ## Process this file with automake to produce Makefile.in > + > + noinst_LIBRARIES = libmisc.a > +-libmisc_a_SOURCES = tcpwrapper.c from_local.c mountpoint.c file.c > ++libmisc_a_SOURCES = tcpwrapper.c from_local.c mountpoint.c misc.c > + > + MAINTAINERCLEANFILES = Makefile.in > +diff --git a/support/misc/file.c b/support/misc/file.c > +deleted file mode 100644 > +index d47e8be..0000000 > +--- a/support/misc/file.c > ++++ /dev/null > +@@ -1,111 +0,0 @@ > +-/* > +- * Copyright 2009 Oracle. All rights reserved. > +- * Copyright 2017 Red Hat, Inc. All rights reserved. > +- * > +- * This file is part of nfs-utils. > +- * > +- * nfs-utils is free software; you can redistribute it and/or modify > +- * it under the terms of the GNU General Public License as published by > +- * the Free Software Foundation; either version 2 of the License, or > +- * (at your option) any later version. > +- * > +- * nfs-utils is distributed in the hope that it will be useful, > +- * but WITHOUT ANY WARRANTY; without even the implied warranty of > +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > +- * GNU General Public License for more details. > +- * > +- * You should have received a copy of the GNU General Public License > +- * along with nfs-utils. If not, see . > +- */ > +- > +-#include > +- > +-#include > +-#include > +-#include > +-#include > +-#include > +-#include > +-#include > +-#include > +- > +-#include "xlog.h" > +-#include "misc.h" > +- > +-/* > +- * Returns a dynamically allocated, '\0'-terminated buffer > +- * containing an appropriate pathname, or NULL if an error > +- * occurs. Caller must free the returned result with free(3). > +- */ > +-__attribute__((__malloc__)) > +-char * > +-generic_make_pathname(const char *base, const char *leaf) > +-{ > +- size_t size; > +- char *path; > +- int len; > +- > +- size = strlen(base) + strlen(leaf) + 2; > +- if (size > PATH_MAX) > +- return NULL; > +- > +- path = malloc(size); > +- if (path == NULL) > +- return NULL; > +- > +- len = snprintf(path, size, "%s/%s", base, leaf); > +- if ((len < 0) || ((size_t)len >= size)) { > +- free(path); > +- return NULL; > +- } > +- > +- return path; > +-} > +- > +- > +-/** > +- * generic_setup_basedir - set up basedir > +- * @progname: C string containing name of program, for error messages > +- * @parentdir: C string containing pathname to on-disk state, or NULL > +- * @base: character buffer to contain the basedir that is set up > +- * @baselen: size of @base in bytes > +- * > +- * This runs before logging is set up, so error messages are directed > +- * to stderr. > +- * > +- * Returns true and sets up our basedir, if @parentdir was valid > +- * and usable; otherwise false is returned. > +- */ > +-_Bool > +-generic_setup_basedir(const char *progname, const char *parentdir, char *base, > +- const size_t baselen) > +-{ > +- static char buf[PATH_MAX]; > +- struct stat st; > +- char *path; > +- > +- /* First: test length of name and whether it exists */ > +- if ((strlen(parentdir) >= baselen) || (strlen(parentdir) >= PATH_MAX)) { > +- (void)fprintf(stderr, "%s: Directory name too long: %s", > +- progname, parentdir); > +- return false; > +- } > +- if (lstat(parentdir, &st) == -1) { > +- (void)fprintf(stderr, "%s: Failed to stat %s: %s", > +- progname, parentdir, strerror(errno)); > +- return false; > +- } > +- > +- /* Ensure we have a clean directory pathname */ > +- strncpy(buf, parentdir, sizeof(buf)); > +- path = dirname(buf); > +- if (*path == '.') { > +- (void)fprintf(stderr, "%s: Unusable directory %s", > +- progname, parentdir); > +- return false; > +- } > +- > +- xlog(D_CALL, "Using %s as the state directory", parentdir); > +- strcpy(base, parentdir); > +- return true; > +-} > +diff --git a/support/misc/misc.c b/support/misc/misc.c > +new file mode 100644 > +index 0000000..d47e8be > +--- /dev/null > ++++ b/support/misc/misc.c > +@@ -0,0 +1,111 @@ > ++/* > ++ * Copyright 2009 Oracle. All rights reserved. > ++ * Copyright 2017 Red Hat, Inc. All rights reserved. > ++ * > ++ * This file is part of nfs-utils. > ++ * > ++ * nfs-utils is free software; you can redistribute it and/or modify > ++ * it under the terms of the GNU General Public License as published by > ++ * the Free Software Foundation; either version 2 of the License, or > ++ * (at your option) any later version. > ++ * > ++ * nfs-utils is distributed in the hope that it will be useful, > ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of > ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > ++ * GNU General Public License for more details. > ++ * > ++ * You should have received a copy of the GNU General Public License > ++ * along with nfs-utils. If not, see . > ++ */ > ++ > ++#include > ++ > ++#include > ++#include > ++#include > ++#include > ++#include > ++#include > ++#include > ++#include > ++ > ++#include "xlog.h" > ++#include "misc.h" > ++ > ++/* > ++ * Returns a dynamically allocated, '\0'-terminated buffer > ++ * containing an appropriate pathname, or NULL if an error > ++ * occurs. Caller must free the returned result with free(3). > ++ */ > ++__attribute__((__malloc__)) > ++char * > ++generic_make_pathname(const char *base, const char *leaf) > ++{ > ++ size_t size; > ++ char *path; > ++ int len; > ++ > ++ size = strlen(base) + strlen(leaf) + 2; > ++ if (size > PATH_MAX) > ++ return NULL; > ++ > ++ path = malloc(size); > ++ if (path == NULL) > ++ return NULL; > ++ > ++ len = snprintf(path, size, "%s/%s", base, leaf); > ++ if ((len < 0) || ((size_t)len >= size)) { > ++ free(path); > ++ return NULL; > ++ } > ++ > ++ return path; > ++} > ++ > ++ > ++/** > ++ * generic_setup_basedir - set up basedir > ++ * @progname: C string containing name of program, for error messages > ++ * @parentdir: C string containing pathname to on-disk state, or NULL > ++ * @base: character buffer to contain the basedir that is set up > ++ * @baselen: size of @base in bytes > ++ * > ++ * This runs before logging is set up, so error messages are directed > ++ * to stderr. > ++ * > ++ * Returns true and sets up our basedir, if @parentdir was valid > ++ * and usable; otherwise false is returned. > ++ */ > ++_Bool > ++generic_setup_basedir(const char *progname, const char *parentdir, char *base, > ++ const size_t baselen) > ++{ > ++ static char buf[PATH_MAX]; > ++ struct stat st; > ++ char *path; > ++ > ++ /* First: test length of name and whether it exists */ > ++ if ((strlen(parentdir) >= baselen) || (strlen(parentdir) >= PATH_MAX)) { > ++ (void)fprintf(stderr, "%s: Directory name too long: %s", > ++ progname, parentdir); > ++ return false; > ++ } > ++ if (lstat(parentdir, &st) == -1) { > ++ (void)fprintf(stderr, "%s: Failed to stat %s: %s", > ++ progname, parentdir, strerror(errno)); > ++ return false; > ++ } > ++ > ++ /* Ensure we have a clean directory pathname */ > ++ strncpy(buf, parentdir, sizeof(buf)); > ++ path = dirname(buf); > ++ if (*path == '.') { > ++ (void)fprintf(stderr, "%s: Unusable directory %s", > ++ progname, parentdir); > ++ return false; > ++ } > ++ > ++ xlog(D_CALL, "Using %s as the state directory", parentdir); > ++ strcpy(base, parentdir); > ++ return true; > ++} > +diff --git a/support/nsm/Makefile.am b/support/nsm/Makefile.am > +index 2038e68..864348d 100644 > +--- a/support/nsm/Makefile.am > ++++ b/support/nsm/Makefile.am > +@@ -10,7 +10,7 @@ GENFILES = $(GENFILES_CLNT) $(GENFILES_SVC) $(GENFILES_XDR) $(GENFILES_H) > + EXTRA_DIST = sm_inter.x > + > + noinst_LIBRARIES = libnsm.a > +-libnsm_a_SOURCES = $(GENFILES) file.c rpc.c > ++libnsm_a_SOURCES = $(GENFILES) ../misc/misc.c file.c rpc.c > + > + BUILT_SOURCES = $(GENFILES) > + > +-- > +2.7.4 > + > 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..ed4aa5f430 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 > @@ -30,6 +30,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x > file://nfs-utils-debianize-start-statd.patch \ > file://bugfix-adjust-statd-service-name.patch \ > file://nfs-utils-musl-limits.patch \ > + file://0001-Makefile.am-update-the-path-of-libnfs.a.patch \ > + file://0001-fix-undefined-for-libnsm.a.patch \ > " > > SRC_URI_append_libc-musl = " file://nfs-utils-musl-res_querydomain.patch" >