diff --git a/README.md b/README.md index cbd40bd72..a7e8822e5 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ Where available commands are: | files | display installed files of package(s) | | help | get information about command usage | | install | install package(s) along with dependencies after prompting for confirmation | -| list | available, installed, compatible or incompatible packages | +| list | available, compatible, incompatible, essential, installed packages | | postinstall | display postinstall messages of package(s) | | prop | display all package boolean properties | | reinstall | remove and install package(s) | diff --git a/bin/crew b/bin/crew index f5ce957d3..991347d07 100755 --- a/bin/crew +++ b/bin/crew @@ -1616,7 +1616,7 @@ def build_command(args) resolve_dependencies_and_build else puts 'Unable to build a fake package. Skipping build.'.lightred if @pkg.is_fake? - puts "Package #{@pkg.name} is not compatible with your device architecture (#{ARCH}). Skipping build.".lightred unless PackageUtils.compatible?(@pkg) + puts "Package #{@pkg.name} is not compatible with your device. Skipping build.".lightred unless PackageUtils.compatible?(@pkg) puts 'Unable to build without source. Skipping build.'.lightred unless @pkg.source?(ARCH) && @pkg.source_url.to_s.upcase != 'SKIP' puts 'Compile not needed. Skipping build.'.lightred if @pkg.no_compile_needed? end diff --git a/lib/const.rb b/lib/const.rb index c2d1995fe..9a743d0f4 100644 --- a/lib/const.rb +++ b/lib/const.rb @@ -2,7 +2,7 @@ # Defines common constants used in different parts of crew require 'etc' -CREW_VERSION = '1.50.4' +CREW_VERSION = '1.50.5' # Kernel architecture. KERN_ARCH = Etc.uname[:machine] diff --git a/lib/package_utils.rb b/lib/package_utils.rb index 1acc25a23..b800dc9ab 100644 --- a/lib/package_utils.rb +++ b/lib/package_utils.rb @@ -25,7 +25,7 @@ class PackageUtils end def self.compatible?(pkg) - return pkg.compatibility.casecmp?('all') || pkg.compatibility.include?(ARCH) + return (pkg.compatibility.casecmp?('all') || pkg.compatibility.include?(ARCH)) && (pkg.min_glibc.nil? || (pkg.min_glibc <= LIBC_VERSION)) end def self.get_url(pkg, build_from_source: false)