X-Git-Url: https://git.tld-linux.org/?p=packages%2Frpm-build-tools.git;a=blobdiff_plain;f=builder.sh;fp=builder.sh;h=7be3210438c98709d8827a9c7f06a1ea79ff4aeb;hp=222e6fc3e911813bdb8adfead1be32d32fc2db47;hb=6ff389efbc11a7bd37bc23ea435653111871c115;hpb=fdaaa46ed28846ba119be045d93d13e44644cd44

diff --git a/builder.sh b/builder.sh
index 222e6fc..7be3210 100755
--- a/builder.sh
+++ b/builder.sh
@@ -123,6 +123,7 @@ WGET_RETRIES=${MAX_WGET_RETRIES:-0}
 
 # rsync repository with git refs of packages
 PKGREVS_URL="http://pkgrevs.tld-linux.org"
+PKGREVS_PREFIX="auto/ti/"
 SETPKGREV="false"
 
 # TLD git/df config
@@ -337,13 +338,11 @@ usage() {
 # if the line contains short and long option, it will take only the long option
 # but if you want both being completed, put the short option to separate line
 	echo "\
-Usage: builder [--all-branches] [-D|--debug] [-V|--version] [--short-version]  [-a|--add_cvs] [-b|-ba|--build]
-[-bb|--build-binary] [-bs|--build-source] [-bc] [-bi] [-bl] [-u|--try-upgrade]
-[{-cf|--cvs-force}] [{-B|--branch} <branch>] [--depth <number>]
-[-g|--get] [-h|--help] [--ftp] [--http] [{-l|--logtofile} <logfile>] [-m|--mr-proper]
-[-q|--quiet] [--date <yyyy-mm-dd> [-r <tag>] [{-T|--tag <tag>]
-[-Tvs|--tag-version-stable] [-Ts|--tag-stable] [-Tv|--tag-version]
-[{-Tp|--tag-prefix} <prefix>] [{-tt|--test-tag}]
+Usage: builder [--all-branches] [-D|--debug] [-V|--version] [--short-version]
+[-a|--add_cvs] [-b|-ba|--build] [-bb|--build-binary] [-bs|--build-source]
+[-bc] [-bi] [-bl] [-u|--try-upgrade] [{-cf|--cvs-force}] [{-B|--branch} <branch>]
+[--depth <number>] [-g|--get] [-h|--help] [--ftp] [--http] [{-l|--logtofile} <logfile>]
+[-m|--mr-proper] [-q|--quiet] [--date <yyyy-mm-dd>] [-r <tag>]
 [-nu|--no-urls] [-v|--verbose] [--opts <rpm opts>] [--short-circuit]
 [--show-bconds] [--with/--without <feature>] [--define <macro> <value>]
 [--git-pld|--git-tld] [--pkgrev] [-lp]
@@ -444,18 +443,6 @@ Usage: builder [--all-branches] [-D|--debug] [-V|--version] [--short-version]  [
                       but icon file is absent),
 -su, --source-urls  - list urls - urls to sources and patches
                       intended for copying urls with spec with lots of macros in urls
--T <tag> , --tag <tag>
-                    - add git tag <tag> for files,
--Tvs, --tag-version-stable
-                    - add git tags STABLE and NAME-VERSION-RELEASE for files,
--Ts, --tag-stable
-                    - add git tag STABLE for files,
--Tv,
---tag-version       - add git tag NAME-VERSION-RELEASE for files,
--Tp, --tag-prefix <prefix>
-                    - add <prefix> to NAME-VERSION-RELEASE tags,
--tt, --test-tag <prefix>
-                    - fail if tag is already present,
 -ir, --integer-release-only
                     - allow only integer and snapshot releases
 -v, --verbose       - be verbose,
@@ -1476,19 +1463,13 @@ get_files() {
 	fi
 }
 
-make_tagver() {
+make_pkgrev() {
 	if [ -n "$DEBUG" ]; then
 		set -x
 		set -v
 	fi
 
-	# Check whether first character of PACKAGE_NAME is legal for tag name
-	if [ -z "${PACKAGE_NAME##[_0-9]*}" -a -z "$TAG_PREFIX" ]; then
-		TAG_PREFIX=tag_
-	fi
-
-	# NOTE: CVS tags may must not contain the characters `$,.:;@'
-	TAGVER=$(echo $TAG_PREFIX$PACKAGE_NAME-$PACKAGE_VERSION-$PACKAGE_RELEASE)
+	TAGVER=$(echo $PKGREVS_PREFIX$PACKAGE_NAME-$PACKAGE_VERSION-$PACKAGE_RELEASE)
 
 	# Remove @kernel.version_release from TAGVER because tagging sources
 	# could occur with different kernel-headers than kernel-headers used at build time.
@@ -1514,12 +1495,7 @@ get_pkgrev() {
 set_pkgrev() {
 	local _tag
 	parse_spec "$1"
-	if [ "$TAG_VERSION" = "yes" ]; then
-		_tag=`make_tagver`
-	fi
-	if [ -n "$TAG" ]; then
-		_tag="$TAG"
-	fi
+	_tag=`make_pkgrev`
 	echo "Writing git revision for tag $_tag"
 	local _tmp=$(mktemp /tmp/.builder-XXXX)
 	rm $_tmp 2>/dev/null
@@ -2382,33 +2358,6 @@ while [ $# -gt 0 ]; do
 		-su | --source-urls)
 			COMMAND="list-sources-urls"
 			shift ;;
-		-Tvs | --tag-version-stable )
-			COMMAND="tag"
-			TAG="STABLE"
-			TAG_VERSION="yes"
-			shift;;
-		-Ts | --tag-stable )
-			COMMAND="tag"
-			TAG="STABLE"
-			TAG_VERSION="no"
-			shift;;
-		-Tv | --tag-version )
-			COMMAND="tag"
-			TAG=""
-			TAG_VERSION="yes"
-			shift;;
-		-Tp | --tag-prefix )
-			TAG_PREFIX="$2"
-			shift 2;;
-		-tt | --test-tag )
-			TEST_TAG="yes"
-			shift;;
-		-T | --tag )
-			COMMAND="tag"
-			shift
-			TAG="$1"
-			TAG_VERSION="no"
-			shift;;
 		-ir | --integer-release-only )
 			INTEGER_RELEASE="yes"
 			shift;;