mirror of
https://git.yoctoproject.org/meta-security
synced 2026-01-11 15:00:34 +00:00
apparmor: Add a python 3.10 compatability patch
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
@@ -16,15 +16,15 @@ DEPENDS = "bison-native apr gettext-native coreutils-native swig-native"
|
||||
SRC_URI = " \
|
||||
git://gitlab.com/apparmor/apparmor.git;protocol=https;branch=apparmor-3.0 \
|
||||
file://run-ptest \
|
||||
file://disable_perl_h_check.patch \
|
||||
file://crosscompile_perl_bindings.patch \
|
||||
file://0001-Makefile.am-suppress-perllocal.pod.patch \
|
||||
file://0001-Revert-profiles-Update-make-check-to-select-tools-ba.patch \
|
||||
file://0001-Makefile-fix-hardcoded-installation-directories.patch \
|
||||
file://0001-rc.apparmor.debian-add-missing-functions.patch \
|
||||
file://py3_10_fixup.patch \
|
||||
"
|
||||
|
||||
SRCREV = "b0f08aa9d678197b8e3477c2fbff790f50a1de5e"
|
||||
SRCREV = "b23de501807b8b5793e9654da8688b5fd3281154"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
PARALLEL_MAKE = ""
|
||||
|
||||
35
recipes-mac/AppArmor/files/py3_10_fixup.patch
Normal file
35
recipes-mac/AppArmor/files/py3_10_fixup.patch
Normal 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])
|
||||
Reference in New Issue
Block a user