Skip to contentSkip to conversation

Refactor to conform to YP Compat requirements

PATCH In review Armin Kuster 2 participants 4 messages Apr 20, 2018 – Apr 23, 2018

lore
Share & tools
lore

Armin Kuster

author
#0 lore raw

PATCH 1/2 Refactor to conform to YP Compat requirements

This prevents the signature from being modified

Signed-off-by Armin Kuster <[email protected]>
---
 recipes-core/busybox/busybox_%.bbappend              | 11 +----------
 recipes-core/busybox/busybox_virtualization.inc      | 10 ++++++++++
 .../iptables/iptables-meta-virtualization.inc        | 19 +++++++++++++++++++
 recipes-extended/iptables/iptables_1.%.bbappend      | 20 +-------------------
 4 files changed, 31 insertions(+), 29 deletions(-)
 create mode 100644 recipes-core/busybox/busybox_virtualization.inc
 create mode 100644 recipes-extended/iptables/iptables-meta-virtualization.inc
recipes-core/busybox/busybox_%.bbappend +1 -10
index 8369a03..617cacc 100644
@@ -1,10 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += " \
-	    file://lspci.cfg \
-	    file://lsusb.cfg \
-	    file://mdev.cfg \
-	    file://mount-cifs.cfg \
-	    file://ps-extras.cfg \
-	    file://getopt.cfg \
-           "
+require ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', '${BPN}_virtualization.inc', '', d)}
recipes-core/busybox/busybox_virtualization.inc new file +10 -0
new file mode 100644
index 0000000..d9c4e67
@@ -0,0 +1,10 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/busybox:"
+
+SRC_URI += " \
+	    file://lspci.cfg \
+	    file://lsusb.cfg \
+	    file://mdev.cfg \
+	    file://mount-cifs.cfg \
+	    file://ps-extras.cfg \
+	    file://getopt.cfg \
+           "
recipes-extended/iptables/iptables-meta-virtualization.inc new file +19 -0
new file mode 100644
index 0000000..8fd521c
@@ -0,0 +1,19 @@
+RRECOMMENDS_${PN} += "kernel-module-ip6-tables \
+                      kernel-module-ip-tables \
+                      kernel-module-ip6table-filter \
+                      kernel-module-iptable-filter \
+                      kernel-module-ip6table-raw \
+                      kernel-module-iptable-raw \
+                      kernel-module-ip6table-nat \
+                      kernel-module-iptable-nat \
+                      kernel-module-ip6table-mangle \
+                      kernel-module-iptable-magle \
+                      kernel-module-ip6table-security \
+                      kernel-module-iptable-security \
+                      kernel-module-ipt-reject \
+                      kernel-module-iptable-mangle \
+                      kernel-module-xt-checksum \
+                      kernel-module-xt-conntrack \
+                      kernel-module-xt-state \
+                      kernel-module-xt-tcpudp \
+                      "
recipes-extended/iptables/iptables_1.%.bbappend +1 -19
index 8fd521c..9a15e60 100644
@@ -1,19 +1 @@
-RRECOMMENDS_${PN} += "kernel-module-ip6-tables \
-                      kernel-module-ip-tables \
-                      kernel-module-ip6table-filter \
-                      kernel-module-iptable-filter \
-                      kernel-module-ip6table-raw \
-                      kernel-module-iptable-raw \
-                      kernel-module-ip6table-nat \
-                      kernel-module-iptable-nat \
-                      kernel-module-ip6table-mangle \
-                      kernel-module-iptable-magle \
-                      kernel-module-ip6table-security \
-                      kernel-module-iptable-security \
-                      kernel-module-ipt-reject \
-                      kernel-module-iptable-mangle \
-                      kernel-module-xt-checksum \
-                      kernel-module-xt-conntrack \
-                      kernel-module-xt-state \
-                      kernel-module-xt-tcpudp \
-                      "
+require ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', '${BPN}-meta-virtualization.inc', '', d)}
Signature · 1 line
2.14.1
author
#1 lore raw

