refactor(boot): add boot-package macro and use INSTALL_IMAGES

Introduce `pkg-boot.mk` with a `boot-package` macro that eliminates
boilerplate in U-Boot and other boot packages that ship pre-built
binaries. Packages declare `_BOOT_SRC` (with optional src:dst rename
syntax) and `_BINARIES_SUBDIR`, and the macro handles the rest.

Migrate all boot packages from `INSTALL_TARGET_CMDS` to
`INSTALL_IMAGES_CMDS` since they install to `$(BINARIES_DIR)`, not
`$(TARGET_DIR)`. Convert simple copy-only packages to `boot-package`
and manually add `INSTALL_IMAGES = YES` to packages with custom
build/install logic.

Also refactor `batocera-system` to use `INSTALL_IMAGES_CMDS` for
`batocera-boot.conf` and replace hardcoded `BR2_EXTERNAL_BATOCERA_PATH`
package paths with `_PKGDIR` throughout.

Author: bryanforbes

external.mk

@@ -1,3 +1,4 @@
+include $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/pkg-boot.mk
 include $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/pkg-emulator-info.mk
 include $(sort $(wildcard $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/*/*.mk $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/*/*/*.mk $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/*/*/*/*.mk $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/*/*/*/*/*.mk))
 

package/batocera/boot/batocera-initramfs/batocera-initramfs.mk

@@ -9,13 +9,14 @@ BATOCERA_INITRAMFS_SITE = http://www.busybox.net/downloads
 BATOCERA_INITRAMFS_SOURCE = busybox-$(BATOCERA_INITRAMFS_VERSION).tar.bz2
 BATOCERA_INITRAMFS_LICENSE = GPLv2
 BATOCERA_INITRAMFS_LICENSE_FILES = LICENSE
+BATOCERA_INITRAMFS_INSTALL_IMAGES = YES
 
 BATOCERA_INITRAMFS_DEPENDENCIES += host-uboot-tools libxcrypt
 BATOCERA_INITRAMFS_CFLAGS = $(TARGET_CFLAGS)
 BATOCERA_INITRAMFS_LDFLAGS = $(TARGET_LDFLAGS)
 
 BATOCERA_INITRAMFS_KCONFIG_FILE = \
-    $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/batocera-initramfs/busybox.config
+    $(BATOCERA_INITRAMFS_PKGDIR)/busybox.config
 
 INITRAMFS_DIR=$(BINARIES_DIR)/initramfs
 
