jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-31 22:47:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #506 from MilhouseVH/kodi-newclock5

Browse Source 
kodi: Update RBP commits
This commit is contained in:
Lukas Rusak 2016-07-05 10:46:13 -07:00 committed by GitHub
commit 17b17dd04b
6 changed files with 165645 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2187
projects/RPi/patches/kodi/kodi-000-backports.patch Normal file
View File

File diff suppressed because it is too large Load Diff

80614
projects/RPi/patches/kodi/kodi-001-backport.patch Normal file
View File

File diff suppressed because it is too large Load Diff

2187
projects/RPi2/patches/kodi/kodi-000-backports.patch Normal file
View File

File diff suppressed because it is too large Load Diff

80614
projects/RPi2/patches/kodi/kodi-001-backport.patch Normal file
View File

File diff suppressed because it is too large Load Diff

33
tools/RPi/gen-rpi-kodi-patch.sh
View File

@ -18,6 +18,7 @@ usage()
echo echo
echo "Example: ${me} jarvis_rbp_backports d11fabefb909e75e7186bd9ecd0cbff9e8b24577" echo "Example: ${me} jarvis_rbp_backports d11fabefb909e75e7186bd9ecd0cbff9e8b24577"
echo "Example: ${me} jarvis_rbp_backports Jarvis" echo "Example: ${me} jarvis_rbp_backports Jarvis"
echo "Example: ${me} newclock5 master"
echo echo
echo "For sha, see https://github.com/xbmc/xbmc/compare/Jarvis...popcornmix:jarvis_rbp_backports (replace branches as appropriate)" echo "For sha, see https://github.com/xbmc/xbmc/compare/Jarvis...popcornmix:jarvis_rbp_backports (replace branches as appropriate)"
exit 1 exit 1
@ -58,9 +59,20 @@ else
BASEREV="xbmc/${BASEREV}" BASEREV="xbmc/${BASEREV}"
fi fi
# Apply the following config change to reduce chance of duplicate hashes
git config --local core.abbrev 40
git fetch --all --depth=${DEPTH} git fetch --all --depth=${DEPTH}
git reset --hard origin/${BRANCH} git reset --hard origin/${BRANCH}
TOPREV="$(git log --oneline --grep "UNSTABLE: This is a placeholder. Commits after this point are considered experimental." | awk '{print $1}')"
if [ -n "${TOPREV}" ]; then
echo "Found UNSTABLE placeholder with rev ${TOPREV}, making this the new HEAD"
git reset --hard ${TOPREV}
else
echo "WARNING: UNSTABLE placeholder not found, assuming it is not present in branch ${BRANCH}"
fi
if [ -d addons/skin.confluence ]; then if [ -d addons/skin.confluence ]; then
SKIN1=skin.confluence SKIN1=skin.confluence
SKIN2=kodi-theme-Confluence SKIN2=kodi-theme-Confluence
@ -69,6 +81,7 @@ else
SKIN2=kodi-theme-Estuary SKIN2=kodi-theme-Estuary
fi fi
GIT_SEQUENCE_EDITOR=${BIN}/rpi-kodi-rebase.sh git rebase -i ${BASEREV}
git format-patch --no-signature --stdout ${BASEREV} -- addons/${SKIN1} | sed -E 's#addons/skin\.[^/]*/##g' >/tmp/skin.patch git format-patch --no-signature --stdout ${BASEREV} -- addons/${SKIN1} | sed -E 's#addons/skin\.[^/]*/##g' >/tmp/skin.patch
git format-patch --no-signature --stdout ${BASEREV} -- . ":!addons/${SKIN1}" >/tmp/kodi.patch git format-patch --no-signature --stdout ${BASEREV} -- . ":!addons/${SKIN1}" >/tmp/kodi.patch
@ -89,13 +102,21 @@ echo "git checkout -b somebranch"
BRANCH="${BRANCH//_/-}" BRANCH="${BRANCH//_/-}"
echo echo
echo "cp /tmp/skin.patch projects/RPi/patches/${SKIN2}/${SKIN2}-001-${BRANCH}.patch" if [ -s /tmp/skin.patch ]; then
echo "cp /tmp/skin.patch projects/RPi2/patches/${SKIN2}/${SKIN2}-001-${BRANCH}.patch" echo "cp /tmp/skin.patch projects/RPi/patches/${SKIN2}/${SKIN2}-001-backport.patch"
echo "git commit -am \"RPi/RPi2: Update ${SKIN2} support patches\"" echo "cp /tmp/skin.patch projects/RPi2/patches/${SKIN2}/${SKIN2}-001-backport.patch"
echo "git commit -am \"RPi/RPi2: Update ${SKIN2} support patches\""
else
echo "NO SKIN PATCH REQUIRED"
fi
echo echo
echo "cp /tmp/kodi.patch projects/RPi/patches/kodi/kodi-001-${BRANCH}.patch" if [ -s /tmp/kodi.patch ]; then
echo "cp /tmp/kodi.patch projects/RPi2/patches/kodi/kodi-001-${BRANCH}.patch" echo "cp /tmp/kodi.patch projects/RPi/patches/kodi/kodi-001-backport.patch"
echo "git commit -am \"RPi/RPi2: Update kodi support patches\"" echo "cp /tmp/kodi.patch projects/RPi2/patches/kodi/kodi-001-backport.patch"
echo "git commit -am \"RPi/RPi2: Update kodi support patches\""
else
echo "NO KODI PATCH REQUIRED"
fi
echo echo

16
tools/RPi/rpi-kodi-rebase.sh Executable file
View File

@ -0,0 +1,16 @@
#!/bin/bash
TODO=$1
# Drop commits not used
DROP_COMMITS="
THIS_IS_A_PLACEHOLDER, REPLACE WITH COMMIT DESCRIPTION ONCE THERE IS SOMETHING TO BE DROPPED!
"
IFS=$'\n'
for COMMIT in $DROP_COMMITS; do
sed -i -E "s/^pick ([0-9a-f]+) (${COMMIT}.*)/drop \1 \2/g" $TODO
done
grep -E "^drop " $TODO > /tmp/dropped
sed -i -E "/^drop /d" $TODO