PATCH 2/2 refactor for YP Compat for PV changes

Only include our versions of recipes if virtualiztions is in DISTRO_FEATURE

Signed-off-by Armin Kuster <[email protected]>
---
 conf/distro/include/meta-virt-default-versions.inc | 9 +++++++++
 conf/layer.conf                                    | 2 ++
 recipes-devtools/python/python-blinker_1.3.bb      | 2 ++
 recipes-devtools/python/python-gevent_1.0.1.bb     | 4 +++-
 recipes-devtools/python/python-m2crypto_0.22.3.bb  | 2 ++
 recipes-devtools/python/python-pyyaml_3.11.bb      | 2 ++
 recipes-devtools/python/python-redis_2.10.3.bb     | 2 ++
 recipes-devtools/python/python-sqlalchemy_1.1.5.bb | 2 ++
 recipes-devtools/python/python-werkzeug_0.10.4.bb  | 2 ++
 9 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 conf/distro/include/meta-virt-default-versions.inc
conf/distro/include/meta-virt-default-versions.inc new file +9 -0
new file mode 100644
index 0000000..27e7b90
@@ -0,0 +1,9 @@
+# Meta-virtuailization PREFERED_VERSION
+
+PREFERRED_VERSION_python-blinker = "1.3"
+PREFERRED_VERSION_python-gevent = "1.0.1"
+PREFERRED_VERSION_python-m2crypto = "0.22.3"
+PREFERRED_VERSION_python-pyyaml = "3.11"
+PREFERRED_VERSION_python-redis = "2.10.3"
+PREFERRED_VERSION_python-sqlalchemy = "1.1.5"
+PREFERRED_VERSION_python-werkzeug = "0.10.4"
conf/layer.conf +2 -0
index 4233d39..fa2e015 100644
@@ -26,3 +26,5 @@ PREFERRED_PROVIDER_virtual/containerd ?= "containerd-opencontainers"
 # Sanity check for meta-virtualization layer.
 # Setting SKIP_META_VIRT_SANITY_CHECK to "1" would skip the bbappend files check.
 INHERIT += "sanity-meta-virt"
+
+require ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'meta-virt-default-versions.inc', '', d)}
recipes-devtools/python/python-blinker_1.3.bb +2 -0
index 24e19b5..8abb9c0 100644
@@ -18,5 +18,7 @@ SRC_URI[sha256sum] = "6811010809262261e41ab7b92f3f6d23f35cf816fbec2bc05077992eeb
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
+DEFAULT_PREFERENCE = "-1"
+
 inherit setuptools
recipes-devtools/python/python-gevent_1.0.1.bb +3 -1
index 7f1d262..8cd1388 100644
@@ -25,4 +25,6 @@ SRC_URI += "file://gevent-allow-ssl-v2-or-v3-certificates.patch"
 # so always force a cross compile
 do_configure_append() {
 	sed -i -e 's/^cross_compiling=no/cross_compiling=yes/' ${S}/libev/configure
-}
\ No newline at end of file
+}
+
+DEFAULT_PREFERENCE = "-1"
recipes-devtools/python/python-m2crypto_0.22.3.bb +2 -0
index 2c2625d..e151dcc 100644
@@ -22,6 +22,8 @@ SRC_URI += " \
 SRC_URI[md5sum] = "573f21aaac7d5c9549798e72ffcefedd"
 SRC_URI[sha256sum] = "6071bfc817d94723e9b458a010d565365104f84aa73f7fe11919871f7562ff72"
 
+DEFAULT_PREFERENCE = "-1"
+
 inherit setuptools pypi
 
 DEPENDS += "openssl swig-native"
