From 32133d63b71999f231abc699ee534ff39db3e5d5 Mon Sep 17 00:00:00 2001 From: Calvin Owens Date: Tue, 23 Sep 2025 01:27:55 -0700 Subject: [PATCH 1/3] chromium: Apply fixes required by oe-core changes This is the result of the two `find` commands described here: https://git.openembedded.org/openembedded-core/commit/?id=46480a5e66 Signed-off-by: Calvin Owens --- meta-chromium/recipes-browser/chromium/chromium.inc | 2 +- .../recipes-browser/chromium/gn-native_136.0.7103.113.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-chromium/recipes-browser/chromium/chromium.inc b/meta-chromium/recipes-browser/chromium/chromium.inc index e2a4f585f..004bff367 100644 --- a/meta-chromium/recipes-browser/chromium/chromium.inc +++ b/meta-chromium/recipes-browser/chromium/chromium.inc @@ -6,7 +6,7 @@ CVE_PRODUCT = "chromium:chromium google:chrome" SRC_URI = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${PV}.tar.xz" SRC_URI[sha256sum] = "7c765bd13df842a28bb52279b8d711411ac6082151473e07bd70b9a482c0a0ac" -S = "${WORKDIR}/chromium-${PV}" +S = "${UNPACKDIR}/chromium-${PV}" # GCC is not tested or officially supported upstream, and supporting it here # requires an ever-growing amount of backports and custom patches, without any diff --git a/meta-chromium/recipes-browser/chromium/gn-native_136.0.7103.113.bb b/meta-chromium/recipes-browser/chromium/gn-native_136.0.7103.113.bb index 5a3225be9..674283371 100644 --- a/meta-chromium/recipes-browser/chromium/gn-native_136.0.7103.113.bb +++ b/meta-chromium/recipes-browser/chromium/gn-native_136.0.7103.113.bb @@ -6,7 +6,7 @@ require chromium.inc inherit native -S = "${WORKDIR}/chromium-${PV}" +S = "${UNPACKDIR}/chromium-${PV}" # bootstrap.py --no_clean hardcodes the build location to out_bootstrap. # Omitting --no_clean causes the script to create a temporary directory with a From 1f60fdbbc2aa806cc2e1eca8639395032824ccc3 Mon Sep 17 00:00:00 2001 From: Calvin Owens Date: Wed, 25 Jun 2025 20:22:19 -0700 Subject: [PATCH 2/3] chromium: Remove gitfiles present in chromium tarball These serve no purpose in a tarball and confuse devtool, removing them allows `devtool modify` to work. Signed-off-by: Calvin Owens --- meta-chromium/recipes-browser/chromium/chromium.inc | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/meta-chromium/recipes-browser/chromium/chromium.inc b/meta-chromium/recipes-browser/chromium/chromium.inc index 004bff367..d87519f25 100644 --- a/meta-chromium/recipes-browser/chromium/chromium.inc +++ b/meta-chromium/recipes-browser/chromium/chromium.inc @@ -604,3 +604,15 @@ LIC_FILES_CHKSUM = "\ file://${S}/url/third_party/mozilla/LICENSE.txt;md5=437ced1e9b232651b0912a9594da43b2 \ file://${S}/v8/LICENSE;md5=3f722db07a0a940a6c859c5c9c2c78fd \ " + +unlink_gitfiles() { + rm -f ${S}/.git-blame-ignore-revs + rm -f ${S}/.gitallowed + rm -f ${S}/.gitattributes + rm -f ${S}/.gitignore + rm -f ${S}/.gitmodules +} + +do_unpack:append() { + bb.build.exec_func('unlink_gitfiles', d) +} From 750da002be5b3e2908e76dfea16162004ee355e4 Mon Sep 17 00:00:00 2001 From: Calvin Owens Date: Wed, 25 Jun 2025 20:22:22 -0700 Subject: [PATCH 3/3] layer.conf: Update chromium to whinlatter (5.3) layer/release series Signed-off-by: Calvin Owens --- meta-chromium/conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-chromium/conf/layer.conf b/meta-chromium/conf/layer.conf index d2de2af72..1ddabff3b 100644 --- a/meta-chromium/conf/layer.conf +++ b/meta-chromium/conf/layer.conf @@ -9,6 +9,6 @@ BBFILE_PATTERN_chromium-browser-layer := "^${LAYERDIR}/" BBFILE_PRIORITY_chromium-browser-layer = "7" LAYERVERSION_chromium-browser-layer = "1" -LAYERSERIES_COMPAT_chromium-browser-layer = "scarthgap styhead walnascar" +LAYERSERIES_COMPAT_chromium-browser-layer = "scarthgap styhead walnascar whinlatter" LAYERDEPENDS_chromium-browser-layer = "clang-layer core openembedded-layer"