Skip to contentSkip to conversation

openssh: fix warnings about overwritting keys

PATCH New Martin Jansa 1 participant 4 messages Apr 12, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 openssh: fix warnings about overwritting keys

* they were causing real issues like openssh-sshd-systemd not really RPROVIDED..
WARNING: Variable key RCONFLICTS_${PN}-sshd (dropbear) replaces original key RCONFLICTS_openssh-sshd ( openssh-sshd-systemd).
WARNING: Variable key FILES_${PN}-sshd (${sbindir}/sshd ${sysconfdir}/init.d/sshd ${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config) replaces original key FILES_openssh-sshd ( ${systemd_unitdir}/system/sshd.socket).
WARNING: Variable key RPROVIDES_${PN}-sshd (sshd) replaces original key RPROVIDES_openssh-sshd ( openssh-sshd-systemd).

---
 .../recipes-connectivity/openssh/openssh_6.1p1.bbappend    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.1p1.bbappend +7 -7
index fe61a89..d757c70 100644
@@ -1,13 +1,13 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC := "${@int(PRINC) + 2}"
+PRINC := "${@int(PRINC) + 3}"
 
-SYSTEMD_PACKAGES = "openssh-sshd"
-SYSTEMD_SERVICE_openssh-sshd = "sshd.socket"
-FILES_openssh-sshd += "${systemd_unitdir}/system/sshd.socket"
-RPROVIDES_openssh-sshd += "openssh-sshd-systemd"
-RREPLACES_openssh-sshd += "openssh-sshd-systemd"
-RCONFLICTS_openssh-sshd += "openssh-sshd-systemd"
+SYSTEMD_PACKAGES = "${PN}-sshd"
+SYSTEMD_SERVICE_${PN}-sshd = "sshd.socket"
+FILES_${PN}-sshd += "${systemd_unitdir}/system/sshd.socket"
+RPROVIDES_${PN}-sshd += "${PN}-sshd-systemd"
+RREPLACES_${PN}-sshd += "${PN}-sshd-systemd"
+RCONFLICTS_${PN}-sshd += "${PN}-sshd-systemd"
 
 inherit systemd
 
Signature · 1 line
1.8.1.5
#1 lore raw

PATCH 2/4 atftpd: fix warning about overwritting keys

* WARNING: Variable key FILES_${PN}d (${sbindir}/* ${sysconfdir}/init.d/* /srv/tftp) replaces original key FILES_atftpd ( ${systemd_unitdir}/system/atftpd.service).

---
 .../meta-oe/recipes-extended/atftp/atftp_git.bbappend        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
meta-systemd/meta-oe/recipes-extended/atftp/atftp_git.bbappend +6 -6
index e58306f..ed9cf9d 100644
@@ -6,12 +6,12 @@ inherit systemd
 
 SRC_URI += "file://atftpd.service"
 
-SYSTEMD_PACKAGES = "atftpd"
-SYSTEMD_SERVICE_atftpd = "atftpd.service"
-FILES_atftpd += "${systemd_unitdir}/system/atftpd.service"
-RPROVIDES_atftpd += "atftpd-systemd"
-RREPLACES_atftpd += "atftpd-systemd"
-RCONFLICTS_atftpd += "atftpd-systemd"
+SYSTEMD_PACKAGES = "${PN}d"
+SYSTEMD_SERVICE_${PN}d = "atftpd.service"
+FILES_${PN}d += "${systemd_unitdir}/system/atftpd.service"
+RPROVIDES_${PN}d += "${PN}d-systemd"
+RREPLACES_${PN}d += "${PN}d-systemd"
+RCONFLICTS_${PN}d += "${PN}d-systemd"
 do_install_append() {
 	install -d ${D}${systemd_unitdir}/system
 	install -m 0644 ${WORKDIR}/atftpd.service ${D}${systemd_unitdir}/system
Signature · 1 line
1.8.1.5
#2 lore raw

PATCH 3/4 gpsd: fix warning about overwritting keys

In reply to Martin Jansa

* WARNING: Variable key FILES_${PN}-dev (${includedir} ${FILES_SOLIBSDEV} ${libdir}/*.la ${libdir}/*.o ${libdir}/pkgconfig ${datadir}/pkgconfig ${datadir}/aclocal ${base_libdir}/*.o ${libdir}/${BPN}/*.la ${base_libdir}/*.la) replaces original key FILES_gpsd-dev ( ${libdir}/pkgconfdir/libgpsd.pc ${libdir}/pkgconfdir/libgps.pc).

---
 meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb +1 -1
index e98d795..ceb700a 100644
@@ -91,7 +91,7 @@ pkg_postrm_${PN}-conf() {
 
 PACKAGES =+ "libgps libgpsd python-pygps-dbg python-pygps gpsd-udev gpsd-conf gpsd-gpsctl gps-utils"
 
-FILES_gpsd-dev += "${libdir}/pkgconfdir/libgpsd.pc ${libdir}/pkgconfdir/libgps.pc"
+FILES_${PN}-dev += "${libdir}/pkgconfdir/libgpsd.pc ${libdir}/pkgconfdir/libgps.pc"
 
 FILES_python-pygps-dbg += " ${libdir}/python*/site-packages/gps/.debug"
 
Signature · 1 line
1.8.1.5
#3 lore raw

PATCH 4/4 libgpewidget: fix warning about overwritting keys

In reply to Martin Jansa

* drop FILES_${PN}-bin completely, use bindir+sbindir from bitbake.conf
* WARNING: Variable key FILES_${PN}-bin (${bindir}/* ${sbindir}/*) replaces original key FILES_libgpewidget-bin (${bindir}/*).

---
 meta-gpe/recipes-graphics/libgpewidget/libgpewidget_0.117.bb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
meta-gpe/recipes-graphics/libgpewidget/libgpewidget_0.117.bb +2 -4
index e30b1ab..8e504c1 100644
@@ -5,7 +5,7 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=d8045f3b8f929c1cb29a1e3fd737b499"
 
 DEPENDS = "gtk+ cairo libxinerama libxcomposite libxrender" 
-PR = "r4"
+PR = "r5"
 
 inherit gpe pkgconfig autotools gtk-doc
 
@@ -20,6 +20,4 @@ GPE_TARBALL_SUFFIX = "bz2"
 EXTRA_OECONF = "--enable-cairo"
 LDFLAGS += " -L${STAGING_LIBDIR}"
 
-PACKAGES =+ "libgpewidget-bin"
-FILES_libgpewidget-bin = "${bindir}/*"
-
+PACKAGES =+ "${PN}-bin"
Signature · 1 line
1.8.1.5