singularity: fix build with python3

* Fix python3native inherit added in:
  https://git.yoctoproject.org/cgit/cgit.cgi/meta-virtualization/commit/?id=a1e3f5c92cdee7c4259b7be643bd829ce7c1efa3
  to actually work
* also remove the work arounds for /usr/bin/python being python3
  on the target device
* I haven't tested this in runtime - I don't use it, it was just
  showing that do_configure error in "bitbake world" builds, the
  scripts might need some changes to be really compatible with
  python3, but it was broken already, now it at least builds
* upgrade to new version with
  https://github.com/hpcng/singularity/pull/1762/commits/3c05f06e6a1c490a4b4714bcdf5a0ce2b2498bb5
  would be nice by someone who actually uses this

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

1 files changed, 3 insertions, 9 deletions

diff --git a/recipes-containers/singularity/singularity_git.bb b/recipes-containers/singularity/singularity_git.bb
index a2653529..103270dd 100644
--- a/recipes-containers/singularity/singularity_git.bb
+++ b/recipes-containers/singularity/singularity_git.bb
@@ -3,9 +3,6 @@
 INSANE_SKIP_${PN} += "dev-so"
 
 RDEPENDS_${PN} += "glibc python3 ca-certificates openssl bash e2fsprogs-mke2fs"
-# Singularity expects to find python3 under the name python, therefore both
-# cannot be installed at the same time.
-RCONFLICTS_${PN} = "python"
 
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYRIGHT.md;md5=be78c34e483dd7d8439358b1e024b294 \
@@ -13,7 +10,9 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT.md;md5=be78c34e483dd7d8439358b1e024b294 \
                     file://LICENSE.md;md5=df4326b473db6424033f1d98a5645e30 \
                     file://debian/copyright;md5=ed267cf386d9b75ab1f27f407e935b10"
 
-SRC_URI = "git://github.com/singularityware/singularity.git;protocol=https"
+SRC_URI = "git://github.com/singularityware/singularity.git;protocol=https \
+    file://0001-Use-python3.patch \
+"
 PV = "2.3.1+git${SRCPV}"
 SRCREV = "e214d4ebf0a1274b1c63b095fd55ae61c7e92947"
 
@@ -23,11 +22,6 @@ inherit python3native autotools-brokensep
 EXTRA_OECONF = "--prefix=/usr/local"
 
 pkg_postinst_${PN}() {
-    # Singularity requires "python" to resolve to "python3" within the commandline.
-    # This creates a symbolic link from python3 to python. A side-effect of this is
-    # that scripts which expect Python 2 may fail to run correctly.
-    ln -sr $D${bindir}/python3 $D${bindir}/python 
-
     # python3 expects CA certificates to be installed in a different place to where
     # they are actually installed. These lines link the two locations.
     rm -r $D${libdir}/ssl/certs