Re: documentation on release build process change (svn -> git)?

[Glen Barber]

On Sat, Aug 29, 2020 at 05:21:16PM -0400, Michael Butler wrote:
> On 8/29/20 5:17 PM, Glen Barber wrote:
> > On Sat, Aug 29, 2020 at 04:38:05PM -0400, Michael Butler wrote:
> >> The build-from-existing mode fails with ..
> >>
> >> imb@vm01:/usr/src/release> sudo ./release.sh -c release-i386.conf
> >> fatal: not a git repository (or any parent up to mount point /usr)
> >> Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
> >> umount: /usr/local/release-builds/i386/dev: not a file system root 
> >> directory
> >>
> > 
> > Here's the fun part - Which revision was this?
> 
> The host system is check-out from SVN r364964,
> 

Can you please try the attached patch against your release.sh?

Glen


Index: release/release.sh
===================================================================
--- release/release.sh  (revision 364960)
+++ release/release.sh  (working copy)
@@ -223,6 +223,8 @@ chroot_setup() {
        if [ -z "${SRC_UPDATE_SKIP}" ]; then
                if [ -d "${CHROOTDIR}/usr/src/.git" ]; then
                        ${VCSUPDATE} -C ${CHROOTDIR}/usr/src
+               elif [ -d "${CHROOTDIR}/usr/src/.svn" ]; then
+                       svn up ${CHROOTDIR}/usr/src
                else
                        ${VCSCMD} ${SRC} -b ${SRCBRANCH} ${CHROOTDIR}/usr/src
                fi
@@ -230,6 +232,8 @@ chroot_setup() {
        if [ -z "${NODOC}" ] && [ -z "${DOC_UPDATE_SKIP}" ]; then
                if [ -d "${CHROOTDIR}/usr/doc/.git" ]; then
                        ${VCSUPDATE} -C ${CHROOTDIR}/usr/doc
+               elif [ -d "${CHROOTDIR}/usr/doc/.svn" ]; then
+                       svn up ${CHROOTDIR}/usr/doc
                else
                        ${VCSCMD} ${DOC} -b ${DOCBRANCH} ${CHROOTDIR}/usr/doc
                fi
@@ -237,6 +241,8 @@ chroot_setup() {
        if [ -z "${NOPORTS}" ] && [ -z "${PORTS_UPDATE_SKIP}" ]; then
                if [ -d "${CHROOTDIR}/usr/ports/.git" ]; then
                        ${VCSUPDATE} -C ${CHROOTDIR}/usr/ports
+               elif [ -d "${CHROOTDIR}/usr/ports/.svn" ]; then
+                       svn up ${CHROOTDIR}/usr/ports
                else
                        ${VCSCMD} ${PORT} -b ${PORTBRANCH} 
${CHROOTDIR}/usr/ports
                fi

signature.asc
Description: PGP signature