From 0882b3e44e29408c7e296f0aab3a613facf344f8 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 14 May 2021 13:22:09 +0000 Subject: [PATCH] python-daemon: Port to Python 3 Signed-off-by: Michael Tremer --- config/rootfiles/common/python-daemon | 19 ------------------- config/rootfiles/common/python3-daemon | 14 ++++++++++++++ lfs/{python-daemon => python3-daemon} | 2 +- make.sh | 2 +- 4 files changed, 16 insertions(+), 21 deletions(-) delete mode 100644 config/rootfiles/common/python-daemon create mode 100644 config/rootfiles/common/python3-daemon rename lfs/{python-daemon => python3-daemon} (98%) diff --git a/config/rootfiles/common/python-daemon b/config/rootfiles/common/python-daemon deleted file mode 100644 index 34d36a463d..0000000000 --- a/config/rootfiles/common/python-daemon +++ /dev/null @@ -1,19 +0,0 @@ -#usr/lib/python2.7/site-packages/daemon -usr/lib/python2.7/site-packages/daemon/__init__.py -usr/lib/python2.7/site-packages/daemon/__init__.pyc -usr/lib/python2.7/site-packages/daemon/_metadata.py -usr/lib/python2.7/site-packages/daemon/_metadata.pyc -usr/lib/python2.7/site-packages/daemon/daemon.py -usr/lib/python2.7/site-packages/daemon/daemon.pyc -usr/lib/python2.7/site-packages/daemon/pidfile.py -usr/lib/python2.7/site-packages/daemon/pidfile.pyc -usr/lib/python2.7/site-packages/daemon/runner.py -usr/lib/python2.7/site-packages/daemon/runner.pyc -#usr/lib/python2.7/site-packages/python_daemon-2.1.1-py2.7.egg-info -#usr/lib/python2.7/site-packages/python_daemon-2.1.1-py2.7.egg-info/PKG-INFO -#usr/lib/python2.7/site-packages/python_daemon-2.1.1-py2.7.egg-info/SOURCES.txt -#usr/lib/python2.7/site-packages/python_daemon-2.1.1-py2.7.egg-info/dependency_links.txt -#usr/lib/python2.7/site-packages/python_daemon-2.1.1-py2.7.egg-info/not-zip-safe -#usr/lib/python2.7/site-packages/python_daemon-2.1.1-py2.7.egg-info/requires.txt -#usr/lib/python2.7/site-packages/python_daemon-2.1.1-py2.7.egg-info/top_level.txt -#usr/lib/python2.7/site-packages/python_daemon-2.1.1-py2.7.egg-info/version_info.json diff --git a/config/rootfiles/common/python3-daemon b/config/rootfiles/common/python3-daemon new file mode 100644 index 0000000000..653dee7d4f --- /dev/null +++ b/config/rootfiles/common/python3-daemon @@ -0,0 +1,14 @@ +#usr/lib/python3.8/site-packages/daemon +usr/lib/python3.8/site-packages/daemon/__init__.py +usr/lib/python3.8/site-packages/daemon/_metadata.py +usr/lib/python3.8/site-packages/daemon/daemon.py +usr/lib/python3.8/site-packages/daemon/pidfile.py +usr/lib/python3.8/site-packages/daemon/runner.py +#usr/lib/python3.8/site-packages/python_daemon-2.1.1-py3.8.egg-info +#usr/lib/python3.8/site-packages/python_daemon-2.1.1-py3.8.egg-info/PKG-INFO +#usr/lib/python3.8/site-packages/python_daemon-2.1.1-py3.8.egg-info/SOURCES.txt +#usr/lib/python3.8/site-packages/python_daemon-2.1.1-py3.8.egg-info/dependency_links.txt +#usr/lib/python3.8/site-packages/python_daemon-2.1.1-py3.8.egg-info/not-zip-safe +#usr/lib/python3.8/site-packages/python_daemon-2.1.1-py3.8.egg-info/requires.txt +#usr/lib/python3.8/site-packages/python_daemon-2.1.1-py3.8.egg-info/top_level.txt +#usr/lib/python3.8/site-packages/python_daemon-2.1.1-py3.8.egg-info/version_info.json diff --git a/lfs/python-daemon b/lfs/python3-daemon similarity index 98% rename from lfs/python-daemon rename to lfs/python3-daemon index e834f30fd8..8f0876ff7c 100644 --- a/lfs/python-daemon +++ b/lfs/python3-daemon @@ -70,6 +70,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && python setup.py install --root=/ + cd $(DIR_APP) && python3 setup.py install --root=/ @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/make.sh b/make.sh index b98f8a34b0..60474a18eb 100755 --- a/make.sh +++ b/make.sh @@ -1347,7 +1347,7 @@ buildipfire() { lfsmake2 python-setuptools lfsmake2 python3-inotify lfsmake2 python-docutils - lfsmake2 python-daemon + lfsmake2 python3-daemon lfsmake2 glib lfsmake2 ntp lfsmake2 openssh -- 2.39.5