Merge pull request #1326 from MilhouseVH/script_cleanup

Build system scripts cleanup

scripts/extract

@@ -32,8 +32,8 @@ case $PKG_SOURCE_NAME in
   $2)
     f="$SOURCES/$1/$PKG_SOURCE_NAME"
     if [ ! -f $f ]; then
-      echo "error: File $PKG_SOURCE_NAME doesn't exists in package $1 sources directory"
-      echo "have you called scripts/extract before scripts/get ?"
+      echo "error: File $PKG_SOURCE_NAME doesn't exist in package $1 sources directory"
+      echo "Have you called scripts/extract before scripts/get ?"
       exit 1
     fi
     case $PKG_SOURCE_NAME in

scripts/get

@@ -30,6 +30,16 @@ fi
 if [ -n "$PKG_URL" -a -n "$PKG_SOURCE_NAME" ]; then
   mkdir -p $SOURCES/$1
 
+  PACKAGE="$SOURCES/$1/$PKG_SOURCE_NAME"
+  PACKAGE_MIRROR="$DISTRO_MIRROR/$PKG_NAME/$PKG_SOURCE_NAME"
+  [ "$VERBOSE" != "yes" ] && WGET_OPT=-q
+  WGET_CMD="wget --timeout=30 --tries=3 --passive-ftp --no-check-certificate -c $WGET_OPT -O $SOURCES/$1/$PKG_SOURCE_NAME"
+
+  STAMP="$PACKAGE.url"
+
+  # Nothing to be downloaded, exit now...
+  [ -f $SOURCES/$1/$PKG_SOURCE_NAME -a "$(cat $STAMP 2>/dev/null)" == "$PKG_URL" ] && exit 0
+
   # Avoid concurrent downloads of the same package
   _isblocked=N
   exec 99<$SOURCES/$1
@@ -38,40 +48,25 @@ if [ -n "$PKG_URL" -a -n "$PKG_SOURCE_NAME" ]; then
     sleep 1
   done
 
-  PACKAGE="$SOURCES/$1/$PKG_SOURCE_NAME"
-  PACKAGE_MIRROR="$DISTRO_MIRROR/$PKG_NAME/$PKG_SOURCE_NAME"
-  [ "$VERBOSE" != "yes" ] && WGET_OPT=-q
-  WGET_CMD="wget --timeout=30 --tries=3 --passive-ftp --no-check-certificate -c $WGET_OPT -O $SOURCES/$1/$PKG_SOURCE_NAME"
-
-  NBWGET="1"
-
-  STAMP="$PACKAGE.url"
-  MD5SUM="$PACKAGE.md5"
-
-  DL="yes"
-  if [ -f "$STAMP" ]; then
-    [ "`cat $STAMP`" == "$PKG_URL" ] && DL="no"
-  fi
-
-  if [ "$DL" == "yes" ]; then
-    rm -f $STAMP
+  if ! [ -f $SOURCES/$1/$PKG_SOURCE_NAME -a "$(cat $STAMP 2>/dev/null)" == "$PKG_URL" ]; then
+    rm -f $SOURCES/$1/$PKG_SOURCE_NAME $STAMP
 
     printf "%${BUILD_INDENT}c ${boldcyan}GET${endcolor}      $1\n" ' '>&$SILENT_OUT
     export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
 
-    until [ -f "$STAMP" ] || $WGET_CMD $PKG_URL || $WGET_CMD $PACKAGE_MIRROR; do
-      NBWGET=$(($NBWGET+1))
-      if [ "$NBWGET" -gt "10" ]; then
+    # unset LD_LIBRARY_PATH to stop wget from using toolchain/lib and loading libssl.so/libcrypto.so instead of host libraries
+    unset LD_LIBRARY_PATH
+
+    NBWGET=1
+    until $WGET_CMD "$PKG_URL" || $WGET_CMD "$PACKAGE_MIRROR"; do
+      NBWGET=$((NBWGET + 1))
+      if [ $NBWGET -gt 10 ]; then
         echo -e "\nCant't get $1 sources : $PKG_URL\n Try later !!"
         exit 1
       fi
     done
 
-    echo $PKG_URL > $STAMP
-    md5sum -t $PACKAGE > $MD5SUM
-
-    rm -f $BUILD_BASE*/$STAMPS_NOARCH/$1/unpack
-    rm -f $BUILD_BASE*/$STAMPS_NOARCH/$1/build
+    echo "$PKG_URL" > $STAMP
   fi
 fi
 

scripts/skip_unpack

@@ -1,47 +0,0 @@
-#!/bin/bash
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  OpenELEC is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-. config/options $1
-
-if [ -z "$1" ]; then
-  echo "usage: $0 package_name"
-  exit 1
-fi
-
-if [ ! -f $PKG_DIR/package.mk ]; then
-  printf "${boldred}$1: no package.mk file found${endcolor}\n"
-  exit 1
-fi
-
-STAMP=$PKG_BUILD/.libreelec-unpack
-
-if [ -f $STAMP ] ; then
-  printf "%${BUILD_INDENT}c ${boldcyan}SKIP_UNPACK${endcolor}   $1\n" ' '>&$SILENT_OUT
-  export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
-
-  rm -f $STAMP
-  STAMP_DEPENDS="$PKG_DIR $PKG_NEED_UNPACK $PROJECT_DIR/$PROJECT/patches/$PKG_NAME"
-  [ -n "$DEVICE" ] && STAMP_DEPENDS="$STAMP_DEPENDS $PROJECT_DIR/$PROJECT/devices/$DEVICE/patches/$PKG_NAME"
-  PKG_DEEPMD5=$(find $STAMP_DEPENDS -exec md5sum {} \; 2>/dev/null | sort | md5sum | cut -d" " -f1)
-  for i in PKG_NAME PKG_DEEPMD5; do
-    eval val=\$$i
-    echo "STAMP_$i=\"$val\"" >> $STAMP
-  done
-fi