All 3 CVEs are fixed in the currently used revision.
Fixes:
CVE-2024-25176: 343ce0edaf
CVE-2024-25177: 85b4fed0b0
CVE-2024-25178: defe61a567
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Please see
https://git.yoctoproject.org/poky/commit/?id=4dd321f8b83afecd962393101b2a6861275b5265
for what changes are needed, and sed commands that can be used to make them en masse.
I've verified that bitbake -c patch world works with these, but did not run a world
build; the majority of recipes shouldn't need further fixups, but if there are
some that still fall out, they can be fixed in followups.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Not referenced since commit 1a05731de4
("luajit: upgrade 2.1beta -> 2.1").
Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
The 32 Bit host development package needed is libc6-dev:i386, not
libc6-dev-i386.
Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
According to documentation mips,mips64 and powerpc are supported
platforms. Adjust accordingly
This was tested to work for mips64, where luajit compiled without
issue.
Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Do not convert the variable name resembling override setups passed to makefile
Fix some of missed overrides
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Martin Jansa <Martin.Jansa@gmail.com>
This is the result of automated script (0.9.1) conversion:
oe-core/scripts/contrib/convert-overrides.py .
converting the metadata to use ":" as the override character instead of "_".
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Fix CVE-2020-15890 and CVE-2020-24372.
Also change PV format because the reference to 2.1.0-beta3
was already far behind the SRCREV. Now, base PV on a tag
and date of SRCREV commit if it is later. Sort order is
2.1.0~beta3 -> 2.1.0~beta-yymmdd -> 2.1.0 -> 2.1.0-yymmdd.
Signed-off-by: Joe Slater <joe.slater@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
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@linaro.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
A couple have still been missed in the past despite multiple
attempts at doing so (or simply have re-appeared?).
Search & replace made using the following command:
sed -e 's|\(d\.getVar \?\)( \?\([^,()]*\), \?True)|\1(\2)|g' \
-i $(git grep -E 'getVar ?\( ?([^,()]*), ?True\)' \
| cut -d':' -f1 \
| sort -u)
Signed-off-by: André Draszik <andre.draszik@jci.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
BUILD_LDFLAGS add --dynamic-linker to point to uninative but
some binaries in luajit are for 32bit build host, so even if
your host has the needed runtime, it will fail to execute because
uninative ldso doesn't know about multilib
we get cyptic errors like
| make[1]: execvp: host/minilua: Accessing a corrupted shared library
| make[1]: *** [Makefile:610: host/buildvm_arch.h] Error 127
Switch to using git for SRC_URI, master is pointing to latest
2.0 stable, it gets us all the patches done since last 2.0.5 relases
in 2017
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
make[1]: Entering directory '/home/jenkins/oe/world/shr-core/tmpfs/work/aarch64-oe-linux/luajit/2.0.5-r0/LuaJIT-2.0.5/src'
| lj_arch.h:55:2: error: #error "No support for this architecture (yet)"
| #error "No support for this architecture (yet)"
| ^~~~~
| lj_arch.h:294:2: error: #error "No target architecture defined"
| #error "No target architecture defined"
Signed-off-by: Armin Kuster <akuster808@gmail.com>
LuaJIT tries to call ldconfig during installation which doesn't work.
This causes the .so and .so.2 symlinks to no be created.
By setting "LDCONFIG= :" the call will be skipped the same as on Darwin
Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
1) Upgrade luajit from 2.0.4 to 2.0.5.
2) License checksum changed,since the copyright years were updated.
Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
When cross compiling, the word size of the compiler set via HOST_CC
must match the word size of the target. That's achieved by appending
"-m32" to BUILD_CC_ARCH if the target word size is known to be 32bits.
Unfortunately the current list of over-rides may not cover all cases.
Using SITEINFO_BITS is a more generic solution.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
When cross compiling, the word size of the compiler set via HOST_CC
must match the word size of the target. That's achieved by appending
"-m32" to BUILD_CC_ARCH if the target word size is known to be 32bits.
Unfortunately the current list of over-rides (powerpc, x86 and arm)
does not cover all cases. Add mips and mipsel to the list too (which
is still not enough to cover all targets or corner cases such as x32,
but better than before).
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Rework how variables are passed in to ensure that more of our flag vars are
obeyed, make it obey more of our target path vars, and use fewer of its
hardcoded flags. Also add verbosity to the compile output for debugging.
Without this, errors were seen for us:
| In file included from .../lib/gcc/i686-pc-linux-gnu/5.2.0/include-fixed/64/sgxx-glibc/syslimits.h:7:0,
| from .../lib/gcc/i686-pc-linux-gnu/5.2.0/include-fixed/64/sgxx-glibc/limits.h:34,
| from luaconf.h:12,
| from lua.h:16,
| from lj_arch.h:9:
| .../lib/gcc/i686-pc-linux-gnu/5.2.0/include-fixed/64/sgxx-glibc/limits.h:168:61: fatal error: limits.h: No such file or directory
| compilation terminated.
| Makefile:233: *** Unsupported target architecture. Stop.
| make[1]: Leaving directory '.../luajit/2.0.4-r0/LuaJIT-2.0.4/src'
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* previous fix didn't work very well, because host version really needs
to use the same pointer size, so it's better to disable native builds
completely and let HOST_LUA to be compiled in target build with
correct params
* EXTRA_OEMAKE_append_mips64 = ' HOST_CC="${BUILD_CC} -m32"'
looks like mistake, is mips64 using 32bit pointers?
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* otherwise minilua for host is built during build of target lua, see
comment in Makefile:
# If left blank, minilua is built and used. You can supply an installed
# copy of (plain) Lua 5.1 or 5.2, plus Lua BitOp. E.g. with: HOST_LUA=lua
* be aware that there is still native buildvm which needs the same headers
if it fails for you, then you probably need to install libc6-dev:i386
which installs these headers to hosts /usr/include, some architectures
are passing HOST_CC="${BUILD_CC} -m32" in EXTRA_OEMAKE, that's why
you need 32bit headers on 64bit host.
* building native minilua fails on some hosts like this:
ERROR: luajit-2.0.4-r0 do_compile: oe_runmake failed
ERROR: luajit-2.0.4-r0 do_compile: Function failed: do_compile (log file is located at /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/luajit/2.0.4-r0/temp/log.do_compile.3067)
ERROR: Logfile of failure stored in: /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/luajit/2.0.4-r0/temp/log.do_compile.3067
Log data follows:
| DEBUG: Executing shell function do_compile
| NOTE: make -j 8 CROSS=arm-oe-linux-gnueabi- TARGET_CFLAGS= --sysroot=/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemuarm -march=armv5te -mthumb TARGET_LDFLAGS= --sysroot=/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemuarm TARGET_SHLDFLAGS= --sysroot=/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemuarm HOST_CC=gcc -m32
| ==== Building LuaJIT 2.0.4 ====
| make -C src
| make[1]: Entering directory `/home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/luajit/2.0.4-r0/LuaJIT-2.0.4/src'
| HOSTCC host/buildvm_asm.o
| HOSTCC host/minilua.o
| HOSTCC host/buildvm_peobj.o
| HOSTCC host/buildvm_lib.o
| HOSTCC host/buildvm_fold.o
| CC lj_gc.o
| CC lj_obj.o
| CC lj_char.o
| In file included from host/buildvm_peobj.c:9:0:
| host/buildvm.h:9:23: fatal error: sys/types.h: No such file or directory
| #include <sys/types.h>
| ^
| compilation terminated.
| In file included from host/buildvm_fold.c:6:0:
| host/buildvm.h:9:23: fatal error: sys/types.h: No such file or directory
| #include <sys/types.h>
| ^
| compilation terminated.
| In file included from host/buildvm_asm.c:6:0:
| host/buildvm.h:9:23: fatal error: sys/types.h: No such file or directory
| #include <sys/types.h>
| ^
| compilation terminated.
| In file included from host/buildvm_lib.c:6:0:
| host/buildvm.h:9:23: fatal error: sys/types.h: No such file or directory
| #include <sys/types.h>
| ^
| compilation terminated.
| In file included from /usr/include/limits.h:25:0,
| from /usr/lib/gcc/x86_64-linux-gnu/4.8/include-fixed/limits.h:168,
| from /usr/lib/gcc/x86_64-linux-gnu/4.8/include-fixed/syslimits.h:7,
| from /usr/lib/gcc/x86_64-linux-gnu/4.8/include-fixed/limits.h:34,
| from host/minilua.c:33:
| /usr/include/features.h:374:25: fatal error: sys/cdefs.h: No such file or directory
| # include <sys/cdefs.h>
| ^
| compilation terminated.
| make[1]: *** [host/buildvm_lib.o] Error 1
| make[1]: *** Waiting for unfinished jobs....
| make[1]: *** [host/buildvm_fold.o] Error 1
| make[1]: *** [host/buildvm_asm.o] Error 1
| make[1]: *** [host/buildvm_peobj.o] Error 1
| make[1]: *** [host/minilua.o] Error 1
| make[1]: Leaving directory `/home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/luajit/2.0.4-r0/LuaJIT-2.0.4/src'
| make: *** [default] Error 2
| ERROR: oe_runmake failed
| ERROR: Function failed: do_compile (log file is located at /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/luajit/2.0.4-r0/temp/log.do_compile.3067)
NOTE: recipe luajit-2.0.4-r0: task do_compile: Failed
ERROR: Task 6 (/home/jenkins/oe/world/shr-core/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb, do_compile) failed with exit code '1'
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
When build luajit-native:
/buildarea2/build/tmp/sysroots/x86_64-linux/usr ====
| rmdir: failed to remove '/buildarea2/build/tmp/work/x86_64-linux/luajit-native/2.0.3-r0/image/buildarea2/build/tmp/sysroots/x86_64-linux/usr/lib/lua/5.*': No such file or directory
| rmdir: failed to remove '/buildarea2/build/tmp/work/x86_64-linux/luajit-native/2.0.3-r0/image/buildarea2/build/tmp/sysroots/x86_64-linux/usr/lib/lua': No such file or directory
| WARNING: exit code 1 from a shell command.
Use ${baselib} instead of ${base_libdir} for variable MULTILIB in
Makefile. Otherwise the INSTALL_LIB would extend to wrong path.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Support i686 without needing to duplicate the i586 over-ride.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
luajit as well as acpitests build system has mind of its own and does not
respect CC and friends in makefiles so we have to inject
the CFLAGS via EXTRA_OEMAKE, some of ABI defining params
e.g. float-abi selection is mentioned in TUNE_CCARGS and
not in TOOLCHAIN_OPTIONS. This causes build to go for softfloat
build and that is not what we want.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Will add this patch in meta-fsl-ppc layer via bbappend.
Signed-off-by: Ting Liu <b28495@freescale.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* http://luajit.org/changes.html says:
This release has the new PS4 port and various important bugfixes over
2.0.2 - an update is recommended.
* add native support (used by efl-native)
* drop lua dependency, it doesn't need lua to be built before luajit
* LIC_FILES_CHKSUM change is only from copyright year update
< Copyright (C) 2005-2013 Mike Pall. All rights reserved.
---
> Copyright (C) 2005-2014 Mike Pall. All rights reserved.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Changes:
- rename SUMMARY with length > 80 to DESCRIPTION
- rename DESCRIPTION with length < 80 to (non present tag) SUMMARY
- drop final point character at the end of SUMMARY string
- remove trailing whitespace of SUMMARY line
Note: don't bump PR
Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
some parts of libluajit is not compiled with PICness
lets fix it.
Also get the hotfix patch for luajit dot org
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Fix stripping related warnings
Drop foldarith_for_spe patch not neded anymore
QA Error about elocations in .text are still there like 2.0.0
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* This change is only aesthetic (unlike indentation in Python
tasks).
* Some recipes were using tabs.
* Some were using 8 spaces.
* Some were using mix or different number of spaces.
* Make them consistently use 4 spaces everywhere.
* Yocto styleguide advises to use tabs (but the only reason to keep
tabs is the need to update a lot of recipes). Lately this advice
was also merged into the styleguide on the OE wiki.
* Using 4 spaces in both types of tasks is better because it's less
error prone when someone is not sure if e.g.
do_generate_toolchain_file() is Python or shell task and also allows
to highlight every tab used in .bb, .inc, .bbappend, .bbclass as
potentially bad (shouldn't be used for indenting of multiline
variable assignments and cannot be used for Python tasks).
* Don't indent closing quote on multiline variables
we're quite inconsistent wheater it's first character on line
under opening quote or under first non-whitespace character in
previous line.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Acked-by: Koen Kooi <koen@dominion.thruhere.net>
luajit does not honor standard CC variables
so when its built from shared state it does
not compile because --sysroot is wrong.
This patch fixes the problem by passing
the TOOLCHAIN_OPTONS to appropriate flags
so that it gets the correct sysroot value
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
when rebuilding we were running into issues where /usr/lib64 was
being made /usr/lib6464 and install was failing. Now we check if /lib
is at the end of line then only we replace it.
Fixes the reinstall issue
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
