From 2f54fcf3d70ebaab4848358d99f8e347874a72a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <hertzog@debian.org>
Date: Mon, 18 Sep 2017 18:00:20 +0200
Subject: [PATCH] Replace "kirkwood" and "orion5x" armel flavors with the new
 "marvell" one

As done by the linux source package since its version 4.4.
---
 debian/changelog      | 2 ++
 functions/defaults.sh | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f82da6520..add85ddd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ live-build (1:20170830) UNRELEASED; urgency=medium
   * Fix size calculation when we use FAT filesystems that do not support
     hardlinks. Closes: #873640
     Thanks to Matthijs Kooijman <matthijs@stdin.nl> for the patch.
+  * Replace "kirkwood" and "orion5x" armel flavors with the new
+    "marvell" (as done by the linux source package since its version 4.4).
 
  -- Raphaƫl Hertzog <hertzog@debian.org>  Tue, 29 Aug 2017 15:13:39 +0200
 
diff --git a/functions/defaults.sh b/functions/defaults.sh
index f17fb7bbb..78ca358d1 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -413,7 +413,7 @@ Set_defaults ()
 		armel)
 			# armel will have special images: one rootfs image and many additional kernel images.
 			# therefore we default to all available armel flavours
-			LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-kirkwood orion5x}"
+			LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-marvell}"
 			;;
 
 		armhf)