Bug #1495

nrelease: replace cvsup with pkgsrc/net/csup (Re: make nrelease: get rid of cvsup; we no longer depend on it)

Added by qhwt+dfly about 5 years ago. Updated over 4 years ago.

Status:ClosedStart date:
Priority:NormalDue date:
Assignee:-% Done:

0%

Category:-
Target version:-

Description

make nrelease: get rid of cvsup; we no longer depend on it

---
nrelease/Makefile | 14 --------------
1 files changed, 0 insertions(+), 14 deletions(-)

diff --git a/nrelease/Makefile b/nrelease/Makefile
index 62379a2..b56f836 100644
--- a/nrelease/Makefile
+++ b/nrelease/Makefile
@@ -34,7 +34,6 @@ PKGBIN_PKG_ADMIN?= ${PKGSRC_PREFIX}/sbin/pkg_admin
PKGBIN_MKISOFS?= ${PKGSRC_PREFIX}/bin/mkisofs
PKGSRC_PKG_PATH?= ${ISODIR}/packages
PKGSRC_BOOTSTRAP_URL?= http://avalon.dragonflybsd.org/DragonFly-pkgsrc-packages/i386/1.12.0-RELEASE-BUILD
-CVSUP_BOOTSTRAP_KIT?= cvsup-bootstrap-20070716

# We use env -i in the chroot, so that environment variables won't
# disturb any (pkgsrc) build. This has happened for TARGET_ARCH,
@@ -179,10 +178,6 @@ check:
@echo "You never bootstrapped pkgsrc on your machine. You can install it with:"
@echo " make pkgsrc_bootstrap"
.endif
-.if !exists(${PKGSRC_PKG_PATH}/${CVSUP_BOOTSTRAP_KIT}.tgz)
- @echo "The cvsup bootstrap kit is not installed. You can install it with:"
- @echo " make fetch"
-.endif
.if !exists (${PKGBIN_MKISOFS})
@echo
@echo "Your machine does not have cdrtools installed. You can install it with:"
@@ -193,9 +188,6 @@ check:
@echo "package building. For example /usr/pkgsrc. See the Makefile"
@echo "in /usr if you are unfamiliar with pkgsrc."
.endif
-.if !exists(${PKGSRC_PKG_PATH}/${CVSUP_BOOTSTRAP_KIT}.tgz)
- @exit 1
-.endif
.if !exists (${PKGBIN_MKISOFS})
@exit 1
.endif
@@ -302,9 +294,6 @@ customizeiso:
@test -O ${.CURDIR} || echo "chowning copied files to root:wheel"
@test -O ${.CURDIR} || ((cd ${ROOTSKEL} && find .) | fgrep -v cpignore | (cd ${ISOROOT} && xargs chown root:wheel))
.endfor
- (cd ${PKGSRC_PKG_PATH}; tar xzpf ${CVSUP_BOOTSTRAP_KIT}.tgz)
- cp -p ${PKGSRC_PKG_PATH}/${CVSUP_BOOTSTRAP_KIT}/usr/local/bin/cvsup ${ISOROOT}/usr/local/bin/cvsup
- cp -p ${PKGSRC_PKG_PATH}/${CVSUP_BOOTSTRAP_KIT}/usr/local/man/man1/cvsup.1 ${ISOROOT}/usr/local/man/man1/cvsup.1
pwd_mkdb -p -d ${ISOROOT}/etc ${ISOROOT}/etc/master.passwd
.for UPGRADE_ITEM in Makefile \
etc.${MACHINE_ARCH} \
@@ -472,9 +461,6 @@ realclean: clean

fetch:
@if [ ! -d ${PKGSRC_PKG_PATH} ]; then mkdir -p ${PKGSRC_PKG_PATH}; fi
-.if !exists(${PKGSRC_PKG_PATH}/${CVSUP_BOOTSTRAP_KIT}.tgz)
- (cd ${PKGSRC_PKG_PATH}; fetch ${PKGSRC_BOOTSTRAP_URL}/${CVSUP_BOOTSTRAP_KIT}.tgz)
-.endif

pkgsrc_bootstrap:
.if !exists(${PKGSRC_PKG_PATH}/${PKGSRC_BOOTSTRAP_KIT}.tgz)
--
1.6.4

History

#1 Updated by swildner about 5 years ago

