Profil pour contruire un paquet deb à partir d’une source obtenue sur pypi

hooks/build/stdeb/build

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+cd src
+for archive in *.tar.gz
+do
+    py2dsc $archive
+    folder="$(find deb_dist/* -maxdepth 0 -type d)"
+    pushd $folder
+    dpkg-buildpackage -b -a"${TAMARIN_TARGET_ARCH}"
+    find ../ -maxdepth 1 -name "*.deb" -type f -print0 | xargs -0r mv -t /dist/
+    popd
+    rm -rf $folder
+done
+
+exit 0   

hooks/containerbuild/debian/install-letsencrypt-ca

@@ -16,11 +16,11 @@ EOF
 
 
 echo "ENV DEBIAN_FRONTEND=noninteractive" >> Dockerfile
-echo "RUN apt-get update && apt-get install --yes --no-install-recommends wget openssl ca-certificates" >> Dockerfile
+echo "RUN apt-get update && apt-get install --yes --no-install-recommends openssl ca-certificates" >> Dockerfile
 
 for cert in $CERTS; do
     filename=$(basename "$cert")
-    echo "RUN wget -O '$DESTDIR/$filename' $cert" >> Dockerfile
+    echo "ADD $cert $DESTDIR/$filename" >> Dockerfile
     echo "RUN openssl x509 -in '$DESTDIR/$filename' -inform PEM -out '$DESTDIR/$filename.crt'" >> Dockerfile
 done
 

hooks/containerbuild/ubuntu/install-stdeb

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -e
+
+echo 'ENV DEBIAN_FRONTEND=noninteractive' >> Dockerfile
+echo 'RUN apt-get update && apt-get install --yes --no-install-recommends python3-all dh-python python3-pip' >> Dockerfile
+echo 'RUN pip3 install stdeb' >> Dockerfile
+echo 'ENV DEBIAN_FRONTEND=' >> Dockerfile
+

hooks/prebuild/eole/create-changelog

@@ -63,10 +63,10 @@ function parse_tag {
   extended_version="${tag##*/}"
   if [ "$flavor" = "pkg" ]
   then
-    exploded_version="$(echo $extended_version | sed "s/\([a-z0-9.+]\+\)-\([0-9]\+\)\(-[a-z]\++[0-9]\+\)\?\(-\([0-9]\+\)-\(g[a-z0-9]\+\)\)\?$/version:\1 revision:\2 modification:\3 distance:\5 anchor:\6/")"
+    exploded_version="$(echo $extended_version | sed "s/\([a-z0-9.]\+\)-\([0-9]\+\)\(-[a-z]\++[0-9]\+\)\?\(-\([0-9]\+\)-\(g[a-z0-9]\+\)\)\?$/version:\1 revision:\2 modification:\3 distance:\5 anchor:\6/")"
   elif [ "$flavor" = "release" ]
   then
-    exploded_version="$(echo $extended_version | sed "s/\([a-z0-9.+]\+\)\(-\([0-9]\+\)-\(g[a-z0-9]\+\)\)\?$/version:\1 distance:\3 anchor:\4/")"
+    exploded_version="$(echo $extended_version | sed "s/\([a-z0-9.]\+\)\(-\([0-9]\+\)-\(g[a-z0-9]\+\)\)\?$/version:\1 distance:\3 anchor:\4/")"
   fi
   echo $exploded_version
 }
