diff options
| author |   Changqing Li <changqing.li@windriver.com> | 2019-09-16 17:17:15 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2019-09-16 18:24:48 -0700 |
| commit | 81a322ff2e32ee0a6f47a282e562494d60ac97ab (patch) | |
| tree | 7dbcf176226d3fe216c663f1ec27dddd4f368975 /meta-networking | |
| parent | f365ca90873c1de03331fe79c6c5a9fc045861b4 (diff) | |
| download | meta-openembedded-contrib-81a322ff2e32ee0a6f47a282e562494d60ac97ab.tar.gz | |
ntp: fix package split wrongly when enabled usrmerge
* when usrmerge is enabled, ${libdir} is /usr/lib, and
${systemd_unitdir} is /usr/lib/systemd, sine PACKAGE
ntpdate is after ntp in variable PACKAGES, so file
${systemd_unitdir}/system/ntpdate.service will be populated
into PACKAGE ntp, but actually we have add it into FILES_ntpdate
when usrmerge is disabled, ${libdir} is empty, and usrmerge is
enabled, files under ${libdir} have been covered by other FILES
config, so fix by remove ${libdir}
* libexecdir is empty, so remove it FILES_${PN}
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking')
| -rw-r--r-- | meta-networking/recipes-support/ntp/ntp_4.2.8p13.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-networking/recipes-support/ntp/ntp_4.2.8p13.bb b/meta-networking/recipes-support/ntp/ntp_4.2.8p13.bb index dc18a602ab..9b327ba2fa 100644 --- a/meta-networking/recipes-support/ntp/ntp_4.2.8p13.bb +++ b/meta-networking/recipes-support/ntp/ntp_4.2.8p13.bb @@ -136,9 +136,9 @@ RCONFLICTS_ntpdate += "ntpdate-systemd" RSUGGESTS_${PN} = "iana-etc" -FILES_${PN} = "${sbindir}/ntpd.ntp ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd ${libdir} \ +FILES_${PN} = "${sbindir}/ntpd.ntp ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd \ ${NTP_USER_HOME} \ - ${systemd_unitdir}/ntp-units.d/60-ntpd.list ${libexecdir}\ + ${systemd_unitdir}/ntp-units.d/60-ntpd.list \ " FILES_${PN}-tickadj = "${sbindir}/tickadj" FILES_${PN}-utils = "${sbindir} ${datadir}/ntp/lib" |