@@ -65,7 +66,7 @@ define BATOCERA_INITRAMFS_RISCV_EARLY_FIRMWARE
 	cp -R $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/starfive/jh7110/initrd/* \
 	    $(INITRAMFS_DIR)/
 endef
-BATOCERA_INITRAMFS_PRE_INSTALL_TARGET_HOOKS += BATOCERA_INITRAMFS_RISCV_EARLY_FIRMWARE
+BATOCERA_INITRAMFS_PRE_INSTALL_IMAGES_HOOKS += BATOCERA_INITRAMFS_RISCV_EARLY_FIRMWARE
 endif
 
 ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_SM8550),y)
@@ -79,7 +80,7 @@ define BATOCERA_INITRAMFS_SM8550_EARLY_FIRMWARE
     cp -R $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/qualcomm/sm8550/fsoverlay/lib/firmware/qcom/* \
         $(INITRAMFS_DIR)/lib/firmware/qcom/
 endef
-BATOCERA_INITRAMFS_PRE_INSTALL_TARGET_HOOKS += BATOCERA_INITRAMFS_SM8550_EARLY_FIRMWARE
+BATOCERA_INITRAMFS_PRE_INSTALL_IMAGES_HOOKS += BATOCERA_INITRAMFS_SM8550_EARLY_FIRMWARE
 endif
 
 ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_H700),y)
@@ -92,13 +93,12 @@ define BATOCERA_INITRAMFS_H700_EARLY_FIRMWARE
 	cp -R $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h700/fsoverlay/lib/firmware/panels/* \
         $(INITRAMFS_DIR)/lib/firmware/panels
 endef
-BATOCERA_INITRAMFS_PRE_INSTALL_TARGET_HOOKS += BATOCERA_INITRAMFS_H700_EARLY_FIRMWARE
+BATOCERA_INITRAMFS_PRE_INSTALL_IMAGES_HOOKS += BATOCERA_INITRAMFS_H700_EARLY_FIRMWARE
 endif
 
-define BATOCERA_INITRAMFS_INSTALL_TARGET_CMDS
+define BATOCERA_INITRAMFS_INSTALL_IMAGES_CMDS
 	mkdir -p $(INITRAMFS_DIR)
-	cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/batocera-initramfs/init \
-	    $(INITRAMFS_DIR)/init
+	cp $(BATOCERA_INITRAMFS_PKGDIR)/init $(INITRAMFS_DIR)/init
 	$(BATOCERA_INITRAMFS_MAKE_ENV) $(MAKE) $(BATOCERA_INITRAMFS_MAKE_OPTS) -C $(@D) install
 	(cd $(INITRAMFS_DIR) && find . | cpio -H newc -o > $(BINARIES_DIR)/initrd)
 	(cd $(BINARIES_DIR) && mkimage -A $(BATOCERA_INITRAMFS_INITRDA) \

package/batocera/boot/batocera-shim-signed-efi-helpers-ia32/batocera-shim-signed-efi-helpers-ia32.mk

@@ -7,6 +7,7 @@
 BATOCERA_SHIM_SIGNED_EFI_HELPERS_IA32_VERSION = 1+15.8+1~deb12u1
 BATOCERA_SHIM_SIGNED_EFI_HELPERS_IA32_SITE = https://ftp.debian.org/debian/pool/main/s/shim-helpers-i386-signed
 BATOCERA_SHIM_SIGNED_EFI_HELPERS_IA32_SOURCE = shim-helpers-i386-signed_$(BATOCERA_SHIM_SIGNED_EFI_HELPERS_IA32_VERSION)_i386.deb
+BATOCERA_SHIM_SIGNED_EFI_HELPERS_IA32_INSTALL_IMAGES = YES
 
 define BATOCERA_SHIM_SIGNED_EFI_HELPERS_IA32_EXTRACT_CMDS
 	mkdir -p $(@D)/shim-signed
@@ -16,7 +17,7 @@ endef
 define BATOCERA_SHIM_SIGNED_EFI_HELPERS_IA32_BUILD_CMDS
 endef
 
-define BATOCERA_SHIM_SIGNED_EFI_HELPERS_IA32_INSTALL_TARGET_CMDS
+define BATOCERA_SHIM_SIGNED_EFI_HELPERS_IA32_INSTALL_IMAGES_CMDS
 	mkdir -p $(BINARIES_DIR)/shim-signed
 
 	cp $(@D)/shim-signed/usr/lib/shim/fbia32.efi.signed $(BINARIES_DIR)/shim-signed/fbia32.efi

package/batocera/boot/batocera-shim-signed-efi-ia32/batocera-shim-signed-efi-ia32.mk

@@ -7,6 +7,7 @@
 BATOCERA_SHIM_SIGNED_EFI_IA32_VERSION = 1.44~1+deb12u1+15.8-1~deb12u1
 BATOCERA_SHIM_SIGNED_EFI_IA32_SITE = https://ftp.debian.org/debian/pool/main/s/shim-signed
 BATOCERA_SHIM_SIGNED_EFI_IA32_SOURCE = shim-signed_$(BATOCERA_SHIM_SIGNED_EFI_IA32_VERSION)_i386.deb
+BATOCERA_SHIM_SIGNED_EFI_IA32_INSTALL_IMAGES = YES
 
 define BATOCERA_SHIM_SIGNED_EFI_IA32_EXTRACT_CMDS
 	mkdir -p $(@D)/shim-signed
@@ -16,7 +17,7 @@ endef
 define BATOCERA_SHIM_SIGNED_EFI_IA32_BUILD_CMDS
 endef
 
-define BATOCERA_SHIM_SIGNED_EFI_IA32_INSTALL_TARGET_CMDS
+define BATOCERA_SHIM_SIGNED_EFI_IA32_INSTALL_IMAGES_CMDS
 	mkdir -p $(BINARIES_DIR)/shim-signed
 
 	cp $(@D)/shim-signed/usr/lib/shim/shimia32.efi.signed $(BINARIES_DIR)/shim-signed/shimia32.efi

package/batocera/boot/batocera-shim-signed-efi-x64/batocera-shim-signed-efi-x64.mk

@@ -7,6 +7,7 @@
 BATOCERA_SHIM_SIGNED_EFI_X64_VERSION = 1.58+15.8-0ubuntu1
 BATOCERA_SHIM_SIGNED_EFI_X64_SITE = https://launchpad.net/ubuntu/+archive/primary/+files
 BATOCERA_SHIM_SIGNED_EFI_X64_SOURCE = shim-signed_$(BATOCERA_SHIM_SIGNED_EFI_X64_VERSION)_amd64.deb
+BATOCERA_SHIM_SIGNED_EFI_X64_INSTALL_IMAGES = YES
 
 define BATOCERA_SHIM_SIGNED_EFI_X64_EXTRACT_CMDS
 	mkdir -p $(@D)/shim-signed
@@ -16,7 +17,7 @@ endef
 define BATOCERA_SHIM_SIGNED_EFI_X64_BUILD_CMDS
 endef
 
-define BATOCERA_SHIM_SIGNED_EFI_X64_INSTALL_TARGET_CMDS
+define BATOCERA_SHIM_SIGNED_EFI_X64_INSTALL_IMAGES_CMDS
 	mkdir -p $(BINARIES_DIR)/shim-signed
 
 	cp $(@D)/shim-signed/usr/lib/shim/fbx64.efi                 $(BINARIES_DIR)/shim-signed/

package/batocera/boot/batocera-syslinux-efi/batocera-syslinux-efi.mk

@@ -7,12 +7,14 @@
 BATOCERA_SYSLINUX_EFI_VERSION = 6.04.pre2.r11.gbf6db5b4-2
 BATOCERA_SYSLINUX_EFI_SOURCE =
 BATOCERA_SYSLINUX_EFI_SITE = binaries
+BATOCERA_SYSLINUX_EFI_DEPENDENCIES = host-dosfstools host-mtools
+BATOCERA_SYSLINUX_EFI_INSTALL_IMAGES = YES
 
 define BATOCERA_SYSLINUX_EFI_EXTRACT_CMDS
-	cp -R $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/batocera-syslinux-efi/binaries/* $(@D)
+	cp -R $(BATOCERA_SYSLINUX_EFI_PKGDIR)/binaries/* $(@D)
 endef
 
-define BATOCERA_SYSLINUX_EFI_INSTALL_TARGET_CMDS
+define BATOCERA_SYSLINUX_EFI_INSTALL_IMAGES_CMDS
 	mkdir -p $(BINARIES_DIR)/syslinux/efi64
 	cp $(@D)/bootx64.selfsigned.efi  $(BINARIES_DIR)/syslinux/bootx64.efi
 	cp $(@D)/fbx64.selfsigned.efi    $(BINARIES_DIR)/syslinux/fbx64.efi

package/batocera/boot/rockpro64-blobs/rockpro64-blobs.mk

@@ -1,8 +1,9 @@
 ROCKPRO64_BLOBS_VERSION = 2.0
 ROCKPRO64_BLOBS_SITE = https://github.com/batocera-linux/rockpro64-blobs.git
 ROCKPRO64_BLOBS_SITE_METHOD=git
+ROCKPRO64_BLOBS_INSTALL_IMAGES = YES
 
-define ROCKPRO64_BLOBS_INSTALL_TARGET_CMDS
+define ROCKPRO64_BLOBS_INSTALL_IMAGES_CMDS
 	cp $(@D)/idbloader.img $(BINARIES_DIR)/idbloader-rockpro64.img
 	cp $(@D)/trust.img     $(BINARIES_DIR)/trust-rockpro64.img
 	cp $(@D)/uboot.img     $(BINARIES_DIR)/u-boot-rockpro64.bin

package/batocera/boot/uboot-bananapi-m7/uboot-bananapi-m7.mk

@@ -6,17 +6,7 @@
 
 # Version: Built from source - @dmanlfc
 UBOOT_BANANAPI_M7_VERSION = 2024.06
-UBOOT_BANANAPI_M7_SOURCE =
+UBOOT_BANANAPI_M7_BOOT_SRC = idbloader.img u-boot.itb
+UBOOT_BANANAPI_M7_BINARIES_SUBDIR = bananapi-m7
 
-define UBOOT_BANANAPI_M7_BUILD_CMDS
-endef
-
-define UBOOT_BANANAPI_M7_INSTALL_TARGET_CMDS
-	mkdir -p $(BINARIES_DIR)/bananapi-m7
-	cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-bananapi-m7/idbloader.img \
-	    $(BINARIES_DIR)/bananapi-m7/idbloader.img
-	cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-bananapi-m7/u-boot.itb \
-	    $(BINARIES_DIR)/bananapi-m7/u-boot.itb
-endef
-
-$(eval $(generic-package))
+$(eval $(boot-package))

package/batocera/boot/uboot-evb-rk3399/uboot-evb-rk3399.mk

@@ -5,16 +5,6 @@
 ################################################################################
 
 UBOOT_EVB_RK3399_VERSION = 1.0
-UBOOT_EVB_RK3399_SOURCE =
+UBOOT_EVB_RK3399_BOOT_SRC = idbloader.img uboot.img trust.img
 
-define UBOOT_EVB_RK3399_BUILD_CMDS
-endef
-
-define UBOOT_EVB_RK3399_INSTALL_TARGET_CMDS
-	mkdir -p $(BINARIES_DIR)/uboot-evb-rk3399
-	cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-evb-rk3399/idbloader.img $(BINARIES_DIR)/uboot-evb-rk3399/idbloader.img
-	cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-evb-rk3399/uboot.img $(BINARIES_DIR)/uboot-evb-rk3399/uboot.img
-	cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-evb-rk3399/trust.img $(BINARIES_DIR)/uboot-evb-rk3399/trust.img
-endef
-
-$(eval $(generic-package))
+$(eval $(boot-package))

package/batocera/boot/uboot-firefly-station-m2/uboot-firefly-station-m2.mk

@@ -5,15 +5,6 @@
 ################################################################################
 
 UBOOT_FIREFLY_STATION_M2_VERSION = 1.0
-UBOOT_FIREFLY_STATION_M2_SOURCE =
+UBOOT_FIREFLY_STATION_M2_BOOT_SRC = idbloader.img uboot.img
 
-define UBOOT_FIREFLY_STATION_M2_BUILD_CMDS
-endef
-
-define UBOOT_FIREFLY_STATION_M2_INSTALL_TARGET_CMDS
-	mkdir -p $(BINARIES_DIR)/uboot-firefly-station-m2
-	cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-firefly-station-m2/idbloader.img $(BINARIES_DIR)/uboot-firefly-station-m2/idbloader.img
-	cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-firefly-station-m2/uboot.img $(BINARIES_DIR)/uboot-firefly-station-m2/uboot.img
-endef
-
-$(eval $(generic-package))
+$(eval $(boot-package))