@@ -181,7 +181,6 @@ function packager_from_commit {
 }
 
 function next_version {
-  set -x
   commit="$1"
   # upstream version is given by most recent of release or pkg tag
   previous_pkg="$(git describe --long --match='pkg/*' $commit 2>/dev/null)"
@@ -205,7 +204,6 @@ function next_version {
     version="$(get_upstream_version_from_tag $previous_release)-1"
   elif [ -n "$previous_pkg" ]
   then
-    distance_from_pkg=$(get_distance_from_tag "$previous_pkg" "$commit")
     distance=$distance_from_pkg
     version="$(get_upstream_version_from_tag $previous_pkg)-$(expr $(get_package_version_from_tag $previous_pkg) + 1)"
   else
@@ -214,10 +212,9 @@ function next_version {
   fi
   if [ "$package_level" = 'dev' ] || [ "$package_level" = 'staging' ]
   then
-    version="${version}~${package_level}+${distance}"
+    version="${version}~${package_level}+${distance}~$(get_short_hash $commit)"
   fi
   echo $version
-  set +x
 }
 
 function gen_changelog_entry {
@@ -260,15 +257,9 @@ function gen_changelog_entry {
 }
 
 function gen_changelog() {
-  limit=10
   while gen_changelog_entry $ceiling_commit
   do
-    limit=`expr $limit - 1`
     echo $changelog_entry
-    if [ "$limit" -le 0 ]
-    then
-      break
-    fi
   done
 }
 

lib/tamarin.py

@@ -1,4 +1,4 @@
-import os, glob, subprocess, configparser, codecs, sys, pathlib
+import os, glob, subprocess, configparser, codecs, sys
 
 def run_profile_hooks(profile, step, **kwargs):
   hooks_dir = get_hooks_dir()
@@ -9,57 +9,51 @@ def run_profile_hooks(profile, step, **kwargs):
     trimmed_hook_name = hook_name.strip(' \t\n\r')
     if not trimmed_hook_name:
       continue
-    hook_path = hooks_dir.joinpath(trimmed_hook_name)
+    hook_path = os.path.join(hooks_dir, trimmed_hook_name)
     run([hook_path], **kwargs)
 
 def get_base_dir():
-  base_dir = pathlib.Path(__file__).absolute().parent.parent.resolve()
-  return base_dir
+  return os.path.realpath(os.path.dirname(os.path.abspath(__file__)) + "/..")
 
 def get_hooks_dir():
-  hooks_dir = get_base_dir().joinpath('hooks')
-  return hooks_dir
+  return os.path.realpath(os.path.dirname(os.path.abspath(__file__)) + "/../hooks")
 
 def get_lib_dir():
-  lib_dir = get_base_dir().joinpath('lib')
-  return lib_dir
+  return os.path.realpath(os.path.dirname(os.path.abspath(__file__)) + "/../lib")
 
 def get_utils_dir():
-  utils_dir = get_base_dir().joinpath('utils')
-  return utils_dir
-
-def get_profiles_dir():
-  profiles_dir = get_base_dir().joinpath('profiles')
-  return profiles_dir
-
-def get_workspace_dir():
-    """Return the absolute path to the tamarin workspace ($HOME/.tamarin)"""
-    home = pathlib.Path(os.environ["HOME"])
-    workspace_dir = home.joinpath('.tamarin')
-    return workspace_dir
-
-def get_workspace_subdir(subdir):
-    """Return the absolute path to a subdirectory in tamarin workspace"""
-    subdir_path = get_workspace_dir().joinpath(subdir)
-    subdir_path.mkdir(parents=True, exist_ok=True)
-    return subdir_path
+  return os.path.realpath(os.path.dirname(os.path.abspath(__file__)) + "/../utils")
 
 def load_profile(profile_name, debug=False):
   profile_filename = profile_name+".conf"
-  profile_path = get_profiles_dir().joinpath(profile_filename)
-  if profile_path.exists():
-    config = configparser.ConfigParser()
-    with codecs.open(profile_path, encoding = 'utf-8', mode = 'r') as handle:
-      config.read_file(handle)
-      return config
+  for profile_file in get_available_profiles():
+    if profile_filename == os.path.basename(profile_file):
+      config = configparser.ConfigParser()
+      with codecs.open(profile_file, encoding = 'utf-8', mode = 'r') as handle:
+        config.read_file(handle)
+        return config
   return None
 
+def get_profiles_dir():
+  return os.path.realpath(os.path.dirname(os.path.abspath(__file__)) + "/../profiles")
+
 def get_available_profiles():
-  return get_profiles_dir().glob('*.conf')
+    return glob.glob(get_profiles_dir() + '/*.conf')
 
 def get_available_profile_names():
     profile_files = get_available_profiles()
-    return [p.stem for p in profile_files]
+    return [os.path.splitext(os.path.basename(f))[0] for f in profile_files]
+
+def get_workspace_dir():
+    """Return the absolute path to the tamarin workspace ($HOME/.tamarin)"""
+    home = os.environ["HOME"]
+    return os.path.join(os.sep, home, '.tamarin')
+
+def get_workspace_subdir(subdir):
+    """Return the absolute path to a subdirectory in tamarin workspace"""
+    dir_path = os.path.join(os.sep, get_workspace_dir(), subdir)
+    os.makedirs(dir_path, exist_ok=True)
+    return dir_path
 
 def run(cmd, captureOutput=False, pty=False, debug=False, **kwargs):
     """Execute an arbitrary command on the system"""

package

@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
 
-import argparse, sys, shutil, os, subprocess, pathlib
+import argparse, sys, shutil, os, subprocess
 
-sys.path.append(pathlib.Path(__file__).parent.joinpath('lib').as_posix())
+sys.path.append(os.path.dirname(__file__) + '/lib')
 
 import tamarin
 
@@ -28,18 +28,18 @@ def create_args_parser():
     return parser
 
 def build_image(build_workspace, base_image, profile_name, profile, debug=False, rebuild=False):
-    shutil.copytree(tamarin.get_base_dir(), build_workspace.joinpath('.tamarin'))
+    shutil.copytree(tamarin.get_base_dir(), os.path.join(build_workspace, '.tamarin'))
 
-    with open(build_workspace.joinpath("Dockerfile"), 'w') as dockerfile:
+    with open("{:s}/Dockerfile".format(build_workspace), 'w') as dockerfile:
         dockerfile.write("FROM {:s}\n".format(base_image))
         dockerfile.write("COPY .tamarin /tamarin\n")
 
     # Configure "containerbuild" hooks environment
     hooks_env = os.environ.copy()
-    hooks_env["PATH"] = os.environ['PATH'] + ':' + tamarin.get_lib_dir().as_posix()
+    hooks_env["PATH"] = os.environ['PATH'] + ':' + tamarin.get_lib_dir()
 
     # Run hooks
-    tamarin.run_profile_hooks(profile, 'containerbuild', cwd=build_workspace.as_posix(), env=hooks_env, debug=debug)
+    tamarin.run_profile_hooks(profile, 'containerbuild', cwd=build_workspace, env=hooks_env, debug=debug)
 
     image_tag = "tamarin:{:s}_{:s}_{:d}".format(profile_name, base_image.replace(':', '_'), os.getpid())
 
@@ -72,9 +72,8 @@ if __name__ == "__main__":
         cleanup(debug=args.debug)
 
     # Verify project directory
-    project_dir = pathlib.Path(args.project_directory).absolute()
-    output_dir = pathlib.Path(args.output).absolute()
-    output_dir.mkdir(parents=True, exist_ok=True)
+    project_dir = os.path.abspath(args.project_directory)
+    output_dir = os.path.abspath(args.output)
 
     # Load build profile
     profile = tamarin.load_profile(args.profile, debug=args.debug)
@@ -84,7 +83,7 @@ if __name__ == "__main__":
     pid = os.getpid()
     build_workspace = tamarin.get_workspace_subdir('tmp/build_{:d}'.format(pid))
 
-    shutil.copytree(tamarin.get_utils_dir(), build_workspace.joinpath('utils'))
+    shutil.copytree(tamarin.get_utils_dir(), os.path.join(build_workspace, 'utils'))
 
     base_image = args.base if args.base != '' else profile['profile']['default_image']
 
@@ -109,16 +108,16 @@ if __name__ == "__main__":
 
         # volumes definition
         docker_args += [
-            "-v", "{:s}:/src:z,ro".format(project_dir.as_posix()),
-            "-v", "{:s}:/dist:z".format(output_dir.as_posix()),
+            "-v", "{:s}:/src:ro".format(project_dir),
+            "-v", "{:s}:/dist".format(output_dir),
         ]
 
         if not args.no_lib_mounts:
             docker_args += [
-                "-v", "{:s}:/tamarin/hooks:z,ro".format(tamarin.get_hooks_dir().as_posix()),
-                "-v", "{:s}:/tamarin/lib:z,ro".format(tamarin.get_lib_dir().as_posix()),
-                "-v", "{:s}:/tamarin/profiles:z,ro".format(tamarin.get_profiles_dir().as_posix()),
-                "-v", "{:s}:/tamarin/utils:z,ro".format(tamarin.get_utils_dir().as_posix())
+                "-v", "{:s}:/tamarin/hooks:ro".format(tamarin.get_hooks_dir()),
+                "-v", "{:s}:/tamarin/lib:ro".format(tamarin.get_lib_dir()),
+                "-v", "{:s}:/tamarin/profiles:ro".format(tamarin.get_profiles_dir()),
+                "-v", "{:s}:/tamarin/utils:ro".format(tamarin.get_utils_dir())
             ]
 
         # Use environment proxy if defined

profiles/eole-2.7.0.conf

@@ -1,30 +0,0 @@
-# Configuration générale du profil
-[profile]
-# Image Docker par défaut
-default_image=ubuntu:bionic
-
-# Configuration de l'étape de pré-construction du conteneur
-[containerbuild]
-hooks=
-  containerbuild/debian/install-build-essential,
-  containerbuild/debian/install-git,
-
-# Configuration de l'étape de pré-construction du paquet
-[prebuild]
-hooks=
-  prebuild/debian/copy-sources-to-workspace,
-  prebuild/debian/run-project-hooks,
-  prebuild/debian/load-project-db,
-  prebuild/debian/complete-project-db,
-  prebuild/eole/create-changelog,
-  prebuild/debian/install-build-depends
-
-# Configuration de l'étape de construction du paquet
-[build]
-hooks=build/debian/build
-
-# Configuration de l'étape de post-construction du paquet
-[postbuild]
-hooks=
-  postbuild/debian/run-project-hooks,
-  postbuild/debian/export-dist

profiles/eole-2.7.1.conf

@@ -17,6 +17,7 @@ hooks=
   prebuild/debian/load-project-db,
   prebuild/debian/complete-project-db,
   prebuild/eole/create-changelog,
+  prebuild/eole/add-package-version-suffix,
   prebuild/debian/install-build-depends
 
 # Configuration de l'étape de construction du paquet

profiles/eole-2.9.0.conf

@@ -1,31 +0,0 @@
-# Configuration générale du profil
-[profile]
-# Image Docker par défaut
-default_image=ubuntu:jammy
-
-# Configuration de l'étape de pré-construction du conteneur
-[containerbuild]
-hooks=
-  containerbuild/debian/install-build-essential,
-  containerbuild/debian/install-git,
-  containerbuild/eole-2.9.0/configure-additional-repository,
-
-# Configuration de l'étape de pré-construction du paquet
-[prebuild]
-hooks=
-  prebuild/debian/copy-sources-to-workspace,
-  prebuild/debian/run-project-hooks,
-  prebuild/debian/load-project-db,
-  prebuild/debian/complete-project-db,
-  prebuild/eole/create-changelog,
-  prebuild/debian/install-build-depends
-
-# Configuration de l'étape de construction du paquet
-[build]
-hooks=build/debian/build
-
-# Configuration de l'étape de post-construction du paquet
-[postbuild]
-hooks=
-  postbuild/debian/run-project-hooks,
-  postbuild/debian/export-dist

profiles/pypi-2.8.1.conf

@@ -7,7 +7,7 @@ default_image=ubuntu:focal
 [containerbuild]
 hooks=
   containerbuild/debian/install-build-essential,
-  containerbuild/debian/install-git,
+  containerbuild/ubuntu/install-stdeb,
 
 # Configuration de l'étape de pré-construction du paquet
 [prebuild]
@@ -15,16 +15,14 @@ hooks=
   prebuild/debian/copy-sources-to-workspace,
   prebuild/debian/run-project-hooks,
   prebuild/debian/load-project-db,
-  prebuild/debian/complete-project-db,
-  prebuild/eole/create-changelog,
-  prebuild/debian/install-build-depends
 
 # Configuration de l'étape de construction du paquet
 [build]
-hooks=build/debian/build
+hooks=build/stdeb/build
 
 # Configuration de l'étape de post-construction du paquet
 [postbuild]
 hooks=
   postbuild/debian/run-project-hooks,
   postbuild/debian/export-dist
+