criu: uprev to version 3.10

A fairly straightforward uprev requiring minimal patch refreshing
since a few hunks were failing due to conflicts with upstream updates.

Unfortunately upstream starting using the now overloaded "PYTHON"
variable in their Makefiles, this is not the path to the python
executable but rather the name 'python2' or 'python3' which is used to
determine which local directories to include. Due to this we must
explicitly assign values to 'PYTHON_FULL' and 'PYTHON'. We use
'python2' since we are using 'setuptools' and therefore are explicitly
using python v2, at some point we might want to make this recipe work
with either python v2 or v3 but for now we continue to explicitly use
v2.

Instead of using version specific filename we switch to using _git.bb
which is inline with similar 'git' recipes found in oe-core and other
repos.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

1 files changed, 7 insertions, 6 deletions

diff --git a/recipes-containers/criu/files/0001-criu-Fix-toolchain-hardcode.patch b/recipes-containers/criu/files/0001-criu-Fix-toolchain-hardcode.patch
index d1f136c4..838cbdc9 100644
--- a/recipes-containers/criu/files/0001-criu-Fix-toolchain-hardcode.patch
+++ b/recipes-containers/criu/files/0001-criu-Fix-toolchain-hardcode.patch
@@ -33,7 +33,7 @@ diff --git a/scripts/nmk/scripts/include.mk b/scripts/nmk/scripts/include.mk
 index 04ccb3a..0d63bc7 100644
 --- a/scripts/nmk/scripts/include.mk
 +++ b/scripts/nmk/scripts/include.mk
-@@ -20,7 +20,7 @@ SUBARCH := $(shell uname -m | sed       \
+@@ -22,7 +22,7 @@ SUBARCH := $(shell uname -m | sed       \
                  -e s/aarch64.*/aarch64/)
  
  ARCH           ?= $(SUBARCH)
@@ -46,7 +46,7 @@ diff --git a/scripts/nmk/scripts/tools.mk b/scripts/nmk/scripts/tools.mk
 index 56dba84..1698821 100644
 --- a/scripts/nmk/scripts/tools.mk
 +++ b/scripts/nmk/scripts/tools.mk
-@@ -2,30 +2,30 @@ ifndef ____nmk_defined__tools
+@@ -2,31 +2,31 @@ ifndef ____nmk_defined__tools
  
  #
  # System tools shorthands
@@ -68,9 +68,7 @@ index 56dba84..1698821 100644
 -MKDIR          := mkdir -p
 -AWK            := awk
 -PERL           := perl
--PYTHON         := python
--FIND           := find
--SH             := $(shell if [ -x "$$BASH" ]; then echo $$BASH;        \
+-FULL_PYTHON    := $(shell which python2 2>/dev/null || which python3 2>/dev/null)
 +CC             ?= $(CROSS_COMPILE)$(HOSTCC)
 +CPP            ?= $(CC) -E
 +AS             ?= $(CROSS_COMPILE)as
@@ -83,7 +81,10 @@ index 56dba84..1698821 100644
 +MKDIR          ?= mkdir -p
 +AWK            ?= awk
 +PERL           ?= perl
-+PYTHON         ?= python
++FULL_PYTHON    ?= $(shell which python2 2>/dev/null || which python3 2>/dev/null)
+ PYTHON         ?= $(shell basename $(FULL_PYTHON))
+-FIND           := find
+-SH             := $(shell if [ -x "$$BASH" ]; then echo $$BASH;        \
 +FIND           ?= find
 +SH             ?= $(shell if [ -x "$$BASH" ]; then echo $$BASH;        \
                          else if [ -x /bin/bash ]; then echo /bin/bash;  \