diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-13 21:39:40 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-05 16:30:44 +0300 |
commit | 82c905dc58a36aeae40b1b273a12f63fb1973cf4 (patch) | |
tree | 38caf00263451b5036435cdc36e035b25d32e623 /meta-openembedded/meta-networking/recipes-support/drbd | |
parent | 83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff) | |
download | openbmc-82c905dc58a36aeae40b1b273a12f63fb1973cf4.tar.xz |
meta-openembedded and poky: subtree updates
Squash of the following due to dependencies among them
and OpenBMC changes:
meta-openembedded: subtree update:d0748372d2..9201611135
meta-openembedded: subtree update:9201611135..17fd382f34
poky: subtree update:9052e5b32a..2e11d97b6c
poky: subtree update:2e11d97b6c..a8544811d7
The change log was too large for the jenkins plugin
to handle therefore it has been removed. Here is
the first and last commit of each subtree:
meta-openembedded:d0748372d2
cppzmq: bump to version 4.6.0
meta-openembedded:17fd382f34
mpv: Remove X11 dependency
poky:9052e5b32a
package_ipk: Remove pointless comment to trigger rebuild
poky:a8544811d7
pbzip2: Fix license warning
Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-support/drbd')
-rw-r--r-- | meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.12.0.bb (renamed from meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.11.0.bb) | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.11.0.bb b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.12.0.bb index 286b0f6066..b83f68f8c1 100644 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.11.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.12.0.bb @@ -12,9 +12,9 @@ SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils \ git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/drbd-headers \ ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \ " -# v9.11.0 -SRCREV_drbd-utils = "63092751e76e1fba397e53df4be5c1161b83a223" -SRCREV_drbd-headers = "d100ee01bf5aa8d5220767e4e35c4224faa8d865" +# v9.12.0 +SRCREV_drbd-utils = "91629a4cce49ca0d4f917fe0bffa25cfe8db3052" +SRCREV_drbd-headers = "233006b4d26cf319638be0ef6d16ec7dee287b66" S = "${WORKDIR}/git" @@ -23,6 +23,8 @@ UPSTREAM_CHECK_URI = "https://github.com/LINBIT/drbd-utils/releases" SYSTEMD_SERVICE_${PN} = "drbd.service" SYSTEMD_AUTO_ENABLE = "disable" +DEPENDS = "flex-native" + inherit autotools-brokensep systemd EXTRA_OECONF = " \ |