diff --git a/scripts/checkdeps b/scripts/checkdeps index 77e4caad2f..56fa386191 100755 --- a/scripts/checkdeps +++ b/scripts/checkdeps @@ -35,6 +35,10 @@ case $1 in deps_pkg="bash bc gcc g++ sed patch fileutils tar bzip2 gzip perl coreutils gawk texinfo gperf cvs zip unzip xutils xfonts-utils diff xsltproc default-jre" files="/usr/include/stdio.h /usr/include/ncurses.h" files_pkg="libc6-dev libncurses5-dev" + if [ -f /etc/redhat-release ]; then + deps_pkg="bash bc gcc gcc-c++ sed patch fileutils tar bzip2 gzip perl coreutils gawk texinfo gperf cvs zip unzip xorg-x11-font-utils xorg-x11-font-utils diffutils libxslt java-1.7.0-openjdk" + files_pkg="glibc-headers ncurses-devel" + fi ;; qemu) if [ ! `which qemu` ]; then @@ -113,6 +117,10 @@ if [ -n "$need" ]; then echo "**** You seem to use a fedora system ****" read -p "would you like to install the needed tools ? (y/n) " ans [ "$ans" = "y" ] && sudo yum install $need_pkg + elif [ -f /etc/redhat-release -a "`which yum 2>/dev/null`" ]; then + echo "**** You seem to use a RedHat or clone (CentOS) system ****" + read -p "would you like to install the needed tools ? (y/n) " ans + [ "$ans" = "y" ] && sudo yum install $need_pkg else echo "********" exit 1 diff --git a/scripts/image b/scripts/image index 92aa2c2ebd..ef6a20db62 100755 --- a/scripts/image +++ b/scripts/image @@ -31,7 +31,10 @@ $SCRIPTS/build kmod:host BUILD_DATE=`date +%Y%m%d%H%M%S` if [ "$OPENELEC_VERSION" = devel -o "$OPENELEC_VERSION" = debug ]; then - GIT_BUILD=$(git rev-list --count HEAD) + if ! GIT_BUILD=$(git rev-list --count HEAD 2>/dev/null) + then + GIT_BUILD=$(git rev-list HEAD | wc -l) + fi GIT_HASH=$(git rev-parse HEAD) GIT_ABBREV=$(git log -1 --pretty=format:%h) OPENELEC_VERSION=$OPENELEC_VERSION-$BUILD_DATE-r$GIT_BUILD-g$GIT_ABBREV