diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-13 21:39:40 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-05 16:30:44 +0300 |
commit | 82c905dc58a36aeae40b1b273a12f63fb1973cf4 (patch) | |
tree | 38caf00263451b5036435cdc36e035b25d32e623 /meta-openembedded/meta-oe/recipes-extended/cfengine | |
parent | 83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff) | |
download | openbmc-82c905dc58a36aeae40b1b273a12f63fb1973cf4.tar.xz |
meta-openembedded and poky: subtree updates
Squash of the following due to dependencies among them
and OpenBMC changes:
meta-openembedded: subtree update:d0748372d2..9201611135
meta-openembedded: subtree update:9201611135..17fd382f34
poky: subtree update:9052e5b32a..2e11d97b6c
poky: subtree update:2e11d97b6c..a8544811d7
The change log was too large for the jenkins plugin
to handle therefore it has been removed. Here is
the first and last commit of each subtree:
meta-openembedded:d0748372d2
cppzmq: bump to version 4.6.0
meta-openembedded:17fd382f34
mpv: Remove X11 dependency
poky:9052e5b32a
package_ipk: Remove pointless comment to trigger rebuild
poky:a8544811d7
pbzip2: Fix license warning
Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended/cfengine')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles/python3.patch | 16 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb (renamed from meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.12.0.bb) | 15 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine_3.15.0.bb (renamed from meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine_3.12.0.bb) | 12 |
3 files changed, 32 insertions, 11 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles/python3.patch b/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles/python3.patch new file mode 100644 index 000000000..a6f670126 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles/python3.patch @@ -0,0 +1,16 @@ +--- a/modules/packages/apt_get ++++ b/modules/packages/apt_get +@@ -1,4 +1,4 @@ +-#!/var/cfengine/bin/python ++#!/var/cfengine/bin/python3 + + import sys + import os +--- a/modules/packages/apt_get.in ++++ b/modules/packages/apt_get.in +@@ -1,4 +1,4 @@ +-#!@bindir@/python ++#!@bindir@/python3 + + import sys + import os diff --git a/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.12.0.bb b/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb index dda6af9c9..35ac85598 100644 --- a/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.12.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb @@ -20,10 +20,11 @@ HOMEPAGE = "http://cfengine.com" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=9f76426f9ef8c6f6739fadd21d817a4f" -SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz" - -SRC_URI[md5sum] = "d59bd8c95620da816c382f749d425860" -SRC_URI[sha256sum] = "1c50e3d8c702097e13a21258626d936d6ff2e6492e893dfe286ff0d6204d7a65" +SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz \ + file://python3.patch \ + " +SRC_URI[md5sum] = "6d456fdd9bd24ff6617eeaa05efae602" +SRC_URI[sha256sum] = "4a071c0c4ba7df9bad93144cff5fbc0566e5172afd66201072e3193b76c55a38" inherit autotools @@ -31,6 +32,10 @@ export EXPLICIT_VERSION="${PV}" EXTRA_OECONF = "--prefix=${datadir}/cfengine" +do_install_append() { + rm -rf ${D}${datadir}/cfengine/modules/packages/zypper ${D}${datadir}/cfengine/modules/packages/yum +} + FILES_${PN} = "${datadir}/cfengine" -RDEPENDS_${PN} += "python-core" +RDEPENDS_${PN} += "python3-core" diff --git a/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine_3.12.0.bb b/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine_3.15.0.bb index 9d0123d8b..2d146bf88 100644 --- a/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine_3.12.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine_3.15.0.bb @@ -11,18 +11,17 @@ its lifecycle. CFEngine takes systems from Build to Deploy, Manage and Audit." HOMEPAGE = "http://cfengine.com" LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f8b34828ab373d6b1bb4b0fc60a78494" +LIC_FILES_CHKSUM = "file://LICENSE;md5=233aa25e53983237cf0bd4c238af255f" -DEPENDS = "attr tokyocabinet" +DEPENDS = "attr tokyocabinet bison-native" SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz \ file://set-path-of-default-config-file.patch \ " +SRC_URI[md5sum] = "d4dabfa46d8afa151be5610f184354e7" +SRC_URI[sha256sum] = "fa53e137f850eb268a8e7ae4578b5db5dc383656341f5053dc1a353ed0288265" -SRC_URI[md5sum] = "33ef12260db4b430352229f37f7cb0e5" -SRC_URI[sha256sum] = "d71ba98a272390c6fa8bc20e8ea27f0050a0a72a3e6b206a4762b4646be332ec" - -inherit autotools systemd +inherit autotools-brokensep systemd export EXPLICIT_VERSION="${PV}" @@ -67,6 +66,7 @@ EOF install -m 0755 -D ${D}${sysconfdir}/init.d/cfengine3 ${D}${datadir}/${BPN}/cfengine3 sed -i -e 's#/etc/init.d#${datadir}/${BPN}#' ${D}${systemd_system_unitdir}/*.service fi + rm -rf ${D}${datadir}/cfengine/modules/packages/zypper } RDEPENDS_${PN} += "${BPN}-masterfiles" |