Changeset 22739

Show
Ignore:
Timestamp:
02/07/08 23:30:14 (2 years ago)
Author:
tabbott
Message:

Centralize database of Debathena supported codenames and their tags
into a new script, debian-versions.sh.

Many scripts can be cleaned up substantially once we drop sarge support.

Location:
trunk/debathena/scripts
Files:
1 added
5 modified

Legend:

Unmodified
Added
Removed

  • trunk/debathena/scripts/SbuildHack.pm

    r22687 r22739  
    99    my $binNMUver = shift; 
    1010    die("Wrong binNMUver!") unless ($binNMUver == 171717); 
    11     my %tags = ( 
    12         'sarge' => '~debian3.1', 
    13         'etch' => '~debian4.0', 
    14         'lenny' => '~debian4.1~0.1', 
    15         'breezy' => '~ubuntu5.10', 
    16         'dapper' => '~ubuntu6.06', 
    17         'edgy' => '~ubuntu6.10', 
    18         'feisty' => '~ubuntu7.04', 
    19         'gutsy' => '~ubuntu7.10' 
    20     ); 
    21     return "$v$tags{$main::distribution}"; 
     11    return "$v".`. $(dirname "$0")/debian-versions.sh; gettag $main::distribution`; 
    2212}; 
    2313 

  • trunk/debathena/scripts/all-schroots

    r22690 r22739  
    1212# instead of source chroots. 
    1313 
     14source $(dirname "$0")/debian-versions.sh 
     15 
    1416if [ "$1" = "-A" ]; then 
    1517 
    1618shift 
    1719prog=$1; shift 
    18 $prog sarge-i386-sbuild "$@" 
    19 $prog etch-amd64-sbuild "$@" 
    20 $prog lenny-amd64-sbuild "$@" 
    21 $prog dapper-amd64-sbuild "$@" 
    22 $prog edgy-amd64-sbuild "$@" 
    23 $prog feisty-amd64-sbuild "$@" 
    24 $prog gutsy-amd64-sbuild "$@" 
     20for code in "$DEBIAN_CODES"; do 
     21    if [ "$code" = "sarge" ]; then 
     22        $prog sarge-i386-sbuild "$@" 
     23    else 
     24        $prog ${code}-amd64-sbuild "$@" 
     25    fi 
     26done 
    2527 
    2628else 
    2729 
    2830prog=$1; shift 
    29 $prog sarge-i386-sbuild-source "$@" 
    30 $prog etch-i386-sbuild-source "$@" 
    31 $prog etch-amd64-sbuild-source "$@" 
    32 $prog lenny-i386-sbuild-source "$@" 
    33 $prog lenny-amd64-sbuild-source "$@" 
    34 $prog dapper-i386-sbuild-source "$@" 
    35 $prog dapper-amd64-sbuild-source "$@" 
    36 $prog edgy-i386-sbuild-source "$@" 
    37 $prog edgy-amd64-sbuild-source "$@" 
    38 $prog feisty-i386-sbuild-source "$@" 
    39 $prog feisty-amd64-sbuild-source "$@" 
    40 $prog gutsy-i386-sbuild-source "$@" 
    41 $prog gutsy-amd64-sbuild-source "$@" 
     31 
     32for code in "$DEBIAN_CODES"; do 
     33    if [ "$code" = "sarge" ]; then 
     34        $prog sarge-i386-sbuild-source "$@" 
     35    else 
     36        $prog ${code}-i386-sbuild-source "$@" 
     37        $prog ${code}-amd64-sbuild-source "$@" 
     38    fi 
     39done 
    4240 
    4341fi 

  • trunk/debathena/scripts/da

    r22688 r22739  
    1515# Typically this script is used to build Debathena packages, in which 
    1616# case PROGRAM is sbuildhack and ARGUMENTS is a path to a .dsc file. 
     17 
     18source $(dirname "$0")/debian-versions.sh 
    1719 
    1820A=0 
    … …  
    5153} 
    5254 
    53 t sarge-i386 -A "$@" 
    54 t dapper-amd64 -A "$@" 
    55 [ $A -eq 1 ] || t dapper-i386 "$@" 
    56 t edgy-amd64 -A "$@" 
    57 [ $A -eq 1 ] || t edgy-i386 "$@" 
    58 t etch-amd64 -A "$@" 
    59 [ $A -eq 1 ] || t etch-i386 "$@" 
    60 t feisty-amd64 -A "$@" 
    61 [ $A -eq 1 ] || t feisty-i386 "$@" 
    62 t gutsy-amd64 -A "$@" 
    63 [ $A -eq 1 ] || t gutsy-i386 "$@" 
    64 t lenny-amd64 -A "$@" 
    65 [ $A -eq 1 ] || t lenny-i386 "$@" 
     55for code in $DEBIAN_CODES; do 
     56    if [ "$code" = "sarge" ]; then 
     57        t sarge-i386 -A "$@" 
     58        continue 
     59    fi 
     60    t "$code"-amd64 -A "$@" 
     61    [ $A -eq 1 ] || t "$code"-i386 "$@" 
     62done 
    6663 
    6764tput bold >&2 

  • trunk/debathena/scripts/daequivsupload

    r22700 r22739  
    77# for each dist. 
    88 
     9source $(dirname "$0")/debian-versions.sh 
     10 
    911: ${DEBATHENA_APT=/mit/debathena/apt} 
    1012 
    11 for dist in sarge etch lenny dapper edgy feisty gutsy; do 
    12     reprepro -Vb $DEBATHENA_APT --ignore=wrongdistribution include "$dist" "$1" 
     13for code in $DEBIAN_CODES; do 
     14    reprepro -Vb $DEBATHENA_APT --ignore=wrongdistribution include "$code" "$1" 
    1315done 

  • trunk/debathena/scripts/daupload-release

    r22730 r22739  
    1414# subdirectory. 
    1515 
    16 : ${DEBATHENA_APT=/mit/debathena/apt} 
     16source $(dirname "$0")/debian-versions.sh 
     17 
     18if [ -z "$DEBATHENA_APT" ]; then 
     19    DEBATHENA_APT=/mit/debathena/apt 
     20fi 
    1721 
    1822case "$(basename "$0")" in 
    … …  
    5458[ -s "$change" ] 
    5559if [ $S -ne 1 ]; then 
    56     check "$base~debian3.1_i386.changes" 
    57     check "$base~debian4.0_amd64.changes" 
    58     check "$base~debian4.1~0.1_amd64.changes" 
    59     check "$base~ubuntu6.06_amd64.changes" 
    60     check "$base~ubuntu6.10_amd64.changes" 
    61     check "$base~ubuntu7.04_amd64.changes" 
    62     check "$base~ubuntu7.10_amd64.changes" 
     60    for code in $DEBIAN_CODES; do 
     61        if [ "$code" = "sarge" ]; then 
     62            check "$base~debian3.1_i386.changes" 
     63        else 
     64            tag=$(gettag "$code") 
     65            check "${base}${tag}_amd64.changes" 
     66        fi 
     67    done 
    6368    if [ $A -eq 1 ]; then 
    64         uncheck "$base~debian4.0_i386.changes" 
    65         uncheck "$base~debian4.1~0.1_i386.changes" 
    66         uncheck "$base~ubuntu6.06_i386.changes" 
    67         uncheck "$base~ubuntu6.10_i386.changes" 
    68         uncheck "$base~ubuntu7.04_i386.changes" 
    69         uncheck "$base~ubuntu7.10_i386.changes" 
     69        for code in $DEBIAN_CODES; do 
     70            if [ "$code" = "sarge" ]; then 
     71                true; 
     72            else 
     73                tag=$(gettag "$code") 
     74                uncheck "${base}${tag}_i386.changes" 
     75            fi 
     76        done 
    7077    else 
    71         check "$base~debian4.0_i386.changes" 
    72         check "$base~debian4.1~0.1_i386.changes" 
    73         check "$base~ubuntu6.06_i386.changes" 
    74         check "$base~ubuntu6.10_i386.changes" 
    75         check "$base~ubuntu7.04_i386.changes" 
    76         check "$base~ubuntu7.10_i386.changes" 
     78        for code in $DEBIAN_CODES; do 
     79            if [ "$code" = "sarge" ]; then 
     80                true; 
     81            else 
     82                tag=$(gettag "$code") 
     83                check "${base}${tag}_i386.changes" 
     84            fi 
     85        done 
    7786    fi 
    7887fi 
    … …  
    8897REPREPROI="$REPREPRO --ignore=wrongdistribution" 
    8998 
    90 $REPREPROI include sarge "$change" 
    91 $REPREPROI include etch "$change" 
    92 $REPREPROI include lenny "$change" 
    93 $REPREPROI include dapper "$change" 
    94 $REPREPROI include edgy "$change" 
    95 $REPREPROI include feisty "$change" 
    96 $REPREPROI include gutsy "$change" 
     99for code in $DEBIAN_CODES; do 
     100    $REPREPROI include "$code" "$change" 
     101done 
    97102 
    98103if [ $S -ne 1 ]; then 
    99     $REPREPRO include sarge "$base~debian3.1_i386.changes" 
    100     [ $A -eq 1 ] || $REPREPRO include etch "$base~debian4.0_i386.changes" 
    101     $REPREPRO include etch "$base~debian4.0_amd64.changes" 
    102     [ $A -eq 1 ] || $REPREPRO include lenny "$base~debian4.1~0.1_i386.changes" 
    103     $REPREPRO include lenny "$base~debian4.1~0.1_amd64.changes" 
    104     [ $A -eq 1 ] || $REPREPRO include dapper "$base~ubuntu6.06_i386.changes" 
    105     $REPREPRO include dapper "$base~ubuntu6.06_amd64.changes" 
    106     [ $A -eq 1 ] || $REPREPRO include edgy "$base~ubuntu6.10_i386.changes" 
    107     $REPREPRO include edgy "$base~ubuntu6.10_amd64.changes" 
    108     [ $A -eq 1 ] || $REPREPRO include feisty "$base~ubuntu7.04_i386.changes" 
    109     $REPREPRO include feisty "$base~ubuntu7.04_amd64.changes" 
    110     [ $A -eq 1 ] || $REPREPRO include gutsy "$base~ubuntu7.10_i386.changes" 
    111     $REPREPRO include gutsy "$base~ubuntu7.10_amd64.changes" 
     104    for code in $DEBIAN_CODES; do 
     105        if [ "$code" = "sarge" ]; then 
     106            $REPREPRO include sarge "$base~debian3.1_i386.changes" 
     107        else 
     108            tag=$(gettag "$code") 
     109            [ $A -eq 1 ] || $REPREPRO include "$code" "${base}${tag}_i386.changes" 
     110            $REPREPRO include "$code" "${base}${tag}_amd64.changes" 
     111        fi 
     112    done 
    112113fi 
    113114 
    114  
    115115changes=$change 
    116 changes=$changes\ $base~debian3.1_i386.changes 
    117 [ $A -eq 1 ] || changes=$changes\ $base~debian4.0_i386.changes 
    118 changes=$changes\ $base~debian4.0_amd64.changes 
    119 [ $A -eq 1 ] || changes=$changes\ $base~debian4.1~0.1_i386.changes 
    120 changes=$changes\ $base~debian4.1~0.1_amd64.changes 
    121 [ $A -eq 1 ] || changes=$changes\ $base~ubuntu6.06_i386.changes 
    122 changes=$changes\ $base~ubuntu6.06_amd64.changes 
    123 [ $A -eq 1 ] || changes=$changes\ $base~ubuntu6.10_i386.changes 
    124 changes=$changes\ $base~ubuntu6.10_amd64.changes 
    125 [ $A -eq 1 ] || changes=$changes\ $base~ubuntu7.04_i386.changes 
    126 changes=$changes\ $base~ubuntu7.04_amd64.changes 
    127 [ $A -eq 1 ] || changes=$changes\ $base~ubuntu7.10_i386.changes 
    128 changes=$changes\ $base~ubuntu7.10_amd64.changes 
     116for code in $$DEBIAN_CODES; do 
     117    if [ "$code" = "sarge" ]; then 
     118        changes=$changes\ $base~debian3.1_i386.changes 
     119    else 
     120        tag=$(gettag "$code") 
     121        [ $A -eq 1 ] || changes=$changes\ "${base}${tag}"_i386.changes 
     122        changes=$changes\ "${base}${tag}"_amd64.changes 
     123    fi 
     124done 
    129125 
    130126files=${change%.changes}.build\ $changes