YONETANI Tomokazu schrieb:
> make nrelease: get rid of cvsup; we no longer depend on it

So far cvsup hasn't been removed since we supply supfiles for other
BSD's and (IMO) it's still the easiest and fastest solution to obtain
all other BSD's repositories without having to install svn or use rather
slow anoncvs. Just works and doesn't harm anyone.

My personal opinion is that we should continue supporting this and
continue supplying the cvsup binary on the LiveCD since it can't be
compiled from source afaik (due to Modula-3 issues). Matt agreed to this
last time I spoke to him about it in IRC. I know others are not of this
opinion, though (although without providing any good reasons except
"cvsup sucks!" or similar :).

However, if the consensus is that we do not want to keep the cvsup
binary, please also remove the supfiles in /usr/share/examples/cvsup as
well, since they are no longer usable without the binary.

Regards,
Sascha

#2 Updated by polachok about 5 years ago

* Sascha Wildner <> [090909 11:57]:
> YONETANI Tomokazu schrieb:
>> make nrelease: get rid of cvsup; we no longer depend on it
>
> So far cvsup hasn't been removed since we supply supfiles for other
> BSD's and (IMO) it's still the easiest and fastest solution to obtain
> all other BSD's repositories without having to install svn or use rather
> slow anoncvs. Just works and doesn't harm anyone.

You can use net/csup instead. It's in C with no extra crap.

#3 Updated by swildner about 5 years ago

Alexander Polakov schrieb:
> You can use net/csup instead. It's in C with no extra crap.

Does it allow me fetching of the whole repo or checking out the tree only?

Sascha

#4 Updated by c.turner about 5 years ago

just checkouts

#5 Updated by c.turner about 5 years ago

whoops.. just RTFM'ed .. I think the FBSD handbook is out of date w/r/t
csup.1 .. and supposedly it does both.. haven't actually tried repo
mirroring though.. see CVS MODE in the manual page.. didn't know about this

#6 Updated by qhwt+dfly about 5 years ago

On Wed, Sep 09, 2009 at 09:50:10AM +0200, Sascha Wildner wrote:
> YONETANI Tomokazu schrieb:
> >make nrelease: get rid of cvsup; we no longer depend on it
>
> So far cvsup hasn't been removed since we supply supfiles for other
> BSD's and (IMO) it's still the easiest and fastest solution to
> obtain all other BSD's repositories without having to install svn or
> use rather slow anoncvs. Just works and doesn't harm anyone.
>
> My personal opinion is that we should continue supporting this and
> continue supplying the cvsup binary on the LiveCD since it can't be
> compiled from source afaik (due to Modula-3 issues). Matt agreed to
> this last time I spoke to him about it in IRC. I know others are not
> of this opinion, though (although without providing any good reasons
> except "cvsup sucks!" or similar :).

Even if we rip the cvsup package from our LiveCD, it doesn't mean
users are no longer able to download cvsup-bootstrap-YYYYMMDD.tgz from
DragonFly website, right? I can't think of a situation where you can
checkout the source trees or retrieve the CVS repositories BUT not
the cvsup binary.

#7 Updated by swildner about 5 years ago

YONETANI Tomokazu schrieb:
> Even if we rip the cvsup package from our LiveCD, it doesn't mean
> users are no longer able to download cvsup-bootstrap-YYYYMMDD.tgz from
> DragonFly website, right? I can't think of a situation where you can
> checkout the source trees or retrieve the CVS repositories BUT not
> the cvsup binary.

Yes of course they still are...

I would have never imagined that there could be so much contention about
a harmless 850k program. :)

But OK, if it really offends so much, I give up my resistance. Remove it
if you must.

Regards,
Sascha

#8 Updated by qhwt+dfly almost 5 years ago

On Wed, Sep 09, 2009 at 08:43:46PM +0200, Sascha Wildner wrote:
> YONETANI Tomokazu schrieb:
> >Even if we rip the cvsup package from our LiveCD, it doesn't mean
> >users are no longer able to download cvsup-bootstrap-YYYYMMDD.tgz from
> >DragonFly website, right? I can't think of a situation where you can
> >checkout the source trees or retrieve the CVS repositories BUT not
> >the cvsup binary.
>
> Yes of course they still are...

