particle-os/apt-ostree
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

fix: make external file installations conditional in debian/rules
Some checks failed
Comprehensive CI/CD Pipeline / Build and Test (push) Failing after 3m10s
Details
Comprehensive CI/CD Pipeline / Security Audit (push) Failing after 7s
Details
Comprehensive CI/CD Pipeline / Package Validation (push) Successful in 37s
Details
Comprehensive CI/CD Pipeline / Status Report (push) Has been skipped
Details

Browse source 
- Add conditional checks for external debian-atomic-files directory
- Prevent CI build failures when external files are missing
- Gracefully skip missing files with warning messages
- Maintain full functionality when external files are available
- Resolves CI build failure: 'cannot stat ../debian-atomic-files/...'
This commit is contained in:
robojerk 2025-09-01 22:35:33 -07:00
parent f6420e5903
commit 776c83e8bb
1 changed files with 50 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

51
debian/rules vendored
View file

@ -111,9 +111,14 @@ override_dh_auto_install:
debian/apt-ostree/lib/systemd/system/apt-ostreed-automatic.service
install -D -m 644 src/daemon/apt-ostreed-automatic.timer \
debian/apt-ostree/lib/systemd/system/apt-ostreed-automatic.timer
# Install fix-shadow-mode service from debian-atomic-files
# Install fix-shadow-mode service from debian-atomic-files (if available)
@if [ -f "../debian-atomic-files/apt-ostree-systemd/systemd/system/apt-ostree-fix-shadow-mode.service" ]; then \
install -D -m 644 ../debian-atomic-files/apt-ostree-systemd/systemd/system/apt-ostree-fix-shadow-mode.service \
debian/apt-ostree/lib/systemd/system/apt-ostree-fix-shadow-mode.service
debian/apt-ostree/lib/systemd/system/apt-ostree-fix-shadow-mode.service; \
echo "Installed apt-ostree-fix-shadow-mode.service"; \
else \
echo "Warning: apt-ostree-fix-shadow-mode.service not found, skipping"; \
fi
# Check and install polkit policy
@if [ ! -f "daemon/polkit/apt-ostree.policy" ]; then \
@ -134,26 +139,56 @@ override_dh_auto_install:
# Install kernel integration files
@echo "Installing kernel integration files..."
mkdir -p debian/apt-ostree/usr/lib/kernel/install.d
@if [ -f "../debian-atomic-files/apt-ostree-systemd/kernel/install.d/05-aptostree.install" ]; then \
install -D -m 644 ../debian-atomic-files/apt-ostree-systemd/kernel/install.d/05-aptostree.install \
debian/apt-ostree/usr/lib/kernel/install.d/05-aptostree.install
debian/apt-ostree/usr/lib/kernel/install.d/05-aptostree.install; \
echo "Installed kernel install hook"; \
else \
echo "Warning: kernel install hook not found, skipping"; \
fi
@if [ -f "../debian-atomic-files/apt-ostree-systemd/kernel/install.conf" ]; then \
install -D -m 644 ../debian-atomic-files/apt-ostree-systemd/kernel/install.conf \
debian/apt-ostree/usr/lib/kernel/install.conf
debian/apt-ostree/usr/lib/kernel/install.conf; \
echo "Installed kernel install config"; \
else \
echo "Warning: kernel install config not found, skipping"; \
fi
# Install tmpfiles configuration
@echo "Installing tmpfiles configuration..."
mkdir -p debian/apt-ostree/usr/lib/tmpfiles.d
@if [ -f "../debian-atomic-files/apt-ostree-systemd/tmpfiles.d/apt-ostree-0-integration.conf" ]; then \
install -D -m 644 ../debian-atomic-files/apt-ostree-systemd/tmpfiles.d/apt-ostree-0-integration.conf \
debian/apt-ostree/usr/lib/tmpfiles.d/apt-ostree-0-integration.conf
debian/apt-ostree/usr/lib/tmpfiles.d/apt-ostree-0-integration.conf; \
echo "Installed tmpfiles integration config"; \
else \
echo "Warning: tmpfiles integration config not found, skipping"; \
fi
@if [ -f "../debian-atomic-files/apt-ostree-systemd/tmpfiles.d/apt-ostree-0-integration-opt-usrlocal.conf" ]; then \
install -D -m 644 ../debian-atomic-files/apt-ostree-systemd/tmpfiles.d/apt-ostree-0-integration-opt-usrlocal.conf \
debian/apt-ostree/usr/lib/tmpfiles.d/apt-ostree-0-integration-opt-usrlocal.conf
debian/apt-ostree/usr/lib/tmpfiles.d/apt-ostree-0-integration-opt-usrlocal.conf; \
echo "Installed tmpfiles usrlocal config"; \
else \
echo "Warning: tmpfiles usrlocal config not found, skipping"; \
fi
@if [ -f "../debian-atomic-files/apt-ostree-systemd/tmpfiles.d/apt-ostree-0-integration-opt-usrlocal-compat.conf" ]; then \
install -D -m 644 ../debian-atomic-files/apt-ostree-systemd/tmpfiles.d/apt-ostree-0-integration-opt-usrlocal-compat.conf \
debian/apt-ostree/usr/lib/tmpfiles.d/apt-ostree-0-integration-opt-usrlocal-compat.conf
debian/apt-ostree/usr/lib/tmpfiles.d/apt-ostree-0-integration-opt-usrlocal-compat.conf; \
echo "Installed tmpfiles usrlocal compat config"; \
else \
echo "Warning: tmpfiles usrlocal compat config not found, skipping"; \
fi
# Install D-Bus policy configuration
@echo "Installing D-Bus policy configuration..."
mkdir -p debian/apt-ostree/usr/share/dbus-1/system.d
@if [ -f "../debian-atomic-files/apt-ostree-systemd/org.debian.aptostree1.conf" ]; then \
install -D -m 644 ../debian-atomic-files/apt-ostree-systemd/org.debian.aptostree1.conf \
debian/apt-ostree/usr/share/dbus-1/system.d/org.debian.aptostree1.conf
debian/apt-ostree/usr/share/dbus-1/system.d/org.debian.aptostree1.conf; \
echo "Installed D-Bus policy config"; \
else \
echo "Warning: D-Bus policy config not found, skipping"; \
fi
# Create additional directories
mkdir -p debian/apt-ostree/usr/share/doc/apt-ostree