Patchwork update-linux-headers.sh: Don't hard code list of architectures

login
register
mail settings
Submitter Peter Maydell
Date July 18, 2012, 10:11 a.m.
Message ID <1342606269-12527-1-git-send-email-peter.maydell@linaro.org>
Download mbox | patch
Permalink /patch/171628/
State New
Headers show

Comments

Peter Maydell - July 18, 2012, 10:11 a.m.
Rather than hardcoding the list of architectures in the kernel
header update script, just import headers for every architecture
which supports KVM (with a blacklist exception for ia64 which
has KVM headers but is dead). This reduces the number of QEMU
files which need to be updated to add support for a new KVM
architecture.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
Changes v1->v2:
 * added a blacklist for ia64, to avoid noise and importing
   a pointless set of headers that will get dropped later

 scripts/update-linux-headers.sh |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)
Jan Kiszka - July 18, 2012, 10:18 a.m.
On 2012-07-18 12:11, Peter Maydell wrote:
> Rather than hardcoding the list of architectures in the kernel
> header update script, just import headers for every architecture
> which supports KVM (with a blacklist exception for ia64 which
> has KVM headers but is dead). This reduces the number of QEMU
> files which need to be updated to add support for a new KVM
> architecture.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Acked-by: Jan Kiszka <jan.kiszka@siemens.com>

> ---
> Changes v1->v2:
>  * added a blacklist for ia64, to avoid noise and importing
>    a pointless set of headers that will get dropped later
> 
>  scripts/update-linux-headers.sh |   16 +++++++++++++++-
>  1 files changed, 15 insertions(+), 1 deletions(-)
> 
> diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
> index 9d2a4bc..57ce69f 100755
> --- a/scripts/update-linux-headers.sh
> +++ b/scripts/update-linux-headers.sh
> @@ -28,7 +28,21 @@ if [ -z "$output" ]; then
>      output="$PWD"
>  fi
>  
> -for arch in x86 powerpc s390; do
> +# This will pick up non-directories too (eg "Kconfig") but we will
> +# ignore them in the next loop.
> +ARCHLIST=$(cd "$linux/arch" && echo *)
> +
> +for arch in $ARCHLIST; do
> +    # Discard anything which isn't a KVM-supporting architecture
> +    if ! [ -e "$linux/arch/$arch/include/asm/kvm.h" ]; then
> +        continue
> +    fi
> +
> +    # Blacklist architectures which have KVM headers but are actually dead
> +    if [ "$arch" = "ia64" ]; then
> +        continue
> +    fi
> +
>      make -C "$linux" INSTALL_HDR_PATH="$tmpdir" SRCARCH=$arch headers_install
>  
>      rm -rf "$output/linux-headers/asm-$arch"
>
Peter Maydell - Aug. 3, 2012, 12:55 p.m.
Ping?

patchwork url: http://patchwork.ozlabs.org/patch/171628/

-- PMM

On 18 July 2012 11:11, Peter Maydell <peter.maydell@linaro.org> wrote:
> Rather than hardcoding the list of architectures in the kernel
> header update script, just import headers for every architecture
> which supports KVM (with a blacklist exception for ia64 which
> has KVM headers but is dead). This reduces the number of QEMU
> files which need to be updated to add support for a new KVM
> architecture.
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
> Changes v1->v2:
>  * added a blacklist for ia64, to avoid noise and importing
>    a pointless set of headers that will get dropped later
>
>  scripts/update-linux-headers.sh |   16 +++++++++++++++-
>  1 files changed, 15 insertions(+), 1 deletions(-)
>
> diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
> index 9d2a4bc..57ce69f 100755
> --- a/scripts/update-linux-headers.sh
> +++ b/scripts/update-linux-headers.sh
> @@ -28,7 +28,21 @@ if [ -z "$output" ]; then
>      output="$PWD"
>  fi
>
> -for arch in x86 powerpc s390; do
> +# This will pick up non-directories too (eg "Kconfig") but we will
> +# ignore them in the next loop.
> +ARCHLIST=$(cd "$linux/arch" && echo *)
> +
> +for arch in $ARCHLIST; do
> +    # Discard anything which isn't a KVM-supporting architecture
> +    if ! [ -e "$linux/arch/$arch/include/asm/kvm.h" ]; then
> +        continue
> +    fi
> +
> +    # Blacklist architectures which have KVM headers but are actually dead
> +    if [ "$arch" = "ia64" ]; then
> +        continue
> +    fi
> +
>      make -C "$linux" INSTALL_HDR_PATH="$tmpdir" SRCARCH=$arch headers_install
>
>      rm -rf "$output/linux-headers/asm-$arch"
> --
> 1.7.5.4
>
>
Peter Maydell - Aug. 13, 2012, 9:23 a.m.
Ping^2?

