Bump Firefrox, add virtual/egl dependancy to SDL2, and enable elfutils/firstboot in systemd. Shift the kde-framework appends to the yocto-meta-kf5 layer

This commit is contained in:
Justin Hammond 2023-08-23 16:35:13 +08:00
parent 1689a6cfb0
commit e19022a262
20 changed files with 103 additions and 117 deletions

View file

@ -1,12 +0,0 @@
# SPDX-FileCopyrightText: 2023 Justin Hammond <justin@dynam.ac>
#
# SPDX-License-Identifier: MIT
#The Cmake files include the sysroot directory to pipewire and spa, delete the actual sysroot from the path.
do_install:prepend:class-target() {
if [ "0" -ne $(find . -name \*.cmake | grep '_usr\|Export' | wc -l) ]; then
echo sed -i 's#'${RECIPE_SYSROOT}/usr'#\$\{_IMPORT_PREFIX\}#g' $(find . -name "*.cmake" | grep '_usr\|Export' )
sed -i 's#'${RECIPE_SYSROOT}/usr'#\$\{_IMPORT_PREFIX\}#g' $(find . -name "*.cmake" | grep '_usr\|Export' )
fi
}

View file

@ -1,4 +1,4 @@
From 9e37248870b2b955293754933c789ca00bca06ef Mon Sep 17 00:00:00 2001
From 5bb23589f0a7851577d6487e49ccd9cc955c4143 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de>
Date: Fri, 1 Oct 2021 13:00:24 +0200
Subject: [PATCH] Cargo.toml: do not abort on panic
@ -8,12 +8,14 @@ OE's rust is configured to unwind, and this setting clashes with it/
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
Cargo.toml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Cargo.toml | 2 --
1 file changed, 2 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
index cdf6d43ca4..a723e36260 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -51,13 +51,11 @@ opt-level = 1
@@ -62,13 +62,11 @@ opt-level = 1
rpath = false
lto = false
debug-assertions = true

View file

