mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
scripts/fixconfigtools: merge into scripts/unpack, various fixes and cosmetics
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
parent
1a0a0a57e5
commit
ac5fb842f4
@ -1,39 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
################################################################################
|
|
||||||
# This file is part of OpenELEC - http://www.openelec.tv
|
|
||||||
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
|
|
||||||
#
|
|
||||||
# This Program 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, or (at your option)
|
|
||||||
# any later version.
|
|
||||||
#
|
|
||||||
# This Program 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.tv; see the file COPYING. If not, write to
|
|
||||||
# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
||||||
# http://www.gnu.org/copyleft/gpl.html
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
. config/options $1
|
|
||||||
|
|
||||||
[ -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION}`
|
|
||||||
[ -d $BUILD/${PKG_NAME}${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}${PKG_VERSION}`
|
|
||||||
|
|
||||||
for i in `find $PKG_BUILD -name config.guess`; do
|
|
||||||
CONFIGTOOLSDIR=`dirname $i`
|
|
||||||
|
|
||||||
printf "%${INDENT}c FIXCONFIG $1: $CONFIGTOOLSDIR\n" >&$SILENT_OUT
|
|
||||||
|
|
||||||
[ -f "$CONFIGTOOLSDIR/config.guess" ] && cp -f $SCRIPTS/configtools/config.guess $CONFIGTOOLSDIR
|
|
||||||
[ -f "$CONFIGTOOLSDIR/config.sub" ] && cp -f $SCRIPTS/configtools/config.sub $CONFIGTOOLSDIR
|
|
||||||
[ -f "$CONFIGTOOLSDIR/configure.guess" ] && cp -f $SCRIPTS/configtools/config.guess $CONFIGTOOLSDIR/configure.guess
|
|
||||||
[ -f "$CONFIGTOOLSDIR/configure.sub" ] && cp -f $SCRIPTS/configtools/config.sub $CONFIGTOOLSDIR/configure.sub
|
|
||||||
done
|
|
||||||
|
|
||||||
exit 0
|
|
@ -70,25 +70,33 @@ fi
|
|||||||
|
|
||||||
[ -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION}`
|
[ -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION}`
|
||||||
[ -d $BUILD/${PKG_NAME}${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}${PKG_VERSION}`
|
[ -d $BUILD/${PKG_NAME}${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}${PKG_VERSION}`
|
||||||
|
[ -d $BUILD/${PKG_NAME} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}`
|
||||||
|
|
||||||
for i in $PKG_DIR/patches/$PKG_NAME-$PKG_VERSION*.patch ; do
|
for i in $PKG_DIR/patches/$PKG_NAME-$PKG_VERSION*.patch ; do
|
||||||
if [ -f "$i" ]; then
|
if [ -f "$i" ]; then
|
||||||
PATCH=`basename $i`
|
PATCH=`basename $i`
|
||||||
PT=`echo $PATCH | sed 's/.*\.\(.*\)$/\1/'`
|
PT=`echo $PATCH | sed 's/.*\.\(.*\)$/\1/'`
|
||||||
if [ "$PT" != "patch" -a "$PT" != "$TARGET_ARCH" ]; then
|
if [ "$PT" != "patch" -a "$PT" != "$TARGET_ARCH" ]; then
|
||||||
echo "## Skipping patch: $i"
|
printf "%${INDENT}c SKIP PATCH: $i\n" >&$SILENT_OUT
|
||||||
continue;
|
continue;
|
||||||
else
|
else
|
||||||
echo "## Applying patch: $i"
|
printf "%${INDENT}c APPLY PATCH: $i\n" >&$SILENT_OUT
|
||||||
cat $i | patch -d `echo "$PKG_BUILD" | cut -f1 -d\ ` -p1 >&$VERBOSE_OUT
|
cat $i | patch -d `echo "$PKG_BUILD" | cut -f1 -d\ ` -p1 >&$VERBOSE_OUT
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
$SCRIPTS/fixconfigtools $1
|
|
||||||
|
|
||||||
[ -f "$PKG_DIR/unpack" ] && $PKG_DIR/unpack $@ >&$VERBOSE_OUT
|
[ -f "$PKG_DIR/unpack" ] && $PKG_DIR/unpack $@ >&$VERBOSE_OUT
|
||||||
|
|
||||||
|
for config in `find $BUILD/$1* -name config.guess | sed 's/config.guess//'`; do
|
||||||
|
printf "%${INDENT}c FIXCONFIG: $config\n" >&$SILENT_OUT
|
||||||
|
|
||||||
|
[ -f "$config/config.guess" ] && cp -f $SCRIPTS/configtools/config.guess $config
|
||||||
|
[ -f "$config/config.sub" ] && cp -f $SCRIPTS/configtools/config.sub $config
|
||||||
|
[ -f "$config/configure.guess" ] && cp -f $SCRIPTS/configtools/config.guess $config/configure.guess
|
||||||
|
[ -f "$config/configure.sub" ] && cp -f $SCRIPTS/configtools/config.sub $config/configure.sub
|
||||||
|
done
|
||||||
|
|
||||||
rm -f $STAMPS/$1/build
|
rm -f $STAMPS/$1/build
|
||||||
|
|
||||||
for i in `sed -n "s/^\([^#].*\)=\".*$/\1/p" $PROJECT_DIR/$PROJECT/options | grep -v "#"`; do
|
for i in `sed -n "s/^\([^#].*\)=\".*$/\1/p" $PROJECT_DIR/$PROJECT/options | grep -v "#"`; do
|
||||||
|
Loading…
x
Reference in New Issue
Block a user