[gnome-build-meta/valentindavid/rock64: 7/9] Do not use compressed kernel on aarch64



commit 717d2199b0c2d4dac5987eb6103f357bd1d65885
Author: Valentin David <valentin david codethink co uk>
Date:   Wed May 6 12:22:11 2020 +0200

    Do not use compressed kernel on aarch64

 elements/freedesktop-sdk.bst     |  2 ++
 fdsdk-linux-image-name-efi.patch | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)
---
diff --git a/elements/freedesktop-sdk.bst b/elements/freedesktop-sdk.bst
index 3a060277..b666c39f 100644
--- a/elements/freedesktop-sdk.bst
+++ b/elements/freedesktop-sdk.bst
@@ -3,6 +3,8 @@ sources:
 - kind: git_tag
   url: https://gitlab.com/freedesktop-sdk/freedesktop-sdk.git
   track: master
+- kind: patch
+  path: fdsdk-linux-image-name-efi.patch
 config:
   options:
     target_arch: '%{arch}'
diff --git a/fdsdk-linux-image-name-efi.patch b/fdsdk-linux-image-name-efi.patch
new file mode 100644
index 00000000..dc6522b2
--- /dev/null
+++ b/fdsdk-linux-image-name-efi.patch
@@ -0,0 +1,33 @@
+diff --git a/elements/components/linux.bst b/elements/components/linux.bst
+index 29767e4c..d620935a 100644
+--- a/elements/components/linux.bst
++++ b/elements/components/linux.bst
+@@ -16,15 +16,17 @@ depends:
+ 
+ variables:
+   bootdir: /boot
++  kernel_arch: '%{arch}'
++  image-name: '$(make -s image_name)'
+   (?):
+   - target_arch == "aarch64":
+       kernel_arch: arm64
++      # The default image file is not EFI compatible
++      image-name: arch/arm64/boot/Image
+   - target_arch == "i686":
+       kernel_arch: i386
+   - target_arch == "powerpc64le":
+       kernel_arch: powerpc
+-  - target_arch != "aarch64" and target_arch != "i686" and target_arch != "powerpc64le":
+-      kernel_arch: '%{arch}'
+ 
+ environment:
+   ARCH: '%{kernel_arch}'
+@@ -156,7 +158,7 @@ config:
+ 
+   install-commands:
+   - |
+-    install -Dm644 $(make -s image_name) '%{install-root}%{bootdir}/vmlinuz'
++    install -Dm644 "%{image-name}" '%{install-root}%{bootdir}/vmlinuz'
+     install -Dm644 System.map '%{install-root}%{bootdir}/System.map'
+     make INSTALL_MOD_PATH='%{install-root}%{prefix}' modules_install
+ 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]