summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphaël Hertzog <hertzog@debian.org>2017-09-18 18:00:20 +0200
committerRaphaël Hertzog <hertzog@debian.org>2017-09-18 18:00:20 +0200
commit2f54fcf3d70ebaab4848358d99f8e347874a72a4 (patch)
tree80fddd3e335e5365a7748321c03937ad88a05773
parent72ca3bcb2062fe5cceb4ae9b3855568aaaa7275d (diff)
downloadvyos-live-build-2f54fcf3d70ebaab4848358d99f8e347874a72a4.tar.gz
vyos-live-build-2f54fcf3d70ebaab4848358d99f8e347874a72a4.zip
Replace "kirkwood" and "orion5x" armel flavors with the new "marvell" one
As done by the linux source package since its version 4.4.
-rw-r--r--debian/changelog2
-rwxr-xr-xfunctions/defaults.sh2
2 files changed, 3 insertions, 1 deletions
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)