From 512fd26b8cb54cf07eca9a22ca5532cf55ed52fc Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Fri, 9 Sep 2022 12:51:20 +0200 Subject: [PATCH] init: more reworks, update server urls --- init.sh | 69 ++++++++++++++++++++++++------------ local.conf.common.inc.sample | 23 +++++++----- 2 files changed, 61 insertions(+), 31 deletions(-) diff --git a/init.sh b/init.sh index 00ec16e..93cfb13 100755 --- a/init.sh +++ b/init.sh @@ -176,33 +176,58 @@ else create_local_config $MACHINE; fi -echo -e "\033[37;1mNOTE:\tLocal setup\033[0m" -echo -e "\t############################################################################################" -echo -e "\t# Possible new or obsolete options or variables at sample configuration will be ignored." -echo -e "\t# $BASEPATH/local.conf.common.inc already exists and nothing" -echo -e "\t# was changed on this file for your configuration." -echo -e "\t# You should check $BASEPATH/local.conf.common.inc and modify this file if required." -echo -e "\t#" -echo -e "\t# Please check this files for modifications or upgrades:" -echo -e "\t# \033[37;1m$BUILD_ROOT//bblayer.conf\033[0m" -echo -e "\t# \033[37;1m$BUILD_ROOT//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; +echo -e "\033[37;1mNOTE:\033[0m" + # check and create distribution directory inside html directory for online update if test ! -L /var/www/html/dist; then - echo -e "\033[37;1mNOTE:\tLocal online update.\033[0m" - echo -e "\t##########################################################################################" - 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#" - echo -e "\t# An easy way is to create a symlink to dist directory:" - echo -e "\t# \033[37;1msudo ln -s $BASEPATH/dist /var/www/html/dist\033[0m" - echo -e "\t##########################################################################################" -fi + echo -e "\033[37;1m\tLocal setup for package online update.\033[0m" + echo -e "\t############################################################################################" + echo -e "\t/var/www/html/dist doesn't exists." + echo -e "\tIf you want to use online update, please configure your webserver and use dist content" + echo -e "\t" + echo -e "\tAn easy way is to create a symlink to dist directory:" + echo -e "\t" + echo -e "\t\t\033[37;1msudo ln -s $BASEPATH/dist /var/www/html/dist\033[0m" +fi +echo -e "\t" +echo -e "\033[37;1m\tLocal environment setup\033[0m" +echo -e "\t############################################################################################" +echo -e "\t$BASEPATH/local.conf.common.inc was created by the 1st call of $0 from" +echo -e "\t$BASEPATH/local.conf.common.inc.sample" +echo -e "\tIf this file already exists nothing was changed on this file for your configuration." +echo -e "\tYou should check $BASEPATH/local.conf.common.inc and modify this file if required." +echo -e "\t" +echo -e "\tUnlike here: Please check this files for modifications or upgrades:" +echo -e "\t" +echo -e "\t\t\033[37;1m$BUILD_ROOT//bblayer.conf\033[0m" +echo -e "\t\t\033[37;1m$BUILD_ROOT//local.conf\033[0m" +# echo -e "\t############################################################################################" +echo -e "\t" +echo -e "\033[37;1m\tStart build\033[0m" +echo -e "\t############################################################################################" +echo -e "\tNow you are ready to build your own images and packages." +echo -e "\tSelectable machines are:" +echo -e "\t" +echo -e "\t\t\033[37;1m$MACHINES\033[0m" +echo -e "\t" +echo -e "\t Select your favorite machine (or identical) and the next steps are:\033[37;1m" +echo -e "\t" +echo -e "\t\tcd $BUILD_ROOT_DIR" +echo -e "\t\t. ./oe-init-build-env build/" +echo -e "\t\tbitbake neutrino-image" +echo -e "\t\033[0m" + +echo -e "\t" +echo -e "\033[37;1m\tUpdating meta-layers\033[0m" +echo -e "\t############################################################################################" +echo -e "\tExecute init script again." +echo -e "\t" +echo -e "\tFor more informations and next steps take a look at the README.md!" +echo -e "\t" echo -e "\033[32;1mDONE!\033[0m" + exit 0 diff --git a/local.conf.common.inc.sample b/local.conf.common.inc.sample index bd3b496..c0bbc85 100644 --- a/local.conf.common.inc.sample +++ b/local.conf.common.inc.sample @@ -203,7 +203,7 @@ OMDB_API_KEY = "" # NOTE! Works only with FLAVOUR = "tuxbox" # Keep this entry disabled, if you want to use an other FLAVOUR than "tuxbox". # and add these lines into your local.conf within your build directory -# EXTRA_OECONF_append_pn-neutrino-mp = " \ +# EXTRA_OECONF_append_pn-neutrino-mp += " \ # --enable-testing \ # " @@ -233,7 +233,8 @@ PACKAGE_CLASSES = "package_ipk" #UPDATE_SERVER_URL = "http://" #UPDATE_SERVER_URL = "http://localhost" UPDATE_SERVER_URL = "file:///var/www/html" -#UPDATE_SERVER_URL = "https://update.tuxbox-neutrino.org" +#UPDATE_SERVER_URL = "https://n4k.sourceforge.io" +#UPDATE_SERVER_URL = "http://n4k.sourceforge.io" # # If local feed with Tuxbox-Builder VM is available: #UPDATE_SERVER_URL = "http://" @@ -263,12 +264,16 @@ RELEASE_TEXT_LOCATION = "${UPDATE_SERVER_URL}/dist/${DISTRO_FEED_VERSION}/${MACH ### URLs for download mirrors from Yocto # +# global archive and source urls +ARCHIVE_SOURCE_URL = "http://n4k.sourceforge.io/sources" +YOCTO_SOURCE_URL = "http://www.yoctoproject.org/sources" + PREMIRRORS_prepend = "\ - https://.*/.* https://archiv.tuxbox-neutrino.org/ \n \ - git://.*/.* http://www.yoctoproject.org/sources/ \n \ - ftp://.*/.* http://www.yoctoproject.org/sources/ \n \ - http://.*/.* http://www.yoctoproject.org/sources/ \n \ - https://.*/.* http://www.yoctoproject.org/sources/ \n \ + https://.*/.* ${ARCHIVE_SOURCE_URL}/ \n \ + git://.*/.* ${YOCTO_SOURCE_URL}/ \n \ + ftp://.*/.* ${YOCTO_SOURCE_URL}/ \n \ + http://.*/.* ${YOCTO_SOURCE_URL}/ \n \ + https://.*/.* ${YOCTO_SOURCE_URL}/ \n \ " ### Download mirrors from Local file mirrors (read only) # @@ -280,7 +285,7 @@ PREMIRRORS_prepend = "\ # see: https://wiki.yoctoproject.org/wiki/How_do_I#Q:_How_do_I_create_my_own_source_download_mirror_.3F # # This is our own stock of archives, those are created by our image builds. -SOURCE_MIRROR_URL = "https://archiv.tuxbox-neutrino.org" +SOURCE_MIRROR_URL = "${ARCHIVE_SOURCE_URL}" INHERIT += "own-mirrors" BB_GENERATE_MIRROR_TARBALLS = "0" #BB_NO_NETWORK = "1" @@ -305,7 +310,7 @@ SSTATE_MIRRORS += "\ " # This is our own stock of sstate cache related of last tuxbox builds. SSTATE_MIRRORS += "\ - file://.* https://sstate.tuxbox-upload.de/all/sstate-cache/PATH;downloadfilename=PATH \n \ + file://.* http://n4k.sourceforge.io/sstate-cache/PATH;downloadfilename=PATH \n \ " # If you are using the TuxboxBuilder VM and it's running, you can use its sstate cache related of last builds.