From 88c4157da4913033181d6ea898d0e0f7857e3ffe Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Mon, 5 Mar 2018 18:33:38 +0000 Subject: [PATCH] RPi: Fix linux patch generation to avoid merge conflict --- tools/RPi/gen-rpi-linux-patch.sh | 8 ++++++++ tools/RPi/rpi-linux-rebase.sh | 5 ++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/tools/RPi/gen-rpi-linux-patch.sh b/tools/RPi/gen-rpi-linux-patch.sh index d4c402d8e8..7e44db4291 100755 --- a/tools/RPi/gen-rpi-linux-patch.sh +++ b/tools/RPi/gen-rpi-linux-patch.sh @@ -105,6 +105,14 @@ cat /tmp/dropped echo echo "Dropped patches: /tmp/dropped" +LINE_START=$(grep -n '^DROP_COMMITS="$' ${BIN}/rpi-linux-rebase.sh | awk -F: '{print $1}') +LINE_END=$(grep -n '^"$' ${BIN}/rpi-linux-rebase.sh | awk -F: '{print $1}') +while read -r msg; do + grep -qxE "drop [a-f0-9]{40} ${msg}$" /tmp/dropped || LINES+="${msg}\n" +done <<< "$(sed -n "$((LINE_START + 1)),$((LINE_END - 1))p" ${BIN}/rpi-linux-rebase.sh | grep -v "^#### " | tr -d "\\\\")" + +[ -n "${LINES}" ] && echo -e "*****\nThe following commits are no longer being dropped:\n\n${LINES}*****" + echo "New patch file : /tmp/linux-01-RPi_support.patch" echo diff --git a/tools/RPi/rpi-linux-rebase.sh b/tools/RPi/rpi-linux-rebase.sh index 6db2898a39..1e56336b36 100755 --- a/tools/RPi/rpi-linux-rebase.sh +++ b/tools/RPi/rpi-linux-rebase.sh @@ -18,10 +18,9 @@ Added Device IDs for August DVB-T 205 net: Add non-mainline source for rtl8192cu wlan net: Fix rtl8192cu build errors on other platforms ARM64: Fix build break for RTL8187\/RTL8192CU wifi -fixup: rtl8192cu fixes from milhouse -rtl8192: Fixup build -rtl8192: switch to netdev->priv_destructor() Revert \"softirq: Let ksoftirqd do its job\" +#### Following commits are dropped to avoid merge conflicts #### +drm\/vc4: Release fence after signalling " IFS=$'\n'