mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-01 14:55:39 +00:00
Code Issues Releases Wiki Activity

amdgpu: Set PLUGINDIR to /usr/lib/criu

Browse Source 
Building the criu packages for Ubuntu/Debian fails with:

	mkdir: cannot create directory '/var/lib/criu': Permission denied

This patch updates PLUGINDIR with the value /usr/lib/criu

Fixes: #1877

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
This commit is contained in:
Radostin Stoyanov
2022-05-08 11:07:25 +01:00
committed by Andrei Vagin
parent e6f292cb38
commit a90a1d4827
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.install
View File

@@ -7,7 +7,7 @@ MANDIR ?= $(PREFIX)/share/man
INCLUDEDIR ?= $(PREFIX)/include INCLUDEDIR ?= $(PREFIX)/include
LIBEXECDIR ?= $(PREFIX)/libexec LIBEXECDIR ?= $(PREFIX)/libexec
RUNDIR ?= /run RUNDIR ?= /run
PLUGINDIR ?= /var/lib/criu PLUGINDIR ?= $(PREFIX)/lib/criu
# #
# For recent Debian/Ubuntu with multiarch support. # For recent Debian/Ubuntu with multiarch support.

4
criu/include/plugin.h
View File

@@ -5,7 +5,9 @@
#include "common/compiler.h" #include "common/compiler.h"
#include "common/list.h" #include "common/list.h"
#define CR_PLUGIN_DEFAULT "/var/lib/criu/" #ifndef CR_PLUGIN_DEFAULT
#define CR_PLUGIN_DEFAULT "/usr/lib/criu/"
#endif
void cr_plugin_fini(int stage, int err); void cr_plugin_fini(int stage, int err);
int cr_plugin_init(int stage); int cr_plugin_init(int stage);

8
plugins/amdgpu/Makefile
View File

@@ -15,7 +15,7 @@ DEPS_NOK := ;
include $(__nmk_dir)msg.mk include $(__nmk_dir)msg.mk
CC := gcc CC := gcc
PLUGIN_CFLAGS := -g -Wall -Werror -D _GNU_SOURCE -shared -nostartfiles -fPIC PLUGIN_CFLAGS := -g -Wall -Werror -D _GNU_SOURCE -shared -nostartfiles -fPIC -DCR_PLUGIN_DEFAULT="$(PLUGINDIR)"
PLUGIN_LDFLAGS := -lpthread -lrt -ldrm -ldrm_amdgpu PLUGIN_LDFLAGS := -lpthread -lrt -ldrm -ldrm_amdgpu
ifeq ($(CONFIG_AMDGPU),y) ifeq ($(CONFIG_AMDGPU),y)
@@ -50,16 +50,16 @@ clean: amdgpu_plugin_clean amdgpu_plugin_test_clean
mrproper: clean mrproper: clean
install: install:
$(Q) mkdir -p $(PLUGINDIR)
ifeq ($(CONFIG_AMDGPU),y) ifeq ($(CONFIG_AMDGPU),y)
$(Q) mkdir -p $(DESTDIR)$(PLUGINDIR)
$(E) " INSTALL " $(PLUGIN_NAME) $(E) " INSTALL " $(PLUGIN_NAME)
$(Q) install -m 644 $(PLUGIN_SOBJ) $(PLUGINDIR) $(Q) install -m 644 $(PLUGIN_SOBJ) $(DESTDIR)$(PLUGINDIR)
endif endif
.PHONY: install .PHONY: install
uninstall: uninstall:
ifeq ($(CONFIG_AMDGPU),y) ifeq ($(CONFIG_AMDGPU),y)
$(E) " UNINSTALL" $(PLUGIN_NAME) $(E) " UNINSTALL" $(PLUGIN_NAME)
$(Q) $(RM) $(PLUGINDIR)/$(PLUGIN_SOBJ) $(Q) $(RM) $(DESTDIR)$(PLUGINDIR)/$(PLUGIN_SOBJ)
endif endif
.PHONY: uninstall .PHONY: uninstall