diff --git a/centos-mirror-tools/dl_tarball.sh b/centos-mirror-tools/dl_tarball.sh index 753e877d..4846d9e2 100755 --- a/centos-mirror-tools/dl_tarball.sh +++ b/centos-mirror-tools/dl_tarball.sh @@ -329,48 +329,18 @@ for line in $(cat $tarball_file); do rm -rf $directory_name rm e6aef069b6e97790cb127d5eeb86ae9ff0b7b0e3.tar.gz elif [ "$tarball_name" = "tss2-930.tar.gz" ]; then - dest_dir=ibmtpm20tss-tss - for dl_src in $dl_source; do - case $dl_src in - $dl_from_stx_mirror) - url="$(url_to_stx_mirror_url "$tarball_url" "$distro")" - ;; - $dl_from_upstream) - url="$tarball_url" - ;; - *) - echo "Error: Unknown dl_source '$dl_src'" - continue - ;; - esac - - git clone $url $dest_dir - if [ $? -eq 0 ]; then - # Success - break - else - echo "Warning: Failed to git clone from '$url'" - continue - fi - done - - if [ ! -d $dest_dir ]; then - echo "Error: Failed to git clone from '$tarball_url'" - echo "$tarball_url" > "$output_log" + download_package $tarball_url + if [ $? -ne 0 ]; then error_count=$((error_count + 1)) popd # pushd $output_tarball continue fi - - pushd $dest_dir - branch=$util - git checkout $branch - rm -rf .git - popd - mv ibmtpm20tss-tss $directory_name + unzip_file=ibmtpm20tss-tss-52539cb81c811c973b26ed23fafd28a700b7cc78 + zip_file="$unzip_file.zip" + unzip $zip_file + mv $unzip_file $directory_name tar czvf $tarball_name $directory_name rm -rf $directory_name - popd # pushd $dest_dir fi popd # pushd $output_tarball continue diff --git a/centos-mirror-tools/tarball-dl.lst b/centos-mirror-tools/tarball-dl.lst index 762b6f7f..19a5e02d 100644 --- a/centos-mirror-tools/tarball-dl.lst +++ b/centos-mirror-tools/tarball-dl.lst @@ -28,7 +28,7 @@ requests-toolbelt-0.5.1.tar.gz#requests-toolbelt-0.5.1#https://github.com/reques rpm-4.14.0.tar.bz2#rpm-4.14.0#https://ftp.osuosl.org/pub/rpm/releases/rpm-4.14.x/rpm-4.14.0.tar.bz2#http## swtpm-0.1.0-253eac5.tar.gz#swtpm-0.1.0#https://github.com/stefanberger/swtpm/tarball/1303be7d03294fb02204cb8242f366cbf0da076d#http## !tpm-kmod-e6aef069.tar.gz#tpm#http://git.infradead.org/users/jjs/linux-tpmdd.git/snapshot/e6aef069b6e97790cb127d5eeb86ae9ff0b7b0e3.tar.gz#http_script#post-dl-script/tpm-kmod.sh -!tss2-930.tar.gz#tss2-930#https://git.code.sf.net/p/ibmtpm20tss/tss#git#v930# +!tss2-930.tar.gz#tss2-930#https://sourceforge.net/code-snapshots/git/i/ib/ibmtpm20tss/tss.git/ibmtpm20tss-tss-52539cb81c811c973b26ed23fafd28a700b7cc78.zip#http## spectre-meltdown-checker-0.37+-5cc77741.tar.gz#spectre-meltdown-checker#https://github.com/speed47/spectre-meltdown-checker/tarball/5cc77741af1d2f52140aa9f89339f56b6c4b6783#http## puppet-boolean-22b726dd78b0a60a224cc7054aebbf28e9306f62.tar.gz#puppet-boolean#https://github.com/voxpupuli/puppet-boolean/tarball/22b726dd78b0a60a224cc7054aebbf28e9306f62#http## puppet-dnsmasq-cff07e90890662972c97684a2baee964f68ff3ed.tar.gz#packstack/puppet/modules/dnsmasq/#https://github.com/procore/puppet-dnsmasq/tarball/cff07e90890662972c97684a2baee964f68ff3ed#http##