create shim 15.6 review

Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:bullseye
+FROM debian:bookworm-20220711
 
 RUN apt update -y && \
  DEBIAN_FRONTEND=noninteractive apt install -y bsdmainutils gcc git lcab make dos2unix curl bzip2 quilt

build.sh

@@ -9,15 +9,12 @@ if [ $arch = "x86_64" ];then
  sudo docker cp $id:/build/shimx64.efi .
  sudo docker cp $id:/build/shimx64.cab .
  sudo docker cp $id:/build/shimx64.cksum .
- sudo docker cp $id:/build/shimia32.efi .
- sudo docker cp $id:/build/shimia32.cab .
- sudo docker cp $id:/build/shimia32.cksum .
- sha256sum -c shimx64.efi.sha256sum
- sha256sum -c shimia32.efi.sha256sum
+ sha256sum -c shimx64.cksum
 elif [ $arch = "aarch64" ];then
  sudo docker cp $id:/build/shimaa64.efi .
  sudo docker cp $id:/build/shimaa64.cab .
  sudo docker cp $id:/build/shimaa64.cksum .
+ sha256sum -c shimaa64.cksum
 fi
 
 sudo docker rm -v $id

build_shim

@@ -8,10 +8,8 @@ exec 2>&1
 CERT=UOS-UEFI-RSA.der
 SBAT=sbat.uos.csv
 OUTNAMEX64=shimx64
-OUTNAMEIA32=shimia32
 SHIM_DBX=shim.dbx
 BOOTX64EFI=BOOTX64.EFI
-BOOTIA32EFI=BOOTIA32.EFI
 # aarch64
 OUTNAMEAA64=shimaa64
 BOOTAA64EFI=BOOTAA64.EFI
@@ -25,17 +23,12 @@ rm *.cksum
 
 
 # Get shim from a tar file
-RELEASEPATH="https://github.com/rhboot/shim/releases/download/15.5-rc1/shim-15.5.rc1.tar.bz2"
+RELEASEPATH="https://github.com/rhboot/shim/releases/download/15.6/shim-15.6.tar.bz2"
+
 
 curl -L $RELEASEPATH | tar -xj || exit 1
 #tar -xjf shim.tar.bz2
-mv shim-15.5~rc1 shim
-
-# Get shim from a repository
-BRANCH=shim-15.5
-REPOSITORY="https://github.com/rhboot/shim.git"
-#git clone --recursive -b $BRANCH $REPOSITORY shim
-
+mv shim-15.6 shim
 
 cp $CERT shim/
 cp $SBAT shim/data/
@@ -59,15 +52,9 @@ case `uname -m` in
  echo "build x86_64 shim"
  build x86_64
  cp shimx64.efi ../$OUTNAMEX64.efi
- echo "build ia32 shim"
- build ia32
- cp shimia32.efi ../$OUTNAMEIA32.efi
  cd ..
  sha256sum -b $OUTNAMEX64.efi > $OUTNAMEX64.cksum
- sha256sum -b $OUTNAMEIA32.efi > $OUTNAMEIA32.cksum
  cp $OUTNAMEX64.efi $BOOTX64EFI
- cp $OUTNAMEIA32.efi $BOOTIA32EFI
- lcab $BOOTIA32EFI $OUTNAMEIA32.cab
  lcab $BOOTX64EFI $OUTNAMEX64.cab
  ;;
  aarch64)
@@ -80,7 +67,7 @@ case `uname -m` in
  lcab $BOOTAA64EFI $OUTNAMEAA64.cab
  ;;
  *)
- echo "暂不支持该CPU架构"
+ echo "This CPU architecture is not currently supported"
  exit 1
 esac
 

key/LiChenggang.pub

@@ -0,0 +1,78 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBGCCeLQBDACb/jqaP4Dmm0PcgqiBnFTksUwydcSX/A7B3y5DwelhXYxnkC61
+KvLAYgPtlFGYkMZlJ/nDsSdjKBInq/NJ2sTiNsdzyegBhIc27PEp6axndO3BgHnK
+9sHCC/vH9XWxCNKBDS8stxsewPacjcMAQ3L4aeCcrr+0krpDc64sDU4zUdB2GlkG
+2ep+j/iSXUOSEbvnLbL99azytNYEiYbft+sQqFR6HxM95RCUSlQa4muniiTQtpHF
+W5keWb/bN+PonoLICzVnR1FnS57y+dsAl5mubxh9Q7ugzzGVJN8+/KUA4MOJ4Zp4
+DYKcx5tK5UuVyklJCI927VoxHz84i8BiKO8d6lOyB8H1AFUNO2Gn6WtVmdLUu8Qq
+I9mdcsIHLtSDJmFyzv/Y/illkEhE3gcaiQe4LUFjmQoKGxWOyxYX/z3OB9o4k8eh
+v8IxRCn8we0R5JhAad24l1S/b3+hDz2oFUUY6Qduvyk533Af1yxx/8ASbucKjJlg
+aLsv7fEk9ZjPrA8AEQEAAbQnbGljaGVuZ2dhbmcgPGxpY2hlbmdnYW5nQHVuaW9u
+dGVjaC5jb20+iQHUBBMBCgA+FiEEPIrRozsv7i/w81FI++yGqgmIBKQFAmCCeLQC
+GwMFCQPCZwAFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQ++yGqgmIBKTQywv8
+CRAKKcAE61SX8BK6cupLyjAwEh/AgilYvZrAlrwceRMFruEMGQcU1YkjusKAizwQ
+jKF8mJQHV/KxlVGHqphsHsQ48uK0U3ZX1JczNI7nAuxnn0/lT8ZxswdHET9V3TTo
+y1RwZWiQvSutc/NXIfmTmKHiCjsKITXe2Jruy0P6JBZrylIE4djSy7X4vaKdHn8s
+Metr1S+SjNFE+V9fS2aK+kA87w017V30Uod8l9babKK79q9V1MG5MGivA9Q6To8A
+rIDE/yJHu5D+qBYn3kD1rSgk0THi1lIDQ16PTqzpQXRbqNAqeamsTtD+0CeJ4ixF
+ZJ2+HXogJN0+MmPAl9vmG7alE8Pb7Hj07RajJCxpteNAsOEXB3C5YxtyrljzAxvg
+jVsUZqv/Nf0Hpy0aVupbsy01Z/h7FU1/m+2HGIu6eOey74nFSP5HBHMbLbXNkpde
+xPrPje3h0plSDd9uHccvtA2TFpDJLlXao1v8VKy1lfC1+rrWALhfOvuvgEUAx85S
+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
++xA=
+=NPYy
+-----END PGP PUBLIC KEY BLOCK-----

key/ZilongZhou.pub

@@ -0,0 +1,41 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=QoGB
+-----END PGP PUBLIC KEY BLOCK-----