From da2b9e6e2b77cdde3b0aa9c62c86aa572e287430 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 1 Jul 2016 07:21:20 +0100 Subject: [PATCH 1/2] kodi: update to 17.0-alpha2-f3ca4ea --- packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk | 2 +- packages/mediacenter/kodi-theme-Estuary/package.mk | 2 +- packages/mediacenter/kodi/package.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk index f5d9264b59..0d96eaad64 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="pvr.stalker" -PKG_VERSION="ad1f7d6" +PKG_VERSION="b465352" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi-theme-Estuary/package.mk b/packages/mediacenter/kodi-theme-Estuary/package.mk index 8d81703d09..846c34c4a8 100644 --- a/packages/mediacenter/kodi-theme-Estuary/package.mk +++ b/packages/mediacenter/kodi-theme-Estuary/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="kodi-theme-Estuary" -PKG_VERSION="17.0-alpha2-d9fd774" +PKG_VERSION="17.0-alpha2-f3ca4eaf9" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index f9f7279fa5..a6510451d7 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="kodi" -PKG_VERSION="17.0-alpha2-d9fd774" +PKG_VERSION="17.0-alpha2-f3ca4eaf9" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 0dfd0312497b1ba53d22c274002a93dffdc12e53 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 1 Jul 2016 07:32:02 +0100 Subject: [PATCH 2/2] mkpkg_kodi: Allow a specific git rev to be used --- tools/mkpkg/mkpkg_kodi | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/mkpkg/mkpkg_kodi b/tools/mkpkg/mkpkg_kodi index ac03dc95db..2e365ed8e5 100755 --- a/tools/mkpkg/mkpkg_kodi +++ b/tools/mkpkg/mkpkg_kodi @@ -18,13 +18,14 @@ ################################################################################ if [ -z "$1" ]; then - echo "Usage: $0 " + echo "Usage: $0 [git-rev]" exit 0 fi PKG_NAME="kodi" PKG_VERSION="" BRANCH="$1" +GIT_REV="$2" GIT_REPO="git://github.com/xbmc/xbmc.git" DEST_DIR="$PKG_NAME-$BRANCH" @@ -36,6 +37,9 @@ echo "getting sources..." cd $DEST_DIR.git git pull + # use a specific git rev, rather than HEAD + [ -n "$GIT_REV" ] && git reset --hard $GIT_REV + echo "getting version..." GIT_HASH=`git log -n1 --format=%h` VERSION_MAJOR=$(grep ^VERSION_MAJOR version.txt | cut -d" " -f2)