Skip to content
This repository has been archived by the owner on Sep 30, 2018. It is now read-only.

Commit

Permalink
Merge branch 'master' of github.com:xbmc/xbmc-live
Browse files Browse the repository at this point in the history
  • Loading branch information
Piethein Strengholt committed Nov 3, 2011
2 parents ffd9345 + 656afde commit 85e550b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 11 deletions.
11 changes: 1 addition & 10 deletions SDK/build.sh
Expand Up @@ -92,7 +92,7 @@ if ! which lb > /dev/null ; then
if [ ! -d live-build ]; then
repoURL="http://live.debian.net/archive/packages/live-build/orig/"
if [ -z "$SDK_USELATESTDEBIANLIVE" ]; then
latestPackage="live-build_3.0~a35.orig.tar.gz"
latestPackage="live-build_3.0~a38.orig.tar.gz"
else
latestPackage=$(curl -x "" -s -f $repoURL | grep live-build | tail -1 | grep -o '"live-build_[^"]*.tar.gz"' | sed -e "s/\"//g")
fi
Expand All @@ -116,16 +116,7 @@ if ! which lb > /dev/null ; then
export LB_BASE="${LB_HOMEDIR}"
export PATH="${PATH}:${LB_BASE}/scripts/build"

# TODO: remove symlink creation once oneiric has come with the latest build-live package
ln -s $LB_HOMEDIR/data/debian-cd/maverick $LB_HOMEDIR/data/debian-cd/oneiric

cd $THISDIR
else
# TODO: remove symlink creation once oneiric has come with the latest build-live package
if [ ! -d "/usr/share/live/build/data/debian-cd/oneiric" ];
then
ln -s /usr/share/live/build/data/debian-cd/maverick /usr/share/live/build/data/debian-cd/oneiric
fi
fi

echo "Start building..."
Expand Down
2 changes: 1 addition & 1 deletion SDK/buildWithOptions.sh
Expand Up @@ -90,7 +90,7 @@ do
shift
;;
-i|--interactive)
echo "Enable interactive mode (opens a chell in chroot after package configuring)"
echo "Enable option: interactive mode (opens a chell in chroot after package configuring)"
export SDK_CHROOTSHELL=1
shift
;;
Expand Down

0 comments on commit 85e550b

Please sign in to comment.