On 2024/02/22 14:13, Mark Kettenis wrote:
> > Date: Thu, 22 Feb 2024 05:32:57 +0900
> > From: SASANO Takayoshi <u...@mx5.nisiq.net>
> >
> > Hi, here is the fixed version:
>
> I'm not sure about the "move away with date" approach. That is
> probably something a ports hacker should judge.
I think your suggestion of just moving the rm was better, there doesn't
seem a reason to backup old build directories.
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/arm-trusted-firmware/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile 19 Feb 2024 18:38:12 -0000 1.21
+++ Makefile 22 Feb 2024 13:39:30 -0000
@@ -9,6 +9,7 @@ GH_ACCOUNT= ARM-software
GH_PROJECT= arm-trusted-firmware
GH_TAGNAME= lts-v${VERSION}
+REVISION= 0
EPOCH= 0
CATEGORIES= sysutils
@@ -39,6 +40,18 @@ PLATFORMS=\
do-build:
.for P in ${PLATFORMS}
+. if "$P" == "sun50i_h6"
+ # ATF's Makefile looks not easy to tweak, rename directory name that
+ # stores compiled objects. First, make with SUNXI_SETUP_REGULATORS=0.
+ cd ${WRKSRC} && \
+ ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
+ V=1 PLAT=${P} DEBUG=0 SUNXI_SETUP_REGULATORS=0 bl31
+ rm -rf ${WRKBUILD}/build/sun50i_h6.noreg
+ mv ${WRKBUILD}/build/sun50i_h6 ${WRKBUILD}/build/sun50i_h6.noreg
+
+ # Second, make default (SUNXI_SETUP_REGULATORS=1).
+ # (FALLTHROUGH)
+. endif
cd ${WRKSRC} && \
${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
V=1 PLAT=${P} DEBUG=0 bl31
@@ -54,6 +67,8 @@ do-install:
${PREFIX}/share/arm-trusted-firmware/sun50i_a64-bl31.bin
${INSTALL_DATA} ${WRKBUILD}/build/sun50i_h6/release/bl31.bin \
${PREFIX}/share/arm-trusted-firmware/sun50i_h6-bl31.bin
+ ${INSTALL_DATA} ${WRKBUILD}/build/sun50i_h6.noreg/release/bl31.bin \
+ ${PREFIX}/share/arm-trusted-firmware/sun50i_h6-bl31-noreg.bin
${INSTALL_DATA} ${WRKBUILD}/build/sun50i_h616/release/bl31.bin \
${PREFIX}/share/arm-trusted-firmware/sun50i_h616-bl31.bin
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/arm-trusted-firmware/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 19 Feb 2024 18:38:12 -0000 1.7
+++ pkg/PLIST 22 Feb 2024 13:39:30 -0000
@@ -3,5 +3,6 @@ share/arm-trusted-firmware/
share/arm-trusted-firmware/rk3328-bl31.elf
share/arm-trusted-firmware/rk3399-bl31.elf
share/arm-trusted-firmware/sun50i_a64-bl31.bin
+share/arm-trusted-firmware/sun50i_h6-bl31-noreg.bin
share/arm-trusted-firmware/sun50i_h6-bl31.bin
share/arm-trusted-firmware/sun50i_h616-bl31.bin
