Changeset bcd2dd3 in rtems-release


Ignore:
Timestamp:
Apr 12, 2017, 12:54:02 AM (3 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
2af55946ab1393fff9801b6ee137a15365220c24
Children:
34dfc16
Parents:
927b695
Message:

Use defaults for compress.

The threading option is added to the XZ command.

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • rtems-release

    r927b695 rbcd2dd3  
    8282  build examples-v2         ${version} ${revision}
    8383  # Hack around the repo naming.
    84   mv ${release}/examples-v2-${release}.tar.xz ${release}/rtems-examples-v2-${release}.tar.xz
     84  mv ${release}/examples-v2-${release}.tar.${comp_ext} \
     85     ${release}/rtems-examples-v2-${release}.tar.${comp_ext}
    8586fi
    8687if [ ${rtems_libbsd} = yes ]; then
  • rtems-release-defaults

    r927b695 rbcd2dd3  
    4949
    5050#
     51# Default compression and options plus file suffix.
     52#
     53comp=xz --threads=0
     54comp_ext=xz
     55comp_tar=J
     56
     57#
    5158# Defaults.
    5259#
  • rtems-release-docs

    r927b695 rbcd2dd3  
    6969 echo "git archive --format=tar --prefix=${prefix}/ origin/${version}"
    7070 git archive --format=tar --prefix=${prefix}/ origin/${version} | \
    71      xz > ../${prefix}-unstamped.tar.xz
     71     ${comp} > ../${prefix}-unstamped.tar.${comp_ext}
    7272 cd ..
    7373
     
    7575# Stamp the source and package
    7676#
    77 echo "tar Jxf ../${prefix}-unstamped.tar.xz"
    78 tar Jxf ${prefix}-unstamped.tar.xz
     77echo "tar ${comp_tar}xf ../${prefix}-unstamped.tar.${comp_ext}"
     78tar ${comp_tar}xf ${prefix}-unstamped.tar.${comp_ext}
    7979
    8080cd ${prefix}
     
    9191
    9292echo "tar cf - ${prefix}"
    93 tar cf - ${prefix} | xz > ../${prefix}.tar.xz
     93tar cf - ${prefix} | ${comp} > ../${prefix}.tar.${comp_ext}
    9494
    95 echo "Created: ${release}/${prefix}.tar.xz"
     95echo "Created: ${release}/${prefix}.tar.${comp_ext}"
    9696
    9797#
     
    109109mkdir ${top}/${release}/docs
    110110cd install
    111  echo "Creating DOC all rtems-${release}-docs-all.tar.xz"
    112  tar cf - * > ${top}/${release}/docs/rtems-${release}-docs-all.tar.xz
     111 echo "Creating DOC all rtems-${release}-docs-all.tar.${comp_ext}"
     112 tar cf - * | ${comp} > ${top}/${release}/docs/rtems-${release}-docs-all.tar.${comp_ext}
    113113 for p in $(find . -name \*.pdf)
    114114 do
     
    118118  # Compress the PDF and move it out of the way.
    119119  #
    120   echo "Creating PDF rtems-${release}-${manual}.pdf.xz"
    121   xz $p
    122   mv $p.xz ${top}/${release}/docs/rtems-${release}-${manual}.pdf.xz
     120  echo "Creating PDF rtems-${release}-${manual}.pdf.${comp_ext}"
     121  ${comp} $p
     122  mv $p.${comp_ext} ${top}/${release}/docs/rtems-${release}-${manual}.pdf.${comp_ext}
    123123  #
    124124  # Create the single html manual
    125125  #
    126   echo "Creating SingleHTML rtems-${release}-${manual}.html.xz"
     126  echo "Creating SingleHTML rtems-${release}-${manual}.html.${comp_ext}"
    127127  mv ${base}/${manual}.html ${base}/rtems-${release}-${manual}.html
    128   xz ${base}/rtems-${release}-${manual}.html
    129   mv ${base}/rtems-${release}-${manual}.html.xz ${top}/${release}/docs/.
     128  ${comp} ${base}/rtems-${release}-${manual}.html
     129  mv ${base}/rtems-${release}-${manual}.html.${comp_ext} ${top}/${release}/docs/.
    130130  #
    131131  # Tar the multi-page html and install.
    132132  #
    133   echo "Creating HTML rtems-${release}-${manual}-html.tar.xz"
    134   tar cf - ${base}/${manual} > ${top}/${release}/docs/rtems-${release}-${manual}-html.tar.xz
     133  echo "Creating HTML rtems-${release}-${manual}-html.tar.${comp_ext}"
     134  tar cf - ${base}/${manual} | \
     135      ${comp} > ${top}/${release}/docs/rtems-${release}-${manual}-html.tar.${comp_ext}
    135136 done
    136137 cd ..
  • rtems-release-kernel

    r927b695 rbcd2dd3  
    6363#
    6464rsb=rtems-source-builder-${release}
    65 echo "tar Jxf ../${rsb}.tar.xz"
    66 tar Jxf ../${rsb}.tar.xz
     65echo "tar ${comp_tar}xf ../${rsb}.tar.${comp_ext}"
     66tar ${comp_tar}xf ../${rsb}.tar.${comp_ext}
    6767
    6868#
     
    134134doxygen Doxyfile
    135135
    136 echo "Creating: rtems-doxygen-${release}.tar.xz"
     136echo "Creating: rtems-doxygen-${release}.tar.${comp_ext}"
    137137mv cpukit_doxy/html rtems-doxygen-${release}
    138 tar cf - rtems-doxygen-${release} | xz > ../rtems-doxygen-${release}.tar.xz
     138tar cf - rtems-doxygen-${release} | \
     139    ${comp} > ../rtems-doxygen-${release}.tar.${comp_ext}
    139140
    140141exit 0
  • rtems-release-package

    r927b695 rbcd2dd3  
    128128#
    129129echo "tar cf - ${prefix}"
    130 tar cf - ${prefix} | xz > ../${prefix}.tar.xz
     130tar cf - ${prefix} | ${comp} > ../${prefix}.tar.${comp_ext}
    131131
    132 echo "Created: ${release}/${prefix}.tar.xz"
     132echo "Created: ${release}/${prefix}.tar.${comp_ext}"
    133133
    134134#
  • rtems-release-sources

    r927b695 rbcd2dd3  
    8585 cd ${workspace}
    8686
    87   echo "tar Jxf ../${prefix}.tar.xz"
    88   tar Jxf ../${prefix}.tar.xz
     87  echo "tar ${comp_tar}xf ../${prefix}.tar.${comp_ext}"
     88  tar ${comp_tar}xf ../${prefix}.tar.${comp_ext}
    8989
    9090  #
     
    102102    for p in rtems-tools rtems
    103103    do
    104      cp ${top}/${release}/${p}-${release}.tar.xz sources/
     104     cp ${top}/${release}/${p}-${release}.tar.${comp_ext} sources/
    105105    done
    106106    #
     
    156156          prefix=$(echo ${g}-${hash} | sed 's/\./\-/')
    157157          echo "Packaging GIT repo: ${g} to ${prefix}"
    158           git archive --format=tar --prefix=${prefix}/ ${hash} | xz > ../../${prefix}.tar.xz
     158          git archive --format=tar --prefix=${prefix}/ ${hash} | ${comp} > ../../${prefix}.tar.${comp_ext}
    159159          cd ..  # ${g}
    160160        done
Note: See TracChangeset for help on using the changeset viewer.