diff options
author | Khem Raj <raj.khem@gmail.com> | 2018-08-11 20:15:49 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-08-15 08:20:06 -0700 |
commit | a793c6d9d1c9e5620a07a7aa7ce266718b0784c9 (patch) | |
tree | c56cec756f61d1b2ae9e1ed4b82864188dd1c08e /meta-oe/recipes-extended | |
parent | d6239c67f8fb01cef3989da6abd953e913c3e8e1 (diff) | |
download | meta-openembedded-a793c6d9d1c9e5620a07a7aa7ce266718b0784c9.tar.gz |
cfengine,cfengine-masterfiles: Upgrade to 3.12.0
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended')
-rw-r--r-- | meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.12.0.bb (renamed from meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.10.2.bb) | 4 | ||||
-rw-r--r-- | meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch | 28 | ||||
-rw-r--r-- | meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch | 23 | ||||
-rw-r--r-- | meta-oe/recipes-extended/cfengine/cfengine_3.12.0.bb (renamed from meta-oe/recipes-extended/cfengine/cfengine_3.10.2.bb) | 7 |
4 files changed, 24 insertions, 38 deletions
diff --git a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.10.2.bb b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.12.0.bb index b52e7cc08..dda6af9c9 100644 --- a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.10.2.bb +++ b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.12.0.bb | |||
@@ -22,8 +22,8 @@ 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 | 24 | ||
25 | SRC_URI[md5sum] = "1247ef4e8f3cee5efa98da50c326e5a4" | 25 | SRC_URI[md5sum] = "d59bd8c95620da816c382f749d425860" |
26 | SRC_URI[sha256sum] = "5d18a8d71f451d0b5dd1f5e579452b29b99b664f2bb0827dbba9a615f2764df6" | 26 | SRC_URI[sha256sum] = "1c50e3d8c702097e13a21258626d936d6ff2e6492e893dfe286ff0d6204d7a65" |
27 | 27 | ||
28 | inherit autotools | 28 | inherit autotools |
29 | 29 | ||
diff --git a/meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch b/meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch deleted file mode 100644 index 2295e415c..000000000 --- a/meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | projlibdir use a hard coded lib path, this will cause error when build a 64bit | ||
4 | target. So change it to suitable path. | ||
5 | |||
6 | Signed-off-by: Song.Li <Song.Li@windriver.com> | ||
7 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
8 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
9 | --- | ||
10 | configure.ac | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/configure.ac b/configure.ac | ||
14 | index 38e2b9c..bc6b996 100644 | ||
15 | --- a/configure.ac | ||
16 | +++ b/configure.ac | ||
17 | @@ -188,7 +188,7 @@ AS_IF([test x"$enable_fhs" = xyes], [ | ||
18 | fi | ||
19 | |||
20 | sbindir='${exec_prefix}/bin' # /var/cfengine/bin despite being sbin_? | ||
21 | - projlibdir='${exec_prefix}/lib' | ||
22 | + projlibdir='${libdir}' | ||
23 | mandir='${exec_prefix}/share/man' | ||
24 | ]) | ||
25 | |||
26 | -- | ||
27 | 1.7.1 | ||
28 | |||
diff --git a/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch b/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch index b9526f284..db69f951c 100644 --- a/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch +++ b/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch | |||
@@ -1,23 +1,38 @@ | |||
1 | From dc270040cb3beb5ca42f864813145c8a68594bad Mon Sep 17 00:00:00 2001 | ||
2 | From: Kai Kang <kai.kang@windriver.com> | ||
3 | Date: Mon, 18 Jul 2016 09:06:06 +0800 | ||
4 | Subject: [PATCH] cfengine: add recipe and base policy | ||
5 | |||
1 | Upstream-Status: Inappropriate [configuration] | 6 | Upstream-Status: Inappropriate [configuration] |
2 | 7 | ||
3 | Set the path of default configure file. | 8 | Set the path of default configure file. |
4 | 9 | ||
5 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | 10 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
11 | |||
6 | --- | 12 | --- |
13 | misc/init.d/cfengine3.in | 12 ++++-------- | ||
14 | 1 file changed, 4 insertions(+), 8 deletions(-) | ||
15 | |||
7 | diff --git a/misc/init.d/cfengine3.in b/misc/init.d/cfengine3.in | 16 | diff --git a/misc/init.d/cfengine3.in b/misc/init.d/cfengine3.in |
8 | index d6ae26f..1dee283 100644 | 17 | index c584817..12f5803 100644 |
9 | --- a/misc/init.d/cfengine3.in | 18 | --- a/misc/init.d/cfengine3.in |
10 | +++ b/misc/init.d/cfengine3.in | 19 | +++ b/misc/init.d/cfengine3.in |
11 | @@ -101,11 +101,7 @@ if [ -z "$LOCKDIR" ]; then | 20 | @@ -101,14 +101,10 @@ if [ -z "$LOCKDIR" ]; then |
12 | fi | 21 | fi |
13 | 22 | ||
14 | # default control file | 23 | # default control file |
15 | -if [ "$DEBIAN" = "1" ]; then | 24 | -if [ "$DEBIAN" = "1" ]; then |
16 | - DEFAULT=/etc/default/cfengine3 | 25 | - DEFAULT=/etc/default/cfengine3 |
26 | - INIT_FUNCTIONS=/lib/lsb/init-functions | ||
27 | - if [ -e "$INIT_FUNCTIONS" ]; then | ||
28 | - . "$INIT_FUNCTIONS" | ||
29 | - fi | ||
17 | -else | 30 | -else |
18 | - DEFAULT=/etc/sysconfig/cfengine3 | 31 | - DEFAULT=/etc/sysconfig/cfengine3 |
19 | -fi | ||
20 | +DEFAULT=/etc/default/cfengine3 | 32 | +DEFAULT=/etc/default/cfengine3 |
33 | +INIT_FUNCTIONS=/lib/lsb/init-functions | ||
34 | +if [ -e "$INIT_FUNCTIONS" ]; then | ||
35 | + . "$INIT_FUNCTIONS" | ||
36 | fi | ||
21 | 37 | ||
22 | if [ -f $DEFAULT ]; then | 38 | if [ -f $DEFAULT ]; then |
23 | . $DEFAULT | ||
diff --git a/meta-oe/recipes-extended/cfengine/cfengine_3.10.2.bb b/meta-oe/recipes-extended/cfengine/cfengine_3.12.0.bb index b86b0a1f1..aa33a97a4 100644 --- a/meta-oe/recipes-extended/cfengine/cfengine_3.10.2.bb +++ b/meta-oe/recipes-extended/cfengine/cfengine_3.12.0.bb | |||
@@ -16,12 +16,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f8b34828ab373d6b1bb4b0fc60a78494" | |||
16 | DEPENDS = "attr tokyocabinet" | 16 | DEPENDS = "attr tokyocabinet" |
17 | 17 | ||
18 | SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz \ | 18 | SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz \ |
19 | file://change-hard-coded-lib-path.patch \ | ||
20 | file://set-path-of-default-config-file.patch \ | 19 | file://set-path-of-default-config-file.patch \ |
21 | " | 20 | " |
22 | 21 | ||
23 | SRC_URI[md5sum] = "c16baf08189a1af6fcf2e2ff61102992" | 22 | SRC_URI[md5sum] = "33ef12260db4b430352229f37f7cb0e5" |
24 | SRC_URI[sha256sum] = "d4fa9ac7276dba7b85d6757aab2f0929ab8d3b115cb0e7b0cf984760347429d7" | 23 | SRC_URI[sha256sum] = "d71ba98a272390c6fa8bc20e8ea27f0050a0a72a3e6b206a4762b4646be332ec" |
25 | 24 | ||
26 | inherit autotools systemd | 25 | inherit autotools systemd |
27 | 26 | ||