diff options
| author | Paul Moore <paul@paul-moore.com> | 2023-06-01 10:21:21 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-06-09 10:22:54 +0200 |
| commit | a03dc3d59abe1e02ed64f6fc25882ff04d1829b6 (patch) | |
| tree | 25fc79e04980b27343cdd0702b00df59fb8d924f | |
| parent | 22fb46cc1cd902363e38739c1fd25b436490ce43 (diff) | |
| download | linux-stable-a03dc3d59abe1e02ed64f6fc25882ff04d1829b6.tar.gz linux-stable-a03dc3d59abe1e02ed64f6fc25882ff04d1829b6.tar.bz2 linux-stable-a03dc3d59abe1e02ed64f6fc25882ff04d1829b6.zip | |
selinux: don't use make's grouped targets feature yet
commit 42c4e97e06a839b07d834f640a10911ad84ec8b3 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 08ba8ca81d40..89c67a814566 100644 --- a/security/selinux/Makefile +++ b/security/selinux/Makefile @@ -22,5 +22,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) |