diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-openembedded/meta-oe/recipes-support/satyr/files/0001-do-not-support-python2.patch | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/satyr/files/0001-do-not-support-python2.patch')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/satyr/files/0001-do-not-support-python2.patch | 84 |
1 files changed, 0 insertions, 84 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/satyr/files/0001-do-not-support-python2.patch b/meta-openembedded/meta-oe/recipes-support/satyr/files/0001-do-not-support-python2.patch deleted file mode 100644 index 9e95a3f9d..000000000 --- a/meta-openembedded/meta-oe/recipes-support/satyr/files/0001-do-not-support-python2.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 206f334d62da17093e784094c9d9e80c853f704f Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Fri, 12 May 2017 03:03:46 -0400 -Subject: [PATCH] do not support python2 - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - configure.ac | 16 ---------------- - python/Makefile.am | 24 ------------------------ - 2 files changed, 40 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 200a7cc..8431c51 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -22,22 +22,6 @@ AM_MISSING_PROG([AUTOM4TE], [autom4te]) - # Needed by tests/atlocal.in. - AC_SUBST([O0CFLAGS], [`echo $CFLAGS | sed 's/-O[[0-9]] *//'`]) - --AM_PATH_PYTHON --AM_CONDITIONAL([HAVE_PYTHON], test -n "$PYTHON") --[if test -z "$PYTHON"; then] -- [echo "The python interpreter was not found in the search path. The Python language bindings"] -- [echo "will not be built. If you want to build the Python language bindings, please ensure"] -- [echo "that python is installed and its directory is included in the search path."] -- [echo "Then run configure again before attempting to build Satyr."] --[fi] -- --# Just PKG_CHECK_MODULES([PYTHON], [python]) works only with python2.7+ --# Below, if python is not found, we set up for python2.6 w/o checking: --PKG_CHECK_MODULES([PYTHON], [python2],,[ -- PYTHON_LIBS='-L/usr/lib64 -lpython2.6' -- PYTHON_CFLAGS='-I/usr/include/python2.6' --]) -- - AC_ARG_ENABLE([python-manpage], - [AS_HELP_STRING([--disable-python-manpage], - [Disable python bindings manpage build])], -diff --git a/python/Makefile.am b/python/Makefile.am -index 36fc2e9..0b73f66 100644 ---- a/python/Makefile.am -+++ b/python/Makefile.am -@@ -1,12 +1,5 @@ - SUBDIRS = . doc - --py2satyrdir = $(pyexecdir)/satyr -- --py2satyr_PYTHON = \ -- __init__.py -- --py2satyr_LTLIBRARIES = _satyr.la -- - PYEXTFILES = \ - py_cluster.h \ - py_cluster.c \ -@@ -75,23 +68,6 @@ PYEXTLDFLAGS = \ - -module \ - -avoid-version - --_satyr_la_SOURCES = $(PYEXTFILES) --_satyr_la_CPPFLAGS = \ -- $(PYEXTCPPFLAGS) \ -- $(PYTHON_CFLAGS) --_satyr_la_LDFLAGS = \ -- $(PYEXTLDFLAGS) \ -- -export-symbols-regex init_satyr -- --# Depending on the configure option, we either link libsatyr.so dynamically (as --# is usual), or directly include its object files (by including the --# convenience library). --if ENABLE_STATIC_PYTHON_MODULE --_satyr_la_LIBADD = ../lib/libsatyr_conv.la --else --_satyr_la_LIBADD = ../lib/libsatyr.la --endif -- - if WITH_PYTHON3 - py3satyrdir = $(py3execdir)/satyr - --- -2.8.1 - |