* [Buildroot] [PATCH 1/5] package/ivi-homescreen: bump to version a038ce00031ed5a9a89b4d8dd7dbde5e3d7ade6e
@ 2025-03-24 9:44 Adam Duskett
2025-03-24 9:44 ` [Buildroot] [PATCH 2/5] package/depot-tools: bump to version 097e20723774957f21ac6d1808fcd0a91e8c7630 Adam Duskett
` (4 more replies)
0 siblings, 5 replies; 7+ messages in thread
From: Adam Duskett @ 2025-03-24 9:44 UTC (permalink / raw)
To: buildroot; +Cc: Adam Duskett
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
package/ivi-homescreen/ivi-homescreen.hash | 2 +-
package/ivi-homescreen/ivi-homescreen.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/ivi-homescreen/ivi-homescreen.hash b/package/ivi-homescreen/ivi-homescreen.hash
index 60b9281abc..484ecfb128 100644
--- a/package/ivi-homescreen/ivi-homescreen.hash
+++ b/package/ivi-homescreen/ivi-homescreen.hash
@@ -1,5 +1,5 @@
# Locally calculated
-sha256 733a95a9b50875e8b45b0b69118656edba3ba88ecc65e3c0d76ea5df9761c433 ivi-homescreen-5ab78a19e95c88cc5d6b173ab1260a211e78cf0a-git4.tar.gz
+sha256 aba31437dd90eca1fc5723619c269394e475b3000309eda86efcfd252452a85e ivi-homescreen-a038ce00031ed5a9a89b4d8dd7dbde5e3d7ade6e-git4.tar.gz
# Apache-2.0
sha256 6b96fa0a3def85caaf466caa2bd82d4ca4f22d106ff88f97a00c537c00cc714b LICENSE
diff --git a/package/ivi-homescreen/ivi-homescreen.mk b/package/ivi-homescreen/ivi-homescreen.mk
index 4293b2bc35..525fb4e11b 100644
--- a/package/ivi-homescreen/ivi-homescreen.mk
+++ b/package/ivi-homescreen/ivi-homescreen.mk
@@ -4,7 +4,7 @@
#
################################################################################
-IVI_HOMESCREEN_VERSION = 5ab78a19e95c88cc5d6b173ab1260a211e78cf0a
+IVI_HOMESCREEN_VERSION = a038ce00031ed5a9a89b4d8dd7dbde5e3d7ade6e
IVI_HOMESCREEN_SITE = https://github.com/toyota-connected/ivi-homescreen.git
IVI_HOMESCREEN_SITE_METHOD = git
IVI_HOMESCREEN_LICENSE = Apache-2.0, BSD-3-Clause, BSD-Style, BSL-1.0, MIT
--
2.49.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 2/5] package/depot-tools: bump to version 097e20723774957f21ac6d1808fcd0a91e8c7630
2025-03-24 9:44 [Buildroot] [PATCH 1/5] package/ivi-homescreen: bump to version a038ce00031ed5a9a89b4d8dd7dbde5e3d7ade6e Adam Duskett
@ 2025-03-24 9:44 ` Adam Duskett
2025-03-24 9:44 ` [Buildroot] [PATCH 3/5] package/flutter-packages: bump to version 2df1c3a524131e35d6e385eb9465c47d530e341b Adam Duskett
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Adam Duskett @ 2025-03-24 9:44 UTC (permalink / raw)
To: buildroot; +Cc: Adam Duskett
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
package/depot-tools/depot-tools.hash | 2 +-
package/depot-tools/depot-tools.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/depot-tools/depot-tools.hash b/package/depot-tools/depot-tools.hash
index 9395b254cf..cd5e34d26e 100644
--- a/package/depot-tools/depot-tools.hash
+++ b/package/depot-tools/depot-tools.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 b4dfe43021f40b360e33a252fdb21b0bb31c9a25629b6000bff987e0e178dbc0 depot-tools-58625e82c685426d441be5b422c9ad88e4867d20-git4.tar.gz
+sha256 d281138bad9dab92f3f67f5d62f8d7fe02bccd9bef1ab2dae4acf93c712967bb depot-tools-097e20723774957f21ac6d1808fcd0a91e8c7630-git4.tar.gz
sha256 984523ee987f4e8b72d61df37d8f1189a7077cd4b77e41a397e35593b297a29d LICENSE
diff --git a/package/depot-tools/depot-tools.mk b/package/depot-tools/depot-tools.mk
index 3ae0055fd6..b62f844b90 100644
--- a/package/depot-tools/depot-tools.mk
+++ b/package/depot-tools/depot-tools.mk
@@ -4,7 +4,7 @@
#
################################################################################
-DEPOT_TOOLS_VERSION = 58625e82c685426d441be5b422c9ad88e4867d20
+DEPOT_TOOLS_VERSION = 097e20723774957f21ac6d1808fcd0a91e8c7630
DEPOT_TOOLS_SITE = https://chromium.googlesource.com/chromium/tools/depot_tools
DEPOT_TOOLS_SITE_METHOD = git
DEPOT_TOOLS_LICENSE = BSD-3-Clause
--
2.49.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 3/5] package/flutter-packages: bump to version 2df1c3a524131e35d6e385eb9465c47d530e341b
2025-03-24 9:44 [Buildroot] [PATCH 1/5] package/ivi-homescreen: bump to version a038ce00031ed5a9a89b4d8dd7dbde5e3d7ade6e Adam Duskett
2025-03-24 9:44 ` [Buildroot] [PATCH 2/5] package/depot-tools: bump to version 097e20723774957f21ac6d1808fcd0a91e8c7630 Adam Duskett
@ 2025-03-24 9:44 ` Adam Duskett
2025-03-24 9:44 ` [Buildroot] [PATCH 4/5] package/flutter-sdk-bin: bump to version 3.29.2 Adam Duskett
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Adam Duskett @ 2025-03-24 9:44 UTC (permalink / raw)
To: buildroot; +Cc: Adam Duskett
native_assets.yaml are now native_assets.json
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
.../flutter-adaptive-scaffold-example.mk | 2 +-
.../flutter-animations-example/flutter-animations-example.mk | 2 +-
.../flutter-go-router-example/flutter-go-router-example.mk | 2 +-
.../flutter-image-example/flutter-image-example.mk | 2 +-
.../flutter-markdown-example/flutter-markdown-example.mk | 2 +-
package/flutter-packages/flutter-packages.hash | 2 +-
package/flutter-packages/flutter-packages.mk | 2 +-
.../flutter-rfw-local-example/flutter-rfw-local-example.mk | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/package/flutter-packages/flutter-adaptive-scaffold-example/flutter-adaptive-scaffold-example.mk b/package/flutter-packages/flutter-adaptive-scaffold-example/flutter-adaptive-scaffold-example.mk
index f6ac086115..e8e27d4383 100644
--- a/package/flutter-packages/flutter-adaptive-scaffold-example/flutter-adaptive-scaffold-example.mk
+++ b/package/flutter-packages/flutter-adaptive-scaffold-example/flutter-adaptive-scaffold-example.mk
@@ -26,7 +26,7 @@ endef
define FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_BUILD_CMDS
cd $(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_BUILDDIR) && \
$(HOST_FLUTTER_SDK_BIN_DART_BIN) \
- --native-assets $(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.yaml \
+ --native-assets $(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.json \
package:$(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_PKG_NAME)/main.dart && \
$(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \
--deterministic \
diff --git a/package/flutter-packages/flutter-animations-example/flutter-animations-example.mk b/package/flutter-packages/flutter-animations-example/flutter-animations-example.mk
index 2b5c896736..440aec4964 100644
--- a/package/flutter-packages/flutter-animations-example/flutter-animations-example.mk
+++ b/package/flutter-packages/flutter-animations-example/flutter-animations-example.mk
@@ -26,7 +26,7 @@ endef
define FLUTTER_ANIMATIONS_EXAMPLE_BUILD_CMDS
cd $(FLUTTER_ANIMATIONS_EXAMPLE_BUILDDIR) && \
$(HOST_FLUTTER_SDK_BIN_DART_BIN) \
- --native-assets $(FLUTTER_ANIMATIONS_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.yaml \
+ --native-assets $(FLUTTER_ANIMATIONS_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.json \
package:$(FLUTTER_ANIMATIONS_EXAMPLE_PKG_NAME)/main.dart && \
$(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \
--deterministic \
diff --git a/package/flutter-packages/flutter-go-router-example/flutter-go-router-example.mk b/package/flutter-packages/flutter-go-router-example/flutter-go-router-example.mk
index a7fa36ca9e..9279a4503f 100644
--- a/package/flutter-packages/flutter-go-router-example/flutter-go-router-example.mk
+++ b/package/flutter-packages/flutter-go-router-example/flutter-go-router-example.mk
@@ -29,7 +29,7 @@ define FLUTTER_GO_ROUTER_EXAMPLE_BUILD_CMDS
-Dflutter.dart_plugin_registrant=file://$(FLUTTER_GO_ROUTER_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/dart_plugin_registrant.dart \
--source file://$(FLUTTER_GO_ROUTER_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/dart_plugin_registrant.dart \
--source package:flutter/src/dart_plugin_registrant.dart \
- --native-assets $(FLUTTER_GO_ROUTER_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.yaml \
+ --native-assets $(FLUTTER_GO_ROUTER_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.json \
package:$(FLUTTER_GO_ROUTER_EXAMPLE_PKG_NAME)/main.dart && \
$(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \
--deterministic \
diff --git a/package/flutter-packages/flutter-image-example/flutter-image-example.mk b/package/flutter-packages/flutter-image-example/flutter-image-example.mk
index 20f185896d..5d754c0ff6 100644
--- a/package/flutter-packages/flutter-image-example/flutter-image-example.mk
+++ b/package/flutter-packages/flutter-image-example/flutter-image-example.mk
@@ -26,7 +26,7 @@ endef
define FLUTTER_IMAGE_EXAMPLE_BUILD_CMDS
cd $(FLUTTER_IMAGE_EXAMPLE_BUILDDIR) && \
$(HOST_FLUTTER_SDK_BIN_DART_BIN) \
- --native-assets $(FLUTTER_IMAGE_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.yaml \
+ --native-assets $(FLUTTER_IMAGE_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.json \
package:$(FLUTTER_IMAGE_EXAMPLE_PKG_NAME)/main.dart && \
$(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \
--deterministic \
diff --git a/package/flutter-packages/flutter-markdown-example/flutter-markdown-example.mk b/package/flutter-packages/flutter-markdown-example/flutter-markdown-example.mk
index eb6792fb02..0859b947eb 100644
--- a/package/flutter-packages/flutter-markdown-example/flutter-markdown-example.mk
+++ b/package/flutter-packages/flutter-markdown-example/flutter-markdown-example.mk
@@ -26,7 +26,7 @@ endef
define FLUTTER_MARKDOWN_EXAMPLE_BUILD_CMDS
cd $(FLUTTER_MARKDOWN_EXAMPLE_BUILDDIR) && \
$(HOST_FLUTTER_SDK_BIN_DART_BIN) \
- --native-assets $(FLUTTER_MARKDOWN_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.yaml \
+ --native-assets $(FLUTTER_MARKDOWN_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.json \
package:$(FLUTTER_MARKDOWN_EXAMPLE_PKG_NAME)/main.dart && \
$(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \
--deterministic \
diff --git a/package/flutter-packages/flutter-packages.hash b/package/flutter-packages/flutter-packages.hash
index 615c1142b8..00346a8a6a 100644
--- a/package/flutter-packages/flutter-packages.hash
+++ b/package/flutter-packages/flutter-packages.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 769de0bbccc6c5b04ccc0be72652c1a9b22d6b4e03b0477a3c7fccacfdb04177 flutter-packages-3976c1bbd8ffba10007e5beeaddff37bfbaa2ae1.tar.gz
+sha256 9b6fdc8660ac3c601887c3c7e8859662e7fca19584af56dfac9c8acb86298a01 flutter-packages-2df1c3a524131e35d6e385eb9465c47d530e341b.tar.gz
sha256 89519eca6f7b9529b35bdddd623a58c3af06a88c458dbd6531ddb4675acf75a9 LICENSE
diff --git a/package/flutter-packages/flutter-packages.mk b/package/flutter-packages/flutter-packages.mk
index 3dbbebb067..40a586f7e0 100644
--- a/package/flutter-packages/flutter-packages.mk
+++ b/package/flutter-packages/flutter-packages.mk
@@ -4,7 +4,7 @@
#
################################################################################
-FLUTTER_PACKAGES_VERSION = 3976c1bbd8ffba10007e5beeaddff37bfbaa2ae1
+FLUTTER_PACKAGES_VERSION = 2df1c3a524131e35d6e385eb9465c47d530e341b
FLUTTER_PACKAGES_SITE = $(call github,flutter,packages,$(FLUTTER_PACKAGES_VERSION))
FLUTTER_PACKAGES_LICENSE = BSD-3-Clause
FLUTTER_PACKAGES_LICENSE_FILES = LICENSE
diff --git a/package/flutter-packages/flutter-rfw-local-example/flutter-rfw-local-example.mk b/package/flutter-packages/flutter-rfw-local-example/flutter-rfw-local-example.mk
index b57c021f8b..49f1dc4dda 100644
--- a/package/flutter-packages/flutter-rfw-local-example/flutter-rfw-local-example.mk
+++ b/package/flutter-packages/flutter-rfw-local-example/flutter-rfw-local-example.mk
@@ -26,7 +26,7 @@ endef
define FLUTTER_RFW_LOCAL_EXAMPLE_BUILD_CMDS
cd $(FLUTTER_RFW_LOCAL_EXAMPLE_BUILDDIR) && \
$(HOST_FLUTTER_SDK_BIN_DART_BIN) \
- --native-assets $(FLUTTER_RFW_LOCAL_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.yaml \
+ --native-assets $(FLUTTER_RFW_LOCAL_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.json \
package:$(FLUTTER_RFW_LOCAL_EXAMPLE_PKG_NAME)/main.dart && \
$(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \
--deterministic \
--
2.49.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 4/5] package/flutter-sdk-bin: bump to version 3.29.2
2025-03-24 9:44 [Buildroot] [PATCH 1/5] package/ivi-homescreen: bump to version a038ce00031ed5a9a89b4d8dd7dbde5e3d7ade6e Adam Duskett
2025-03-24 9:44 ` [Buildroot] [PATCH 2/5] package/depot-tools: bump to version 097e20723774957f21ac6d1808fcd0a91e8c7630 Adam Duskett
2025-03-24 9:44 ` [Buildroot] [PATCH 3/5] package/flutter-packages: bump to version 2df1c3a524131e35d6e385eb9465c47d530e341b Adam Duskett
@ 2025-03-24 9:44 ` Adam Duskett
2025-03-24 9:44 ` [Buildroot] [PATCH 5/5] package/flutter-engine: " Adam Duskett
2025-04-21 21:22 ` [Buildroot] [PATCH 1/5] package/ivi-homescreen: bump to version a038ce00031ed5a9a89b4d8dd7dbde5e3d7ade6e Thomas Petazzoni via buildroot
4 siblings, 0 replies; 7+ messages in thread
From: Adam Duskett @ 2025-03-24 9:44 UTC (permalink / raw)
To: buildroot; +Cc: Adam Duskett
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
package/flutter-sdk-bin/flutter-sdk-bin.hash | 2 +-
package/flutter-sdk-bin/flutter-sdk-bin.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.hash b/package/flutter-sdk-bin/flutter-sdk-bin.hash
index 02fee767a3..3c4cdb69dc 100644
--- a/package/flutter-sdk-bin/flutter-sdk-bin.hash
+++ b/package/flutter-sdk-bin/flutter-sdk-bin.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 61497eb64cd7b3aa99ca9911ccd921c8dab79afd909ca1c9ff9546067ebcf6ca flutter_linux_3.27.1-stable.tar.xz
+sha256 6096f21370773093ec19240e133664c1c12eb8b5a85605a92d16ce462a18eac4 flutter_linux_3.29.2-stable.tar.xz
sha256 a598db94b6290ffbe10b5ecf911057b6a943351c727fdda9e5f2891d68700a20 LICENSE
diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.mk b/package/flutter-sdk-bin/flutter-sdk-bin.mk
index 68cce21eac..e1d6a9fdaa 100644
--- a/package/flutter-sdk-bin/flutter-sdk-bin.mk
+++ b/package/flutter-sdk-bin/flutter-sdk-bin.mk
@@ -4,7 +4,7 @@
#
################################################################################
-FLUTTER_SDK_BIN_VERSION = 3.27.1
+FLUTTER_SDK_BIN_VERSION = 3.29.2
FLUTTER_SDK_BIN_SITE = https://storage.googleapis.com/flutter_infra_release/releases/stable/linux
FLUTTER_SDK_BIN_SOURCE = flutter_linux_$(FLUTTER_SDK_BIN_VERSION)-stable.tar.xz
FLUTTER_SDK_BIN_LICENSE = BSD-3-Clause
--
2.49.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 5/5] package/flutter-engine: bump to version 3.29.2
2025-03-24 9:44 [Buildroot] [PATCH 1/5] package/ivi-homescreen: bump to version a038ce00031ed5a9a89b4d8dd7dbde5e3d7ade6e Adam Duskett
` (2 preceding siblings ...)
2025-03-24 9:44 ` [Buildroot] [PATCH 4/5] package/flutter-sdk-bin: bump to version 3.29.2 Adam Duskett
@ 2025-03-24 9:44 ` Adam Duskett
2025-04-21 21:24 ` Thomas Petazzoni via buildroot
2025-04-21 21:22 ` [Buildroot] [PATCH 1/5] package/ivi-homescreen: bump to version a038ce00031ed5a9a89b4d8dd7dbde5e3d7ade6e Thomas Petazzoni via buildroot
4 siblings, 1 reply; 7+ messages in thread
From: Adam Duskett @ 2025-03-24 9:44 UTC (permalink / raw)
To: buildroot; +Cc: Adam Duskett
As of Flutter 3.27.4, the flutter-engine github repository is archived, and the
flutter-engine source code now resides at https://github.com/flutter/flutter/.
Because of the above, the following changes must occure:
- Paths are now prefixed with engine/src.
- The "name" field in the dot-gclient file is now "./", and the gen-tarball
script:
- Makes the dl-tmp/src dir
- Copies the dot-gclient file to the dl-tmp/src dir
- Runs gclient.py inside of the dl-tmp/src dir
Without these changes, gclient creates two directores:
dl-tmp/src/flutter and dl-tmp/src/engine, and cloning fails with the following
error:
```
python3: can't open file 'dl-tmp/src/engine/src/flutter/tools/pub_get_offline.py':
[Errno 2] No such file or directory
```
because the file resides at src/flutter/engine/src/flutter/tools.
Changing the name from src/flutter to ./ and running gclient.py directly in
the src directory creates a proper directory structure suitable for compiling.
Of course, this also means there is a new pushd in the gen_tarball method to
move to ${SCRATCH_DIR} to ensure the tarball is generated outside of the
source directory.
Tested with run-tests tests.package.test_flutter.TestFlutter.test_run.
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
.../0001-disable-pre-canned-sysroot.patch | 8 +++----
.../0002-remove-explicit-x11-dependency.patch | 8 +++----
.../0003-fix-toolchain-paths.patch | 10 ++++----
...onfig.py-do-not-prepend-sysroot-path.patch | 8 +++----
package/flutter-engine/dot-gclient | 4 ++--
package/flutter-engine/flutter-engine.hash | 2 +-
package/flutter-engine/flutter-engine.mk | 24 +++++++++----------
package/flutter-engine/gen-tarball | 6 +++--
8 files changed, 36 insertions(+), 34 deletions(-)
diff --git a/package/flutter-engine/0001-disable-pre-canned-sysroot.patch b/package/flutter-engine/0001-disable-pre-canned-sysroot.patch
index a9776d7388..2c02fc4948 100644
--- a/package/flutter-engine/0001-disable-pre-canned-sysroot.patch
+++ b/package/flutter-engine/0001-disable-pre-canned-sysroot.patch
@@ -11,13 +11,13 @@ Upstream: https://github.com/flutter/flutter/issues/123073
Signed-off-by: Joel Winarske <joel.winarsk@gmail.com>
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
- build/config/sysroot.gni | 2 +-
+ engine/src/build/config/sysroot.gni | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/build/config/sysroot.gni b/build/config/sysroot.gni
+diff --git a/engine/src/build/config/sysroot.gni b/engine/src/build/config/sysroot.gni
index 7987e519d..1de694263 100644
---- a/build/config/sysroot.gni
-+++ b/build/config/sysroot.gni
+--- a/engine/src/build/config/sysroot.gni
++++ b/engine/src/build/config/sysroot.gni
@@ -12,7 +12,7 @@ declare_args() {
# Whether to use the default sysroot when building for Linux, if an explicit
diff --git a/package/flutter-engine/0002-remove-explicit-x11-dependency.patch b/package/flutter-engine/0002-remove-explicit-x11-dependency.patch
index 23d7ec9b06..85f6db1c38 100644
--- a/package/flutter-engine/0002-remove-explicit-x11-dependency.patch
+++ b/package/flutter-engine/0002-remove-explicit-x11-dependency.patch
@@ -10,13 +10,13 @@ Upstream: https://github.com/flutter/flutter/issues/123073
Signed-off-by: Joel Winarske <joel.winarske@gmail.com>
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
- flutter/shell/platform/linux/config/BUILD.gn | 4 ----
+ engine/src/flutter/shell/platform/linux/config/BUILD.gn | 4 ----
1 file changed, 4 deletions(-)
-diff --git a/flutter/shell/platform/linux/config/BUILD.gn b/flutter/shell/platform/linux/config/BUILD.gn
+diff --git a/engine/src/flutter/shell/platform/linux/config/BUILD.gn b/engine/src/flutter/shell/platform/linux/config/BUILD.gn
index da0ac056b..70c7a0ea1 100644
---- a/flutter/shell/platform/linux/config/BUILD.gn
-+++ b/flutter/shell/platform/linux/config/BUILD.gn
+--- a/engine/src/flutter/shell/platform/linux/config/BUILD.gn
++++ b/engine/src/flutter/shell/platform/linux/config/BUILD.gn
@@ -5,10 +5,6 @@
import("//build/config/linux/pkg_config.gni")
import("//flutter/shell/platform/glfw/config.gni")
diff --git a/package/flutter-engine/0003-fix-toolchain-paths.patch b/package/flutter-engine/0003-fix-toolchain-paths.patch
index ba5d5f8023..93239c039f 100644
--- a/package/flutter-engine/0003-fix-toolchain-paths.patch
+++ b/package/flutter-engine/0003-fix-toolchain-paths.patch
@@ -4,7 +4,7 @@ Date: Sun, 5 Mar 2023 10:43:02 -0800
Subject: [PATCH] fix toolchain paths
Flutter includes a copy of clang which is required to build. However, by
-default, build/toolchain/custom/BUILD.gn attempts to use several gcc utilities
+default, engine/src/build/toolchain/custom/BUILD.gn attempts to use several gcc utilities
such as ar, readelf, nm, and strip. Change these to the proper llvm provided
utility.
@@ -13,13 +13,13 @@ Upstream: https://github.com/flutter/flutter/issues/123073
Signed-off-by: Joel Winarske <joel.winarsk@gmail.com>
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
- build/toolchain/custom/BUILD.gn | 4 +++++------
+ engine/src/build/toolchain/custom/BUILD.gn | 4 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
-diff --git a/build/toolchain/custom/BUILD.gn b/build/toolchain/custom/BUILD.gn
+diff --git a/engine/src/build/toolchain/custom/BUILD.gn b/engine/src/build/toolchain/custom/BUILD.gn
index 65b1623..8b3f6f8 100644
---- a/build/toolchain/custom/BUILD.gn
-+++ b/build/toolchain/custom/BUILD.gn
+--- a/engine/src/build/toolchain/custom/BUILD.gn
++++ b/engine/src/build/toolchain/custom/BUILD.gn
@@ -12,11 +12,11 @@ toolchain("custom") {
# these values in our scope.
cc = "${toolchain_bin}/clang"
diff --git a/package/flutter-engine/0004-pkg-config.py-do-not-prepend-sysroot-path.patch b/package/flutter-engine/0004-pkg-config.py-do-not-prepend-sysroot-path.patch
index a31be7d77f..43b4a3ce2e 100644
--- a/package/flutter-engine/0004-pkg-config.py-do-not-prepend-sysroot-path.patch
+++ b/package/flutter-engine/0004-pkg-config.py-do-not-prepend-sysroot-path.patch
@@ -14,13 +14,13 @@ IE: output/host/.../sysroot/output/host/.../sysroot
Upstream: https://github.com/flutter/flutter/issues/132152
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
- build/config/linux/pkg-config.py | 4 +---
+ engine/src/build/config/linux/pkg-config.py | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
-diff --git a/build/config/linux/pkg-config.py b/build/config/linux/pkg-config.py
+diff --git a/engine/src/build/config/linux/pkg-config.py b/engine/src/build/config/linux/pkg-config.py
index b4a6aff17..44ffdcaea 100644
---- a/build/config/linux/pkg-config.py
-+++ b/build/config/linux/pkg-config.py
+--- a/engine/src/build/config/linux/pkg-config.py
++++ b/engine/src/build/config/linux/pkg-config.py
@@ -207,9 +207,7 @@ def main():
all_flags = flag_string.strip().split(' ')
diff --git a/package/flutter-engine/dot-gclient b/package/flutter-engine/dot-gclient
index 6ead80c8c2..7dfebdde2c 100644
--- a/package/flutter-engine/dot-gclient
+++ b/package/flutter-engine/dot-gclient
@@ -3,8 +3,8 @@
solutions = [{
"managed": False,
- "name": "src/flutter",
- "url": "https://github.com/flutter/engine.git@!FLUTTER_VERSION!",
+ "name": "./",
+ "url": "https://github.com/flutter/flutter.git@!FLUTTER_VERSION!",
"custom_vars": {
"download_android_deps": False,
"download_windows_deps": False,
diff --git a/package/flutter-engine/flutter-engine.hash b/package/flutter-engine/flutter-engine.hash
index 3309082139..13f52ee6ea 100644
--- a/package/flutter-engine/flutter-engine.hash
+++ b/package/flutter-engine/flutter-engine.hash
@@ -1 +1 @@
-sha256 89519eca6f7b9529b35bdddd623a58c3af06a88c458dbd6531ddb4675acf75a9 LICENSE
+sha256 a598db94b6290ffbe10b5ecf911057b6a943351c727fdda9e5f2891d68700a20 flutter/LICENSE
diff --git a/package/flutter-engine/flutter-engine.mk b/package/flutter-engine/flutter-engine.mk
index a399296247..1fa59a3863 100644
--- a/package/flutter-engine/flutter-engine.mk
+++ b/package/flutter-engine/flutter-engine.mk
@@ -22,7 +22,7 @@
# There is no hash provided for the source tarball, as the gn binary
# (used for configuration) relies on the .git directories. As such, a
# reproducible tarball is not possible.
-FLUTTER_ENGINE_VERSION = 3.27.1
+FLUTTER_ENGINE_VERSION = 3.29.2
# There is nothing for Buildroot to download. This is handled by gclient.
FLUTTER_ENGINE_SITE =
@@ -41,7 +41,7 @@ FLUTTER_ENGINE_DEPENDENCIES = \
# Dispatch all architectures of flutter
# FLUTTER_ENGINE_TARGET_TRIPPLE must match the directory name found in
-# buildtools/linux-x64/clang/lib/clang/*/lib
+# engine/src/buildtools/linux-x64/clang/lib/clang/*/lib
ifeq ($(BR2_aarch64),y)
FLUTTER_ENGINE_TARGET_ARCH = arm64
FLUTTER_ENGINE_TARGET_TRIPPLE = aarch64-unknown-linux-gnu
@@ -62,13 +62,13 @@ FLUTTER_ENGINE_RUNTIME_MODE=release
endif
FLUTTER_ENGINE_BUILD_DIR = \
- $(@D)/out/linux_$(FLUTTER_ENGINE_RUNTIME_MODE)_$(FLUTTER_ENGINE_TARGET_ARCH)
+ $(@D)/engine/src/out/linux_$(FLUTTER_ENGINE_RUNTIME_MODE)_$(FLUTTER_ENGINE_TARGET_ARCH)
FLUTTER_ENGINE_INSTALL_FILES = libflutter_engine.so
# Flutter engine includes a bundled patched clang that must be used for
# compiling or else there are linking errors.
-FLUTTER_ENGINE_CLANG_PATH = $(@D)/flutter/buildtools/linux-x64/clang
+FLUTTER_ENGINE_CLANG_PATH = $(@D)/engine/src/flutter/buildtools/linux-x64/clang
FLUTTER_ENGINE_CONF_OPTS = \
--clang \
@@ -97,10 +97,10 @@ endif
ifeq ($(BR2_CCACHE),y)
define FLUTTER_ENGINE_COMPILER_PATH_FIXUP
$(SED) "s%cc =.*%cc = \"$(HOST_DIR)/bin/ccache $(FLUTTER_ENGINE_CLANG_PATH)/bin/clang\""%g \
- $(@D)/build/toolchain/custom/BUILD.gn
+ $(@D)/engine/src/build/toolchain/custom/BUILD.gn
$(SED) "s%cxx =.*%cxx = \"$(HOST_DIR)/bin/ccache $(FLUTTER_ENGINE_CLANG_PATH)/bin/clang++\""%g \
- $(@D)/build/toolchain/custom/BUILD.gn
+ $(@D)/engine/src/build/toolchain/custom/BUILD.gn
endef
FLUTTER_ENGINE_PRE_CONFIGURE_HOOKS += FLUTTER_ENGINE_COMPILER_PATH_FIXUP
endif
@@ -154,10 +154,10 @@ FLUTTER_ENGINE_DEPENDENCIES += libxcb
else
define FLUTTER_ENGINE_VULKAN_X11_SUPPORT_FIXUP
$(SED) "s%vulkan_use_x11.*%vulkan_use_x11 = false%g" -i \
- $(@D)/flutter/build_overrides/vulkan_headers.gni
+ $(@D)/engine/src/flutter/build_overrides/vulkan_headers.gni
$(SED) "s%ozone_platform_x11.*%ozone_platform_x11 = false%g" \
- $(@D)/build/config/BUILDCONFIG.gn
+ $(@D)/engine/src/build/config/BUILDCONFIG.gn
endef
FLUTTER_ENGINE_PRE_CONFIGURE_HOOKS += FLUTTER_ENGINE_VULKAN_X11_SUPPORT_FIXUP
endif
@@ -167,10 +167,10 @@ FLUTTER_ENGINE_DEPENDENCIES += wayland
else
define FLUTTER_ENGINE_VULKAN_WAYLAND_SUPPORT_FIXUP
$(SED) "s%vulkan_use_wayland.*%vulkan_use_wayland = false%g" \
- $(@D)/flutter/build_overrides/vulkan_headers.gni
+ $(@D)/engine/src/flutter/build_overrides/vulkan_headers.gni
$(SED) "s%ozone_platform_wayland.*%ozone_platform_wayland = false%g" \
- $(@D)/build/config/BUILDCONFIG.gn
+ $(@D)/engine/src/build/config/BUILDCONFIG.gn
endef
FLUTTER_ENGINE_PRE_CONFIGURE_HOOKS += FLUTTER_ENGINE_VULKAN_WAYLAND_SUPPORT_FIXUP
endif
@@ -198,7 +198,7 @@ endef
# We must set the home directory to the sdk directory or else flutter will
# place .dart, and .flutter in ~/.
define FLUTTER_ENGINE_CONFIGURE_CMDS
- cd $(@D) && \
+ cd $(@D)/engine/src && \
rm -rf $(FLUTTER_ENGINE_BUILD_DIR) && \
PATH=$(HOST_DIR)/share/depot_tools:$(BR_PATH) \
PUB_CACHE=$(FLUTTER_SDK_BIN_PUB_CACHE) \
@@ -208,7 +208,7 @@ define FLUTTER_ENGINE_CONFIGURE_CMDS
endef
define FLUTTER_ENGINE_BUILD_CMDS
- cd $(@D) && \
+ cd $(@D)/engine/src && \
PATH=$(HOST_DIR)/share/depot_tools:$(BR_PATH) \
PUB_CACHE=$(FLUTTER_SDK_BIN_PUB_CACHE) \
HOME=$(HOST_FLUTTER_SDK_BIN_SDK) \
diff --git a/package/flutter-engine/gen-tarball b/package/flutter-engine/gen-tarball
index 5bfb8f60e8..e5203b7bca 100755
--- a/package/flutter-engine/gen-tarball
+++ b/package/flutter-engine/gen-tarball
@@ -41,8 +41,8 @@ parse_opts() {
prepare() {
rm -rf "${SCRATCH_DIR}"
- mkdir -p "${SCRATCH_DIR}"
- pushd "${SCRATCH_DIR}" >/dev/null
+ mkdir -p "${SCRATCH_DIR}"/src
+ pushd "${SCRATCH_DIR}"/src >/dev/null
}
copy_dot_gclient() {
@@ -63,6 +63,7 @@ run_gclient() {
gen_tarball() {
message "Generating tarball"
mkdir -p "${DL_DIR}"
+ pushd "${SCRATCH_DIR}" >/dev/null
# There are two issues with the flutter-engine buildsystem:
# - it expects empty directories created by gclient.py to be present; that
# means we can't use the mk_tar_gz helper method from support/download/helpers,
@@ -72,6 +73,7 @@ gen_tarball() {
# So we just create a plain tarball.
${TAR} -C "${SCRATCH_DIR}"/src -czf "${TARBALL_NAME}" .
mv "${TARBALL_NAME}" "${TARBALL_DL_PATH}"
+ popd >/dev/null
}
cleanup() {
--
2.49.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [Buildroot] [PATCH 1/5] package/ivi-homescreen: bump to version a038ce00031ed5a9a89b4d8dd7dbde5e3d7ade6e
2025-03-24 9:44 [Buildroot] [PATCH 1/5] package/ivi-homescreen: bump to version a038ce00031ed5a9a89b4d8dd7dbde5e3d7ade6e Adam Duskett
` (3 preceding siblings ...)
2025-03-24 9:44 ` [Buildroot] [PATCH 5/5] package/flutter-engine: " Adam Duskett
@ 2025-04-21 21:22 ` Thomas Petazzoni via buildroot
4 siblings, 0 replies; 7+ messages in thread
From: Thomas Petazzoni via buildroot @ 2025-04-21 21:22 UTC (permalink / raw)
To: Adam Duskett; +Cc: buildroot
On Mon, 24 Mar 2025 10:44:20 +0100
Adam Duskett <adam.duskett@amarulasolutions.com> wrote:
> Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
> ---
> package/ivi-homescreen/ivi-homescreen.hash | 2 +-
> package/ivi-homescreen/ivi-homescreen.mk | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
Thanks, series applied! I'll reply to PATCH 5/5, on which I had an
issue and a question.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Buildroot] [PATCH 5/5] package/flutter-engine: bump to version 3.29.2
2025-03-24 9:44 ` [Buildroot] [PATCH 5/5] package/flutter-engine: " Adam Duskett
@ 2025-04-21 21:24 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 7+ messages in thread
From: Thomas Petazzoni via buildroot @ 2025-04-21 21:24 UTC (permalink / raw)
To: Adam Duskett; +Cc: buildroot
Hello Adam,
On Mon, 24 Mar 2025 10:44:24 +0100
Adam Duskett <adam.duskett@amarulasolutions.com> wrote:
> -sha256 89519eca6f7b9529b35bdddd623a58c3af06a88c458dbd6531ddb4675acf75a9 LICENSE
> +sha256 a598db94b6290ffbe10b5ecf911057b6a943351c727fdda9e5f2891d68700a20 flutter/LICENSE
This file does not exist, it's still in the root as LICENSE, not
flutter/LICENSE. Also, FLUTTER_ENGINE_LICENSE_FILES still contains
"LICENSE".
However, make legal-info does not collect this license file for
flutter-engine, and I'm not sure why. Is it because there's no
FLUTTER_ENGINE_SOURCE? In any case, we should figure this out and fix
it up, it's not normal that the license file for flutter-engine doesn't
get collected.
Thanks a lot!
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2025-04-21 21:24 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-24 9:44 [Buildroot] [PATCH 1/5] package/ivi-homescreen: bump to version a038ce00031ed5a9a89b4d8dd7dbde5e3d7ade6e Adam Duskett
2025-03-24 9:44 ` [Buildroot] [PATCH 2/5] package/depot-tools: bump to version 097e20723774957f21ac6d1808fcd0a91e8c7630 Adam Duskett
2025-03-24 9:44 ` [Buildroot] [PATCH 3/5] package/flutter-packages: bump to version 2df1c3a524131e35d6e385eb9465c47d530e341b Adam Duskett
2025-03-24 9:44 ` [Buildroot] [PATCH 4/5] package/flutter-sdk-bin: bump to version 3.29.2 Adam Duskett
2025-03-24 9:44 ` [Buildroot] [PATCH 5/5] package/flutter-engine: " Adam Duskett
2025-04-21 21:24 ` Thomas Petazzoni via buildroot
2025-04-21 21:22 ` [Buildroot] [PATCH 1/5] package/ivi-homescreen: bump to version a038ce00031ed5a9a89b4d8dd7dbde5e3d7ade6e Thomas Petazzoni via buildroot
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.