diff options
Diffstat (limited to 'meta-cgl-common/conf/distro')
| -rw-r--r-- | meta-cgl-common/conf/distro/include/cgl_common_security_flags.inc | 6 | ||||
| -rw-r--r-- | meta-cgl-common/conf/distro/poky-cgl.conf | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/meta-cgl-common/conf/distro/include/cgl_common_security_flags.inc b/meta-cgl-common/conf/distro/include/cgl_common_security_flags.inc index a2f9857..ef3f296 100644 --- a/meta-cgl-common/conf/distro/include/cgl_common_security_flags.inc +++ b/meta-cgl-common/conf/distro/include/cgl_common_security_flags.inc @@ -1,5 +1,3 @@ -SECURITY_LDFLAGS_remove_pn-audit = "-fstack-protector-strong" - -SECURITY_CFLAGS_pn-ocfs2-tools = "${SECURITY_NOPIE_CFLAGS}" -SECURITY_LDFLAGS_pn-ocfs2-tools = "" +SECURITY_CFLAGS:pn-ocfs2-tools = "${SECURITY_NOPIE_CFLAGS}" +SECURITY_LDFLAGS:pn-ocfs2-tools = "" diff --git a/meta-cgl-common/conf/distro/poky-cgl.conf b/meta-cgl-common/conf/distro/poky-cgl.conf index 269ce49..2932dcf 100644 --- a/meta-cgl-common/conf/distro/poky-cgl.conf +++ b/meta-cgl-common/conf/distro/poky-cgl.conf @@ -1,9 +1,9 @@ -require conf/distro/poky-lsb.conf +require conf/distro/poky-altcfg.conf DISTRO = "poky-cgl" DISTROOVERRIDES .= ":poky-cgl" -DISTRO_FEATURES_append = " selinux ptest argp ext2 xattr nfs pci ipv4 ipv6" +DISTRO_FEATURES:append = " selinux ptest argp ext2 xattr nfs pci ipv4 ipv6" PREFERRED_PROVIDER_virtual/refpolicy="refpolicy-targeted" |