From 85d2699b2db28c21ecbbae662ea09d0fbd967d6e Mon Sep 17 00:00:00 2001 From: Francis Rowe Date: Sat, 16 May 2015 20:00:01 -0400 Subject: build/release/archives: don't compress crossgcc It's already compressed. Compressing it more didn't save any space and just increased the time taken for the build to finish. --- diff --git a/.gitignore b/.gitignore index f39189d..cc82433 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,6 @@ /libreboot_src.tar.xz /libreboot_util.tar.xz /libreboot_docs.tar.xz -/libreboot_crossgcc.tar.xz /libreboot_macbook21.tar.xz /libreboot_qemu_i440fx_piix4.tar.xz /libreboot_qemu_q35_ich9.tar.xz @@ -22,7 +21,7 @@ /libreboot_util/ /libreboot_src/ /libreboot_docs/ -/libreboot_crossgcc/ +/crossgcc/ /release/ /resources/utilities/ich9deblob/factory.rom /resources/utilities/ich9deblob/deblobbed_descriptor.bin diff --git a/resources/scripts/helpers/build/release/archives b/resources/scripts/helpers/build/release/archives index b645010..06ff35f 100755 --- a/resources/scripts/helpers/build/release/archives +++ b/resources/scripts/helpers/build/release/archives @@ -435,12 +435,11 @@ rm -rf libreboot_src/tobuild/ rm -f libreboot_src/tobuild.tar.xz # separate coreboot's crossgcc toolchain into a new archive -mv libreboot_src/coreboot/util/crossgcc/tarballs/ libreboot_crossgcc +mv libreboot_src/coreboot/util/crossgcc/tarballs/ crossgcc # mention the commit ID (libreboot, git) in the release archives cat commitid > libreboot_src/commitid cat commitid > libreboot_util/commitid -cat commitid > libreboot_crossgcc/commitid # create lzma compressed src archive printf "Compressing libreboot_src/ into libreboot_src.tar.xz\n" @@ -450,14 +449,10 @@ printf "Compressing libreboot_util/ into libreboot_util.tar.xz\n" # create lzma compressed util archive tar -c libreboot_util | xz -9e >libreboot_util.tar.xz -printf "Compressing libreboot_crossgcc/ into libreboot_crossgcc.tar.xz\n" -# create lzma compressed crossgcc archive -tar -c libreboot_crossgcc | xz -9e >libreboot_crossgcc.tar.xz - # Move the archives to the release directory mv libreboot_src.tar.xz release/ mv libreboot_util.tar.xz release/ -mv libreboot_crossgcc.tar.xz release/ +mv crossgcc/ release/ # Create a symlink to the commitid file, in release/ cat commitid > release/commitid @@ -470,7 +465,6 @@ printf "\n\n" # The uncompressed archives are no longer needed rm -rf libreboot_src rm -rf libreboot_util -rm -rf libreboot_crossgcc # For those utilities that have to be built on the target ./build external source -- cgit v0.9.1