Re: documentation on release build process change (svn -> git)?
On Fri, Aug 28, 2020 at 01:32:06PM -0400, Michael Butler wrote:
> Is there any documentation around the changes to the release build
> system from SVN to GIT?
>
> I currently keep a mirrored SVN repo and the revised release scripts
> seem not to have that as a build option. Can I still use this or do I
> need to throw it all out and start over?
>
> With one target machine being a 700MHz Pentium-3, building locally is
> not a practical option,
>
You should be able to override VCSCMD, GIT{ROOT,SRC,PORTS,DOC}, and
{SRC,DOC,PORTS}BRANCH in a local release.conf (see release.conf.sample).
Glen
signature.asc
Description: PGP signature
Re: documentation on release build process change (svn -> git)?
On Fri, Aug 28, 2020 at 05:43:07PM +, Glen Barber wrote:
> On Fri, Aug 28, 2020 at 01:32:06PM -0400, Michael Butler wrote:
> > Is there any documentation around the changes to the release build
> > system from SVN to GIT?
> >
> > I currently keep a mirrored SVN repo and the revised release scripts
> > seem not to have that as a build option. Can I still use this or do I
> > need to throw it all out and start over?
> >
> > With one target machine being a 700MHz Pentium-3, building locally is
> > not a practical option,
> >
>
> You should be able to override VCSCMD, GIT{ROOT,SRC,PORTS,DOC}, and
> {SRC,DOC,PORTS}BRANCH in a local release.conf (see release.conf.sample).
>
Note, not entirely tested, however, since future snapshots and 13.0 will
be exclusively built from the git sources.
Glen
signature.asc
Description: PGP signature
Re: documentation on release build process change (svn -> git)?
On Sat, Aug 29, 2020 at 10:30:24AM -0400, Michael Butler wrote: > On 8/28/20 1:44 PM, Glen Barber wrote: > > > Note, not entirely tested, however, since future snapshots and 13.0 will > > be exclusively built from the git sources. > > When building with .. > > ## Set miscellaneous 'make release' settings. > NODOC=yes > NOPORTS=yes > WITH_DVD=yes > > The build fails after building the target kernel but before building > either the tar-balls or ISOs with .. > > >>> Kernel(s) GENERIC-NODEBUG built in 765 seconds, ncpu: 8, make -j4 > -- > make: "/usr/src/release/Makefile.inc1" line 14: "Git binary not found. > Set GIT_CMD appropriately." > > It seems to want GIT in the chroot environment, because it's there on > the host, > NOPORTS=yes is the problem, and I forgot to address it before merging the project branch back. Please try with r364956. Thank you for reporting this. Glen signature.asc Description: PGP signature
Re: documentation on release build process change (svn -> git)?
On Sat, Aug 29, 2020 at 11:34:15AM -0400, Michael Butler wrote: > On 8/29/20 11:14 AM, Glen Barber wrote: > > NOPORTS=yes is the problem, and I forgot to address it before merging > > the project branch back. Please try with r364956. > > Trying now but, in the interim, I noted .. > > With SVN, I could re-use a previously existing build directory and it > would simply apply the relevant diffs to bring the tree up to date. > > In the move to GIT, now it seems I have to pull the whole tree down or > it complains .. > > imb@vm01:/usr/src/release> sudo ./release.sh -c release-i386.conf > fatal: destination path '/usr/local/release-builds/i386/usr/src' already > exists and is not an empty directory. > > I'm not that familiar with GIT but .. Is there an incremental update > option I can use? If so, should this be the default? As is, it seems > like a colossal waste of bandwidth and unwanted load on the parent GIT repo, > I added a way to update an existing tree in r364959. I have only done very trivial testing on this change, however, so please let me know if it does not work as expected. Glen signature.asc Description: PGP signature
Re: documentation on release build process change (svn -> git)?
On Sat, Aug 29, 2020 at 03:51:23PM +, Glen Barber wrote: > On Sat, Aug 29, 2020 at 11:34:15AM -0400, Michael Butler wrote: > > On 8/29/20 11:14 AM, Glen Barber wrote: > > > NOPORTS=yes is the problem, and I forgot to address it before merging > > > the project branch back. Please try with r364956. > > > > Trying now but, in the interim, I noted .. > > > > With SVN, I could re-use a previously existing build directory and it > > would simply apply the relevant diffs to bring the tree up to date. > > > > In the move to GIT, now it seems I have to pull the whole tree down or > > it complains .. > > > > imb@vm01:/usr/src/release> sudo ./release.sh -c release-i386.conf > > fatal: destination path '/usr/local/release-builds/i386/usr/src' already > > exists and is not an empty directory. > > > > I'm not that familiar with GIT but .. Is there an incremental update > > option I can use? If so, should this be the default? As is, it seems > > like a colossal waste of bandwidth and unwanted load on the parent GIT repo, > > > > I added a way to update an existing tree in r364959. I have only done > very trivial testing on this change, however, so please let me know if > it does not work as expected. > r364960 further refines how this works; that would be a better revision to use to test. Glen signature.asc Description: PGP signature
Re: documentation on release build process change (svn -> git)?
On 8/28/20 1:44 PM, Glen Barber wrote: > Note, not entirely tested, however, since future snapshots and 13.0 will > be exclusively built from the git sources. When building with .. ## Set miscellaneous 'make release' settings. NODOC=yes NOPORTS=yes WITH_DVD=yes The build fails after building the target kernel but before building either the tar-balls or ISOs with .. >>> Kernel(s) GENERIC-NODEBUG built in 765 seconds, ncpu: 8, make -j4 -- make: "/usr/src/release/Makefile.inc1" line 14: "Git binary not found. Set GIT_CMD appropriately." It seems to want GIT in the chroot environment, because it's there on the host, imb ___ freebsd-current@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
Re: documentation on release build process change (svn -> git)?
On 8/29/20 11:14 AM, Glen Barber wrote: > NOPORTS=yes is the problem, and I forgot to address it before merging > the project branch back. Please try with r364956. Trying now but, in the interim, I noted .. With SVN, I could re-use a previously existing build directory and it would simply apply the relevant diffs to bring the tree up to date. In the move to GIT, now it seems I have to pull the whole tree down or it complains .. imb@vm01:/usr/src/release> sudo ./release.sh -c release-i386.conf fatal: destination path '/usr/local/release-builds/i386/usr/src' already exists and is not an empty directory. I'm not that familiar with GIT but .. Is there an incremental update option I can use? If so, should this be the default? As is, it seems like a colossal waste of bandwidth and unwanted load on the parent GIT repo, imb ___ freebsd-current@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
Re: documentation on release build process change (svn -> git)?
On Sat, Aug 29, 2020 at 04:38:05PM -0400, Michael Butler wrote: > On 8/29/20 12:04 PM, Glen Barber wrote: > > On Sat, Aug 29, 2020 at 03:51:23PM +, Glen Barber wrote: > >> I added a way to update an existing tree in r364959. I have only done > >> very trivial testing on this change, however, so please let me know if > >> it does not work as expected. > >> > > r364960 further refines how this works; that would be a better revision > > to use to test. > > The build-from-scratch mode now works to produce tar-balls and ISOs :-) > However, I noticed that after building a clean amd64 tool-chain, it does > fetch the amd64 GIT packages and dependencies (~76MB in all) before > building 'all' for the target. No big deal but I usually prefer to build > everything locally. > > 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? > Many thanks for your efforts! > Many thanks for your bug reports! Glen signature.asc Description: PGP signature
Re: documentation on release build process change (svn -> git)?
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
Re: documentation on release build process change (svn -> git)?
On Sat, Aug 29, 2020 at 09:30:02PM +, Glen Barber wrote: > 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? > Nevermind, I see the problem. Standby. Glen signature.asc Description: PGP signature
Re: documentation on release build process change (svn -> git)?
On Sat, Aug 29, 2020 at 09:40:17PM +, Glen Barber wrote: > On Sat, Aug 29, 2020 at 09:30:02PM +, Glen Barber wrote: > > 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? > > > > Nevermind, I see the problem. Standby. > r364966 should fix it. Thank you again for your help here. Glen signature.asc Description: PGP signature
Re: documentation on release build process change (svn -> git)?
On Sat, Aug 29, 2020 at 09:43:25PM +, Glen Barber wrote: > On Sat, Aug 29, 2020 at 09:40:17PM +, Glen Barber wrote: > > On Sat, Aug 29, 2020 at 09:30:02PM +, Glen Barber wrote: > > > 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? > > > > > > > Nevermind, I see the problem. Standby. > > > > r364966 should fix it. Thank you again for your help here. > Sigh. r364968 should *really* fix it.. Is it Friday yet? Glen signature.asc Description: PGP signature
Re: documentation on release build process change (svn -> git)?
On Sat, Aug 29, 2020 at 05:54:31PM -0400, Michael Butler wrote: > On 8/29/20 5:48 PM, Glen Barber wrote: > > On Sat, Aug 29, 2020 at 09:43:25PM +, Glen Barber wrote: > >> On Sat, Aug 29, 2020 at 09:40:17PM +, Glen Barber wrote: > > [ .. ] > > >>> Nevermind, I see the problem. Standby. > >>> > >> > >> r364966 should fix it. Thank you again for your help here. > >> > > > > Sigh. r364968 should *really* fix it.. > > It does and without pulling ~1.2GB of GIT pack down :-) > Awesome! Thank you very much for testing! > > Is it Friday yet? > > LOL :-) > :-) Glen signature.asc Description: PGP signature
Re: documentation on release build process change (svn -> git)?
On 8/29/20 12:04 PM, Glen Barber wrote: > On Sat, Aug 29, 2020 at 03:51:23PM +, Glen Barber wrote: >> I added a way to update an existing tree in r364959. I have only done >> very trivial testing on this change, however, so please let me know if >> it does not work as expected. >> > r364960 further refines how this works; that would be a better revision > to use to test. The build-from-scratch mode now works to produce tar-balls and ISOs :-) However, I noticed that after building a clean amd64 tool-chain, it does fetch the amd64 GIT packages and dependencies (~76MB in all) before building 'all' for the target. No big deal but I usually prefer to build everything locally. 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 Many thanks for your efforts! imb ___ freebsd-current@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
Re: documentation on release build process change (svn -> git)?
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, imb ___ freebsd-current@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
Re: documentation on release build process change (svn -> git)?
On 8/29/20 5:48 PM, Glen Barber wrote: > On Sat, Aug 29, 2020 at 09:43:25PM +, Glen Barber wrote: >> On Sat, Aug 29, 2020 at 09:40:17PM +, Glen Barber wrote: [ .. ] >>> Nevermind, I see the problem. Standby. >>> >> >> r364966 should fix it. Thank you again for your help here. >> > > Sigh. r364968 should *really* fix it.. It does and without pulling ~1.2GB of GIT pack down :-) > Is it Friday yet? LOL :-) imb ___ freebsd-current@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
Re: documentation on release build process change (svn -> git)?
Dear Michael , Your messages are classified as spam because GMail is not able to verify that their origin is the above address . I have tried to send this message to Michael Butler GMail responded as approximately "The address could not be found." . Mehmet Erol Sanliturk On Sun, Aug 30, 2020 at 12:48 AM Glen Barber wrote: > On Sat, Aug 29, 2020 at 09:43:25PM +, Glen Barber wrote: > > On Sat, Aug 29, 2020 at 09:40:17PM +, Glen Barber wrote: > > > On Sat, Aug 29, 2020 at 09:30:02PM +, Glen Barber wrote: > > > > 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? > > > > > > > > > > Nevermind, I see the problem. Standby. > > > > > > > r364966 should fix it. Thank you again for your help here. > > > > Sigh. r364968 should *really* fix it.. > > Is it Friday yet? > > Glen > > ___ freebsd-current@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
