diff options
| author | Robert Peichaer <rpe@cvs.openbsd.org> | 2017-11-05 10:29:25 +0000 |
|---|---|---|
| committer | Robert Peichaer <rpe@cvs.openbsd.org> | 2017-11-05 10:29:25 +0000 |
| commit | 2b3a46c29190b63ef7df6030edba6a9b2b1ec71a (patch) | |
| tree | 05895ed99018e9b4368387efbe8f9367b668d782 /etc/Makefile | |
| parent | f68e9694a72eb5ed92202034f2586a2e441b3c04 (diff) | |
Consolidate lib.so.*.a, ld.so.a and the kernel relink kit into
one location under /usr/share/relink.
Be more specific in src/etc/rc reorder_libs() what filesystems
need r/w remount and ensure that their mount state is restored.
Idea and positive feedback from deraadt@
OK aja@ tb@
Diffstat (limited to 'etc/Makefile')
| -rw-r--r-- | etc/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/etc/Makefile b/etc/Makefile index 26461a8c4ad..aa0a7309ce2 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.460 2017/06/22 16:02:42 deraadt Exp $ +# $OpenBSD: Makefile,v 1.461 2017/11/05 10:29:24 rpe Exp $ .include <bsd.own.mk> @@ -30,11 +30,11 @@ kernels: ${ALL_KERNELS} chmod a+r ${RELEASEDIR}/$K .endfor cd ${.CURDIR}/../sys/arch/${MACHINE}/compile/ && \ - tar -chzf ${DESTDIR}/usr/share/compile.tgz -s ',/obj/,/,' \ + tar -chzf ${DESTDIR}/usr/share/relink/kernel.tgz -s ',/obj/,/,' \ GENERIC*/obj/*.o GENERIC*/obj/Makefile \ GENERIC*/obj/ld.script GENERIC*/obj/makegap.sh - chown root:wheel ${DESTDIR}/usr/share/compile.tgz - chmod 644 ${DESTDIR}/usr/share/compile.tgz + chown root:wheel ${DESTDIR}/usr/share/relink/kernel.tgz + chmod 644 ${DESTDIR}/usr/share/relink/kernel.tgz # -rw-r--r-- BINOWN= root @@ -272,7 +272,7 @@ do-release: release-sets: su ${BUILDUSER} -c 'exec ${MAKE} distribution' su ${BUILDUSER} -c 'exec ${MAKE} kernels' - cp -p ${DESTDIR}/usr/share/compile.tgz /usr/share/compile.tgz + cp -p ${DESTDIR}/usr/share/relink/kernel.tgz /usr/share/relink/kernel.tgz ${MAKE} bootblocks cd ${RELEASEDIR} && rm -f SHA256 cd ../distrib/sets && exec su ${BUILDUSER} -c 'exec sh maketars ${OSrev}' |