The tail end of make release on arm64 looks like this:

...
===> arm64/miniroot
cp miniroot64.fs /home/rel-arm64
su build -c 'exec make sha'
cd /home/rel-arm64;  date -u "+Build date: %s - %+" > BUILDINFO;  cksum -a 
sha256 BUILDINFO INSTALL.`arch -ks`  bsd bsd.mp bsd.rd BOOTAA64.EFI 
miniroot64.fs base64.tgz comp64.tgz man64.tgz game64.tgz | sort > SHA256        
                
cksum: cannot open bsd.rd: Permission denied                                   
cd /home/rel-arm64 && chmod g-w,a+rX *

Wait, didn't we fix the bsd.rd permissions a while ago?  Yes, there
was a commit...

---------------------------->
CVSROOT:        /cvs
Module name:    src
Changes by:     dera...@cvs.openbsd.org 2017/06/03 16:25:19

Modified files:
        distrib/alpha/bsd.rd: Makefile 
        distrib/amd64/ramdiskA: Makefile.inc 
        distrib/amd64/ramdisk_cd: Makefile.inc 
        distrib/hppa/ramdisk: Makefile 
        distrib/i386/common: Makefile.inc 
        distrib/ramdisk: Makefile 
        distrib/sparc64/bsd.rd: Makefile 
        distrib/sparc64/common: Makefile.inc 

Log message:
kernels in compile dirs are readonly, and the bsd.rd we created has
tracked that permission.  Make the copy in $RELEASEDIR a+r
<----------------------------

... but it bypassed armv7 and arm64.  So below is the corresponding
fix for those archs.

Alternatively, if we are confident that we won't return to multiple
bsd.rd kernels (like sgi has), I can remove the ALLBSDRD contortions
throughout that Makefile and use "bsd.rd" instead, like we do on most
archs.

Index: distrib/arm64/ramdisk/Makefile
===================================================================
RCS file: /cvs/src/distrib/arm64/ramdisk/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- distrib/arm64/ramdisk/Makefile      22 Aug 2017 23:20:00 -0000      1.3
+++ distrib/arm64/ramdisk/Makefile      24 Jan 2019 03:58:15 -0000
@@ -79,6 +79,7 @@ clean cleandir:
 .ifdef RELEASEDIR
 install:
        cp ${ALLBSDRD} ${RELEASEDIR}
+       cd ${RELEASEDIR} && chmod a+r ${ALLBSDRD}
 .endif # RELEASEDIR
 
 .include <bsd.obj.mk>
Index: distrib/armv7/ramdisk/Makefile
===================================================================
RCS file: /cvs/src/distrib/armv7/ramdisk/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- distrib/armv7/ramdisk/Makefile      1 Sep 2017 04:40:40 -0000       1.17
+++ distrib/armv7/ramdisk/Makefile      24 Jan 2019 03:58:40 -0000
@@ -83,6 +83,7 @@ clean cleandir:
 .ifdef RELEASEDIR
 install:
        cp ${ALLBSDRD} ${RELEASEDIR}
+       cd ${RELEASEDIR} && chmod a+r ${ALLBSDRD}
 .endif # RELEASEDIR
 
 .include <bsd.obj.mk>
-- 
Christian "naddy" Weisgerber                          na...@mips.inka.de

Reply via email to