From 8dad9e86d0688e4e71dc52f7338d948902312685 Mon Sep 17 00:00:00 2001 From: Dongjin Kim Date: Sat, 20 Jan 2024 01:03:51 +0900 Subject: [PATCH] fixup: remove 'linux-image-' from kernel package name Signed-off-by: Dongjin Kim Change-Id: I4c47e2e2b72062fd52a3a391b4746926c2ac78e7 --- boards/odroidc2/functions | 2 +- boards/odroidc4/functions | 2 +- boards/odroidgo2/functions | 2 +- boards/odroidhc4/functions | 2 +- boards/odroidm1/functions | 2 +- boards/odroidm1s/functions | 4 ++-- boards/odroidn2/functions | 2 +- boards/odroidn2l/functions | 2 +- boards/odroidn2plus/functions | 2 +- boards/odroidxu4/functions | 2 +- custom/kodi/areascout/gbm/functions | 2 +- fixups/S20-install-packages | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/boards/odroidc2/functions b/boards/odroidc2/functions index a7fb513..1fdab89 100644 --- a/boards/odroidc2/functions +++ b/boards/odroidc2/functions @@ -3,7 +3,7 @@ get_machine_name() { } get_kernel_package() { - echo "linux-image-generic" + echo "generic" } get_bootscript_package() { diff --git a/boards/odroidc4/functions b/boards/odroidc4/functions index 9a7b696..633cc5a 100644 --- a/boards/odroidc4/functions +++ b/boards/odroidc4/functions @@ -3,7 +3,7 @@ get_machine_name() { } get_kernel_package() { - echo "linux-image-generic" + echo "generic" } get_bootscript_package() { diff --git a/boards/odroidgo2/functions b/boards/odroidgo2/functions index 4ddbdc3..8bc19ae 100644 --- a/boards/odroidgo2/functions +++ b/boards/odroidgo2/functions @@ -3,7 +3,7 @@ get_machine_name() { } get_kernel_package() { - echo "linux-image-odroidgo2" + echo "odroidgo2" } get_bootscript_package() { diff --git a/boards/odroidhc4/functions b/boards/odroidhc4/functions index 8ae0dbe..5763b09 100644 --- a/boards/odroidhc4/functions +++ b/boards/odroidhc4/functions @@ -3,7 +3,7 @@ get_machine_name() { } get_kernel_package() { - echo "linux-image-generic" + echo "generic" } get_bootscript_package() { diff --git a/boards/odroidm1/functions b/boards/odroidm1/functions index 546a58e..f2f801e 100644 --- a/boards/odroidm1/functions +++ b/boards/odroidm1/functions @@ -3,7 +3,7 @@ get_machine_name() { } get_kernel_package() { - echo "linux-image-odroidm1" + echo "odroidm1" } get_bootscript_package() { diff --git a/boards/odroidm1s/functions b/boards/odroidm1s/functions index 7d21fbd..8035138 100644 --- a/boards/odroidm1s/functions +++ b/boards/odroidm1s/functions @@ -5,10 +5,10 @@ get_machine_name() { get_kernel_package() { case ${DISTRO} in focal) - echo "linux-image-5.10.0-odroid-arm64" + echo "5.10.0-odroid-arm64" ;; *) - echo "linux-image-6.1.0-odroid-arm64" + echo "6.1.0-odroid-arm64" ;; esac } diff --git a/boards/odroidn2/functions b/boards/odroidn2/functions index bc90423..da7874c 100644 --- a/boards/odroidn2/functions +++ b/boards/odroidn2/functions @@ -3,7 +3,7 @@ get_machine_name() { } get_kernel_package() { - echo "linux-image-generic" + echo "generic" } get_bootscript_package() { diff --git a/boards/odroidn2l/functions b/boards/odroidn2l/functions index 429126c..d6cdf99 100644 --- a/boards/odroidn2l/functions +++ b/boards/odroidn2l/functions @@ -3,7 +3,7 @@ get_machine_name() { } get_kernel_package() { - echo "linux-image-generic" + echo "generic" } get_bootscript_package() { diff --git a/boards/odroidn2plus/functions b/boards/odroidn2plus/functions index 0f6490a..ab81585 100644 --- a/boards/odroidn2plus/functions +++ b/boards/odroidn2plus/functions @@ -3,7 +3,7 @@ get_machine_name() { } get_kernel_package() { - echo "linux-image-generic" + echo "generic" } get_bootscript_package() { diff --git a/boards/odroidxu4/functions b/boards/odroidxu4/functions index 88a64f6..9e686d2 100644 --- a/boards/odroidxu4/functions +++ b/boards/odroidxu4/functions @@ -3,7 +3,7 @@ get_machine_name() { } get_kernel_package() { - echo "linux-image-generic" + echo "generic" } get_bootscript_package() { diff --git a/custom/kodi/areascout/gbm/functions b/custom/kodi/areascout/gbm/functions index ceae197..5ea526a 100644 --- a/custom/kodi/areascout/gbm/functions +++ b/custom/kodi/areascout/gbm/functions @@ -1,3 +1,3 @@ get_kernel_package() { - echo "linux-image-5.10.0-odroid-arm64" + echo "5.10.0-odroid-arm64" } diff --git a/fixups/S20-install-packages b/fixups/S20-install-packages index e20ad3d..21692e8 100755 --- a/fixups/S20-install-packages +++ b/fixups/S20-install-packages @@ -16,7 +16,7 @@ apt install @@DEFAULT_APT_OPTIONS@@ \ rsync \ network-manager \ @@DEFAULT_FLAVOUR_PACKAGES@@ \ - @@DEFAULT_KERNEL_PACKAGE@@ \ + linux-image-@@DEFAULT_KERNEL_PACKAGE@@ \ @@DEFAULT_BOOTSCRIPT_PACKAGE@@ || exit 1 if ls /overlay/host/debs/*.deb 1>/dev/null 2>&1; then