X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=scripts%2F.aglsetup_genconfig.bash;h=c4dde423d4b69c79d3ee609dc23a4d43c7a0bf66;hb=8cf8d33912f6f7944f813e2191debf546be01b3b;hp=31520a7cc184d6988768b2203777d4b50fdf7611;hpb=ead1bded123556f3aa7d716c4e009d342b891a20;p=AGL%2Fmeta-agl.git diff --git a/scripts/.aglsetup_genconfig.bash b/scripts/.aglsetup_genconfig.bash index 31520a7cc..c4dde423d 100755 --- a/scripts/.aglsetup_genconfig.bash +++ b/scripts/.aglsetup_genconfig.bash @@ -27,8 +27,8 @@ # ################################################################################ -# this script shouldn't be called directly, but through aglsetup.sh that will in -# turn execute (source) generated instructions back in the parent shell, +# this script shouldn't be called directly, but through aglsetup.sh that will in +# turn execute (source) generated instructions back in the parent shell, # whether it's bash, zsh, or any other supported shell VERSION=1.1.0 @@ -51,11 +51,11 @@ function debug() { [[ $DEBUG == 1 ]] && echo "DEBUG: $@" >&2; return 0;} info "------------ $SCRIPT: Starting" #compute AGL_REPOSITORIES -AGL_REPOSITORIES=$(for x in $(ls -d $METADIR/*/templates/{machine,feature}); do echo $(basename $(dirname $(dirname $x))); done | sort -u) +AGL_REPOSITORIES=$(for x in $(ls -d $METADIR/meta-ag*/templates/{machine,feature} $METADIR/bsp/*/templates/machine); do echo $(basename $(dirname $(dirname $x))); done | sort -u) function list_machines() { - for x in $@; do - for y in $(ls -d $METADIR/$x/templates/machine/* 2>/dev/null); do + for a in $@; do + for y in $(ls -d $METADIR/{.,bsp}/$a/templates/machine/* 2>/dev/null); do echo $(basename $y) done done @@ -67,11 +67,18 @@ function list_all_machines() { done } +function validate_builddir() { + if [[ "$BUILDDIR" =~ [[:space:]] ]]; then + error "Build dir '$BUILDDIR' shouldn't contain any space" + fi + debug "Build dir is valid" +} + function validate_machines() { list_all_machines | sort | uniq -c | while read cnt machine; do [[ $cnt == 1 ]] && continue info "Machine $machine found in the following repositories:" - for x in $(ls -d $METADIR/*/templates/machine/$machine); do + for x in $(ls -d $METADIR/*/templates/machine/$machine $METADIR/bsp/*/templates/machine/$machine ); do info " - $x" done error "Multiple machine templates are not allowed" @@ -97,7 +104,7 @@ function validate_features() { list_all_features | sort | uniq -c | while read cnt feature; do [[ $cnt == 1 ]] && continue; info "Feature $feature found in the following repositories:" - for x in $(ls -d $METADIR/*/templates/feature/$feature); do + for x in $(ls -d $METADIR/*/templates/feature/$feature ); do info " - $x" done error "Multiple feature templates are not allowed" @@ -108,8 +115,10 @@ function validate_features() { function find_machine_dir() { machine=$1 for x in $AGL_REPOSITORIES; do - dir=$METADIR/$x/templates/machine/$machine - [[ -d $dir ]] && { echo $dir; return 0; } + dirs=$(ls -d $METADIR/{.,bsp}/$x/templates/machine/$machine) + for dir in $dirs; do + [[ -d $dir ]] && { echo $dir; return 0; } + done done return 1 } @@ -123,24 +132,6 @@ function find_feature_dir() { return 1 } -function process-feature-shortcuts() { - TOCHECK=$1 - debug "processing feature shortcut $TOCHECK" - if $(echo "$FEATURES" | grep -q "$TOCHECK" 2>&1 ) ; then - featuredir=$(find_feature_dir $TOCHECK) - if test -d $featuredir; then - tmpfeatures="$FEATURES $(cat $featuredir/included.inc)" - tmpfeatures_uniq=$(echo $tmpfeatures | sed -e "s/$TOCHECK//g" -e 's/ / /g' | tr "[:blank:]" "\n" | sort -u ) - export FEATURES=$tmpfeatures_uniq - debug "Features used: $FEATURES" - else - error "No feature directory with this name: $TOCHECK" - exit 1 - fi - fi -} - - function usage() { cat <&2 Usage: . $SCRIPT [options] [feature [feature [... ]]] @@ -161,6 +152,15 @@ Options: -f|--force flag to force overwriting any existing configuration default: false + -r|--rpm-revision + Specify how to handle RPM packages revisions + can be: + 'prservice[:
]' : Use a PR service daemon. + if
is not specified, the default value 'localhost:0' + is used (shortcut for a PR service started by bitbake) + 'timestamp' : Use a generated time stamp (UTC). + 'value:' : Use explicitly. + 'none' : Do nothing. -v|--verbose verbose mode default: false @@ -172,13 +172,13 @@ Options: EOF local buf - + echo "Available machines:" >&2 for x in $AGL_REPOSITORIES; do buf=$(list_machines $x) [[ -z "$buf" ]] && continue echo " [$x]" - for y in $buf; do + for y in $buf; do [[ $y == $DEFAULT_MACHINE ]] && def="* " || def=" " echo " $def$y" done @@ -224,7 +224,7 @@ function append_fragment() { function execute_setup() { script=$1 debug "Executing script $script" - opts= + opts="-e" [[ $DEBUG == 1 ]] && opts="$opts -x" pushd $BUILDDIR &>/dev/null $BASH $opts $script \ @@ -292,7 +292,7 @@ function find_feature_dependency() { GLOBAL_ARGS=( "$@" ) debug "Parsing arguments: $@" -TEMP=$(getopt -o m:b:s:fvdh --long machine:,builddir:,script:,force,verbose,debug,help -n $SCRIPT -- "$@") +TEMP=$(getopt -o m:b:r:s:fvdh --long machine:,builddir:,rpm-revision:,script:,force,verbose,debug,help -n $SCRIPT -- "$@") [[ $? != 0 ]] && { usage; exit 1; } eval set -- "$TEMP" @@ -303,17 +303,20 @@ MACHINE=$DEFAULT_MACHINE BUILDDIR=$DEFAULT_BUILDDIR SETUPSCRIPT= FORCE= +RPMREVISION= +SETUP_MANIFEST=aglsetup.manifest while true; do case "$1" in - -m|--machine) MACHINE=$2; shift 2;; - -b|--builddir) BUILDDIR=$2; shift 2;; - -s|--setupscript) SETUPSCRIPT=$2; shift 2;; - -f|--force) FORCE=1; shift;; - -v|--verbose) VERBOSE=1; shift;; - -d|--debug) VERBOSE=1; DEBUG=1; shift;; - -h|--help) HELP=1; shift;; - --) shift; break;; + -m|--machine) MACHINE=$2; shift 2;; + -b|--builddir) BUILDDIR=$2; shift 2;; + -s|--setupscript) SETUPSCRIPT=$2; shift 2;; + -f|--force) FORCE=1; shift;; + -r|--rpm-revision) RPMREVISION=$2; shift 2;; + -v|--verbose) VERBOSE=1; shift;; + -d|--debug) VERBOSE=1; DEBUG=1; shift;; + -h|--help) HELP=1; shift;; + --) shift; break;; *) error "Arguments parsing error"; exit 1;; esac done @@ -324,9 +327,6 @@ verbose "Command line arguments: ${GLOBAL_ARGS[@]}" # the remaining args are the features FEATURES="$@" -process-feature-shortcuts agl-all-features -process-feature-shortcuts agl-ci-change-features -process-feature-shortcuts agl-ci-snapshot-features # validate the machine list debug "validating machines list" @@ -345,8 +345,8 @@ for FEATURE in $FEATURES;do TMP_FEATURES="$TMP_FEATURES $FEATURE" TMP_FEATURES="$TMP_FEATURES $(find_feature_dependency $FEATURE $TMP_FEATURES)" done -FEATURES=$TMP_FEATURES -echo "Features used: $FEATURES" +# remove duplicate features if any +FEATURES=$(for x in $TMP_FEATURES; do echo $x; done | sort -u | awk '{printf("%s ",$1);}') # validate the features for f in $FEATURES; do @@ -356,7 +356,8 @@ done # validate build dir debug "validating builddir $BUILDDIR" -BUILDDIR=$(mkdir -p $BUILDDIR && cd $BUILDDIR && pwd -P) +BUILDDIR=$(mkdir -p "$BUILDDIR" && cd "$BUILDDIR" && pwd -P) +validate_builddir ########################################################################################### function dump_log() { @@ -374,11 +375,11 @@ function genconfig() { # step 1: run usual OE setup to generate conf dir export TEMPLATECONF=$(cd $SCRIPTDIR/../templates/base && pwd -P) debug "running oe-init-build-env with TEMPLATECONF=$TEMPLATECONF" - info " Running $METADIR/poky/oe-init-build-env" + info " Running $METADIR/external/poky/oe-init-build-env" info " Templates dir: $TEMPLATECONF" CURDIR=$(pwd -P) - . $METADIR/poky/oe-init-build-env $BUILDDIR >/dev/null + . $METADIR/external/poky/oe-init-build-env $BUILDDIR >/dev/null cd $CURDIR # step 2: concatenate other remaining fragments coming from base @@ -410,6 +411,12 @@ function genconfig() { append_fragment $BUILDDIR/conf/local.conf $file verbose " + $file" done + # special fragment to call distro-manifest-generator.sh from + # meta-agl-profile-core/recipes-core/distro-build-manifest/distro-build-manifest.bb + append_fragment $BUILDDIR/conf/local.conf /dev/stdin "# generated by $(realpath $BASH_SOURCE)" <<-EOF + DISTRO_SETUP_MANIFEST = "$(realpath -Ls $BUILDDIR)/$SETUP_MANIFEST" + DISTRO_MANIFEST_GENERATOR = "$(dirname $(realpath $BASH_SOURCE))/distro-manifest-generator.sh" + EOF FRAGMENTS_SETUP=$(sed 's/ /\n/g' <<<$FRAGMENTS_SETUP | sort) debug "setup fragments: $FRAGMENTS_SETUP" @@ -422,6 +429,8 @@ export MACHINE="$MACHINE" export FEATURES="$FEATURES" export BUILDDIR="$BUILDDIR" export METADIR="$METADIR" +export RPMREVISION="$RPMREVISION" +export LOCALCONF="$BUILDDIR/conf/local.conf" echo "--- beginning of setup script" EOF @@ -445,7 +454,6 @@ EOF dump_log $BUILDDIR/conf/setup.log return 1 } - # NOTE: the setup.sh script is removed if execution succeeded (only the log remains) } ########################################################################################### @@ -457,10 +465,12 @@ EOF $BUILDDIR/conf/setup.* \ $BUILDDIR/conf/*.log +####### step 1: generate configuration file ####### + if [[ -f $BUILDDIR/conf/local.conf || -f $BUILDDIR/conf/bblayers.conf ]]; then info "Configuration files already exist:" for x in $BUILDDIR/conf/local.conf $BUILDDIR/conf/bblayers.conf; do - [[ -f $x ]] && info " - $x" + [[ -f $x ]] && info " - $x" done info "Skipping configuration files generation." info "Use option -f|--force to overwrite existing configuration." @@ -468,21 +478,61 @@ else genconfig fi +####### step 2: generate aglsetup.manifest ####### + +infon "Generating setup manifest: $BUILDDIR/$SETUP_MANIFEST ... " +for x in /etc/os-release /usr/lib/os-release; do + [[ -f $x ]] && . $x +done +FEATURES_md5=$(echo $FEATURES|md5sum -|awk '{print $1;}') +cat <$BUILDDIR/$SETUP_MANIFEST +# ---------------------------------------------- +# This fragment has been generated by $SCRIPT at setup time + +# distro name +DIST_DISTRO_NAME="AGL" + +# target machine as passed to $SCRIPT +DIST_MACHINE="$MACHINE" + +# features as resolved by $SCRIPT +DIST_FEATURES="$FEATURES" +DIST_FEATURES_MD5="${FEATURES_md5}" + +# build host information deduced from os-release +DIST_BUILD_HOST="$(id -un)@$(hostname -f || hostname || hostname -s)" +DIST_BUILD_OS="${PRETTY_NAME:-${NAME} ${VERSION} [COMPUTED]}" + +# meta directory +DIST_METADIR="$METADIR" + +# timestamp +DIST_SETUP_TS="$(date -u +%Y%m%d_%H%M%S_%Z)" + +# ------------ end of $SCRIPT fragment -------- +EOF +info "OK" + +####### step 3: generate agl-init-build-env ####### + # always generate setup script in builddir: it can be sourced later manually without re-running the setup infon "Generating setup file: $BUILDDIR/agl-init-build-env ... " + cat <$BUILDDIR/agl-init-build-env -. $METADIR/poky/oe-init-build-env $BUILDDIR +. $METADIR/external/poky/oe-init-build-env $BUILDDIR if [ -n "\$DL_DIR" ]; then BB_ENV_EXTRAWHITE="\$BB_ENV_EXTRAWHITE DL_DIR" fi if [ -n "\$SSTATE_DIR" ]; then - BB_ENV_EXTRAWHITE="\$BB_ENV_EXTRAWHITE SSTATE_DIR" + BB_ENV_EXTRAWHITE="\$BB_ENV_EXTRAWHITE SSTATE_DIR" fi export BB_ENV_EXTRAWHITE unset TEMPLATECONF EOF info "OK" +####### step 4: generate output script ####### + # finally, generate output script if requested by caller if [[ -n "$SETUPSCRIPT" ]]; then debug "generating setupscript in $SETUPSCRIPT"