Date: Wed, 15 Apr 1998 11:03:36 -0400 (EDT) From: "Greg A. Woods" <woods@zeus.leitch.com> To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: misc/6309: fixes to release/Makefile to better support other CVS repositories Message-ID: <199804151503.LAA28218@brain.zeus.leitch.com>
next in thread | raw e-mail | index | archive | help
>Number: 6309
>Category: misc
>Synopsis: fixes to release/Makefile to better support other CVS repositories
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Apr 15 08:10:01 PDT 1998
>Last-Modified:
>Originator: Greg A. Woods
>Organization:
Planix, Inc.; Toronto, Ontario; Canada; on contract to Leitch Technology
>Release: FreeBSD 2.2.6-STABLE i386
>Environment:
FreeBSD 2.2.x (i.e. RELENG_2_2)
>Description:
It is impossible to use 'make release' in an environment where the CVS
repository doesn't have exactly the same structure and module names as
the official FreeBSD.ORG repository. However this can be fixed with a
couple of very minor changes to the release/Makefile which will allow a
fully flexible module naming scheme.
>How-To-Repeat:
Try to "cd release; make release ... " on a system where the CVS
repository does not have a 'src' module that points at the FreeBSD
source tree.
>Fix:
Note that in the last hunk of this patch I've also disabled "make
rerelease RELEASETAG=tag" since it seems illogical to do this (though if
RELEASETAG were a branch and *not* a "release" tag this may have some
meaning in terms of doing snapshots of that branch).
*** src-2.2.x/release/Makefile Mon Mar 30 13:59:04 1998
--- src/release/Makefile Wed Apr 8 16:47:26 1998
***************
*** 19,24 ****
--- 19,28 ----
# If this is a RELEASE, then set
#RELEASETAG=RELENG_2_2
+ # The name of the CVS module identifying the root of your FreeBSD tree
+ CVSMODULENAME=src
+ #CVSMODULENAME=Leitch-BSD
+
# Uncomment this to disable the doc.1 target. It is also an ERROR
# to set NOPORTS and not set NODOC since docs depend on ports.
#NODOC= YES
***************
*** 123,132 ****
done
.if !defined(RELEASETAG)
cd ${CHROOTDIR}/usr && rm -rf src && \
! cvs -d ${CVSROOT} co -P src
.else
cd ${CHROOTDIR}/usr && rm -rf src && \
! cvs -d ${CVSROOT} co -P -r ${RELEASETAG} src
.endif
.if defined(LOCAL_PATCHES) && exists(${LOCAL_PATCHES})
cd ${CHROOTDIR}/usr/src && patch --silent < ${LOCAL_PATCHES}
--- 127,136 ----
done
.if !defined(RELEASETAG)
cd ${CHROOTDIR}/usr && rm -rf src && \
! cvs -d ${CVSROOT} co -P -d src ${CVSMODULENAME}
.else
cd ${CHROOTDIR}/usr && rm -rf src && \
! cvs -d ${CVSROOT} export -kv -r ${RELEASETAG} -d src ${CVSMODULENAME}
.endif
.if defined(LOCAL_PATCHES) && exists(${LOCAL_PATCHES})
cd ${CHROOTDIR}/usr/src && patch --silent < ${LOCAL_PATCHES}
***************
*** 147,153 ****
.if !defined(RELEASETAG)
cd ${CHROOTDIR}/usr/src && cvs -q update -P -d
.else
! cd ${CHROOTDIR}/usr/src && cvs -q update -P -d -r ${RELEASETAG}
.endif
.if !defined(NOPORTS)
cd ${CHROOTDIR}/usr/ports && cvs -q update -P -d
--- 151,157 ----
.if !defined(RELEASETAG)
cd ${CHROOTDIR}/usr/src && cvs -q update -P -d
.else
! echo 'no can do a re-release with a RELEASETAG' && exit 1
.endif
.if !defined(NOPORTS)
cd ${CHROOTDIR}/usr/ports && cvs -q update -P -d
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199804151503.LAA28218>