diff --git a/build/images/browser.sh b/build/images/browser.sh index bcbe2bcf..a313c398 100644 --- a/build/images/browser.sh +++ b/build/images/browser.sh @@ -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 } diff --git a/build/stages/04-images.sh b/build/stages/04-images.sh index 2a9b44c0..9ad97e28 100755 --- a/build/stages/04-images.sh +++ b/build/stages/04-images.sh @@ -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=""