mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-11-23 19:41:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

build_torcx_store: add package 'url' location

Browse Source 
This also moves the 'torcx' prefixing logic over to the torcx upload
root introduced in the release util library.

It also corrects a bug in how the source package was being determined.
This commit is contained in:
Euan Kemp 2017-09-06 13:46:13 -07:00
parent 8f712b2af1
commit c196be8798
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
build_torcx_store
View File

@ -95,7 +95,7 @@ function torcx_package() {
local version=${pkg:${#name}+1} local version=${pkg:${#name}+1}
local manifest_path="${2}" local manifest_path="${2}"
local type="${3}" local type="${3}"
local deppkg digest file rpath sha512sum source_pkg tmproot tmppkgroot update_default local deppkg digest file rpath sha512sum source_pkg rdepends tmproot tmppkgroot update_default
local pkg_cas_file pkg_cas_root local pkg_cas_file pkg_cas_root
local pkg_locations=() local pkg_locations=()
local name=${name##*/} local name=${name##*/}
@ -120,12 +120,14 @@ function torcx_package() {
# Install the meta-package and its direct dependencies. # Install the meta-package and its direct dependencies.
for deppkg in "=${pkg}" $(torcx_dependencies "${pkg}") for deppkg in "=${pkg}" $(torcx_dependencies "${pkg}")
do do
# The first file in an app-torcx package is, by convention,
# considered the source package.
[ -z "${source_pkg}" ] && source_pkg="${deppkg#=}"
torcx_build "${tmproot}" "${deppkg}" torcx_build "${tmproot}" "${deppkg}"
done done
# by convention, the first dependency in a torcx package is the primary
# source package
rdepends=($(torcx_dependencies "${pkg}"))
source_pkg="${rdepends[0]#=}"
# Pluck out shared libraries and SONAME links. # Pluck out shared libraries and SONAME links.
sudo mv "${tmproot}"/{lib,tmplib} sudo mv "${tmproot}"/{lib,tmplib}
sudo rm -fr "${tmproot}/tmplib/debug" sudo rm -fr "${tmproot}/tmplib/debug"
@ -199,7 +201,9 @@ function torcx_package() {
update_default=true update_default=true
pkg_locations+=("/usr/share/torcx/store/${name}:${version}.torcx.tgz") pkg_locations+=("/usr/share/torcx/store/${name}:${version}.torcx.tgz")
fi fi
# TODO: add upload bucket path to pkg_locations if [[ "${FLAGS_upload}" -eq ${FLAGS_TRUE} ]]; then
pkg_locations+=("$(download_tectonic_torcx_url "pkg/${BOARD}/${name}/${digest}/${name}:${version}.torcx.tgz")")
fi
torcx_manifest::add_pkg "${manifest_path}" \ torcx_manifest::add_pkg "${manifest_path}" \
"${name}" \ "${name}" \
"${version}" \ "${version}" \
@ -236,21 +240,20 @@ set_build_symlinks latest "${FLAGS_group}-latest"
# Upload the pkgs referenced by this manifest # Upload the pkgs referenced by this manifest
for pkg in $(torcx_manifest::get_pkg_names "${manifest_path}"); do for pkg in $(torcx_manifest::get_pkg_names "${manifest_path}"); do
pkg_name="${pkgs[0]}"
for digest in $(torcx_manifest::get_digests "${manifest_path}" "${pkg}"); do for digest in $(torcx_manifest::get_digests "${manifest_path}" "${pkg}"); do
# no need to sign; the manifest includes their shasum and is signed. # no need to sign; the manifest includes their shasum and is signed.
upload_files \ upload_files \
'torcx pkg' \ 'torcx pkg' \
"${UPLOAD_ROOT}/torcx/pkg/${BOARD}/${pkg_name}/${digest}" \ "${TORCX_UPLOAD_ROOT}/pkg/${BOARD}/${pkg}/${digest}" \
"" \ "" \
"${TORCX_CAS_ROOT}/${pkg_name}/${digest}"/*.torcx.tgz "${TORCX_CAS_ROOT}/${pkg}/${digest}"/*.torcx.tgz
done done
done done
# Upload the manifest # Upload the manifest
sign_and_upload_files \ sign_and_upload_files \
'torcx manifest' \ 'torcx manifest' \
"${UPLOAD_ROOT}/torcx/manifests/${BOARD}/${COREOS_VERSION}" \ "${TORCX_UPLOAD_ROOT}/manifests/${BOARD}/${COREOS_VERSION}" \
"" \ "" \
"${manifest_path}" "${manifest_path}"