Skip to content
Snippets Groups Projects
Commit ad9ca847 authored by Philip Müller's avatar Philip Müller
Browse files

[pkg-upd] 2022.07rc6-1

- fix 1001 patch
parent 90fbb8e5
No related branches found
No related tags found
No related merge requests found
Pipeline #8312 passed
...@@ -12,13 +12,14 @@ diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common ...@@ -12,13 +12,14 @@ diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common
index ba7061a287..5dc92373b2 100644 index ba7061a287..5dc92373b2 100644
--- a/include/configs/rockchip-common.h --- a/include/configs/rockchip-common.h
+++ b/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h
@@ -55,9 +55,9 @@ @@ -61,10 +61,10 @@
#ifdef CONFIG_ROCKCHIP_RK3399 #ifdef CONFIG_ROCKCHIP_RK3399
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
+ BOOT_TARGET_USB(func) \ + BOOT_TARGET_USB(func) \
BOOT_TARGET_MMC(func) \ BOOT_TARGET_MMC(func) \
BOOT_TARGET_NVME(func) \ BOOT_TARGET_NVME(func) \
BOOT_TARGET_SCSI(func) \
- BOOT_TARGET_USB(func) \ - BOOT_TARGET_USB(func) \
BOOT_TARGET_PXE(func) \ BOOT_TARGET_PXE(func) \
BOOT_TARGET_DHCP(func) \ BOOT_TARGET_DHCP(func) \
......
...@@ -40,7 +40,7 @@ sha256sums=('fdad16d681e9ac0803f7bb56fd8965d0835eb8fed11159288854a619aad9c010' ...@@ -40,7 +40,7 @@ sha256sums=('fdad16d681e9ac0803f7bb56fd8965d0835eb8fed11159288854a619aad9c010'
'e55fb02dfb6213eabbb899b468dc5f68d36a11c05feda4c14e80282415222fea' 'e55fb02dfb6213eabbb899b468dc5f68d36a11c05feda4c14e80282415222fea'
'6265fb9d3bc84bf1217383b52587b1d5a36372d88a824932586a802a502f62ba' '6265fb9d3bc84bf1217383b52587b1d5a36372d88a824932586a802a502f62ba'
'05eaccb2e8ea1eba3e86a4e7fcf12fd232195b5018c049ddf36e5a82a968cc24' '05eaccb2e8ea1eba3e86a4e7fcf12fd232195b5018c049ddf36e5a82a968cc24'
'017d33aac55f8a5ed22170c97b4792ba755a4dad04f6c0cdd85119bbc81e87b3' 'b182b84c111c45317176335b35f94a9f043dd0a1b68c429b029f5ac60d3aa07a'
'7c3d76f4bee0e54900142043241248072e334387065212141e1f600afe0aafba' '7c3d76f4bee0e54900142043241248072e334387065212141e1f600afe0aafba'
'1c9cc403f527733b9ef093505c147074ac5afa881380d65ae3819f2bad75c8cd' '1c9cc403f527733b9ef093505c147074ac5afa881380d65ae3819f2bad75c8cd'
'4417d39d9da79e3256267adb9928cd9fd7cf10d363761cea77b275f106804fe8' '4417d39d9da79e3256267adb9928cd9fd7cf10d363761cea77b275f106804fe8'
...@@ -56,7 +56,7 @@ prepare() { ...@@ -56,7 +56,7 @@ prepare() {
PATCH="${PATCH##*/}" PATCH="${PATCH##*/}"
[[ ${PATCH} = $1*.patch ]] || continue [[ ${PATCH} = $1*.patch ]] || continue
msg2 "Applying patch: ${PATCH}..." msg2 "Applying patch: ${PATCH}..."
patch -N -p1 < "../${PATCH}" || true patch -N -p1 < "../${PATCH}" # || true
done done
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment