From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by mail.openembedded.org (Postfix) with ESMTP id 8C7A871DB8 for ; Wed, 5 Apr 2017 16:49:44 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id t20so4328858wra.2 for ; Wed, 05 Apr 2017 09:49:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=VWxLpGBbEsrSleAiJkuvDZ5adBo6Cjo9aYw5BsMLAnc=; b=P3PQg9Ws9ZQfXFYYNjejsypC2RoFcaSGJ4oyjV0OlWOJgsEL3bu0FKclihX97OPiYg tnW5cBrvQ639WQF2KKopuknxhE1AqXCQ9Q/82NHgK68xoMIuBFJXszX2VZKE3XQgMT59 OSnPyA7WD401f+T/h3i2oOMVnrie96dCom1/zmYn6zQ8OqTzSRpxjzmKQ1SliOeWeuCy oKNJA0bSrY5cSJFVk2XfyJBxPV4mo3vLUlwqogYPRBQOXOJh5PyB46PWWxrS2JwqBAfQ T27isx2CzWTxL/S+vCuDBomALo24n6a240NEkG4qe6gGD7ixdkZNEUkNTGTiK6p6G2ng OXxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=VWxLpGBbEsrSleAiJkuvDZ5adBo6Cjo9aYw5BsMLAnc=; b=CCXda9C0bX7bz9Pg0lDYx8gBz7WCyIBd1B0D9U3XqwZQLJoQH09z+UyDncn0YnTzBo AVAM6KC7YGJ+Q+iUKg1XM9Jk84mxk7Yr6D1jRa65DHcUUmyGQDIjSH98GAuPGZsu4Gbk /aSNQ2qtvhQVHZjtR0A0AlR82K5lqQSKNAqaDEw6jErTxpjA/txWUqHjSt7PsvHkph0p hZAXO/Z9yv46UZSfFUBs1evk7VdREO848B4U4sYSmoggDNmdPIdslho8x43P+aQDWahg zEaSxk9/lES7l9GFD4d28Qac1Fkgyw29DrKIQqH9rXBnLxZK+mHbpR4uzZ7Utop30IEp jD2w== X-Gm-Message-State: AFeK/H3bDLup1mjLdAMy6pHT4m4YGuTzpiRFvMZAm8OtP7+6vSqABOQYYJZafUsXHXQaJ7/iUNr/1BGWs06S0g== X-Received: by 10.223.138.225 with SMTP id z30mr26781603wrz.26.1491410985141; Wed, 05 Apr 2017 09:49:45 -0700 (PDT) MIME-Version: 1.0 Received: by 10.80.180.162 with HTTP; Wed, 5 Apr 2017 09:49:14 -0700 (PDT) In-Reply-To: <20170403141806.GD3311@jama> References: <20170331164247.5052-1-raj.khem@gmail.com> <20170331164247.5052-29-raj.khem@gmail.com> <20170403141806.GD3311@jama> From: Khem Raj Date: Wed, 5 Apr 2017 09:49:14 -0700 Message-ID: To: Martin Jansa Cc: openembeded-devel Subject: Re: [meta-oe][PATCH 29/43] libqb: Upgrade to 1.0.1 release X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Apr 2017 16:49:44 -0000 Content-Type: text/plain; charset=UTF-8 On Mon, Apr 3, 2017 at 7:18 AM, Martin Jansa wrote: > On Fri, Mar 31, 2017 at 09:42:33AM -0700, Khem Raj wrote: >> Add a patch needed for cross compiling > > This breaks corosync: > http://errors.yoctoproject.org/Errors/Details/138932/ > This needed updated too. I have pushed a recipe update for corosync https://github.com/kraj/meta-openembedded/commit/6d4e506ecf2ae4effee4e70b3ff0e3d7c1a18542 >> Signed-off-by: Khem Raj >> --- >> ...-Remove-runtime-check-for-CLOCK_MONOTONIC.patch | 43 ++++++++++++++++++++++ >> .../libqb/{libqb_0.17.2.bb => libqb_1.0.1.bb} | 14 +++---- >> 2 files changed, 49 insertions(+), 8 deletions(-) >> create mode 100644 meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch >> rename meta-oe/recipes-extended/libqb/{libqb_0.17.2.bb => libqb_1.0.1.bb} (67%) >> >> diff --git a/meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch b/meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch >> new file mode 100644 >> index 000000000..28bc5c07d >> --- /dev/null >> +++ b/meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch >> @@ -0,0 +1,43 @@ >> +From e6fbad0c122ba8e87b67a9e2447505adcaafe204 Mon Sep 17 00:00:00 2001 >> +From: Khem Raj >> +Date: Wed, 29 Mar 2017 16:31:38 -0700 >> +Subject: [PATCH] Remove runtime check for CLOCK_MONOTONIC >> + >> +Does not work during cross compile >> + >> +use a compile-time check to detect whether the >> +monotonic clock is available. This check can run just fine when we are >> +cross-compiling. >> + >> +Signed-off-by: Khem Raj >> +--- >> + configure.ac | 12 ++++++++++-- >> + 1 file changed, 10 insertions(+), 2 deletions(-) >> + >> +diff --git a/configure.ac b/configure.ac >> +index fa13ae6..f4f0f46 100644 >> +--- a/configure.ac >> ++++ b/configure.ac >> +@@ -175,9 +175,17 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM( >> + ) >> + >> + AC_MSG_CHECKING(for a working clock_getres(CLOCK_MONOTONIC, &ts)) >> +-AC_RUN_IFELSE([AC_LANG_PROGRAM( >> ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM( >> + [[#include ]], >> +-[[struct timespec ts; if(clock_getres(CLOCK_MONOTONIC, &ts)) return -1;]])], >> ++[[ >> ++#include >> ++int main() { >> ++#if !(defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 && defined(CLOCK_MONOTONIC)) >> ++ #error No monotonic clock >> ++#endif >> ++ return 0; >> ++ >> ++]])], >> + [ >> + AC_MSG_RESULT([yes]) >> + AC_DEFINE_UNQUOTED([HAVE_CLOCK_GETRES_MONOTONIC], 1, [Define to 1 if clock_getres(CLOCK_MONOTONIC, &ts) works]) >> +-- >> +2.12.1 >> + >> diff --git a/meta-oe/recipes-extended/libqb/libqb_0.17.2.bb b/meta-oe/recipes-extended/libqb/libqb_1.0.1.bb >> similarity index 67% >> rename from meta-oe/recipes-extended/libqb/libqb_0.17.2.bb >> rename to meta-oe/recipes-extended/libqb/libqb_1.0.1.bb >> index 94030b2ea..e26bb7c19 100644 >> --- a/meta-oe/recipes-extended/libqb/libqb_0.17.2.bb >> +++ b/meta-oe/recipes-extended/libqb/libqb_1.0.1.bb >> @@ -4,22 +4,20 @@ It provides high performance logging, tracing, ipc, and poll." >> >> HOMEPAGE = "https://github.com/clusterlabs/libqb/wiki" >> SECTION = "libs" >> - >> LICENSE = "LGPL-2.1" >> LIC_FILES_CHKSUM = "file://COPYING;md5=321bf41f280cf805086dd5a720b37785" >> >> -inherit autotools-brokensep pkgconfig >> - >> -PV = "0.17.2+git${SRCPV}" >> +inherit autotools pkgconfig >> >> -SRCREV = "bd2c587f6ccacd8a5644b275d99324d200c2b378" >> -SRC_URI = "git://github.com/ClusterLabs/${BPN}.git" >> +PV .= "+git${SRCPV}" >> >> +SRCREV = "0a329683a76bc6aeb36f20f2bf6b43ba0440c4dc" >> +SRC_URI = "git://github.com/ClusterLabs/${BPN}.git \ >> + file://0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch \ >> + " >> S = "${WORKDIR}/git" >> >> do_configure_prepend() { >> ( cd ${S} >> ${S}/autogen.sh ) >> } >> - >> - >> -- >> 2.12.1 >> >> -- >> _______________________________________________ >> Openembedded-devel mailing list >> Openembedded-devel@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel > > -- > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com