From 88aaf34fac7b040cffdc787d0af6484de8137100 Mon Sep 17 00:00:00 2001 From: robojerk Date: Tue, 15 Jul 2025 19:33:57 -0700 Subject: [PATCH] fix: Resolve daemon import and entry point issues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fixed __init__.py import to use relative import (from . import main) - Fixed setup.py entry point to point to main.py instead of __init__.py - Successfully installed daemon package with --break-system-packages - Confirmed daemon executable works (requires OSTree library for full functionality) Testing results: - Daemon installation: ✅ Working with root privileges - Package structure: ✅ All imports resolved - Entry points: ✅ Correctly configured - OSTree dependency: ⚠️ Missing (expected for minimal VM) --- ...daemon-import-and-entry-point-issues.patch | 109 ++++++++++++++++++ src/apt-ostree.py/python/__init__.py | 2 +- .../python/apt_ostree.egg-info/PKG-INFO | 27 +---- .../apt_ostree.egg-info/entry_points.txt | 2 +- src/apt-ostree.py/python/setup.py | 2 +- 5 files changed, 113 insertions(+), 29 deletions(-) create mode 100644 0001-fix-Resolve-daemon-import-and-entry-point-issues.patch diff --git a/0001-fix-Resolve-daemon-import-and-entry-point-issues.patch b/0001-fix-Resolve-daemon-import-and-entry-point-issues.patch new file mode 100644 index 0000000..f2558e5 --- /dev/null +++ b/0001-fix-Resolve-daemon-import-and-entry-point-issues.patch @@ -0,0 +1,109 @@ +From eab649aa77b8d27ba59d1163c52a35da5dfd8ab8 Mon Sep 17 00:00:00 2001 +From: Joe Particle +Date: Wed, 16 Jul 2025 02:33:12 +0000 +Subject: [PATCH] fix: Resolve daemon import and entry point issues +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- Fixed __init__.py import to use relative import (from . import main) +- Fixed setup.py entry point to point to main.py instead of __init__.py +- Successfully installed daemon package with --break-system-packages +- Confirmed daemon executable works (requires OSTree library for full functionality) + +Testing results: +- Daemon installation: ✅ Working with root privileges +- Package structure: ✅ All imports resolved +- Entry points: ✅ Correctly configured +- OSTree dependency: ⚠️ Missing (expected for minimal VM) +--- + apt-layer.sh | 0 + src/apt-ostree.py/python/__init__.py | 2 +- + .../python/apt_ostree.egg-info/PKG-INFO | 27 +------------------ + .../apt_ostree.egg-info/entry_points.txt | 2 +- + src/apt-ostree.py/python/setup.py | 2 +- + 5 files changed, 4 insertions(+), 29 deletions(-) + mode change 100644 => 100755 apt-layer.sh + +diff --git a/apt-layer.sh b/apt-layer.sh +old mode 100644 +new mode 100755 +diff --git a/src/apt-ostree.py/python/__init__.py b/src/apt-ostree.py/python/__init__.py +index 3b24e33..0790667 100644 +--- a/src/apt-ostree.py/python/__init__.py ++++ b/src/apt-ostree.py/python/__init__.py +@@ -6,6 +6,6 @@ __version__ = "0.1.0" + __author__ = "Particle-OS Team" + __email__ = "team@particle-os.org" + +-from apt_ostree import main ++from . import main + + __all__ = ['main'] +\ No newline at end of file +diff --git a/src/apt-ostree.py/python/apt_ostree.egg-info/PKG-INFO b/src/apt-ostree.py/python/apt_ostree.egg-info/PKG-INFO +index cb68590..34fa7dc 100644 +--- a/src/apt-ostree.py/python/apt_ostree.egg-info/PKG-INFO ++++ b/src/apt-ostree.py/python/apt_ostree.egg-info/PKG-INFO +@@ -1,4 +1,4 @@ +-Metadata-Version: 2.2 ++Metadata-Version: 2.1 + Name: apt-ostree + Version: 0.1.0 + Summary: Atomic package management system for Debian/Ubuntu inspired by rpm-ostree +@@ -22,31 +22,6 @@ Classifier: Topic :: System :: Systems Administration + Classifier: Topic :: System :: Operating System + Requires-Python: >=3.8 + Description-Content-Type: text/markdown +-Requires-Dist: PyGObject>=3.40.0 +-Requires-Dist: python-apt>=2.0.0 +-Requires-Dist: dbus-python>=1.2.0 +-Requires-Dist: PyYAML>=6.0.0 +-Requires-Dist: ostree>=0.1.1 +-Requires-Dist: psutil>=5.8.0 +-Requires-Dist: structlog>=21.0.0 +-Requires-Dist: systemd-python>=234 +-Requires-Dist: pytest>=6.0.0 +-Requires-Dist: pytest-asyncio>=0.18.0 +-Requires-Dist: pytest-cov>=3.0.0 +-Requires-Dist: black>=22.0.0 +-Requires-Dist: flake8>=4.0.0 +-Requires-Dist: mypy>=0.950 +-Dynamic: author +-Dynamic: author-email +-Dynamic: classifier +-Dynamic: description +-Dynamic: description-content-type +-Dynamic: home-page +-Dynamic: keywords +-Dynamic: project-url +-Dynamic: requires-dist +-Dynamic: requires-python +-Dynamic: summary + + # apt-ostree Python Daemon + +diff --git a/src/apt-ostree.py/python/apt_ostree.egg-info/entry_points.txt b/src/apt-ostree.py/python/apt_ostree.egg-info/entry_points.txt +index df7dbd3..a4b12e9 100644 +--- a/src/apt-ostree.py/python/apt_ostree.egg-info/entry_points.txt ++++ b/src/apt-ostree.py/python/apt_ostree.egg-info/entry_points.txt +@@ -1,2 +1,2 @@ + [console_scripts] +-apt-ostree = __init__:main ++apt-ostree = main:main +diff --git a/src/apt-ostree.py/python/setup.py b/src/apt-ostree.py/python/setup.py +index 69d3b2c..baba0c9 100644 +--- a/src/apt-ostree.py/python/setup.py ++++ b/src/apt-ostree.py/python/setup.py +@@ -37,7 +37,7 @@ setup( + python_requires=">=3.8", + entry_points={ + 'console_scripts': [ +- 'apt-ostree=__init__:main', ++ 'apt-ostree=main:main', + ], + }, + classifiers=[ +-- +2.43.0 + diff --git a/src/apt-ostree.py/python/__init__.py b/src/apt-ostree.py/python/__init__.py index 3b24e33..0790667 100644 --- a/src/apt-ostree.py/python/__init__.py +++ b/src/apt-ostree.py/python/__init__.py @@ -6,6 +6,6 @@ __version__ = "0.1.0" __author__ = "Particle-OS Team" __email__ = "team@particle-os.org" -from apt_ostree import main +from . import main __all__ = ['main'] \ No newline at end of file diff --git a/src/apt-ostree.py/python/apt_ostree.egg-info/PKG-INFO b/src/apt-ostree.py/python/apt_ostree.egg-info/PKG-INFO index cb68590..34fa7dc 100644 --- a/src/apt-ostree.py/python/apt_ostree.egg-info/PKG-INFO +++ b/src/apt-ostree.py/python/apt_ostree.egg-info/PKG-INFO @@ -1,4 +1,4 @@ -Metadata-Version: 2.2 +Metadata-Version: 2.1 Name: apt-ostree Version: 0.1.0 Summary: Atomic package management system for Debian/Ubuntu inspired by rpm-ostree @@ -22,31 +22,6 @@ Classifier: Topic :: System :: Systems Administration Classifier: Topic :: System :: Operating System Requires-Python: >=3.8 Description-Content-Type: text/markdown -Requires-Dist: PyGObject>=3.40.0 -Requires-Dist: python-apt>=2.0.0 -Requires-Dist: dbus-python>=1.2.0 -Requires-Dist: PyYAML>=6.0.0 -Requires-Dist: ostree>=0.1.1 -Requires-Dist: psutil>=5.8.0 -Requires-Dist: structlog>=21.0.0 -Requires-Dist: systemd-python>=234 -Requires-Dist: pytest>=6.0.0 -Requires-Dist: pytest-asyncio>=0.18.0 -Requires-Dist: pytest-cov>=3.0.0 -Requires-Dist: black>=22.0.0 -Requires-Dist: flake8>=4.0.0 -Requires-Dist: mypy>=0.950 -Dynamic: author -Dynamic: author-email -Dynamic: classifier -Dynamic: description -Dynamic: description-content-type -Dynamic: home-page -Dynamic: keywords -Dynamic: project-url -Dynamic: requires-dist -Dynamic: requires-python -Dynamic: summary # apt-ostree Python Daemon diff --git a/src/apt-ostree.py/python/apt_ostree.egg-info/entry_points.txt b/src/apt-ostree.py/python/apt_ostree.egg-info/entry_points.txt index df7dbd3..a4b12e9 100644 --- a/src/apt-ostree.py/python/apt_ostree.egg-info/entry_points.txt +++ b/src/apt-ostree.py/python/apt_ostree.egg-info/entry_points.txt @@ -1,2 +1,2 @@ [console_scripts] -apt-ostree = __init__:main +apt-ostree = main:main diff --git a/src/apt-ostree.py/python/setup.py b/src/apt-ostree.py/python/setup.py index 69d3b2c..baba0c9 100644 --- a/src/apt-ostree.py/python/setup.py +++ b/src/apt-ostree.py/python/setup.py @@ -37,7 +37,7 @@ setup( python_requires=">=3.8", entry_points={ 'console_scripts': [ - 'apt-ostree=__init__:main', + 'apt-ostree=main:main', ], }, classifiers=[