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

2021-08-10 12:28:40 +02:00
9 changed files with 39 additions and 86 deletions
--- a/hooks/build/stdeb/build
+++ b/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   
--- a/hooks/containerbuild/debian/install-letsencrypt-ca
+++ b/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

--- a/hooks/containerbuild/ubuntu/install-stdeb
+++ b/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
+
--- a/hooks/prebuild/eole/create-changelog
+++ b/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
 }

--- a/12
+++ b/12
@ -108,16 +108,16 @@ if __name__ == "__main__":

        # volumes definition
        docker_args += [
-            "-v", "{:s}:/src:z,ro".format(project_dir),
-            "-v", "{:s}:/dist:z".format(output_dir),
+            "-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()),
-                "-v", "{:s}:/tamarin/lib:z,ro".format(tamarin.get_lib_dir()),
-                "-v", "{:s}:/tamarin/profiles:z,ro".format(tamarin.get_profiles_dir()),
-                "-v", "{:s}:/tamarin/utils:z,ro".format(tamarin.get_utils_dir())
+                "-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
--- a/profiles/eole-2.7.0.conf
+++ b/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
--- a/profiles/eole-2.7.1.conf
+++ b/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
--- a/profiles/eole-2.9.0.conf
+++ b/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
--- a/profiles/pypi-2.8.1.conf
+++ b/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
+