Skip to content
This repository has been archived by the owner on Oct 2, 2024. It is now read-only.

Mksquashfs quiet #1920

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions bin/ch-convert
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ cv_dir_squash () {
# Exclude build cache metadata. 64kiB block size based on Shane’s
# experiments.
# shellcheck disable=SC2086
quiet mksquashfs "$1" "$2" $squash_xattr_arg -b 65536 -noappend -all-root \
-pf "$pflist" -e "$1"/ch/git -e "$1"/ch/git.pickle
mksquashfs "$1" "$2" $squash_xattr_arg -b 65536 -noappend -all-root \
-pf "$pflist" -e "$1"/ch/git -e "$1"/ch/git.pickle > /dev/null
# Zero the archive’s internal modification time at bytes 8–11, 0-indexed
# [1]. Newer SquashFS-Tools ≥4.3 have option “-fstime 0” to do this, but
# CentOS 7 comes with 4.2. [1]: https://dr-emann.github.io/squashfs/
Expand Down Expand Up @@ -465,7 +465,8 @@ EOF

chimage_in_validate () {
img=$(chimage_path "$1")
[ -d "$img" ] || FATAL "source image not found in ch-image storage: $1"
echo "ch-img path: $img"
[ -d "$img" ] || FATAL "ch-img path: $img, source image not found in ch-image storage: $1"
}

chimage_out_validate () {
Expand Down
6 changes: 0 additions & 6 deletions doc/dev.rst
Original file line number Diff line number Diff line change
Expand Up @@ -253,12 +253,6 @@ fail or that won’t give you additional information, and not pushing every
commit (CI tests only the most recent commit in a pushed group). Avoid making
commits merely to trigger CI.

**Purging Docker cache.** :code:`misc/docker-clean.sh` can be used to purge
your Docker cache, either by removing all tags or deleting all containers and
images. The former is generally preferred, as it lets you update only those
base images that have actually changed (the ones that haven’t will be
re-tagged).

Issue labeling
--------------

Expand Down
2 changes: 1 addition & 1 deletion misc/Makefile.am
Original file line number Diff line number Diff line change
@@ -1 +1 @@
EXTRA_DIST = docker-clean.sh grep version
EXTRA_DIST = grep version
43 changes: 0 additions & 43 deletions misc/docker-clean.sh

This file was deleted.

1 change: 0 additions & 1 deletion misc/loc
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@ find . -type f -a \( \
-path ./.gitattributes \
-o -path ./.gitignore \
-o -path ./VERSION \
-o -path ./misc/docker-clean.sh \
-o -path ./misc/branches-tidy \
-o -path ./misc/grep \
-o -path ./misc/loc \) | sort > /tmp/loc.misc
Expand Down
Loading