From 71a193e96f8417873a63848ad474d6379617d9a0 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 5 Mar 2018 11:40:45 +0000
Subject: scripts/mkimg: remove -hardened kernel and vanilla iso

standard iso is now vanilla kernel so it does not make any sense to have
a separata vanilla iso.

Also update xen to use vanilla kernel instead of hardened
---
 scripts/mkimg.arm.sh      | 14 +++-----------
 scripts/mkimg.base.sh     |  2 +-
 scripts/mkimg.standard.sh | 16 ++--------------
 scripts/mkimg.xen.sh      |  2 +-
 4 files changed, 7 insertions(+), 27 deletions(-)

(limited to 'scripts')

diff --git a/scripts/mkimg.arm.sh b/scripts/mkimg.arm.sh
index c0c65cbd79..3b1341b345 100755
--- a/scripts/mkimg.arm.sh
+++ b/scripts/mkimg.arm.sh
@@ -48,7 +48,7 @@ profile_rpi() {
 	profile_base
 	title="Raspberry Pi"
 	desc="Includes Raspberry Pi kernel.
-		Does not include grsec patchset.
+		Designed for RPI 1,2 and 3.
 		And much more..."
 	image_ext="tar.gz"
 	arch="armhf"
@@ -86,16 +86,8 @@ profile_uboot() {
 		Supports armhf and aarch64."
 	image_ext="tar.gz"
 	arch="aarch64 armhf armv7"
-	case "$ARCH" in
-	aarch64)
-		kernel_flavors="vanilla"
-		kernel_addons=
-		;;
-	*)
-		kernel_flavors="hardened"
-		kernel_addons="xtables-addons"
-		;;
-	esac
+	kernel_flavors="vanilla"
+	kernel_addons="xtables-addons"
 	initfs_features="base bootchart squashfs ext2 ext3 ext4 kms mmc raid scsi usb"
 	apkovl="genapkovl-dhcp.sh"
 	hostname="alpine"
diff --git a/scripts/mkimg.base.sh b/scripts/mkimg.base.sh
index 31d3d985d7..567184d28f 100755
--- a/scripts/mkimg.base.sh
+++ b/scripts/mkimg.base.sh
@@ -267,7 +267,7 @@ create_image_targz() {
 }
 
 profile_base() {
-	kernel_flavors="hardened"
+	kernel_flavors="vanilla"
 	initfs_cmdline="modules=loop,squashfs,sd-mod,usb-storage quiet"
 	initfs_features="ata base bootchart cdrom squashfs ext2 ext3 ext4 mmc raid scsi usb virtio"
 	grub_mod="disk part_msdos linux normal configfile search search_label efi_uga efi_gop fat iso9660 cat echo ls test true help"
diff --git a/scripts/mkimg.standard.sh b/scripts/mkimg.standard.sh
index 4337e07105..0fd39c912c 100755
--- a/scripts/mkimg.standard.sh
+++ b/scripts/mkimg.standard.sh
@@ -5,24 +5,12 @@ profile_standard() {
 		Network connection is required."
 	profile_base
 	image_ext="iso"
-	arch="x86 x86_64"
+	arch="x86 x86_64 ppc64le"
 	output_format="iso"
 	kernel_cmdline="nomodeset"
 	kernel_addons="xtables-addons"
 }
 
-profile_vanilla() {
-	profile_standard
-	title="Vanilla"
-	desc="Includes a vanilla kernel.
-		Does not include grsec patch set.
-		Suitable for debugging."
-	#arch="$arch aarch64"
-	arch="$arch ppc64le"
-	kernel_flavors="vanilla"
-	kernel_addons=
-}
-
 profile_extended() {
 	profile_standard
 	title="Extended"
@@ -70,7 +58,7 @@ profile_virt() {
 		Slimmed down kernel.
 		Optimized for virtual systems."
 	kernel_addons=
-	kernel_flavors="virthardened"
+	kernel_flavors="virt"
 	kernel_cmdline="console=tty0 console=ttyS0,115200"
 	syslinux_serial="0 115200"
 }
diff --git a/scripts/mkimg.xen.sh b/scripts/mkimg.xen.sh
index 556abd9af9..c825cf9b1e 100755
--- a/scripts/mkimg.xen.sh
+++ b/scripts/mkimg.xen.sh
@@ -12,7 +12,7 @@ profile_xen() {
 	title="Xen"
 	desc="Build-in support for Xen Hypervisor.
 		Includes packages targed at Xen usage.
-		Includes grsec kernel."
+		Use for Xen Dom 0."
 	arch="x86_64"
 	kernel_cmdline="nomodeset"
 	xen_params=""
-- 
cgit v1.2.3