| Message ID | 20231117163349.1605366-1-adam.duskett@amarulasolutions.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/flutter-engine: set HOME_DIR variable when configuring and building | expand |
Adam, All, On 2023-11-17 09:33 -0700, Adam Duskett spake thusly: > If the HOME_DIR variable is not set, flutter-engine creates a .dart directory You reference HOME_DIR in the commit title and log, but the patch is about HOME... > in ~/. I've rewritten the commit title, and drastically rewriten the commit log to properly explain what is going on and why we decided to do that. Applied to master, thanks. Regards, Yann E. MORIN. > Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com> > --- > package/flutter-engine/flutter-engine.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/flutter-engine/flutter-engine.mk b/package/flutter-engine/flutter-engine.mk > index 32aaa1cccf..d31d435d79 100644 > --- a/package/flutter-engine/flutter-engine.mk > +++ b/package/flutter-engine/flutter-engine.mk > @@ -185,11 +185,14 @@ define FLUTTER_ENGINE_EXTRACT_CMDS > | $(TAR) --strip-components=1 -C $(@D) $(TAR_OPTIONS) - > 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) && \ > rm -rf $(FLUTTER_ENGINE_BUILD_DIR) && \ > PATH=$(HOST_DIR)/share/depot_tools:$(BR_PATH) \ > PUB_CACHE=$(FLUTTER_SDK_BIN_PUB_CACHE) \ > + HOME=$(HOST_FLUTTER_SDK_BIN_SDK) \ > ./flutter/tools/gn \ > $(FLUTTER_ENGINE_CONF_OPTS) > endef > @@ -198,6 +201,7 @@ define FLUTTER_ENGINE_BUILD_CMDS > cd $(@D) && \ > PATH=$(HOST_DIR)/share/depot_tools:$(BR_PATH) \ > PUB_CACHE=$(FLUTTER_SDK_BIN_PUB_CACHE) \ > + HOME=$(HOST_FLUTTER_SDK_BIN_SDK) \ > $(HOST_DIR)/bin/ninja \ > -j $(PARALLEL_JOBS) \ > -C $(FLUTTER_ENGINE_BUILD_DIR) > -- > 2.42.0 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
diff --git a/package/flutter-engine/flutter-engine.mk b/package/flutter-engine/flutter-engine.mk index 32aaa1cccf..d31d435d79 100644 --- a/package/flutter-engine/flutter-engine.mk +++ b/package/flutter-engine/flutter-engine.mk @@ -185,11 +185,14 @@ define FLUTTER_ENGINE_EXTRACT_CMDS | $(TAR) --strip-components=1 -C $(@D) $(TAR_OPTIONS) - 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) && \ rm -rf $(FLUTTER_ENGINE_BUILD_DIR) && \ PATH=$(HOST_DIR)/share/depot_tools:$(BR_PATH) \ PUB_CACHE=$(FLUTTER_SDK_BIN_PUB_CACHE) \ + HOME=$(HOST_FLUTTER_SDK_BIN_SDK) \ ./flutter/tools/gn \ $(FLUTTER_ENGINE_CONF_OPTS) endef @@ -198,6 +201,7 @@ define FLUTTER_ENGINE_BUILD_CMDS cd $(@D) && \ PATH=$(HOST_DIR)/share/depot_tools:$(BR_PATH) \ PUB_CACHE=$(FLUTTER_SDK_BIN_PUB_CACHE) \ + HOME=$(HOST_FLUTTER_SDK_BIN_SDK) \ $(HOST_DIR)/bin/ninja \ -j $(PARALLEL_JOBS) \ -C $(FLUTTER_ENGINE_BUILD_DIR)
If the HOME_DIR variable is not set, flutter-engine creates a .dart directory in ~/. Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com> --- package/flutter-engine/flutter-engine.mk | 4 ++++ 1 file changed, 4 insertions(+)