X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=scripts%2F.aglsetup_genconfig.bash;h=e95605a65f230642133102b964a1c3dd5065f441;hb=7d027fc6280a9ffe234736a38c8aed32243a4dd6;hp=c6e5a36a157d28026608b01b33ad14e5022bdc12;hpb=7918af5e635629a70ddb97a3ecfb94e8c7548d0c;p=AGL%2Fmeta-agl.git diff --git a/scripts/.aglsetup_genconfig.bash b/scripts/.aglsetup_genconfig.bash index c6e5a36a1..e95605a65 100755 --- a/scripts/.aglsetup_genconfig.bash +++ b/scripts/.aglsetup_genconfig.bash @@ -5,6 +5,7 @@ # The MIT License (MIT) # # Copyright (c) 2016 Stéphane Desneux +# (c) 2016 Jan-Simon Möller # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -26,12 +27,11 @@ # ################################################################################ -# 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.0.0 -AGL_REPOSITORIES="meta-agl meta-agl-extra meta-agl-contrib" +VERSION=1.1.0 DEFAULT_MACHINE=qemux86-64 DEFAULT_BUILDDIR=./build VERBOSE=0 @@ -50,40 +50,71 @@ 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) + function list_machines() { for x in $@; do for y in $(ls -d $METADIR/$x/templates/machine/* 2>/dev/null); do - echo -n "$(basename $y) " + echo $(basename $y) done done } function list_all_machines() { for x in $AGL_REPOSITORIES; do - [[ ! -d $METADIR/$x ]] && continue list_machines $x 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 + info " - $x" + done + error "Multiple machine templates are not allowed" + done + debug "Machines list has no duplicate." +} + function list_features() { for x in $@; do for y in $(ls -d $METADIR/$x/templates/feature/* 2>/dev/null); do - echo -n "$(basename $y) " + echo $(basename $y) done done } function list_all_features() { for x in $AGL_REPOSITORIES; do - [[ ! -d $METADIR/$x ]] && continue list_features $x done } +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 + info " - $x" + done + error "Multiple feature templates are not allowed" + done + debug "Features list has no duplicate." +} + function find_machine_dir() { machine=$1 for x in $AGL_REPOSITORIES; do - [[ ! -d $METADIR/$x ]] && continue dir=$METADIR/$x/templates/machine/$machine [[ -d $dir ]] && { echo $dir; return 0; } done @@ -93,7 +124,6 @@ function find_machine_dir() { function find_feature_dir() { feature=$1 for x in $AGL_REPOSITORIES; do - [[ ! -d $METADIR/$x ]] && continue dir=$METADIR/$x/templates/feature/$feature [[ -d $dir ]] && { echo $dir; return 0; } done @@ -120,6 +150,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 @@ -130,12 +169,14 @@ Options: get some help EOF - + local buf + echo "Available machines:" >&2 for x in $AGL_REPOSITORIES; do - [[ ! -d $METADIR/$x ]] && continue + buf=$(list_machines $x) + [[ -z "$buf" ]] && continue echo " [$x]" - for y in $(list_machines $x); do + for y in $buf; do [[ $y == $DEFAULT_MACHINE ]] && def="* " || def=" " echo " $def$y" done @@ -144,10 +185,16 @@ EOF echo "Available features:" >&2 for x in $AGL_REPOSITORIES; do - [[ ! -d $METADIR/$x ]] && continue + buf=$(list_features $x) + [[ -z "$buf" ]] && continue echo " [$x]" - for y in $(list_features $x); do - echo " $y" + for feature in $buf; do + print_feature="$feature" + featuredir=$(find_feature_dir $feature) + if [ -e $featuredir/included.dep ];then + print_feature="$print_feature :($(find_feature_dependency $feature $feature))" + fi; + echo " $print_feature" done done echo >&2 @@ -175,7 +222,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 \ @@ -185,6 +232,7 @@ function execute_setup() { return $rc } + # process all fragments FRAGMENTS_BBLAYERS="" FRAGMENTS_LOCALCONF="" @@ -215,9 +263,34 @@ function process_fragments() { done } +function containsFeature () { + for feature in $1; do + [[ "$feature" == "$2" ]] && return 1; + done; + return 0; +} + +function find_feature_dependency() { + res_dep_features="" + featuredir=$(find_feature_dir $1) + full_feature=$2; + if [ -e $featuredir/included.dep ]; then + dep_features="$(cat $featuredir/included.dep)" + for dep_feature in $dep_features; do + full_feature="$full_feature $res_dep_features" + res_dep_features="$res_dep_features $dep_feature" + if containsFeature $dep_feature $full_feature ; then + res_dep_features="$res_dep_features $(find_feature_dependency $dep_feature $full_feature)" + fi; + done; + fi; + echo "$res_dep_features"; + return 0; +} + 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" @@ -228,17 +301,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 @@ -250,10 +326,26 @@ verbose "Command line arguments: ${GLOBAL_ARGS[@]}" # the remaining args are the features FEATURES="$@" +# validate the machine list +debug "validating machines list" +validate_machines + # validate the machine debug "validating machine $MACHINE" find_machine_dir $MACHINE >/dev/null || error "Machine '$MACHINE' not found in [ $(list_all_machines)]" +# validate the features list +debug "validating features list" +validate_features + +TMP_FEATURES=""; +for FEATURE in $FEATURES;do + TMP_FEATURES="$TMP_FEATURES $FEATURE" + TMP_FEATURES="$TMP_FEATURES $(find_feature_dependency $FEATURE $TMP_FEATURES)" +done +# 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 debug "validating feature $f" @@ -262,7 +354,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() { @@ -316,6 +409,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" @@ -328,6 +427,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 @@ -340,18 +441,17 @@ EOF append_fragment $BUILDDIR/conf/setup.sh "" "echo '--- end of setup script'" infon " Executing setup script ... " - execute_setup $BUILDDIR/conf/setup.sh 2>&1 | tee $BUILDDIR/conf/setup.log \ - && { - info "OK" - [[ $VERBOSE == 1 ]] && dump_log $BUILDDIR/conf/setup.log - rm $BUILDDIR/conf/setup.sh - } \ - || { - info "FAIL: please check $BUILDDIR/conf/setup.log" - dump_log $BUILDDIR/conf/setup.log - return 1 - } - # NOTE: the setup.sh script is removed if execution succeeded (only the log remains) + execute_setup $BUILDDIR/conf/setup.sh 2>&1 | tee $BUILDDIR/conf/setup.log + [[ ${PIPESTATUS[0]} == 0 ]] && { + info "OK" + [[ $VERBOSE == 1 ]] && dump_log $BUILDDIR/conf/setup.log + rm $BUILDDIR/conf/setup.sh + } \ + || { + info "FAIL: please check $BUILDDIR/conf/setup.log" + dump_log $BUILDDIR/conf/setup.log + return 1 + } } ########################################################################################### @@ -363,10 +463,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." @@ -374,21 +476,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 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"