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 /libexec/ld.so | |
| 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 'libexec/ld.so')
| -rw-r--r-- | libexec/ld.so/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libexec/ld.so/Makefile b/libexec/ld.so/Makefile index 63f51b6aedc..e4b0a5fc44a 100644 --- a/libexec/ld.so/Makefile +++ b/libexec/ld.so/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.69 2017/08/27 22:18:08 deraadt Exp $ +# $OpenBSD: Makefile,v 1.70 2017/11/05 10:29:24 rpe Exp $ SUBDIR=ldconfig ldd MAN= ld.so.1 @@ -82,5 +82,7 @@ ld.so.a: ${OBJS} ${.CURDIR}/Symbols.map ${test_prog} ar cqD $@ $? afterinstall: ld.so.a + install -d -o root -g wheel -m 755 \ + ${DESTDIR}/usr/share/relink/usr/libexec install -o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} \ - ld.so.a ${DESTDIR}/usr/libdata/ld.so.a + ld.so.a ${DESTDIR}/usr/share/relink/usr/libexec/ld.so.a |