Commit 98722483 authored by nextime's avatar nextime

Fix wsssh-server Debian package build issues

- Removed redundant debian/compat file (compatibility level already specified in control)
- Fixed debhelper compatibility conflict error
- Modified debian/rules to reuse existing wssshd binary from dist/ directory
- Updated override_dh_auto_build to check for existing binary and copy instead of rebuild
- Modified override_dh_auto_clean to preserve dist directory
- Eliminates unnecessary rebuilds and improves build efficiency
- Resolves both compatibility and binary reuse issues
parent f42ff1ee
13
\ No newline at end of file
...@@ -88,9 +88,15 @@ override_dh_auto_configure: ...@@ -88,9 +88,15 @@ override_dh_auto_configure:
@echo ')' >> wssshd.spec @echo ')' >> wssshd.spec
override_dh_auto_build: override_dh_auto_build:
# Build PyInstaller binary # Check if wssshd binary already exists in dist directory
pip3 install pyinstaller if [ -f ../dist/wssshd ]; then \
pyinstaller --clean --onefile wssshd.spec echo "Using existing wssshd binary from ../dist/wssshd"; \
cp ../dist/wssshd dist/wssshd; \
else \
echo "Building PyInstaller binary"; \
pip3 install pyinstaller; \
pyinstaller --clean --onefile wssshd.spec; \
fi
override_dh_auto_install: override_dh_auto_install:
# Install PyInstaller binary # Install PyInstaller binary
...@@ -118,5 +124,6 @@ override_dh_auto_install: ...@@ -118,5 +124,6 @@ override_dh_auto_install:
mkdir -p debian/wsssh-server/etc/wssshd mkdir -p debian/wsssh-server/etc/wssshd
override_dh_auto_clean: override_dh_auto_clean:
rm -rf build dist *.spec rm -rf build *.spec
# Don't clean dist directory to preserve existing wssshd binary
dh_auto_clean dh_auto_clean
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment