cfengine-masterfiles: 3.9.0 -> 3.10.2

Upgrade cfengine-masterfiles from 3.9.0 to lastest lts version 3.10.2.

* year info has been updated in license file so md5 checksum changed
* remove remove-policy-of-usr-local-sbin.patch which has been done in upstream already
* correct install prefix

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Kai Kang
2018-01-04 14:58:45 +08:00
committed by Armin Kuster
parent 02e3e2a211
commit 8c6a4273a2
2 changed files with 8 additions and 37 deletions
@@ -1,28 +0,0 @@
Upstream-Status: Inappropriate [configuration]
Directory /usr/local is not used for us. Remove the policy that not to install
binaries to /usr/local/sbin.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
diff --git a/cfe_internal/update/update_bins.cf b/cfe_internal/update/update_bins.cf
index 1796caa..697af0d 100644
--- a/cfe_internal/update/update_bins.cf
+++ b/cfe_internal/update/update_bins.cf
@@ -55,16 +55,6 @@ bundle agent cfe_internal_bins
depth_search => u_recurse_basedir("inf"),
action => u_immediate;
- "/usr/local/sbin/$(agents)"
- comment => "Create symlinks of CFE binaries in /usr/local/sbin",
- handle => canonify("cfe_internal_bins_files_sbin_$(agents)"),
- move_obstructions => "true",
- link_from => u_ln_s("$(sys.workdir)/bin/$(agents)");
-
- "/usr/local/sbin/$(agents).cfsaved"
- comment => "Remove all .cfsaved file extension",
- handle => canonify("cfe_internal_bins_files_remove_$(agent)_cfsaved"),
- delete => u_tidy;
}
bundle agent cfe_internal_update_bins
@@ -1,5 +1,5 @@
#
# Copyright (C) 2014 - 2016 Wind River Systems, Inc.
# Copyright (C) 2014 - 2017 Wind River Systems, Inc.
#
SUMMARY = "Base policy for CFEngine"
@@ -18,20 +18,19 @@ or wherever `$(sys.masterdir)` points. \
HOMEPAGE = "http://cfengine.com"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=52cd3d13af93180822888ab0088e9328"
LIC_FILES_CHKSUM = "file://LICENSE;md5=9f76426f9ef8c6f6739fadd21d817a4f"
SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz \
file://remove-policy-of-usr-local-sbin.patch \
"
SRC_URI[md5sum] = "b101ddcd546738af6ec91be5c297cb24"
SRC_URI[sha256sum] = "63dec2f8649f5f2788cd463dccf47f8dbe941522acfcf3093517f983bbfa0606"
SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz"
SRC_URI[md5sum] = "1247ef4e8f3cee5efa98da50c326e5a4"
SRC_URI[sha256sum] = "5d18a8d71f451d0b5dd1f5e579452b29b99b664f2bb0827dbba9a615f2764df6"
inherit autotools
export EXPLICIT_VERSION="${PV}"
EXTRA_OECONF = "--prefix=${localstatedir}/cfengine"
EXTRA_OECONF = "--prefix=${datadir}/cfengine"
FILES_${PN} += "${localstatedir}/cfengine"
FILES_${PN} = "${datadir}/cfengine"
RDEPENDS_${PN} += "python-core"