recipes-devtools/python/python-pyyaml_3.11.bb +2 -0
index cb1db8c..ecb1719 100644
@@ -25,6 +25,8 @@ SRC_URI[sha256sum] = "c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
+DEFAULT_PREFERENCE = "-1"
+
 inherit setuptools
 
 DEPENDS += "libyaml python-cython-native"
recipes-devtools/python/python-redis_2.10.3.bb +2 -0
index 9eda8a5..2ef2b6b 100644
@@ -15,6 +15,8 @@ SRC_URI[sha256sum] = "a4fb37b02860f6b1617f6469487471fd086dd2d38bbce640c2055862b9
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
+DEFAULT_PREFERENCE = "-1"
+
 inherit setuptools
 
 RDEPENDS_${PN} = "redis"
recipes-devtools/python/python-sqlalchemy_1.1.5.bb +2 -0
index 63caeb4..f22d272 100644
@@ -13,4 +13,6 @@ SRC_URI[sha256sum] = "68fb40049690e567ebda7b270176f5abf0d53d9fbd515fec4e43326f60
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
+DEFAULT_PREFERENCE = "-1"
+
 inherit setuptools
recipes-devtools/python/python-werkzeug_0.10.4.bb +2 -0
index 763e5b9..5f3e01f 100644
@@ -14,6 +14,8 @@ SRC_URI[sha256sum] = "9d2771e4c89be127bc4bac056ab7ceaf0e0064c723d6b6e195739c3af4
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
+DEFAULT_PREFERENCE = "-1"
+
 inherit setuptools
 
 RDEPENDS_${PN} += "python-io \
Signature · 1 line
2.14.1
#2 lore raw

Re: [PATCH 2/2] refactor for YP Compat for PV changes

merged

Bruce

Quoted 158 lines · Armin Kuster

Only include our versions of recipes if virtualiztions is in DISTRO_FEATURE

Signed-off-by Armin Kuster <[email protected]>
---
 conf/distro/include/meta-virt-default-versions.inc | 9 +++++++++
 conf/layer.conf                                    | 2 ++
 recipes-devtools/python/python-blinker_1.3.bb      | 2 ++
 recipes-devtools/python/python-gevent_1.0.1.bb     | 4 +++-
 recipes-devtools/python/python-m2crypto_0.22.3.bb  | 2 ++
 recipes-devtools/python/python-pyyaml_3.11.bb      | 2 ++
 recipes-devtools/python/python-redis_2.10.3.bb     | 2 ++
 recipes-devtools/python/python-sqlalchemy_1.1.5.bb | 2 ++
 recipes-devtools/python/python-werkzeug_0.10.4.bb  | 2 ++
 9 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 conf/distro/include/meta-virt-default-versions.inc
conf/distro/include/meta-virt-default-versions.inc new file +9 -0
new file mode 100644
index 0000000..27e7b90
@@ -0,0 +1,9 @@
+# Meta-virtuailization PREFERED_VERSION
+
+PREFERRED_VERSION_python-blinker = "1.3"
+PREFERRED_VERSION_python-gevent = "1.0.1"
+PREFERRED_VERSION_python-m2crypto = "0.22.3"
+PREFERRED_VERSION_python-pyyaml = "3.11"
+PREFERRED_VERSION_python-redis = "2.10.3"
+PREFERRED_VERSION_python-sqlalchemy = "1.1.5"
+PREFERRED_VERSION_python-werkzeug = "0.10.4"
conf/layer.conf +0 -0
index 4233d39..fa2e015 100644
@@ -26,3 +26,5 @@ PREFERRED_PROVIDER_virtual/containerd ?=

"containerd-opencontainers"
# Sanity check for meta-virtualization layer.
# Setting SKIP_META_VIRT_SANITY_CHECK to "1" would skip the bbappend
files check.
INHERIT += "sanity-meta-virt"

conf/layer.conf +2 -0
+
+require ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization',

'meta-virt-default-versions.inc', '', d)}

