Changeset 2286


Ignore:
Timestamp:
Jul 26, 2016, 12:42:11 PM (3 years ago)
Author:
hectorgh
Message:

new changes

Location:
llx-pool-tools/trunk/fuentes/install-files/usr/share/llx-pool/actions/xenial
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • llx-pool-tools/trunk/fuentes/install-files/usr/share/llx-pool/actions/xenial/package-list-update-frozen.sh

    r1290 r2286  
    2020METAS_FILE="${CONFIG_PATH}/llx-metas-list"
    2121UDEBS_FILE="${CONFIG_PATH}/udeb-list"
    22 UDEBS_EXTRA_FILE="${CONFIG_PATH}/udeb-list-extra"
     22UDEBS_EXTRA_FILE="${CONFIG_PATH}/udeb-extra"
    2323
    2424# Frozen lliurex pacakges list
     
    2929LLX_XENIAL_MIRROR="/srv/nfs/lliurex1609/xenial"
    3030LLX_PREXENIAL_MIRROR="/srv/nfs/lliurex1609/pre-xenial"
    31 UBUNTU_XENIAL_MIRROR="/srv/nfs/lliurex1609/ubuntu"
     31UBUNTU_XENIAL_MIRROR="/srv/nfs/lliurex1609/ubuntu/"
    3232
    3333AMD64_CHROOT="${CHROOT_BASE}/amd64"
     
    5959mount --bind $UBUNTU_XENIAL_MIRROR $I386_CHROOT/srv
    6060
    61 
     61mount --bind /srv/nfs/lliurex1609/xenial-included $AMD64_CHROOT/mnt
     62mount --bind /srv/nfs/lliurex1609/xenial-included $I386_CHROOT/mnt
    6263
    6364for ch in $AMD64_CHROOT $I386_CHROOT; do
     
    6566        echo "[${ch}] Updating apt..."
    6667        chroot ${ch} apt-get update 2>/dev/null 1>/dev/null
    67         echo "[${ch}] Installing pool data..."
    68         chroot ${ch} apt-get install lliurex-pool-data -y --force-yes
     68        #echo "[${ch}] Installing pool data..."
     69        #chroot ${ch} apt-get install lliurex-pool-data -y --force-yes
    6970        #CDD_SUPPORTED_LIST="$(cat ${ch}/usr/share/lliurex-pool-data/lists/supported/cdd-supported | tr "\n" " ")"
    70         chroot ${ch} lliurex-resolver -i ${UDEB_LIST} ${META_LIST} ${EXTRA_SUPPORTED_LIST} -d -o ${PACKAGE_LIST}
     71        #ARCH=$(echo ${ch} | cut -d / -f6)
     72        #less ${UDEBS_EXTRA_FILE}.${ARCH}
     73        chroot ${ch} lliurex-resolver -i ${UDEB_LIST} ${META_LIST} ${EXTRA_SUPPORTED_LIST} -b unity-greeter -o ${PACKAGE_LIST} -d
    7174        echo "The path of list is: "
    7275        echo "${ch}"/"${PACKAGE_LIST}"
     
    7982umount $I386_CHROOT/srv
    8083
     84umount $I386_CHROOT/mnt
     85umount $I386_CHROOT/mnt
    8186
    8287# Order and unique packages
  • llx-pool-tools/trunk/fuentes/install-files/usr/share/llx-pool/actions/xenial/package-list-update.sh

    r1290 r2286  
    1313DISTRO="xenial"
    1414
    15 # Path base de configuracion
     15# Config base dir
    1616CONFIG_PATH="/etc/llx-pool/basic-pkg-lists/${DISTRO}/"
    1717
    18 # Listas de paquetes
     18# Package lists
    1919SUPPORTED_FILE="${CONFIG_PATH}/extra-pkg-list"
    2020METAS_FILE="${CONFIG_PATH}/llx-metas-list"
    2121UDEBS_FILE="${CONFIG_PATH}/udeb-list"
    22 UDEBS_EXTRA_FILE="${CONFIG_PATH}/udeb-list-extra"
     22UDEBS_EXTRA_FILE="${CONFIG_PATH}/udeb-extra"
    2323
    24 # Lista de paquetes congelados de LliureX
     24# Frozen lliurex pacakges list
    2525FROZEN_FILE="${CONFIG_PATH}/frozen-list"
    2626
    2727#PATHS
    28 PATH_TO_CHROOT="/srv/nfs/lliurex1609/bootstraps"
    29 PATH_TO_PRO_TRUSTY="/srv/nfs/lliurex1609/trusty"
    30 PATH_TO_PRE_TRUSTY="/srv/nfs/lliurex1609/pre-trusty"
     28CHROOT_BASE="/srv/nfs/lliurex1609/bootstraps"
     29LLX_XENIAL_MIRROR="/srv/nfs/lliurex1609/xenial"
     30LLX_PREXENIAL_MIRROR="/srv/nfs/lliurex1609/pre-xenial"
     31UBUNTU_XENIAL_MIRROR="/srv/nfs/lliurex1609/ubuntu/"
    3132
    32 LIST_NAME="MegaLista.txt"
     33AMD64_CHROOT="${CHROOT_BASE}/amd64"
     34I386_CHROOT="${CHROOT_BASE}/i386"
    3335
    34 # Obtenemos la lista de los paquetes que estan soportados via lista-supported.txt
    35 LIST_OF_SUPPORTED="$(cat ${SUPPORTED_FILE} | tr "\n" " ")"
     36PACKAGE_LIST="PackageList.txt"
    3637
    37 # Obtenemos la lista de los metas
    38 LIST_OF_METAS=$(cat ${METAS_FILE} | tr "\n" " ")
     38EXTRA_SUPPORTED_LIST="$(cat ${SUPPORTED_FILE} | tr "\n" " ")"
    3939
    40 # Obtenemos la lista de los udebs
    41 LIST_OF_UDEBS=$(cat ${UDEBS_FILE} | tr "\n" " ")
     40
     41META_LIST=$(cat ${METAS_FILE} | tr "\n" " ")
     42UDEB_LIST=$(cat ${UDEBS_FILE} | tr "\n" " ")
     43
     44
     45
     46
    4247
    4348# Copy sources-list files
    4449
    45 cp $PATH_TO_CHROOT/sources.list.ubuntu $PATH_TO_CHROOT/trusty-chroot-amd64/etc/apt/sources.list
    46 cp $PATH_TO_CHROOT/sources.list.ubuntu $PATH_TO_CHROOT/trusty-chroot-i386/etc/apt/sources.list
     50cp $CHROOT_BASE/sources.list.ubuntu $AMD64_CHROOT/etc/apt/sources.list
     51cp $CHROOT_BASE/sources.list.ubuntu $I386_CHROOT/etc/apt/sources.list
    4752
    48 cp $PATH_TO_CHROOT/debian-installer.ubuntu $PATH_TO_CHROOT/trusty-chroot-amd64/etc/apt/sources.list.d/debian-installer.list
    49 cp $PATH_TO_CHROOT/debian-installer.ubuntu $PATH_TO_CHROOT/trusty-chroot-i386/etc/apt/sources.list.d/debian-installer.list
     53cp $CHROOT_BASE/debian-installer.ubuntu $AMD64_CHROOT/etc/apt/sources.list.d/debian-installer.list
     54cp $CHROOT_BASE/debian-installer.ubuntu $I386_CHROOT/etc/apt/sources.list.d/debian-installer.list
     55
     56# Mount ubuntu-mirror
     57
     58mount --bind $UBUNTU_XENIAL_MIRROR $AMD64_CHROOT/srv
     59mount --bind $UBUNTU_XENIAL_MIRROR $I386_CHROOT/srv
     60
     61mount --bind /srv/nfs/lliurex1609/xenial-included $AMD64_CHROOT/mnt
     62mount --bind /srv/nfs/lliurex1609/xenial-included $I386_CHROOT/mnt
     63
     64for ch in $AMD64_CHROOT $I386_CHROOT; do
     65
     66        echo "[${ch}] Updating apt..."
     67        chroot ${ch} apt-get update 2>/dev/null 1>/dev/null
     68        #echo "[${ch}] Installing pool data..."
     69        #chroot ${ch} apt-get install lliurex-pool-data -y --force-yes
     70        #CDD_SUPPORTED_LIST="$(cat ${ch}/usr/share/lliurex-pool-data/lists/supported/cdd-supported | tr "\n" " ")"
     71        #ARCH=$(echo ${ch} | cut -d / -f6)
     72        #less ${UDEBS_EXTRA_FILE}.${ARCH}
     73        chroot ${ch} lliurex-resolver -i ${UDEB_LIST} ${META_LIST} ${EXTRA_SUPPORTED_LIST} -b unity-greeter -o ${PACKAGE_LIST} -d
     74        echo "The path of list is: "
     75        echo "${ch}"/"${PACKAGE_LIST}"
     76
     77done
     78
     79# Umount ubuntu-mirror
     80
     81umount $AMD64_CHROOT/srv
     82umount $I386_CHROOT/srv
     83
     84umount $I386_CHROOT/mnt
     85umount $I386_CHROOT/mnt
     86
     87# Order and unique packages
     88cat $AMD64_CHROOT/$PACKAGE_LIST | sort -u > /tmp/$PACKAGE_LIST
     89cp /tmp/$PACKAGE_LIST $AMD64_CHROOT/$PACKAGE_LIST
     90
     91cat $I386_CHROOT/$PACKAGE_LIST | sort -u > /tmp/$PACKAGE_LIST
     92cp /tmp/$PACKAGE_LIST $I386_CHROOT/$PACKAGE_LIST
    5093
    5194
    5295
    53 for ch in ${PATH_TO_CHROOT}/amd64 ${PATH_TO_CHROOT}/i386; do
    54 
    55         echo "Actualizando ${ch}"
    56         chroot ${ch} apt-get update 2>/dev/null 1>/dev/null
    57         echo "Fin de la actualizacion ${ch}"
    58         chroot ${ch} apt-get install lliurex-pool-data -y --force-yes
    59         LIST_OF_CDD_SUPPORTED="$(cat ${ch}/usr/share/lliurex-pool-data/lists/supported/cdd-supported | tr "\n" " ")"
    60         chroot ${ch} lliurex-resolver -i ${LIST_OF_UDEBS} ${LIST_OF_METAS} ${LIST_OF_CDD_SUPPORTED} ${LIST_OF_SUPPORTED} -d -o ${LIST_NAME}
    61         echo "The path of list is: "
    62         echo "${ch}"/"${LIST_NAME}"
    63 
    64 done
    65 
    66 
    67 # Order and unique packages
    68 cat ${PATH_TO_CHROOT}/trusty-chroot-amd64/MegaLista.txt |sort -u > /tmp/Megalista.txt
    69 cp /tmp/Megalista.txt ${PATH_TO_CHROOT}/trusty-chroot-amd64/MegaLista.txt
    70 
    71 cat ${PATH_TO_CHROOT}/trusty-chroot-i386/MegaLista.txt |sort -u > /tmp/Megalista.txt
    72 cp /tmp/Megalista.txt ${PATH_TO_CHROOT}/trusty-chroot-i386/MegaLista.txt
    73 
    74 # Remove frozen apps from list from Ubuntu repos
     96#Remove frozen apps from list from Ubuntu repos
    7597echo "# Frozen apps!"
    76 cp ${PATH_TO_CHROOT}/trusty-chroot-amd64/MegaLista.txt ${PATH_TO_CHROOT}/trusty-chroot-amd64/MegaLista-Frozen.txt
    77 cp ${PATH_TO_CHROOT}/trusty-chroot-i386/MegaLista.txt ${PATH_TO_CHROOT}/trusty-chroot-i386/MegaLista-Frozen.txt
     98cp $AMD64_CHROOT/$PACKAGE_LIST $AMD64_CHROOT/$PACKAGE_LIST.frozen
     99cp $I386_CHROOT/$PACKAGE_LIST $I386_CHROOT/$PACKAGE_LIST.frozen
    78100
    79101# Removing frozen packages
     
    81103do
    82104    pkg=$line
    83     echo " [ LliureX Mega Resolver ]  * Frozen :  $pkg"
    84     sed -i "/^$pkg[[:blank:]]\+/d" ${PATH_TO_CHROOT}/trusty-chroot-amd64/MegaLista-Frozen.txt
    85     sed -i "/^$pkg[[:blank:]]\+/d" ${PATH_TO_CHROOT}/trusty-chroot-i386/MegaLista-Frozen.txt
     105   echo " [ LliureX Mega Resolver ]  * Frozen :  $pkg"
     106    sed -i "/^$pkg[[:blank:]]\+/d" $AMD64_CHROOT/$PACKAGE_LIST.frozen
     107   sed -i "/^$pkg[[:blank:]]\+/d" $I386_CHROOT/$PACKAGE_LIST.frozen
    86108done < ${FROZEN_FILE}
    87 
    88109
    89110echo ""
     
    93114echo "****  SHOWING DIFFERENCIES (If empty, there are no changes)"
    94115echo "[AMD64]"
    95 diff -Nuar ${PATH_TO_PRE_TRUSTY}/conf/amd64.txt ${PATH_TO_CHROOT}/trusty-chroot-amd64/MegaLista.txt
    96 echo ""
     116diff -Nuar ${LLX_PREXENIAL_MIRROR}/conf/amd64.txt ${AMD64_CHROOT}/${PACKAGE_LIST}
     117
    97118echo "[FROZEN AMD64]"
    98 diff -Nuar ${PATH_TO_PRE_TRUSTY}/conf/amd64-frozen.txt ${PATH_TO_CHROOT}/trusty-chroot-amd64/MegaLista-Frozen.txt
     119diff -Nuar ${LLX_PREXENIAL_MIRROR}/conf/amd64-frozen.txt ${AMD64_CHROOT}/${PACKAGE_LIST}.frozen
     120
    99121echo ""
    100122echo -n " * Press any key to continue... "
     
    102124
    103125echo "[i386]"
    104 diff -Nuar ${PATH_TO_PRE_TRUSTY}/conf/i386.txt ${PATH_TO_CHROOT}/trusty-chroot-i386/MegaLista.txt
    105 echo ""
     126diff -Nuar ${LLX_PREXENIAL_MIRROR}/conf/i386.txt ${I386_CHROOT}/${PACKAGE_LIST}
     127
    106128echo "[FROZEN i386]"
    107 diff -Nuar ${PATH_TO_PRE_TRUSTY}/conf/i386-frozen.txt ${PATH_TO_CHROOT}/trusty-chroot-i386/MegaLista-Frozen.txt
     129diff -Nuar ${LLX_PREXENIAL_MIRROR}/conf/i386-frozen.txt ${I386_CHROOT}/${PACKAGE_LIST}.frozen
     130
    108131echo ""
    109132echo -n " * Press any key to continue... "
     
    113136echo ""
    114137
    115 echo -n "# Copy new packages list to pre-trusty? [y/n]: "
     138echo -n "# Copy new packages list to pre-xenial? [y/n]: "
    116139read x
    117140if [ "$x" = "y" ]; then
    118     cp ${PATH_TO_CHROOT}/trusty-chroot-i386/MegaLista.txt ${PATH_TO_PRE_TRUSTY}/conf/i386.txt
    119     cp ${PATH_TO_CHROOT}/trusty-chroot-amd64/MegaLista.txt ${PATH_TO_PRE_TRUSTY}/conf/amd64.txt
    120     cp ${PATH_TO_CHROOT}/trusty-chroot-i386/MegaLista-Frozen.txt ${PATH_TO_PRE_TRUSTY}/conf/i386-frozen.txt
    121     cp ${PATH_TO_CHROOT}/trusty-chroot-amd64/MegaLista-Frozen.txt ${PATH_TO_PRE_TRUSTY}/conf/amd64-frozen.txt
     141    cp ${I386_CHROOT}/${PACKAGE_LIST} ${LLX_PREXENIAL_MIRROR}/conf/i386.txt
     142    cp ${AMD64_CHROOT}/${PACKAGE_LIST} ${LLX_PREXENIAL_MIRROR}/conf/amd64.txt
     143   
     144    cp ${I386_CHROOT}/${PACKAGE_LIST}.frozen ${LLX_PREXENIAL_MIRROR}/conf/i386-frozen.txt
     145    cp ${AMD64_CHROOT}/${PACKAGE_LIST}.frozen ${LLX_PREXENIAL_MIRROR}/conf/amd64-frozen.txt
     146   
     147   
    122148else
    123149    echo "Nothing to do."
    124150fi
    125151
    126 echo -n "# Copy new packages list to trusty? [y/n]: "
     152echo -n "# Copy new packages list to xenial? [y/n]: "
    127153read x
    128154if [ "$x" = "y" ]; then
    129     cp ${PATH_TO_CHROOT}/trusty-chroot-i386/MegaLista.txt ${PATH_TO_PRO_TRUSTY}/conf/i386.txt
    130     cp ${PATH_TO_CHROOT}/trusty-chroot-amd64/MegaLista.txt ${PATH_TO_PRO_TRUSTY}/conf/amd64.txt
    131     cp ${PATH_TO_CHROOT}/trusty-chroot-i386/MegaLista-Frozen.txt ${PATH_TO_PRO_TRUSTY}/conf/i386-frozen.txt
    132     cp ${PATH_TO_CHROOT}/trusty-chroot-amd64/MegaLista-Frozen.txt ${PATH_TO_PRO_TRUSTY}/conf/amd64-frozen.txt
     155   
     156    cp ${I386_CHROOT}/${PACKAGE_LIST} ${LLX_XENIAL_MIRROR}/conf/i386.txt
     157    cp ${AMD64_CHROOT}/${PACKAGE_LIST} ${LLX_XENIAL_MIRROR}/conf/amd64.txt
     158   
     159    cp ${I386_CHROOT}/${PACKAGE_LIST}.frozen ${LLX_XENIAL_MIRROR}/conf/i386-frozen.txt
     160    cp ${AMD64_CHROOT}/${PACKAGE_LIST}.frozen ${LLX_XENIAL_MIRROR}/conf/amd64-frozen.txt
     161   
    133162else
    134163    echo "Nothing to do."
    135164fi
     165
     166
  • llx-pool-tools/trunk/fuentes/install-files/usr/share/llx-pool/actions/xenial/sync-pro-to-lliurex-net-pro.sh

    r1426 r2286  
    55COMMENT="RSYNC local xenial to lliurex.net/xenial"
    66
     7MIRROR_DIR="/srv/nfs/lliurex1609/xenial"
     8
    79echo ""
    810echo -n "We are about to rsync local xenial to lliurex.net/xenial . Continue? [y/n] "
    911read x
    1012if [ "$x" = "y" ]; then
    11 
     13       
    1214        llx-pool-check-version-stamp
    1315
     
    1719                exit 0
    1820        fi
     21        date +%Y/%m/%d_%H:%m > ${MIRROR_DIR}/time-of-last-update
    1922
    2023        USERS_AT_HOSTS="syncpool@lliurex.net"
  • llx-pool-tools/trunk/fuentes/install-files/usr/share/llx-pool/actions/xenial/update-full.sh

    r1303 r2286  
    1414#cp $UPDATES.pro $UPDATES
    1515
    16 
     16eval $(gpg-agent --daemon)
    1717reprepro -b $MIRROR_DIR  -V --noskipold update
     18reprepro -b $MIRROR_DIR export
     19killall gpg-agent
    1820
    1921
  • llx-pool-tools/trunk/fuentes/install-files/usr/share/llx-pool/actions/xenial/update-included.sh

    r1370 r2286  
    1414#cp $UPDATES.pro $UPDATES
    1515
    16 
     16eval $(gpg-agent --daemon)
    1717reprepro -b $MIRROR_DIR  -V --noskipold update
     18reprepro -b $MIRROR_DIR export
     19killall gpg-agent
    1820
    1921
  • llx-pool-tools/trunk/fuentes/install-files/usr/share/llx-pool/actions/xenial/update-ppa-and-frozen.sh

    r1290 r2286  
    1414#cp $UPDATES.pro $UPDATES
    1515
    16 
     16eval $(gpg-agent --daemon)
    1717reprepro -b $MIRROR_DIR  -V --noskipold update
     18reprepro -b $MIRROR_DIR export
     19killall gpg-agent
    1820
    1921
    20 
  • llx-pool-tools/trunk/fuentes/install-files/usr/share/llx-pool/actions/xenial/update-ppa-only.sh

    r1370 r2286  
    1414#cp $UPDATES.pro $UPDATES
    1515
    16 
     16eval $(gpg-agent --daemon)
    1717reprepro -b $MIRROR_DIR  -V --noskipold update
     18reprepro -b $MIRROR_DIR export
     19killall gpg-agent
    1820
    1921
    20 
  • llx-pool-tools/trunk/fuentes/install-files/usr/share/llx-pool/actions/xenial/update-security.sh

    r1370 r2286  
    1414#cp $UPDATES.pro $UPDATES
    1515
    16 
     16eval $(gpg-agent --daemon)
    1717reprepro -b $MIRROR_DIR  -V --noskipold update
     18reprepro -b $MIRROR_DIR export
     19killall gpg-agent
    1820
    1921
    20 
Note: See TracChangeset for help on using the changeset viewer.