From af0a880e4aa6c600f3f15517b0fc0d29a0cc47ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20=C5=A0urda?= Date: Mon, 19 Sep 2022 20:31:35 +0800 Subject: [PATCH] Change floppy image to USB image --- buildbot/buildbot_steps.sh | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/buildbot/buildbot_steps.sh b/buildbot/buildbot_steps.sh index b712f92..46e2f68 100755 --- a/buildbot/buildbot_steps.sh +++ b/buildbot/buildbot_steps.sh @@ -153,7 +153,7 @@ function make_ipxe_dsk() { curr="$(pwd)" cd "${ipxe_src_dir}/src/" || return 1 - make bin/ipxe.dsk EMBED="${embed_file}" CERT="${signing_cert},${ca_cert}" TRUST="${ca_cert}" || return 2 + make bin/ipxe.usb EMBED="${embed_file}" CERT="${signing_cert},${ca_cert}" TRUST="${ca_cert}" || return 2 cd "$curr" return 0 @@ -252,8 +252,8 @@ function make_ipxe_bin_shasums() { >&2 echo "IPXE iso build file does not exist." return 1 fi - if [[ ! -f "${ipxe_src_dir}/src/bin/ipxe.dsk" ]]; then - >&2 echo "IPXE floppy build file does not exist." + if [[ ! -f "${ipxe_src_dir}/src/bin/ipxe.usb" ]]; then + >&2 echo "IPXE USB build file does not exist." return 1 fi if [[ ! -f "${ipxe_src_dir}/src/bin/ipxe.pxe" ]]; then @@ -268,7 +268,7 @@ function make_ipxe_bin_shasums() { curr="$(pwd)" cd "${ipxe_src_dir}/src/bin/" || return 1 - sha256sum ipxe.lkrn ipxe.iso ipxe.dsk ipxe.pxe ipxe.efi > SHA256SUMS || return 2 + sha256sum ipxe.lkrn ipxe.iso ipxe.usb ipxe.pxe ipxe.efi > SHA256SUMS || return 2 cd "$curr" return 0 @@ -424,8 +424,8 @@ function upload_release_ipxe_lkrn() { >&2 echo "IPXE iso build file does not exist." return 1 fi - if [[ ! -f "${ipxe_src_dir}/src/bin/ipxe.dsk" ]]; then - >&2 echo "IPXE floppy build file does not exist." + if [[ ! -f "${ipxe_src_dir}/src/bin/ipxe.usb" ]]; then + >&2 echo "IPXE USB build file does not exist." return 1 fi if [[ ! -f "${ipxe_src_dir}/src/bin/ipxe.pxe" ]]; then @@ -606,8 +606,8 @@ function upload_release_ipxe_dsk() { >&2 echo "IPXE iso build file does not exist." return 1 fi - if [[ ! -f "${ipxe_src_dir}/src/bin/ipxe.dsk" ]]; then - >&2 echo "IPXE iso build file does not exist." + if [[ ! -f "${ipxe_src_dir}/src/bin/ipxe.usb" ]]; then + >&2 echo "IPXE USB build file does not exist." return 1 fi if [[ ! -f "${ipxe_src_dir}/src/bin/ipxe.pxe" ]]; then @@ -638,20 +638,20 @@ function upload_release_ipxe_dsk() { fi releaseid="$(tail -n 1 release_results.txt | jq .id)" - curl -X POST "https://git.bitmessage.org/api/v1/repos/${repo_user}/${repo_name}/releases/${releaseid}/assets?name=ipxe.dsk" \ + curl -X POST "https://git.bitmessage.org/api/v1/repos/${repo_user}/${repo_name}/releases/${releaseid}/assets?name=ipxe.usb" \ -H "accept: application/json" \ -H "Authorization: token $(cat $api_token_file)" \ -i \ - -F "attachment=@${ipxe_src_dir}/src/bin/ipxe.dsk" > release_dsk.txt + -F "attachment=@${ipxe_src_dir}/src/bin/ipxe.usb" > release_usb.txt - cat release_dsk.txt | grep ^HTTP/ | grep 201 >/dev/null + cat release_usb.txt | grep ^HTTP/ | grep 201 >/dev/null if [ $? -ne 0 ]; then - >&2 echo "The upload of ipxe.dsk as a release attachment failed." + >&2 echo "The upload of ipxe.usb as a release attachment failed." return 2 fi - tail -n 1 release_dsk.txt | jq .id | grep -P '^(\d)+$' >/dev/null + tail -n 1 release_usb.txt | jq .id | grep -P '^(\d)+$' >/dev/null if [ $? -ne 0 ]; then - >&2 echo "The upload of ipxe.dsk as a release attachment failed." + >&2 echo "The upload of ipxe.usb as a release attachment failed." return 2 fi