Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make some shell scripts use hermetic aspect toolchains #140

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

make some shell scripts use hermetic aspect toolchains #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 14 additions & 2 deletions apt/private/dpkg_status.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,28 @@ _DOC = """TODO: docs"""

def _dpkg_status_impl(ctx):
bsdtar = ctx.toolchains[tar_lib.TOOLCHAIN_TYPE]
coreutils = ctx.toolchains["@aspect_bazel_lib//lib:coreutils_toolchain_type"]

output = ctx.actions.declare_file(ctx.attr.name + ".tar")

args = ctx.actions.args()
args.add(bsdtar.tarinfo.binary)
args.add(coreutils.coreutils_info.bin.path)
args.add(output)
args.add_all(ctx.files.controls)

tools = depset(
transitive = [
bsdtar.default.files,
depset([coreutils.coreutils_info.bin]),
]
)

ctx.actions.run(
executable = ctx.executable._dpkg_status_sh,
inputs = ctx.files.controls,
outputs = [output],
tools = bsdtar.default.files,
tools = tools,
arguments = [args],
)

Expand All @@ -42,5 +51,8 @@ dpkg_status = rule(
),
},
implementation = _dpkg_status_impl,
toolchains = [tar_lib.TOOLCHAIN_TYPE],
toolchains = [
tar_lib.TOOLCHAIN_TYPE,
"@aspect_bazel_lib//lib:coreutils_toolchain_type",
],
)
26 changes: 15 additions & 11 deletions apt/private/dpkg_status.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,27 @@
set -o pipefail -o errexit -o nounset

readonly bsdtar="$1"
readonly out="$2"
shift 2
readonly coreutils="$2"
readonly out="$3"
shift 3

tmp_out=$(mktemp)
tmp_out=$($coreutils mktemp)

while (( $# > 0 )); do
$bsdtar -xf "$1" --to-stdout ./control |
awk '{
print $0;
if (NR == 1) { print "Status: install ok installed"};
} END { print "" }
' >> $tmp_out
$bsdtar -xf "$1" --to-stdout ./control | (
# Print first line
read -r line && echo "$line" && echo "Status: install ok installed"
# Print remaining lines, including the last one
while read -r line || [ -n "$line" ]; do
echo "$line"
done
echo ""
) >> "$tmp_out"
shift
done

echo "#mtree
./var/lib/dpkg/status type=file uid=0 gid=0 mode=0644 time=1672560000 contents=$tmp_out
" | "$bsdtar" $@ -cf "$out" "@-"
" | "$bsdtar" "$@" -cf "$out" "@-"

rm $tmp_out
$coreutils rm "$tmp_out"
16 changes: 14 additions & 2 deletions apt/private/dpkg_statusd.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,31 @@ _DOC = """TODO: docs"""

def _dpkg_statusd_impl(ctx):
bsdtar = ctx.toolchains[tar_lib.TOOLCHAIN_TYPE]
coreutils = ctx.toolchains["@aspect_bazel_lib//lib:coreutils_toolchain_type"]

ext = tar_lib.common.compression_to_extension[ctx.attr.compression] if ctx.attr.compression else ".tar"
output = ctx.actions.declare_file(ctx.attr.name + ext)

args = ctx.actions.args()
args.add(bsdtar.tarinfo.binary)
args.add(coreutils.coreutils_info.bin.path)
args.add(output)
args.add(ctx.file.control)
args.add(ctx.attr.package_name)
tar_lib.common.add_compression_args(ctx.attr.compression, args)

tools = depset(
transitive = [
bsdtar.default.files,
depset([coreutils.coreutils_info.bin]),
]
)

ctx.actions.run(
executable = ctx.executable._dpkg_statusd_sh,
inputs = [ctx.file.control],
outputs = [output],
tools = bsdtar.default.files,
tools = tools,
arguments = [args],
)

Expand Down Expand Up @@ -50,5 +59,8 @@ dpkg_statusd = rule(
),
},
implementation = _dpkg_statusd_impl,
toolchains = [tar_lib.TOOLCHAIN_TYPE],
toolchains = [
tar_lib.TOOLCHAIN_TYPE,
"@aspect_bazel_lib//lib:coreutils_toolchain_type",
],
)
52 changes: 32 additions & 20 deletions apt/private/dpkg_statusd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,40 @@
set -o pipefail -o errexit -o nounset

readonly bsdtar="$1"
readonly out="$2"
readonly control_path="$3"
readonly package_name="$4"
shift 4
readonly coreutils="$2"
readonly out="$3"
readonly control_path="$4"
readonly package_name="$5"
shift 5

include=(--include "^./control$" --include "^./md5sums$")

tmp=$(mktemp -d)
tmp=$($coreutils mktemp -d)
"$bsdtar" -xf "$control_path" "${include[@]}" -C "$tmp"

"$bsdtar" -cf - $@ --format=mtree "${include[@]}" --options '!gname,!uname,!sha1,!nlink,!time' "@$control_path" | \
awk -v pkg="$package_name" '{
if ($1=="#mtree") {
print $1; next
};
# strip leading ./ prefix
sub(/^\.?\//, "", $1);

if ($1 ~ /^control/) {
$1 = "./var/lib/dpkg/status.d/" pkg " contents=./" $1;
} else if ($1 ~ /^md5sums/) {
$1 = "./var/lib/dpkg/status.d/" pkg ".md5sums contents=./" $1;
}
print $0
}' | "$bsdtar" $@ -cf "$out" -C "$tmp/" @-
"$bsdtar" -cf - "$@" --format=mtree "${include[@]}" --options '!gname,!uname,!sha1,!nlink,!time' "@$control_path" | \
while IFS= read -r line; do
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i found awk scripts to be much more readable and easy to author for text editing purposes. however in this case we don't have awk built off the shelf.

I have bazel recipes in place to build GAWK for windows, darwin and linux but never made a release.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe it's better to introduce a gawk toolchain in bazel-lib and use that? i am not sure how much effort that would take.

first_field=$(echo "$line" | cut -d' ' -f1)
rest_of_line=$(echo "$line" | cut -d' ' -f2-)

if [ "$first_field" = "#mtree" ]; then
echo "$line"
continue
fi

# Strip leading ./ prefix using parameter expansion
first_field="${first_field/#.\//}"
first_field="${first_field/#\//}"

if [[ "$first_field" =~ ^control ]]; then
first_field="./var/lib/dpkg/status.d/${package_name} contents=./${first_field}"
elif [[ "$first_field" =~ ^md5sums ]]; then
first_field="./var/lib/dpkg/status.d/${package_name}.md5sums contents=./${first_field}"
fi

if [ -n "$rest_of_line" ]; then
echo "$first_field $rest_of_line"
else
echo "$first_field"
fi
done | "$bsdtar" "$@" -cf "$out" -C "$tmp/" @-
Loading