aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlliver Schinagl <oliver@schinagl.nl>2019-02-22 21:08:14 +0100
committerNatanael Copa <ncopa@alpinelinux.org>2019-02-28 22:10:16 +0100
commit0ac4b4a86aa6497bb9f0f4e7dcb962e7a80f6692 (patch)
tree6750ac905bc53a40d3e0059f00b6f8b1c073fd84
parent7a2566ec8260ceacae81088ebe2ffe6526c3809e (diff)
downloadalpine_aports-0ac4b4a86aa6497bb9f0f4e7dcb962e7a80f6692.tar.bz2
alpine_aports-0ac4b4a86aa6497bb9f0f4e7dcb962e7a80f6692.tar.xz
alpine_aports-0ac4b4a86aa6497bb9f0f4e7dcb962e7a80f6692.zip
scripts: add armv7 support to images
Signed-off-by: Olliver Schinagl <oliver@schinagl.nl> (cherry picked from commit bf993f3f649bc2e9520ff4d1f9a3c00a41f419e0)
-rwxr-xr-xscripts/mkimage.sh2
-rwxr-xr-xscripts/mkimg.arm.sh6
-rwxr-xr-xscripts/mkimg.minirootfs.sh2
-rwxr-xr-xscripts/mkimg.netboot.sh2
4 files changed, 9 insertions, 3 deletions
diff --git a/scripts/mkimage.sh b/scripts/mkimage.sh
index de040aac83..0c3dea5da8 100755
--- a/scripts/mkimage.sh
+++ b/scripts/mkimage.sh
@@ -22,7 +22,7 @@ set -e
22all_sections="" 22all_sections=""
23all_profiles="" 23all_profiles=""
24all_checksums="sha256 sha512" 24all_checksums="sha256 sha512"
25all_arches="aarch64 armhf x86 x86_64" 25all_arches="aarch64 armhf armv7 x86 x86_64"
26all_dirs="" 26all_dirs=""
27build_date="$(date +%y%m%d)" 27build_date="$(date +%y%m%d)"
28default_arch="$(apk --print-arch)" 28default_arch="$(apk --print-arch)"
diff --git a/scripts/mkimg.arm.sh b/scripts/mkimg.arm.sh
index 76956d5281..f044a0d910 100755
--- a/scripts/mkimg.arm.sh
+++ b/scripts/mkimg.arm.sh
@@ -20,6 +20,12 @@ rpi_gen_config() {
20 [pi1] 20 [pi1]
21 kernel=boot/vmlinuz-rpi 21 kernel=boot/vmlinuz-rpi
22 initramfs boot/initramfs-rpi 22 initramfs boot/initramfs-rpi
23 [all]
24 include usercfg.txt
25 EOF
26 ;;
27 armv7)
28 cat <<-EOF
23 [pi2] 29 [pi2]
24 kernel=boot/vmlinuz-rpi2 30 kernel=boot/vmlinuz-rpi2
25 initramfs boot/initramfs-rpi2 31 initramfs boot/initramfs-rpi2
diff --git a/scripts/mkimg.minirootfs.sh b/scripts/mkimg.minirootfs.sh
index ec2b1435dc..6b8b6b903c 100755
--- a/scripts/mkimg.minirootfs.sh
+++ b/scripts/mkimg.minirootfs.sh
@@ -20,6 +20,6 @@ profile_minirootfs() {
20 and minimal chroots." 20 and minimal chroots."
21 image_ext=tar.gz 21 image_ext=tar.gz
22 output_format=rootfs 22 output_format=rootfs
23 arch="x86 x86_64 armhf aarch64 ppc64le s390x" 23 arch="x86 x86_64 armhf armv7 aarch64 ppc64le s390x"
24 rootfs_apks="busybox alpine-baselayout alpine-keys apk-tools libc-utils" 24 rootfs_apks="busybox alpine-baselayout alpine-keys apk-tools libc-utils"
25} 25}
diff --git a/scripts/mkimg.netboot.sh b/scripts/mkimg.netboot.sh
index afce270f81..aa7f8c5429 100755
--- a/scripts/mkimg.netboot.sh
+++ b/scripts/mkimg.netboot.sh
@@ -10,7 +10,7 @@ profile_netboot() {
10 desc="Kernel, initramfs and modloop for 10 desc="Kernel, initramfs and modloop for
11 netboot. 11 netboot.
12 " 12 "
13 arch="aarch64 armhf ppc64le x86 x86_64 s390x" 13 arch="aarch64 armhf armv7 ppc64le x86 x86_64 s390x"
14 kernel_cmdline="nomodeset" 14 kernel_cmdline="nomodeset"
15 kernel_flavors="vanilla" 15 kernel_flavors="vanilla"
16 modloop_sign=yes 16 modloop_sign=yes