Skip to content

Commit

Permalink
Allow to configure sbin path (RRZE-HPC#449)
Browse files Browse the repository at this point in the history
  • Loading branch information
ho-ob authored Mar 3, 2022
1 parent 4a8766f commit b99cf24
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 14 deletions.
20 changes: 10 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -399,19 +399,19 @@ endif
ifeq ($(BUILDFREQ),true)
ifneq ($(COMPILER),MIC)
install_freq:
@echo "===> INSTALL setFrequencies tool to $(PREFIX)/sbin/$(FREQ_TARGET)"
@mkdir -p $(PREFIX)/sbin
@install -m 4755 $(INSTALL_CHOWN) $(FREQ_TARGET) $(PREFIX)/sbin/$(FREQ_TARGET)
@echo "===> INSTALL setFrequencies tool to $(SBINPREFIX)/$(FREQ_TARGET)"
@mkdir -p $(SBINPREFIX)
@install -m 4755 $(INSTALL_CHOWN) $(FREQ_TARGET) $(SBINPREFIX)/$(FREQ_TARGET)
move_freq:
@echo "===> MOVE setFrequencies tool from $(PREFIX)/sbin/$(FREQ_TARGET) to $(INSTALLED_PREFIX)/sbin/$(FREQ_TARGET)"
@mkdir -p $(INSTALLED_PREFIX)/sbin
@install -m 4755 $(INSTALL_CHOWN) $(PREFIX)/sbin/$(FREQ_TARGET) $(INSTALLED_PREFIX)/sbin/$(FREQ_TARGET)
@echo "===> MOVE setFrequencies tool from $(SBINPREFIX)/$(FREQ_TARGET) to $(INSTALLED_SBINPREFIX)/$(FREQ_TARGET)"
@mkdir -p $(INSTALLED_SBINPREFIX)
@install -m 4755 $(INSTALL_CHOWN) $(SBINPREFIX)/$(FREQ_TARGET) $(INSTALLED_SBINPREFIX)/$(FREQ_TARGET)
uninstall_freq:
@echo "===> REMOVING setFrequencies tool from $(PREFIX)/sbin/$(FREQ_TARGET)"
@rm -f $(PREFIX)/sbin/$(FREQ_TARGET)
@echo "===> REMOVING setFrequencies tool from $(SBINPREFIX)/$(FREQ_TARGET)"
@rm -f $(SBINPREFIX)/$(FREQ_TARGET)
uninstall_freq_moved:
@echo "===> REMOVING setFrequencies tool from $(INSTALLED_PREFIX)/sbin/$(FREQ_TARGET)"
@rm -f $(INSTALLED_PREFIX)/sbin/$(FREQ_TARGET)
@echo "===> REMOVING setFrequencies tool from $(INSTALLED_SBINPREFIX)/$(FREQ_TARGET)"
@rm -f $(INSTALLED_SBINPREFIX)/$(FREQ_TARGET)
else
install_freq:
@echo "===> No INSTALL of setFrequencies tool"
Expand Down
10 changes: 6 additions & 4 deletions config.mk
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ COLOR = BLUE#NO SPACE
# Some path definitions
MANPREFIX = $(PREFIX)/man#NO SPACE
BINPREFIX = $(PREFIX)/bin#NO SPACE
SBINPREFIX = $(PREFIX)/sbin#NO SPACE
LIBPREFIX = $(PREFIX)/lib#NO SPACE

# These paths are hardcoded into executables and libraries. Usually
Expand All @@ -56,21 +57,22 @@ LIBPREFIX = $(PREFIX)/lib#NO SPACE
# the INTSTALLED_PREFIX
INSTALLED_PREFIX ?= $(PREFIX)#NO SPACE
INSTALLED_BINPREFIX = $(INSTALLED_PREFIX)/bin#NO SPACE
INSTALLED_SBINPREFIX = $(INSTALLED_PREFIX)/sbin#NO SPACE
INSTALLED_LIBPREFIX = $(INSTALLED_PREFIX)/lib#NO SPACE

# Build the accessDaemon. Have a look in the WIKI for details.
BUILDDAEMON = true#NO SPACE
# For the daemon based secure msr/pci access configure
# the absolute path to the msr daemon executable.
ACCESSDAEMON = $(PREFIX)/sbin/likwid-accessD#NO SPACE
INSTALLED_ACCESSDAEMON = $(INSTALLED_PREFIX)/sbin/likwid-accessD#NO SPACE
ACCESSDAEMON = $(SBINPREFIX)/likwid-accessD#NO SPACE
INSTALLED_ACCESSDAEMON = $(INSTALLED_SBINPREFIX)/likwid-accessD#NO SPACE

# Build the setFrequencies daemon to allow users setting the CPU and Uncore
# frequency
BUILDFREQ = true#NO SPACE
# Paths for frequencie deaemon after installation
FREQDAEMON = $(PREFIX)/sbin/likwid-setFreq#NO SPACE
INSTALLED_FREQDAEMON = $(INSTALLED_PREFIX)/sbin/likwid-setFreq#NO SPACE
FREQDAEMON = $(SBINPREFIX)/likwid-setFreq#NO SPACE
INSTALLED_FREQDAEMON = $(INSTALLED_SBINPREFIX)/likwid-setFreq#NO SPACE

# Build the appDaemon. It's not really a daemon but an LD_PRELOAD library
# It is required to get access to the application context.
Expand Down

0 comments on commit b99cf24

Please sign in to comment.