diff --git a/hack/dev/kernel/docker-build.sh b/hack/dev/kernel/docker-build.sh index 982813e..3e22876 100755 --- a/hack/dev/kernel/docker-build.sh +++ b/hack/dev/kernel/docker-build.sh @@ -29,11 +29,10 @@ else fi make CROSS_COMPILE="${MAYBE_CROSS_COMPILE}" ARCH="${TARGET_KARCH}" defconfig -if [ "${TARGET_KARCH}" = "x86_64" ] -then - make CROSS_COMPILE="${MAYBE_CROSS_COMPILE}" ARCH="${TARGET_KARCH}" xen.config - ./scripts/config -e XEN_PV - ./scripts/config -e XEN_PV_DOM0 +if [ "${TARGET_KARCH}" = "x86_64" ]; then + make CROSS_COMPILE="${MAYBE_CROSS_COMPILE}" ARCH="${TARGET_KARCH}" xen.config + ./scripts/config -e XEN_PV + ./scripts/config -e XEN_PV_DOM0 fi make CROSS_COMPILE="${MAYBE_CROSS_COMPILE}" ARCH="${TARGET_KARCH}" mod2yesconfig @@ -45,5 +44,5 @@ make CROSS_COMPILE="${MAYBE_CROSS_COMPILE}" ARCH="${TARGET_KARCH}" mod2yesconfig make "-j$(nproc)" CROSS_COMPILE="${MAYBE_CROSS_COMPILE}" ARCH="${TARGET_KARCH}" [ -f "arch/x86/boot/bzImage" ] && cp "arch/x86/boot/bzImage" kernel.image -[ -f "arch/arm64/boot/Image.gz" ] && gzip -d < "arch/arm64/boot/Image.gz" > kernel.image +[ -f "arch/arm64/boot/Image.gz" ] && gzip -d <"arch/arm64/boot/Image.gz" >kernel.image exit 0 diff --git a/hack/format.sh b/hack/format.sh index f9a2aa1..e1c389e 100755 --- a/hack/format.sh +++ b/hack/format.sh @@ -3,5 +3,5 @@ set -e cd "$(dirname "${0}")/.." || exit 1 -cargo fmt --all -shfmt -w hack/**/*.sh +cargo fmt --all || true +shfmt -w hack/**/*.sh || true