diff options
author | Ovidiu Panait <ovidiu.panait@windriver.com> | 2020-04-01 09:49:07 +0300 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-03-31 23:56:42 -0700 |
commit | 6c44a5ebe312ad2191559d956e1e8521ea54a03f (patch) | |
tree | 4057839858fd16d59a8d89e0a95c730a3a8efcad /meta-networking | |
parent | ffc0878a7cd281e9afb57963fbbb44c672bd169f (diff) | |
download | meta-openembedded-contrib-6c44a5ebe312ad2191559d956e1e8521ea54a03f.tar.gz |
tftp-hpa: Use alternatives to avoid manpage conflicts
Fix the following manpage conflicts:
* check_data_file_clashes: Package inetutils-doc wants to install file /usr/share/man/man1/tftp.1
But that file is already provided by package * tftp-hpa-doc
* check_data_file_clashes: Package inetutils-doc wants to install file /usr/share/man/man8/tftpd.8
But that file is already provided by package * tftp-hpa-doc
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking')
-rw-r--r-- | meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb index 132972b331..413950be1b 100644 --- a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb +++ b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb @@ -82,10 +82,15 @@ INITSCRIPT_PACKAGES = "tftp-hpa-server" INITSCRIPT_NAME = "tftpd-hpa" INITSCRIPT_PARAMS = "start 20 2 3 4 5 . stop 20 1 ." +ALTERNATIVE_${PN}-doc = "tftpd.8 tftp.1" +ALTERNATIVE_LINK_NAME[tftpd.8] = "${mandir}/man8/tftpd.8" +ALTERNATIVE_LINK_NAME[tftp.1] = "${mandir}/man1/tftp.1" + ALTERNATIVE_${PN} = "tftp" ALTERNATIVE_TARGET[tftp] = "${bindir}/tftp-hpa" ALTERNATIVE_PRIORITY = "60" + SYSTEMD_PACKAGES = "tftp-hpa-server" SYSTEMD_SERVICE_tftp-hpa-server = "tftpd-hpa.socket tftpd-hpa.service" SYSTEMD_AUTO_ENABLE_tftp-hpa-server = "enable" |