diff options
author | Kai Kang <kai.kang@windriver.com> | 2018-01-04 14:58:45 +0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-01-16 21:36:53 -0800 |
commit | 8c6a4273a29b8b176e67fae874117f819947d50c (patch) | |
tree | 72a23b99ae4ee3222e1dd1801d6f138f53cbfebf /meta-oe/recipes-extended | |
parent | 02e3e2a211d2d4baadecb366de4658db1fcd2cbc (diff) | |
download | meta-openembedded-8c6a4273a29b8b176e67fae874117f819947d50c.tar.gz |
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>
Diffstat (limited to 'meta-oe/recipes-extended')
-rw-r--r-- | meta-oe/recipes-extended/cfengine/cfengine-masterfiles/remove-policy-of-usr-local-sbin.patch | 28 | ||||
-rw-r--r-- | meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.10.2.bb (renamed from meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.9.0.bb) | 17 |
2 files changed, 8 insertions, 37 deletions
diff --git a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles/remove-policy-of-usr-local-sbin.patch b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles/remove-policy-of-usr-local-sbin.patch deleted file mode 100644 index 3f8debc28..000000000 --- a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles/remove-policy-of-usr-local-sbin.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | Directory /usr/local is not used for us. Remove the policy that not to install | ||
4 | binaries to /usr/local/sbin. | ||
5 | |||
6 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
7 | --- | ||
8 | diff --git a/cfe_internal/update/update_bins.cf b/cfe_internal/update/update_bins.cf | ||
9 | index 1796caa..697af0d 100644 | ||
10 | --- a/cfe_internal/update/update_bins.cf | ||
11 | +++ b/cfe_internal/update/update_bins.cf | ||
12 | @@ -55,16 +55,6 @@ bundle agent cfe_internal_bins | ||
13 | depth_search => u_recurse_basedir("inf"), | ||
14 | action => u_immediate; | ||
15 | |||
16 | - "/usr/local/sbin/$(agents)" | ||
17 | - comment => "Create symlinks of CFE binaries in /usr/local/sbin", | ||
18 | - handle => canonify("cfe_internal_bins_files_sbin_$(agents)"), | ||
19 | - move_obstructions => "true", | ||
20 | - link_from => u_ln_s("$(sys.workdir)/bin/$(agents)"); | ||
21 | - | ||
22 | - "/usr/local/sbin/$(agents).cfsaved" | ||
23 | - comment => "Remove all .cfsaved file extension", | ||
24 | - handle => canonify("cfe_internal_bins_files_remove_$(agent)_cfsaved"), | ||
25 | - delete => u_tidy; | ||
26 | } | ||
27 | |||
28 | bundle agent cfe_internal_update_bins | ||
diff --git a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.9.0.bb b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.10.2.bb index 9d01c5128..b52e7cc08 100644 --- a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.9.0.bb +++ b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.10.2.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | # | 1 | # |
2 | # Copyright (C) 2014 - 2016 Wind River Systems, Inc. | 2 | # Copyright (C) 2014 - 2017 Wind River Systems, Inc. |
3 | # | 3 | # |
4 | SUMMARY = "Base policy for CFEngine" | 4 | SUMMARY = "Base policy for CFEngine" |
5 | 5 | ||
@@ -18,20 +18,19 @@ or wherever `$(sys.masterdir)` points. \ | |||
18 | HOMEPAGE = "http://cfengine.com" | 18 | HOMEPAGE = "http://cfengine.com" |
19 | 19 | ||
20 | LICENSE = "MIT" | 20 | LICENSE = "MIT" |
21 | LIC_FILES_CHKSUM = "file://LICENSE;md5=52cd3d13af93180822888ab0088e9328" | 21 | LIC_FILES_CHKSUM = "file://LICENSE;md5=9f76426f9ef8c6f6739fadd21d817a4f" |
22 | 22 | ||
23 | SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz \ | 23 | SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz" |
24 | file://remove-policy-of-usr-local-sbin.patch \ | 24 | |
25 | " | 25 | SRC_URI[md5sum] = "1247ef4e8f3cee5efa98da50c326e5a4" |
26 | SRC_URI[md5sum] = "b101ddcd546738af6ec91be5c297cb24" | 26 | SRC_URI[sha256sum] = "5d18a8d71f451d0b5dd1f5e579452b29b99b664f2bb0827dbba9a615f2764df6" |
27 | SRC_URI[sha256sum] = "63dec2f8649f5f2788cd463dccf47f8dbe941522acfcf3093517f983bbfa0606" | ||
28 | 27 | ||
29 | inherit autotools | 28 | inherit autotools |
30 | 29 | ||
31 | export EXPLICIT_VERSION="${PV}" | 30 | export EXPLICIT_VERSION="${PV}" |
32 | 31 | ||
33 | EXTRA_OECONF = "--prefix=${localstatedir}/cfengine" | 32 | EXTRA_OECONF = "--prefix=${datadir}/cfengine" |
34 | 33 | ||
35 | FILES_${PN} += "${localstatedir}/cfengine" | 34 | FILES_${PN} = "${datadir}/cfengine" |
36 | 35 | ||
37 | RDEPENDS_${PN} += "python-core" | 36 | RDEPENDS_${PN} += "python-core" |