Merge pull request #85 from learmj/flow_dev

Brave new world

Author: learmj

.gitignore

@@ -1,7 +1,2 @@
-deploy/*
 work/*
-postrun.sh
-SKIP
-SKIP_IMAGES
-.pc
-*-pc
+site/__pycache__

.gitlab-ci.yml

@@ -0,0 +1,16 @@
+# Enable most checks but disable some overly pedantic ones
+enable=all
+
+# Disable these checks as they're often impractical
+disable=SC2034   # Variable appears unused (often false positives)
+disable=SC2086   # Double quote to prevent globbing (sometimes we want word splitting)
+disable=SC2154   # Silence referenced but not assigned
+disable=SC2181   # Check exit code directly ([ $? -eq 0 ] instead of if command)
+disable=SC2207   # Prefer mapfile for arrays (mapfile isn't always available)
+disable=SC2249   # Case statements don't always need defaults
+
+# Style issues are non-fatal
+severity=style
+disable=SC2250   # Don't always want braces around variables
+
+shell=bash

.shellcheckrc

@@ -76,7 +76,7 @@ if [ "${#FARGS[@]}" -eq 0 ]; then
 }
 
 
-ASSET_DIR=$(pmap -f $JSON --get-key IGmeta.IGconf_sys_outputdir)
+ASSET_DIR=$(pmap -f $JSON --get-key IGmeta.IGconf_image_outputdir)
 [[ -d $ASSET_DIR ]] || die "JSON specified asset dir $ASSET_DIR is invalid"
 
 # Do it

README.adoc

@@ -0,0 +1,30 @@
+#!/usr/bin/env python3
+import sys
+import os
+
+bindir = os.path.dirname(os.path.abspath(__file__))
+igroot = os.path.dirname(bindir)
+sitedir = os.path.join(igroot, 'site')
+sys.path.insert(0, sitedir)
+
+import argparse
+from config_loader import ConfigLoader_register_parser
+from metadata_parser import Metadata_register_parser
+from layer_manager import LayerManager_register_parser
+
+def main():
+    parser = argparse.ArgumentParser(description="rpi-image-gen core engine helper")
+    subparsers = parser.add_subparsers(title="subcommands", dest="command")
+    subparsers.required = True
+
+    # Register subcommands
+    ConfigLoader_register_parser(subparsers)
+    Metadata_register_parser(subparsers)
+    LayerManager_register_parser(subparsers,root=igroot)
+
+    args = parser.parse_args()
+    args.func(args)
+
+
+if __name__ == "__main__":
+    main()

bin/idp.sh

@@ -88,6 +88,15 @@ igconf_isval()
     return 0
 }
 
+igconf_getval()
+{
+   igconf_isval "$@" || return 1
+   local v values=()
+   for v in $(igconf_tr "" "$@"); do
+      values+=("${!v}")
+   done
+   printf '%s\n' "${values[*]}"
+}
 
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]] ; then
    set -u
@@ -98,7 +107,7 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]] ; then
    shift 1
 
    case "$op" in
-      isy|isn|isset|isnset|isval)
+      isy|isn|isset|isnset|isval|getval)
          igconf_"$op" "$@"
          exit $?
          ;;

bin/ig

@@ -9,15 +9,15 @@ import sys
 import subprocess
 
 
-VERSION = "2.0.0"
+VERSION = "2.1.0"
 
 
 IMAGE_KEYS = {"IGconf_device_class",
               "IGconf_device_variant",
               "IGconf_device_storage_type",
               "IGconf_device_sector_size",
               "IGconf_image_version",
-              "IGconf_sys_outputdir"}
+              "IGconf_image_outputdir"}
 
 
 IMAGE_KEY_TYPES = {
@@ -216,7 +216,7 @@ def get_artefact_path(file, dir_evar):
 
 # Returns the size of a build artefact file.
 def get_artefact_size(file):
-    f = get_artefact_path(file, "IGconf_sys_outputdir")
+    f = get_artefact_path(file, "IGconf_image_outputdir")
     if f:
         return os.stat(f).st_size
     return None
@@ -319,7 +319,7 @@ def parse_genimage_config(config_path):
                         partitions[pname]["simage"] = sname
 
     # Read the partition table from the image
-    img_path = get_artefact_path(img_name, "IGconf_sys_outputdir")
+    img_path = get_artefact_path(img_name, "IGconf_image_outputdir")
     try:
         res = subprocess.run(
                 ["sfdisk", "--verify", "--json", img_path],

bin/igconf

@@ -7,29 +7,35 @@ shift 1
 
 # Execute scripts from within these dirs in this order
 dirs=()
-dirs+=("${IGIMAGE}/bdebstrap")
-dirs+=("${IGDEVICE}/bdebstrap")
-[[ -n ${IGconf_ext_dir+x} ]] && dirs+=("${IGconf_ext_dir}/bdebstrap")
+[[ -n ${IGconf_device_assetdir+x} ]] && dirs+=("${IGconf_device_assetdir}/bdebstrap")
+[[ -n ${IGconf_image_assetdir+x} ]] && dirs+=("${IGconf_image_assetdir}/bdebstrap")
+dirs+=("${SRC_DIR}/bdebstrap")
 dirs+=("${IGTOP}/scripts/bdebstrap")
 
 case "$op" in
    setup|extract|essential|customize|cleanup)
       for dir in "${dirs[@]}" ; do
          [[ -d "$dir" ]] || continue
-         scripts=("${dir}/${op}"*)
-         for script in "${scripts[@]}" ; do
-            if [ -x "$script" ] ; then
+         if compgen -G "${dir}/${op}*" >/dev/null; then
+            for script in "${dir}/${op}"* ; do
                s=$(basename "$script")
-               if [[ $s =~ ^[a-zA-Z0-9-]+$ ]] ; then
-                  env -C "$dir" bash "$s" "$@"
-                  err=$?
-                  if [ $err -ne 0 ] ; then
-                     >&2 echo "runner: $script error ($err)"
-                     exit $err
+               if [ -x "$script" ] ; then
+                  if [[ $s =~ ^[a-zA-Z0-9-]+$ ]] ; then
+                     echo "runner: $dir [run $s]"
+                     env -C "$dir" bash "$s" "$@"
+                     err=$?
+                     if [ $err -ne 0 ] ; then
+                        >&2 echo "runner: $script error ($err)"
+                        exit $err
+                     fi
+                  else
+                     >&2 echo "runner: $dir [skipped $s]"
                   fi
+               else
+                  >&2 echo "runner: $dir [ignored $s]"
                fi
-            fi
-         done
+            done
+         fi
       done
       ;;
    *)

bin/image2json

@@ -0,0 +1,47 @@
+#!/bin/sh
+
+# safe userspec chroot wrapper as local user IGconf_device_user1 with shell
+# command execution.
+# This user is created by rpi-user-credentials as a valid regular local user
+# with home dir. The command is 
+set -u
+
+if [ $# -eq 0 ]; then
+   >&2 echo "uchroot <chroot_path> [command...]"
+   exit 1
+fi
+
+if [ -z "${IGconf_device_user1:-}" ]; then
+   >&2 echo "uchroot: IGconf_device_user1 not set"
+   exit 1
+fi
+
+if [ ! -d "$1" ]; then
+   >&2 echo "uchroot: dir '$1' is invalid"
+   exit 1
+fi
+
+dir="$1"
+shift
+
+if [ -r "${dir}/etc/passwd" ]; then
+   spec=$(grep "^$IGconf_device_user1:" "${dir}/etc/passwd" 2>/dev/null || true)
+   if [ -n "$spec" ]; then
+      # home is 6th field
+      home_dir=$(echo "$spec" | cut -d: -f6)
+      if [ -d "${dir}${home_dir}" ]; then
+         # GID is 4th field
+         user_gid=$(echo "$spec" | cut -d: -f4)
+         userspec="${IGconf_device_user1}:${user_gid}"
+
+         USER="$IGconf_device_user1" \
+         LOGNAME="$IGconf_device_user1" \
+         HOME="$home_dir" \
+         chroot --userspec "$userspec" "$dir" /bin/sh -c "$*"
+         exit $?
+      fi
+   fi
+fi
+
+>&2 echo "uchroot: User '$IGconf_device_user1' does not exist"
+exit 1