From c2237dd25072236fe9a5dffd03bf2cdda71ff819 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 13 Jul 2024 11:30:46 +0200 Subject: [PATCH] configs/qemu_riscv32_nommu_virt: remove duplicate entry Commit d037d9c2d63e9cd47b3701aaef8e28c32b8f5b37 added accidentally a duplicate of BR2_DOWNLOAD_FORCE_CHECK_HASHES and forgot to remove existing board/qemu/riscv32-virt/patches directory. Remove that. Signed-off-by: Waldemar Brodkorb [Romain: slightly update the commit log] Signed-off-by: Romain Naour --- .../riscv32-virt/patches/linux-headers/linux-headers.hash | 2 -- board/qemu/riscv32-virt/patches/linux/linux.hash | 2 -- configs/qemu_riscv32_nommu_virt_defconfig | 4 ---- 3 files changed, 8 deletions(-) delete mode 100644 board/qemu/riscv32-virt/patches/linux-headers/linux-headers.hash delete mode 100644 board/qemu/riscv32-virt/patches/linux/linux.hash diff --git a/board/qemu/riscv32-virt/patches/linux-headers/linux-headers.hash b/board/qemu/riscv32-virt/patches/linux-headers/linux-headers.hash deleted file mode 100644 index a6c777192c..0000000000 --- a/board/qemu/riscv32-virt/patches/linux-headers/linux-headers.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://cdn.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 4e43d8c5fba14f7c82597838011648056487b7550fd83276ad534559e8499b1d linux-6.6.18.tar.xz diff --git a/board/qemu/riscv32-virt/patches/linux/linux.hash b/board/qemu/riscv32-virt/patches/linux/linux.hash deleted file mode 100644 index a6c777192c..0000000000 --- a/board/qemu/riscv32-virt/patches/linux/linux.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://cdn.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 4e43d8c5fba14f7c82597838011648056487b7550fd83276ad534559e8499b1d linux-6.6.18.tar.xz diff --git a/configs/qemu_riscv32_nommu_virt_defconfig b/configs/qemu_riscv32_nommu_virt_defconfig index 38a1cf791f..b958d42d02 100644 --- a/configs/qemu_riscv32_nommu_virt_defconfig +++ b/configs/qemu_riscv32_nommu_virt_defconfig @@ -7,10 +7,6 @@ BR2_RISCV_32=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -# Hashes -BR2_GLOBAL_PATCH_DIR="board/qemu/riscv32-virt/patches" -BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - # Linux headers same as kernel BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y