Permalink
Browse files

Use the version of FreeBSD marked in source for creating ISO filename,

so that we get the -pX number
  • Loading branch information...
1 parent 9cff2d8 commit c474acc3a87b8d5edee62317546c4fe98d1b1410 @kmoore134 kmoore134 committed Nov 21, 2013
Showing with 12 additions and 1 deletion.
  1. +1 −1 scripts/9.3.makedvd.sh
  2. +11 −0 scripts/functions.sh
@@ -37,7 +37,7 @@ mount_nullfs ${METAPKGDIR} ${ISODISTDIR}/packages
fDate="-`date '+%m-%d-%Y'`"
# Base file name
-bFile="PCBSD${PCBSDVER}${fDate}-${FARCH}"
+bFile="PCBSD${ISOVER}${fDate}-${FARCH}"
export bFile
# Set the pcbsd-media-details file marker on this media
View
@@ -39,6 +39,17 @@ PDESTDIRSERVER="${PROGDIR}/buildworld-server" ; export PDESTDIRSERVER
# Set the PC-BSD Version
export PCBSDVER="${TARGETREL}"
+# Set the ISO Version
+REVISION="`cat ${WORLDSRC}/sys/conf/newvers.sh 2>/dev/null | grep '^REVISION=' | cut -d '"' -f 2`"
+if [ -z "$REVISION" ] ; then
+ REVISION="UNKNOWN"
+fi
+BRANCH="`cat ${WORLDSRC}/sys/conf/newvers.sh 2>/dev/null | grep '^BRANCH=' | cut -d '"' -f 2`"
+if [ -z "$BRANCH" ] ; then
+ BRANCH="UNKNOWN"
+fi
+export ISOVER="${REVISION}-${BRANCH}"
+
# Where are the config files
PCONFDIR="${GITBRANCH}/build-files/conf" ; export PCONFDIR

0 comments on commit c474acc

Please sign in to comment.