build: fix building flask headers before descending in flask/ss/
PATCH 1/1 build: fix building flask headers before descending in flask/ss/
Unfortunatly, adding prerequisite to "$(obj)/ss/built_in.o" doesn't work because we have "$(obj)/%/built_in.o: $(obj)/% ;" in Rules.mk. So, make is allow to try to build objects in "xsm/flask/ss/" before generating the headers.
Adding a prerequisite on "$(obj)/ss" instead will fix the issue has that the target used to run make in this subdirectory.
Unfortunatly, that target is also used when running make clean, so we need to ignore it in this case. $(MAKECMDGOALS) can't be used in this case as it is empty, but we can guess which operation is done by looking at the list of loaded makefiles.
--- xen/xsm/flask/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
xen/xsm/flask/Makefile +5 -1
@@ -16,7 +16,11 @@ FLASK_H_FILES := flask.h class_to_string.h initial_sid_to_string.h AV_H_FILES := av_perm_to_string.h av_permissions.h ALL_H_FILES := $(addprefix include/,$(FLASK_H_FILES) $(AV_H_FILES)) -$(addprefix $(obj)/,$(obj-y)) $(obj)/ss/built_in.o: $(addprefix $(obj)/,$(ALL_H_FILES)) +# Adding prerequisite to descending into ss/ folder only when not running `make +# clean`. +ifeq ($(filter %/Makefile.clean,$(MAKEFILE_LIST)),) +$(addprefix $(obj)/,$(obj-y)) $(obj)/ss: $(addprefix $(obj)/,$(ALL_H_FILES)) +endif extra-y += $(ALL_H_FILES) mkflask := $(srcdir)/policy/mkflask.sh
Signature · 1 line
Anthony PERARD
Quoted 27 lines · Anthony PERARD
Unfortunatly, adding prerequisite to "$(obj)/ss/built_in.o" doesn't work because we have "$(obj)/%/built_in.o: $(obj)/% ;" in Rules.mk. So, make is allow to try to build objects in "xsm/flask/ss/" before generating the headers.
Adding a prerequisite on "$(obj)/ss" instead will fix the issue has that the target used to run make in this subdirectory.
Unfortunatly, that target is also used when running
make clean, so we need to ignore it in this case. $(MAKECMDGOALS) can't be used in this case as it is empty, but we can guess which operation is done by looking at the list of loaded makefiles.Fixes 7a3bcd2babcc ("build: build everything from the root dir, use obj=$subdir")Reported-by "Daniel P. Smith" <[email protected]>Signed-off-by Anthony PERARD <[email protected]>--- xen/xsm/flask/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)xen/xsm/flask/Makefile +0
-0@@ -16,7 +16,11 @@ FLASK_H_FILES := flask.h class_to_string.h initial_sid_to_string.h AV_H_FILES := av_perm_to_string.h av_permissions.h ALL_H_FILES := $(addprefix include/,$(FLASK_H_FILES) $(AV_H_FILES))
xen/xsm/flask/Makefile FLASK_H_FILES := flask.h class_to_string.h initial_sid_to_string.h · line 26
Quoted 10 lines
xen/xsm/flask/Makefile +5
-1-$(addprefix $(obj)/,$(obj-y)) $(obj)/ss/built_in.o: $(addprefix $(obj)/,$(ALL_H_FILES)) +# Adding prerequisite to descending into ss/ folder only when not running `make +# clean`. +ifeq ($(filter %/Makefile.clean,$(MAKEFILE_LIST)),) +$(addprefix $(obj)/,$(obj-y)) $(obj)/ss: $(addprefix $(obj)/,$(ALL_H_FILES)) +endif extra-y += $(ALL_H_FILES) mkflask := $(srcdir)/policy/mkflask.sh
It builds for me, but I also do not have a large enough system to do a -j16 to confirm it at the scale for which it occurred. Regardless, I will ack it.
Quoted 7 lines · Anthony PERARD
Unfortunatly, adding prerequisite to "$(obj)/ss/built_in.o" doesn't work because we have "$(obj)/%/built_in.o: $(obj)/% ;" in Rules.mk. So, make is allow to try to build objects in "xsm/flask/ss/" before generating the headers.
Adding a prerequisite on "$(obj)/ss" instead will fix the issue has that the target used to run make in this subdirectory.
DYM "... the issue, as that's ..."?
Quoted 2 lines
Unfortunatly, that target is also used when running
make clean, so we need to ignore it in this case. $(MAKECMDGOALS) can't be used in
s/need/want/, I guess, as nothing would break, we'd just create files only to delete them again right away?
Quoted 6 lines
this case as it is empty, but we can guess which operation is done by looking at the list of loaded makefiles.
Fixes 7a3bcd2babcc ("build: build everything from the root dir, use obj=$subdir")Reported-by "Daniel P. Smith" <[email protected]>Signed-off-by Anthony PERARD <[email protected]>
xen/xsm/flask/Makefile FLASK_H_FILES := flask.h class_to_string.h initial_sid_to_string.h · line 20
Quoted 9 lines
xen/xsm/flask/Makefile +2
-1@@ -16,7 +16,11 @@ FLASK_H_FILES := flask.h class_to_string.h initial_sid_to_string.h AV_H_FILES := av_perm_to_string.h av_permissions.h ALL_H_FILES := $(addprefix include/,$(FLASK_H_FILES) $(AV_H_FILES)) -$(addprefix $(obj)/,$(obj-y)) $(obj)/ss/built_in.o: $(addprefix $(obj)/,$(ALL_H_FILES)) +# Adding prerequisite to descending into ss/ folder only when not running `make +# clean`.
That's then for all "clean" targets, isn't it? I.e. maybe better to refer to make *clean (or make %clean, but I think the % could be misleading there)?
I'm happy to make adjustments while committing, as long (or as far) as you agree with me doing so.
Jan
Quoted 10 lines · Jan Beulich
Quoted 7 lines · Anthony PERARD
Unfortunatly, adding prerequisite to "$(obj)/ss/built_in.o" doesn't work because we have "$(obj)/%/built_in.o: $(obj)/% ;" in Rules.mk. So, make is allow to try to build objects in "xsm/flask/ss/" before generating the headers.
Adding a prerequisite on "$(obj)/ss" instead will fix the issue has that the target used to run make in this subdirectory.
DYM "... the issue, as that's ..."?
Yes.
Quoted 5 lines
Quoted 2 lines
Unfortunatly, that target is also used when running
make clean, so we need to ignore it in this case. $(MAKECMDGOALS) can't be used ins/need/want/, I guess, as nothing would break, we'd just create files only to delete them again right away?
Actually, I did found out that the "FORCE" target doesn't exist in Makefile.clean, which is why I had to avoid the rule on make clean. But I don't think that needs fixing.
But you can s/need/want/.
Quoted 15 lines
Quoted 6 lines
this case as it is empty, but we can guess which operation is done by looking at the list of loaded makefiles.
Fixes 7a3bcd2babcc ("build: build everything from the root dir, use obj=$subdir")Reported-by "Daniel P. Smith" <[email protected]>Signed-off-by Anthony PERARD <[email protected]>Reviewed-by Jan Beulich <[email protected]>Quoted 6 lines
xen/xsm/flask/Makefile +0
-0@@ -16,7 +16,11 @@ FLASK_H_FILES := flask.h class_to_string.h initial_sid_to_string.h AV_H_FILES := av_perm_to_string.h av_permissions.h ALL_H_FILES := $(addprefix include/,$(FLASK_H_FILES) $(AV_H_FILES))
Quoted 6 lines
xen/xsm/flask/Makefile FLASK_H_FILES := flask.h class_to_string.h initial_sid_to_string.h · line 20
Quoted 3 lines
xen/xsm/flask/Makefile +2
-1-$(addprefix $(obj)/,$(obj-y)) $(obj)/ss/built_in.o: $(addprefix $(obj)/,$(ALL_H_FILES)) +# Adding prerequisite to descending into ss/ folder only when not running `make +# clean`.That's then for all "clean" targets, isn't it? I.e. maybe better to refer to
make *clean(ormake %clean, but I think the % could be misleading there)?
Yes, all clean targets. Referring to make *clean sounds good.
Quoted 2 lines
I'm happy to make adjustments while committing, as long (or as far) as you agree with me doing so.
Yes.
Thanks,
Signature · 1 line
Anthony PERARD