mirrors/meta-security
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-security synced 2026-07-16 03:47:21 +00:00
Code Issues Projects Releases Wiki Activity

apparmor: Add a python 3.10 compatability patch

Browse Source 
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Armin Kuster
2021-10-25 07:50:07 -07:00
parent e5e54135da
commit 8f045875fb
2 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recipes-mac/AppArmor/apparmor_3.0.1.bb
+2 -2
View File
@@ -16,15 +16,15 @@ DEPENDS = "bison-native apr gettext-native coreutils-native swig-native"
SRC_URI = " \ SRC_URI = " \
git://gitlab.com/apparmor/apparmor.git;protocol=https;branch=apparmor-3.0 \ git://gitlab.com/apparmor/apparmor.git;protocol=https;branch=apparmor-3.0 \
file://run-ptest \ file://run-ptest \
file://disable_perl_h_check.patch \
file://crosscompile_perl_bindings.patch \ file://crosscompile_perl_bindings.patch \
file://0001-Makefile.am-suppress-perllocal.pod.patch \ file://0001-Makefile.am-suppress-perllocal.pod.patch \
file://0001-Revert-profiles-Update-make-check-to-select-tools-ba.patch \ file://0001-Revert-profiles-Update-make-check-to-select-tools-ba.patch \
file://0001-Makefile-fix-hardcoded-installation-directories.patch \ file://0001-Makefile-fix-hardcoded-installation-directories.patch \
file://0001-rc.apparmor.debian-add-missing-functions.patch \ file://0001-rc.apparmor.debian-add-missing-functions.patch \
file://py3_10_fixup.patch \
" "
SRCREV = "b0f08aa9d678197b8e3477c2fbff790f50a1de5e" SRCREV = "b23de501807b8b5793e9654da8688b5fd3281154"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
PARALLEL_MAKE = "" PARALLEL_MAKE = ""
recipes-mac/AppArmor/files/py3_10_fixup.patch
+35
View File
@@ -0,0 +1,35 @@
m4/ax_python_devel.m4: do not check for distutils
With py 3.10 this prints a deprecation warning which is
taken as an error. Upstream should rework the code to not
use distuils.
Upstream-Status: Inappropriate [needs a proper fix upstream]
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Index: git/libraries/libapparmor/m4/ac_python_devel.m4
===================================================================
--- git.orig/libraries/libapparmor/m4/ac_python_devel.m4
+++ git/libraries/libapparmor/m4/ac_python_devel.m4
@@ -66,21 +66,6 @@ variable to configure. See ``configure -
fi
#
- # Check if you have distutils, else fail
- #
- AC_MSG_CHECKING([for the distutils Python package])
- ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
- if test -z "$ac_distutils_result"; then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([cannot import Python module "distutils".
-Please check your Python installation. The error was:
-$ac_distutils_result])
- PYTHON_VERSION=""
- fi
-
- #
# Check for Python include path
#
AC_MSG_CHECKING([for Python include path])