mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-29 01:21:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1751 from flatcar/jepio/fixes

Browse Source 
Small fixes
This commit is contained in:
Jeremi Piotrowski 2024-03-15 17:13:03 +01:00 committed by GitHub
commit dc71208a3e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build_library/build_image_util.sh
View File

@ -529,7 +529,8 @@ insert_extra_slsa() {
if [ -f "${binpkg}" ]; then if [ -f "${binpkg}" ]; then
info "Found ${atom} at ${binpkg}" info "Found ${atom} at ${binpkg}"
qtbz2 -O -t "${binpkg}" | \ qtbz2 -O -t "${binpkg}" | \
sudo tar -C "${rootfs}" -xj --wildcards './usr/share/SLSA' lbzcat -d -c - | \
sudo tar -C "${rootfs}" -x --wildcards './usr/share/SLSA'
continue continue
fi fi
warn "Missing SLSA information for ${atom}" warn "Missing SLSA information for ${atom}"

3
build_library/prod_image_util.sh
View File

@ -44,7 +44,8 @@ extract_prod_gcc() {
# /usr/lib/gcc/x86_64-cros-linux-gnu/$version/* # /usr/lib/gcc/x86_64-cros-linux-gnu/$version/*
# Instead we extract them to plain old /usr/lib # Instead we extract them to plain old /usr/lib
qtbz2 -O -t "${pkg}" | \ qtbz2 -O -t "${pkg}" | \
sudo tar -C "${root_fs_dir}" -xj \ lbzcat -d -c - | \
sudo tar -C "${root_fs_dir}" -x \
--transform 's#/usr/lib/.*/#/usr/lib64/#' \ --transform 's#/usr/lib/.*/#/usr/lib64/#' \
--wildcards './usr/lib/gcc/*.so*' \ --wildcards './usr/lib/gcc/*.so*' \
--wildcards './usr/share/SLSA' --wildcards './usr/share/SLSA'

2
build_library/vm_image_util.sh
View File

@ -695,7 +695,7 @@ _write_cpio_common() {
# Build the squashfs, embed squashfs into a gzipped cpio # Build the squashfs, embed squashfs into a gzipped cpio
pushd "${cpio_target}" >/dev/null pushd "${cpio_target}" >/dev/null
sudo mksquashfs "${base_dir}" "./usr.squashfs" -pf "${VM_TMP_DIR}/extra" sudo mksquashfs "${base_dir}" "./usr.squashfs" -pf "${VM_TMP_DIR}/extra" -xattrs-exclude '^btrfs.'
find . | cpio -o -H newc | gzip > "$2" find . | cpio -o -H newc | gzip > "$2"
popd >/dev/null popd >/dev/null

4
ci-automation/test.sh
View File

@ -167,7 +167,7 @@ function _test_run_impl() {
# determine success based on test results (tapfile). # determine success based on test results (tapfile).
set +e set +e
touch sdk_container/.env touch sdk_container/.env
docker run --rm --name="${container_name}" --privileged --net host -v /dev:/dev \ docker run --pull always --rm --name="${container_name}" --privileged --net host -v /dev:/dev \
-w /work -v "$PWD":/work "${mantle_ref}" \ -w /work -v "$PWD":/work "${mantle_ref}" \
bash -c "git config --global --add safe.directory /work && \ bash -c "git config --global --add safe.directory /work && \
source sdk_container/.env && \ source sdk_container/.env && \
@ -176,7 +176,7 @@ function _test_run_impl() {
rm -f "${work_dir}/first_run" rm -f "${work_dir}/first_run"
# Note: git safe.directory is not set in this run as it does not use git # Note: git safe.directory is not set in this run as it does not use git
docker run --rm --name="${container_name}" --privileged --net host -v /dev:/dev \ docker run --pull always --rm --name="${container_name}" --privileged --net host -v /dev:/dev \
-w /work -v "$PWD":/work "${mantle_ref}" \ -w /work -v "$PWD":/work "${mantle_ref}" \
ci-automation/test_update_reruns.sh \ ci-automation/test_update_reruns.sh \
"${arch}" "${vernum}" "${image}" "${retry}" \ "${arch}" "${vernum}" "${image}" "${retry}" \

5
sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-libs/ncurses vendored Normal file
View File

@ -0,0 +1,5 @@
cros_post_src_install_tmux_terminfo() {
mkdir -p "${ED}/usr/share/terminfo/t"
cp "${ED}/usr/share/terminfo/"{s/screen,t/tmux}
cp "${ED}/usr/share/terminfo/"{s/screen-256color,t/tmux-256color}
}