X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-security%2Frecipes-core%2Fsystemd%2Fsystemd_239.bbappend;fp=meta-security%2Frecipes-core%2Fsystemd%2Fsystemd_234.bbappend;h=789c05f8397b1b4b0daf0d29c9136aa68cd2bde9;hb=7faccb97d69c7581e338f88ce3a2153cdd69fd16;hp=79753a2d6d186fa9f4fe9d2840e25835423546dd;hpb=e978a20f40916eac57a5e1af8f65b6ed9f719e50;p=AGL%2Fmeta-agl.git

diff --git a/meta-security/recipes-core/systemd/systemd_234.bbappend b/meta-security/recipes-core/systemd/systemd_239.bbappend
similarity index 80%
rename from meta-security/recipes-core/systemd/systemd_234.bbappend
rename to meta-security/recipes-core/systemd/systemd_239.bbappend
index 79753a2d6..789c05f83 100644
--- a/meta-security/recipes-core/systemd/systemd_234.bbappend
+++ b/meta-security/recipes-core/systemd/systemd_239.bbappend
@@ -1,16 +1,7 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-##################################################################################
-# What follows is temporary.
-# This patch is still needed for systemd 234 but is normally upstreamed
-# and thus should be removed in later versions.
-##################################################################################
-SRC_URI_append_with-lsm-smack = "\
-    file://0001-Switch-Smack-label-earlier.patch \
-"
-
 # Ensures systemd runs with label "System"
-EXTRA_OECONF_append_with-lsm-smack = " --with-smack-run-label=System"
+EXTRA_OEMESON_append_with-lsm-smack = " -Dsmack-run-label=System"
 
 ##################################################################################
 # Maintaining trivial, non-upstreamable configuration changes as patches