Merge remote-tracking branch 'upstream/master'

Author: Hancock33

Config.in

@@ -30,10 +30,12 @@ menu "System"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/rk3128-blobs/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/rocknix-abl/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/rockpro64-blobs/Config.in"
+    source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-anbernic-h700/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-bananapi-m7/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-evb-rk3399/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-firefly-station-m2/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-firefly-station-p2/Config.in"
+    source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-gameforce-ace/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-hugsun-x99/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-multiboard/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-nanopi-m6/Config.in"
@@ -357,7 +359,7 @@ menu "Emulators"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/hypseus-singe/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/lexaloffle-pico8/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/lexaloffle-voxatron/Config.in"
-    source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/lindbergh-loader/Config.in"
+    source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/linuxloader/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/mame/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/melonds/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/nanoboyadvance/Config.in"
@@ -466,6 +468,7 @@ endif
 
 menu "Libraries"
   source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/appstream/Config.in"
+  source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/asio/Config.in"
   source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/batocera-luajit/Config.in"
   source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/cpp-ipc/Config.in"
   source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/ecm/Config.in"
@@ -488,8 +491,6 @@ menu "Libraries"
   source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/nghttp3/Config.in"
   source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/ngtcp2/Config.in"
   source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/pipewire-ffmpeg-plugins/Config.in"
-  source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/plutosvg/Config.in"
-  source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/plutovg/Config.in"
   source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/pm_auto/Config.in"
   source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/pm_dashboard/Config.in"
   source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/pysdl2/Config.in"
@@ -504,7 +505,6 @@ menu "Libraries"
   source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/python-adafruit-circuitpython-ws2801/Config.in"
   source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/python-adafruit-platformdetect/Config.in"
   source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/python-adafruit-pureio/Config.in"
-  source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/python-batocera-common/Config.in"
   source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/python-binho-host-adapter/Config.in"
   source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/python-cog/Config.in"
   source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/python-hidapi/Config.in"
@@ -514,12 +514,12 @@ menu "Libraries"
   source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/python-smbus3/Config.in"
   source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/pywebview/Config.in"
   source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/rapidyaml/Config.in"
-  source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/sdl3_mixer/Config.in"
   source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/semver/Config.in"
   source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/sf_rpi_status/Config.in"
   source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/tomlplusplus/Config.in"
   source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/uthash/Config.in"
   source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/wxwidgets/Config.in"
+  source "$BR2_EXTERNAL_BATOCERA_PATH/python-src/python-batocera-common/Config.in"
 endmenu
 
 menu "Looks"
@@ -634,7 +634,6 @@ menu "Utils"
   source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/batocera-led-handheld/Config.in"
   source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/batocera-nfc/Config.in"
   source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/batocera-onscreen-keyboard/Config.in"
-  source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/batocera-bezel-overlay/Config.in"
   source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/batocera-pygame/Config.in"
   source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/batocera-steam/Config.in"
   source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/batocera-test/Config.in"
@@ -689,6 +688,7 @@ menu "Utils"
   source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/xwiimote/Config.in"
   source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/xxd/Config.in"
   source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/zramswap/Config.in"
+  source "$BR2_EXTERNAL_BATOCERA_PATH/python-src/batocera-bezel-overlay/Config.in"
 endmenu
 
 menu "Utils Host"

Makefile

@@ -106,19 +106,24 @@ SYSTEMS_REPORT_TARGETS := $(filter-out $(SYSTEMS_REPORT_EXCLUDE_TARGETS) x86_wow
 # All defconfig files for systems report targets, generated from the board files
 SYSTEMS_REPORT_DEFCONFIGS = $(foreach target,$(SYSTEMS_REPORT_TARGETS),$(call target-defconfig,$(target)))
 
+# Pass the git commit from the host so builds in git worktrees have the hash in the container
+GIT_COMMIT := $(shell git -C $(PROJECT_DIR) rev-parse --short HEAD 2>/dev/null || echo unknown)
+
 # define build command based on whether we are building direct or inside a docker build container
 ifdef DIRECT_BUILD
 define MAKE_BUILDROOT
 	make $(MAKE_OPTS) O=$(OUTPUT_DIR)/$(1) \
 		BR2_EXTERNAL=$(PROJECT_DIR) \
 		BR2_DL_DIR=$(DL_DIR) \
 		BR2_CCACHE_DIR=$(CCACHE_DIR) \
+		BATOCERA_GIT_COMMIT=$(GIT_COMMIT) \
 		-C $(PROJECT_DIR)/buildroot
 endef
 else # DIRECT_BUILD
 define MAKE_BUILDROOT
 	$(call RUN_DOCKER,$(1)) make $(MAKE_OPTS) O=/$(1) \
 					BR2_EXTERNAL=/build \
+					BATOCERA_GIT_COMMIT=$(GIT_COMMIT) \
 					-C /build/buildroot
 endef
 endif # DIRECT_BUILD
@@ -313,7 +318,7 @@ ifdef BATCH_MODE
 	$(if $(CMD),,$(error CMD is required to use $*-shell in BATCH_MODE))
 endif
 	@$(call MESSAGE,$(if $(CMD),Executing command,Starting interactive shell))
-	@$(RUN_DOCKER_TARGET) $(CMD)
+	@$(call RUN_DOCKER,$*,-e BATOCERA_GIT_COMMIT=$(GIT_COMMIT)) $(CMD)
 
 %-ccache-stats: %-config
 	@$(MAKE_BUILDROOT_TARGET) ccache-stats