Skip to content

Commit

Permalink
Use install command to ensure proper permissions
Browse files Browse the repository at this point in the history 
Signed-off-by: Ryan Bottriell <rbottriell@ilm.com>
  • Loading branch information
@rydrman
rydrman committed Mar 12, 2024
1 parent 125337d commit 4268f4a
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Makefile.linux
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,16 @@ install-dirs:
copy-debug: copy-debug-spfs copy-debug-spk

copy-debug-spfs: debug-spfs install-dirs
sudo cp -f $(CARGO_TARGET_DIR)/debug/spfs* '$(DESTDIR)$(bindir)'
for bin in $(CARGO_TARGET_DIR)/debug/spfs*; do sudo install -p -m 755 $$bin '$(DESTDIR)$(bindir)'; done

copy-debug-spk: debug install-dirs
sudo cp -f $(CARGO_TARGET_DIR)/debug/spk '$(DESTDIR)$(bindir)'
sudo install -p -m 755 $(CARGO_TARGET_DIR)/debug/spk '$(DESTDIR)$(bindir)'

copy-release: release install-dirs
sudo cp -f $(CARGO_TARGET_DIR)/release/spk $(CARGO_TARGET_DIR)/release/spfs* '$(DESTDIR)$(bindir)'
sudo install -p -m 755 $(CARGO_TARGET_DIR)/release/spk '$(DESTDIR)$(bindir)'

This comment has been minimized.

Sign in to view

Copy link
@jrray

jrray Jun 11, 2024

Collaborator

This change made it stop installing spfs when using make install. Was this intentional?

2+ hours of my life I won't get back doing a git bisect and not actually testing the builds...

This comment has been minimized.

Sign in to view

Copy link
@rydrman

rydrman Jun 15, 2024

Author Collaborator

oof, sorry! I think I meant to add copy-spfs as a prerequisite to this one during the change...

copy-spfs: release-spfs install-dirs
sudo cp -f $(CARGO_TARGET_DIR)/release/spfs* '$(DESTDIR)$(bindir)'
for bin in $(CARGO_TARGET_DIR)/release/spfs*; do sudo install -p -m 755 $$bin '$(DESTDIR)$(bindir)'; done

setcap:
sudo setcap 'cap_dac_override,cap_fowner+ep' '$(DESTDIR)$(bindir)/spfs-clean'
Expand Down

0 comments on commit 4268f4a

Please sign in to comment.