From 4bb4791a5529b7ddf0a600212632d983d6f52233 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Sat, 1 Oct 2022 19:37:51 +0200 Subject: [PATCH] chore: Remove duplicate config --- configs/alpine.conf | 82 -------------------------------- configs/arch/aarch64.conf | 15 ------ configs/arch/x86_64.conf | 9 ---- configs/bootstrap/cloudinit.conf | 16 ------- configs/bootstrap/tiny.conf | 33 ------------- configs/cloud/aws.conf | 37 -------------- configs/firmware/bios.conf | 7 --- configs/firmware/uefi.conf | 18 ------- configs/images.conf | 1 - configs/version/3.13.conf | 3 -- configs/version/3.14.conf | 3 -- configs/version/3.15.conf | 7 --- configs/version/3.16.conf | 7 --- configs/version/base/1.conf | 60 ----------------------- configs/version/base/2.conf | 8 ---- configs/version/base/3.conf | 8 ---- configs/version/base/4.conf | 8 ---- configs/version/edge.conf | 15 ------ 18 files changed, 337 deletions(-) delete mode 100644 configs/alpine.conf delete mode 100644 configs/arch/aarch64.conf delete mode 100644 configs/arch/x86_64.conf delete mode 100644 configs/bootstrap/cloudinit.conf delete mode 100644 configs/bootstrap/tiny.conf delete mode 100644 configs/cloud/aws.conf delete mode 100644 configs/firmware/bios.conf delete mode 100644 configs/firmware/uefi.conf delete mode 120000 configs/images.conf delete mode 100644 configs/version/3.13.conf delete mode 100644 configs/version/3.14.conf delete mode 100644 configs/version/3.15.conf delete mode 100644 configs/version/3.16.conf delete mode 100644 configs/version/base/1.conf delete mode 100644 configs/version/base/2.conf delete mode 100644 configs/version/base/3.conf delete mode 100644 configs/version/base/4.conf delete mode 100644 configs/version/edge.conf diff --git a/configs/alpine.conf b/configs/alpine.conf deleted file mode 100644 index 37cf0bd..0000000 --- a/configs/alpine.conf +++ /dev/null @@ -1,82 +0,0 @@ -# vim: ts=2 et: - -# NOTE: If you are using alpine-cloud-images to build public cloud images -# for something/someone other than Alpine Linux, you *MUST* override -# *AT LEAST* the 'project' setting with a unique identifier string value -# via a "config overlay" to avoid image import and publishing collisions. - -project = "https://alpinelinux.org/cloud" - -# all build configs start with these -Default { - project = ${project} - - # image name/description components - name = [ alpine ] - description = [ Alpine Linux ] - - motd { - welcome = "Welcome to Alpine!" - - wiki = "The Alpine Wiki contains a large amount of how-to guides and general\n"\ - "information about administrating Alpine systems.\n"\ - "See ." - - version_notes = "Release Notes:\n"\ - "* " - release_notes = "* " - } - - # initial provisioning script and data directory - scripts = [ setup ] - script_dirs = [ setup.d ] - - size = 1G - login = alpine - - local_format = qcow2 - - # image access - access.PUBLIC = true - - # image publication - regions.ALL = true -} - -# profile build matrix -Dimensions { - version { - "3.16" { include required("version/3.16.conf") } - "3.15" { include required("version/3.15.conf") } - "3.14" { include required("version/3.14.conf") } - "3.13" { include required("version/3.13.conf") } - edge { include required("version/edge.conf") } - } - arch { - x86_64 { include required("arch/x86_64.conf") } - aarch64 { include required("arch/aarch64.conf") } - } - firmware { - bios { include required("firmware/bios.conf") } - uefi { include required("firmware/uefi.conf") } - } - bootstrap { - tiny { include required("bootstrap/tiny.conf") } - cloudinit { include required("bootstrap/cloudinit.conf") } - } - cloud { - aws { include required("cloud/aws.conf") } - } -} - -# all build configs merge these at the very end -Mandatory { - name = [ "r{revision}" ] - description = [ "- https://alpinelinux.org/cloud" ] - - # final motd message - motd.motd_change = "You may change this message by editing /etc/motd." - - # final provisioning script - scripts = [ cleanup ] -} diff --git a/configs/arch/aarch64.conf b/configs/arch/aarch64.conf deleted file mode 100644 index dc4cfc3..0000000 --- a/configs/arch/aarch64.conf +++ /dev/null @@ -1,15 +0,0 @@ -# vim: ts=2 et: -name = [aarch64] -arch_name = aarch64 - -# aarch64 is UEFI only -EXCLUDE = [bios] - -qemu.machine_type = virt -qemu.args = [ - [-cpu, cortex-a57], - [-boot, d], - [-device, virtio-gpu-pci], - [-device, usb-ehci], - [-device, usb-kbd], -] diff --git a/configs/arch/x86_64.conf b/configs/arch/x86_64.conf deleted file mode 100644 index d90ba09..0000000 --- a/configs/arch/x86_64.conf +++ /dev/null @@ -1,9 +0,0 @@ -# vim: ts=2 et: -name = [x86_64] -arch_name = x86_64 - -# TODO: until we have a image metadata service, let's avoid UEFI -EXCLUDE = [uefi] - -qemu.machine_type = null -qemu.args = null diff --git a/configs/bootstrap/cloudinit.conf b/configs/bootstrap/cloudinit.conf deleted file mode 100644 index 19dd869..0000000 --- a/configs/bootstrap/cloudinit.conf +++ /dev/null @@ -1,16 +0,0 @@ -# vim: ts=2 et: -name = [cloudinit] -bootstrap_name = cloud-init -bootstrap_url = "https://cloud-init.io/" - -# start cloudinit images with 3.15 -EXCLUDE = ["3.12", "3.13", "3.14"] - -packages { - cloud-init = true - openssh-server-pam = true - e2fsprogs-extra = true # for resize2fs -} -services.default.cloud-init-hotplugd = true - -scripts = [ setup-cloudinit ] \ No newline at end of file diff --git a/configs/bootstrap/tiny.conf b/configs/bootstrap/tiny.conf deleted file mode 100644 index 1a50056..0000000 --- a/configs/bootstrap/tiny.conf +++ /dev/null @@ -1,33 +0,0 @@ -# vim: ts=2 et: -name = [tiny] -bootstrap_name = Tiny Cloud -bootstrap_url = "https://gitlab.alpinelinux.org/alpine/cloud/tiny-cloud" - -services { - sysinit.tiny-cloud-early = true - default.tiny-cloud = true - default.tiny-cloud-final = true -} - -WHEN { - aws { - packages.tiny-cloud-aws = true - WHEN { - "3.12" { - # tiny-cloud-network requires ifupdown-ng (unavailable in 3.12) - packages.tiny-cloud-aws = null - services.sysinit.tiny-cloud-early = null - services.default.tiny-cloud = null - services.default.tiny-cloud-final = null - # fall back to tiny-ec2-bootstrap instead - packages.tiny-ec2-bootstrap = true - services.default.tiny-ec2-bootstrap = true - } - } - } - # azure.packages.tiny-cloud-azure = true - # gcp.packages.tiny-cloud-gcp = true - # oci.packages.tiny-cloud-oci = true -} - -scripts = [ setup-tiny ] \ No newline at end of file diff --git a/configs/cloud/aws.conf b/configs/cloud/aws.conf deleted file mode 100644 index fd23f4e..0000000 --- a/configs/cloud/aws.conf +++ /dev/null @@ -1,37 +0,0 @@ -# vim: ts=2 et: -cloud_name = Amazon Web Services -cloud_image_url = "https://{region}.console.aws.amazon.com/ec2/home#Images:visibility=public-images;imageId={image_id}", -cloud_launch_url = "https://{region}.console.aws.amazon.com/ec2/home#launchAmi={image_id}" - -builder = qemu -ntp_server = 169.254.169.123 - -kernel_modules { - ena = true - nvme = true -} -kernel_options { - "nvme_core.io_timeout=4294967295" = true -} -initfs_features { - ena = true - nvme = true -} - -access.PUBLIC = true -regions.ALL = true - -WHEN { - aarch64 { - # new AWS aarch64 default... - kernel_modules.gpio_pl061 = true - initfs_features.gpio_pl061 = true - WHEN { - "3.14 3.13 3.12" { - # ...but not supported for older versions - kernel_modules.gpio_pl061 = false - initfs_features.gpio_pl061 = false - } - } - } -} \ No newline at end of file diff --git a/configs/firmware/bios.conf b/configs/firmware/bios.conf deleted file mode 100644 index 6bd8161..0000000 --- a/configs/firmware/bios.conf +++ /dev/null @@ -1,7 +0,0 @@ -# vim: ts=2 et: -name = [bios] -firmware_name = BIOS - -bootloader = extlinux -packages.syslinux = --no-scripts -qemu.firmware = null \ No newline at end of file diff --git a/configs/firmware/uefi.conf b/configs/firmware/uefi.conf deleted file mode 100644 index 12937c7..0000000 --- a/configs/firmware/uefi.conf +++ /dev/null @@ -1,18 +0,0 @@ -# vim: ts=2 et: -name = [uefi] -firmware_name = UEFI - -bootloader = grub-efi -packages { - grub-efi = --no-scripts - dosfstools = true -} - -WHEN { - aarch64 { - qemu.firmware = work/firmware/uefi-aarch64.bin - } - x86_64 { - qemu.firmware = work/firmware/uefi-x86_64.bin - } -} \ No newline at end of file diff --git a/configs/images.conf b/configs/images.conf deleted file mode 120000 index 99f2529..0000000 --- a/configs/images.conf +++ /dev/null @@ -1 +0,0 @@ -alpine.conf \ No newline at end of file diff --git a/configs/version/3.13.conf b/configs/version/3.13.conf deleted file mode 100644 index 9481943..0000000 --- a/configs/version/3.13.conf +++ /dev/null @@ -1,3 +0,0 @@ -# vim: ts=2 et: - -include required("base/2.conf") \ No newline at end of file diff --git a/configs/version/3.14.conf b/configs/version/3.14.conf deleted file mode 100644 index 9481943..0000000 --- a/configs/version/3.14.conf +++ /dev/null @@ -1,3 +0,0 @@ -# vim: ts=2 et: - -include required("base/2.conf") \ No newline at end of file diff --git a/configs/version/3.15.conf b/configs/version/3.15.conf deleted file mode 100644 index a9f6475..0000000 --- a/configs/version/3.15.conf +++ /dev/null @@ -1,7 +0,0 @@ -# vim: ts=2 et: - -include required("base/3.conf") - -motd { - sudo_deprecated = "NOTE: 'sudo' has been deprecated, please use 'doas' instead." -} \ No newline at end of file diff --git a/configs/version/3.16.conf b/configs/version/3.16.conf deleted file mode 100644 index 29a6936..0000000 --- a/configs/version/3.16.conf +++ /dev/null @@ -1,7 +0,0 @@ -# vim: ts=2 et: - -include required("base/4.conf") - -motd { - sudo_removed = "NOTE: 'sudo' is no longer installed by default, please use 'doas' instead." -} diff --git a/configs/version/base/1.conf b/configs/version/base/1.conf deleted file mode 100644 index 9d95504..0000000 --- a/configs/version/base/1.conf +++ /dev/null @@ -1,60 +0,0 @@ -# vim: ts=2 et: - -repos { - "https://dl-cdn.alpinelinux.org/alpine/v{version}/main" = true - "https://dl-cdn.alpinelinux.org/alpine/v{version}/community" = true - "https://dl-cdn.alpinelinux.org/alpine/v{version}/testing" = false -} - -packages { - alpine-base = true - linux-virt = true - alpine-mirrors = true - chrony = true - e2fsprogs = true - openssh = true - sudo = true - tzdata = true -} - -services { - sysinit { - devfs = true - dmesg = true - hwdrivers = true - mdev = true - } - boot { - acpid = true - bootmisc = true - hostname = true - hwclock = true - modules = true - swap = true - sysctl = true - syslog = true - } - default { - chronyd = true - networking = true - sshd = true - } - shutdown { - killprocs = true - mount-ro = true - savecache = true - } -} - -kernel_modules { - sd-mod = true - usb-storage = true - ext4 = true -} - -kernel_options { - "console=ttyS0,115200n8" = true -} - -initfs_features { -} diff --git a/configs/version/base/2.conf b/configs/version/base/2.conf deleted file mode 100644 index f6909c6..0000000 --- a/configs/version/base/2.conf +++ /dev/null @@ -1,8 +0,0 @@ -# vim: ts=2 et: - -include required("1.conf") - -packages { - # drop old alpine-mirrors - alpine-mirrors = null -} diff --git a/configs/version/base/3.conf b/configs/version/base/3.conf deleted file mode 100644 index 4373266..0000000 --- a/configs/version/base/3.conf +++ /dev/null @@ -1,8 +0,0 @@ -# vim: ts=2 et: - -include required("2.conf") - -packages { - # doas will officially replace sudo in 3.16 - doas = true -} diff --git a/configs/version/base/4.conf b/configs/version/base/4.conf deleted file mode 100644 index 6f2e978..0000000 --- a/configs/version/base/4.conf +++ /dev/null @@ -1,8 +0,0 @@ -# vim: ts=2 et: - -include required("3.conf") - -packages { - # doas officially replaces sudo in 3.16 - sudo = false -} diff --git a/configs/version/edge.conf b/configs/version/edge.conf deleted file mode 100644 index 885a4bf..0000000 --- a/configs/version/edge.conf +++ /dev/null @@ -1,15 +0,0 @@ -# vim: ts=2 et: - -include required("base/4.conf") - -motd { - sudo_removed = "NOTE: 'sudo' is no longer installed by default, please use 'doas' instead." -} - -# clear out inherited repos -repos = null -repos { - "https://dl-cdn.alpinelinux.org/alpine/edge/main" = true - "https://dl-cdn.alpinelinux.org/alpine/edge/community" = true - "https://dl-cdn.alpinelinux.org/alpine/edge/testing" = true -}