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 --- 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 ++---- 38 files changed, 76 insertions(+), 150 deletions(-) (limited to 'systems') 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