mirrors/buildenv
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/buildenv.git synced 2025-08-26 23:13:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

init: more reworks

Browse Source
This commit is contained in:
Thilo Graf
2022-09-08 19:58:14 +02:00
parent 8853288746
commit 417adaae42
2 changed files with 74 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
init.functions.sh
View File

@@ -18,32 +18,32 @@ function do_exec() {
DEX_ARG1=$1 DEX_ARG1=$1
DEX_ARG2=$2 DEX_ARG2=$2
DEX_ARG3=$3 DEX_ARG3=$3
rm -f $TMP_LOGFILE # rm -f $TMP_LOGFILE
echo "[`date '+%Y%m%d_%H%M%S'`] EXEC: $DEX_ARG1" >> $LOGFILE
if [ "$DEX_ARG3" == "show_output" ]; then if [ "$DEX_ARG3" == "show_output" ]; then
$DEX_ARG1 $DEX_ARG1
else else
$DEX_ARG1 > /dev/null 2>> $TMP_LOGFILE $DEX_ARG1 > /dev/null 2>> $TMP_LOGFILE
fi fi
# echo -e "DEX_ARG1 [$DEX_ARG1] DEX_ARG2 [$DEX_ARG2] DEX_ARG3 [$DEX_ARG3]" # echo -e "DEX_ARG1 [$DEX_ARG1] DEX_ARG2 [$DEX_ARG2] DEX_ARG3 [$DEX_ARG3]"
if test -f $TMP_LOGFILE; then
LOGTEXT=`cat $TMP_LOGFILE`
echo > $TMP_LOGFILE
fi
if [ $? != 0 ]; then if [ $? != 0 ]; then
if test -f $TMP_LOGFILE; then
LOGTEXT=`cat $TMP_LOGFILE`
fi
echo "$LOGTEXT" >> $LOGFILE
if [ "$DEX_ARG2" != "no_exit" ]; then if [ "$DEX_ARG2" != "no_exit" ]; then
if [ "$LOGTEXT" != "" ]; then if [ "$LOGTEXT" != "" ]; then
echo -e "\033[31;1mERROR:\t\033[0m $LOGTEXT" echo -e "\033[31;1mERROR:\t\033[0m $LOGTEXT"
echo "ERROR: $LOGTEXT" >> $LOGFILE
fi fi
exit 1 exit 1
else else
if [ "$LOGTEXT" != "" ]; then if [ "$LOGTEXT" != "" ]; then
echo -e "\033[37;1mNOTE:\t\033[0m $LOGTEXT" echo -e "\033[37;1mNOTE:\t\033[0m $LOGTEXT"
echo "NOTE: $LOGTEXT" >> $LOGFILE
fi fi
fi fi
fi fi
# if [ $DEX_ARG2 == "no_exit" ]; then
# echo -e "\033[32;1mOK:\033[0m `cat $LOGFILE`"
# fi
} }
function get_metaname () { function get_metaname () {
@@ -78,7 +78,7 @@ function clone_meta () {
TMP_LAYER_BRANCH=$BRANCH_NAME TMP_LAYER_BRANCH=$BRANCH_NAME
if test ! -d $TARGET_GIT_PATH/.git; then if test ! -d $TARGET_GIT_PATH/.git; then
echo -e "\033[35;1mclone branch $BRANCH_NAME from $LAYER_GIT_URL into $TARGET_GIT_PATH\033[0m" echo -e "\033[35;1mclone branch $BRANCH_NAME from $LAYER_GIT_URL\033[0m"
do_exec "git clone -b $BRANCH_NAME $LAYER_GIT_URL $TARGET_GIT_PATH" ' ' 'show_output' do_exec "git clone -b $BRANCH_NAME $LAYER_GIT_URL $TARGET_GIT_PATH" ' ' 'show_output'
do_exec "git -C $TARGET_GIT_PATH checkout $BRANCH_HASH -b $IMAGE_VERSION" do_exec "git -C $TARGET_GIT_PATH checkout $BRANCH_HASH -b $IMAGE_VERSION"
do_exec "git -C $TARGET_GIT_PATH pull -r origin $BRANCH_NAME" ' ' 'show_output' do_exec "git -C $TARGET_GIT_PATH pull -r origin $BRANCH_NAME" ' ' 'show_output'
@@ -161,12 +161,19 @@ function set_file_entry () {
FILE_NEW_ENTRY=$3 FILE_NEW_ENTRY=$3
if test ! -f $FILE_NAME; then if test ! -f $FILE_NAME; then
echo $FILE_NEW_ENTRY > $FILE_NAME echo $FILE_NEW_ENTRY > $FILE_NAME
return 1
else else
OLD_CONTENT=`cat $FILE_NAME`
HAS_ENTRY=`grep -c -w $FILE_SEARCH_ENTRY $FILE_NAME` HAS_ENTRY=`grep -c -w $FILE_SEARCH_ENTRY $FILE_NAME`
if [ "$HAS_ENTRY" == "0" ] ; then if [ "$HAS_ENTRY" == "0" ] ; then
echo $FILE_NEW_ENTRY >> $FILE_NAME echo $FILE_NEW_ENTRY >> $FILE_NAME
fi fi
NEW_CONTENT=`cat $FILE_NAME`
if [ "$OLD_CONTENT" == "$NEW_CONTENT" ] ; then
return 1
fi
fi fi
return 0
} }
# function to create configuration for box types # function to create configuration for box types
@@ -176,38 +183,46 @@ function create_local_config () {
if [ "$CLC_ARG1" != "all" ]; then if [ "$CLC_ARG1" != "all" ]; then
MACHINE_BUILD_DIR=$BUILD_ROOT/$CLC_ARG1 MACHINE_BUILD_DIR=$BUILD_ROOT/$CLC_ARG1
mkdir -p $BUILD_ROOT do_exec "mkdir -p $BUILD_ROOT"
BACKUP_CONFIG_DIR="$BACKUP_PATH/$CLC_ARG1/conf" BACKUP_CONFIG_DIR="$BACKUP_PATH/$CLC_ARG1/conf"
mkdir -p $BACKUP_CONFIG_DIR do_exec "mkdir -p $BACKUP_CONFIG_DIR"
LOCAL_CONFIG_FILE_PATH=$MACHINE_BUILD_DIR/conf/local.conf
if test -d $BUILD_ROOT_DIR/$CLC_ARG1; then if test -d $BUILD_ROOT_DIR/$CLC_ARG1; then
if test ! -L $BUILD_ROOT_DIR/$CLC_ARG1; then if test ! -L $BUILD_ROOT_DIR/$CLC_ARG1; then
# generate build/config symlinks for compatibility # generate build/config symlinks for compatibility
echo -e "\033[37;1m\tcreate compatible symlinks directory for $CLC_ARG1 environment ...\033[0m" echo -e "\033[37;1m\tcreate compatible symlinks directory for $CLC_ARG1 environment ...\033[0m"
mv $BUILD_ROOT_DIR/$CLC_ARG1 $BUILD_ROOT do_exec "mv -v $BUILD_ROOT_DIR/$CLC_ARG1 $BUILD_ROOT"
ln -s $MACHINE_BUILD_DIR $BUILD_ROOT_DIR/$CLC_ARG1 do_exec "ln -sv $MACHINE_BUILD_DIR $BUILD_ROOT_DIR/$CLC_ARG1"
fi
else
# generate default config
if test ! -d $MACHINE_BUILD_DIR/conf; then
echo -e "\033[37;1m\tcreate build directory for $CLC_ARG1 environment ...\033[0m"
do_exec "cd $BUILD_ROOT_DIR"
do_exec ". ./oe-init-build-env $MACHINE_BUILD_DIR"
do_exec "cd $BASEPATH"
fi fi
fi fi
# move config files into conf directory # generate default config
if test -f $BASEPATH/local.conf.common.inc; then if test ! -d $MACHINE_BUILD_DIR/conf; then
LOCAL_CONFIG_FILE_PATH=$MACHINE_BUILD_DIR/conf/local.conf echo -e "\033[37;1m\tcreating build directory for $CLC_ARG1 environment ...\033[0m"
do_exec "cd $BUILD_ROOT_DIR"
do_exec ". ./oe-init-build-env $MACHINE_BUILD_DIR"
# we need a clean config file
if test -f $LOCAL_CONFIG_FILE_PATH & test ! -f $LOCAL_CONFIG_FILE_PATH.origin; then
# so we save the origin local.conf
do_exec "mv -v $LOCAL_CONFIG_FILE_PATH $LOCAL_CONFIG_FILE_PATH.origin"
fi
do_exec "cd $BASEPATH"
echo "[Desktop Entry]" > $BUILD_ROOT/.directory
echo "Icon=folder-green" >> $BUILD_ROOT/.directory
fi
echo -e "\tmodify $LOCAL_CONFIG_FILE_PATH for $CLC_ARG1 ... " # modify or upgrade config files inside conf directory
if test -f $BASEPATH/local.conf.common.inc; then
if test -f $LOCAL_CONFIG_FILE_PATH; then if test -f $LOCAL_CONFIG_FILE_PATH; then
do_exec "cp -v $LOCAL_CONFIG_FILE_PATH $BACKUP_CONFIG_DIR/local.conf.$TIMESTAMP.$BACKUP_SUFFIX" HASHSTAMP=`MD5SUM $LOCAL_CONFIG_FILE_PATH`
do_exec "cp -v $LOCAL_CONFIG_FILE_PATH $BACKUP_CONFIG_DIR/local.conf.$HASHSTAMP.$BACKUP_SUFFIX"
fi fi
# add init note
set_file_entry $LOCAL_CONFIG_FILE_PATH "generated" "# auto generated entries by init script" set_file_entry $LOCAL_CONFIG_FILE_PATH "generated" "# auto generated entries by init script"
# add line 1, include for local.conf.common.inc # add line 1, include for local.conf.common.inc
@@ -215,22 +230,26 @@ function create_local_config () {
# add line 2, machine type # add line 2, machine type
M_TYPE='MACHINE = "'`get_real_machine_type $CLC_ARG1`'"' M_TYPE='MACHINE = "'`get_real_machine_type $CLC_ARG1`'"'
set_file_entry $LOCAL_CONFIG_FILE_PATH "MACHINE" "$M_TYPE" if set_file_entry $LOCAL_CONFIG_FILE_PATH "MACHINE" "$M_TYPE" == 1; then
echo -e "\t\033[37;1m$LOCAL_CONFIG_FILE_PATH has been upgraded with entry: $M_TYPE \033[0m"
fi
# add line 3, machine build # add line 3, machine build
M_ID='MACHINEBUILD = "'`get_real_machine_id $CLC_ARG1`'"' M_ID='MACHINEBUILD = "'`get_real_machine_id $CLC_ARG1`'"'
set_file_entry $LOCAL_CONFIG_FILE_PATH "MACHINEBUILD" "$M_ID" if set_file_entry $LOCAL_CONFIG_FILE_PATH "MACHINEBUILD" "$M_ID" == 1; then
echo -e "\t\033[37;1m$LOCAL_CONFIG_FILE_PATH has been upgraded with entry: $M_ID \033[0m"
fi
else else
echo -e "\033[31;1mERROR:\033[0m:\ttemplate $BASEPATH/local.conf.common.inc not found..." echo -e "\033[31;1mERROR:\033[0m:\ttemplate $BASEPATH/local.conf.common.inc not found..."
exit 1 exit 1
fi fi
BBLAYER_CONF_FILE="$MACHINE_BUILD_DIR/conf/bblayers.conf" BBLAYER_CONF_FILE="$MACHINE_BUILD_DIR/conf/bblayers.conf"
echo -e "\tmodify $BBLAYER_CONF_FILE for $CLC_ARG1..."
# craete backup for bblayer.conf # craete backup for bblayer.conf
if test -f $BBLAYER_CONF_FILE; then if test -f $BBLAYER_CONF_FILE; then
do_exec "cp -v $BBLAYER_CONF_FILE $BACKUP_CONFIG_DIR/bblayer.conf.$TIMESTAMP.$BACKUP_SUFFIX" HASHSTAMP=`MD5SUM $BBLAYER_CONF_FILE`
do_exec "cp -v $BBLAYER_CONF_FILE $BACKUP_CONFIG_DIR/bblayer.conf.$HASHSTAMP.$BACKUP_SUFFIX"
fi fi
META_MACHINE_LAYER=meta-`get_metaname $CLC_ARG1` META_MACHINE_LAYER=meta-`get_metaname $CLC_ARG1`
@@ -239,7 +258,9 @@ function create_local_config () {
set_file_entry $BBLAYER_CONF_FILE "generated" '# auto generated entries by init script' set_file_entry $BBLAYER_CONF_FILE "generated" '# auto generated entries by init script'
LAYER_LIST=" $TUXBOX_LAYER_NAME $META_MACHINE_LAYER $OE_LAYER_NAME/meta-oe $OE_LAYER_NAME/meta-networking $PYTHON2_LAYER_NAME $QT5_LAYER_NAME " LAYER_LIST=" $TUXBOX_LAYER_NAME $META_MACHINE_LAYER $OE_LAYER_NAME/meta-oe $OE_LAYER_NAME/meta-networking $PYTHON2_LAYER_NAME $QT5_LAYER_NAME "
for LL in $LAYER_LIST ; do for LL in $LAYER_LIST ; do
set_file_entry $BBLAYER_CONF_FILE $LL 'BBLAYERS += " '$BUILD_ROOT_DIR'/'$LL' "' if set_file_entry $BBLAYER_CONF_FILE $LL 'BBLAYERS += " '$BUILD_ROOT_DIR'/'$LL' "' == 1;then
echo -e "\t\033[37;1m$BBLAYER_CONF_FILE has been upgraded with entry: $LL... \033[0m"
fi
done done
fi fi
} }
@@ -258,9 +279,15 @@ function create_dist_tree () {
DIST_LIST=`ls $BUILD_ROOT` DIST_LIST=`ls $BUILD_ROOT`
for DL in $DIST_LIST ; do for DL in $DIST_LIST ; do
DEPLOY_DIR="$BUILD_ROOT/$DL/tmp/deploy" DEPLOY_DIR="$BUILD_ROOT/$DL/tmp/deploy"
ln -sf $DEPLOY_DIR $DIST_BASEDIR/$DL do_exec "ln -sfv $DEPLOY_DIR $DIST_BASEDIR/$DL"
if test -L "$DIST_BASEDIR/$DL/deploy"; then if test -L "$DIST_BASEDIR/$DL/deploy"; then
unlink $DIST_BASEDIR/$DL/deploy do_exec "unlink -v $DIST_BASEDIR/$DL/deploy"
fi fi
done done
} }
function MD5SUM () {
MD5SUM_FILE=$1
MD5STAMP=`md5sum $MD5SUM_FILE |cut -f 1 -d " "`
echo $MD5STAMP
}

25
init.sh
View File

@@ -176,22 +176,25 @@ else
create_local_config $MACHINE; create_local_config $MACHINE;
fi fi
echo -e "\033[37;1mNOTE:\tLocal configuration not considered\033[0m" echo -e "\033[37;1mNOTE:\tLocal setup\033[0m"
echo -e "\t##########################################################################################" echo -e "\t############################################################################################"
echo -e "\t# $BASEPATH/local.conf.common.inc already exists." echo -e "\t# Possible new or obsolete options or variables at sample configuration will be ignored."
echo -e "\t# Nothing was changed on this file for your configuration." echo -e "\t# $BASEPATH/local.conf.common.inc already exists and nothing"
echo -e "\t# Possible changes at sample configuration will be ignored." echo -e "\t# was changed on this file for your configuration."
echo -e "\t# You should check local configuration and modify your configuration if required." echo -e "\t# You should check $BASEPATH/local.conf.common.inc and modify this file if required."
echo -e "\t# \033[37;1m$BASEPATH/local.conf.common.inc" echo -e "\t#"
echo -e "\t# local.conf, bblayer.conf\033[0m files could be modifyed, " echo -e "\t# Please check this files for modifications or upgrades:"
echo -e "\t# Please check this files if required!" echo -e "\t# \033[37;1m$BUILD_ROOT/<machine>/bblayer.conf\033[0m"
echo -e "\t##########################################################################################" echo -e "\t# \033[37;1m$BUILD_ROOT/<machine>/local.conf\033[0m"
echo -e "\t#"
echo -e "\t# Please take a look at the README.md for next steps!"
echo -e "\t###########################################################################################"
create_dist_tree; create_dist_tree;
# check and create distribution directory inside html directory for online update # check and create distribution directory inside html directory for online update
if test ! -L /var/www/html/dist; then if test ! -L /var/www/html/dist; then
echo -e "\033[37;1mNOTE:\tOnline update.\033[0m" echo -e "\033[37;1mNOTE:\tLocal online update.\033[0m"
echo -e "\t##########################################################################################" echo -e "\t##########################################################################################"
echo -e "\t# /var/www/html/dist doesn't exists." echo -e "\t# /var/www/html/dist doesn't exists."
echo -e "\t# If you want to use online update, please configure your webserver and use dist content" echo -e "\t# If you want to use online update, please configure your webserver and use dist content"