Subject: Re: NetBSD 2.1 release for Mac68k softfloat
To: William Duke <wduke@cogeco.ca>
From: Bruce O'Neel <edoneel@sdf.lonestar.org>
List: port-mac68k
Date: 10/29/2005 14:39:39
Hi,
Just to be complete, here is the differences between netbsd-2-1-RELEASE
and netbsd-2-1-RC6. The build that I did of 2.1 for Mac68ks was from
netbsd-2-1-RELEASE
It looks minor...
cheers
bruce
Index: src/distrib/sets/makesrctars
diff -c src/distrib/sets/makesrctars:1.15.2.3.2.1 src/distrib/sets/makesrctars:1.15.2.3
*** src/distrib/sets/makesrctars:1.15.2.3.2.1 Fri Oct 21 05:51:17 2005
--- src/distrib/sets/makesrctars Tue May 11 13:11:18 2004
***************
*** 1,6 ****
#! /bin/sh
#
! # $NetBSD: makesrctars,v 1.15.2.3.2.1 2005/10/21 05:51:17 riz Exp $
#
# makesrctars srcdir setdir
# Create source tarballs in setdir from the source under srcdir.
--- 1,6 ----
#! /bin/sh
#
! # $NetBSD: makesrctars,v 1.15.2.3 2004/05/11 13:11:18 tron Exp $
#
# makesrctars srcdir setdir
# Create source tarballs in setdir from the source under srcdir.
***************
*** 9,17 ****
prog=${0##*/}
# set defaults
! : ${CKSUM:=cksum}
! : ${MTREE:=/usr/sbin/mtree}
! : ${PAX:=pax}
xsrcdir=
--- 9,16 ----
prog=${0##*/}
# set defaults
! : ${CKSUM=cksum}
! : ${PAX=pax}
xsrcdir=
***************
*** 21,29 ****
usage()
{
cat 1>&2 <<USAGE
! Usage: ${prog} [-N password/group dir] [-x xsrcdir] srcdir setdir
! -N dir location which contains master.passwd and group files
! (defaults to \${srcdir}/etc)
-x xsrcdir build xsrc.tgz from xsrcdir
srcdir location of sources
setdir where to write the .tgz files to
--- 20,26 ----
usage()
{
cat 1>&2 <<USAGE
! Usage: ${prog} [-x xsrcdir] srcdir setdir
-x xsrcdir build xsrc.tgz from xsrcdir
srcdir location of sources
setdir where to write the .tgz files to
***************
*** 32,45 ****
}
# handle args
! while getopts N:x: ch; do
case ${ch} in
! x)
xsrcdir=${OPTARG}
;;
- N)
- PASSWD=${OPTARG}
- ;;
*)
usage
;;
--- 29,39 ----
}
# handle args
! while getopts x: ch; do
case ${ch} in
! x)
xsrcdir=${OPTARG}
;;
*)
usage
;;
***************
*** 48,58 ****
shift $((${OPTIND} - 1))
if [ $# -ne 2 ]; then
! usage
fi
srcdir=$1
setdir=$2
- : ${PASSWD:=${srcdir}/etc}
if [ ! -d "${setdir}" ]; then
echo "${setdir} is not a directory"
--- 42,52 ----
shift $((${OPTIND} - 1))
if [ $# -ne 2 ]; then
! echo "Usage: $0 srcdir setdir"
! exit 1
fi
srcdir=$1
setdir=$2
if [ ! -d "${setdir}" ]; then
echo "${setdir} is not a directory"
***************
*** 60,91 ****
fi
makeset()
! {(
set=$1.tgz
shift
- dir=$1
- shift
echo "Creating ${set}"
- if [ "${dir}" != "." ]; then
- cd $dir
- srcprefix="${srcprefix}/${dir}"
- fi
- # Gets rid of any obj dirs and things below it
- echo "obj" > /tmp/in$$
- egrep=$*
- if [ "$egrep" = "" ]; then
- egrep='.'
- fi
set -f
! ${MTREE} -c -X /tmp/in$$ | ${MTREE} -C -k type | \
! egrep -v 'type=link' | egrep $egrep | \
! sed -e 's:type=file:& mode=0664:' \
! -e 's:type=dir:& mode=0775:' \
! -e 's:$: uname=root gname=wsrc:' | \
! ${PAX} -M -N ${PASSWD} -w -d -s'|^\.|'${srcprefix}'|' | \
! gzip > "${setdir}/${set}"
! rm -f /tmp/in$$
! )}
# create (base)src sets
--- 54,72 ----
fi
makeset()
! {
set=$1.tgz
shift
echo "Creating ${set}"
set -f
! find -s $* \
! ! \( \( -name obj -o -name 'obj.*' \) \( -type l -o -type d \) -prune \) \
! -print \
! | ${PAX} -w -d -s'|^\.|'${srcprefix}'|' \
! | gzip \
! > "${setdir}/${set}"
! set +f
! }
# create (base)src sets
***************
*** 97,112 ****
fi
srcprefix=usr/src
- export setdir MTREE PAX CKSUM GZIP PASSWD srcprefix
-
- makeset src . \
- -v '^\.\/gnu|^\.\/share|^\.\/sys|^\.\/contrib\.sys|^\.\/usr\.bin\/config'
-
- makeset gnusrc gnu
! makeset syssrc . -e '^\..type=dir|^\.\/sys|^\.\/contrib.type=dir|^\.\/contrib\/sys|^\.\/usr\.sbin.type=dir|^\.\/usr\.sbin\/config'
! makeset sharesrc share
# create xsrc sets
--- 78,99 ----
fi
srcprefix=usr/src
! makeset src . \
! ! \( \( -path ./gnu \
! -o -path ./share \
! -o -path ./sys \
! -o -path ./contrib/sys \
! -o -path ./usr.sbin/config \
! \) -prune \)
!
! makeset gnusrc ./gnu
!
! makeset syssrc ./sys ./contrib/sys ./usr.sbin/config \
! ! \( -path ./sys/arch/\*/compile/\* -type d \
! ! -name CVS -prune \)
! makeset sharesrc ./share
# create xsrc sets
***************
*** 128,131 ****
${CKSUM} -m *.tgz > MD5
${CKSUM} -o2 *.tgz > SYSVSUM
)
- exit 0
--- 115,117 ----
Index: src/doc/CHANGES-2.1
diff -c src/doc/CHANGES-2.1:1.1.2.202 src/doc/CHANGES-2.1:1.1.2.199
*** src/doc/CHANGES-2.1:1.1.2.202 Sun Oct 23 00:23:50 2005
--- src/doc/CHANGES-2.1 Wed Oct 12 01:02:59 2005
***************
*** 1,4 ****
! # $NetBSD: CHANGES-2.1,v 1.1.2.202 2005/10/23 00:23:50 riz Exp $
A complete list of changes from the NetBSD 2.0 release to the NetBSD 2.1
release
--- 1,4 ----
! # $NetBSD: CHANGES-2.1,v 1.1.2.199 2005/10/12 01:02:59 riz Exp $
A complete list of changes from the NetBSD 2.0 release to the NetBSD 2.1
release
***************
*** 3881,3900 ****
gnu/usr.bin/groff/tmac/mdoc.local patch
Welcome to 2.1_RC6
-
- distrib/sets/makesrctars patch
-
- Allow autobuild to create ready-to-release source tars with builds.
- [jmc, ticket #5935]
-
- sys/sys/param.h patch
- share/tmac/doc-common patch
- gnu/usr.bin/groff/tmac/mdoc.local patch
-
- Welcome to 2.1
-
- doc/LAST_MINUTE patch
-
- Note that the sgimips ISO image is not bootable.
-
- {NOTE: Moved 2.1-release tag for CHANGES-2.1, LAST_MINUTE}
--- 3881,3883 ----
Index: src/doc/LAST_MINUTE
diff -c src/doc/LAST_MINUTE:1.2.2.2.2.2 src/doc/LAST_MINUTE:1.2.2.2.2.1
*** src/doc/LAST_MINUTE:1.2.2.2.2.2 Sun Oct 23 00:23:50 2005
--- src/doc/LAST_MINUTE Mon Oct 3 22:43:34 2005
***************
*** 1,10 ****
! # $NetBSD: LAST_MINUTE,v 1.2.2.2.2.2 2005/10/23 00:23:50 riz Exp $
This file contains important information on the NetBSD 2.1 release that
did not make it into the main documentation.
- [sgimips]
-
- The ISO image for sgimips is _not_ bootable under the NetBSD 2.1
- release.
-
--- 1,5 ----
! # $NetBSD: LAST_MINUTE,v 1.2.2.2.2.1 2005/10/03 22:43:34 riz Exp $
This file contains important information on the NetBSD 2.1 release that
did not make it into the main documentation.
Index: src/gnu/usr.bin/groff/tmac/mdoc.local
diff -c src/gnu/usr.bin/groff/tmac/mdoc.local:1.13.2.5.2.11 src/gnu/usr.bin/groff/tmac/mdoc.local:1.13.2.5.2.10
*** src/gnu/usr.bin/groff/tmac/mdoc.local:1.13.2.5.2.11 Fri Oct 21 06:16:42 2005
--- src/gnu/usr.bin/groff/tmac/mdoc.local Wed Oct 12 01:02:22 2005
***************
*** 1,4 ****
! .\" $NetBSD: mdoc.local,v 1.13.2.5.2.11 2005/10/21 06:16:42 riz Exp $
.\"
.\" Copyright (c) 2003 The NetBSD Foundation, Inc.
.\" All rights reserved.
--- 1,4 ----
! .\" $NetBSD: mdoc.local,v 1.13.2.5.2.10 2005/10/12 01:02:22 riz Exp $
.\"
.\" Copyright (c) 2003 The NetBSD Foundation, Inc.
.\" All rights reserved.
***************
*** 133,139 ****
.as doc-str-St--ieee1275-94 " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq])
.
.\" Default .Os value
! .ds doc-operating-system NetBSD\~2.1
.\" Other known versions, not yet in groff distribution
.ds doc-operating-system-NetBSD-1.4.1 1.4.1
.ds doc-operating-system-NetBSD-1.4.2 1.4.2
--- 133,139 ----
.as doc-str-St--ieee1275-94 " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq])
.
.\" Default .Os value
! .ds doc-operating-system NetBSD\~2.1_RC6
.\" Other known versions, not yet in groff distribution
.ds doc-operating-system-NetBSD-1.4.1 1.4.1
.ds doc-operating-system-NetBSD-1.4.2 1.4.2
Index: src/share/tmac/doc-common
diff -c src/share/tmac/doc-common:1.61.2.7.2.10 src/share/tmac/doc-common:1.61.2.7.2.9
*** src/share/tmac/doc-common:1.61.2.7.2.10 Fri Oct 21 06:16:42 2005
--- src/share/tmac/doc-common Wed Oct 12 01:02:22 2005
***************
*** 1,4 ****
! .\" $NetBSD: doc-common,v 1.61.2.7.2.10 2005/10/21 06:16:42 riz Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
--- 1,4 ----
! .\" $NetBSD: doc-common,v 1.61.2.7.2.9 2005/10/12 01:02:22 riz Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
***************
*** 245,251 ****
.de Os
.ds oS Null
.if "\\$1"" \{\
! . ds oS NetBSD 2.1
.\}
.if "\\$2"" \{\
. ds aa Non-Null
--- 245,251 ----
.de Os
.ds oS Null
.if "\\$1"" \{\
! . ds oS NetBSD 2.1_RC6
.\}
.if "\\$2"" \{\
. ds aa Non-Null
Index: src/sys/sys/param.h
diff -c src/sys/sys/param.h:1.188.2.9.2.11 src/sys/sys/param.h:1.188.2.9.2.10
*** src/sys/sys/param.h:1.188.2.9.2.11 Fri Oct 21 06:16:42 2005
--- src/sys/sys/param.h Wed Oct 12 01:02:23 2005
***************
*** 1,4 ****
! /* $NetBSD: param.h,v 1.188.2.9.2.11 2005/10/21 06:16:42 riz Exp $ */
/*-
* Copyright (c) 1982, 1986, 1989, 1993
--- 1,4 ----
! /* $NetBSD: param.h,v 1.188.2.9.2.10 2005/10/12 01:02:23 riz Exp $ */
/*-
* Copyright (c) 1982, 1986, 1989, 1993
***************
*** 63,69 ****
* 2.99.9 (299000900)
*/
! #define __NetBSD_Version__ 201000000 /* NetBSD 2.1 */
#define __NetBSD_Prereq__(M,m,p) (((((M) * 100000000) + \
(m) * 1000000) + (p) * 100) >= __NetBSD_Version__)
--- 63,69 ----
* 2.99.9 (299000900)
*/
! #define __NetBSD_Version__ 201000000 /* NetBSD 2.1_RC6 */
#define __NetBSD_Prereq__(M,m,p) (((((M) * 100000000) + \
(m) * 1000000) + (p) * 100) >= __NetBSD_Version__)
On Sat, Oct 29, 2005 at 08:20:04AM +0000, Bruce O'Neel wrote:
> Hi,
>
> My incomplete understanding of the idea is that one has different RCn
> releases until everyone is happy, and then except for CVS tags,
> displayed version numbers and such, it becomes the release.
>
> My feeling would be that unless you have some overriding desire to
> run 2.1 vs 2.1RC6, I'd just stick with 2.1RC6. One could run
> a cvs diff command as well if you wanted to check for sure.
>
> cheers
>
> bruce
>
> On Fri, Oct 28, 2005 at 08:17:51PM -0400, William Duke wrote:
> > Bruce,
> >
> > I just finished doing a complete install of 2.1_RC6 the other day. I'm
> > wondering if there are any changes between 2.1_RC6 and 2.1 that would
> > warrant installation of the 2.1 builds?
> >
> > Basically, is there any difference between 2.1_RC6 and 2.1 other than the
> > dropping of the "_RC6" suffix from the name? I'm not going to bother
> > re-installing if 2.1_RC6 and 2.1 are the same animal with a just slightly
> > changed name.
> >
> > Thanks,
> >
> >
> > > From: "Bruce O'Neel" <edoneel@sdf.lonestar.org>
> > > Date: Fri, 28 Oct 2005 19:32:58 +0000
> > > To: port-mac68k@NetBSD.org
> > > Subject: Re: NetBSD 2.1 release for Mac68k softfloat
> > >
> > > Yep, it works. I'll have to wait until monday to try it on the system which
> > > failed today.
> > >
> > > cheers
> > >
> > > bruce
> > >
> > > On Fri, Oct 28, 2005 at 06:49:25PM +0000, Bruce O'Neel wrote:
> > >> Hi,
> > >>
> > >> On a different system, and booting the install kernel off of
> > >> an appletalk server, it seems to be working.
> > >>
> > >> We'll know in an hour or so.
> > >>
> > >>
> > >> cheers
> > >>
> > >> bruce
> > >>
> > >> On Fri, Oct 28, 2005 at 11:23:39AM +0000, Bruce O'Neel wrote:
> > >>> Hmm,
> > >>>
> > >>> A quick test has the install kernel crashing on boot. I'll have to
> > >>> play more this weekend since work calls.
> > >>>
> > >>> cheers
> > >>>
> > >>> bruce
> > >>>
> > >>>
> > >>> On Fri, Oct 28, 2005 at 10:01:30AM +0000, Bruce O'Neel wrote:
> > >>>> Hi,
> > >>>>
> > >>>> Well, there hasn't been an official announcment yet, beyond the CVS logs
> > >>>> of "welcome to NetBSD 2.1", but netbsd 2.1 for Mac68k softfloat is at:
> > >>>>
> > >>>> ftp://ftp.ziaspace.com/pub/NetBSD/m68k/NetBSD-2.1-mac68ksoftfloat/
> > >>>>
> > >>>> I build this from a cvs checkout of the tag netbsd-2-1-release or so,
> > >>>> Normally I would have built from the source that lives somewhere like
> > >>>> ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-2.1/ but I already had CVS
> > >>>> version sitting around this time.
> > >>>>
> > >>>> I've not tested this yet, but, I'll try today.
> > >>>>
> > >>>> BTW, this is the last version where a patch is necessary.
> > >>>>
> > >>>> cheers
> > >>>>
> > >>>> bruce
> > >>>>
> > >>>>
> > >>>> --
> > >>>> edoneel@sdf.lonestar.org
> > >>>> SDF Public Access UNIX System - http://sdf.lonestar.org
> > >>>
> > >>> --
> > >>> edoneel@sdf.lonestar.org
> > >>> SDF Public Access UNIX System - http://sdf.lonestar.org
> > >>
> > >> --
> > >> edoneel@sdf.lonestar.org
> > >> SDF Public Access UNIX System - http://sdf.lonestar.org
> > >
> > > --
> > > edoneel@sdf.lonestar.org
> > > SDF Public Access UNIX System - http://sdf.lonestar.org
> >
>
> --
> edoneel@sdf.lonestar.org
> SDF Public Access UNIX System - http://sdf.lonestar.org
--
edoneel@sdf.lonestar.org
SDF Public Access UNIX System - http://sdf.lonestar.org