Hi Dave,

It worked! Really appreciate the help :)

I learned a lot about git, never new about the bare feature.

On Fri, Aug 16, 2019 at 5:11 AM Dave Barach (dbarach) <dbar...@cisco.com> wrote:
>
> That setup will cause no end of pain if your git chops aren't up to it. I 
> guess you've already discovered that. If you do things in a more normal way, 
> you won't have to add tags or argue with the build system.
>
> A more straightforward way to work - which I use myself - goes like so:
>
> Create a local bare clone [mirror] of the gerrit.fd.io upstream.
>
> Clone the local mirror into a working tree.
>
> In the working tree, check out the base branch you want to work on - 19.08, 
> master, or one of the other release branches - and create a private branch:
>
> $ git checkout -b mystuff origin/stable/1908 # note that the local bare clone 
> / mirror IS "origin" in this setup
>
> Add code, work, commit locally.
>
> Push your private branch into the local bare clone / mirror:
>
> $ git push origin mystuff
>
> Picking up changes from gerrit.fd.io is simple:
>
> In the local bare clone/mirror, "git fetch" # pulls all new commits on all 
> branches from gerrit.fd.io
>
> In the working tree: "git checkout <upstream-branch>; git pull"
>
> To integrate upstream changes into your branch: "git checkout mybranch; git 
> rebase master" or "git checkout mybranch; git merge master". Test, and then 
> "git push origin mybranch".
>
> Make sure to back up the local bare clone / mirror, since that's the single 
> source of "mybranch" truth.
>
> If you want to s/local bare mirror/github/ you can do that, but you'll have 
> to navigate roughly twice the number of tools to get the same result.
>
> FWIW... Dave
>
> -----Original Message-----
> From: vpp-dev@lists.fd.io <vpp-dev@lists.fd.io> On Behalf Of carlito nueno
> Sent: Friday, August 16, 2019 12:58 AM
> To: Carlito Nueno <carlitonu...@gmail.com>
> Cc: vpp-dev@lists.fd.io
> Subject: Re: [vpp-dev] Build errors
>
> Hi all,
>
> I think I found the problem.
>
> fatal: ambiguous argument 'v1.19-rc0..': unknown revision or path not in the 
> working tree.
>
> Here are steps I did:
> - I forked `stable/1908` branch and added some code to it.
> - Now my branch is `test-stable/1908`
> - I tagged my branch with `v1.19.08`.
> - I pushed the VPP master and my branch to github.
> - On my build server, I cloned my repo `github.com/carnu/vpp.git`
> - I checked out `v1.19.08`
>
> I am not well versed with git. Please let me know how I can compile after 
> adding custom code.
>
> Really appreciate it!
>
> On Thu, Aug 15, 2019 at 5:44 PM carlito nueno via Lists.Fd.Io 
> <carlitonueno=gmail....@lists.fd.io> wrote:
> >
> > I am getting the same error with: build-root/vagrant/build.sh
> >
> > On Thu, Aug 15, 2019 at 5:21 PM carlito nueno via Lists.Fd.Io
> > <carlitonueno=gmail....@lists.fd.io> wrote:
> > >
> > > Hi all,
> > >
> > > I am following this guide to build VPP:
> > > https://wiki.fd.io/view/VPP/Pulling,_Building,_Running,_Hacking_and_
> > > Pushing_VPP_Code
> > >
> > > I added a patch to stable/1908 branch using ubuntu 18.04LTS running
> > > as ROOT user
> > >
> > > I followed these steps:
> > > apt-get update
> > > apt-get install build-essential
> > > make install-dep
> > > make install-ext-deps
> > > make build
> > >
> > > When I do make install-ext-deps, I get these errors:
> > >
> > > dpkg-buildpackage: warning:     debian/changelog(l1): version '-0' is
> > > invalid: upstream version cannot be empty
> > > LINE: vpp-ext-deps (-0) unstable; urgency=low
> > > dpkg-buildpackage: info: source package vpp-ext-deps
> > > dpkg-buildpackage: info: source version unknown
> > > dpkg-buildpackage: error: version number does not start with digit
> > > Makefile:72: recipe for target 'vpp-ext-deps_-0_amd64.deb' failed
> > > make[2]: *** [vpp-ext-deps_-0_amd64.deb] Error 255
> > > make[2]: Leaving directory '/root/vpp/build/external'
> > > Makefile:79: recipe for target 'install-deb' failed
> > > make[1]: *** [install-deb] Error 2
> > > make[1]: Leaving directory '/root/vpp/build/external'
> > > Makefile:540: recipe for target 'install-ext-deps' failed
> > > make: *** [install-ext-deps] Error 2
> > >
> > > when I do make build, I get these errors
> > >
> > > -- Configuration:
> > > VPP version         :
> > > VPP library version : NOTFOUND
> > > GIT toplevel dir    : /root/vpp
> > > Build type          :
> > > C flags             : -Wno-address-of-packed-member -march=corei7
> > > -mtune=corei7-avx -O0 -DCLIB_DEBUG -g -DFORTIFY_SOURCE=2
> > > -fstack-protector -fPIC -Wall -Werror -fno-common
> > > Linker flags        : -O0 -DCLIB_DEBUG -g -DFORTIFY_SOURCE=2
> > > -fstack-protector -fPIC -Wall -Werror -fno-common
> > > Host processor      : x86_64
> > > Target processor    : x86_64
> > > Prefix path         :
> > > /opt/vpp/external/x86_64;/root/vpp/build-root/install-vpp_debug-native/external
> > > Install prefix      : /root/vpp/build-root/install-vpp_debug-native/vpp
> > > -- Configuring incomplete, errors occurred!
> > > See also 
> > > "/root/vpp/build-root/build-vpp_debug-native/vpp/CMakeFiles/CMakeOutput.log".
> > > See also 
> > > "/root/vpp/build-root/build-vpp_debug-native/vpp/CMakeFiles/CMakeError.log".
> > > Makefile:644: recipe for target 'vpp-configure' failed
> > > make[1]: *** [vpp-configure] Error 1
> > > make[1]: Leaving directory '/root/vpp/build-root'
> > > Makefile:367: recipe for target 'build' failed
> > > make: *** [build] Error 2
> > >
> > > CMakeFiles/CMakeOutput.log: https://termbin.com/fhaz
> > > CMakeFiles/CMakeError.log: https://termbin.com/pkh7d
> > >
> > > Thanks
> > > -=-=-=-=-=-=-=-=-=-=-=-
> > > Links: You receive all messages sent to this group.
> > >
> > > View/Reply Online (#13757):
> > > https://lists.fd.io/g/vpp-dev/message/13757
> > > Mute This Topic: https://lists.fd.io/mt/32893039/675621
> > > Group Owner: vpp-dev+ow...@lists.fd.io
> > > Unsubscribe: https://lists.fd.io/g/vpp-dev/unsub
> > > [carlitonu...@gmail.com]
> > > -=-=-=-=-=-=-=-=-=-=-=-
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> >
> > View/Reply Online (#13758):
> > https://lists.fd.io/g/vpp-dev/message/13758
> > Mute This Topic: https://lists.fd.io/mt/32893039/675621
> > Group Owner: vpp-dev+ow...@lists.fd.io
> > Unsubscribe: https://lists.fd.io/g/vpp-dev/unsub
> > [carlitonu...@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#13770): https://lists.fd.io/g/vpp-dev/message/13770
Mute This Topic: https://lists.fd.io/mt/32893039/21656
Group Owner: vpp-dev+ow...@lists.fd.io
Unsubscribe: https://lists.fd.io/g/vpp-dev/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to