Tue Apr 23 22:00:37 2024 UTC (16d)
VAX boot.fs: Fix owner/group/permissions for VAX's boot.fs (Jan-Benedict Glaw)

(Initial patch from Christos Zoulas.)  Don't create an archive based on local
permission bits and owner/group. Instead, feed a small manifest into `pax`
and let it to its work.

  NB: Don't also feed in an entry for the current directory ".", as `pax` will
then archive all files in the current directory, in `readdir()` order.


(christos)
diff -r1.14 -r1.15 src/distrib/vax/floppy/Makefile
cvs diff -r1.14 -r1.15 src/distrib/vax/floppy/Makefile (expand / switch to unified diff)

--- src/distrib/vax/floppy/Makefile 2017/02/11 03:07:06 1.14
+++ src/distrib/vax/floppy/Makefile 2024/04/23 22:00:37 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.14 2017/02/11 03:07:06 christos Exp $ 1# $NetBSD: Makefile,v 1.15 2024/04/23 22:00:37 christos Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" 4.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
5 5
6.include <bsd.kernobj.mk> 6.include <bsd.kernobj.mk>
7 7
8.if ${MKREPRO_TIMESTAMP:Uno} != "no" 8.if ${MKREPRO_TIMESTAMP:Uno} != "no"
9MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP}" 9MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP}"
10PAX_TIMESTAMP=--timestamp "${MKREPRO_TIMESTAMP}" 10PAX_TIMESTAMP=--timestamp "${MKREPRO_TIMESTAMP}"
11.endif 11.endif
12 12
13INSTKERNOBJ!= cd ${.CURDIR}/../ramdisk-kernel && ${PRINTOBJDIR} 13INSTKERNOBJ!= cd ${.CURDIR}/../ramdisk-kernel && ${PRINTOBJDIR}
14 14
@@ -19,21 +19,24 @@ XXBOOT= ${DESTDIR}/usr/mdec/xxboot_usta @@ -19,21 +19,24 @@ XXBOOT= ${DESTDIR}/usr/mdec/xxboot_usta
19IMAGEDEPENDS= ${XXBOOT} boot.vax netbsd.gz 19IMAGEDEPENDS= ${XXBOOT} boot.vax netbsd.gz
20CLEANFILES+= netbsd.gz boot.vax ${IMAGE}.tmp 20CLEANFILES+= netbsd.gz boot.vax ${IMAGE}.tmp
21 21
22realall: ${IMAGE} ${XXBOOT} ${DESTDIR}/usr/mdec/boot 22realall: ${IMAGE} ${XXBOOT} ${DESTDIR}/usr/mdec/boot
23 23
24netbsd.gz: ${INSTKERNOBJ}/install.ram.gz 24netbsd.gz: ${INSTKERNOBJ}/install.ram.gz
25 cp -f ${.ALLSRC} ${.TARGET} 25 cp -f ${.ALLSRC} ${.TARGET}
26 26
27boot.vax: ${DESTDIR}/usr/mdec/boot 27boot.vax: ${DESTDIR}/usr/mdec/boot
28 cp -f ${.ALLSRC} ${.TARGET} 28 cp -f ${.ALLSRC} ${.TARGET}
29 29
30${IMAGE}: ${IMAGEDEPENDS} 30${IMAGE}: ${IMAGEDEPENDS}
31 cat ${XXBOOT} > ${IMAGE}.tmp 31 cat ${XXBOOT} > ${IMAGE}.tmp
32 ${TOOL_PAX} ${PAX_TIMESTAMP} -O -w -x ustar boot.vax netbsd.gz | dd of=${IMAGE}.tmp seek=16 32 (echo "./boot.vax type=file uname=root gname=wheel mode=0755"; \
 33 echo "./netbsd.gz type=file uname=root gname=wheel mode=0644") | \
 34 ${TOOL_PAX} ${PAX_TIMESTAMP} -O -w -x ustar -M | \
 35 dd of=${IMAGE}.tmp seek=16
33 dd if=${IMAGE}.tmp of=${IMAGE} bs=${IMAGESIZE} conv=sync 36 dd if=${IMAGE}.tmp of=${IMAGE} bs=${IMAGESIZE} conv=sync
34 37
35release: check_RELEASEDIR .WAIT ${IMAGE} 38release: check_RELEASEDIR .WAIT ${IMAGE}
36 ${RELEASE_INSTALL} ${IMAGE} \ 39 ${RELEASE_INSTALL} ${IMAGE} \
37 ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/bootfs 40 ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/bootfs
38 41
39.include <bsd.prog.mk> 42.include <bsd.prog.mk>