#561 Fix branch detection with private branches
Closed: Fixed None Opened 15 years ago by markmc.

If you do e.g.:

cvs co kernel
cd kernel/F-9
cvs tag -b private-markmc-foo-branch
cd ../
cvs co -r private-markmc-foo-branch -d F-9-foo rpms/kernel/F-9
cd F-9-foo
make verrel

You get a bunch of crap spewed about %dist not being defined.

Since we have a "branch" file, I'm not sure why we use pwd to figure out what
branch we're on.

Something like this seems more sane:

{{{
-BRANCH:=$(shell pwd | awk -F '/' '{ print $$NF }' )
+BRANCH:=$(shell [ -f branch ] && cat branch || { pwd | awk -F '/' '{ print $$NF }' ; })
}}}


It was changed this way to allow for building SRPMS after branching them (w/o changes, IIRC.) Your change may help - cc'ing Dennis.

We use pwd because devel doesn't have a branch file. we could look at adding a branch file to devel as mass branch time. so that it would always work as we want.

That would work, but what's wrong with the patch as an immediate solution? Seems like a no-brainer to me

Closing, sorry about the delay. Please reopen if this doesn't work right in git.

Login to comment on this ticket.

Metadata