[oe] [meta-oe][PATCH 19/21] cfengine, cfengine-masterfiles: Upgrade to 3.12.0

Thu Aug 16 17:58:12 UTC 2018

On Thu, Aug 16, 2018 at 10:27 AM Martin Jansa <martin.jansa at gmail.com> wrote:
>
> With this one I'm seeing cfengine-3.12.0-r0 do_package failure:
>
> ERROR: SYSTEMD_SERVICE_cfengine value cf-consumer.service does not exist

its likely, since my local builders use sysvinit and OE builders
where I relied for systemd builds are currently enjoying a cruise in pacific

care to cook a patch ? if not I will get to it eventually.

>
> On Mon, Aug 13, 2018 at 10:20 AM Khem Raj <raj.khem at gmail.com> wrote:
>>
>> Signed-off-by: Khem Raj <raj.khem at gmail.com>
>> ---
>>  ...10.2.bb => cfengine-masterfiles_3.12.0.bb} |  4 +--
>>  .../cfengine/change-hard-coded-lib-path.patch | 28 -------------------
>>  .../set-path-of-default-config-file.patch     | 23 ++++++++++++---
>>  ...{cfengine_3.10.2.bb => cfengine_3.12.0.bb} |  7 ++---
>>  4 files changed, 24 insertions(+), 38 deletions(-)
>>  rename meta-oe/recipes-extended/cfengine/{cfengine-masterfiles_3.10.2.bb => cfengine-masterfiles_3.12.0.bb} (87%)
>>  delete mode 100644 meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch
>>  rename meta-oe/recipes-extended/cfengine/{cfengine_3.10.2.bb => cfengine_3.12.0.bb} (93%)
>>
>> 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
>> similarity index 87%
>> rename from meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.10.2.bb
>> rename to meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.12.0.bb
>> index b52e7cc082..dda6af9c9d 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"
>>
>>  SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz"
>>
>> -SRC_URI[md5sum] = "1247ef4e8f3cee5efa98da50c326e5a4"
>> -SRC_URI[sha256sum] = "5d18a8d71f451d0b5dd1f5e579452b29b99b664f2bb0827dbba9a615f2764df6"
>> +SRC_URI[md5sum] = "d59bd8c95620da816c382f749d425860"
>> +SRC_URI[sha256sum] = "1c50e3d8c702097e13a21258626d936d6ff2e6492e893dfe286ff0d6204d7a65"
>>
>>  inherit autotools
>>
>> 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 2295e415cd..0000000000
>> --- a/meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch
>> +++ /dev/null
>> @@ -1,28 +0,0 @@
>> -Upstream-Status: Inappropriate [configuration]
>> -
>> -projlibdir use a hard coded lib path, this will cause error when build a 64bit
>> -target. So change it to suitable path.
>> -
>> -Signed-off-by: Song.Li <Song.Li at windriver.com>
>> -Signed-off-by: Jackie Huang <jackie.huang at windriver.com>
>> -Signed-off-by: Kai Kang <kai.kang at windriver.com>
>> ----
>> - configure.ac | 2 +-
>> - 1 file changed, 1 insertion(+), 1 deletion(-)
>> -
>> -diff --git a/configure.ac b/configure.ac
>> -index 38e2b9c..bc6b996 100644
>> ---- a/configure.ac
>> -+++ b/configure.ac
>> -@@ -188,7 +188,7 @@ AS_IF([test x"$enable_fhs" = xyes], [
>> -   fi
>> -
>> -   sbindir='${exec_prefix}/bin' # /var/cfengine/bin despite being sbin_?
>> --  projlibdir='${exec_prefix}/lib'
>> -+  projlibdir='${libdir}'
>> -   mandir='${exec_prefix}/share/man'
>> - ])
>> -
>> ---
>> -1.7.1
>> -
>> 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 b9526f2843..db69f951ca 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 @@
>> +From dc270040cb3beb5ca42f864813145c8a68594bad Mon Sep 17 00:00:00 2001
>> +From: Kai Kang <kai.kang at windriver.com>
>> +Date: Mon, 18 Jul 2016 09:06:06 +0800
>> +Subject: [PATCH] cfengine: add recipe and base policy
>> +
>>  Upstream-Status: Inappropriate [configuration]
>>
>>  Set the path of default configure file.
>>
>>  Signed-off-by: Kai Kang <kai.kang at windriver.com>
>> +
>>  ---
>> + misc/init.d/cfengine3.in | 12 ++++--------
>> + 1 file changed, 4 insertions(+), 8 deletions(-)
>> +
>>  diff --git a/misc/init.d/cfengine3.in b/misc/init.d/cfengine3.in
>> -index d6ae26f..1dee283 100644
>> +index c584817..12f5803 100644
>>  --- a/misc/init.d/cfengine3.in
>>  +++ b/misc/init.d/cfengine3.in
>> -@@ -101,11 +101,7 @@ if [ -z "$LOCKDIR" ]; then
>> +@@ -101,14 +101,10 @@ if [ -z "$LOCKDIR" ]; then
>>   fi
>>
>>   # default control file
>>  -if [ "$DEBIAN" = "1" ]; then
>>  -    DEFAULT=/etc/default/cfengine3
>> +-    INIT_FUNCTIONS=/lib/lsb/init-functions
>> +-    if [ -e "$INIT_FUNCTIONS" ]; then
>> +-        . "$INIT_FUNCTIONS"
>> +-    fi
>>  -else
>>  -    DEFAULT=/etc/sysconfig/cfengine3
>> --fi
>>  +DEFAULT=/etc/default/cfengine3
>> ++INIT_FUNCTIONS=/lib/lsb/init-functions
>> ++if [ -e "$INIT_FUNCTIONS" ]; then
>> ++    . "$INIT_FUNCTIONS"
>> + fi
>>
>>   if [ -f $DEFAULT ]; then
>> -     . $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
>> similarity index 93%
>> rename from meta-oe/recipes-extended/cfengine/cfengine_3.10.2.bb
>> rename to meta-oe/recipes-extended/cfengine/cfengine_3.12.0.bb
>> index b86b0a1f18..aa33a97a4d 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"
>>  DEPENDS = "attr tokyocabinet"
>>
>>  SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz \
>> -           file://change-hard-coded-lib-path.patch \
>>             file://set-path-of-default-config-file.patch \
>> -"
>> +           "
>>
>> -SRC_URI[md5sum] = "c16baf08189a1af6fcf2e2ff61102992"
>> -SRC_URI[sha256sum] = "d4fa9ac7276dba7b85d6757aab2f0929ab8d3b115cb0e7b0cf984760347429d7"
>> +SRC_URI[md5sum] = "33ef12260db4b430352229f37f7cb0e5"
>> +SRC_URI[sha256sum] = "d71ba98a272390c6fa8bc20e8ea27f0050a0a72a3e6b206a4762b4646be332ec"
>>
>>  inherit autotools systemd
>>
>> --
>> 2.18.0
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel at lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel