Merge branch 'isomd5sum' into 'main'

embed checksum into the .iso files created (isomd5sum)

See merge request systemrescue/systemrescue-sources!245
This commit is contained in:
Gerd v. Egidy 2022-11-23 21:03:32 +00:00
commit 100032695d
4 changed files with 6 additions and 3 deletions

View file

@ -11,7 +11,7 @@ https://gitlab.archlinux.org/archlinux/archiso/
SystemRescue can be built for x86_64 or i686 architectures. It must be built
on archlinux if you want to build a 64bit edition, or archlinux32 if you want
to create a 32bit edition. The following packages must be installed on the
build system: archiso, grub, mtools, edk2-shell, hugo.
build system: archiso, grub, isomd5sum, mtools, edk2-shell, hugo.
You need to use a modified version of archiso for the build to work. This
version is provided in the custom `sysrescuerepo` repository. See the

View file

@ -403,6 +403,9 @@ make_iso() {
)
# Create the ISO image
setarch ${arch} mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" -A "${iso_application}" -o "${out_dir}" iso "${iso_name}-${iso_version}-${arch/x86_64/amd64}.iso"
# embed checksum
implantisomd5 "${out_dir}/${iso_name}-${iso_version}-${arch/x86_64/amd64}.iso"
}
if [[ ${EUID} -ne 0 ]]; then

View file

@ -2,6 +2,6 @@ FROM fdupoux/archlinux32
RUN mkdir -p /workspace
COPY tmpfiles/pacman.conf /etc/pacman.conf
RUN sed -i -e 's/^Architecture.*$/Architecture = i686/' /etc/pacman.conf
RUN pacman -Syyu --noconfirm archiso binutils edk2-shell grub hugo mtools && rm -rf /var/cache/pacman/pkg/*
RUN pacman -Syyu --noconfirm archiso binutils edk2-shell grub hugo isomd5sum mtools && rm -rf /var/cache/pacman/pkg/*
CMD ["setarch","i686","/usr/bin/bash"]
WORKDIR /workspace

View file

@ -1,6 +1,6 @@
FROM archlinux:latest
RUN mkdir -p /workspace
COPY tmpfiles/pacman.conf /etc/pacman.conf
RUN pacman -Syyu --noconfirm archiso binutils edk2-shell grub hugo mtools && rm -rf /var/cache/pacman/pkg/*
RUN pacman -Syyu --noconfirm archiso binutils edk2-shell grub hugo isomd5sum mtools && rm -rf /var/cache/pacman/pkg/*
CMD ["setarch","x86_64","/usr/bin/bash"]
WORKDIR /workspace