diff --git a/profiles/alpine.conf b/profiles/alpine.conf index 16e031a..23d66ed 100644 --- a/profiles/alpine.conf +++ b/profiles/alpine.conf @@ -17,15 +17,6 @@ official { ami_desc_suffix = " - https://alpinelinux.org/cloud" } -fix_root_resize { - # https://github.com/mcrute/tiny-ec2-bootstrap/pull/16 - pkgs { - sfdisk = true - util-linux = true - } - setup_script = scripts/tiny-ec2-backport.sh -} - # Build definitions BUILDS { # merge version, arch, profile; add per-build { revision = "r1" } if needed @@ -37,5 +28,5 @@ BUILDS { edge-aarch64 = ${version-edge} ${arch-aarch64} ${official} v3_13-aarch64 = ${version-3_13} ${arch-aarch64} ${official} - v3_12-aarch64 = ${version-3_12} ${arch-aarch64} ${community} ${fix_root_resize} + v3_12-aarch64 = ${version-3_12} ${arch-aarch64} ${community} } diff --git a/scripts/tiny-ec2-backport.sh b/scripts/tiny-ec2-backport.sh deleted file mode 100755 index 1aae591..0000000 --- a/scripts/tiny-ec2-backport.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -set -ex - -# Backports tiny-ec2-bootstrap 1.4.1 to Alpine 3.12 and earlier. This fixes -# resizing the root partition on aarch64 AMIs, and is NOT NECESSARY FOR x86_64. -# -# The build profile should also include the following dependencies... -# -# pkgs { -# sfdisk = true -# util-linux = true -# } -# - -TINY_EC2_BOOTSTRAP_VERSION=1.4.1 -TINY_EC2_BOOTSTRAP_URL="$(printf \ - https://raw.githubusercontent.com/mcrute/tiny-ec2-bootstrap/release-%s/tiny-ec2-bootstrap \ - "${TINY_EC2_BOOTSTRAP_VERSION}" -)" - -wget "$TINY_EC2_BOOTSTRAP_URL" -chmod +x tiny-ec2-bootstrap -cp -a tiny-ec2-bootstrap "$TARGET"/etc/init.d