enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

undo/remove helper_compile.sh

Browse Source
This commit is contained in:
Guillaume Romagny 2016-07-12 01:23:13 +02:00
parent fbaa1d07b1
commit 588edb0181
2 changed files with 4 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
compile.sh
View File

@ -38,14 +38,6 @@ LIB_TAG="" # empty for latest version,
# one of listed here: https://github.com/igorpecovnik/lib/tags for stable versions,
# or commit hash
#--------------------------------------------------------------------------------------------------------------------------------
# to use the config helper: cp lib/helper_compile.sh .
# then uncomment next line and *if needed* uncomment the line "do_clean_up" at the bottom
# you can also create a file e.g. helper_compile_xu4.sh with your config for odroid-xu4
# and call with ./compile.sh xu4
#source ./helper_compile{1:+_}${1:+$1}.sh
#--------------------------------------------------------------------------------------------------------------------------------
# source is where compile.sh is located
SRC=$(pwd)
@ -72,10 +64,6 @@ if [[ -d $DEST/output ]]; then
read
fi
#--------------------------------------------------------------------------------------------------------------------------------
# switching script execution using sudo
#--------------------------------------------------------------------------------------------------------------------------------
if [[ $EUID != 0 ]]; then
echo -e "[\e[0;35m warn \x1B[0m] This script requires root privileges"
sudo "$0" "$@"
@ -86,22 +74,22 @@ fi
# Get updates of the main build libraries
#--------------------------------------------------------------------------------------------------------------------------------
[[ $(dpkg-query -W -f='${db:Status-Abbrev}\n' git 2>/dev/null) != *ii* ]] && \
eval ${PREFIX_GIT_LIB:- } apt-get -qq -y --no-install-recommends install git
apt-get -qq -y --no-install-recommends install git
if [[ ! -d $SRC/lib ]]; then
eval ${PREFIX_GIT_LIB:- } git clone https://github.com/igorpecovnik/lib
git clone https://github.com/igorpecovnik/lib
fi
cd $SRC/lib
if [[ ! -f $SRC/.ignore_changes ]]; then
echo -e "[\e[0;32m o.k. \x1B[0m] This script will try to update"
eval ${PREFIX_GIT_LIB:- } git pull
git pull
CHANGED_FILES=$(git diff --name-only)
if [[ -n $CHANGED_FILES ]]; then
echo -e "[\e[0;35m warn \x1B[0m] Can't update [\e[0;33mlib/\x1B[0m] since you made changes to: \e[0;32m\n${CHANGED_FILES}\x1B[0m"
echo -e "Press \e[0;33m<Ctrl-C>\x1B[0m to abort compilation, \e[0;33m<Enter>\x1B[0m to ignore and continue"
read
else
eval ${PREFIX_GIT_LIB:- } git checkout ${LIB_TAG:- master}
git checkout ${LIB_TAG:- master}
fi
fi
#--------------------------------------------------------------------------------------------------------------------------------
@ -113,8 +101,6 @@ else
source $SRC/lib/main.sh
fi
#do_clean_up
# If you are committing new version of this file, increment VERSION
# Only integers are supported
# VERSION=19

55
helper_compile.sh
View File

@ -1,55 +0,0 @@
#!/bin/bash
function do_clean_up()
{
## update all "lib" & .ccache files to logname user
#
#chown -R $(/usr/bin/logname):$(/usr/bin/id -g $(/usr/bin/logname)) $SRC/lib $HOME/.ccache
#
}
#
# uncomment if you want to call do_clean_up on Ctrl-C
#trap '{ echo "Hey, you pressed Ctrl-C. Time to clean-up & quit." ; do_clean_up; exit 1; }' INT
# useful for forked version of Armbian "lib" using github RSA public key
# uncomment if you want the Armbian "lib" files to be managed with logname user (login name)
# instead of root UID
#PREFIX_GIT_LIB='sudo -u $(/usr/bin/logname)'
#
# uncomment/modify the following config *if* needed
#
#USE_CCACHE="yes"
#EXPERIMENTAL_DEBOOTSTRAP="yes"
#EXTENDED_DEBOOTSTRAP="yes"
#USE_MAINLINE_GOOGLE_MIRROR="yes"
#COMPRESS_OUTPUTIMAGE="yes"
#SEVENZIP="yes"
#PROGRESS_DISPLAY="plain"
#PROGRESS_LOG_TO_FILE="yes"
#USEALLCORES="yes"
#RELEASE="xenial"
#RELEASE="trusty"
#RELEASE="jessie"
#SUBREVISON=""
#BOARD=""
#BRANCH="default"
#BRANCH="next"
#KERNEL_ONLY="no"
#KERNEL_ONLY="yes"
#KERNEL_CONFIGURE="yes"
#KERNEL_CONFIGURE="no"
#CLEAN_LEVEL="make,debs"
#DEST_LANG="en_US.UTF-8"