diff options
| -rwxr-xr-x | scripts/mkimage.sh | 2 | ||||
| -rwxr-xr-x | scripts/mkimg.arm.sh | 6 | ||||
| -rwxr-xr-x | scripts/mkimg.minirootfs.sh | 2 | ||||
| -rwxr-xr-x | scripts/mkimg.netboot.sh | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/scripts/mkimage.sh b/scripts/mkimage.sh index de040aac832..0c3dea5da8e 100755 --- a/scripts/mkimage.sh +++ b/scripts/mkimage.sh @@ -22,7 +22,7 @@ set -e all_sections="" all_profiles="" all_checksums="sha256 sha512" -all_arches="aarch64 armhf x86 x86_64" +all_arches="aarch64 armhf armv7 x86 x86_64" all_dirs="" build_date="$(date +%y%m%d)" default_arch="$(apk --print-arch)" diff --git a/scripts/mkimg.arm.sh b/scripts/mkimg.arm.sh index 76956d52812..f044a0d9101 100755 --- a/scripts/mkimg.arm.sh +++ b/scripts/mkimg.arm.sh @@ -20,6 +20,12 @@ rpi_gen_config() { [pi1] kernel=boot/vmlinuz-rpi initramfs boot/initramfs-rpi + [all] + include usercfg.txt + EOF + ;; + armv7) + cat <<-EOF [pi2] kernel=boot/vmlinuz-rpi2 initramfs boot/initramfs-rpi2 diff --git a/scripts/mkimg.minirootfs.sh b/scripts/mkimg.minirootfs.sh index ec2b1435dc4..6b8b6b903c3 100755 --- a/scripts/mkimg.minirootfs.sh +++ b/scripts/mkimg.minirootfs.sh @@ -20,6 +20,6 @@ profile_minirootfs() { and minimal chroots." image_ext=tar.gz output_format=rootfs - arch="x86 x86_64 armhf aarch64 ppc64le s390x" + arch="x86 x86_64 armhf armv7 aarch64 ppc64le s390x" rootfs_apks="busybox alpine-baselayout alpine-keys apk-tools libc-utils" } diff --git a/scripts/mkimg.netboot.sh b/scripts/mkimg.netboot.sh index afce270f815..aa7f8c5429a 100755 --- a/scripts/mkimg.netboot.sh +++ b/scripts/mkimg.netboot.sh @@ -10,7 +10,7 @@ profile_netboot() { desc="Kernel, initramfs and modloop for netboot. " - arch="aarch64 armhf ppc64le x86 x86_64 s390x" + arch="aarch64 armhf armv7 ppc64le x86 x86_64 s390x" kernel_cmdline="nomodeset" kernel_flavors="vanilla" modloop_sign=yes |