From 46f4244a08f3fa29a7ff86a95bd918355f07c522 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 6 Dec 2019 17:23:13 +0000
Subject: [PATCH] scripts: replace -vanilla kernel with -lts
also add doas to extended image
---
scripts/bootstrap.sh | 4 ++--
scripts/mkimg.arm.sh | 2 +-
scripts/mkimg.netboot.sh | 2 +-
scripts/mkimg.standard.sh | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index c273c4380b7c..804037c29a8f 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -6,7 +6,7 @@ TARGET_ARCH="$1"
SUDO_APK=abuild-apk
# optional cross build packages
-KERNEL_PKG="linux-firmware linux-vanilla"
+KERNEL_PKG="linux-firmware linux-lts"
# get abuild configurables
[ -e /usr/share/abuild/functions.sh ] || (echo "abuild not found" ; exit 1)
@@ -46,7 +46,7 @@ Steps for introducing new architecture include:
- adding the arch type detection to apk-tools
- adjusting build rules for packages that are arch aware:
gcc, openssl, linux-headers
-- create new kernel config for linux-vanilla
+- create new kernel config for linux-lts
After these steps the initial cross-build can be completed
by running this with the target arch as parameter, e.g.:
diff --git a/scripts/mkimg.arm.sh b/scripts/mkimg.arm.sh
index a671f0543fe9..1221e84915b0 100755
--- a/scripts/mkimg.arm.sh
+++ b/scripts/mkimg.arm.sh
@@ -118,7 +118,7 @@ profile_uboot() {
Supports armhf and aarch64."
image_ext="tar.gz"
arch="aarch64 armhf armv7"
- kernel_flavors="vanilla"
+ kernel_flavors="lts"
kernel_addons="xtables-addons"
initfs_features="base bootchart squashfs ext4 kms mmc raid scsi usb"
apkovl="genapkovl-dhcp.sh"
diff --git a/scripts/mkimg.netboot.sh b/scripts/mkimg.netboot.sh
index c5f447be9b45..7fd065916b3a 100755
--- a/scripts/mkimg.netboot.sh
+++ b/scripts/mkimg.netboot.sh
@@ -12,7 +12,7 @@ profile_netboot() {
"
arch="aarch64 armhf armv7 ppc64le x86 x86_64 s390x"
kernel_cmdline="nomodeset"
- kernel_flavors="vanilla"
+ kernel_flavors="lts"
modloop_sign=yes
apks=""
initfs_features="base network squashfs usb virtio"
diff --git a/scripts/mkimg.standard.sh b/scripts/mkimg.standard.sh
index 8599227771f2..ccda5a5c551c 100755
--- a/scripts/mkimg.standard.sh
+++ b/scripts/mkimg.standard.sh
@@ -30,9 +30,9 @@ profile_extended() {
Suitable for routers and servers.
Runs from RAM."
arch="x86 x86_64"
- kernel_addons="dahdi-linux xtables-addons zfs spl"
+ kernel_addons="xtables-addons zfs"
apks="$apks
- dahdi-linux dahdi-tools ethtool hwdata lftp links
+ ethtool hwdata lftp links doas
logrotate lua5.3 lsof lm_sensors lxc lxc-templates nano
pax-utils paxmark pciutils screen strace sudo tmux
usbutils v86d vim xtables-addons curl
--
GitLab