瀏覽代碼

Fixed fresh build digest verification issues (GitHub: #7)

stage3-i686-*.DIGESTS.asc file now has WHIRLPOOL hashes filtered
in a way that allows repetitive fresh build runs.

stage3-i686-*.CONTENTS is now verified by listing the archive using
"en_US.UTF-8" locale (since "C.UTF-8" is not yet widely available).
If users encounter issues, CONTENTS verification can be disabled
altogether, since archive's hash is verified anyway.
Maxim Kammerer 12 年之前
父節點
當前提交
3d990983da
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      mkroot

+ 2 - 2
mkroot

@@ -130,13 +130,13 @@ fi
 
 
 sinfo "Verifying stage3 SHA512 digests"
-sed -i '6,7d; 10,11d' ${LIVECD}/mirror/stage3/${stage3file}.DIGESTS.asc
+sed -i '/^# WHIRLPOOL HASH$/{N; s/.*/\n/}' ${LIVECD}/mirror/stage3/${stage3file}.DIGESTS.asc
 (cd ${LIVECD}/mirror/stage3; sha512sum -c ${stage3file}.DIGESTS.asc)
 
 
 if tar --version | grep -q '(GNU tar)'; then
     sinfo "Verifying stage3 files list"
-    LC_ALL=C tar --utc -tjvf ${LIVECD}/mirror/stage3/${stage3file} > ${LIVECD}/mirror/stage3/${stage3file}.CONTENTS.actual
+    LC_ALL=en_US.UTF-8 tar --utc -tjvf ${LIVECD}/mirror/stage3/${stage3file} > ${LIVECD}/mirror/stage3/${stage3file}.CONTENTS.actual
     cmp -s ${LIVECD}/mirror/stage3/${stage3file}.CONTENTS \
            ${LIVECD}/mirror/stage3/${stage3file}.CONTENTS.actual
     rm     ${LIVECD}/mirror/stage3/${stage3file}.CONTENTS.actual