jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

RPi: Fix linux patch generation to avoid merge conflict

Browse Source
This commit is contained in:
MilhouseVH 2018-03-05 18:33:38 +00:00
parent 9f74916e2c
commit 88c4157da4
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/RPi/gen-rpi-linux-patch.sh
View File

@ -105,6 +105,14 @@ cat /tmp/dropped
echo echo
echo "Dropped patches: /tmp/dropped" 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 "New patch file : /tmp/linux-01-RPi_support.patch"
echo echo

5
tools/RPi/rpi-linux-rebase.sh
View File

@ -18,10 +18,9 @@ Added Device IDs for August DVB-T 205
net: Add non-mainline source for rtl8192cu wlan net: Add non-mainline source for rtl8192cu wlan
net: Fix rtl8192cu build errors on other platforms net: Fix rtl8192cu build errors on other platforms
ARM64: Fix build break for RTL8187\/RTL8192CU wifi 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\" Revert \"softirq: Let ksoftirqd do its job\"
#### Following commits are dropped to avoid merge conflicts ####
drm\/vc4: Release fence after signalling
" "
IFS=$'\n' IFS=$'\n'