recipes-devtools/python/python-blinker_1.3.bb +0 -0
index 24e19b5..8abb9c0 100644
@@ -18,5 +18,7 @@ SRC_URI[sha256sum] = "6811010809262261e41ab7b92f3f6d

23f35cf816fbec2bc05077992eeb

S = "${WORKDIR}/${SRCNAME}-${PV}"

recipes-devtools/python/python-blinker_1.3.bb +2 -0
+DEFAULT_PREFERENCE = "-1"
+
 inherit setuptools
recipes-devtools/python/python-gevent_1.0.1.bb +0 -0
index 7f1d262..8cd1388 100644
@@ -25,4 +25,6 @@ SRC_URI += "file://gevent-allow-ssl-v2-

or-v3-certificates.patch"

 # so always force a cross compile
 do_configure_append() {
        sed -i -e 's/^cross_compiling=no/cross_compiling=yes/'
${S}/libev/configure
recipes-devtools/python/python-gevent_1.0.1.bb +3 -1
-}
\ No newline at end of file
+}
+
+DEFAULT_PREFERENCE = "-1"
recipes-devtools/python/python-m2crypto_0.22.3.bb +0 -0
index 2c2625d..e151dcc 100644
@@ -22,6 +22,8 @@ SRC_URI += " \
 SRC_URI[md5sum] = "573f21aaac7d5c9549798e72ffcefedd"
 SRC_URI[sha256sum] = "6071bfc817d94723e9b458a010d565

365104f84aa73f7fe11919871f7562ff72"

recipes-devtools/python/python-m2crypto_0.22.3.bb +2 -0
+DEFAULT_PREFERENCE = "-1"
+
 inherit setuptools pypi
 
 DEPENDS += "openssl swig-native"
recipes-devtools/python/python-pyyaml_3.11.bb +0 -0
index cb1db8c..ecb1719 100644
@@ -25,6 +25,8 @@ SRC_URI[sha256sum] = "c36c938a872e5ff494938b33b14aaa

156cb439ec67548fcab3535bb78b

S = "${WORKDIR}/${SRCNAME}-${PV}"

recipes-devtools/python/python-pyyaml_3.11.bb +2 -0
+DEFAULT_PREFERENCE = "-1"
+
 inherit setuptools
 
 DEPENDS += "libyaml python-cython-native"
recipes-devtools/python/python-redis_2.10.3.bb +0 -0
index 9eda8a5..2ef2b6b 100644
@@ -15,6 +15,8 @@ SRC_URI[sha256sum] = "a4fb37b02860f6b1617f6469487471

fd086dd2d38bbce640c2055862b9

S = "${WORKDIR}/${SRCNAME}-${PV}"

recipes-devtools/python/python-redis_2.10.3.bb +2 -0
+DEFAULT_PREFERENCE = "-1"
+
 inherit setuptools
 
 RDEPENDS_${PN} = "redis"
recipes-devtools/python/python-sqlalchemy_1.1.5.bb +0 -0
index 63caeb4..f22d272 100644
@@ -13,4 +13,6 @@ SRC_URI[sha256sum] = "68fb40049690e567ebda7b270176f5

abf0d53d9fbd515fec4e43326f60

S = "${WORKDIR}/${SRCNAME}-${PV}"

recipes-devtools/python/python-sqlalchemy_1.1.5.bb +2 -0
+DEFAULT_PREFERENCE = "-1"
+
 inherit setuptools
recipes-devtools/python/python-werkzeug_0.10.4.bb +0 -0
index 763e5b9..5f3e01f 100644
@@ -14,6 +14,8 @@ SRC_URI[sha256sum] = "9d2771e4c89be127bc4bac056ab7ce

af0e0064c723d6b6e195739c3af4

S = "${WORKDIR}/${SRCNAME}-${PV}"

recipes-devtools/python/python-werkzeug_0.10.4.bb +2 -1
+DEFAULT_PREFERENCE = "-1"
+
 inherit setuptools
 
 RDEPENDS_${PN} += "python-io \
--

