Skip to contentSkip to conversation

configs/qemu_riscv32_nommu_virt: remove duplicate entry

PATCH Applied Waldemar Brodkorb 2 participants 2 messages Jul 13, 2024 RISC-V

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 configs/qemu_riscv32_nommu_virt: remove duplicate entry

Commit d037d9c2d63e9cd47b3701aaef8e28c32b8f5b37 added accidentally a duplicate of BR2_DOWNLOAD_FORCE_CHECK_HASHES. Remove that.

---
 .../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
board/qemu/riscv32-virt/patches/linux-headers/linux-headers.hash deleted +0 -2
deleted file mode 100644
index a6c777192c..0000000000
@@ -1,2 +0,0 @@
-# From https://cdn.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
-sha256  4e43d8c5fba14f7c82597838011648056487b7550fd83276ad534559e8499b1d  linux-6.6.18.tar.xz
board/qemu/riscv32-virt/patches/linux/linux.hash deleted +0 -2
deleted file mode 100644
index a6c777192c..0000000000
@@ -1,2 +0,0 @@
-# From https://cdn.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
-sha256  4e43d8c5fba14f7c82597838011648056487b7550fd83276ad534559e8499b1d  linux-6.6.18.tar.xz
configs/qemu_riscv32_nommu_virt_defconfig +0 -4
index 38a1cf791f..b958d42d02 100644
@@ -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
 
Signature · 6 lines
2.39.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

Hello Waldemar, All,

Le 13/07/2024 à 11:30, Waldemar Brodkorb a écrit :

Quoted 2 lines

Commit d037d9c2d63e9cd47b3701aaef8e28c32b8f5b37 added accidentally a duplicate of BR2_DOWNLOAD_FORCE_CHECK_HASHES. Remove that.

Actually this commit also forgot to remove the qemu/riscv32-virt specific patches directory.

Applied to master, thanks.

Best regards,
Romain

Quoted 31 lines
---
 .../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
board/qemu/riscv32-virt/patches/linux-headers/linux-headers.hash deleted +0 -2
deleted file mode 100644
index a6c777192c..0000000000
@@ -1,2 +0,0 @@
-# From https://cdn.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
-sha256  4e43d8c5fba14f7c82597838011648056487b7550fd83276ad534559e8499b1d  linux-6.6.18.tar.xz
board/qemu/riscv32-virt/patches/linux/linux.hash deleted +0 -2
deleted file mode 100644
index a6c777192c..0000000000
@@ -1,2 +0,0 @@
-# From https://cdn.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
-sha256  4e43d8c5fba14f7c82597838011648056487b7550fd83276ad534559e8499b1d  linux-6.6.18.tar.xz
configs/qemu_riscv32_nommu_virt_defconfig +0 -0
index 38a1cf791f..b958d42d02 100644

configs/qemu_riscv32_nommu_virt_defconfig BR2_RISCV_32=y · line 12

Quoted 10 lines
configs/qemu_riscv32_nommu_virt_defconfig +0 -4
@@ -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
 

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot