diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
| commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
| tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-openembedded/meta-oe/recipes-core/ndctl | |
| parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
| download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz | |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-core/ndctl')
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v63.bb (renamed from meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_git.bb) | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_git.bb b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v63.bb index 048f166fc..1f3abf514 100644 --- a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v63.bb @@ -8,26 +8,23 @@ HOMEPAGE = "https://git.kernel.org/cgit/linux/kernel/git/nvdimm/nvdimm.git/tree/ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=e66651809cac5da60c8b80e9e4e79e08" -inherit autotools-brokensep pkgconfig module-base bash-completion systemd +inherit autotools-brokensep pkgconfig bash-completion systemd -# v62 -SRCREV = "11f560f4048c1d38b7011a49566871a1e8a07c94" +SRCREV = "cb2d678dd6d286dd96d31548c32449a8b883ae32" SRC_URI = "git://github.com/pmem/ndctl.git" DEPENDS = "virtual/kernel kmod udev json-c" -PV = "v62+git${SRCPV}" S = "${WORKDIR}/git" EXTRA_OECONF += "--enable-test --enable-destructive --disable-docs" -PACKAGECONFIG ??= "" -PACKAGECONFIG[systemd] = "--with-systemd-unit-dir=${systemd_system_unitdir}, --without-systemd-unit-dir," +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" +PACKAGECONFIG[systemd] = "--with-systemd, --without-systemd, systemd" do_configure_prepend() { ${S}/autogen.sh } SYSTEMD_SERVICE_${PN} = "ndctl-monitor.service" - -COMPATIBLE_HOST='(x86_64).*' +SYSTEMD_AUTO_ENABLE_${PN} = "disable" |