Skip to content

Commit ffdbd5e

Browse files
npfnpf
committed
[Makefiles] rework cgv1 vs systemd
1 parent 9f045d3 commit ffdbd5e

File tree

5 files changed

+28
-41
lines changed

5 files changed

+28
-41
lines changed

‎Makefile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,6 @@ $(P_TARGETS):
142142
$(MAKE) -f Makefiles/common.mk $(P_ACTION) \
143143
DESTDIR=$(PACKAGES_DIR)/oar-common
144144

145-
# oar-common-legacy
146-
mkdir -p $(PACKAGES_DIR)/oar-common-legacy/var/lib/oar
147-
$(MAKE) -f Makefiles/common.mk OARSH_LEGACY=1 $(P_ACTION) \
148-
DESTDIR=$(PACKAGES_DIR)/oar-common-legacy
149-
150145
# liboar-perl
151146
mkdir -p $(PACKAGES_DIR)/liboar-perl/var/lib/oar
152147
$(MAKE) -f Makefiles/common-libs.mk $(P_ACTION) \

‎Makefiles/common.mk

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
MODULE=common
22
SRCDIR=sources/core
33

4-
OARSH_DIR := $(if $(OARSH_LEGACY),oarsh-legacy,oarsh)
4+
OARSH_DIR := $(if $(OAR_CGV1),oarsh-legacy,oarsh)
55

66
OARDIR_BINFILES = $(SRCDIR)/tools/$(OARSH_DIR)/oarsh_shell.in \
77
$(SRCDIR)/tools/$(OARSH_DIR)/oarsh.in \
@@ -33,18 +33,21 @@ clean: clean_shared
3333
$(OARDO_CLEAN) CMD_WRAPPER=$(OARDIR)/oarsh CMD_TARGET=$(DESTDIR)$(BINDIR)/oarsh
3434
$(OARDO_CLEAN) CMD_WRAPPER=$(OARDIR)/oarnodesetting CMD_TARGET=$(DESTDIR)$(SBINDIR)/oarnodesetting
3535
-rm -f $(SRCDIR)/tools/oardodo
36-
-rm $(SRCDIR)/tools/oarcgdev/oarcgdev
37-
-rm $(SRCDIR)/tools/oarcgdev/oarcgdev-ebpf
36+
ifndef OAR_CGV1
37+
-rm -f $(SRCDIR)/tools/oarcgdev/oarcgdev
38+
-rm -f $(SRCDIR)/tools/oarcgdev/oarcgdev-ebpf
39+
endif
3840

3941
build: build_shared
4042
$(MAKE) -f Makefiles/man.mk build
4143
$(OARDO_BUILD) CMD_WRAPPER=$(OARDIR)/oarsh CMD_TARGET=$(DESTDIR)$(BINDIR)/oarsh
4244
$(OARDO_BUILD) CMD_WRAPPER=$(OARDIR)/oarnodesetting CMD_TARGET=$(DESTDIR)$(SBINDIR)/oarnodesetting
4345

