[meta-selinux][PATCH 06/12] python2: drop bbappend


Yi Zhao
 

This bbappend was added long time ago and it is useless now.

Signed-off-by: Yi Zhao <yi.zhao@...>
---
conf/layer.conf | 2 --
.../python/files/sitecustomize.py | 26 -------------------
.../recipes-devtools/python/python_%.bbappend | 1 -
.../python/python_selinux.inc | 5 ----
4 files changed, 34 deletions(-)
delete mode 100644 dynamic-layers/python2-layer/recipes-devtools/python/files/sitecustomize.py
delete mode 100644 dynamic-layers/python2-layer/recipes-devtools/python/python_%.bbappend
delete mode 100644 dynamic-layers/python2-layer/recipes-devtools/python/python_selinux.inc

diff --git a/conf/layer.conf b/conf/layer.conf
index fcd61d5..d7c80b8 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -7,8 +7,6 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \

BBFILES_DYNAMIC += "networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bb \
networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bbappend \
- meta-python2:${LAYERDIR}/dynamic-layers/python2-layer/recipes*/*/*.bb \
- meta-python2:${LAYERDIR}/dynamic-layers/python2-layer/recipes*/*/*.bbappend \
"

BBFILE_COLLECTIONS += "selinux"
diff --git a/dynamic-layers/python2-layer/recipes-devtools/python/files/sitecustomize.py b/dynamic-layers/python2-layer/recipes-devtools/python/files/sitecustomize.py
deleted file mode 100644
index d2b71fa..0000000
--- a/dynamic-layers/python2-layer/recipes-devtools/python/files/sitecustomize.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# OpenEmbedded sitecustomize.py (C) 2002-2008 Michael 'Mickey' Lauer <mlauer@...>
-# GPLv2 or later
-# Version: 20081123
-# Features:
-# * set proper default encoding
-# Features removed for SELinux:
-# * enable readline completion in the interactive interpreter
-# * load command line history on startup
-# * save command line history on exit
-
-import os
-
-def __enableDefaultEncoding():
- import sys
- try:
- sys.setdefaultencoding( "utf8" )
- except LookupError:
- pass
-
-import sys
-try:
- import rlcompleter, readline
-except ImportError:
- pass
-else:
- __enableDefaultEncoding()
diff --git a/dynamic-layers/python2-layer/recipes-devtools/python/python_%.bbappend b/dynamic-layers/python2-layer/recipes-devtools/python/python_%.bbappend
deleted file mode 100644
index 7719d3b..0000000
--- a/dynamic-layers/python2-layer/recipes-devtools/python/python_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-require ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', '${BPN}_selinux.inc', '', d)}
diff --git a/dynamic-layers/python2-layer/recipes-devtools/python/python_selinux.inc b/dynamic-layers/python2-layer/recipes-devtools/python/python_selinux.inc
deleted file mode 100644
index 4fed832..0000000
--- a/dynamic-layers/python2-layer/recipes-devtools/python/python_selinux.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# If selinux enabled, disable handlers to rw command history file
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-
-inherit selinux
-
--
2.25.1

Join yocto@lists.yoctoproject.org to automatically receive all group messages.