mirror of
https://github.com/chromebrew/chromebrew.git
synced 2026-01-08 23:18:10 -05:00
Fix util_linux build, rebuild pcre2, fix install.sh hash checking, etc — pcre2 → 10.47-1,util_linux → 2.41.2 (#13251)
* Add unbuilt util_linux to updater-util_linux-2.41.2 * Move to meson WIP. Signed-off-by: Satadru Pramanik <satadru@gmail.com> * WIP util-linux changes. See also https://github.com/util-linux/util-linux/issues/3763 for upstream build failure report. Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Update to latest commit from stable/v2.4.1 branch. Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Fix util_linux build using 5.10 linux headers, rebuild pcre2. Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Let gitlab_pkginfo handle build packages, fix download of build packages, fix debug aliases, fix crew const not working in a repo root. Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Update arm binaries for util_linux. Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Fix cached archive download_check in installer.sh Signed-off-by: Satadru Pramanik <satadru@gmail.com> * bump version Signed-off-by: Satadru Pramanik <satadru@gmail.com> --------- Signed-off-by: Satadru Pramanik <satadru@gmail.com> Co-authored-by: chromebrew-actions[bot] <chromebrew-actions[bot]@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
126888df5e
commit
3735bf4c4e
@@ -100,7 +100,7 @@ class PackageUtils
|
||||
return pkg_version
|
||||
end
|
||||
|
||||
def self.get_gitlab_pkginfo(pkg_name, pkg_version, pkg_arch, verbose = nil)
|
||||
def self.get_gitlab_pkginfo(pkg_name, pkg_version, pkg_arch, build = nil, verbose = nil)
|
||||
# This is largely rehashing self.get_binary_url(pkg) using the
|
||||
# curl and jq binaries for debugging purposes.
|
||||
# outputs are :pkg_file_name, :pkg_sha256, :pkg_upload_date :pkg_url
|
||||
@@ -115,13 +115,18 @@ class PackageUtils
|
||||
# abort "Gitlab upload at #{fallback_url} not found."lightred unless `curl -fsI "#{fallback_url}"`.lines.first.split[1] == '200'
|
||||
|
||||
# What is the gitlab package binary PACKAGE_ID?
|
||||
|
||||
crewlog 'curl -s --location \\'
|
||||
crewlog "#{CREW_GITLAB_PKG_REPO}?package_type=generic&package_name=#{pkg_name}&package_version=#{pkg_version}_#{pkg_arch}#{'_build' if build}"
|
||||
gitlab_binary_pkg_id = `curl -s --location \
|
||||
"#{CREW_GITLAB_PKG_REPO}?package_type=generic&package_name=#{pkg_name}&package_version=#{pkg_version}_#{pkg_arch}" \
|
||||
| jq -r ".[] | select(.name==\\"#{pkg_name}\\" and .version==\\"#{pkg_version}_#{pkg_arch}\\") | .id"`.chomp
|
||||
"#{CREW_GITLAB_PKG_REPO}?package_type=generic&package_name=#{pkg_name}&package_version=#{pkg_version}_#{pkg_arch}#{'_build' if build}" \
|
||||
| jq -r ".[] | select(.name==\\"#{pkg_name}\\" and .version==\\"#{pkg_version}_#{pkg_arch}#{'_build' if build}\\") | .id"`.chomp
|
||||
crewlog "gitlab_binary_pkg_id is #{gitlab_binary_pkg_id}" if verbose
|
||||
# What is the hash of the gitlab package remote binary file name?
|
||||
pkg_file_name = `curl -s --location \
|
||||
"#{CREW_GITLAB_PKG_REPO}/#{gitlab_binary_pkg_id}/package_files" \
|
||||
| jq -r "last(.[].file_name)"`.chomp
|
||||
crewlog "pkg_file_name is #{pkg_file_name}" if verbose
|
||||
# What is the hash of the gitlab package remote binary?
|
||||
pkg_sha256 = `curl -s --location \
|
||||
"#{CREW_GITLAB_PKG_REPO}/#{gitlab_binary_pkg_id}/package_files" \
|
||||
@@ -130,6 +135,7 @@ class PackageUtils
|
||||
pkg_upload_date = `curl -s --location \
|
||||
"#{CREW_GITLAB_PKG_REPO}/#{gitlab_binary_pkg_id}/package_files" \
|
||||
| jq -r "last(.[].created_at)"`.chomp
|
||||
crewlog "pkg_upload_date is #{pkg_upload_date}" if verbose
|
||||
pkg_url = "#{CREW_GITLAB_PKG_REPO}/generic/#{pkg_name}/#{pkg_version}_#{pkg_arch}/#{pkg_file_name}"
|
||||
puts "\e[1A\e[K#{pkg_name.capitalize} #{pkg_version} has a#{'n' if pkg_arch.start_with?('a', 'e', 'i', 'o', 'u')} #{pkg_arch} upload on Gitlab.\n".green
|
||||
puts "\e[1A\e[K sha256: #{pkg_sha256}\n uploaded: #{pkg_upload_date}\n url: #{pkg_url}\n".orange if verbose
|
||||
|
||||
Reference in New Issue
Block a user