Crew: skip (#5713)

* crew: Add package file source_url SKIP option, clean up extractions in install

* change /dev/null source_url to SKIP in all packages

* uprev

bin/crew

@@ -569,6 +569,8 @@ def download
     puts "Precompiled binary available, downloading..."
   elsif @pkg.build_from_source
     puts "Downloading source..."
+  elsif uri =~ /^SKIP$/i
+    puts "Skipping source download..."
   else
     puts "No precompiled binary available for your platform, downloading source..."
   end
@@ -679,6 +681,8 @@ def download
         system "sha256sum #{cachefile} > #{cachefile}.sha256"
         puts 'Git repo cached.'.lightgreen
       end
+    when /^SKIP$/i
+      Dir.mkdir @extract_dir
     end
   end
   return {source: source, filename: filename}
@@ -860,13 +864,13 @@ def install_package (pkgdir)
     FileUtils.mv 'dlist', CREW_META_PATH + @pkg.name + '.directorylist', verbose: @fileutils_verbose
     FileUtils.mv 'filelist', CREW_META_PATH + @pkg.name + '.filelist', verbose: @fileutils_verbose
 
-    strip_dir pkgdir
+    strip_dir pkgdir if Dir.exists? "#{pkgdir}/usr"
 
     if Dir.exists? "#{pkgdir}/home" then
       system "tar -c#{@verbose}f - ./usr/* ./home/* | (cd /; tar xp --keep-directory-symlink -f -)"
-    else
+    elsif Dir.exists? "#{pkgdir}/usr" then
       system "tar -c#{@verbose}f - ./usr/* | (cd /; tar xp --keep-directory-symlink -f -)"
-      end
+    end
   end
 end
 

lib/const.rb

 # Defines common constants used in different parts of crew
 
-CREW_VERSION = '1.8.13'
+CREW_VERSION = '1.8.14'
 
 ARCH_ACTUAL = `uname -m`.strip
 # This helps with virtualized builds on aarch64 machines

packages/aws.rb

@@ -6,8 +6,7 @@ class Aws < Package
   version '1.19.53'
   license 'Apache-2.0'
   compatibility 'all'
-  source_url 'file:///dev/null'
-  source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  source_url 'SKIP'
 
   binary_url({
     aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/aws/1.19.53_armv7l/aws-1.19.53-chromeos-armv7l.tar.xz',

packages/aws2.rb

@@ -7,8 +7,7 @@ class Aws2 < Package
   version @_ver + '-1'
   license 'GPL-3'
   compatibility 'all'
-  source_url 'file:///dev/null'
-  source_sha256 'e7f09c31b8c152ea015a002c2f2dc8745f0e2ec01cc21cc5fd92afb6b97e24a4'
+  source_url 'SKIP'
 
   binary_url({
   })

packages/bashdb.rb

@@ -6,8 +6,7 @@ class Bashdb < Package
   version '5.0-1.1.2-abac'
   license 'GPL-2'
   compatibility 'all'
-  source_url 'file:///dev/null'
-  source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  source_url 'SKIP'
 
   binary_url({
     aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/bashdb/5.0-1.1.2-abac_armv7l/bashdb-5.0-1.1.2-abac-chromeos-armv7l.tar.xz',

packages/bind.rb

@@ -7,8 +7,7 @@ class Bind < Package
   version @_ver
   license 'Apache-2.0, BSD, BSD-2, GPL-2, HPND, ISC and MPL-2.0'
   compatibility 'all'
-  source_url 'file:///dev/null'
-  source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  source_url 'SKIP'
 
   binary_url({
     aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/bind/9.17.11_armv7l/bind-9.17.11-chromeos-armv7l.tar.xz',

packages/broadway.rb

@@ -6,8 +6,7 @@ class Broadway < Package
   version 'gtk3.22-3'
   license 'GPL-3+'
   compatibility 'all'
-  source_url 'file:///dev/null'
-  source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  source_url 'SKIP'
 
   binary_url ({
   })

packages/chrx.rb

@@ -6,8 +6,7 @@ class Chrx < Package
   version '3.0.2'
   license 'unlicensed'
   compatibility 'all'
-  source_url 'file:///dev/null'
-  source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  source_url 'SKIP'
 
   binary_url ({
     aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/chrx/3.0.2_armv7l/chrx-3.0.2-chromeos-armv7l.tar.xz',

packages/clear_cache.rb

@@ -6,8 +6,7 @@ class Clear_cache < Package
   version '1.0'
   license 'GPL-3+'
   compatibility 'all'
-  source_url 'file:///dev/null'
-  source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  source_url 'SKIP'
 
   def self.build
     system "cat << 'EOF' > clear-cache

packages/crew_profile_base.rb

@@ -6,8 +6,7 @@ class Crew_profile_base < Package
   version '0.0.1'
   license 'GPL-3+'
   compatibility 'all'
-  source_url 'file:///dev/null'
-  source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  source_url 'SKIP'
 
   binary_url({
     aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/crew_profile_base/0.0.1-pre6_armv7l/crew_profile_base-0.0.1-pre6-chromeos-armv7l.tar.xz',

packages/depot_tools.rb

@@ -7,8 +7,7 @@ class Depot_tools < Package
   version @_ver
   license 'BSD-Google'
   compatibility 'all'
-  source_url 'file:///dev/null'
-  source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  source_url 'SKIP'
 
   binary_url({
     aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/depot_tools/da768751_armv7l/depot_tools-da768751-chromeos-armv7l.tar.xz',

packages/ffmpeg.rb

@@ -7,8 +7,7 @@ class Ffmpeg < Package
   version @_ver
   license 'LGPL-2,1, GPL-2, GPL-3, and LGPL-3' # When changing ffmpeg's configure options, make sure this variable is still accurate.
   compatibility 'all'
-  source_url 'file:///dev/null'
-  source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  source_url 'SKIP'
 
   binary_url({
     aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/ffmpeg/4.4_armv7l/ffmpeg-4.4-chromeos-armv7l.tar.xz',

packages/gcc_tools.rb

@@ -6,8 +6,7 @@ class Gcc_tools < Package
   version '1.1'
   license 'GPL-3+'
   compatibility 'all'
-  source_url 'file:///dev/null'
-  source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  source_url 'SKIP'
 
   def self.build
     system 'cat << "EOF" > crewfix

packages/gn.rb

@@ -6,8 +6,7 @@ class Gn < Package
   version 'dca877f'
   license 'BSD'
   compatibility 'all'
-  source_url 'file:///dev/null'
-  source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  source_url 'SKIP'
 
   binary_url ({
     aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/gn/dca877f_armv7l/gn-dca877f-chromeos-armv7l.tar.xz',

packages/go_tools.rb

@@ -7,8 +7,7 @@ class Go_tools < Package
   version @_ver
   license 'BSD'
   compatibility 'all'
-  source_url 'file:///dev/null'
-  source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  source_url 'SKIP'
 
   binary_url({
     aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/go_tools/0.6.6_armv7l/go_tools-0.6.6-chromeos-armv7l.tar.xz',

packages/gyp_next.rb

@@ -6,8 +6,7 @@ class Gyp_next < Package
   version '0.8.0'
   license 'BSD'
   compatibility 'all'
-  source_url 'file:///dev/null'
-  source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  source_url 'SKIP'
 
   binary_url({
     aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/gyp_next/0.8.0_armv7l/gyp_next-0.8.0-chromeos-armv7l.tar.xz',

packages/hget.rb

@@ -6,8 +6,7 @@ class Hget < Package
   version '8cff5f7'
   license 'MIT'
   compatibility 'all'
-  source_url 'file:///dev/null'
-  source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  source_url 'SKIP'
 
   binary_url ({
     aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/hget/8cff5f7_armv7l/hget-8cff5f7-chromeos-armv7l.tar.xz',

packages/jdk11.rb

@@ -6,8 +6,7 @@ class Jdk11 < Package
   version '11.0.10'
   license 'Oracle-BCLA-JavaSE'
   compatibility 'x86_64'
-  source_url 'file:///dev/null'
-  source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  source_url 'SKIP'
 
   binary_url ({
     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/jdk11/11.0.10_x86_64/jdk11-11.0.10-chromeos-x86_64.tar.xz',

packages/jdk15.rb

@@ -6,8 +6,7 @@ class Jdk15 < Package
   version '15.0.2'
   license 'Oracle-BCLA-JavaSE'
   compatibility 'x86_64'
-  source_url 'file:///dev/null'
-  source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  source_url 'SKIP'
 
   binary_url ({
     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/jdk15/15.0.2_x86_64/jdk15-15.0.2-chromeos-x86_64.tar.xz',

packages/jdk8.rb

@@ -6,8 +6,7 @@ class Jdk8 < Package
   version '8u281'
   license 'Oracle-BCLA-JavaSE'
   compatibility 'all'
-  source_url 'file:///dev/null'
-  source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  source_url 'SKIP'
 
   binary_url ({
     aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/jdk8/8u281_armv7l/jdk8-8u281-chromeos-armv7l.tar.xz',

packages/ld_default.rb

@@ -6,8 +6,7 @@ class Ld_default < Package
   version '1.2'
   license 'GPL-3+'
   compatibility 'all'
-  source_url 'file:///dev/null'
-  source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  source_url 'SKIP'
 
   depends_on 'llvm'
 

packages/libaom.rb

@@ -6,8 +6,7 @@ class Libaom < Package
   version '3.0.0'
   license 'BSD-2'
   compatibility 'all'
-  source_url 'file:///dev/null'
-  source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  source_url 'SKIP'
 
   binary_url({
     aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libaom/3.0.0_armv7l/libaom-3.0.0-chromeos-armv7l.tar.xz',

packages/libtinfo.rb

@@ -6,8 +6,7 @@ class Libtinfo < Package
   version '6.2-1'
   license 'MIT' # Ncurses license
   compatibility 'all'
-  source_url 'file:///dev/null'
-  source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  source_url 'SKIP'
 
   binary_url ({
   })

packages/libyuv.rb

@@ -6,8 +6,7 @@ class Libyuv < Package
   version 'd470'
   license 'BSD-Google'
   compatibility 'all'
-  source_url 'file:///dev/null'
-  source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  source_url 'SKIP'
 
   binary_url({
     aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libyuv/d470_armv7l/libyuv-d470-chromeos-armv7l.tar.xz',

packages/linuxheaders.rb

@@ -6,8 +6,7 @@ class Linuxheaders < Package
   version '4.14'
   license 'GPL-2'
   compatibility 'all'
-  source_url 'file:///dev/null'
-  source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  source_url 'SKIP'
 
   binary_url ({
     aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/linuxheaders/4.14_armv7l/linuxheaders-4.14-chromeos-armv7l.tar.xz',

packages/lxml.rb

@@ -6,8 +6,7 @@ class Lxml < Package
   version '4.6.1'
   license 'BSD, ElementTree, GPL-2 and PSF-2'
   compatibility 'all'
-  source_url 'file:///dev/null'
-  source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  source_url 'SKIP'
 
   binary_url({
     aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/lxml/4.6.1_armv7l/lxml-4.6.1-chromeos-armv7l.tar.xz',

packages/perf.rb

@@ -6,8 +6,7 @@ class Perf < Package
   version '4.14'
   license 'GPL-2'
   compatibility 'all'
-  source_url 'file:///dev/null'
-  source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  source_url 'SKIP'
 
   binary_url ({
     aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/perf/4.14_armv7l/perf-4.14-chromeos-armv7l.tar.xz',

packages/pyelftools.rb

@@ -6,8 +6,7 @@ class Pyelftools < Package
   version '0.27'
   license 'public-domain'
   compatibility 'all'
-  source_url 'file:///dev/null'
-  source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  source_url 'SKIP'
 
   binary_url ({
      aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pyelftools/0.27_armv7l/pyelftools-0.27-chromeos-armv7l.tar.xz',

packages/pygments.rb

@@ -6,8 +6,7 @@ class Pygments < Package
   version '2.8.0'
   license 'BSD'
   compatibility 'all'
-  source_url 'file:///dev/null'
-  source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  source_url 'SKIP'
 
   binary_url({
     aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pygments/2.8.0_armv7l/pygments-2.8.0-chromeos-armv7l.tar.xz',

packages/qtbase.rb

@@ -7,8 +7,7 @@ class Qtbase < Package
   version @_ver + '-1'
   license 'FDL, GPL-2, GPL-3, GPL-3-with-qt-exception and LGPL-3'
   compatibility 'all'
-  source_url 'file:///dev/null'
-  source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  source_url 'SKIP'
 
   binary_url ({
      aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/qtbase/5.15.2-1_armv7l/qtbase-5.15.2-1-chromeos-armv7l.tar.xz',

packages/rust.rb

@@ -7,8 +7,7 @@ class Rust < Package
   version @_ver
   license 'Apache-2.0 and MIT'
   compatibility 'all'
-  source_url 'file:///dev/null'
-  source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  source_url 'SKIP'
 
   binary_url({
     aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/rust/1.51.0_armv7l/rust-1.51.0-chromeos-armv7l.tar.xz',

packages/sommelier.rb

@@ -6,8 +6,7 @@ class Sommelier < Package
   version '20210109-2'
   license 'BSD-Google'
   compatibility 'all'
-  source_url 'file:///dev/null'
-  source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  source_url 'SKIP'
 
   binary_url({
     aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/sommelier/20210109-2_armv7l/sommelier-20210109-2-chromeos-armv7l.tar.xz',

packages/symfony.rb

@@ -6,8 +6,7 @@ class Symfony < Package
   version '4.22.0'
   license 'Symfony-cli-EULA'
   compatibility 'all'
-  source_url 'file:///dev/null'
-  source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  source_url 'SKIP'
 
   depends_on 'php74' unless File.exist? "#{CREW_PREFIX}/bin/php"
 

packages/texlive.rb

@@ -6,8 +6,7 @@ class Texlive < Package
   version '20210413'
   license 'GPL-2 and GPL-3'
   compatibility 'all'
-  source_url 'file:///dev/null'
-  source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  source_url 'SKIP'
 
   binary_url({
     aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/texlive/20210413_armv7l/texlive-20210413-chromeos-armv7l.tar.xz',

packages/unicode_emoji.rb

@@ -7,8 +7,7 @@ class Unicode_emoji < Package
   version @_ver
   license 'unicode'
   compatibility 'all'
-  source_url 'file:///dev/null'
-  source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  source_url 'SKIP'
 
   binary_url({
     aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/unicode_emoji/13.1_armv7l/unicode_emoji-13.1-chromeos-armv7l.tar.xz',

packages/xdg_base.rb

@@ -6,8 +6,7 @@ class Xdg_base < Package
   version '0.7-7-1'
   license 'GPL-3+'
   compatibility 'all'
-  source_url 'file:///dev/null'
-  source_sha256 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  source_url 'SKIP'
 
   binary_url({
     aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/xdg_base/0.7-7-1_armv7l/xdg_base-0.7-7-1-chromeos-armv7l.tar.xz',