diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-openembedded/meta-oe/recipes-extended/cfengine | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended/cfengine')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.12.0.bb (renamed from meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.10.2.bb) | 4 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch | 28 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch | 23 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine_3.12.0.bb (renamed from meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine_3.10.2.bb) | 11 |
4 files changed, 26 insertions, 40 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.10.2.bb b/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.12.0.bb index b52e7cc082..dda6af9c9d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.10.2.bb +++ b/meta-openembedded/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-openembedded/meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch b/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch deleted file mode 100644 index 2295e415cd..0000000000 --- a/meta-openembedded/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@windriver.com> -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> -Signed-off-by: Kai Kang <kai.kang@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-openembedded/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch b/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch index b9526f2843..db69f951ca 100644 --- a/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch +++ b/meta-openembedded/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@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@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-openembedded/meta-oe/recipes-extended/cfengine/cfengine_3.10.2.bb b/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine_3.12.0.bb index b86b0a1f18..9d0123d8bd 100644 --- a/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine_3.10.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine_3.12.0.bb @@ -16,20 +16,19 @@ 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 export EXPLICIT_VERSION="${PV}" SYSTEMD_SERVICE_${PN} = "cfengine3.service cf-apache.service cf-hub.service cf-postgres.service \ - cf-runalerts.service cf-consumer.service cf-execd.service \ - cf-monitord.service cf-redis-server.service cf-serverd.service \ + cf-runalerts.service cf-execd.service \ + cf-monitord.service cf-serverd.service \ " SYSTEMD_AUTO_ENABLE_${PN} = "disable" |