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 A53696FA23 for ; Wed, 2 Apr 2014 02:35:56 +0000 (UTC) Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail1.windriver.com (8.14.5/8.14.5) with ESMTP id s322ZuZu011481 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL); Tue, 1 Apr 2014 19:35:56 -0700 (PDT) Received: from [128.224.162.231] (128.224.162.231) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server (TLS) id 14.3.169.1; Tue, 1 Apr 2014 19:35:55 -0700 Message-ID: <533B7788.7000301@windriver.com> Date: Wed, 2 Apr 2014 10:35:52 +0800 From: Kang Kai User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130623 Thunderbird/17.0.7 MIME-Version: 1.0 To: Kai Kang References: <1396275649-32352-1-git-send-email-kai.kang@windriver.com> <1396275649-32352-2-git-send-email-kai.kang@windriver.com> In-Reply-To: <1396275649-32352-2-git-send-email-kai.kang@windriver.com> X-Originating-IP: [128.224.162.231] Cc: openembedded-core@lists.openembedded.org Subject: Re: [PATCH] nss: avoid to use the hardcode kernel version 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: Wed, 02 Apr 2014 02:35:58 -0000 Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit On 2014年03月31日 22:20, Kai Kang wrote: > From: Roy Li > > When native package is built, use the uname to return the kernel version. > > When target is built, read kernel version from ${STAGING_KERNEL_DIR}/kernel-abiversion > to avoid to use the hardcode kernel version. > > Signed-off-by: Roy Li > Signed-off-by: Kai Kang > --- > meta/recipes-support/nss/nss.inc | 15 +++++++++++++-- > 1 file changed, 13 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-support/nss/nss.inc b/meta/recipes-support/nss/nss.inc > index 404decc..f24da68 100644 > --- a/meta/recipes-support/nss/nss.inc > +++ b/meta/recipes-support/nss/nss.inc > @@ -26,6 +26,7 @@ SRC_URI_append_class-target = "\ > inherit siteinfo > PR = "r0" > DEPENDS = "sqlite3 nspr zlib nss-native" > +DEPENDS_append_class-target += "virtual/kernel" > DEPENDS_class-native = "sqlite3-native nspr-native zlib-native" > RDEPENDS_${PN} = "perl" > > @@ -37,12 +38,24 @@ TARGET_CC_ARCH += "${LDFLAGS}" > do_compile_prepend_class-native() { > export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE} > export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE} > + export OS_RELEASE=`uname -r` > } > > do_compile_prepend_class-nativesdk() { > export LDFLAGS="" > } > > +do_compile_prepend_class-target() { > + export OS_RELEASE=`cat ${STAGING_KERNEL_DIR}/kernel-abiversion|sed 's/-.*//'` > +} > + > +do_install_prepend_class-native() { > + export OS_RELEASE=`uname -r` > +} > + > +do_install_prepend_class-target() { > + export OS_RELEASE=`cat ${STAGING_KERNEL_DIR}/kernel-abiversion|sed 's/-.*//'` > +} > do_compile() { > export CROSS_COMPILE=1 > export NATIVE_CC="gcc" > @@ -57,7 +70,6 @@ do_compile() { > export NSS_USE_SYSTEM_SQLITE=1 > export NSS_ENABLE_ECC=1 > > - export OS_RELEASE=3.4 How about use var LINUXLIBCVERSION: export OS_RELEASE="${@d.getVar('LINUXLIBCVERSION', True)}" it should be the same value with kernel version, right? --Kai > export OS_TARGET=Linux > export OS_ARCH=Linux > > @@ -97,7 +109,6 @@ do_install() { > export NSS_USE_SYSTEM_SQLITE=1 > export NSS_ENABLE_ECC=1 > > - export OS_RELEASE=3.4 > export OS_TARGET=Linux > export OS_ARCH=Linux > -- Regards, Neil | Kai Kang