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-filesystems/recipes-filesystems/owfs/owfs_3.2p2.bb | |
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-filesystems/recipes-filesystems/owfs/owfs_3.2p2.bb')
-rw-r--r-- | meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p2.bb | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p2.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p2.bb index 50865cccd..857aaf216 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p2.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p2.bb @@ -18,7 +18,7 @@ SRC_URI = "git://github.com/owfs/owfs \ S = "${WORKDIR}/git" -inherit autotools-brokensep update-rc.d pkgconfig +inherit autotools-brokensep update-rc.d pkgconfig systemd EXTRA_OECONF = " \ --with-fuseinclude=${STAGING_INCDIR} \ @@ -52,9 +52,12 @@ DESCRIPTION_libownet = "easy C-language 1-wire interface to the owserver protoco DESCRIPTION_owmon = "Monitor for owserver settings and statistics" DESCRIPTION_owtap = "Packet sniffer for the owserver protocol" -FILES_owftpd = "${bindir}/owftpd" -FILES_owhttpd = "${bindir}/owhttpd ${sysconfdir}/init.d/owhttpd" -FILES_owserver = "${bindir}/owserver ${sysconfdir}/init.d/owserver" +FILES_owftpd = "${bindir}/owftpd ${systemd_system_unitdir}/owftpd.service" +FILES_owhttpd = "${bindir}/owhttpd ${sysconfdir}/init.d/owhttpd \ + ${systemd_system_unitdir}/owhttpd.service" +FILES_owserver = "${bindir}/owserver ${sysconfdir}/init.d/owserver \ + ${systemd_system_unitdir}/owserver.service \ + ${systemd_system_unitdir}/owserver.socket" FILES_owshell = "${bindir}/owread ${bindir}/owwrite \ ${bindir}/owdir ${bindir}/owpresent \ ${bindir}/owget ${bindir}/owside" @@ -63,9 +66,15 @@ FILES_owtap = "${bindir}/owtap" FILES_libowcapi = "${libdir}/libowcapi-*" FILES_libow = "${libdir}/libow-*" FILES_libownet = "${libdir}/libownet-*" +FILES_${PN} += "${systemd_system_unitdir}/owfs.service" INITSCRIPT_PACKAGES = "owhttpd owserver" INITSCRIPT_NAME_owserver = "owserver" INITSCRIPT_NAME_owhttpd = "owhttpd" INITSCRIPT_PARAMS_owserver = "defaults 20" INITSCRIPT_PARAMS_owhttpd = "defaults 21" + +SYSTEMD_SERVICE_${PN} = "owfs.service" +SYSTEMD_SERVICE_${PN}-owftpd = "owftpd.service" +SYSTEMD_SERVICE_${PN}-owhttpd = "owhttpd.service" +SYSTEMD_SERVICE_${PN}-owserver = "owserver.service owserver.socket" |