diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 011804d..52652ca 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ include: variables: BUILD_SCRIPT: ./.gitlab/ci/build_releng.sh - PACKAGE_LIST: archiso erofs-utils ipxe openssl zsync + PACKAGE_LIST: archiso erofs-utils ipxe openssl zsync python python-jinja python-orjson QEMU_BUILD_TIMEOUT: 2400 QEMU_COPY_ARTIFACTS_TIMEOUT: 120 QEMU_VM_MEMORY: 3072 diff --git a/.gitlab/ci/build_releng.sh b/.gitlab/ci/build_releng.sh index 8eb7672..d97531f 100755 --- a/.gitlab/ci/build_releng.sh +++ b/.gitlab/ci/build_releng.sh @@ -252,7 +252,6 @@ copy_ipxe_binaries() { print_section_start "copy_ipxe" "Copy iPXE binaries" - install -vdm 755 -- "${_ipxe_output}" cp -av -- "${_ipxe_base}/"{ipxe-arch.{lkrn,pxe},x86_64/ipxe-arch.efi} "${_ipxe_output}" print_section_end "copy_ipxe" @@ -313,6 +312,7 @@ generate_archlinux_ipxe() { local _ipxe_dir="${orig_pwd}/ipxe" local _ipxe_output="${output}/ipxe/ipxe-${version}" + install -vdm 755 -- "${_ipxe_output}" python "${_ipxe_dir}/generate_archlinux_ipxe.py" > "${_ipxe_output}/archlinux.ipxe" create_checksums "${_ipxe_output}/archlinux.ipxe" @@ -331,7 +331,7 @@ sign_archlinux_ipxe() { -sign \ -binary \ -noattr \ - -in "${_ipxe_dir}/archlinux.ipxe" \ + -in "${_ipxe_output}/archlinux.ipxe" \ -signer "${codesigning_cert}" \ -inkey "${codesigning_key}" \ -outform DER \