From 2279c92f2b71a26f54e17abcd42f99b69d56010f Mon Sep 17 00:00:00 2001 From: Nav Date: Wed, 18 Jan 2023 22:00:11 +0000 Subject: [PATCH] Changed udev rules installation path to `/lib/udev/rules.d` in DEB package, as that's what Debian based systems expect. --- README.md | 2 ++ build/packaging/deb/package-deb.sh.in | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index aed2a7a8..5ba62cbc 100644 --- a/README.md +++ b/README.md @@ -119,3 +119,5 @@ sudo cmake --install ./ --prefix [SOME_OTHER_INSTALLATION_DIR]; 2. Update Bloom's RUNPATH (with a tool like `patchelf`) - Once you've installed Bloom, you'll need to create a symlink to Bloom's binary, in `/usr/bin/`, to run `bloom` without having to supply the full path: `sudo ln -s /opt/bloom/bin/bloom /usr/bin/;` +- If you're installing on Ubuntu 20.04 or older, you may need to move the installed udev rules, as they're expected + to reside in `/lib/udev/rules.d` on those systems. Move them via: `sudo mv /usr/lib/udev/rules.d/99-bloom.rules /lib/udev/rules.d/;` diff --git a/build/packaging/deb/package-deb.sh.in b/build/packaging/deb/package-deb.sh.in index 1f6fde7e..24fa1150 100644 --- a/build/packaging/deb/package-deb.sh.in +++ b/build/packaging/deb/package-deb.sh.in @@ -19,7 +19,7 @@ mkdir -p ${DEBIAN_DIR}; mkdir -p ${BLOOM_INSTALLATION_DIR}; mkdir -p ${BLOOM_INSTALLATION_DIR}/bin; -mkdir -p ${PLAYGROUND_DIR}/usr/lib/udev/rules.d/; +mkdir -p ${PLAYGROUND_DIR}/lib/udev/rules.d/; mkdir -p ${PLAYGROUND_DIR}/usr/bin/; echo "Copying Debian control file..."; @@ -37,7 +37,7 @@ cp -a @CMAKE_CURRENT_SOURCE_DIR@/build/distributed/bin/lib ${BLOOM_INSTALLATION_ cp -a @CMAKE_CURRENT_SOURCE_DIR@/build/distributed/bin/plugins ${BLOOM_INSTALLATION_DIR}/; echo "Copying udev rules..."; -cp -a @CMAKE_CURRENT_SOURCE_DIR@/build/distributed/udevrules/99-bloom.rules ${PLAYGROUND_DIR}/usr/lib/udev/rules.d/; +cp -a @CMAKE_CURRENT_SOURCE_DIR@/build/distributed/udevrules/99-bloom.rules ${PLAYGROUND_DIR}/lib/udev/rules.d/; echo "Adjusting permissions..."; chmod u=rwx,g=rx,o=rx -R ${BLOOM_INSTALLATION_DIR}/bin/; @@ -46,7 +46,7 @@ chmod u=rwx,g=rx,o=rx -R ${BLOOM_INSTALLATION_DIR}/plugins/; chmod u=rwX,g=rX,o=rX -R ${BLOOM_INSTALLATION_DIR}/resources/; -chmod u=rw,g=r,o=r ${PLAYGROUND_DIR}/usr/lib/udev/rules.d/99-bloom.rules; +chmod u=rw,g=r,o=r ${PLAYGROUND_DIR}/lib/udev/rules.d/99-bloom.rules; echo "Creating symbolic link for Bloom binary..." ln -s -f ${BLOOM_INSTALLATION_PREFIX}./bin/bloom ${PLAYGROUND_DIR}/usr/bin/;