summaryrefslogtreecommitdiff
path: root/usr.sbin/config/mkmakefile.c
diff options
context:
space:
mode:
authorRobert Peichaer <rpe@cvs.openbsd.org>2017-11-05 10:29:25 +0000
committerRobert Peichaer <rpe@cvs.openbsd.org>2017-11-05 10:29:25 +0000
commit2b3a46c29190b63ef7df6030edba6a9b2b1ec71a (patch)
tree05895ed99018e9b4368387efbe8f9367b668d782 /usr.sbin/config/mkmakefile.c
parentf68e9694a72eb5ed92202034f2586a2e441b3c04 (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 'usr.sbin/config/mkmakefile.c')
-rw-r--r--usr.sbin/config/mkmakefile.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c
index 79f59c898ab..a5bf75aaf9b 100644
--- a/usr.sbin/config/mkmakefile.c
+++ b/usr.sbin/config/mkmakefile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkmakefile.c,v 1.44 2017/07/18 16:43:27 tb Exp $ */
+/* $OpenBSD: mkmakefile.c,v 1.45 2017/11/05 10:29:24 rpe Exp $ */
/* $NetBSD: mkmakefile.c,v 1.34 1997/02/02 21:12:36 thorpej Exp $ */
/*
@@ -524,11 +524,11 @@ emitload(FILE *fp)
if (fprintf(fp, "update-link:\n") < 0)
return (1);
if (fprintf(fp,
- "\tmkdir -p -m 700 /usr/share/compile\n"
- "\trm -rf /usr/share/compile/%s /usr/share/compile.tgz\n"
- "\tmkdir /usr/share/compile/%s\n"
+ "\tmkdir -p -m 700 /usr/share/relink/kernel\n"
+ "\trm -rf /usr/share/relink/kernel/%s /usr/share/relink/kernel.tgz\n"
+ "\tmkdir /usr/share/relink/kernel/%s\n"
"\ttar -chf - Makefile makegap.sh ld.script *.o | \\\n"
- "\t tar -C /usr/share/compile/%s -xf -\n\n",
+ "\t tar -C /usr/share/relink/kernel/%s -xf -\n\n",
last_component, last_component, last_component) < 0)
return (1);
}