Changeset 6adfe6f


Ignore:
Timestamp:
Jul 22, 2013 2:16:52 PM (9 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1
Children:
91d60cd
Parents:
6c2cb18
Message:

Fix a bug, if we already have -pX set in our newvers.sh, lets remove that
so we don't endup with -pX-pX in the version string

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build-files/freebsd-update/scripts/build.subr

    r635dc54 r6adfe6f  
    415415# at release time. 
    416416patchnewvers () { 
    417         sed -i "" -E "s,^(BRANCH=.*)\",\1$2\","                 \ 
     417        # KPM 7-22-2013 - If we already have -p2 or something set, lets overwrite it 
     418        oVer="`grep ^BRANCH= ${WORKDIR}/${1}/usr/src/sys/conf/newvers.sh | cut -d '"' -f 2 | cut -d '-' -f 1`" 
     419        sed -i "" -E "s,^(BRANCH=.*)\",BRANCH=\"${oVer}${2}\","                 \ 
    418420            ${WORKDIR}/$1/usr/src/sys/conf/newvers.sh 
    419421        sed -i "" -E 's,^(RELEASE=).*,\1"${REVISION}-${BRANCH}",'       \ 
Note: See TracChangeset for help on using the changeset viewer.