[meta-selinux] clean up getVar() usage

Submitted by Joe MacDonald on April 3, 2020, 12:52 p.m. | Patch ID: 171563

Details

Message ID 20200403125251.35877-1-joe_macdonald@mentor.com
State New
Headers show

Commit Message

Joe MacDonald April 3, 2020, 12:52 p.m.
83eac4de updated the usage of getVar() in classes/selinux.bbclass to
leave out the default expand parameter. This is consistent with the
usage in the core layers.

Bring all other calls to getVar() in the layer into alignment with this
approach.

Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
---
 recipes-core/busybox/busybox_selinux.inc        | 8 ++++----
 recipes-security/refpolicy/refpolicy_common.inc | 2 +-
 recipes-security/selinux/libselinux-python.inc  | 2 +-
 recipes-security/selinux/libselinux.inc         | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

Patch hide | download patch | download mbox

diff --git a/recipes-core/busybox/busybox_selinux.inc b/recipes-core/busybox/busybox_selinux.inc
index cc83b01..6e491ce 100644
--- a/recipes-core/busybox/busybox_selinux.inc
+++ b/recipes-core/busybox/busybox_selinux.inc
@@ -8,9 +8,9 @@  python create_sh_wrapper_reset_alternative_vars () {
     # We need to load the full set of busybox provides from the /etc/busybox.links
     # Use this to see the update-alternatives with the right information
 
-    dvar = d.getVar('D', True)
-    pn = d.getVar('PN', True)
-    base_bindir = d.getVar('base_bindir', True)
+    dvar = d.getVar('D')
+    pn = d.getVar('PN')
+    base_bindir = d.getVar('base_bindir')
 
     def create_sh_alternative_vars(links, target, mode):
         import shutil
@@ -20,7 +20,7 @@  python create_sh_wrapper_reset_alternative_vars () {
         os.fchmod(fwp.fileno(), mode)
         fwp.close()
         # Install the sh wrappers and alternatives reset to link to them
-        wpdir = os.path.join(d.getVar('libdir', True), pn)
+        wpdir = os.path.join(d.getVar('libdir'), pn)
         wpdir_dest = '%s%s' % (dvar, wpdir)
         if not os.path.exists(wpdir_dest):
             os.makedirs(wpdir_dest)
diff --git a/recipes-security/refpolicy/refpolicy_common.inc b/recipes-security/refpolicy/refpolicy_common.inc
index 2083a37..1d9ca93 100644
--- a/recipes-security/refpolicy/refpolicy_common.inc
+++ b/recipes-security/refpolicy/refpolicy_common.inc
@@ -117,7 +117,7 @@  python __anonymous () {
 
     # make sure DEFAULT_ENFORCING is something sane
     if not re.match('^(enforcing|permissive|disabled)$',
-                    d.getVar('DEFAULT_ENFORCING', True),
+                    d.getVar('DEFAULT_ENFORCING'),
                     flags=0):
         d.setVar('DEFAULT_ENFORCING', 'permissive')
 }
diff --git a/recipes-security/selinux/libselinux-python.inc b/recipes-security/selinux/libselinux-python.inc
index 24407e8..6a64473 100644
--- a/recipes-security/selinux/libselinux-python.inc
+++ b/recipes-security/selinux/libselinux-python.inc
@@ -14,7 +14,7 @@  RDEPENDS_${PN} += "libselinux python3-core python3-shell"
 
 def get_policyconfigarch(d):
     import re
-    target = d.getVar('TARGET_ARCH', True)
+    target = d.getVar('TARGET_ARCH')
     p = re.compile('i.86')
     target = p.sub('i386',target)
     return "ARCH=%s" % (target)
diff --git a/recipes-security/selinux/libselinux.inc b/recipes-security/selinux/libselinux.inc
index 8d381de..fe8c087 100644
--- a/recipes-security/selinux/libselinux.inc
+++ b/recipes-security/selinux/libselinux.inc
@@ -12,7 +12,7 @@  DEPENDS_append_libc-musl = " fts"
 
 def get_policyconfigarch(d):
     import re
-    target = d.getVar('TARGET_ARCH', True)
+    target = d.getVar('TARGET_ARCH')
     p = re.compile('i.86')
     target = p.sub('i386',target)
     return "ARCH=%s" % (target)