Skip to content

Commit

Permalink
Merge pull request LibreELEC#1448 from MilhouseVH/gen_script_devices
Browse files Browse the repository at this point in the history
tools: fixup RPi gen scripts after devices
  • Loading branch information
lrusak authored Mar 15, 2017
2 parents a3b0cb5 + 75305c6 commit 1b38cb9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 17 deletions.
16 changes: 2 additions & 14 deletions tools/RPi/gen-rpi-kodi-patch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,11 @@ else
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}" >/tmp/kodi.patch
git format-patch --no-signature --stdout ${BASEREV} >/tmp/kodi.patch

cd .. && rm -fr raspberrypi-kodi

echo
echo "New skin patch: /tmp/skin.patch"
echo "New kodi patch: /tmp/kodi.patch"

echo
Expand All @@ -101,20 +99,10 @@ echo "git checkout -b somebranch"

BRANCH="${BRANCH//_/-}"

echo
if [ -s /tmp/skin.patch ]; then
echo "cp /tmp/skin.patch projects/RPi/patches/${SKIN2}/${SKIN2}-001-backport.patch"
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
if [ -s /tmp/kodi.patch ]; then
echo "cp /tmp/kodi.patch projects/RPi/patches/kodi/kodi-001-backport.patch"
echo "cp /tmp/kodi.patch projects/RPi2/patches/kodi/kodi-001-backport.patch"
echo "git commit -am \"RPi/RPi2: Update kodi support patches\""
echo "git commit -am \"RPi: Update kodi support patch\""
else
echo "NO KODI PATCH REQUIRED"
fi
Expand Down
4 changes: 1 addition & 3 deletions tools/RPi/gen-rpi-linux-patch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,8 @@ echo "git checkout -b somebranch"

echo
echo "cp /tmp/linux-01-RPi_support.patch projects/RPi/patches/linux/linux-01-RPi_support.patch"
echo
echo "cp /tmp/linux-01-RPi_support.patch projects/RPi2/patches/linux/linux-01-RPi_support.patch"

echo
echo "git commit -am \"RPi/RPi2: update linux support patches for linux ${KERNEL:-${BRANCH}}\""
echo "git commit -am \"RPi: update linux support patch for linux ${KERNEL:-${BRANCH}}\""

echo

0 comments on commit 1b38cb9

Please sign in to comment.