2.14.1

--
_______________________________________________
meta-virtualization mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-virtualization

Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end"
#3 lore raw
In reply to Armin Kuster

merged

Bruce

Quoted 112 lines · Armin Kuster

This prevents the signature from being modified

Signed-off-by Armin Kuster <[email protected]>
---
 recipes-core/busybox/busybox_%.bbappend              | 11 +----------
 recipes-core/busybox/busybox_virtualization.inc      | 10 ++++++++++
 .../iptables/iptables-meta-virtualization.inc        | 19
+++++++++++++++++++
 recipes-extended/iptables/iptables_1.%.bbappend      | 20
+-------------------
 4 files changed, 31 insertions(+), 29 deletions(-)
 create mode 100644 recipes-core/busybox/busybox_virtualization.inc
 create mode 100644 recipes-extended/iptables/

iptables-meta-virtualization.inc

recipes-core/busybox/busybox_%.bbappend +1 -10
index 8369a03..617cacc 100644
@@ -1,10 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += " \
-           file://lspci.cfg \
-           file://lsusb.cfg \
-           file://mdev.cfg \
-           file://mount-cifs.cfg \
-           file://ps-extras.cfg \
-           file://getopt.cfg \
-           "
+require ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization',

'${BPN}_virtualization.inc', '', d)}

recipes-core/busybox/busybox_virtualization.inc new file +10 -0
new file mode 100644
index 0000000..d9c4e67
@@ -0,0 +1,10 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/busybox:"
+
+SRC_URI += " \
+           file://lspci.cfg \
+           file://lsusb.cfg \
+           file://mdev.cfg \
+           file://mount-cifs.cfg \
+           file://ps-extras.cfg \
+           file://getopt.cfg \
+           "
recipes-extended/iptables/iptables-meta-virtualization.inc new file +19 -0
new file mode 100644
index 0000000..8fd521c
@@ -0,0 +1,19 @@
+RRECOMMENDS_${PN} += "kernel-module-ip6-tables \
+                      kernel-module-ip-tables \
+                      kernel-module-ip6table-filter \
+                      kernel-module-iptable-filter \
+                      kernel-module-ip6table-raw \
+                      kernel-module-iptable-raw \
+                      kernel-module-ip6table-nat \
+                      kernel-module-iptable-nat \
+                      kernel-module-ip6table-mangle \
+                      kernel-module-iptable-magle \
+                      kernel-module-ip6table-security \
+                      kernel-module-iptable-security \
+                      kernel-module-ipt-reject \
+                      kernel-module-iptable-mangle \
+                      kernel-module-xt-checksum \
+                      kernel-module-xt-conntrack \
+                      kernel-module-xt-state \
+                      kernel-module-xt-tcpudp \
+                      "
recipes-extended/iptables/iptables_1.%.bbappend +1 -19
index 8fd521c..9a15e60 100644
@@ -1,19 +1 @@
-RRECOMMENDS_${PN} += "kernel-module-ip6-tables \
-                      kernel-module-ip-tables \
-                      kernel-module-ip6table-filter \
-                      kernel-module-iptable-filter \
-                      kernel-module-ip6table-raw \
-                      kernel-module-iptable-raw \
-                      kernel-module-ip6table-nat \
-                      kernel-module-iptable-nat \
-                      kernel-module-ip6table-mangle \
-                      kernel-module-iptable-magle \
-                      kernel-module-ip6table-security \
-                      kernel-module-iptable-security \
-                      kernel-module-ipt-reject \
-                      kernel-module-iptable-mangle \
-                      kernel-module-xt-checksum \
-                      kernel-module-xt-conntrack \
-                      kernel-module-xt-state \
-                      kernel-module-xt-tcpudp \
-                      "
+require ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization',

'${BPN}-meta-virtualization.inc', '', d)}
--
2.14.1

--
_______________________________________________
meta-virtualization mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-virtualization

Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end"