The way we currently check for branches is broken at release time. everything that was tagged in devel that was branched for F-9 when you try and build in koji gets a disttag of .fc10 and fails to build due to a mismatch. this has been a minor issue in the past. but it is a big issue for secondary arch rampup.
Makefile.common checked for the existence of a branch file which devel does not have. it is added at branch time. long term we probably need to add some logic so that we always have a branch file and check it and fall back to this method if its not there. it will help with always being able to reproduce a srpm. Since this is somewhat invasive i wanted to run it by people first. it worked ok in my testing. Dennis
? Makefile.common.branch Index: Makefile.common =================================================================== RCS file: /cvs/pkgs/common/Makefile.common,v retrieving revision 1.94 diff -u -r1.94 Makefile.common --- Makefile.common 22 Apr 2008 15:44:53 -0000 1.94 +++ Makefile.common 24 Apr 2008 02:30:13 -0000 @@ -19,7 +19,7 @@ ifndef HEAD_BRANCH HEAD_BRANCH := devel endif -BRANCH:=$(shell [ -f branch ] && cat branch || echo $(HEAD_BRANCH)) +BRANCH:=$(lastword $(shell pwd| cut -d/ --output-delimiter=" " -f2-)) # check to see if this is an early branched package; we should make this more # generic in the future ifeq ($(BRANCH),devel)
signature.asc
Description: This is a digitally signed message part.
-- Fedora-buildsys-list mailing list [email protected] https://www.redhat.com/mailman/listinfo/fedora-buildsys-list
