tools: source packages reliably

This commit is contained in:
MilhouseVH 2018-02-01 02:59:57 +00:00
parent 2ae80ca928
commit 6b9155cf8b
2 changed files with 32 additions and 28 deletions

View File

@ -22,6 +22,8 @@ if [ -z "$1" ]; then
exit 0
fi
ROOT=$(cd $(dirname $0)/../.. && pwd)
KODI_BRANCH="$1"
KODI_DIR="kodi-${KODI_BRANCH}.git"
@ -66,9 +68,9 @@ resolve_hash() {
# Return 1 if not a github domain
geturl() {
local addon="$1"
local domain owner repo
local domain owner repo PKG_URL
. ../../packages/mediacenter/kodi-binary-addons/${addon}/package.mk 1>/dev/null 2>/dev/null
PKG_URL="$(get_pkg_var ${addon} PKG_URL)"
domain="$(echo "${PKG_URL}" | cut -d/ -f3)"
[ "${domain}" = "github.com" ] || return 1
@ -98,8 +100,8 @@ validate_pkg_url() {
get_pkg_var() {
local pkg_name="$1" pkg_var="$2"
cd ../..
PROJECT=Generic ARCH=x86_64 source config/options ${pkg_name}
cd ${ROOT}
PROJECT=Generic ARCH=x86_64 source config/options ${pkg_name} &>/dev/null
echo "${!pkg_var}"
}
@ -129,11 +131,11 @@ GIT_HASH=$(cat $KODI_DIR/cmake/addons/depends/common/p8-platform/p8-platform.txt
PKG_NAME="p8-platform"
git_clone $REPO master $PKG_NAME.git $GIT_HASH
if [ -f ../../packages/mediacenter/p8-platform/package.mk ] ; then
if [ -f ${ROOT}/packages/mediacenter/p8-platform/package.mk ] ; then
# update package.mk
RESOLVED_HASH=$(resolve_hash $PKG_NAME.git $GIT_HASH)
echo "Resolving hash for ${PKG_NAME}: ${GIT_HASH} => ${RESOLVED_HASH}"
sed -i "s|PKG_VERSION=.*|PKG_VERSION=\"$RESOLVED_HASH\"|g" ../../packages/mediacenter/p8-platform/package.mk
sed -i "s|PKG_VERSION=.*|PKG_VERSION=\"$RESOLVED_HASH\"|g" ${ROOT}/packages/mediacenter/p8-platform/package.mk
fi
rm -rf $PKG_NAME.git
@ -143,10 +145,10 @@ GIT_HASH=$(cat $KODI_DIR/cmake/addons/depends/common/kodi-platform/kodi-platform
PKG_NAME="kodi-platform"
git_clone $REPO master $PKG_NAME.git $GIT_HASH
if [ -f ../../packages/mediacenter/kodi-platform/package.mk ] ; then
if [ -f ${ROOT}/packages/mediacenter/kodi-platform/package.mk ] ; then
# update package.mk
RESOLVED_HASH=$(resolve_hash $PKG_NAME.git $GIT_HASH)
update_pkg ../../packages/mediacenter/kodi-platform/package.mk ${PKG_NAME} ${RESOLVED_HASH}
update_pkg ${ROOT}/packages/mediacenter/kodi-platform/package.mk ${PKG_NAME} ${RESOLVED_HASH}
fi
rm -rf $PKG_NAME.git
@ -175,13 +177,13 @@ for addontxt in $KODI_DIR/cmake/addons/bootstrap/repositories/*-addons.txt ; do
continue
fi
if [ -f ../../packages/mediacenter/kodi-binary-addons/$ADDON/package.mk ] ; then
if [ -f ${ROOT}/packages/mediacenter/kodi-binary-addons/$ADDON/package.mk ] ; then
git_clone $REPO ${KODI_BRANCH} $PKG_NAME.git $GIT_HASH
# update package.mk
RESOLVED_HASH=$(resolve_hash $PKG_NAME.git $GIT_HASH)
echo "Resolving hash for ${PKG_NAME}: ${GIT_HASH} => ${RESOLVED_HASH}"
update_pkg ../../packages/mediacenter/kodi-binary-addons/$ADDON/package.mk ${PKG_NAME} ${RESOLVED_HASH}
update_pkg ${ROOT}/packages/mediacenter/kodi-binary-addons/$ADDON/package.mk ${PKG_NAME} ${RESOLVED_HASH}
rm -rf $PKG_NAME.git
else
@ -197,7 +199,7 @@ for addontxt in $KODI_DIR/cmake/addons/bootstrap/repositories/*-addons.txt ; do
done
# finally, any other unofficial addons
for ADDON in $(ls -1 ../../packages/mediacenter/kodi-binary-addons); do
for ADDON in $(ls -1 ${ROOT}/packages/mediacenter/kodi-binary-addons); do
[[ ${ADDON} =~ ^game.* ]] && continue # ignore game.* addons - handled by update_retroplayer-addons
# ignore already processed addons
@ -211,7 +213,7 @@ for ADDON in $(ls -1 ../../packages/mediacenter/kodi-binary-addons); do
# update package.mk for stale github.com packages
RESOLVED_HASH=$(resolve_hash ${ADDON}.git HEAD) || continue
echo "Resolving hash for ${ADDON}: HEAD => ${RESOLVED_HASH}"
update_pkg ../../packages/mediacenter/kodi-binary-addons/$ADDON/package.mk ${ADDON} ${RESOLVED_HASH}
update_pkg ${ROOT}/packages/mediacenter/kodi-binary-addons/$ADDON/package.mk ${ADDON} ${RESOLVED_HASH}
rm -rf $ADDON.git
done

View File

@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash
################################################################################
# This file is part of LibreELEC - https://libreelec.tv
# Copyright (C) 2016 Team LibreELEC
@ -17,6 +17,8 @@
# along with LibreELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################
ROOT=$(cd $(dirname $0)/../.. && pwd)
git_clone() {
# git_clone https://repo.url branch ./target_dir [githash]
echo "[mkpkg] Checking out $1 ..."
@ -49,8 +51,8 @@ resolve_hash() {
get_pkg_var() {
local pkg_name="$1" pkg_var="$2"
cd ../..
PROJECT=Generic ARCH=x86_64 source config/options ${pkg_name}
cd ${ROOT}
PROJECT=Generic ARCH=x86_64 source config/options ${pkg_name} &>/dev/null
echo "${!pkg_var}"
}
@ -64,10 +66,11 @@ update_pkg() {
[ -n "$pkg_version}" ] && sed -e "s|PKG_VERSION=.*|PKG_VERSION=\"${pkg_version}\"|g" -i ${pkg_path}
pkg_url=$(get_pkg_var "${pkg_name}" PKG_URL)
if [ -n "${pkg_url}" ]; then
new_sha256="$(wget -q ${pkg_url} -O- | sha256sum | awk '{print $1}')" || exit 1
sed -e "s|PKG_SHA256=.*|PKG_SHA256=\"${new_sha256}\"|g" -i ${pkg_path}
fi
fi
}
# addons
@ -96,15 +99,14 @@ for addontxt in "binary-addons https://github.com/lrusak/repo-binary-addons.git
# binary add-on section #
#########################
if [ -f ../../packages/mediacenter/kodi-binary-addons/$ADDON/package.mk ]; then
if [ -f ${ROOT}/packages/mediacenter/kodi-binary-addons/$ADDON/package.mk ]; then
. ../../packages/mediacenter/kodi-binary-addons/$ADDON/package.mk
OLD_HASH=$PKG_VERSION
OLD_HASH=$(get_pkg_var "${ADDON}" PKG_VERSION)
git_clone $REPO master $ADDON.git $GIT_HASH
RESOLVED_HASH=$(resolve_hash $ADDON.git $GIT_HASH)
if [ "$OLD_HASH" != "$RESOLVED_HASH" ]; then
update_pkg ../../packages/mediacenter/kodi-binary-addons/$ADDON/package.mk ${ADDON} ${RESOLVED_HASH}
update_pkg ${ROOT}/packages/mediacenter/kodi-binary-addons/$ADDON/package.mk ${ADDON} ${RESOLVED_HASH}
BUMP_REV=true
@ -119,15 +121,15 @@ for addontxt in "binary-addons https://github.com/lrusak/repo-binary-addons.git
# emulation section #
#########################
if [ -f ../../packages/emulation/$EMULATOR/package.mk ]; then
if [ -f ${ROOT}/packages/emulation/$EMULATOR/package.mk ]; then
. ../../packages/emulation/$EMULATOR/package.mk
OLD_HASH=$PKG_VERSION
OLD_HASH=$(get_pkg_var "${EMULATOR}" PKG_VERSION)
PKG_SITE=$(get_pkg_var "${EMULATOR}" PKG_SITE)
git_clone $PKG_SITE master $EMULATOR.git
RESOLVED_HASH=$(resolve_hash $EMULATOR.git master)
if [ "$OLD_HASH" != "$RESOLVED_HASH" ]; then
update_pkg ../../packages/emulation/$EMULATOR/package.mk ${EMULATOR} ${RESOLVED_HASH}
update_pkg ${ROOT}/packages/emulation/$EMULATOR/package.mk ${EMULATOR} ${RESOLVED_HASH}
BUMP_REV=true
echo "OLD_HASH: $OLD_HASH"
@ -139,8 +141,8 @@ for addontxt in "binary-addons https://github.com/lrusak/repo-binary-addons.git
if [ "$BUMP_REV" = "true" ]; then
. ../../packages/mediacenter/kodi-binary-addons/$ADDON/package.mk
sed -e "s|PKG_REV=.*|PKG_REV=\"$((PKG_REV+1))\"|" -i ../../packages/mediacenter/kodi-binary-addons/$ADDON/package.mk
PKG_REV=$(get_pkg_var "${ADDON}" PKG_REV)
sed -e "s|PKG_REV=.*|PKG_REV=\"$((PKG_REV+1))\"|" -i ${ROOT}/packages/mediacenter/kodi-binary-addons/$ADDON/package.mk
echo "BUMPING PKG_REV FROM: $PKG_REV TO: $((PKG_REV+1))"
echo ""