move from SS to sisyphus suffix

bin/rpmbph

@@ -86,7 +86,7 @@ test -z "$LISTNAMES" && fatal "file not found in '$@'"
 
 if [ "$PKGVENDOR" = "alt" ] ; then
 	MDISTR=$MENV
-	[ "$MDISTR" = "SS" ] && fatal "It makes no sense to backport to Sisyphus (You need to try with -b $EXAMPLEALTDISTRVERSION)."
+	[ "$MDISTR" = "sisyphus" ] && fatal "It makes no sense to backport to Sisyphus (You need to try with -b $EXAMPLEALTDISTRVERSION)."
 	# override by defined target version
 	DISTRVERSION=$BINARYREPO
 else

bin/rpmbps

@@ -66,7 +66,7 @@ test -f "$SPECNAME" || fatal "file '$SPECNAME' is not found"
 
 if [ "$PKGVENDOR" = "alt" ] ; then
 	MDISTR=$MENV
-	[ "$MDISTR" = "SS" ] && fatal "It makes no sense to backport to Sisyphus (You need to try with -b $EXAMPLEALTDISTRVERSION)."
+	[ "$MDISTR" = "sisyphus" ] && fatal "It makes no sense to backport to Sisyphus (You need to try with -b $EXAMPLEALTDISTRVERSION)."
 	# override by defined target version
 	DISTRVERSION=$BINARYREPO
 else

bin/rpmbsh

@@ -16,7 +16,7 @@ REMCOM=
 COMMIT=
 
 #############################
-Usage="Usage: $name [GIRAR] [-r -s -u -m -i -c -e] [-f] [spec or src.rpm]..."
+Usage="Usage: $name [GIRAR] [-r -s -u -m -i -c -e ] [-b REPONAME] [-f] [spec or src.rpm]..."
 function mygetopts()
 {
 name=${0##*/}
@@ -40,7 +40,7 @@ phelp()
 	echog "   -t  make temporary commit before build (rpmbb like behavior)"
 	echog "   -l  lazy cleanup (clean before build, not after)"
 	echog "   -w  use tar as immediate archive for myhsh"
-	echog "   -b REPONAME  binary repository name (p6, t6, c7, p8 and so on)"
+	echog "   -b REPONAME  binary repository name (p9, c8, sisyphus and so on)"
 }
 
 PASSEDARGS=

etc/apt/apt.conf.SS

-/*
- * This is the main configuration file for the APT suite of tools,
- * see apt.conf(5) for details.
- */
-
-Dir::Etc::main "/dev/null";
-Dir::Etc::parts "/var/empty";
-Dir::Etc::SourceParts "/var/empty";
-
-Dir::Etc::sourcelist "/etc/eterbuild/apt/sources.list.SS";

etc/apt/apt.conf.DD → etc/apt/apt.conf.sisyphus

@@ -7,4 +7,4 @@ Dir::Etc::main "/dev/null";
 Dir::Etc::parts "/var/empty";
 Dir::Etc::SourceParts "/var/empty";
 
-Dir::Etc::sourcelist "/etc/eterbuild/apt/sources.list.DD";
+Dir::Etc::sourcelist "/etc/eterbuild/apt/sources.list.sisyphus";

share/eterbuild/functions/alt

@@ -20,7 +20,7 @@ set_target_type()
 		return 0
 	fi
 	case "$1" in
-		("DD" | "SS" | "EE")
+		("DD" | "SS" | "EE" | "sisyphus")
 			MENV="$1"
 			return 0;
 			;;
@@ -94,7 +94,7 @@ get_altdistr_version()
 # p6 -> M60P
 get_altdistr_mod()
 {
-	echo "$1" | sed -e "s|Sisyphus|SS|gi" -e "s|p\([5-9]\)|M\10P|g" -e "s|c\([6-9]\)|M\10C|g" -e "s|t\([6-9]\)|M\10T|g"
+	echo "$1" | sed -e "s|Sisyphus|sisyphus|gi" -e "s|p\([5-9]\)|M\10P|g" -e "s|c\([6-9]\)|M\10C|g" -e "s|t\([6-9]\)|M\10T|g"
 }
 
 # TODO: include in sisyphus_check
@@ -110,7 +110,7 @@ pkg_release_check()
 	# can be set from korinf config
 	[ -z "$KORINFTARGETRELEASE" ] || STREL=$KORINFTARGETRELEASE
 # FIXME! broken for release more than 9
-	if [ "$MENV" = "SS" ] || [ "$MENV" = "DD" ] ; then
+	if [ "$MENV" = "sisyphus" ] ; then
 		for i in $@ ; do
 			if rhas "$i" "($STREL|$STRELDEF)[0-9]+\.M[0-9][0-9]\.[0-9]+" ; then
 				# Значит не тот релиз

share/eterbuild/functions/build

@@ -52,7 +52,7 @@ uni_rpmbuild()
 		GEARRULES=$(get_gear_rules_by_spec "$SPECNAME")
 
 		# build package without MENV checking
-		if true || [ "$MENV" = "SS" ] ; then
+		if true || [ "$MENV" = "sisyphus" ] ; then
 			LANG=$NEULOCALE docmd $NICE $GEAR $COMMIT $GEARRULES --rpmbuild -- $RPMBUILD "$TWOPARAM" "$THRPARAM" "$FOURPARAM" "$FIVEPARAM" "$SIXPARAM" "$SEVENPARAM" "$@" || RET=$?
 			[ -z "$COMMANDAFTER" ] || docmd $COMMANDAFTER
 		else

share/eterbuild/functions/common

@@ -367,8 +367,8 @@ set_target_pkg_env
 
 if [ "$PKGVENDOR" = "alt" ] && [ -n "$MENV" ] ; then
 	#[ -n "$APTCONF" ] && fatal "Internal error: APTCONF already defined as $APTCONF for $MENV"
-	APTCONF=${APTCONFBASE/.SS}.$MENV
-	[ "$MENV" = "SS" ] && [ ! -r "$APTCONF" ] && APTCONF=${APTCONFBASE/.SS}
+	APTCONF=${APTCONFBASE/.sisyphus}.$MENV
+	[ "$MENV" = "sisyphus" ] && [ ! -r "$APTCONF" ] && APTCONF=${APTCONFBASE/.sisyphus}
 	
 	[ -n "$VERBOSE" ] && echog "Target ALT Linux system: `get_altdistr_version $MENV`, use \$APTCONF"
 	MENVARG="-$MENV"
@@ -410,8 +410,7 @@ do
 		# echo is workaround for missed readlink
 		LISTNAMES="$LISTNAMES $(realpath "$i" 2>/dev/null || echo "$i")"
 	else
-		# set target type if -M?? in param
-		set_target_type ${i/-/} || LISTARGS="$LISTARGS $i"
+		LISTARGS="$LISTARGS $i"
 	fi
 done
 LISTNAMES=$(estrlist strip_spaces "$LISTNAMES")

share/eterbuild/functions/spec

@@ -104,10 +104,9 @@ reset_release()
 	set_var $1 Release $RELEASE
 }
 
-# TODO: SS/DD (did not pass test)
 is_backported_release()
 {
-	echo "$1" | grep -E -q "\.(M[0-9][0-9][CPT]|SS|DD)\."
+	echo "$1" | grep -E -q "\.(M[0-9][0-9][CPT])\."
 }
 
 # inc 2 release to 3