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.

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

bake.sh: Gate mksquashfs xattr exclusion behind version check #60

Merged
merged 1 commit into from
Apr 18, 2024

Conversation

pothos
Copy link
Member

@pothos pothos commented Apr 17, 2024

Old mksquashfs versions don't support the xattr exclusion that was added to prevent harmless warnings getting printed. To support old mksquashfs versions, gate this behind a version check.

How to use

Testing done

I tested ./create_wasmtime_sysext.sh 4.0.0 wasmtime with a 4.6 version, and for an older version it was also tested

@pothos pothos force-pushed the kai/mksquashfs-version branch from 7ad8eb0 to 1d2adef Compare April 17, 2024 13:16
@pothos pothos requested a review from a team April 17, 2024 13:27
bake.sh Outdated Show resolved Hide resolved
bake.sh Outdated Show resolved Hide resolved
Old mksquashfs versions don't support the xattr exclusion that was
added to prevent harmless warnings getting printed.
To support old mksquashfs versions, gate this behind a version check.
@pothos pothos force-pushed the kai/mksquashfs-version branch from 91c1e02 to d1419fc Compare April 18, 2024 09:27
@pothos pothos merged commit 313b804 into main Apr 18, 2024
@pothos pothos deleted the kai/mksquashfs-version branch April 18, 2024 09:27
VERMAJ=$(echo "${VER}" | cut -d . -f 1)
VERMIN=$(echo "${VER}" | cut -d . -f 2)
ARG=(-all-root -noappend)
if [ "${VERMAJ}" -gt 4 ] && [ "${VERMIN}" -gt 6 ]; then
Copy link
Contributor

Choose a reason for hiding this comment

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

The check should be if [[ "${VERMAJ}" -gt 4 || ( "${VERMAJ}" -eq 4 && "${VERMIN}" -gt 5 ) ]]; then ?

See:
https://github.com/plougher/squashfs-tools/blob/master/README-4.6.1#L37

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, your logic is correct.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants