From 893259d724707190f763a980bc055ad9c87f7535 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Fri, 4 Sep 2015 18:21:27 +0100 Subject: core: Use python3 instead python2 From [1]: "Python 2.x is legacy, Python 3.x is the present and future of the language" As a reference, python3 is already the default python version in Arch, and other distros like Ubuntu/Debian [2] or Fedora [3] are planning to switch soon [1] https://wiki.python.org/moin/Python2orPython3 [2] https://wiki.ubuntu.com/Python/3 [3] https://fedoraproject.org/wiki/Changes/Python_3_as_Default Change-Id: I6d4d11844d4424bfa49b37fe7d9a3639547c0139 --- install-files/essential-files/usr/bin/brpaste | 12 ++-- strata/apache-httpd-server.morph | 2 +- strata/cloudinit-support.morph | 2 +- strata/core.morph | 16 ++--- strata/core/cpython.morph | 12 ---- strata/core/python3.morph | 13 ++++ strata/cross-bootstrap.morph | 2 +- strata/databases.morph | 2 +- strata/devtools.morph | 2 +- strata/django.morph | 2 +- strata/docutils.morph | 2 +- strata/foundation.morph | 1 + strata/glib-common.morph | 2 +- strata/gnome.morph | 2 +- strata/llvm-common.morph | 2 +- strata/mesa-common.morph | 2 +- strata/morph-utils.morph | 2 +- strata/python-cliapp.morph | 2 +- strata/python-common.morph | 2 +- strata/python-core.morph | 52 ---------------- strata/python-core/pyyaml.morph | 6 -- strata/python-pygobject.morph | 2 +- strata/python-tools.morph | 2 +- strata/python-wsgi.morph | 2 +- strata/python2-core.morph | 78 ++++++++++++++++++++++++ strata/python2-core/python2.morph | 13 ++++ strata/python2-core/pyyaml.morph | 6 ++ strata/python3-core.morph | 11 ---- strata/python3-core/python3.morph | 7 --- strata/trove.morph | 2 +- strata/virtualization.morph | 2 +- strata/xstatic.morph | 2 +- systems/build-system-armv5l-openbmc-aspeed.morph | 6 +- systems/build-system-armv7lhf-highbank.morph | 6 +- systems/build-system-armv7lhf-jetson.morph | 6 +- systems/build-system-armv8b64.morph | 6 +- systems/build-system-armv8l64.morph | 6 +- systems/build-system-ppc64.morph | 6 +- systems/build-system-x86_32-chroot.morph | 6 +- systems/build-system-x86_32.morph | 6 +- systems/build-system-x86_64-chroot.morph | 6 +- systems/build-system-x86_64.morph | 6 +- systems/ceph-service-x86_64-generic.morph | 6 +- systems/devel-system-armv7-chroot.morph | 6 +- systems/devel-system-armv7-highbank.morph | 6 +- systems/devel-system-armv7-versatile.morph | 6 +- systems/devel-system-armv7-wandboard.morph | 6 +- systems/devel-system-armv7b-chroot.morph | 6 +- systems/devel-system-armv7b-highbank.morph | 6 +- systems/devel-system-armv7lhf-chroot.morph | 6 +- systems/devel-system-armv7lhf-highbank.morph | 6 +- systems/devel-system-armv7lhf-jetson.morph | 6 +- systems/devel-system-armv7lhf-wandboard.morph | 6 +- systems/devel-system-armv8b64.morph | 6 +- systems/devel-system-armv8l64.morph | 6 +- systems/devel-system-ppc64-chroot.morph | 6 +- systems/devel-system-ppc64-generic.morph | 6 +- systems/devel-system-x86_32-chroot.morph | 6 +- systems/devel-system-x86_32-generic.morph | 6 +- systems/devel-system-x86_64-chroot.morph | 6 +- systems/devel-system-x86_64-generic.morph | 6 +- systems/devel-system-x86_64-vagrant.morph | 6 +- systems/gnome-system-x86_64.morph | 4 +- systems/installer-system-armv8b64.morph | 6 +- systems/installer-system-x86_64.morph | 6 +- systems/java-build-system-x86_64-generic.morph | 6 +- systems/openstack-system-x86_64.morph | 6 +- systems/swift-system-x86_64.morph | 6 +- systems/trove-system-x86_64.morph | 6 +- systems/xfce-system-x86_64.morph | 6 +- 70 files changed, 221 insertions(+), 272 deletions(-) delete mode 100644 strata/core/cpython.morph create mode 100644 strata/core/python3.morph delete mode 100644 strata/python-core.morph delete mode 100644 strata/python-core/pyyaml.morph create mode 100644 strata/python2-core.morph create mode 100644 strata/python2-core/python2.morph create mode 100644 strata/python2-core/pyyaml.morph delete mode 100644 strata/python3-core.morph delete mode 100644 strata/python3-core/python3.morph diff --git a/install-files/essential-files/usr/bin/brpaste b/install-files/essential-files/usr/bin/brpaste index 15f976b9..d2f9d867 100644 --- a/install-files/essential-files/usr/bin/brpaste +++ b/install-files/essential-files/usr/bin/brpaste @@ -1,6 +1,6 @@ -#!/usr/bin/python +#!/usr/bin/env python3 -import urllib2 +import urllib.request import os import json @@ -15,14 +15,14 @@ def run(*args): extensions = [None] for i, each in enumerate(content): - req = urllib2.Request(URL, each) - response = urllib2.urlopen(req) - the_page = response.read() + req = urllib.request.Request(URL, each.encode('utf-8')) + response = urllib.request.urlopen(req) + the_page = response.read().decode('utf-8') key = json.loads(the_page)['key'] url = "http://paste.baserock.org/%s" % key if extensions[i]: url += extensions[i] - print url + print(url) if __name__ == '__main__': import sys diff --git a/strata/apache-httpd-server.morph b/strata/apache-httpd-server.morph index 74aa72f5..3e32f7e5 100644 --- a/strata/apache-httpd-server.morph +++ b/strata/apache-httpd-server.morph @@ -4,7 +4,7 @@ description: apache http web server and some utilities related to it build-depends: - morph: strata/tools.morph - morph: strata/pcre-utils.morph -- morph: strata/python-core.morph +- morph: strata/python2-core.morph chunks: - name: apr morph: strata/apache-httpd-server/apr.morph diff --git a/strata/cloudinit-support.morph b/strata/cloudinit-support.morph index fc7d73ad..4cb15542 100644 --- a/strata/cloudinit-support.morph +++ b/strata/cloudinit-support.morph @@ -3,7 +3,7 @@ kind: stratum description: A stratum with cloudinit to fit a system in the OpenStack cloud. build-depends: - morph: strata/build-essential.morph -- morph: strata/python-core.morph +- morph: strata/python2-core.morph - morph: strata/python-common.morph - morph: strata/foundation.morph chunks: diff --git a/strata/core.morph b/strata/core.morph index 30add442..4d51b763 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -119,11 +119,11 @@ chunks: ref: 24adc227bc29cd17e39df097fbca389c7724cd14 unpetrify-ref: sqlite-autoconf-3080801 build-system: autotools -- name: cpython - morph: strata/core/cpython.morph +- name: python3 + morph: strata/core/python3.morph repo: upstream:cpython - ref: 57af3f22d11600ca98c0c9073d0b3b57d43f7c4b - unpetrify-ref: v2.7.10 + ref: 3f1e8a3de39ff8a807720d57f49a91d7449435ad + unpetrify-ref: v3.4.3 build-depends: - openssl-new - bzip2 @@ -139,7 +139,7 @@ chunks: unpetrify-ref: baserock/debian/20140325 build-depends: - automake - - cpython + - python3 - name: curl morph: strata/core/curl.morph repo: upstream:curl @@ -166,7 +166,7 @@ chunks: unpetrify-ref: v2.3.0 build-depends: - autoconf - - cpython + - python3 - curl - gettext-tarball - libexpat @@ -340,7 +340,7 @@ chunks: - autoconf - automake - file - - cpython + - python3 - libtool - xz - name: libxslt @@ -388,7 +388,7 @@ chunks: unpetrify-ref: 0.22 build-system: python-distutils build-depends: - - cpython + - python3 - name: gperf morph: strata/core/gperf.morph repo: upstream:gperf diff --git a/strata/core/cpython.morph b/strata/core/cpython.morph deleted file mode 100644 index e2f59278..00000000 --- a/strata/core/cpython.morph +++ /dev/null @@ -1,12 +0,0 @@ -name: cpython -kind: chunk -build-system: autotools -configure-commands: -- | - ./configure --prefix="$PREFIX" \ - --enable-shared \ - --with-ensurepip=upgrade \ - --with-system-expat \ - --with-system-ffi -post-install-commands: -- test -x "$DESTDIR"/"$PREFIX"/bin/python2 || ln -s python2.7 "$DESTDIR"/"$PREFIX"/bin/python2 diff --git a/strata/core/python3.morph b/strata/core/python3.morph new file mode 100644 index 00000000..0d730bc9 --- /dev/null +++ b/strata/core/python3.morph @@ -0,0 +1,13 @@ +name: python3 +kind: chunk +build-system: autotools +configure-commands: +- | + ./configure --prefix="$PREFIX" \ + --sysconfdir=/etc \ + --enable-shared \ + --with-system-expat \ + --with-system-ffi +post-install-commands: +- test -x "$DESTDIR"/"$PREFIX"/bin/python || ln -s python3.4 "$DESTDIR"/"$PREFIX"/bin/python +- test -x "$DESTDIR"/"$PREFIX"/bin/python3 || ln -s python3.4 "$DESTDIR"/"$PREFIX"/bin/python3 diff --git a/strata/cross-bootstrap.morph b/strata/cross-bootstrap.morph index e0c5991d..9248101a 100644 --- a/strata/cross-bootstrap.morph +++ b/strata/cross-bootstrap.morph @@ -3,7 +3,7 @@ kind: stratum description: The minimal development tools to build a baserock devel system build-depends: - morph: strata/core.morph -- morph: strata/python-core.morph +- morph: strata/python2-core.morph chunks: - name: groff morph: strata/cross-bootstrap/groff.morph diff --git a/strata/databases.morph b/strata/databases.morph index 1f8f7b8d..444cca9a 100644 --- a/strata/databases.morph +++ b/strata/databases.morph @@ -4,7 +4,7 @@ description: some popular databases and some utils related to databases build-depends: - morph: strata/tools.morph - morph: strata/nfs.morph -- morph: strata/python-core.morph +- morph: strata/python2-core.morph chunks: - name: postgresql repo: upstream:postgresql diff --git a/strata/devtools.morph b/strata/devtools.morph index 7bc8b581..c48d63ab 100644 --- a/strata/devtools.morph +++ b/strata/devtools.morph @@ -7,7 +7,7 @@ description: | stratum) build-depends: - morph: strata/core.morph -- morph: strata/python-core.morph +- morph: strata/python2-core.morph chunks: - name: nano morph: strata/devtools/nano.morph diff --git a/strata/django.morph b/strata/django.morph index 7da11a9f..27c1c662 100644 --- a/strata/django.morph +++ b/strata/django.morph @@ -3,7 +3,7 @@ kind: stratum description: Stratum with Django and its plugins and dependencies. build-depends: - morph: strata/foundation.morph -- morph: strata/python-core.morph +- morph: strata/python2-core.morph chunks: - name: django repo: upstream:python-packages/django diff --git a/strata/docutils.morph b/strata/docutils.morph index 4329bb42..e76cc7a2 100644 --- a/strata/docutils.morph +++ b/strata/docutils.morph @@ -2,7 +2,7 @@ name: docutils kind: stratum description: Stuff for generating documentation build-depends: -- morph: strata/core.morph +- morph: strata/python2-core.morph chunks: - name: xml-catalog morph: strata/docutils/xml-catalog.morph diff --git a/strata/foundation.morph b/strata/foundation.morph index ff18e4e7..5961dc50 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -3,6 +3,7 @@ kind: stratum description: Basic userland runtime system build-depends: - morph: strata/coreutils-common.morph +- morph: strata/python2-core.morph chunks: - name: bash-completion repo: upstream:bash-completion diff --git a/strata/glib-common.morph b/strata/glib-common.morph index 2976e7de..ffdc5b14 100644 --- a/strata/glib-common.morph +++ b/strata/glib-common.morph @@ -2,7 +2,7 @@ name: glib-common kind: stratum description: GLib and dependencies build-depends: -- morph: strata/core.morph +- morph: strata/python2-core.morph chunks: - name: gtk-doc-stub repo: upstream:gtk-doc-stub diff --git a/strata/gnome.morph b/strata/gnome.morph index 0c7dac0f..2dc0a7a5 100644 --- a/strata/gnome.morph +++ b/strata/gnome.morph @@ -11,7 +11,7 @@ build-depends: - morph: strata/multimedia-gstreamer.morph - morph: strata/network-security.morph - morph: strata/python-pygobject.morph -- morph: strata/python3-core.morph +- morph: strata/python2-core.morph - morph: strata/wayland-generic.morph - morph: strata/x-generic.morph chunks: diff --git a/strata/llvm-common.morph b/strata/llvm-common.morph index 794a7fc5..d8fdb14a 100644 --- a/strata/llvm-common.morph +++ b/strata/llvm-common.morph @@ -1,7 +1,7 @@ name: llvm-common kind: stratum build-depends: -- morph: strata/core.morph +- morph: strata/python2-core.morph chunks: - name: llvm morph: strata/llvm-common/llvm.morph diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph index 50faeaa9..f47fcf0e 100644 --- a/strata/mesa-common.morph +++ b/strata/mesa-common.morph @@ -5,7 +5,7 @@ build-depends: - morph: strata/llvm-common.morph - morph: strata/libdrm-common.morph - morph: strata/wayland-generic.morph -- morph: strata/python-core.morph +- morph: strata/python2-core.morph - morph: strata/x-common.morph chunks: - name: mesa diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index 83f19d6d..ded1bd3e 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -4,7 +4,7 @@ build-depends: - morph: strata/core.morph - morph: strata/ostree-core.morph - morph: strata/python-cliapp.morph -- morph: strata/python-core.morph +- morph: strata/python2-core.morph - morph: strata/python-pygobject.morph - morph: strata/python-wsgi.morph chunks: diff --git a/strata/python-cliapp.morph b/strata/python-cliapp.morph index fa5084e1..d143007d 100644 --- a/strata/python-cliapp.morph +++ b/strata/python-cliapp.morph @@ -3,7 +3,7 @@ kind: stratum description: | Cliapp command line application framework. build-depends: -- morph: strata/python-core.morph +- morph: strata/python2-core.morph chunks: - name: python-coveragepy morph: strata/python-cliapp/python-coveragepy.morph diff --git a/strata/python-common.morph b/strata/python-common.morph index 961a0a19..9d844a49 100644 --- a/strata/python-common.morph +++ b/strata/python-common.morph @@ -2,7 +2,7 @@ name: python-common kind: stratum description: Common dependencies of some python chunks build-depends: -- morph: strata/python-core.morph +- morph: strata/python2-core.morph chunks: - name: pycrypto morph: strata/python-common/pycrypto.morph diff --git a/strata/python-core.morph b/strata/python-core.morph deleted file mode 100644 index 3cc4a174..00000000 --- a/strata/python-core.morph +++ /dev/null @@ -1,52 +0,0 @@ -name: python-core -kind: stratum -description: Core python packages -build-depends: -- morph: strata/core.morph -chunks: -- name: python-setuptools - repo: upstream:python-setuptools-bitbucket - ref: 0aa6a4de5931d02876428388678802db2371fd37 - unpetrify-ref: baserock/master - build-system: python-distutils -- name: mako - repo: upstream:python-packages/mako.git - ref: 285bc818a50ccc0f9549630f7c4f4c250585c3e7 - unpetrify-ref: rel_1_0_0 - build-system: python-distutils - build-depends: - - python-setuptools -- name: pbr - repo: upstream:pbr - ref: aef4f7ef4faec987d553d1ca40b55951235af0b1 - unpetrify-ref: 0.10.7 - build-system: python-distutils - build-depends: - - python-setuptools -- name: python-requests - repo: upstream:python-requests - ref: b83131779c701720a9ae9efae78996277d416269 - unpetrify-ref: v2.5.1 - build-system: python-distutils -- name: six - repo: upstream:six - ref: 8cfbff6b764af86d825086fa1637aa009e90d75a - unpetrify-ref: 1.9.0 - build-system: python-distutils -- name: pyyaml - morph: strata/python-core/pyyaml.morph - repo: upstream:pyyaml - ref: d9fbcceaed39d955f6871b07c61dc42f824285c1 - unpetrify-ref: baserock/morph - build-depends: - - python-setuptools -- name: python-lxml - repo: upstream:python-lxml - ref: 14505bc62f5f1fc9fb0ff007955f3e67ab4562bb - unpetrify-ref: lxml-3.4.0 - build-system: python-distutils -- name: python-markdown - repo: upstream:python-markdown - ref: f0c5b71acbc02af60a33d67c59558bb513b25e74 - unpetrify-ref: 2.5.1-final - build-system: python-distutils diff --git a/strata/python-core/pyyaml.morph b/strata/python-core/pyyaml.morph deleted file mode 100644 index 8ebd7b57..00000000 --- a/strata/python-core/pyyaml.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: pyyaml -kind: chunk -build-commands: -- python setup.py --without-libyaml build -install-commands: -- python setup.py --without-libyaml install --prefix="$PREFIX" --root "$DESTDIR" diff --git a/strata/python-pygobject.morph b/strata/python-pygobject.morph index 53e9fd72..a6667be2 100644 --- a/strata/python-pygobject.morph +++ b/strata/python-pygobject.morph @@ -3,7 +3,7 @@ kind: stratum description: | Python GObject bindings build-depends: -- morph: strata/core.morph +- morph: strata/python2-core.morph - morph: strata/glib-common.morph chunks: - name: pygobject diff --git a/strata/python-tools.morph b/strata/python-tools.morph index bc466755..d61fe150 100644 --- a/strata/python-tools.morph +++ b/strata/python-tools.morph @@ -3,7 +3,7 @@ kind: stratum description: | A stratum for useful python tools that we don't want to include in core. build-depends: -- morph: strata/python-core.morph +- morph: strata/python2-core.morph chunks: - name: virtualenv repo: upstream:python-packages/virtualenv diff --git a/strata/python-wsgi.morph b/strata/python-wsgi.morph index 1472dc9b..cd72e398 100644 --- a/strata/python-wsgi.morph +++ b/strata/python-wsgi.morph @@ -3,7 +3,7 @@ kind: stratum description: | Python modules for web applications using Web Server Gateway Interface. build-depends: -- morph: strata/python-core.morph +- morph: strata/python2-core.morph chunks: - name: bottle repo: upstream:bottle diff --git a/strata/python2-core.morph b/strata/python2-core.morph new file mode 100644 index 00000000..ded49141 --- /dev/null +++ b/strata/python2-core.morph @@ -0,0 +1,78 @@ +name: python2-core +kind: stratum +description: Core python 2 packages +build-depends: +- morph: strata/core.morph +chunks: +- name: python2 + morph: strata/python2-core/python2.morph + repo: upstream:cpython + ref: 57af3f22d11600ca98c0c9073d0b3b57d43f7c4b + unpetrify-ref: v2.7.10 +- name: python-setuptools + repo: upstream:python-setuptools-bitbucket + ref: 0aa6a4de5931d02876428388678802db2371fd37 + unpetrify-ref: baserock/master + build-system: python-distutils + build-depends: + - python2 +- name: mako + repo: upstream:python-packages/mako.git + ref: 285bc818a50ccc0f9549630f7c4f4c250585c3e7 + unpetrify-ref: rel_1_0_0 + build-system: python-distutils + build-depends: + - python2 + - python-setuptools +- name: pbr + repo: upstream:pbr + ref: aef4f7ef4faec987d553d1ca40b55951235af0b1 + unpetrify-ref: 0.10.7 + build-system: python-distutils + build-depends: + - python2 + - python-setuptools +- name: python-requests + repo: upstream:python-requests + ref: b83131779c701720a9ae9efae78996277d416269 + unpetrify-ref: v2.5.1 + build-system: python-distutils + build-depends: + - python2 +- name: six + repo: upstream:six + ref: 8cfbff6b764af86d825086fa1637aa009e90d75a + unpetrify-ref: 1.9.0 + build-system: python-distutils + build-depends: + - python2 +- name: pyyaml + morph: strata/python2-core/pyyaml.morph + repo: upstream:pyyaml + ref: d9fbcceaed39d955f6871b07c61dc42f824285c1 + unpetrify-ref: baserock/morph + build-depends: + - python2 + - python-setuptools +- name: cython2 + repo: upstream:cython + ref: 4dd8e762fa51d01775506fbbc102c45dbcea065d + unpetrify-ref: 0.22 + build-system: python-distutils + build-depends: + - python2 +- name: python-lxml + repo: upstream:python-lxml + ref: 14505bc62f5f1fc9fb0ff007955f3e67ab4562bb + unpetrify-ref: lxml-3.4.0 + build-system: python-distutils + build-depends: + - python2 + - cython2 +- name: python-markdown + repo: upstream:python-markdown + ref: f0c5b71acbc02af60a33d67c59558bb513b25e74 + unpetrify-ref: 2.5.1-final + build-system: python-distutils + build-depends: + - python2 diff --git a/strata/python2-core/python2.morph b/strata/python2-core/python2.morph new file mode 100644 index 00000000..d5f6913a --- /dev/null +++ b/strata/python2-core/python2.morph @@ -0,0 +1,13 @@ +name: python2 +kind: chunk +build-system: autotools +configure-commands: +- | + ./configure --prefix="$PREFIX" \ + --enable-shared \ + --with-ensurepip=upgrade \ + --with-system-expat \ + --with-system-ffi +post-install-commands: +- ln -sf python2.7 "$DESTDIR"/"$PREFIX"/bin/python +- test -x "$DESTDIR"/"$PREFIX"/bin/python2 || ln -s python2.7 "$DESTDIR"/"$PREFIX"/bin/python2 diff --git a/strata/python2-core/pyyaml.morph b/strata/python2-core/pyyaml.morph new file mode 100644 index 00000000..8ebd7b57 --- /dev/null +++ b/strata/python2-core/pyyaml.morph @@ -0,0 +1,6 @@ +name: pyyaml +kind: chunk +build-commands: +- python setup.py --without-libyaml build +install-commands: +- python setup.py --without-libyaml install --prefix="$PREFIX" --root "$DESTDIR" diff --git a/strata/python3-core.morph b/strata/python3-core.morph deleted file mode 100644 index f0da65fc..00000000 --- a/strata/python3-core.morph +++ /dev/null @@ -1,11 +0,0 @@ -name: python3-core -kind: stratum -description: Core python3 packages -build-depends: -- morph: strata/core.morph -chunks: -- name: python3 - morph: strata/python3-core/python3.morph - repo: upstream:cpython - ref: 3f1e8a3de39ff8a807720d57f49a91d7449435ad - unpetrify-ref: v3.4.3 diff --git a/strata/python3-core/python3.morph b/strata/python3-core/python3.morph deleted file mode 100644 index fa7bedc9..00000000 --- a/strata/python3-core/python3.morph +++ /dev/null @@ -1,7 +0,0 @@ -name: python3 -kind: chunk -build-system: autotools -configure-commands: -- ./configure --prefix="$PREFIX" --sysconfdir=/etc --enable-shared -post-install-commands: -- test -x "$DESTDIR"/"$PREFIX"/bin/python3 || ln -s python3.4 "$DESTDIR"/"$PREFIX"/bin/python3 diff --git a/strata/trove.morph b/strata/trove.morph index 984050b7..026c6870 100644 --- a/strata/trove.morph +++ b/strata/trove.morph @@ -2,7 +2,7 @@ name: trove kind: stratum description: Trove software build-depends: -- morph: strata/python-core.morph +- morph: strata/python2-core.morph - morph: strata/tools.morph - morph: strata/morph-utils.morph - morph: strata/pcre-utils.morph diff --git a/strata/virtualization.morph b/strata/virtualization.morph index fe02f0f8..f58018b6 100644 --- a/strata/virtualization.morph +++ b/strata/virtualization.morph @@ -7,7 +7,7 @@ description: | for example. build-depends: - morph: strata/libsoup-common.morph -- morph: strata/python-core.morph +- morph: strata/python2-core.morph - morph: strata/python-pygobject.morph - morph: strata/connman-common.morph - morph: strata/lvm.morph diff --git a/strata/xstatic.morph b/strata/xstatic.morph index 64b1fc64..e396003b 100644 --- a/strata/xstatic.morph +++ b/strata/xstatic.morph @@ -10,7 +10,7 @@ description: | but it is required right now for the Openstack system to work. build-depends: - morph: strata/foundation.morph -- morph: strata/python-core.morph +- morph: strata/python2-core.morph chunks: - name: xstatic repo: upstream:xstatic diff --git a/systems/build-system-armv5l-openbmc-aspeed.morph b/systems/build-system-armv5l-openbmc-aspeed.morph index 922d49f1..699f8b7e 100644 --- a/systems/build-system-armv5l-openbmc-aspeed.morph +++ b/systems/build-system-armv5l-openbmc-aspeed.morph @@ -11,10 +11,8 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: bsp-armv5l-openbmc-aspeed morph: strata/bsp-armv5l-openbmc-aspeed.morph - name: tools diff --git a/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph index fa96ca02..752655af 100644 --- a/systems/build-system-armv7lhf-highbank.morph +++ b/systems/build-system-armv7lhf-highbank.morph @@ -10,10 +10,8 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: bsp-armv7-highbank morph: strata/bsp-armv7-highbank.morph - name: tools diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph index 2e180a6e..928d4c9f 100644 --- a/systems/build-system-armv7lhf-jetson.morph +++ b/systems/build-system-armv7lhf-jetson.morph @@ -10,10 +10,8 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: bsp-jetson morph: strata/bsp-jetson.morph - name: tools diff --git a/systems/build-system-armv8b64.morph b/systems/build-system-armv8b64.morph index 27757027..75864921 100644 --- a/systems/build-system-armv8b64.morph +++ b/systems/build-system-armv8b64.morph @@ -13,10 +13,8 @@ strata: morph: strata/foundation.morph - name: bsp-armv8b64-generic morph: strata/bsp-armv8b64-generic.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: tools morph: strata/tools.morph - name: python-cliapp diff --git a/systems/build-system-armv8l64.morph b/systems/build-system-armv8l64.morph index 2f9560c4..da6e45a1 100644 --- a/systems/build-system-armv8l64.morph +++ b/systems/build-system-armv8l64.morph @@ -11,10 +11,8 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: bsp-armv8l64-generic morph: strata/bsp-armv8l64-generic.morph - name: tools diff --git a/systems/build-system-ppc64.morph b/systems/build-system-ppc64.morph index 5c2851bf..0e8bcfc1 100644 --- a/systems/build-system-ppc64.morph +++ b/systems/build-system-ppc64.morph @@ -10,10 +10,8 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: bsp-ppc64-generic morph: strata/bsp-ppc64-generic.morph - name: tools diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph index bfd77b8e..ba2d6b04 100644 --- a/systems/build-system-x86_32-chroot.morph +++ b/systems/build-system-x86_32-chroot.morph @@ -10,10 +10,8 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: tools morph: strata/tools.morph - name: python-cliapp diff --git a/systems/build-system-x86_32.morph b/systems/build-system-x86_32.morph index fe35055f..61d339da 100644 --- a/systems/build-system-x86_32.morph +++ b/systems/build-system-x86_32.morph @@ -10,10 +10,8 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: bsp-x86_32-generic morph: strata/bsp-x86_32-generic.morph - name: tools diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph index 3bbdd914..48463cd2 100644 --- a/systems/build-system-x86_64-chroot.morph +++ b/systems/build-system-x86_64-chroot.morph @@ -10,10 +10,8 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: tools morph: strata/tools.morph - name: python-cliapp diff --git a/systems/build-system-x86_64.morph b/systems/build-system-x86_64.morph index b5e39f73..0abf5925 100644 --- a/systems/build-system-x86_64.morph +++ b/systems/build-system-x86_64.morph @@ -10,10 +10,8 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: bsp-x86_64-generic morph: strata/bsp-x86_64-generic.morph - name: tools diff --git a/systems/ceph-service-x86_64-generic.morph b/systems/ceph-service-x86_64-generic.morph index 9a36b850..803d002f 100644 --- a/systems/ceph-service-x86_64-generic.morph +++ b/systems/ceph-service-x86_64-generic.morph @@ -50,10 +50,8 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: python-common morph: strata/python-common.morph - name: chef diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph index 6fe76927..b93900cd 100644 --- a/systems/devel-system-armv7-chroot.morph +++ b/systems/devel-system-armv7-chroot.morph @@ -35,10 +35,8 @@ strata: morph: strata/lorry.morph - name: baserock-import morph: strata/baserock-import.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: python-tools morph: strata/python-tools.morph - name: python-common diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph index 9305bd55..b59efbd5 100644 --- a/systems/devel-system-armv7-highbank.morph +++ b/systems/devel-system-armv7-highbank.morph @@ -36,10 +36,8 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: python-tools morph: strata/python-tools.morph - name: python-common diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph index fc1ee9c5..87c21e84 100644 --- a/systems/devel-system-armv7-versatile.morph +++ b/systems/devel-system-armv7-versatile.morph @@ -36,10 +36,8 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: python-tools morph: strata/python-tools.morph - name: python-common diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph index 4d6eabff..7935bfbb 100644 --- a/systems/devel-system-armv7-wandboard.morph +++ b/systems/devel-system-armv7-wandboard.morph @@ -36,10 +36,8 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: python-tools morph: strata/python-tools.morph - name: python-common diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph index 01187420..17e20852 100644 --- a/systems/devel-system-armv7b-chroot.morph +++ b/systems/devel-system-armv7b-chroot.morph @@ -27,10 +27,8 @@ strata: morph: strata/openstack-clients.morph - name: baserock-import morph: strata/baserock-import.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: python-tools morph: strata/python-tools.morph - name: python-common diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph index acd68b5f..a632087d 100644 --- a/systems/devel-system-armv7b-highbank.morph +++ b/systems/devel-system-armv7b-highbank.morph @@ -32,10 +32,8 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: python-tools morph: strata/python-tools.morph - name: python-common diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph index 180779d9..a5065d6e 100644 --- a/systems/devel-system-armv7lhf-chroot.morph +++ b/systems/devel-system-armv7lhf-chroot.morph @@ -35,10 +35,8 @@ strata: morph: strata/lorry.morph - name: baserock-import morph: strata/baserock-import.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: python-tools morph: strata/python-tools.morph - name: python-common diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph index 8660e698..95feecb2 100644 --- a/systems/devel-system-armv7lhf-highbank.morph +++ b/systems/devel-system-armv7lhf-highbank.morph @@ -39,10 +39,8 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: python-tools morph: strata/python-tools.morph - name: python-common diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph index bac4f2ab..e4e7a717 100644 --- a/systems/devel-system-armv7lhf-jetson.morph +++ b/systems/devel-system-armv7lhf-jetson.morph @@ -39,10 +39,8 @@ strata: morph: strata/lorry.morph - name: baserock-import morph: strata/baserock-import.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: python-tools morph: strata/python-tools.morph - name: python-common diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph index c11bbbb6..7f99d234 100644 --- a/systems/devel-system-armv7lhf-wandboard.morph +++ b/systems/devel-system-armv7lhf-wandboard.morph @@ -39,10 +39,8 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: python-tools morph: strata/python-tools.morph - name: python-common diff --git a/systems/devel-system-armv8b64.morph b/systems/devel-system-armv8b64.morph index 001de4b5..17cf9c72 100644 --- a/systems/devel-system-armv8b64.morph +++ b/systems/devel-system-armv8b64.morph @@ -40,10 +40,8 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: python-tools morph: strata/python-tools.morph - name: python-common diff --git a/systems/devel-system-armv8l64.morph b/systems/devel-system-armv8l64.morph index cde9fe18..c08fcd49 100644 --- a/systems/devel-system-armv8l64.morph +++ b/systems/devel-system-armv8l64.morph @@ -38,10 +38,8 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: python-tools morph: strata/python-tools.morph - name: python-common diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph index 59b03bdd..e4ade5e8 100644 --- a/systems/devel-system-ppc64-chroot.morph +++ b/systems/devel-system-ppc64-chroot.morph @@ -33,10 +33,8 @@ strata: morph: strata/lorry.morph - name: baserock-import morph: strata/baserock-import.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: python-tools morph: strata/python-tools.morph - name: python-common diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph index 0a077609..74e27416 100644 --- a/systems/devel-system-ppc64-generic.morph +++ b/systems/devel-system-ppc64-generic.morph @@ -36,10 +36,8 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: python-tools morph: strata/python-tools.morph - name: python-common diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph index b071abfc..55d41b12 100644 --- a/systems/devel-system-x86_32-chroot.morph +++ b/systems/devel-system-x86_32-chroot.morph @@ -35,10 +35,8 @@ strata: morph: strata/lorry.morph - name: baserock-import morph: strata/baserock-import.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: python-tools morph: strata/python-tools.morph - name: python-common diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph index 9f792f30..3e2abab2 100644 --- a/systems/devel-system-x86_32-generic.morph +++ b/systems/devel-system-x86_32-generic.morph @@ -40,10 +40,8 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: python-tools morph: strata/python-tools.morph - name: python-common diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph index 5be9910c..b55988c3 100644 --- a/systems/devel-system-x86_64-chroot.morph +++ b/systems/devel-system-x86_64-chroot.morph @@ -37,10 +37,8 @@ strata: morph: strata/lorry.morph - name: baserock-import morph: strata/baserock-import.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: python-tools morph: strata/python-tools.morph - name: python-common diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph index ae0c97e8..ad4a87d6 100644 --- a/systems/devel-system-x86_64-generic.morph +++ b/systems/devel-system-x86_64-generic.morph @@ -40,10 +40,8 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: python-tools morph: strata/python-tools.morph - name: python-common diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph index 4a91f84b..58dcf2bc 100644 --- a/systems/devel-system-x86_64-vagrant.morph +++ b/systems/devel-system-x86_64-vagrant.morph @@ -38,10 +38,8 @@ strata: morph: strata/lorry.morph - name: baserock-import morph: strata/baserock-import.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: python-tools morph: strata/python-tools.morph - name: python-common diff --git a/systems/gnome-system-x86_64.morph b/systems/gnome-system-x86_64.morph index ecec7a1f..8c1e4a75 100644 --- a/systems/gnome-system-x86_64.morph +++ b/systems/gnome-system-x86_64.morph @@ -35,8 +35,8 @@ strata: morph: strata/multimedia-common.morph - name: multimedia-gstreamer morph: strata/multimedia-gstreamer.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: python-pygobject morph: strata/python-pygobject.morph - name: libsoup-common diff --git a/systems/installer-system-armv8b64.morph b/systems/installer-system-armv8b64.morph index 860a6231..824e2dab 100644 --- a/systems/installer-system-armv8b64.morph +++ b/systems/installer-system-armv8b64.morph @@ -8,10 +8,8 @@ strata: morph: strata/build-essential.morph - name: core morph: strata/core.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: foundation morph: strata/foundation.morph - name: bsp-armv8b64-generic diff --git a/systems/installer-system-x86_64.morph b/systems/installer-system-x86_64.morph index 1e854f33..aa102c15 100644 --- a/systems/installer-system-x86_64.morph +++ b/systems/installer-system-x86_64.morph @@ -8,10 +8,8 @@ strata: morph: strata/build-essential.morph - name: core morph: strata/core.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: foundation morph: strata/foundation.morph - name: bsp-x86_64-generic diff --git a/systems/java-build-system-x86_64-generic.morph b/systems/java-build-system-x86_64-generic.morph index f0830980..b60637ba 100644 --- a/systems/java-build-system-x86_64-generic.morph +++ b/systems/java-build-system-x86_64-generic.morph @@ -43,10 +43,8 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: python-tools morph: strata/python-tools.morph - name: python-common diff --git a/systems/openstack-system-x86_64.morph b/systems/openstack-system-x86_64.morph index 8c191be6..7cb8c20f 100644 --- a/systems/openstack-system-x86_64.morph +++ b/systems/openstack-system-x86_64.morph @@ -7,10 +7,8 @@ strata: morph: strata/build-essential.morph - name: core morph: strata/core.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: python-pygobject morph: strata/python-pygobject.morph - name: python-common diff --git a/systems/swift-system-x86_64.morph b/systems/swift-system-x86_64.morph index 139c0028..f850ec45 100644 --- a/systems/swift-system-x86_64.morph +++ b/systems/swift-system-x86_64.morph @@ -15,10 +15,8 @@ strata: morph: strata/swift.morph - name: ntpd morph: strata/ntpd.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: python-common morph: strata/python-common.morph - name: ansible diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph index 3ffb8995..bd0a0ff4 100644 --- a/systems/trove-system-x86_64.morph +++ b/systems/trove-system-x86_64.morph @@ -11,10 +11,8 @@ strata: morph: strata/foundation.morph - name: core morph: strata/core.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: tools morph: strata/tools.morph - name: python-cliapp diff --git a/systems/xfce-system-x86_64.morph b/systems/xfce-system-x86_64.morph index da23ecb9..fedddd57 100644 --- a/systems/xfce-system-x86_64.morph +++ b/systems/xfce-system-x86_64.morph @@ -9,10 +9,8 @@ strata: morph: strata/core.morph - name: coreutils-common morph: strata/coreutils-common.morph -- name: python-core - morph: strata/python-core.morph -- name: python3-core - morph: strata/python3-core.morph +- name: python2-core + morph: strata/python2-core.morph - name: foundation morph: strata/foundation.morph - name: bsp-x86_64-generic -- cgit v1.2.1