Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:fstrba:argonone
argononed
0003-Add-DESTDIR-in-order-to-be-able-to-use-in-...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0003-Add-DESTDIR-in-order-to-be-able-to-use-in-rpm-build.patch of Package argononed
From e438e58fb1343096a44c471d449f08ce6a3b306b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch> Date: Mon, 26 Jul 2021 12:44:51 +0200 Subject: [PATCH 3/4] Add DESTDIR in order to be able to use in rpm build --- makefile | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/makefile b/makefile index 78f7dac..594251e 100644 --- a/makefile +++ b/makefile @@ -19,6 +19,7 @@ OVERLAY = argonone.dtbo GCCVER = $(shell expr `gcc -dumpversion | cut -f1 -d.` \>= 10) USERID = $(shell id -u) LOGLEVEL = 5 +DESTDIR ?= -include makefile.conf ifndef BOOTLOC @@ -66,8 +67,10 @@ endif ifeq (install,$(findstring install, $(MAKECMDGOALS))) ifneq ($(USERID), 0) +ifeq ($(DESTDIR),) $(error "(Un)Installing requires elevated privileges") endif +endif ifeq ($(PACKAGESYS),ENABLED) $(error "(Un)Installing Not supported with Package System") endif @@ -87,7 +90,7 @@ endif build/%.o: src/%.c @echo "Compile $<" - $(CC) -c -o $@ $< $(CFLAGS) -DLOG_LEVEL=$(LOGLEVEL) + $(CC) -c -o $@ $< $(CFLAGS) -DLOG_LEVEL=$(LOGLEVEL) $(BIN_DAEMON): $(OBJ_DAEMON) @echo "Build $(BIN_DAEMON)" @@ -97,7 +100,7 @@ $(BIN_SHUTDOWN): $(OBJ_SHUTDOWN) @echo "Build $(BIN_SHUTDOWN)" $(CC) -o build/$(BIN_SHUTDOWN) $^ $(CFLAGS) -$(BIN_CLI): $(OBJ_CLI) +$(BIN_CLI): $(OBJ_CLI) @echo "Build $(BIN_CLI)" $(CC) -o build/$(BIN_CLI) $^ $(CFLAGS) -DLOG_LEVEL=$(LOGLEVEL) $(LFLAGS3) @@ -129,9 +132,9 @@ ifndef OVERRIDE_INSTALL_DAEMON .PHONY: install-daemon install-daemon: @echo -n "Installing daemon " - @$(INSTALL) build/$(BIN_DAEMON) $(PREFIX)/sbin/$(BIN_DAEMON) 2>/dev/null && echo "Successful" || { echo "Failed"; true; } + @$(INSTALL) -D build/$(BIN_DAEMON) $(DESTDIR)$(PREFIX)/sbin/$(BIN_DAEMON) 2>/dev/null && echo "Successful" || { echo "Failed"; true; } ifeq ($(LOGROTATE),1) - @$(INSTALL) -m 600 OS/_common/argononed.logrotate /etc/logrotate.d/argononed + @$(INSTALL) -Dm 600 OS/_common/argononed.logrotate $(DESTDIR)/etc/logrotate.d/argononed endif endif @@ -139,10 +142,10 @@ ifndef OVERRIDE_INSTALL_CLI .PHONY: install-cli install-cli: @echo -n "Installing CLI " - @$(INSTALL) -m 0755 build/$(BIN_CLI) $(PREFIX)/bin/$(BIN_CLI) 2>/dev/null && echo "Successful" || { echo "Failed"; true; } + @$(INSTALL) -Dm 0755 build/$(BIN_CLI) $(DESTDIR)$(PREFIX)/bin/$(BIN_CLI) 2>/dev/null && echo "Successful" || { echo "Failed"; true; } ifeq ($(AUTOCOMP), 1) @echo -n "Installing CLI autocomplete for bash " - @$(INSTALL) -m 755 OS/_common/argonone-cli-complete.bash /etc/bash_completion.d/argonone-cli 2>/dev/null && echo "Successful" || { echo "Failed"; true; } + @$(INSTALL) -Dm 755 OS/_common/argonone-cli-complete.bash $(DESTDIR)/etc/bash_completion.d/argonone-cli 2>/dev/null && echo "Successful" || { echo "Failed"; true; } endif endif @@ -150,18 +153,21 @@ ifndef OVERRIDE_INSTALL_OVERLAY .PHONY: install-overlay install-overlay: @echo -n "Installing overlay " - @$(INSTALL) build/argonone.dtbo $(BOOTLOC)/overlays/argonone.dtbo 2>/dev/null && echo "Successful" || { echo "Failed"; } + @$(INSTALL) -D build/argonone.dtbo $(DESTDIR)$(BOOTLOC)/overlays/argonone.dtbo 2>/dev/null && echo "Successful" || { echo "Failed"; } +ifeq ($(DESTDIR),) @$(BASH) OS/_common/setup-overlay.sh $(BOOTLOC)/config.txt endif +endif ifndef OVERRIDE_INSTALL_SERVICE .PHONY: install-service install-service: @echo "Installing services " @echo -n "argononed.service ... " - @$(INSTALL) -m $(SERVICE_FILE_PERMISSIONS) $(SERVICE_FILE) $(SERVICE_PATH) 2>/dev/null && echo "Successful" || { echo "Failed"; true; } + @$(INSTALL) -Dm $(SERVICE_FILE_PERMISSIONS) $(SERVICE_FILE) $(DESTDIR)$(SERVICE_PATH) 2>/dev/null && echo "Successful" || { echo "Failed"; true; } @echo -n "argonone-shutdown ... " - @$(INSTALL) $(SHUTDOWN_FILE) $(SHUTDOWN_PATH) 2>/dev/null && echo "Successful" || { echo "Failed"; true; } + @$(INSTALL) -D $(SHUTDOWN_FILE) $(DESTDIR)$(SHUTDOWN_PATH) 2>/dev/null && echo "Successful" || { echo "Failed"; true; } +ifeq ($(DESTDIR),) ifeq ($(INITSYS), SYSTEMD) @echo "Refresh services list" @systemctl daemon-reload @@ -171,20 +177,25 @@ endif @echo -n "Starting Service " @timeout 5s $(SERVICE_START) &>/dev/null && echo "Successful" || { ( [ $$? -eq 124 ] && echo "Timeout" || echo "Failed" ) } endif +endif .PHONY: install -install:: install-daemon install-cli install-overlay install-service +install:: install-daemon install-cli install-service install-overlay +ifeq ($(DESTDIR),) ifeq ($(shell if [ -f /usr/bin/argononed ]; then echo 1; fi), 1) @echo -n "Removing old daemon ... " @$(RM) /usr/bin/argononed 2>/dev/null&& echo "Successful" || { echo "Failed"; true; } +endif endif @echo "Install Complete" .PHONY: update update:: install-daemon install-cli install-service +ifeq ($(DESTDIR),) ifeq ($(shell if [ -f /usr/bin/argononed ]; then echo 1; fi), 1) @echo -n "Removing old daemon ... " @$(RM) /usr/bin/argononed 2>/dev/null&& echo "Successful" || { echo "Failed"; true; } +endif endif @echo "Update Complete" -- 2.44.0
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor