utils/index: Add west projects to Zephyr repo on fetch

docker/Dockerfile

@@ -34,7 +34,8 @@ RUN \
     libapache2-mod-wsgi-py3 \
     libjansson4 \
     libyaml-0-2 \
-    wget
+    wget \
+    yq
 
 COPY ./requirements.txt /usr/local/elixir/
 

projects/zephyr.sh

@@ -3,6 +3,17 @@
 # Enable DT bindings compatible strings support
 dts_comp_support=1
 
+version_dir()
+{
+    grep "^elixir-" |
+    sed -e 's/elixir-//';
+}
+
+version_rev()
+{
+    sed -e 's/^/elixir-/';
+}
+
 list_tags()
 {
     echo "$tags" |
@@ -21,3 +32,7 @@ get_latest_tags()
 {
     git tag | grep -v '^zephyr-v' | version_dir | grep -v '\-rc' | sort -Vr
 }
+
+fetch_hook() {
+    $script_dir/utils/zephyr-converter.sh $opt1
+}

script.sh

@@ -32,11 +32,13 @@ script_dir=`pwd`
 cd "$cur_dir"
 dts_comp_support=0 # DT bindings compatible strings support (disable by default)
 
+# Converts git repository tag to name visible in Elixir
 version_dir()
 {
     cat;
 }
 
+# Converts tag name visible in Elixir to git repository tag
 version_rev()
 {
     cat;
@@ -214,6 +216,11 @@ dts_comp()
     echo $dts_comp_support
 }
 
+# Ran from utils/index to allow projects modify the repository after fetch
+fetch_hook() {
+    cat;
+}
+
 project=$(basename `dirname $LXR_REPO_DIR`)
 
 plugin=$script_dir/projects/$project.sh
@@ -291,6 +298,10 @@ case $cmd in
         dts_comp
         ;;
 
+    fetch-hook)
+        fetch_hook
+        ;;
+
     help)
         echo "Usage: $0 subcommand [args]..."
         exit 1

utils/index

@@ -46,6 +46,9 @@ project_fetch() {
 
     $git fetch --all --tags -j4
 
+    LXR_REPO_DIR=$1/repo LXR_DATA_DIR=$1/data \
+        ./script.sh fetch-hook "$(realpath $1)"
+
     # A gc.log file implies a garbage collect failed in the past.
     # Also, create a hidden flag which could be useful to trigger GCs manually.
     if test -e $1/repo/gc.log -o "$ELIXIR_GC"; then

utils/zephyr-converter.sh

@@ -0,0 +1,109 @@
+#!/bin/bash
+
+set -e
+
+clean_git_worktree() {
+    find $1 -mindepth 1 -maxdepth 1 -type d -not -path "$1/.git*" -exec rm -r {} \; || true
+    find $1 -mindepth 1 -maxdepth 1 -type f -not -path "$1/.git*" -exec rm -r {} \; || true
+}
+
+copy_git_worktree() {
+    rsync -q -av $1 --exclude .git $2
+}
+
+resolve_path() {
+    project_path_resolved=`readlink -m $1`
+    echo ./`realpath -m --relative-to=$(pwd) $project_path_resolved`
+}
+
+print_readme() {
+    echo "This directory contains projects specified in west.yaml."
+    echo "It was generated automatically and is not a part of the upstream $PROJECT_NAME repository."
+    echo "You can report bugs (ex. missing west.yaml projects) at https://github.com/bootlin/elixir"
+}
+
+if [[ "$#" -ne 1 ]]; then
+    echo "usage: $0 west-project-dir"
+    exit 1
+fi
+
+if ! command -v west 2>&1 >/dev/null; then
+    echo "west command is not available"
+    exit 1
+fi
+
+cd $1
+
+PROJECT_NAME=zephyr
+TOP_DIR=./west-topdir
+REPO_DIR=./repo
+TMP_DIR=./tmp
+export ZEPHYR_BASE=$TOP_DIR
+
+if [[ ! -d $REPO_DIR ]]; then
+    echo "$REPO_DIR does not exist. Please clone project repository to $REPO first."
+    exit 1
+fi
+
+git -C $REPO_DIR config user.email [email protected]
+git -C $REPO_DIR config user.name "west repository converter for $PROJECT_NAME"
+
+if [[ ! -f $TOP_DIR/$PROJECT_NAME/.git ]]; then
+    git -C $REPO_DIR worktree add ../$TOP_DIR/$PROJECT_NAME main
+fi
+
+if [[ ! -f $TMP_DIR/.git ]]; then
+    git -C $REPO_DIR worktree add -b elixir --orphan ../$TMP_DIR
+    git -C $TMP_DIR commit --allow-empty -m "initial commit"
+fi
+
+if [[ ! -d $TOP_DIR/.west ]]; then
+    west init $TOP_DIR/zephyr -l
+fi
+
+project_tags=`git -C $REPO_DIR tag | grep -v "^elixir" | grep -v "^$PROJECT_NAME"`
+local_tags=`git -C $REPO_DIR tag | { grep "^elixir" || true; } | sed 's/^elixir-//'`
+new_tags= #`echo $project_tags $local_tags | tr ' ' '\n' | sort -n | uniq -u | grep v4.0.0`
+
+for tag in $new_tags; do
+    echo "found missing tag $tag"
+    git -C $TOP_DIR/$PROJECT_NAME checkout -f $tag
+    clean_git_worktree $TMP_DIR
+
+    west_manifest=$TOP_DIR/$PROJECT_NAME/west.yml
+    if [[ -f $west_manifest ]]; then
+        # Find disabled groups
+        extra_group_names=`cat west-topdir/$PROJECT_NAME/west.yml | yq -r '(.manifest."group-filter" // [])[]'`
+        # Take only disabled groups (start with '-'), enable them (replace - with +),
+        # concatenate lines to group-a,group-b,...
+        extra_groups=`echo $extra_group_names | tr ' ' '\n' | grep '^-' | sed 's/^-/+/' | paste -s -d,`
+        west update $([[ ! -z $extra_groups ]] && echo --group-filter "$extra_groups")
+        # Get module paths to copy
+        module_paths=`cat $west_manifest | yq -r '.manifest.projects | map(.path)[] | select(. != null)'`
+
+        mkdir -p $TMP_DIR/west_projects
+        for top_path in $module_paths; do
+            # Check if project_path does not traverse outside west_projects
+            project_path=`resolve_path $TMP_DIR/west_projects/$top_path`
+            if [[ $project_path =~ ^$TMP_DIR/west_projects/.* ]]; then
+                echo "copying $top_path project directory"
+                mkdir -p $project_path
+                copy_git_worktree $TOP_DIR/$top_path/ $project_path
+            else
+                echo "found suspicious path $project_path, not copying"
+            fi
+        done
+
+        print_readme > $TMP_DIR/west_projects/README.txt
+    fi
+
+    echo "copying $PROJECT_NAME directory"
+    git -C $TMP_DIR checkout -q elixir
+    copy_git_worktree $TOP_DIR/$PROJECT_NAME/ $TMP_DIR
+
+    echo "commiting $tag"
+    git -C $TMP_DIR add '*'
+    git -C $TMP_DIR commit -q -a -m $tag
+    git -C $TMP_DIR tag elixir-$tag
+done
+