diff options
| author | Paul Moore <paul@paul-moore.com> | 2023-06-01 10:21:21 -0400 |
|---|---|---|
| committer | Paul Moore <paul@paul-moore.com> | 2023-06-01 13:56:13 -0400 |
| commit | 42c4e97e06a839b07d834f640a10911ad84ec8b3 (patch) | |
| tree | 349f8f1b416120d556cff82fe1edcd4f26f20270 | |
| parent | ac9a78681b921877518763ba0e89202254349d1b (diff) | |
| download | selinux-stable-6.4.tar.gz | |
selinux: don't use make's grouped targets feature yetselinux-pr-20230601stable-6.4
The Linux Kernel currently only requires make v3.82 while the grouped
target functionality requires make v4.3. Removed the grouped target
introduced in 4ce1f694eb5d ("selinux: ensure av_permissions.h is
built when needed") as well as the multiple header file targets in
the make rule. This effectively reverts the problem commit.
We will revisit this change when make >= 4.3 is required by the rest
of the kernel.
Cc: stable@vger.kernel.org
Fixes: 4ce1f694eb5d ("selinux: ensure av_permissions.h is built when needed")
Reported-by: Erwan Velu <e.velu@criteo.com>
Reported-by: Luiz Capitulino <luizcap@amazon.com>
Tested-by: Luiz Capitulino <luizcap@amazon.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
| -rw-r--r-- | security/selinux/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/security/selinux/Makefile b/security/selinux/Makefile index 0aecf9334ec31e..8b21520bd4b9fc 100644 --- a/security/selinux/Makefile +++ b/security/selinux/Makefile @@ -26,5 +26,9 @@ quiet_cmd_flask = GEN $(obj)/flask.h $(obj)/av_permissions.h cmd_flask = $< $(obj)/flask.h $(obj)/av_permissions.h targets += flask.h av_permissions.h -$(obj)/flask.h $(obj)/av_permissions.h &: scripts/selinux/genheaders/genheaders FORCE +# once make >= 4.3 is required, we can use grouped targets in the rule below, +# which basically involves adding both headers and a '&' before the colon, see +# the example below: +# $(obj)/flask.h $(obj)/av_permissions.h &: scripts/selinux/... +$(obj)/flask.h: scripts/selinux/genheaders/genheaders FORCE $(call if_changed,flask) |