diff options
| author | Rob Savoye <rob.savoye@linaro.org> | 2015-11-12 14:50:37 -0700 |
|---|---|---|
| committer | Rob Savoye <rob.savoye@linaro.org> | 2015-11-16 19:08:17 -0700 |
| commit | be74b531cb0cfa769c8ddacd59150cfc1766f5fa (patch) | |
| tree | d1be62165aa56415635142d3bfb4c8ae68e3e548 | |
| parent | 24fc43498008f195dace06ac6f765943cc19980d (diff) | |
Use rysnc and drop the -h option to tar so symbolic links don't get dereferenced.
Change-Id: I20580163d3693921556c5f2333af67678a590162
| -rw-r--r-- | lib/package.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/package.sh b/lib/package.sh index b644eaff..f387d8b9 100644 --- a/lib/package.sh +++ b/lib/package.sh @@ -220,7 +220,7 @@ binary_toolchain() fi local destdir="${local_builds}/tmp.$$/${tag}" - dryrun "mkdir -p ${local_builds}/tmp.$$" + dryrun "mkdir -p ${destdir}" # The manifest file records the versions of all of the components used to # build toolchain. @@ -228,11 +228,12 @@ binary_toolchain() # local installdir="`find ${destdir} -name ${target}-nm`" # local installdir="`dirname ${installdir} | sed -e 's:/bin::'`" - dryrun "ln -sfnT ${local_builds}/destdir/${host} ${destdir}" + dryrun "rsync -avr ${local_builds}/destdir/${host}/* ${destdir}/" if test x"${build}" != x"${target}"; then # FIXME: link the sysroot into the toolchain tarball - dryrun "ln -sfnT ${sysroots} ${destdir}/${target}/libc" + dryrun "mkdir -p ${destdir}/${target}/libc/" + dryrun "rsync -avr ${sysroots} ${destdir}/${target}/libc/" fi # Some mingw packages have a runtime dependency on libwinpthread-1.dll, so a copy @@ -249,7 +250,7 @@ binary_toolchain() # if test `echo ${host} | grep -c mingw` -eq 0; then # make the tarball from the tree we just created. notice "Making binary tarball for toolchain, please wait..." - dryrun "tar Jcfh ${local_snapshots}/${tag}.tar.xz --directory=${local_builds}/tmp.$$ ${exclude} ${tag}" + dryrun "tar Jcf ${local_snapshots}/${tag}.tar.xz --directory=${local_builds}/tmp.$$ ${exclude} ${tag}" rm -f ${local_snapshots}/${tag}.tar.xz.asc dryrun "md5sum ${local_snapshots}/${tag}.tar.xz | sed -e 's:${local_snapshots}/::' > ${local_snapshots}/${tag}.tar.xz.asc" |