Skip to content

The browser image carries the texts of Firefox's licences, not only the pointer to them #518

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

Merged
DevomB merged 4 commits into from
Oct 16, 2026
Merged

The browser image carries the texts of Firefox's licences, not only the pointer to them #518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e3c6212
The browser image carries the texts of Firefox's licences
DevomB Oct 15, 2026
9d4c2f2
Merge the browser batch as it lands (9d540a3d): post-top main, the im…
DevomB Oct 15, 2026
f11fb55
Each image's chroot is entered with KRYPTIK_STICK_BIN cleared, as wit…
DevomB Oct 15, 2026
32bc1eb
Merge the browser batch as it lands (85180feb): #533, a zone binds it…
DevomB Oct 15, 2026
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
6 changes: 5 additions & 1 deletion build/images/browser.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,10 @@ EOF
EOF
}

# Firefox's top-level LICENSE only points to toolkit/content/license.html, the texts of everything it
# carries (its about:license): that file is taken too, and must be there.
s_browser_licences() {
echo "$(source_licences < <("${KRYPTIK_ROOT}/tools/fetch-sources.sh" --list-image browser)) licence files"
echo "$(source_licences '^[^/]+/toolkit/content/license\.html$' \
< <("${KRYPTIK_ROOT}/tools/fetch-sources.sh" --list-image browser)) licence files"
test -s /usr/share/licenses/firefox/toolkit/content/license.html
}
3 changes: 2 additions & 1 deletion build/stages/04-images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ build_image() { # build_image NAME
done
MOUNTED="$top"
mount -t overlay overlay -o "lowerdir=${lowers}${SYSROOT},upperdir=${top}/upper,workdir=${top}/overlay-work" "${top}/sysroot"
env KRYPTIK_WORK="$top" KRYPTIK_KRYPTIKD_BIN= KRYPTIK_WLPROXY_BIN= \
# The Rust binaries are the base system's; a mount point for one would be a file the image adds.
env KRYPTIK_WORK="$top" KRYPTIK_KRYPTIKD_BIN= KRYPTIK_WLPROXY_BIN= KRYPTIK_STICK_BIN= \
"$CHROOTD" run /kryptik/build/stages/04-images.sh --inside "$name"
unmount_image "$top"
MOUNTED=""
Expand Down
Loading