From c92351c28b44904a032e860b1fc7ea770d47ef48 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Sun, 21 Jan 2018 18:12:27 -0600 Subject: [PATCH] Disabling no-follow-recommends needs some more testing and benchmarking, and it's not breaking anything right now to have it, so let's revert those changes. --- STRUCTURE | 1 + core | 2 ++ core-gtk | 2 ++ core-qt | 2 ++ core-share | 2 ++ desktop | 2 ++ desktop-gtk | 2 ++ desktop-qt | 2 ++ desktop-share | 2 ++ live | 2 ++ live-gtk | 2 ++ live-qt | 2 ++ live-share | 6 ++++++ 13 files changed, 29 insertions(+) diff --git a/STRUCTURE b/STRUCTURE index 9ba223b..9019574 100644 --- a/STRUCTURE +++ b/STRUCTURE @@ -1,4 +1,5 @@ include platform.bionic +feature no-follow-recommends core: core-share core-gtk: core-share core-qt: core-share diff --git a/core b/core index 848986d..1ccf3a3 100644 --- a/core +++ b/core @@ -7,6 +7,8 @@ Task-Name: lubuntu-core Task-Metapackage: lubuntu-core Task-Seeds: core-gtk core-share + * Feature: no-follow-recommends + = Meta-package = * lubuntu-core diff --git a/core-gtk b/core-gtk index ca93b64..7fbf5e8 100644 --- a/core-gtk +++ b/core-gtk @@ -7,6 +7,8 @@ Task-Name: lubuntu-gtk-core Task-Metapackage: lubuntu-gtk-core Task-Seeds: core-share + * Feature: no-follow-recommends + = LXDE core packages = * pcmanfm diff --git a/core-qt b/core-qt index ffaabba..6f82104 100644 --- a/core-qt +++ b/core-qt @@ -7,6 +7,8 @@ Task-Name: lubuntu-qt-core Task-Metapackage: lubuntu-qt-core Task-Seeds: core-share + * Feature: no-follow-recommends + = LXQt core packages = * pcmanfm-qt diff --git a/core-share b/core-share index a9cb55b..375224a 100644 --- a/core-share +++ b/core-share @@ -5,6 +5,8 @@ Task-Extended-Description: This task provides shared packages for minimal instal Task-Key: core-share Task-Name: core-share + * Feature: no-follow-recommends + = LXDE / LXQt core packages = diff --git a/desktop b/desktop index 7388b4d..79d6b9e 100644 --- a/desktop +++ b/desktop @@ -7,6 +7,8 @@ Task-Name: lubuntu-desktop Task-Metapackage: lubuntu-desktop Task-Seeds: desktop-gtk desktop-share + * Feature: no-follow-recommends + == Default seeds == * lubuntu-desktop-gtk diff --git a/desktop-gtk b/desktop-gtk index 459c6a6..fc9ce12 100644 --- a/desktop-gtk +++ b/desktop-gtk @@ -7,6 +7,8 @@ Task-Name: lubuntu-gtk-desktop Task-Metapackage: lubuntu-gtk-desktop Task-Seeds: desktop-share core-gtk + * Feature: no-follow-recommends + == Default seeds == * lubuntu-gtk-core diff --git a/desktop-qt b/desktop-qt index bf3573d..e24f235 100644 --- a/desktop-qt +++ b/desktop-qt @@ -7,6 +7,8 @@ Task-Name: lubuntu-qt-desktop Task-Metapackage: lubuntu-qt-desktop Task-Seeds: desktop-share core-qt + * Feature: no-follow-recommends + == Default seeds == * lubuntu-qt-core diff --git a/desktop-share b/desktop-share index 97ec76c..eb1c7c7 100644 --- a/desktop-share +++ b/desktop-share @@ -6,6 +6,8 @@ Task-Key: lubuntu-desktop-share Task-Name: lubuntu-desktop-share Task-Seeds: core-share + * Feature: no-follow-recommends + == Default seeds == * lubuntu-core diff --git a/live b/live index 3d20521..dc71e20 100644 --- a/live +++ b/live @@ -7,6 +7,8 @@ Task-Key: ubiquity-frontend Task-Test-new-install: skip show Task-Seeds: live-gtk live-share live-common + * Feature: no-follow-recommends + == Languages support == * Languages: en diff --git a/live-gtk b/live-gtk index f952942..98d966a 100644 --- a/live-gtk +++ b/live-gtk @@ -7,6 +7,8 @@ Task-Key: ubiquity-frontend-gtk Task-Test-new-install: skip show Task-Seeds: live-share + * Feature: no-follow-recommends + == Languages support == * Languages: en diff --git a/live-qt b/live-qt index b57d843..af7cf8e 100644 --- a/live-qt +++ b/live-qt @@ -7,6 +7,8 @@ Task-Key: ubiquity-frontend-qt Task-Test-new-install: skip show Task-Seeds: live-share + * Feature: no-follow-recommends + == Languages support == * Languages: en diff --git a/live-share b/live-share index 2cf75c6..c390280 100644 --- a/live-share +++ b/live-share @@ -7,6 +7,12 @@ Task-Key: ubiquity-frontend Task-Test-new-install: skip show Task-Seeds: live-common + * Feature: no-follow-recommends + +== Bootloader == + * grub-pc # no-follow-recommends doesn't put grub on the ISO (ubiquity recommends) + # See LP: 1649462 + == Languages support == * Languages: en