Actually at the time I posted the first message, we didn't have git snapshot
of pkgsrc tree, so one might have wanted cvsup or csup to retrieve/update
pkgsrc tree. For people who don't want to keep growing git repository on
their disk drive, cvsup or csup might be still handy.

> I would have never imagined that there could be so much contention
> about a harmless 850k program. :)

For that matter, pkgsrc/net/csup, which is 250K in size, is more harmless
in that it won't install files in an odd location now that we're accustomed
to use pkgsrc (I forgot removing the part populating /usr/local in the
previous patch, BTW), yet it does almost the same job as cvsup program
(last time I checked, the expansion of some less popular keywords, $Log for
one, didn't work correctly).

I can redo the patch to replace it with net/csup or to add WITHOUT_CVSUP
knob.

#9 Updated by qhwt+dfly almost 5 years ago

On Sat, Sep 26, 2009 at 10:00:03AM +0900, YONETANI Tomokazu wrote:
> in that it won't install files in an odd location now that we're accustomed
> to use pkgsrc (I forgot removing the part populating /usr/local in the

The installer is installed under /usr/local, too, so I can't do this.
Sorry about the noise.

#10 Updated by swildner almost 5 years ago

YONETANI Tomokazu schrieb:
> On Sat, Sep 26, 2009 at 10:00:03AM +0900, YONETANI Tomokazu wrote:
>> in that it won't install files in an odd location now that we're accustomed
>> to use pkgsrc (I forgot removing the part populating /usr/local in the
>
> The installer is installed under /usr/local, too, so I can't do this.
> Sorry about the noise.

I will look into moving the remaining installer stuff out of /usr/local.

Sascha

#11 Updated by swildner almost 5 years ago

YONETANI Tomokazu schrieb:
> For that matter, pkgsrc/net/csup, which is 250K in size, is more harmless
> in that it won't install files in an odd location now that we're accustomed
> to use pkgsrc (I forgot removing the part populating /usr/local in the
> previous patch, BTW), yet it does almost the same job as cvsup program
> (last time I checked, the expansion of some less popular keywords, $Log for
> one, didn't work correctly).

Last time I looked, csup (the one from pkgsrc at least) supported only
checkout mode, but not CVS mode (contrary to what someone wrote in this
thread).

Sascha

#12 Updated by qhwt+dfly almost 5 years ago

On Sat, Sep 26, 2009 at 03:10:51PM +0200, Sascha Wildner wrote:
> YONETANI Tomokazu schrieb:
> >previous patch, BTW), yet it does almost the same job as cvsup program
> >(last time I checked, the expansion of some less popular keywords, $Log for
> >one, didn't work correctly).
>
> Last time I looked, csup (the one from pkgsrc at least) supported
> only checkout mode, but not CVS mode (contrary to what someone wrote
> in this thread).

Right, maybe he and I were looking at FreeBSD manpage. CVSmode support
has been added to FreeBSD repository in r186781 and r186871 this year,
whereas NetBSD pkgsrc is still using the snapshot taken at Feburary, 2007.

#13 Updated by qhwt+dfly over 4 years ago

Hello.

This has completely slipped my mind, but here's an updated version:
http://gitweb.dragonflybsd.org/~y0netan1/dragonfly.git/commit/911bb15d8c191e1b513881d0f6aa9be54911549c

It replaces cvsup with pkgsrc/net/csup, removes unused `fetch' target,
and stop populating /usr/local. Although we have a git-snapshot of
pkgsrc tree, having CVSup client in the installer may benefit a user
who don't want the extra 80M or so bytes for its git repository.
And it runs on x86_64, too. For people who do want to download CVS
repositories, well, they can use devel/cvsync, which is available in
the pkgsrc collection.

Oh by the way, we still have the following entry in UPDATING file:

> Upgrading to DragonFly from FreeBSD

Do we still support this upgrading path in the first place? If not,
I'll simply drop this entry. If we do, we need to update it. Currently
it explains how to download the CVS repository of DragonFly source tree
and checkout from it locally, but as far as I know we've never published
a CVS-mirror of our git repository, so mayb s/he finds a mirror of very
old CVS repository and surprise.

#14 Updated by qhwt+dfly over 4 years ago

committed as 796fd273a0e69a9b22f38f93af47e1027c0f9fdd

Also available in: Atom PDF