From da1941d529f97588c80b27491af80aaf1c8d9c4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= Date: Wed, 10 Dec 2014 09:26:14 +0100 Subject: [PATCH] =?UTF-8?q?Switch=20back=20to=20use=20=E2=80=9C#if=20ARCHI?= =?UTF-8?q?TECTURES=E2=80=9D=20instead=20of=20=E2=80=9C#if=20ARCHITECTURE?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit live-build 4.0.4 reverted the problematic change. --- config/package-lists/kali.list.binary | 4 ++-- config/package-lists/kali.list.chroot | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/package-lists/kali.list.binary b/config/package-lists/kali.list.binary index dc1f3aa..51edfbf 100644 --- a/config/package-lists/kali.list.binary +++ b/config/package-lists/kali.list.binary @@ -1,11 +1,11 @@ # EFI support, ensure we have the required .deb in the ISO available for # installation -#if ARCHITECTURE i386 +#if ARCHITECTURES i386 grub-efi grub-efi-ia32 #endif -#if ARCHITECTURE amd64 +#if ARCHITECTURES amd64 grub-efi grub-efi-amd64 #endif diff --git a/config/package-lists/kali.list.chroot b/config/package-lists/kali.list.chroot index 66e5012..cd9ace3 100644 --- a/config/package-lists/kali.list.chroot +++ b/config/package-lists/kali.list.chroot @@ -16,13 +16,13 @@ kbd console-data console-common -#if ARCHITECTURE armel armhf +#if ARCHITECTURES armel armhf cgpt vboot-utils vboot-kernel-utils #endif -#if ARCHITECTURE i386 amd64 +#if ARCHITECTURES i386 amd64 firmware-b43legacy-installer firmware-b43-installer guymager @@ -35,7 +35,7 @@ guymager # or you can just comment everything except the package of your # preferred desktop. -#if ARCHITECTURE i386 amd64 +#if ARCHITECTURES i386 amd64 # *** GNOME DESKTOP *** gnome-core gnome-brave-icon-theme @@ -44,7 +44,7 @@ nautilus-open-terminal gnome-orca #endif -#if ARCHITECTURE armel armhf +#if ARCHITECTURES armel armhf # *** XFCE DESKTOP *** xfce4 network-manager-gnome