Update for release 67 and above

packages/glibc.rb

@@ -3,35 +3,17 @@ require 'package'
 class Glibc < Package
   description 'The GNU C Library project provides the core libraries for GNU/Linux systems.'
   homepage 'https://www.gnu.org/software/libc/'
-  version '1.1'
+  version '1.2'
 
   is_fake
 
-  if (File.exist? "/lib/libc-2.23.so") || (File.exist? "/lib64/libc-2.23.so")
-    depends_on 'glibc223'
-    # Check previous version
-    if File.exist? CREW_CONFIG_PATH + "meta/glibc219.filelist"
-      conflict_solve = "`crew remove glibc219`"
+  if CHROMEOS_RELEASE <= '66'
+    if (File.exist? '/lib/libc-2.23.so') || (File.exist? '/lib64/libc-2.23.so')
+      # Check previous version
+      if File.exist? CREW_CONFIG_PATH + 'meta/glibc219.filelist'
+        system 'crew remove glibc219'
+      end
+      depends_on 'glibc223'
     end
-  else
-    depends_on 'glibc219'
-  end
-
-  # Check old glibc
-  if File.exist? CREW_CONFIG_PATH + "meta/glibc.filelist"
-    if File.exist? CREW_CONFIG_PATH + "meta/glibc223.filelist"
-      # Already installed old glibc and glibc223, so need to remove both once
-      conflict_solve = "`crew remove glibc223 glibc`"
-    else
-      # Already installed old glibc, so need it once
-      conflict_solve = "`crew remove glibc`"
-    end
-  end
-
-  if conflict_solve
-    puts
-    puts "In order to install/upgrade glibc, please execute #{conflict_solve} first".lightblue
-    puts
-    exit 1
   end
 end

packages/glibc219.rb

-require 'package'
-
-class Glibc219 < Package
-  description 'GNU C Library'
-  homepage 'https://www.gnu.org/software/libc/'
-  version '2.19-2'
-  binary_url ({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew-cross/glibc219-2.19-2-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew-cross/glibc219-2.19-2-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew-cross/glibc219-2.19-2-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew-cross/glibc219-2.19-2-chromeos-x86_64.tar.xz',
-  })
-  binary_sha256 ({
-    aarch64: 'df5fb603d658438489bc1d54de317bf8901e2cd3d80a4f3c3379e93cf8539c3c',
-     armv7l: 'df5fb603d658438489bc1d54de317bf8901e2cd3d80a4f3c3379e93cf8539c3c',
-       i686: 'a7e09144668734a08c660093b4f9ef7b6660c89c027d16eb9db1426f61660d85',
-     x86_64: 'bd8a5e69ca2994884bb7cf006887754331faa90e59e6165a693c4392968ccca3',
-  })
-end

packages/glibc223.rb

@@ -3,7 +3,7 @@ require 'package'
 class Glibc223 < Package
   description 'GNU C Library'
   homepage 'https://www.gnu.org/software/libc/'
-  version '2.23-3'
+  version '2.23-4'
   source_url 'https://ftpmirror.gnu.org/glibc/glibc-2.23.tar.xz'
   source_sha256 '94efeb00e4603c8546209cefb3e1a50a5315c86fa9b078b6fad758e187ce13e9'
 
@@ -23,6 +23,10 @@ class Glibc223 < Package
   depends_on 'libgd' => :build
   depends_on 'texinfo' => :build
 
+  if (CHROMEOS_RELEASE > '66') && (ARGV[0] != 'search')
+    abort "This package cannot be installed with release #{CHROMEOS_RELEASE}!".lightred
+  end
+
   def self.patch
     # Apply patch due to new version of binutils  which causes compilation failure
     # http://lists.busybox.net/pipermail/buildroot/2017-August/199812.html