Merge branch 'dev-2.2' into master

.gitignore

@@ -4,6 +4,14 @@ out/
 
 # Genie wrapper
 binsrc/genie-wrapper/genie
+binsrc/genie/*.dist-info
+binsrc/genie/argparse.py
+binsrc/genie/bin/
+binsrc/genie/contextlib2/
+binsrc/genie/nsenter/
+binsrc/genie/pathlib.py
+binsrc/genie/python_hosts/
+binsrc/out
 
 # Debian build intermediates
 

Makefile

@@ -64,11 +64,8 @@ internal-debian-package:
 	# Binaries.
 	mkdir -p "$(BINDIR)"
 	install -Dm 6755 -o root "binsrc/genie-wrapper/genie" -t "$(BINDIR)"
-	install -Dm 0755 -o root "binsrc/genie/genie" -t "$(INSTALLDIR)"
-	install -Dm 0755 -o root "binsrc/genie/runinwsl" -t "$(INSTALLDIR)"
-
-	# Requirements
-	install -Dm 0644 -o root "binsrc/genie/requirements.txt" -t "$(INSTALLDIR)"
+	install -Dm 0755 -o root "binsrc/out/genie" -t "$(INSTALLDIR)"
+	install -Dm 0755 -o root "binsrc/out/runinwsl" -t "$(INSTALLDIR)"
 
 	# Environment generator.
 	install -Dm 0755 -o root "othersrc/scripts/80-genie-envar.sh" -t "$(INSTALLDIR)"

binsrc/Makefile

@@ -5,11 +5,28 @@
 #
 # default target: build both for installation
 #
-build:
+build: build-wrapper build-runinwsl build-genie
+
+build-wrapper:
 	make -C genie-wrapper
 
+build-runinwsl:
+	python -m zipapp -o out/runinwsl -p "/usr/bin/env python3" -c runinwsl
+
+build-genie:
+	python -m pip install -r genie/requirements.txt --target genie
+	python -m zipapp -o out/genie -p "/usr/bin/env python3" -c genie
+
 #
 # clean: clean up after a build/package
 #
-clean:
+clean: clean-wrapper clean-runinwsl clean-genie
+
+clean-wrapper:
 	make -C genie-wrapper clean
+
+clean-runinwsl:
+	rm -f out/runinwsl
+
+clean-genie:
+	rm -f out/genie

binsrc/genie-wrapper/Makefile

@@ -14,4 +14,4 @@ all:
 #
 
 clean:
-	# rm genie
+	rm -f genie

binsrc/genie/genie → binsrc/genie/__main__.py

@@ -1,4 +1,4 @@
-#! /usr/bin/python3
+#! /usr/bin/env python3
 
 import argparse
 import configparser

binsrc/genie/requirements.txt

@@ -1,3 +1,3 @@
 nsenter>=0.2
-psutil>=5.9.0
 python_hosts>=1.0.1
+# psutil>=5.9.0 (should be handled by apt package)

binsrc/genie/runinwsl → binsrc/runinwsl/__main__.py

@@ -1,4 +1,4 @@
-#! /usr/bin/python3
+#! /usr/bin/env python3
 
 import os
 import subprocess

debian/changelog

@@ -1,3 +1,10 @@
+systemd-genie (2.2) buster bullseye bookworm sid focal bionic; urgency=medium
+
+        * Single-file package python scripts.
+        * Man page fixes.
+
+ -- Alistair Young <avatar@arkane-systems.net>  Mon, 28 Feb 2022 18:30:00 -0500
+
 systemd-genie (2.1) buster bullseye bookworm sid focal bionic; urgency=medium
 
         * Documentation updates.

debian/control

@@ -10,7 +10,7 @@ Vcs-Browser: https://github.com/arkane-systems/genie
 
 Package: systemd-genie
 Architecture: amd64
-Depends: ${misc:Depends}, ${shlibs:Depends}, dbus, policykit-1, daemonize, systemd (>= 232-25), python3 (>= 3.7), python3-pip, systemd-container (>= 232-25), gawk
+Depends: ${misc:Depends}, ${shlibs:Depends}, dbus, policykit-1, daemonize, systemd (>= 232-25), python3 (>= 3.7), python3-pip, python3-psutil, systemd-container (>= 232-25), gawk
 Description: quick way into a systemd "bottle" under Windows Subsystem for Linux
  Automates the process of starting up, entering into, and shutting down
  a container within which systemd is pid 1, effectively enabling the use

debian/systemd-genie.lintian-overrides

@@ -1,10 +1,2 @@
-# Needed for systemd
-# breakout-link usr/lib/systemd/system-environment-generators/80-genie-envar.sh -> usr/lib/genie/80-genie-envar.sh
-# breakout-link usr/lib/systemd/user-environment-generators/80-genie-envar.sh -> usr/lib/genie/80-genie-envar.sh
-
 # Must be setuid
 elevated-privileges usr/bin/genie 6755 root/root
-
-# Python should be more usual
-unusual-interpreter /usr/bin/python3 [usr/lib/genie/genie]
-unusual-interpreter /usr/bin/python3 [usr/lib/genie/runinwsl]