Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Move the METALOG from ${_SRC_TOP_OBJ_} to ${DESTDIR}.
details: https://anonhg.NetBSD.org/src/rev/7507d97f4eb0
branches: trunk
changeset: 526424:7507d97f4eb0
user: lukem <lukem%NetBSD.org@localhost>
date: Fri May 03 08:58:45 2002 +0000
description:
Move the METALOG from ${_SRC_TOP_OBJ_} to ${DESTDIR}.
There were too many synchronisation problems with using the former;
including situations such as a "make clean" performed between two
installs to the same DESTDIR would result in a truncated METALOG and
the resultant sets would be missing stuff such as include files that
don't get reinstalled if they haven't changed, even with !UPDATE.
diffstat:
BUILDING | 9 ++++-----
BUILDING.mdoc | 10 ++++------
Makefile | 5 +----
share/man/man5/mk.conf.5 | 6 ++----
share/mk/bsd.own.mk | 8 ++------
5 files changed, 13 insertions(+), 25 deletions(-)
diffs (115 lines):
diff -r c8f8e325c9c3 -r 7507d97f4eb0 BUILDING
--- a/BUILDING Fri May 03 08:48:12 2002 +0000
+++ b/BUILDING Fri May 03 08:58:45 2002 +0000
@@ -240,10 +240,9 @@
UNPRIVED If set, then an unprivileged install will occur. The user,
group, permissions, and file flags, will not be set on the
installed item; instead the information will be appended to a
- file called METALOG in the .OBJDIR of src. The contents of
- METALOG is used during the generation of the distribution tar
- files to ensure that the appropriate file ownership is
- stored.
+ file called METALOG in DESTDIR. The contents of METALOG is
+ used during the generation of the distribution tar files to
+ ensure that the appropriate file ownership is stored.
Default: Unset.
@@ -519,4 +518,4 @@
BUGS
A few platforms are not yet using the USE_NEW_TOOLCHAIN system.
-NetBSD March 5, 2002 8
+NetBSD May 3, 2002 8
diff -r c8f8e325c9c3 -r 7507d97f4eb0 BUILDING.mdoc
--- a/BUILDING.mdoc Fri May 03 08:48:12 2002 +0000
+++ b/BUILDING.mdoc Fri May 03 08:58:45 2002 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: BUILDING.mdoc,v 1.16 2002/05/02 22:13:30 sommerfeld Exp $
+.\" $NetBSD: BUILDING.mdoc,v 1.17 2002/05/03 08:59:14 lukem Exp $
.\"
.\" Copyright (c) 2001 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -38,7 +38,7 @@
.\" NOTE: After changing this file, run "make build-docs" to generate the
.\" proper plaintext versions, and check in all BUILDING.* files!
.\"
-.Dd March 5, 2002
+.Dd May 3, 2002
.Dt BUILDING 8
.Os NetBSD
.
@@ -438,10 +438,8 @@
the installed item; instead the information will be appended to
a file called
.Pa METALOG
-in the
-.Sy .OBJDIR
-of
-.Sy src .
+in
+.Sy DESTDIR .
The contents of
.Pa METALOG
is used during the generation of the distribution tar files to ensure
diff -r c8f8e325c9c3 -r 7507d97f4eb0 Makefile
--- a/Makefile Fri May 03 08:48:12 2002 +0000
+++ b/Makefile Fri May 03 08:58:45 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.173 2002/05/02 22:13:30 sommerfeld Exp $
+# $NetBSD: Makefile,v 1.174 2002/05/03 08:59:14 lukem Exp $
# This is the top-level makefile for building NetBSD. For an outline of
# how to build a snapshot or release, as well as other release engineering
@@ -210,9 +210,6 @@
dependall-distrib depend-distrib all-distrib:
@true
-clean:
- rm -f METALOG
-
.include <bsd.obj.mk>
.include <bsd.subdir.mk>
diff -r c8f8e325c9c3 -r 7507d97f4eb0 share/man/man5/mk.conf.5
--- a/share/man/man5/mk.conf.5 Fri May 03 08:48:12 2002 +0000
+++ b/share/man/man5/mk.conf.5 Fri May 03 08:58:45 2002 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: mk.conf.5,v 1.12 2002/04/26 16:24:06 lukem Exp $
+.\" $NetBSD: mk.conf.5,v 1.13 2002/05/03 08:58:46 lukem Exp $
.\"
.\" Copyright (c) 1999 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -159,9 +159,7 @@
.Sq "make install"
will not attempt to set the ownership or permissions of the target
file, and will instead attempt to log the information to
-.Pa METALOG
-in the objdir of
-.Sy NETBSDSRCDIR .
+.Pa ${DESTDIR}/METALOG .
.El
.Ss Pkgsrc system variables
Please see
diff -r c8f8e325c9c3 -r 7507d97f4eb0 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk Fri May 03 08:48:12 2002 +0000
+++ b/share/mk/bsd.own.mk Fri May 03 08:58:45 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.290 2002/04/29 19:27:07 wiz Exp $
+# $NetBSD: bsd.own.mk,v 1.291 2002/05/03 08:58:45 lukem Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
@@ -258,11 +258,7 @@
HRDLINK?= -l h
SYMLINK?= -l s
-.if defined(_SRC_TOP_OBJ_)
-METALOG?= ${_SRC_TOP_OBJ_}/METALOG
-.else
-METALOG?= /dev/null
-.endif
+METALOG?= ${DESTDIR}/METALOG
INSTPRIV?= ${UNPRIVED:D-U -M ${METALOG}}
STRIPFLAG?= -s
Home |
Main Index |
Thread Index |
Old Index