I've committed a different diff which adds them with @comment, so they are not included in the package, but won't show up in "make plist" next time (so that any actual changes are apparent).
If they're needed for anything they can be un-@comment'ed. ----- Forwarded message from Stuart Henderson <[email protected]> ----- From: Stuart Henderson <[email protected]> Date: Sat, 2 Sep 2023 15:36:58 +0100 To: ports <[email protected]> Subject: u-boot-arm PLIST; some files are built but not packaged Mail-Followup-To: ports <[email protected]> As shown by "make plist" after building, u-boot-arm builds more files than are packaged. There are already a bunch of @comment'ed-out files in the list but there are others. Would anyone who is familiar with arm u-boot like to comment on whether any of these extra files should be included in the package, or should they be commented-out too? Here's a diff which just adds them (which makes it easy to see which files are involved). Index: Makefile =================================================================== RCS file: /cvs/ports/sysutils/u-boot/arm/Makefile,v retrieving revision 1.3 diff -u -p -r1.3 Makefile --- Makefile 2 Sep 2023 14:29:59 -0000 1.3 +++ Makefile 2 Sep 2023 14:33:39 -0000 @@ -1,5 +1,5 @@ VERSION= 2021.10 -REVISION= 7 +REVISION= 8 SOC= arm Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/sysutils/u-boot/arm/pkg/PLIST,v retrieving revision 1.1 diff -u -p -r1.1 PLIST --- pkg/PLIST 11 Aug 2023 19:48:27 -0000 1.1 +++ pkg/PLIST 2 Sep 2023 14:33:39 -0000 @@ -4,18 +4,21 @@ share/u-boot/ share/u-boot/A10-OLinuXino-Lime/ share/u-boot/A10-OLinuXino-Lime/sunxi-spl.bin @comment share/u-boot/A10-OLinuXino-Lime/u-boot +share/u-boot/A10-OLinuXino-Lime/u-boot-spl.bin share/u-boot/A10-OLinuXino-Lime/u-boot-sunxi-with-spl.bin @comment share/u-boot/A10-OLinuXino-Lime/u-boot.bin @comment share/u-boot/A10-OLinuXino-Lime/u-boot.img share/u-boot/A10s-OLinuXino-M/ share/u-boot/A10s-OLinuXino-M/sunxi-spl.bin @comment share/u-boot/A10s-OLinuXino-M/u-boot +share/u-boot/A10s-OLinuXino-M/u-boot-spl.bin share/u-boot/A10s-OLinuXino-M/u-boot-sunxi-with-spl.bin @comment share/u-boot/A10s-OLinuXino-M/u-boot.bin @comment share/u-boot/A10s-OLinuXino-M/u-boot.img share/u-boot/A20-OLinuXino-Lime/ share/u-boot/A20-OLinuXino-Lime/sunxi-spl.bin @comment share/u-boot/A20-OLinuXino-Lime/u-boot +share/u-boot/A20-OLinuXino-Lime/u-boot-spl.bin share/u-boot/A20-OLinuXino-Lime/u-boot-sunxi-with-spl.bin @comment share/u-boot/A20-OLinuXino-Lime/u-boot.bin @comment share/u-boot/A20-OLinuXino-Lime/u-boot.img @@ -23,140 +26,164 @@ share/u-boot/A20-OLinuXino-Lime2/ share/u-boot/A20-OLinuXino-Lime2-eMMC/ share/u-boot/A20-OLinuXino-Lime2-eMMC/sunxi-spl.bin @comment share/u-boot/A20-OLinuXino-Lime2-eMMC/u-boot +share/u-boot/A20-OLinuXino-Lime2-eMMC/u-boot-spl.bin share/u-boot/A20-OLinuXino-Lime2-eMMC/u-boot-sunxi-with-spl.bin @comment share/u-boot/A20-OLinuXino-Lime2-eMMC/u-boot.bin @comment share/u-boot/A20-OLinuXino-Lime2-eMMC/u-boot.img share/u-boot/A20-OLinuXino-Lime2/sunxi-spl.bin @comment share/u-boot/A20-OLinuXino-Lime2/u-boot +share/u-boot/A20-OLinuXino-Lime2/u-boot-spl.bin share/u-boot/A20-OLinuXino-Lime2/u-boot-sunxi-with-spl.bin @comment share/u-boot/A20-OLinuXino-Lime2/u-boot.bin @comment share/u-boot/A20-OLinuXino-Lime2/u-boot.img share/u-boot/A20-OLinuXino_MICRO/ share/u-boot/A20-OLinuXino_MICRO/sunxi-spl.bin @comment share/u-boot/A20-OLinuXino_MICRO/u-boot +share/u-boot/A20-OLinuXino_MICRO/u-boot-spl.bin share/u-boot/A20-OLinuXino_MICRO/u-boot-sunxi-with-spl.bin @comment share/u-boot/A20-OLinuXino_MICRO/u-boot.bin @comment share/u-boot/A20-OLinuXino_MICRO/u-boot.img share/u-boot/Bananapi/ share/u-boot/Bananapi/sunxi-spl.bin @comment share/u-boot/Bananapi/u-boot +share/u-boot/Bananapi/u-boot-spl.bin share/u-boot/Bananapi/u-boot-sunxi-with-spl.bin @comment share/u-boot/Bananapi/u-boot.bin @comment share/u-boot/Bananapi/u-boot.img share/u-boot/Bananapi_M2_Ultra/ share/u-boot/Bananapi_M2_Ultra/sunxi-spl.bin @comment share/u-boot/Bananapi_M2_Ultra/u-boot +share/u-boot/Bananapi_M2_Ultra/u-boot-spl.bin share/u-boot/Bananapi_M2_Ultra/u-boot-sunxi-with-spl.bin @comment share/u-boot/Bananapi_M2_Ultra/u-boot.bin @comment share/u-boot/Bananapi_M2_Ultra/u-boot.img share/u-boot/Bananapi_m2m/ share/u-boot/Bananapi_m2m/sunxi-spl.bin @comment share/u-boot/Bananapi_m2m/u-boot +share/u-boot/Bananapi_m2m/u-boot-spl.bin share/u-boot/Bananapi_m2m/u-boot-sunxi-with-spl.bin @comment share/u-boot/Bananapi_m2m/u-boot.bin @comment share/u-boot/Bananapi_m2m/u-boot.img share/u-boot/Bananapro/ share/u-boot/Bananapro/sunxi-spl.bin @comment share/u-boot/Bananapro/u-boot +share/u-boot/Bananapro/u-boot-spl.bin share/u-boot/Bananapro/u-boot-sunxi-with-spl.bin @comment share/u-boot/Bananapro/u-boot.bin @comment share/u-boot/Bananapro/u-boot.img share/u-boot/CHIP/ share/u-boot/CHIP/sunxi-spl.bin @comment share/u-boot/CHIP/u-boot +share/u-boot/CHIP/u-boot-spl.bin share/u-boot/CHIP/u-boot-sunxi-with-spl.bin @comment share/u-boot/CHIP/u-boot.bin @comment share/u-boot/CHIP/u-boot.img share/u-boot/Cubieboard/ share/u-boot/Cubieboard/sunxi-spl.bin @comment share/u-boot/Cubieboard/u-boot +share/u-boot/Cubieboard/u-boot-spl.bin share/u-boot/Cubieboard/u-boot-sunxi-with-spl.bin @comment share/u-boot/Cubieboard/u-boot.bin @comment share/u-boot/Cubieboard/u-boot.img share/u-boot/Cubieboard2/ share/u-boot/Cubieboard2/sunxi-spl.bin @comment share/u-boot/Cubieboard2/u-boot +share/u-boot/Cubieboard2/u-boot-spl.bin share/u-boot/Cubieboard2/u-boot-sunxi-with-spl.bin @comment share/u-boot/Cubieboard2/u-boot.bin @comment share/u-boot/Cubieboard2/u-boot.img share/u-boot/Cubieboard4/ share/u-boot/Cubieboard4/sunxi-spl.bin @comment share/u-boot/Cubieboard4/u-boot +share/u-boot/Cubieboard4/u-boot-spl.bin share/u-boot/Cubieboard4/u-boot-sunxi-with-spl.bin @comment share/u-boot/Cubieboard4/u-boot.bin @comment share/u-boot/Cubieboard4/u-boot.img share/u-boot/Cubietruck/ share/u-boot/Cubietruck/sunxi-spl.bin @comment share/u-boot/Cubietruck/u-boot +share/u-boot/Cubietruck/u-boot-spl.bin share/u-boot/Cubietruck/u-boot-sunxi-with-spl.bin @comment share/u-boot/Cubietruck/u-boot.bin @comment share/u-boot/Cubietruck/u-boot.img share/u-boot/Lamobo_R1/ share/u-boot/Lamobo_R1/sunxi-spl.bin @comment share/u-boot/Lamobo_R1/u-boot +share/u-boot/Lamobo_R1/u-boot-spl.bin share/u-boot/Lamobo_R1/u-boot-sunxi-with-spl.bin @comment share/u-boot/Lamobo_R1/u-boot.bin @comment share/u-boot/Lamobo_R1/u-boot.img share/u-boot/Linksprite_pcDuino/ share/u-boot/Linksprite_pcDuino/sunxi-spl.bin @comment share/u-boot/Linksprite_pcDuino/u-boot +share/u-boot/Linksprite_pcDuino/u-boot-spl.bin share/u-boot/Linksprite_pcDuino/u-boot-sunxi-with-spl.bin @comment share/u-boot/Linksprite_pcDuino/u-boot.bin @comment share/u-boot/Linksprite_pcDuino/u-boot.img share/u-boot/Linksprite_pcDuino3/ share/u-boot/Linksprite_pcDuino3/sunxi-spl.bin @comment share/u-boot/Linksprite_pcDuino3/u-boot +share/u-boot/Linksprite_pcDuino3/u-boot-spl.bin share/u-boot/Linksprite_pcDuino3/u-boot-sunxi-with-spl.bin @comment share/u-boot/Linksprite_pcDuino3/u-boot.bin @comment share/u-boot/Linksprite_pcDuino3/u-boot.img share/u-boot/Linksprite_pcDuino3_Nano/ share/u-boot/Linksprite_pcDuino3_Nano/sunxi-spl.bin @comment share/u-boot/Linksprite_pcDuino3_Nano/u-boot +share/u-boot/Linksprite_pcDuino3_Nano/u-boot-spl.bin share/u-boot/Linksprite_pcDuino3_Nano/u-boot-sunxi-with-spl.bin @comment share/u-boot/Linksprite_pcDuino3_Nano/u-boot.bin @comment share/u-boot/Linksprite_pcDuino3_Nano/u-boot.img share/u-boot/Orangepi/ share/u-boot/Orangepi/sunxi-spl.bin @comment share/u-boot/Orangepi/u-boot +share/u-boot/Orangepi/u-boot-spl.bin share/u-boot/Orangepi/u-boot-sunxi-with-spl.bin @comment share/u-boot/Orangepi/u-boot.bin @comment share/u-boot/Orangepi/u-boot.img share/u-boot/Orangepi_mini/ share/u-boot/Orangepi_mini/sunxi-spl.bin @comment share/u-boot/Orangepi_mini/u-boot +share/u-boot/Orangepi_mini/u-boot-spl.bin share/u-boot/Orangepi_mini/u-boot-sunxi-with-spl.bin @comment share/u-boot/Orangepi_mini/u-boot.bin @comment share/u-boot/Orangepi_mini/u-boot.img share/u-boot/am335x_evm/ share/u-boot/am335x_evm/MLO @comment share/u-boot/am335x_evm/u-boot +share/u-boot/am335x_evm/u-boot-spl.bin @comment share/u-boot/am335x_evm/u-boot.bin share/u-boot/am335x_evm/u-boot.img share/u-boot/bananapi_m2_plus_h3/ share/u-boot/bananapi_m2_plus_h3/sunxi-spl.bin @comment share/u-boot/bananapi_m2_plus_h3/u-boot +share/u-boot/bananapi_m2_plus_h3/u-boot-spl.bin share/u-boot/bananapi_m2_plus_h3/u-boot-sunxi-with-spl.bin @comment share/u-boot/bananapi_m2_plus_h3/u-boot.bin @comment share/u-boot/bananapi_m2_plus_h3/u-boot.img share/u-boot/bananapi_m2_zero/ share/u-boot/bananapi_m2_zero/sunxi-spl.bin @comment share/u-boot/bananapi_m2_zero/u-boot +share/u-boot/bananapi_m2_zero/u-boot-spl.bin share/u-boot/bananapi_m2_zero/u-boot-sunxi-with-spl.bin @comment share/u-boot/bananapi_m2_zero/u-boot.bin @comment share/u-boot/bananapi_m2_zero/u-boot.img share/u-boot/clearfog/ @comment share/u-boot/clearfog/u-boot +share/u-boot/clearfog/u-boot-spl.bin share/u-boot/clearfog/u-boot-spl.kwb @comment share/u-boot/clearfog/u-boot.bin @comment share/u-boot/clearfog/u-boot.img share/u-boot/cm_fx6/ share/u-boot/cm_fx6/SPL @comment share/u-boot/cm_fx6/u-boot +share/u-boot/cm_fx6/u-boot-spl.bin @comment share/u-boot/cm_fx6/u-boot.bin share/u-boot/cm_fx6/u-boot.img share/u-boot/mx6cuboxi/ share/u-boot/mx6cuboxi/SPL @comment share/u-boot/mx6cuboxi/u-boot +share/u-boot/mx6cuboxi/u-boot-spl.bin @comment share/u-boot/mx6cuboxi/u-boot.bin share/u-boot/mx6cuboxi/u-boot.img share/u-boot/mx6qsabrelite/ @@ -166,6 +193,7 @@ share/u-boot/mx6qsabrelite/u-boot-dtb.im share/u-boot/nanopi_neo/ share/u-boot/nanopi_neo/sunxi-spl.bin @comment share/u-boot/nanopi_neo/u-boot +share/u-boot/nanopi_neo/u-boot-spl.bin share/u-boot/nanopi_neo/u-boot-sunxi-with-spl.bin @comment share/u-boot/nanopi_neo/u-boot.bin @comment share/u-boot/nanopi_neo/u-boot.img @@ -176,58 +204,68 @@ share/u-boot/nitrogen6q/u-boot-dtb.imx share/u-boot/novena/ share/u-boot/novena/SPL @comment share/u-boot/novena/u-boot +share/u-boot/novena/u-boot-spl.bin @comment share/u-boot/novena/u-boot.bin share/u-boot/novena/u-boot.img share/u-boot/omap4_panda/ share/u-boot/omap4_panda/MLO @comment share/u-boot/omap4_panda/u-boot +share/u-boot/omap4_panda/u-boot-spl.bin @comment share/u-boot/omap4_panda/u-boot.bin share/u-boot/omap4_panda/u-boot.img share/u-boot/orangepi_2/ share/u-boot/orangepi_2/sunxi-spl.bin @comment share/u-boot/orangepi_2/u-boot +share/u-boot/orangepi_2/u-boot-spl.bin share/u-boot/orangepi_2/u-boot-sunxi-with-spl.bin @comment share/u-boot/orangepi_2/u-boot.bin @comment share/u-boot/orangepi_2/u-boot.img share/u-boot/orangepi_lite/ share/u-boot/orangepi_lite/sunxi-spl.bin @comment share/u-boot/orangepi_lite/u-boot +share/u-boot/orangepi_lite/u-boot-spl.bin share/u-boot/orangepi_lite/u-boot-sunxi-with-spl.bin @comment share/u-boot/orangepi_lite/u-boot.bin @comment share/u-boot/orangepi_lite/u-boot.img share/u-boot/orangepi_one/ share/u-boot/orangepi_one/sunxi-spl.bin @comment share/u-boot/orangepi_one/u-boot +share/u-boot/orangepi_one/u-boot-spl.bin share/u-boot/orangepi_one/u-boot-sunxi-with-spl.bin @comment share/u-boot/orangepi_one/u-boot.bin @comment share/u-boot/orangepi_one/u-boot.img share/u-boot/orangepi_pc/ share/u-boot/orangepi_pc/sunxi-spl.bin @comment share/u-boot/orangepi_pc/u-boot +share/u-boot/orangepi_pc/u-boot-spl.bin share/u-boot/orangepi_pc/u-boot-sunxi-with-spl.bin @comment share/u-boot/orangepi_pc/u-boot.bin @comment share/u-boot/orangepi_pc/u-boot.img share/u-boot/orangepi_pc_plus/ share/u-boot/orangepi_pc_plus/sunxi-spl.bin @comment share/u-boot/orangepi_pc_plus/u-boot +share/u-boot/orangepi_pc_plus/u-boot-spl.bin share/u-boot/orangepi_pc_plus/u-boot-sunxi-with-spl.bin @comment share/u-boot/orangepi_pc_plus/u-boot.bin @comment share/u-boot/orangepi_pc_plus/u-boot.img share/u-boot/orangepi_plus/ share/u-boot/orangepi_plus/sunxi-spl.bin @comment share/u-boot/orangepi_plus/u-boot +share/u-boot/orangepi_plus/u-boot-spl.bin share/u-boot/orangepi_plus/u-boot-sunxi-with-spl.bin @comment share/u-boot/orangepi_plus/u-boot.bin @comment share/u-boot/orangepi_plus/u-boot.img share/u-boot/orangepi_plus2e/ share/u-boot/orangepi_plus2e/sunxi-spl.bin @comment share/u-boot/orangepi_plus2e/u-boot +share/u-boot/orangepi_plus2e/u-boot-spl.bin share/u-boot/orangepi_plus2e/u-boot-sunxi-with-spl.bin @comment share/u-boot/orangepi_plus2e/u-boot.bin @comment share/u-boot/orangepi_plus2e/u-boot.img share/u-boot/orangepi_zero/ share/u-boot/orangepi_zero/sunxi-spl.bin @comment share/u-boot/orangepi_zero/u-boot +share/u-boot/orangepi_zero/u-boot-spl.bin share/u-boot/orangepi_zero/u-boot-sunxi-with-spl.bin @comment share/u-boot/orangepi_zero/u-boot.bin @comment share/u-boot/orangepi_zero/u-boot.img @@ -243,23 +281,29 @@ share/u-boot/rpi_3_32b/u-boot.bin share/u-boot/tinker-rk3288/ share/u-boot/tinker-rk3288/idbloader.img @comment share/u-boot/tinker-rk3288/u-boot +share/u-boot/tinker-rk3288/u-boot-rockchip.bin +share/u-boot/tinker-rk3288/u-boot-spl.bin @comment share/u-boot/tinker-rk3288/u-boot.bin share/u-boot/tinker-rk3288/u-boot.img share/u-boot/turris_omnia/ @comment share/u-boot/turris_omnia/u-boot +share/u-boot/turris_omnia/u-boot-spl.bin share/u-boot/turris_omnia/u-boot-spl.kwb @comment share/u-boot/turris_omnia/u-boot.bin @comment share/u-boot/turris_omnia/u-boot.img share/u-boot/udoo/ share/u-boot/udoo/SPL @comment share/u-boot/udoo/u-boot +share/u-boot/udoo/u-boot-spl.bin @comment share/u-boot/udoo/u-boot.bin share/u-boot/udoo/u-boot.img share/u-boot/usbarmory/ share/u-boot/usbarmory/u-boot +share/u-boot/usbarmory/u-boot-dtb.imx share/u-boot/usbarmory/u-boot.bin share/u-boot/wandboard/ share/u-boot/wandboard/SPL @comment share/u-boot/wandboard/u-boot +share/u-boot/wandboard/u-boot-spl.bin @comment share/u-boot/wandboard/u-boot.bin share/u-boot/wandboard/u-boot.img ----- End forwarded message -----