4446
$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $(SRCDIR)/tools/oardodo $(SRCDIR)/tools/oardodo.c
45-
46-
gcc -g -O0 -rdynamic -Wall -Werror $(SRCDIR)/tools/oarcgdev/oarcgdev.c -lelf -lz -lbpf -o $(SRCDIR)/tools/oarcgdev/oarcgdev
47-
clang -I /usr/include/*-linux-gnu/ -O2 -target bpf -mcpu=v3 -g -c $(SRCDIR)/tools/oarcgdev/oarcgdev-ebpf.c -o $(SRCDIR)/tools/oarcgdev/oarcgdev.bpf
47+
ifndef OAR_CGV1
48+
$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(SRCDIR)/tools/oarcgdev/oarcgdev.c -lelf -lz -lbpf -o $(SRCDIR)/tools/oarcgdev/oarcgdev
49+
clang -I /usr/include/$(shell gcc -print-multiarch) -O2 -target bpf -mcpu=v3 -g -c $(SRCDIR)/tools/oarcgdev/oarcgdev-ebpf.c -o $(SRCDIR)/tools/oarcgdev/oarcgdev.bpf
50+
endif
4851

4952
install: install_shared
5053

@@ -60,15 +63,21 @@ install: install_shared
6063

6164
cp -f $(DESTDIR)$(MANDIR)/man1/oarsh.1 $(DESTDIR)$(MANDIR)/man1/oarcp.1
6265

66+
ifndef OAR_CGV1
6367
install -m 0700 $(SRCDIR)/tools/oarcgdev/oarcgdev $(DESTDIR)$(OARDIR)/oarcgdev
6468
install -m 0700 $(SRCDIR)/tools/oarcgdev/oarcgdev.bpf $(DESTDIR)$(OARDIR)/oarcgdev.bpf
69+
endif
6570

6671
uninstall: uninstall_shared
6772
$(OARDO_UNINSTALL) CMD_WRAPPER=$(OARDIR)/oarsh CMD_TARGET=$(DESTDIR)$(BINDIR)/oarsh
6873
$(OARDO_UNINSTALL) CMD_WRAPPER=$(OARDIR)/oarnodesetting CMD_TARGET=$(DESTDIR)$(SBINDIR)/oarnodesetting
6974
rm -f $(DESTDIR)$(MANDIR)/man1/oarcp.1
7075
rm -rf $(DESTDIR)$(OARDIR)/oardodo
7176
rm -rf $(DESTDIR)$(EXAMPLEDIR)
77+
ifndef OAR_CGV1
78+
rm -f $(DESTDIR)$(OARDIR)/oarcgdev
79+
rm -f $(DESTDIR)$(OARDIR)/oarcgdev.bpf
80+
endif
7281

7382

7483
.PHONY: install setup uninstall build clean

‎Makefiles/server.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ MANDIR_FILES = $(SRCDIR)/man/man1/Almighty.1 \
3939
SBINDIR_FILES = $(SRCDIR)/server/sbin/oar-server.in
4040

4141
SHAREDIR_FILES = $(SRCDIR)/tools/job_resource_manager_cpuset.pl \
42-
$(SRCDIR)/tools/job_resource_manager_cgroups.pl \
43-
$(SRCDIR)/tools/job_resource_manager_systemd.pl \
44-
$(SRCDIR)/tools/suspend_resume_manager_cpuset.pl \
42+
$(SRCDIR)/tools/job_resource_manager_cgroups.pl \
43+
$(SRCDIR)/tools/job_resource_manager_systemd.pl \
44+
$(SRCDIR)/tools/suspend_resume_manager_cgroups.pl \
4545
$(SRCDIR)/tools/suspend_resume_manager_systemd.pl \
4646
$(SRCDIR)/tools/oarmonitor_sensor.pl \
4747
$(SRCDIR)/scripts/server_epilogue \

‎setup/common.sh.in

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -156,14 +156,6 @@ common_setup() {
156156
${OARCONFDIR}/update_cpuset_id.sh \
157157
0755
158158

159-
if [ -n "OARSH_LEGACY" ]; then
160-
ln -sf ${OARCONFDIR}/job_resource_manager_cgroups.pl ${OARCONFDIR}/job_resource_manager.pl
161-
ln -sf ${OARCONFDIR}/suspend_resume_manager_cgroups.pl ${OARCONFDIR}/suspend_resume_manager.pl
162-
else
163-
ln -sf ${OARCONFDIR}/job_resource_manager_systemd.pl ${OARCONFDIR}/job_resource_manager.pl
164-
ln -sf ${OARCONFDIR}/suspend_resume_manager_systemd.pl ${OARCONFDIR}/suspend_resume_manager.pl
165-
fi
166-
167159
set_rights ${BINDIR}/oarsh 6755 ${OARDO_DEFAULTUSER} ${OARDO_DEFAULTGROUP}
168160
set_rights ${SBINDIR}/oarnodesetting 6750 ${OARDO_DEFAULTUSER} ${OARDO_DEFAULTGROUP}
169161

‎setup/server.sh.in

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,30 +21,21 @@ create_phoenix_home() {
2121
chown ${OAROWNER}:${OAROWNERGROUP} ${OARHOMEDIR}/phoenix
2222
}
2323

24-
server_setup() {
25-
install_conffile \
26-
${SHAREDIR}/job_resource_manager_cpuset.pl \
27-
${OARCONFDIR}/job_resource_manager_cpuset.pl \
28-
0644
29-
30-
install_conffile \
31-
${SHAREDIR}/job_resource_manager_cgroups.pl \
32-
${OARCONFDIR}/job_resource_manager_cgroups.pl \
33-
0644
34-
35-
install_conffile \
36-
${SHAREDIR}/job_resource_manager_systemd.pl \
37-
${OARCONFDIR}/job_resource_manager_systemd.pl \
38-
0644
3924

25+
server_setup() {
26+
if [ -z $OAR_CGV1 ]; then
27+
CGV1_OR_SYSTEMD=systemd
28+
else
29+
CGV1_OR_SYSTEMD=cgroup
30+
fi
4031
install_conffile \
41-
${SHAREDIR}/suspend_resume_manager_cpuset.pl \
42-
${OARCONFDIR}/suspend_resume_manager_cpuset.pl \
32+
${SHAREDIR}/job_resource_manager_${CGV1_OR_SYSTEMD}.pl \
33+
${OARCONFDIR}/job_resource_manager.pl \
4334
0644
4435

4536
install_conffile \
46-
${SHAREDIR}/suspend_resume_manager_systemd.pl \
47-
${OARCONFDIR}/suspend_resume_manager_systemd.pl \
37+
${SHAREDIR}/suspend_resume_manager_${CGV1_OR_SYSTEMD}.pl \
38+
${OARCONFDIR}/suspend_resume_manager.pl \
4839
0644
4940

5041
install_conffile \

0 commit comments

Comments
 (0)