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

Initial review for el9 aarch64 shim submission #4

Open
wants to merge 43 commits into
base: aarch_15.8_el9
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 40 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
27853f0
Initial commit, successful docker + rpmbuild for shim-15.6 (Rocky 8 b…
skip77 Oct 19, 2022
5e178b7
Modified static repo to official location in s3 bucket
skip77 Nov 23, 2022
eeff846
Updated with 15.7 shim and NX patch
Mar 27, 2023
27f28c8
Updated to 8.8 build env., Added official CIQ SB CA
skip77 Aug 22, 2023
c6b2842
Adding full log of build via container
skip77 Aug 23, 2023
02c325b
adding README.md for shim review
jason-rodri Sep 8, 2023
d285582
updating shim srpm with sbat updates
jason-rodri Sep 8, 2023
3eb66f7
updating with buggy-binutils patch
jason-rodri Oct 6, 2023
843b36e
README.md edited online with Bitbucket
jason-rodri Oct 10, 2023
c23cf30
Updating README.md with review comments
jason-rodri Oct 16, 2023
e6cf220
Merged in ctrliq-shim-x64-ia32-20231010 (pull request #1)
jason-rodri Oct 16, 2023
cd1d01b
Merge remote-tracking branch 'origin/ctrliq-shim-x64-ia32-20231010' i…
jason-rodri Oct 16, 2023
18db966
fix formatting
jason-rodri Oct 16, 2023
04991d7
README.md edited online with Bitbucket
jason-rodri Oct 27, 2023
1a20d11
build shim without the NX patch
jason-rodri Nov 20, 2023
5f716ea
updating for 15.8 shim
jason-rodri Jan 23, 2024
fcc4736
attempt at updating for 15.8
jason-rodri Jan 23, 2024
74fb265
fixing up read me
jason-rodri Jan 23, 2024
af48395
correcting typos
jason-rodri Jan 24, 2024
39f1530
updating grub references
jason-rodri Jan 24, 2024
ef3f03f
fixing grub version
jason-rodri Jan 24, 2024
c55e5f1
Merged in 15.8_submission (pull request #3)
jason-rodri Jan 31, 2024
0b95365
Merged in sub-prep (pull request #4)
jason-rodri May 17, 2024
5e7c826
Updated src rpm (re-add http boot), fix repo typo
skip77 May 17, 2024
e1eb3df
removing ia32 from compare script
jason-rodri May 17, 2024
d6a33bc
updating log
jason-rodri May 17, 2024
ec22521
Update README.md wirth github links
jason-rodri May 19, 2024
8488303
Fixed grammar, updated fwupd SBAT entry
skip77 Jun 21, 2024
951d1af
Fixed fwupd SBAT entry
skip77 Jun 21, 2024
ac35447
updating build logs
jason-rodri Jul 5, 2024
0c60fbe
Merge branch 'r9' of github.com:ctrliq/ciq-shim-build into r9
jason-rodri Jul 5, 2024
a42abe5
updating build logs
jason-rodri Jul 5, 2024
10d06f3
adding aarch64 srpm
jason-rodri Oct 4, 2024
9793c7f
updating dockerfile to support arm
jason-rodri Oct 4, 2024
a0fcd94
updating branch with aarch64 el9
jason-rodri Oct 9, 2024
774b038
reverting config back to 9.2 docker image
jason-rodri Oct 9, 2024
ebfc026
Update Dockerfile
jason-rodri Oct 9, 2024
f3c95c2
updating build logs and readme
jason-rodri Jan 2, 2025
5baf214
updating build log
jason-rodri Jan 2, 2025
f0d5cb4
updating with issues identified in review
jason-rodri Jan 7, 2025
0dde764
review fixes
jason-rodri Jan 9, 2025
ed78589
review fixes
jason-rodri Jan 9, 2025
5f71628
updating answer to systemd-boot
jason-rodri Jan 9, 2025
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
50 changes: 0 additions & 50 deletions .gitignore

This file was deleted.

41 changes: 41 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# Container to build CIQ's patched shim in a reproducible way
#
# It inserts a static repo for buildtime deps, then performs the rpmbuild/compilation, then outputs a comparison of binaries
#
# Build and tag locally with: docker build --tag ciq-shim-review:9 ./
#

FROM --platform=linux/arm64 rockylinux/rockylinux:9.2 AS arm64
ENV EL_PLATFORM el9
ENV shim_release 15.8-0.$EL_PLATFORM

# Copy and extract src rpm and macros, modify setarch in spec file because 32-bit mod is not allowed inside containers:
COPY rpmmacros /root/.rpmmacros
COPY shim-unsigned-aarch64-$shim_release.src.rpm /root
RUN rpm -ivh /root/shim-unsigned-aarch64-$shim_release.src.rpm

# already-built shim binaries for comparison:
COPY shimaa64.efi /

# Remove all repos, and point *only* to our static one with the necessary BuildRequires
# We don't want to contaminate the build with anything different - it must be reproducible
RUN rm -f /etc/yum.repos.d/*.repo
COPY ciq_static_shim.repo /etc/yum.repos.d/

# Install necessary packages, and run the build:
RUN dnf -y install dnf-plugins-core rpm-build; dnf -y builddep /builddir/build/SPECS/shim-unsigned-aarch64.spec
RUN rpmbuild -bb /builddir/build/SPECS/shim-unsigned-aarch64.spec


# Put resulting RPM in a temp folder (optionally mounted on host system for extraction)
RUN mkdir -p /shim_result
RUN rpm2cpio /builddir/build/RPMS/aarch64/shim-unsigned-aarch64-$shim_release.aarch64.rpm | cpio -diu -D /shim_result



# Insert shim-compare.sh script and run
COPY shim-compare.sh /root
RUN chmod 0755 /root/shim-compare.sh; /root/shim-compare.sh



370 changes: 370 additions & 0 deletions README.md

Large diffs are not rendered by default.

38 changes: 38 additions & 0 deletions ciq_sb_ca.cer
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
-----BEGIN CERTIFICATE-----
MIIGjTCCBHWgAwIBAgIQfFHVzML9szKBDVE2GPxNATANBgkqhkiG9w0BAQwFADBl
MQswCQYDVQQGEwJVUzEPMA0GA1UECBMGTmV2YWRhMQ0wCwYDVQQHEwRSZW5vMRYw
FAYDVQQKEw1DdHJsIElRLCBJbmMuMR4wHAYDVQQDExVDdHJsIElRLCBJbmMuIFJv
b3QgQ0EwHhcNMjMwNDIxMTUwOTMwWhcNNDgwNDIwMjM1OTU5WjBoMQswCQYDVQQG
EwJVUzEPMA0GA1UECBMGTmV2YWRhMQ0wCwYDVQQHEwRSZW5vMRYwFAYDVQQKEw1D
dHJsIElRLCBJbmMuMSEwHwYDVQQDExhDdHJsIElRLCBJbmMuIElzc3VpbmcgQ0Ew
ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC6FonbLsKcNGwYsezQGazS
+R5rAq2fRVGbI5VzQmL6AjZ7gy4x7ovV7nW232GRSJM1cZmpXq9BgYprrkstsr7A
LtgXCVQqwup0X38embgXoJr8rq2iE5O9ESIgaAIulxJPCRtzPa4G6SWDxt+t9TYB
uJlJktC6ZscodPfT+JPZ6jS9b1t2gKmbn24N7O4UlP4FzVhYKdR+k8eNuDChZBsd
tlXKA2Y/i+Dsg1bbcTdQ4lv8BCF3S7SyPoreCXZuKyyesWfchJv5++f4Pu4P6qsg
RnFiRHT5xVKmoIzDZHsHvZh4BWzkFwlUq5zmrT+3bQcangJMv+S31gkSW1RUlrz4
z3y/rex5127Ww7TEdFd5zo4jqQtYduh7MSQMgMUgvYC7SCwHWZIrCb/9MilU/PCz
npRZkQk57oy7QXqFaegsSMeFzgITBL3MRvEStBQuD9rq1SQHjwpKNiDVGgVPuc8z
xHV1zm9LXWhWwM/2pBdbv8eCxyzuYJJIOxNIdtAmyPbgt4U9/XD4lg4RQtOHrv0D
dDgghhRkVGHCVPA3kqyXoA19p1tJPJj9mesI8M0HVeIWtO1SH8/9wRIGgE+Zy/pl
JaeQuo3m+J6H+SKFLmlnDPYVSSRVPmePdK3WJEw+c0ZJtosnVDPrH1X9vavYsKjE
4rLiuYMvZS/toyl1y1q3hwIDAQABo4IBNDCCATAwHwYDVR0jBBgwFoAU3EXJ+n9i
o/keZA3WIBYE5nxfhm4wDgYDVR0PAQH/BAQDAgGGMBIGA1UdEwEB/wQIMAYBAf8C
AQAwRgYDVR0fBD8wPTA7oDmgN4Y1aHR0cDovL2NybC5lbnRlcnByaXNlLnNlY3Rp
Z28uY29tL0N0cmxJUUluY1Jvb3RDQS5jcmwwgYEGCCsGAQUFBwEBBHUwczBBBggr
BgEFBQcwAoY1aHR0cDovL2NydC5lbnRlcnByaXNlLnNlY3RpZ28uY29tL0N0cmxJ
UUluY1Jvb3RDQS5jcnQwLgYIKwYBBQUHMAGGImh0dHA6Ly9vY3NwLmVudGVycHJp
c2Uuc2VjdGlnby5jb20wHQYDVR0OBBYEFJMirmCI7u+In58FqnNCnS8Ih6nNMA0G
CSqGSIb3DQEBDAUAA4ICAQCHYZbCwJNFeNIUnE5ntRVjpr8rFU4/sdXy6g6Yyxji
0altfBVJ57pNHCIsPoxabdQvNEHu2IL2PYXac/RGbWYf5V8jnJzJ32Vjng/+VhGw
JUSWJpq1Pxl5ZlOHrCOEsVep1n6EAIr2TlVnCdDS9HBvjBIvDxKoVw1UJxVAXENb
L38fte4AHVo4Y5BIbZc2ONPrMxzpqf+b7tTH3I8Gnz9a4TcqdIxj+DAE5jqNmxxi
gSVYXSsWczgIbuZc1MdWvRhYauW4wUaEASyRRJjVptdN4qlmpiHauvBssvvHC/bm
FKGLy8jMexcFhN8Wwd9yT2fjA3+GSokQ1FgvU2ws/2SwxwOWyAgllAOI47dPnTcF
Ec/h3hJT6gPzvJvpO6l2iUOmoPEHYfbmmCVguze42WFSKj/WktAu+DHb8jCkk7pq
cj/JOuNzjTiofkl9oiG4tkNu6IMGSG0Q4YSk9VDpPfKlmDdNveoDUVdIHY5eaaoS
XoYwxhE9fhrMgmNG9uv+yp25PajIQRH6+u5LqUrmKJdQP7+uoz9zRWRLEIFZ7Bry
n83P6JZBQ58KhXV9HdhORHVvkSUjb0BWrTfgCjXDGhZpvX3II/6kuRn3fR1R/a+t
Z/N3lf2StJECyfe41VJrsFU27A7OqixQWFD5KUgUjvpXBbIk27klrgq4kuz4RIL8
vQ==
-----END CERTIFICATE-----
Binary file added ciq_sb_ca.der
Binary file not shown.
21 changes: 21 additions & 0 deletions ciq_static_shim.repo
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
[rocky-appstream-92]
name=Rocky Linux 9.2 AppStream
baseurl=https://dl.rockylinux.org/vault/rocky/9.2/AppStream/aarch64/os/
gpgcheck=1
enabled=1
gpgkey=https://dl.rockylinux.org/pub/rocky/RPM-GPG-KEY-Rocky-9

[rocky-baseos-92]
name=Rocky Linux 9.2 BaseOS
baseurl=https://dl.rockylinux.org/vault/rocky/9.2/BaseOS/aarch64/os/
gpgcheck=1
enabled=1
gpgkey=https://dl.rockylinux.org/pub/rocky/RPM-GPG-KEY-Rocky-9

[rocky-crb-92]
name=Rocky Linux 9.2 CRB
baseurl=https://dl.rockylinux.org/vault/rocky/9.2/CRB/aarch64/os/
gpgcheck=1
enabled=1
gpgkey=https://dl.rockylinux.org/pub/rocky/RPM-GPG-KEY-Rocky-9

Loading