[oe] [meta-oe][PATCH v4] luajit: Upgrade to 2.1.0-beta3

Wed Mar 4 04:53:07 UTC 2020

On Tue, Mar 3, 2020 at 8:43 PM Martin Jansa <martin.jansa at gmail.com> wrote:
>
> You can use something like:
> 2.0.99+2.1.0-beta3
> to make sure it doesn't go backwards.
>
> 2.1.0+beta3 seems wrong, because it would sort higher than final 2.1.0 (without the +git${SRCPV} suffix).
>
> 2.1.0~beta3 might work, but it's not used by many recipes.
>

this came out to work well and is concise too, so I went with this

> On Wed, Mar 4, 2020 at 4:01 AM Leo Yan <leo.yan at linaro.org> wrote:
>>
>> Hi Khem,
>>
>> On Thu, Feb 27, 2020 at 07:27:21AM -0800, Khem Raj wrote:
>> > I am seeing version going backward errors still
>> >
>> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-src went
>> > backwards which would break package feeds (from
>> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
>> > [version-going-backwards]
>> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-dbg went
>> > backwards which would break package feeds (from
>> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
>> > [version-going-backwards]
>> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-staticdev
>> > went backwards which would break package feeds (from
>> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
>> > [version-going-backwards]
>> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-dev went
>> > backwards which would break package feeds (from
>> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
>> > [version-going-backwards]
>> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-doc went
>> > backwards which would break package feeds (from
>> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
>> > [version-going-backwards]
>> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-locale
>> > went backwards which would break package feeds (from
>> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
>> > [version-going-backwards]
>> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit went
>> > backwards which would break package feeds (from
>> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
>> > [version-going-backwards]
>> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-common
>> > went backwards which would break package feeds (from
>> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
>> > [version-going-backwards]
>>
>> I googled for this issue, the backwards issue is likely caused by the
>> PV: from "2.0.5+git${SRCPV}" to "2.0.5+2.1.0-beta3".
>>
>> So how about change PV to "2.1.0+beta3" and later for version 2.1.0,
>> we can use the format "2.1.0+git${SRCPV}"?  At the end we can get the
>> version sequence as:
>>
>> Old:   2.0.5+git${SRCPV}
>> Now:   2.1.0+beta3
>> Later: 2.1.0+git${SRCPV}
>>
>> Does this make sense for you?
>>
>> Thanks,
>> Leo
>>
>> > On Wed, Feb 26, 2020 at 4:26 AM Leo Yan <leo.yan at linaro.org> wrote:
>> > >
>> > > Since luajit 2.1.0-beta3 can support architecture aarch64 and the old
>> > > misses to support aarch64, the patch upgrades to luajit 2.1.0-beta3.
>> > >
>> > > Also updated clang.patch to dismiss patch warning: "Hunk #1 succeeded
>> > > at 436 with fuzz 1 (offset 123 lines)."
>> > >
>> > > Signed-off-by: Leo Yan <leo.yan at linaro.org>
>> > > ---
>> > >  meta-oe/recipes-devtools/luajit/luajit/clang.patch  |  4 ++--
>> > >  .../luajit/{luajit_2.0.5.bb => luajit_git.bb}       | 13 ++++++-------
>> > >  2 files changed, 8 insertions(+), 9 deletions(-)
>> > >  rename meta-oe/recipes-devtools/luajit/{luajit_2.0.5.bb => luajit_git.bb} (90%)
>> > >
>> > > diff --git a/meta-oe/recipes-devtools/luajit/luajit/clang.patch b/meta-oe/recipes-devtools/luajit/luajit/clang.patch
>> > > index c39ef6fd4..807cc4417 100644
>> > > --- a/meta-oe/recipes-devtools/luajit/luajit/clang.patch
>> > > +++ b/meta-oe/recipes-devtools/luajit/luajit/clang.patch
>> > > @@ -8,8 +8,8 @@ Index: LuaJIT-2.0.5/src/lj_arch.h
>> > >  ===================================================================
>> > >  --- LuaJIT-2.0.5.orig/src/lj_arch.h
>> > >  +++ LuaJIT-2.0.5/src/lj_arch.h
>> > > -@@ -313,7 +313,7 @@
>> > > - #error "Need at least GCC 4.2 or newer"
>> > > +@@ -436,7 +436,7 @@
>> > > + #endif
>> > >   #endif
>> > >   #elif !LJ_TARGET_PS3
>> > >  -#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3)
>> > > diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb b/meta-oe/recipes-devtools/luajit/luajit_git.bb
>> > > similarity index 90%
>> > > rename from meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
>> > > rename to meta-oe/recipes-devtools/luajit/luajit_git.bb
>> > > index 93128dda8..2a7243842 100644
>> > > --- a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
>> > > +++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb
>> > > @@ -1,14 +1,14 @@
>> > >  SUMMARY = "Just-In-Time Compiler for Lua"
>> > >  LICENSE = "MIT"
>> > > -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=10a96c93403affcc34765f4c2612bc22"
>> > > +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d739bb9250a55c124a545b588fd76771"
>> > >  HOMEPAGE = "http://luajit.org"
>> > >
>> > > -PV .= "+git${SRCPV}"
>> > > -SRCREV = "02b521981a1ab919ff2cd4d9bcaee80baf77dce2"
>> > > -SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http \
>> > > +PV = "2.0.5+2.1.0-beta3"
>> > > +SRCREV = "0ad60ccbc3768fa8e3e726858adf261950edbc22"
>> > > +SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \
>> > >             file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \
>> > >             file://clang.patch \
>> > > -"
>> > > +           "
>> > >
>> > >  S = "${WORKDIR}/git"
>> > >
>> > > @@ -90,8 +90,7 @@ FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \
>> > >  "
>> > >  FILES_luajit-common = "${datadir}/${BPN}-${PV}"
>> > >
>> > > -# Aarch64/mips64/ppc/ppc64/riscv64 is not supported in this release
>> > > -COMPATIBLE_HOST_aarch64 = "null"
>> > > +# mips64/ppc/ppc64/riscv64 is not supported in this release
>> > >  COMPATIBLE_HOST_mipsarchn32 = "null"
>> > >  COMPATIBLE_HOST_mipsarchn64 = "null"
>> > >  COMPATIBLE_HOST_powerpc = "null"
>> > > --
>> > > 2.17.1
>> > >
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel at lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel