From 912e3b34caa0db0e00be961bcfe3ef61c5777daf Mon Sep 17 00:00:00 2001 From: deraadt Date: Sat, 3 Jun 2017 22:25:19 +0000 Subject: [PATCH] kernels in compile dirs are readonly, and the bsd.rd we created has tracked that permission. Make the copy in $RELEASEDIR a+r --- distrib/alpha/bsd.rd/Makefile | 3 ++- distrib/amd64/ramdiskA/Makefile.inc | 3 ++- distrib/amd64/ramdisk_cd/Makefile.inc | 3 ++- distrib/hppa/ramdisk/Makefile | 3 ++- distrib/i386/common/Makefile.inc | 3 ++- distrib/ramdisk/Makefile | 3 ++- distrib/sparc64/bsd.rd/Makefile | 3 ++- distrib/sparc64/common/Makefile.inc | 3 ++- 8 files changed, 16 insertions(+), 8 deletions(-) diff --git a/distrib/alpha/bsd.rd/Makefile b/distrib/alpha/bsd.rd/Makefile index 0b1e1dd0eee..241185ba092 100644 --- a/distrib/alpha/bsd.rd/Makefile +++ b/distrib/alpha/bsd.rd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.23 2017/01/27 17:59:09 natano Exp $ +# $OpenBSD: Makefile,v 1.24 2017/06/03 22:25:19 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -52,4 +52,5 @@ rdsetroot: ${TOP}/../common/elfrdsetroot.c .ifdef RELEASEDIR beforeinstall: cp bsd.rd ${RELEASEDIR} + chmod a+r ${RELEASEDIR}/bsd.rd .endif diff --git a/distrib/amd64/ramdiskA/Makefile.inc b/distrib/amd64/ramdiskA/Makefile.inc index 450b912de04..e447e86b412 100644 --- a/distrib/amd64/ramdiskA/Makefile.inc +++ b/distrib/amd64/ramdiskA/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.3 2016/11/24 16:32:33 natano Exp $ +# $OpenBSD: Makefile.inc,v 1.4 2017/06/03 22:25:19 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -97,6 +97,7 @@ rdsetroot: ${TOP}/../common/elfrdsetroot.c install: .ifndef NOBSDRD cp bsd.rd ${RELEASEDIR}/bsd.rd + chmod a+r ${RELEASEDIR}/bsd.rd .endif .ifndef NOFS cp ${FS} ${RELEASEDIR}/${FS} diff --git a/distrib/amd64/ramdisk_cd/Makefile.inc b/distrib/amd64/ramdisk_cd/Makefile.inc index 33a0e0e09d1..941716fac3b 100644 --- a/distrib/amd64/ramdisk_cd/Makefile.inc +++ b/distrib/amd64/ramdisk_cd/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.4 2016/12/30 22:32:25 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.5 2017/06/03 22:25:19 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -103,6 +103,7 @@ rdsetroot: ${TOP}/../common/elfrdsetroot.c install: .ifndef NOBSDRD cp bsd.rd ${RELEASEDIR}/bsd.rd + chmod a+r ${RELEASEDIR}/bsd.rd .endif .ifndef NOFS cp ${FS} ${RELEASEDIR}/${FS} diff --git a/distrib/hppa/ramdisk/Makefile b/distrib/hppa/ramdisk/Makefile index dc1f1a6b028..0d3c2ad3594 100644 --- a/distrib/hppa/ramdisk/Makefile +++ b/distrib/hppa/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.31 2016/12/30 22:32:25 deraadt Exp $ +# $OpenBSD: Makefile,v 1.32 2017/06/03 22:25:19 deraadt Exp $ CBIN= instbin ARCHDIR= ${.CURDIR}/.. @@ -99,6 +99,7 @@ clean cleandir: .ifdef RELEASEDIR beforeinstall: cp bsd.rd ${LIF} ${CDROM} ${RELEASEDIR} + chmod a+r ${RELEASEDIR}/bsd.rd .endif .include diff --git a/distrib/i386/common/Makefile.inc b/distrib/i386/common/Makefile.inc index 9e2044916e2..70e883ff17c 100644 --- a/distrib/i386/common/Makefile.inc +++ b/distrib/i386/common/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.41 2016/12/30 22:32:25 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.42 2017/06/03 22:25:19 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -97,6 +97,7 @@ rdsetroot: ${TOP}/../common/elfrdsetroot.c install: .ifndef NOBSDRD cp bsd.rd ${RELEASEDIR}/bsd.rd + chmod a+r ${RELEASEDIR}/bsd.rd .endif .ifndef NOFS cp ${FS} ${RELEASEDIR}/${FS} diff --git a/distrib/ramdisk/Makefile b/distrib/ramdisk/Makefile index 28600c57b3b..ba7ae4adb12 100644 --- a/distrib/ramdisk/Makefile +++ b/distrib/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.47 2016/10/14 18:44:20 deraadt Exp $ +# $OpenBSD: Makefile,v 1.48 2017/06/03 22:25:19 deraadt Exp $ REV= ${OSrev} @@ -128,6 +128,7 @@ clean cleandir: .ifdef RELEASEDIR beforeinstall: cp bsd.rd ${RELEASEDIR} + chmod a+r ${RELEASEDIR}/bsd.rd .ifdef MAKEFLOPPY cp ${FLOPPY} ${RELEASEDIR} .endif # MAKEFLOPPY diff --git a/distrib/sparc64/bsd.rd/Makefile b/distrib/sparc64/bsd.rd/Makefile index 2a7cf7ab358..87e06d11406 100644 --- a/distrib/sparc64/bsd.rd/Makefile +++ b/distrib/sparc64/bsd.rd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.30 2017/01/27 17:59:09 natano Exp $ +# $OpenBSD: Makefile,v 1.31 2017/06/03 22:25:19 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -53,6 +53,7 @@ rdsetroot: ${TOP}/../common/elfrdsetroot.c install: .ifndef NOBSDRD cp bsd.rd ${RELEASEDIR} + chmod a+r ${RELEASEDIR}/bsd.rd .endif .endif diff --git a/distrib/sparc64/common/Makefile.inc b/distrib/sparc64/common/Makefile.inc index f511bfaf7da..8f46729c38b 100644 --- a/distrib/sparc64/common/Makefile.inc +++ b/distrib/sparc64/common/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.16 2014/11/22 15:02:27 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.17 2017/06/03 22:25:19 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -81,6 +81,7 @@ unconfig: install: .ifndef NOBSDRD cp bsd.rd ${RELEASEDIR} + chmod a+r ${RELEASEDIR}/bsd.rd .endif cp ${FS} ${RELEASEDIR} .endif -- 2.20.1