cfengine: Upgrade to 3.15

License-Update: Change in Company name Cfengine AS a Norwegian company -> Northern.tech
Python3 fixes to needed scripts

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2020-02-18 12:59:32 -08:00
parent b934d3bf84
commit ee45667af8
3 changed files with 31 additions and 10 deletions
@@ -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
@@ -20,10 +20,11 @@ HOMEPAGE = "http://cfengine.com"
LICENSE = "MIT" LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=9f76426f9ef8c6f6739fadd21d817a4f" LIC_FILES_CHKSUM = "file://LICENSE;md5=9f76426f9ef8c6f6739fadd21d817a4f"
SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz" SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz \
file://python3.patch \
SRC_URI[md5sum] = "d59bd8c95620da816c382f749d425860" "
SRC_URI[sha256sum] = "1c50e3d8c702097e13a21258626d936d6ff2e6492e893dfe286ff0d6204d7a65" SRC_URI[md5sum] = "6d456fdd9bd24ff6617eeaa05efae602"
SRC_URI[sha256sum] = "4a071c0c4ba7df9bad93144cff5fbc0566e5172afd66201072e3193b76c55a38"
inherit autotools inherit autotools
@@ -31,6 +32,10 @@ export EXPLICIT_VERSION="${PV}"
EXTRA_OECONF = "--prefix=${datadir}/cfengine" EXTRA_OECONF = "--prefix=${datadir}/cfengine"
do_install_append() {
rm -rf ${D}${datadir}/cfengine/modules/packages/{zypper,yum}
}
FILES_${PN} = "${datadir}/cfengine" FILES_${PN} = "${datadir}/cfengine"
RDEPENDS_${PN} += "python-core" RDEPENDS_${PN} += "python3-core"
@@ -11,18 +11,17 @@ its lifecycle. CFEngine takes systems from Build to Deploy, Manage and Audit."
HOMEPAGE = "http://cfengine.com" HOMEPAGE = "http://cfengine.com"
LICENSE = "GPLv3" LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://LICENSE;md5=f8b34828ab373d6b1bb4b0fc60a78494" LIC_FILES_CHKSUM = "file://LICENSE;md5=233aa25e53983237cf0bd4c238af255f"
DEPENDS = "attr tokyocabinet" DEPENDS = "attr tokyocabinet"
SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz \ SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz \
file://set-path-of-default-config-file.patch \ file://set-path-of-default-config-file.patch \
" "
SRC_URI[md5sum] = "d4dabfa46d8afa151be5610f184354e7"
SRC_URI[sha256sum] = "fa53e137f850eb268a8e7ae4578b5db5dc383656341f5053dc1a353ed0288265"
SRC_URI[md5sum] = "33ef12260db4b430352229f37f7cb0e5" inherit autotools-brokensep systemd
SRC_URI[sha256sum] = "d71ba98a272390c6fa8bc20e8ea27f0050a0a72a3e6b206a4762b4646be332ec"
inherit autotools systemd
export EXPLICIT_VERSION="${PV}" export EXPLICIT_VERSION="${PV}"
@@ -67,6 +66,7 @@ EOF
install -m 0755 -D ${D}${sysconfdir}/init.d/cfengine3 ${D}${datadir}/${BPN}/cfengine3 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 sed -i -e 's#/etc/init.d#${datadir}/${BPN}#' ${D}${systemd_system_unitdir}/*.service
fi fi
rm -rf ${D}${datadir}/cfengine/modules/packages/zypper
} }
RDEPENDS_${PN} += "${BPN}-masterfiles" RDEPENDS_${PN} += "${BPN}-masterfiles"