@ -1,4 +1,4 @@
From 749ba11fd6a69c8180945d4866415d16ae06a9c0 Mon Sep 17 00:00:00 2001
From ba93b9d4068505b3c7327375f53cb0fe1662930e Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de>
Date: Fri, 1 Oct 2021 13:02:17 +0200
Subject: [PATCH] rust.configure: do not try to find a suitable upstream target
@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
1 file changed, 2 insertions(+), 32 deletions(-)
diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
index cd77d72bb7..4b6481cbe3 100644
index 7a2fd1ae70..e11f13b253 100644
--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
@@ -459,33 +459,7 @@ def assert_rust_compile(host_or_target, rustc_target, rustc):
@@ -486,33 +486,7 @@ def assert_rust_compile(host_or_target, rustc_target, rustc):
def rust_host_triple(
rustc, host, compiler_info, rustc_host, rust_supported_targets, arm_target
):
@ -50,7 +50,7 @@ index cd77d72bb7..4b6481cbe3 100644
@depends(
@@ -495,11 +469,7 @@ def rust_host_triple(
@@ -522,11 +496,7 @@ def rust_host_triple(
def rust_target_triple(
rustc, target, compiler_info, rust_supported_targets, arm_target
):

View file

@ -1,4 +1,4 @@
From 65acc8800dba7e10da882871d4648241805c47ce Mon Sep 17 00:00:00 2001
From 280b337d99c87eadea8a221909fcbd7a0410a48b Mon Sep 17 00:00:00 2001
From: Andre McCurdy <amccurdy@gmail.com>
Date: Sat, 30 Apr 2016 15:29:06 -0700
Subject: [PATCH] use <asm/sgidefs.h>
@ -19,12 +19,14 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
gdb/mips-linux-nat.c | 2 +-
mfbt/RandomNum.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mfbt/RandomNum.cpp b/mfbt/RandomNum.cpp
index 96de5d4055..2cfb2e10ee 100644
--- a/mfbt/RandomNum.cpp
+++ b/mfbt/RandomNum.cpp
@@ -52,7 +52,7 @@ extern "C" BOOLEAN NTAPI RtlGenRandom(PV
@@ -53,7 +53,7 @@ extern "C" BOOLEAN NTAPI RtlGenRandom(PVOID RandomBuffer,
# elif defined(__s390__)
# define GETRANDOM_NR 349
# elif defined(__mips__)

View file

@ -0,0 +1,25 @@
From e26385b0ceb108ec86680edbe899defd3628b776 Mon Sep 17 00:00:00 2001
From: Justin Hammond <justin@dynam.ac>
Date: Tue, 22 Aug 2023 10:19:05 +0000
Subject: [PATCH] mozjs60 miscompiles on musl if built with
HAVE_THREAD_TLS_KEYWORD:
https://github.com/void-linux/void-packages/issues/2598
---
js/src/old-configure.in | 3 +++
1 file changed, 3 insertions(+)
diff --git a/js/src/old-configure.in b/js/src/old-configure.in
index 032267a235..440bf82241 100644
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -807,6 +807,9 @@ if test "$ac_cv_thread_keyword" = yes; then
*-android*|*-linuxandroid*)
:
;;
+ *-musl*)
+ :
+ ;;
*)
AC_DEFINE(HAVE_THREAD_TLS_KEYWORD)
;;

View file

@ -1,4 +1,4 @@
From b13cad4abc53f816f64c8b0af70cb46820746c72 Mon Sep 17 00:00:00 2001
From 59a02c5ca2c537f1ecbcde4b5cb5db4b1ed468bf Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
Date: Thu, 11 Nov 2021 16:05:54 +0800
Subject: [PATCH] util.configure: fix one occasionally reproduced configure
@ -33,10 +33,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/moz.configure/util.configure b/build/moz.configure/util.configure
index 8f35e89c73..84e256647d 100644
index b017a10f84..e84b859801 100644
--- a/build/moz.configure/util.configure
+++ b/build/moz.configure/util.configure
@@ -222,7 +222,7 @@ def try_invoke_compiler(compiler, language, source, flags=None, onerror=None):
@@ -256,7 +256,7 @@ def try_invoke_compiler(
"C++": ".cpp",
}[language]
@ -45,6 +45,3 @@ index 8f35e89c73..84e256647d 100644
try:
source = source.encode("ascii", "replace")
--
2.17.1

View file

@ -1,4 +1,4 @@
From 9eceb43dd676afe2f675bd65ab369ba4d14f6537 Mon Sep 17 00:00:00 2001
From 6ebc4bec70f82865b4c17fd45c186333ee4c0315 Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
Date: Thu, 18 Nov 2021 07:16:39 +0000
Subject: [PATCH] Rewrite cargo-host-linker in python3
@ -19,11 +19,11 @@ Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
build/cargo-host-linker | 24 +++++++---
build/cargo-host-linker | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/build/cargo-host-linker b/build/cargo-host-linker
index cbd0472bf7..ccd8bffec1 100755
index cbd0472bf7..87d43ce9ec 100755
--- a/build/cargo-host-linker
+++ b/build/cargo-host-linker
@@ -1,3 +1,21 @@
@ -51,6 +51,3 @@ index cbd0472bf7..ccd8bffec1 100755
+ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + sys.argv[1:]
+
+os.execvp(binary, args)
--
2.33.1

View file

@ -1,41 +1,49 @@
From 99596dd6e8ee004f9998d75caf2c7f7007e3b70c Mon Sep 17 00:00:00 2001
From 961149a8c1ee0705d0fe7ab8920a55be88c89ce2 Mon Sep 17 00:00:00 2001
From: Justin Hammond <justin@dynam.ac>
Date: Mon, 5 Jun 2023 09:20:05 +0000
Subject: [PATCH] do not use config.sub target sys
---
build/moz.configure/init.configure | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
build/moz.configure/init.configure | 31 +++++++++++++++---------------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
index 662d75e0e5..b96e4bc11e 100644
index 34d917d790..055109f802 100644
--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -649,17 +649,18 @@ def config_sub(shell, triplet):
@@ -649,21 +649,22 @@ def config_sub(shell, triplet):
config_sub = os.path.join(os.path.dirname(__file__), "..", "autoconf", "config.sub")
# Config.sub doesn't like the *-windows-msvc/*-windows-gnu triplets, so
# munge those before and after calling config.sub.
- suffix = None
- mingw_suffix = "-mingw32"
- for check_suffix in ("-windows-msvc", "-windows-gnu"):
- munging = {
- "-windows-msvc": "-mingw32",
- "-windows-gnu": "-mingw32",
- }
- for check_suffix, replacement in munging.items():
- if triplet.endswith(check_suffix):
- suffix = check_suffix
- triplet = triplet[: -len(suffix)] + mingw_suffix
- triplet = triplet[: -len(suffix)] + replacement
- break
- result = check_cmd_output(shell, config_sub, triplet).strip()
- if suffix:
- assert result.endswith(mingw_suffix)
- result = result[: -len(mingw_suffix)] + suffix
- assert result.endswith(replacement)
- result = result[: -len(replacement)] + suffix
- return result
+ #suffix = None
+ #mingw_suffix = "-mingw32"
+ #for check_suffix in ("-windows-msvc", "-windows-gnu"):
+ #munging = {
+ # "-windows-msvc": "-mingw32",
+ # "-windows-gnu": "-mingw32",
+ #}
+ #for check_suffix, replacement in munging.items():
+ # if triplet.endswith(check_suffix):
+ # suffix = check_suffix
+ # triplet = triplet[: -len(suffix)] + mingw_suffix
+ # triplet = triplet[: -len(suffix)] + replacement
+ # break
+ #result = check_cmd_output(shell, config_sub, triplet).strip()
+ #if suffix:
+ # assert result.endswith(mingw_suffix)
+ # result = result[: -len(mingw_suffix)] + suffix
+ # assert result.endswith(replacement)
+ # result = result[: -len(replacement)] + suffix
+ #return result
+ return triplet

View file

@ -1,4 +1,4 @@
From de7e18fed40ab9563601715e4acb2222bc98c074 Mon Sep 17 00:00:00 2001
From 2182915fb51836bac55f49c5ca180881432a2b32 Mon Sep 17 00:00:00 2001
From: Justin Hammond <justin@dynam.ac>
Date: Mon, 5 Jun 2023 10:25:38 +0000
Subject: [PATCH] Update some prefs
@ -9,10 +9,10 @@ Subject: [PATCH] Update some prefs
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
index 5173c16303..0bf1034a6e 100644
index cf34acc434..24caa274b2 100644
--- a/modules/libpref/init/StaticPrefList.yaml
+++ b/modules/libpref/init/StaticPrefList.yaml
@@ -8215,7 +8215,7 @@
@@ -8190,7 +8190,7 @@
# interpretation of physical units such as "pt".
- name: layout.css.dpi
type: int32_t
@ -20,12 +20,12 @@ index 5173c16303..0bf1034a6e 100644
+ value: 0
mirror: always
# Whether @layer is enabled
# Whether Container Queries are enabled
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 3c82b43030..083845f06c 100644
index a366fdaeb8..b9f33b0781 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -954,6 +954,7 @@ pref("privacy.purge_trackers.consider_entity_list", false);
@@ -900,6 +900,7 @@ pref("privacy.purge_trackers.consider_entity_list", false);
pref("dom.event.contextmenu.enabled", true);
pref("javascript.enabled", true);
@ -33,6 +33,3 @@ index 3c82b43030..083845f06c 100644
pref("javascript.options.asmjs", true);
pref("javascript.options.wasm", true);
pref("javascript.options.wasm_trustedprincipals", true);
--
2.25.1

View file

@ -1,17 +1,17 @@
From 2b8f2b1926dbd0e7fada446c5f7a5258bbf1026a Mon Sep 17 00:00:00 2001
From 5c0d622b8193b74177cec2b3fc480610df387b67 Mon Sep 17 00:00:00 2001
From: Justin Hammond <justin@dynam.ac>
Date: Wed, 7 Jun 2023 09:29:11 +0000
Subject: [PATCH] force useGLES on riscv
---
toolkit/xre/glxtest.cpp | 2 +-
toolkit/xre/glxtest/glxtest.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/toolkit/xre/glxtest.cpp b/toolkit/xre/glxtest.cpp
index 509675cc44..bfd72c238d 100644
--- a/toolkit/xre/glxtest.cpp
+++ b/toolkit/xre/glxtest.cpp
@@ -537,7 +537,7 @@ static bool get_egl_gl_status(EGLDisplay dpy,
diff --git a/toolkit/xre/glxtest/glxtest.cpp b/toolkit/xre/glxtest/glxtest.cpp
index cd45db815f..b4686dde3f 100644
--- a/toolkit/xre/glxtest/glxtest.cpp
+++ b/toolkit/xre/glxtest/glxtest.cpp
@@ -435,7 +435,7 @@ static bool get_egl_gl_status(EGLDisplay dpy,
PFNGLGETSTRING glGetString =
cast<PFNGLGETSTRING>(eglGetProcAddress("glGetString"));

View file

@ -4,24 +4,25 @@ LICENSE = "MPL-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=dc9b6ecd19a14a54a628edaaf23733bf"
SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}/source/firefox-${PV}.source.tar.xz \
file://0001-Cargo.toml-do-not-abort-on-panic.patch \
file://0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch \
file://0004-use-asm-sgidefs.h.patch \
file://fix-musl-build.patch \
file://0001-util.configure-fix-one-occasionally-reproduced-confi.patch \
file://0001-rewrite-cargo-host-linker-in-python3.patch \
file://mozconfig \
file://0001-do-not-use-config.sub-target-sys.patch \
file://webrtc-riscv64.patch \
file://0001-Update-some-prefs.patch \
file://vendor.js \
file://firefox.sh \
file://mozilla-firefox.desktop \
file://mozilla-firefox.png \
file://0001-force-useGLES-on-riscv.patch \
file://0001-Cargo.toml-do-not-abort-on-panic.patch \
file://0002-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch \
file://0003-use-asm-sgidefs.h.patch \
file://0004-mozjs60-miscompiles-on-musl-if-built-with-HAVE_THREA.patch \
file://0005-util.configure-fix-one-occasionally-reproduced-confi.patch \
file://0006-Rewrite-cargo-host-linker-in-python3.patch \
file://0007-do-not-use-config.sub-target-sys.patch \
file://0008-Update-some-prefs.patch \
file://0009-force-useGLES-on-riscv.patch \
"
SRC_URI[sha256sum] = "7a266044cb9d0c63079b3453507ea0c80a23389f4cbf6a4f6fd15146c6072627"
SRC_URI[sha256sum] = "575a0d11b487a03527cc90c5e6d556c09669201cbb584b73442b202ee1d3e2e6"
S = "${WORKDIR}/firefox-${@d.getVar("PV").replace("esr", "")}"
@ -58,6 +59,7 @@ DEPENDS += " \
zip-native \
gtk+ \
libvpx \
gcc-runtime \
"
B = "${WORKDIR}/build"

View file

@ -1,2 +1,2 @@
PACKAGECONFIG:remove = "networkd resolved nss-resolve"
PACKAGECONFIG:append = "coredump"
PACKAGECONFIG:append = "coredump elfutils firstboot"

View file

@ -1,2 +1,6 @@
#disable opengl
PACKAGECONFIG_GL=""
DEPENDS += " \
virtual/egl \
"

View file

@ -1,11 +0,0 @@
do_install:append:class-target() {
if [ "0" -ne $(find . -name \*.cmake | grep '_usr\|Export' | grep 'noconfig' | wc -l) ]; then
echo sed -i 's#'\$\{_IMPORT_PREFIX\}'#\$\{OE_KF5_PATH_HOST_ROOT\}/usr/#g' $(find . -name "*.cmake" | grep '_usr\|Export' | grep 'noconfig' )
sed -i 's#'\$\{_IMPORT_PREFIX\}'#\$\{OE_KF5_PATH_HOST_ROOT\}/usr/#g' $(find . -name "*.cmake" | grep '_usr\|Export' | grep 'noconfig' )
fi
}
RDEPENDS:${PN}:class-native += " \
kconfig \
kcoreaddons \
"

View file

@ -1,7 +0,0 @@
#we need to ensure its always in the work directory as when other packages verify their
#docbook files, it has hard coded paths to the kdoctools build directory. This needs fixing.
#do_compile[nostamp] = "1"
DEPENDS += " \
docbook-xsl-stylesheets-native \
"

View file

@ -1,12 +0,0 @@
inherit kconfig
DEPENDS += " \
libkexiv2 \
ffmpeg \
poppler \
taglib \
"
FILES:${PN} += " \
${libdir}/plugins/kf5/kfilemetadata/writers/ \
"

View file

@ -1,2 +0,0 @@
#The Cmake files include the sysroot directory to pipewire and spa, delete the actual sysroot from the path.
inherit cmake_sysroot

View file

@ -1,2 +0,0 @@
#The Cmake files include the sysroot directory to pipewire and spa, delete the actual sysroot from the path.
inherit cmake_sysroot

View file

@ -1,2 +0,0 @@
#The Cmake files include the sysroot directory to pipewire and spa, delete the actual sysroot from the path.
inherit cmake_sysroot

View file

@ -27,11 +27,11 @@ layers['poky']='git://git.yoctoproject.org/poky|kirkstone|fc697fe87412b9b179ae3a
layers['meta-openembedded']='https://github.com/openembedded/meta-openembedded|kirkstone|529620141e773080a6a7be4615fb7993204af883'
layers['meta-riscv']='https://github.com/Fishwaldo/meta-riscv.git|master|49e36737e2431006c217a845e41310816a378403'
layers['meta-qt5']='https://github.com/meta-qt5/meta-qt5.git|master|cf6ffcbad5275a3428f6046468a0c9d572e813d1'
layers['yocto-meta-kf5']='https://github.com/Fishwaldo/yocto-meta-kf5.git|master|daa1c79cbf12176e8c8397512f80c0eb4ef6db74'
layers['yocto-meta-kde']='https://github.com/Fishwaldo/yocto-meta-kde.git|master|1ba0b84e783b4a5ec83cf883181622538566eb9c'
layers['yocto-meta-kf5']='https://github.com/Fishwaldo/yocto-meta-kf5.git|master|e17d3eab6de7289987216d2c5126e67798a6e7fa'
layers['yocto-meta-kde']='https://github.com/Fishwaldo/yocto-meta-kde.git|master|dd5bc4fbe6835a3b6ba84a70cf8ed2d566c04872'
layers['meta-python2']='https://git.openembedded.org/meta-python2|kirkstone|f02882e2aa9279ca7becca8d0cedbffe88b5a253'
layers['meta-java']='https://github.com/meta-java/meta-java.git|kirkstone|8bf79fc2002bb83c6439d25bb63e4206894c2d10'
layers['meta-kde-gear']='https://github.com/Fishwaldo/meta-kde-gear.git|master|7d1b94ae504e69b9e80f0eb3283293b95a131f0e'
layers['meta-kde-gear']='https://github.com/Fishwaldo/meta-kde-gear.git|master|81458800c7dfc0ef1d6e70b35d7a8504a3b263b4'
layers['meta-clang']='https://github.com/kraj/meta-clang.git|kirkstone|71321ddf78ea522b87a6b4bffefb14c988a6d921'
layers['meta-lts-rust']='https://git.yoctoproject.org/git/meta-lts-mixins|kirkstone/rust-1.68|feed1bb0eb4aefb701d582156d7defb0c1fc0473'