Skip to contentSkip to conversation

images/packagegroups: python2 only

PATCH New Tim Orling 1 participant 2 messages Dec 3, 2019

lore
Share & tools
lore

Tim Orling

author
#0 lore raw

PATCH 1/2 images/packagegroups: python2 only

Rename images and packagegroups so that they will not interfere with the similar recipes in meta-python.

Drop all python3 references, this layer is python2 only.

Fix ptest packagegroup, RDEPENDS on *-ptest.

---
 recipes-core/images/meta-python-image.bb      |  6 --
 ...age-base.bb => meta-python2-image-base.bb} |  0
 recipes-core/images/meta-python2-image.bb     |  5 ++
 ...t-image.bb => meta-python2-ptest-image.bb} |  0
 ...python.bb => packagegroup-meta-python2.bb} | 68 +------------------
 5 files changed, 7 insertions(+), 72 deletions(-)
 delete mode 100644 recipes-core/images/meta-python-image.bb
 rename recipes-core/images/{meta-python-image-base.bb => meta-python2-image-base.bb} (100%)
 create mode 100644 recipes-core/images/meta-python2-image.bb
 rename recipes-core/images/{meta-python-ptest-image.bb => meta-python2-ptest-image.bb} (100%)
 rename recipes-core/packagegroups/{packagegroup-meta-python.bb => packagegroup-meta-python2.bb} (53%)
recipes-core/images/meta-python-image.bb deleted +0 -6
deleted file mode 100644
index b0824233..00000000
@@ -1,6 +0,0 @@
-require  meta-python2-image-base.bb
-
-SUMMARY = "meta-python2 build test image"
-
-IMAGE_INSTALL += "packagegroup-meta-python2 \
-                  packagegroup-meta-python3"
recipes-core/images/meta-python2-image-base.bb renamed from recipes-core/images/meta-python-image-base.bb +0 -0
similarity index 100%
rename from recipes-core/images/meta-python-image-base.bb
rename to recipes-core/images/meta-python2-image-base.bb
recipes-core/images/meta-python2-image.bb new file +5 -0
new file mode 100644
index 00000000..9fe75ea0
@@ -0,0 +1,5 @@
+require  meta-python2-image-base.bb
+
+SUMMARY = "meta-python2 build test image"
+
+IMAGE_INSTALL += "packagegroup-meta-python2"
recipes-core/images/meta-python2-ptest-image.bb renamed from recipes-core/images/meta-python-ptest-image.bb +0 -0
similarity index 100%
rename from recipes-core/images/meta-python-ptest-image.bb
rename to recipes-core/images/meta-python2-ptest-image.bb
recipes-core/packagegroups/packagegroup-meta-python2.bb renamed from recipes-core/packagegroups/packagegroup-meta-python.bb +2 -66

93 lines not on this page · raw message

Signature · 1 line
2.24.0
author
#1 lore raw

PATCH 2/2 Enhance README, add kas, Pipfile and gitlab

Add strong language about the EOL of Python2 to
the README. Also include information about 'kas',
'Pipfile' and .gitlab-ci.yml

---
 .gitlab-ci.yml                   |  13 ++++
 Pipfile                          |  12 ++++
 Pipfile.lock                     | 102 +++++++++++++++++++++++++++++++
 README                           |  73 +++++++++++++++++++---
 kas-meta-python2-image-base.yml  |  26 ++++++++
 kas-meta-python2-image.yml       |   8 +++
 kas-meta-python2-ptest-image.yml |  22 +++++++
 7 files changed, 249 insertions(+), 7 deletions(-)
 create mode 100644 .gitlab-ci.yml
 create mode 100644 Pipfile
 create mode 100644 Pipfile.lock
 create mode 100644 kas-meta-python2-image-base.yml
 create mode 100644 kas-meta-python2-image.yml
 create mode 100644 kas-meta-python2-ptest-image.yml
.gitlab-ci.yml new file +13 -0
new file mode 100644
index 00000000..81807699
@@ -0,0 +1,13 @@
+image: kasproject/kas:latest
+
+meta-python2-image:
+  stage: build
+  script:
+    - kas build kas-meta-python2-image.yml
+
+meta-python2-ptest-image:
+  stage: build
+  script:
+    - kas build kas-meta-python2-ptest-image.yml
+    - kas build -c testimage kas-meta-python2-ptest-image.yml
+
Pipfile new file +12 -0
new file mode 100644
index 00000000..4f2828fd
@@ -0,0 +1,12 @@
+[[source]]
+url = "https://pypi.python.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+kas = "*"
+
+[dev-packages]
+
+[requires]
+python_version = "3.7"
Pipfile.lock new file +102 -0

102 lines not on this page · raw message

README +66 -7

99 lines not on this page · raw message

kas-meta-python2-image-base.yml new file +26 -0
new file mode 100644
index 00000000..9d63305c
@@ -0,0 +1,26 @@
+header:
+  version: 8
+
+machine: qemux86-64
+distro: poky
+target: meta-python2-image-base
+
+repos:
+  meta-python2:
+
+  poky:
+    url: https://git.yoctoproject.org/git/poky
+    refspec: zeus
+    layers:
+      meta:
+      meta-poky:
+
+  meta-openembedded:
+    url: http://git.openembedded.org/meta-openembedded
+    refspec: zeus
+    layers:
+      meta-oe:
+
+local_conf_header:
+  reduce_diskspace: |
+    INHERIT += "rm_work_and_downloads"
kas-meta-python2-image.yml new file +8 -0
new file mode 100644
index 00000000..f5d82ba7
@@ -0,0 +1,8 @@
+header:
+  version: 8
+  includes:
+    - kas-meta-python2-image-base.yml
+
+machine: qemux86-64
+distro: poky
+target: meta-python2-image
kas-meta-python2-ptest-image.yml new file +22 -0
new file mode 100644
index 00000000..3a15add5
@@ -0,0 +1,22 @@
+header:
+  version: 8
+  includes:
+    - kas-meta-python2-image-base.yml
+
+machine: qemux86-64
+distro: poky
+target: meta-python2-ptest-image
+
+local_conf_header:
+  enable_ptest_and_testimage: |
+    INHERIT += "rm_work_and_downloads"
+    IMAGE_CLASSES += " testimage"
+    DISTRO_FEAURES_append = " ptest"
+    EXTRA_IMAGE_FEATURES = "debug-tweaks"
+    TESTIMAGE_AUTO = "1"
+    TEST_SUITES = " ping ssh ptest"
+    TEST_QEMUPARAMS += "-smp 4 -m 8192"
+    TEST_RUNQEMUPARAMS += "kvm gl"
+    IMAGE_ROOTFS_SIZE ?= "8192"
+    IMAGE_ROOTFS_EXTRA_SPACE_append = "${@bb.utils.contains("DISTRO_FEATURES", "systemd", " + 4096", "", d)}"
+    IMAGE_INSTALL_append = " ptest-runner dropbear procps coreutils iproute2 sysstat"
Signature · 1 line
2.24.0