Change floppy image to USB image
Some checks failed
buildbot/travis_bionic Build done.
buildbot/multibuild_parent Build done.
buildbot/ipxe_x86_build_and_release Build done.

This commit is contained in:
Peter Šurda 2022-09-19 20:31:35 +08:00
parent 535e6fe061
commit af0a880e4a
Signed by: PeterSurda
GPG Key ID: 3E47497CF67ABB95

View File

@ -153,7 +153,7 @@ function make_ipxe_dsk() {
curr="$(pwd)" curr="$(pwd)"
cd "${ipxe_src_dir}/src/" || return 1 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" cd "$curr"
return 0 return 0
@ -252,8 +252,8 @@ function make_ipxe_bin_shasums() {
>&2 echo "IPXE iso build file does not exist." >&2 echo "IPXE iso build file does not exist."
return 1 return 1
fi fi
if [[ ! -f "${ipxe_src_dir}/src/bin/ipxe.dsk" ]]; then if [[ ! -f "${ipxe_src_dir}/src/bin/ipxe.usb" ]]; then
>&2 echo "IPXE floppy build file does not exist." >&2 echo "IPXE USB build file does not exist."
return 1 return 1
fi fi
if [[ ! -f "${ipxe_src_dir}/src/bin/ipxe.pxe" ]]; then if [[ ! -f "${ipxe_src_dir}/src/bin/ipxe.pxe" ]]; then
@ -268,7 +268,7 @@ function make_ipxe_bin_shasums() {
curr="$(pwd)" curr="$(pwd)"
cd "${ipxe_src_dir}/src/bin/" || return 1 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" cd "$curr"
return 0 return 0
@ -424,8 +424,8 @@ function upload_release_ipxe_lkrn() {
>&2 echo "IPXE iso build file does not exist." >&2 echo "IPXE iso build file does not exist."
return 1 return 1
fi fi
if [[ ! -f "${ipxe_src_dir}/src/bin/ipxe.dsk" ]]; then if [[ ! -f "${ipxe_src_dir}/src/bin/ipxe.usb" ]]; then
>&2 echo "IPXE floppy build file does not exist." >&2 echo "IPXE USB build file does not exist."
return 1 return 1
fi fi
if [[ ! -f "${ipxe_src_dir}/src/bin/ipxe.pxe" ]]; then 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." >&2 echo "IPXE iso build file does not exist."
return 1 return 1
fi fi
if [[ ! -f "${ipxe_src_dir}/src/bin/ipxe.dsk" ]]; then if [[ ! -f "${ipxe_src_dir}/src/bin/ipxe.usb" ]]; then
>&2 echo "IPXE iso build file does not exist." >&2 echo "IPXE USB build file does not exist."
return 1 return 1
fi fi
if [[ ! -f "${ipxe_src_dir}/src/bin/ipxe.pxe" ]]; then if [[ ! -f "${ipxe_src_dir}/src/bin/ipxe.pxe" ]]; then
@ -638,20 +638,20 @@ function upload_release_ipxe_dsk() {
fi fi
releaseid="$(tail -n 1 release_results.txt | jq .id)" 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 "accept: application/json" \
-H "Authorization: token $(cat $api_token_file)" \ -H "Authorization: token $(cat $api_token_file)" \
-i \ -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 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 return 2
fi 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 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 return 2
fi fi