diff options
| -rw-r--r-- | recipes-core/busybox/busybox_selinux.inc | 8 | ||||
| -rw-r--r-- | recipes-security/refpolicy/refpolicy_common.inc | 2 | ||||
| -rw-r--r-- | recipes-security/selinux/libselinux-python.inc | 2 | ||||
| -rw-r--r-- | recipes-security/selinux/libselinux.inc | 2 |
4 files changed, 7 insertions, 7 deletions
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 () { | |||
| 8 | # We need to load the full set of busybox provides from the /etc/busybox.links | 8 | # We need to load the full set of busybox provides from the /etc/busybox.links |
| 9 | # Use this to see the update-alternatives with the right information | 9 | # Use this to see the update-alternatives with the right information |
| 10 | 10 | ||
| 11 | dvar = d.getVar('D', True) | 11 | dvar = d.getVar('D') |
| 12 | pn = d.getVar('PN', True) | 12 | pn = d.getVar('PN') |
| 13 | base_bindir = d.getVar('base_bindir', True) | 13 | base_bindir = d.getVar('base_bindir') |
| 14 | 14 | ||
| 15 | def create_sh_alternative_vars(links, target, mode): | 15 | def create_sh_alternative_vars(links, target, mode): |
| 16 | import shutil | 16 | import shutil |
| @@ -20,7 +20,7 @@ python create_sh_wrapper_reset_alternative_vars () { | |||
| 20 | os.fchmod(fwp.fileno(), mode) | 20 | os.fchmod(fwp.fileno(), mode) |
| 21 | fwp.close() | 21 | fwp.close() |
| 22 | # Install the sh wrappers and alternatives reset to link to them | 22 | # Install the sh wrappers and alternatives reset to link to them |
| 23 | wpdir = os.path.join(d.getVar('libdir', True), pn) | 23 | wpdir = os.path.join(d.getVar('libdir'), pn) |
| 24 | wpdir_dest = '%s%s' % (dvar, wpdir) | 24 | wpdir_dest = '%s%s' % (dvar, wpdir) |
| 25 | if not os.path.exists(wpdir_dest): | 25 | if not os.path.exists(wpdir_dest): |
| 26 | os.makedirs(wpdir_dest) | 26 | 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 () { | |||
| 117 | 117 | ||
| 118 | # make sure DEFAULT_ENFORCING is something sane | 118 | # make sure DEFAULT_ENFORCING is something sane |
| 119 | if not re.match('^(enforcing|permissive|disabled)$', | 119 | if not re.match('^(enforcing|permissive|disabled)$', |
| 120 | d.getVar('DEFAULT_ENFORCING', True), | 120 | d.getVar('DEFAULT_ENFORCING'), |
| 121 | flags=0): | 121 | flags=0): |
| 122 | d.setVar('DEFAULT_ENFORCING', 'permissive') | 122 | d.setVar('DEFAULT_ENFORCING', 'permissive') |
| 123 | } | 123 | } |
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" | |||
| 14 | 14 | ||
| 15 | def get_policyconfigarch(d): | 15 | def get_policyconfigarch(d): |
| 16 | import re | 16 | import re |
| 17 | target = d.getVar('TARGET_ARCH', True) | 17 | target = d.getVar('TARGET_ARCH') |
| 18 | p = re.compile('i.86') | 18 | p = re.compile('i.86') |
| 19 | target = p.sub('i386',target) | 19 | target = p.sub('i386',target) |
| 20 | return "ARCH=%s" % (target) | 20 | 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" | |||
| 12 | 12 | ||
| 13 | def get_policyconfigarch(d): | 13 | def get_policyconfigarch(d): |
| 14 | import re | 14 | import re |
| 15 | target = d.getVar('TARGET_ARCH', True) | 15 | target = d.getVar('TARGET_ARCH') |
| 16 | p = re.compile('i.86') | 16 | p = re.compile('i.86') |
| 17 | target = p.sub('i386',target) | 17 | target = p.sub('i386',target) |
| 18 | return "ARCH=%s" % (target) | 18 | return "ARCH=%s" % (target) |