On 3 August 2012 13:55, Peter Maydell <peter.maydell@linaro.org> wrote:
> Ping?
>
> patchwork url: http://patchwork.ozlabs.org/patch/171628/
>
> -- PMM
>
> On 18 July 2012 11:11, Peter Maydell <peter.maydell@linaro.org> wrote:
>> Rather than hardcoding the list of architectures in the kernel
>> header update script, just import headers for every architecture
>> which supports KVM (with a blacklist exception for ia64 which
>> has KVM headers but is dead). This reduces the number of QEMU
>> files which need to be updated to add support for a new KVM
>> architecture.
>>
>> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
>> ---
>> Changes v1->v2:
>>  * added a blacklist for ia64, to avoid noise and importing
>>    a pointless set of headers that will get dropped later
>>
>>  scripts/update-linux-headers.sh |   16 +++++++++++++++-
>>  1 files changed, 15 insertions(+), 1 deletions(-)
>>
>> diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
>> index 9d2a4bc..57ce69f 100755
>> --- a/scripts/update-linux-headers.sh
>> +++ b/scripts/update-linux-headers.sh
>> @@ -28,7 +28,21 @@ if [ -z "$output" ]; then
>>      output="$PWD"
>>  fi
>>
>> -for arch in x86 powerpc s390; do
>> +# This will pick up non-directories too (eg "Kconfig") but we will
>> +# ignore them in the next loop.
>> +ARCHLIST=$(cd "$linux/arch" && echo *)
>> +
>> +for arch in $ARCHLIST; do
>> +    # Discard anything which isn't a KVM-supporting architecture
>> +    if ! [ -e "$linux/arch/$arch/include/asm/kvm.h" ]; then
>> +        continue
>> +    fi
>> +
>> +    # Blacklist architectures which have KVM headers but are actually dead
>> +    if [ "$arch" = "ia64" ]; then
>> +        continue
>> +    fi
>> +
>>      make -C "$linux" INSTALL_HDR_PATH="$tmpdir" SRCARCH=$arch headers_install
>>
>>      rm -rf "$output/linux-headers/asm-$arch"
>> --
>> 1.7.5.4
>>
>>

Patch

diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
index 9d2a4bc..57ce69f 100755
--- a/scripts/update-linux-headers.sh
+++ b/scripts/update-linux-headers.sh
@@ -28,7 +28,21 @@  if [ -z "$output" ]; then
     output="$PWD"
 fi
 
-for arch in x86 powerpc s390; do
+# This will pick up non-directories too (eg "Kconfig") but we will
+# ignore them in the next loop.
+ARCHLIST=$(cd "$linux/arch" && echo *)
+
+for arch in $ARCHLIST; do
+    # Discard anything which isn't a KVM-supporting architecture
+    if ! [ -e "$linux/arch/$arch/include/asm/kvm.h" ]; then
+        continue
+    fi
+
+    # Blacklist architectures which have KVM headers but are actually dead
+    if [ "$arch" = "ia64" ]; then
+        continue
+    fi
+
     make -C "$linux" INSTALL_HDR_PATH="$tmpdir" SRCARCH=$arch headers_install
 
     rm -rf "$output/linux-headers/asm-$arch"