[elbe-devel] [PATCH v2 12/15] examples: change <norecommend /> to <install-recommends />

Torben Hohn torben.hohn at linutronix.de
Thu May 16 09:05:33 CEST 2019


because <norecommend /> was broken since its first introduction, it
is not fixed silently, but its removed, and <install-recommends /> is
added, which should provide the same functionality.

Change all examples that used <norecommend /> to use <install-recommends />
now.

Signed-off-by: Torben Hohn <torben.hohn at linutronix.de>
---
 examples/arm64-qemu-virt.xml                     | 2 +-
 examples/armel-rescue-busybox-cpio.xml           | 2 +-
 examples/armhf-ti-beaglebone-black.xml           | 2 +-
 examples/x86_64-pc-hdimg-grub-hybrid-stretch.xml | 2 +-
 examples/x86_64-pc-hdimg-grub-uefi-stretch.xml   | 2 +-
 examples/x86_64-pc-rescue-busybox-dyn-cpio.xml   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/arm64-qemu-virt.xml b/examples/arm64-qemu-virt.xml
index 2b346db21..448fd86b4 100644
--- a/examples/arm64-qemu-virt.xml
+++ b/examples/arm64-qemu-virt.xml
@@ -63,7 +63,7 @@
 				</fs>
 			</bylabel>
 		</fstab>
-		<norecommend />
+		<install-recommends />
 		<finetuning>
 			<rm>/var/cache/apt/archives/*.deb</rm>
 		</finetuning>
diff --git a/examples/armel-rescue-busybox-cpio.xml b/examples/armel-rescue-busybox-cpio.xml
index eb2a9105a..4b30d89d2 100644
--- a/examples/armel-rescue-busybox-cpio.xml
+++ b/examples/armel-rescue-busybox-cpio.xml
@@ -52,7 +52,7 @@
 			</bydev>
 		</fstab>
 		<diet />
-		<norecommend />
+		<install-recommends />
 		<finetuning>
 			<!-- Create missing directories -->
 			<mkdir>/dev</mkdir>
diff --git a/examples/armhf-ti-beaglebone-black.xml b/examples/armhf-ti-beaglebone-black.xml
index 3b913c6d6..eb835ee4a 100644
--- a/examples/armhf-ti-beaglebone-black.xml
+++ b/examples/armhf-ti-beaglebone-black.xml
@@ -89,7 +89,7 @@
 			</bylabel>
 		</fstab>
 		<!-- don't auto install recommended packages -->
-		<norecommend />
+		<install-recommends />
 		<finetuning>
 			<!-- move the 1st stage bootloader to the path where the bootrom expects it -->
 			<cp path="/usr/lib/u-boot/am335x_boneblack/MLO">/boot/MLO</cp>
diff --git a/examples/x86_64-pc-hdimg-grub-hybrid-stretch.xml b/examples/x86_64-pc-hdimg-grub-hybrid-stretch.xml
index 908115623..2d6c6125b 100644
--- a/examples/x86_64-pc-hdimg-grub-hybrid-stretch.xml
+++ b/examples/x86_64-pc-hdimg-grub-hybrid-stretch.xml
@@ -79,7 +79,7 @@
 				</fs>
 			</bylabel>
 		</fstab>
-		<norecommend />
+		<install-recommends />
 		<pkg-list>
 			<!-- grub-efi-amd64 conflicts with grub-pc, so install grub-efi-amd64-bin and grub-pc -->
 			<pkg>grub-efi-amd64-bin</pkg>
diff --git a/examples/x86_64-pc-hdimg-grub-uefi-stretch.xml b/examples/x86_64-pc-hdimg-grub-uefi-stretch.xml
index 85d7cb2c1..5bafe41ce 100644
--- a/examples/x86_64-pc-hdimg-grub-uefi-stretch.xml
+++ b/examples/x86_64-pc-hdimg-grub-uefi-stretch.xml
@@ -70,7 +70,7 @@
 				</fs>
 			</bylabel>
 		</fstab>
-		<norecommend />
+		<install-recommends />
 		<pkg-list>
 			<!-- install the EFI version of grub -->
 			<pkg>grub-efi-amd64</pkg>
diff --git a/examples/x86_64-pc-rescue-busybox-dyn-cpio.xml b/examples/x86_64-pc-rescue-busybox-dyn-cpio.xml
index ca0fb729c..6b9496dbb 100644
--- a/examples/x86_64-pc-rescue-busybox-dyn-cpio.xml
+++ b/examples/x86_64-pc-rescue-busybox-dyn-cpio.xml
@@ -53,7 +53,7 @@
 			</bydev>
 		</fstab>
 		<diet />
-		<norecommend />
+		<install-recommends />
 		<finetuning>
 			<!-- Create missing directories -->
 			<mkdir>/dev</mkdir>
-- 
2.11.0




More information about the elbe-devel mailing list