meta: 4 fixes
cover meta: 4 fixes
The following changes since commit b61a2acc321489c3427f0afa3059486dc144a13b:
bind: Update libxml2 check to make it deterministic. (2015-01-08 09:21:18 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib rbt/4fixes
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/4fixes
Robert Yang (4):
libical: use BPN in SRC_URI
cups: remove fakeroot from do_install()
man: remove fakeroot from do_install()
portmap: remove obsolete lines
meta/recipes-connectivity/portmap/portmap.inc | 19 +------------------
.../destdir-no-strip.patch | 0
.../{portmap-6.0 => portmap}/tcpd-config.patch | 0
meta/recipes-connectivity/portmap/portmap_6.0.bb | 2 +-
meta/recipes-extended/cups/cups.inc | 2 +-
meta/recipes-extended/man/man_1.6g.bb | 2 +-
meta/recipes-support/libical/libical_1.0.0.bb | 2 +-
7 files changed, 5 insertions(+), 22 deletions(-)
rename meta/recipes-connectivity/portmap/{portmap-6.0 => portmap}/destdir-no-strip.patch (100%)
rename meta/recipes-connectivity/portmap/{portmap-6.0 => portmap}/tcpd-config.patch (100%)Signature · 1 line
1.7.9.5
PATCH 1/4 libical: use BPN in SRC_URI
Signed-off-by Robert Yang <[email protected]>
--- meta/recipes-support/libical/libical_1.0.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-support/libical/libical_1.0.0.bb +1 -1
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d4fc58309d8ed46587ac63bb449d82f8 \ file://LICENSE;md5=d1a0891cd3e582b3e2ec8fe63badbbb6" SECTION = "libs" -SRC_URI = "https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz" +SRC_URI = "https://github.com/${BPN}/${BPN}/archive/v${PV}.tar.gz" SRC_URI[md5sum] = "f4b8e33ae5efb2f025eb43ce69682a36" SRC_URI[sha256sum] = "0072e83834092315772e6719b85fc8b11530b1ff53f4d108315fb38cddbce8c2"
Signature · 1 line
1.7.9.5
PATCH 2/4 cups: remove fakeroot from do_install()
In reply to Robert YangThe fakeroot is already set in base.bbclass.
Signed-off-by Robert Yang <[email protected]>
--- meta/recipes-extended/cups/cups.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/cups/cups.inc +1 -1
@@ -71,7 +71,7 @@ do_compile () { "-I." } -fakeroot do_install () { +do_install () { oe_runmake "DSTROOT=${D}" install # Remove /var/run from package as cupsd will populate it on startup
Signature · 1 line
1.7.9.5
PATCH 3/4 man: remove fakeroot from do_install()
In reply to Robert YangThe fakeroot is already set in base.bbclass.
Signed-off-by Robert Yang <[email protected]>
--- meta/recipes-extended/man/man_1.6g.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/man/man_1.6g.bb +1 -1
@@ -60,7 +60,7 @@ do_configure () { } -fakeroot do_install() { +do_install() { oe_runmake install DESTDIR=${D} }
Signature · 1 line
1.7.9.5
PATCH 4/4 portmap: remove obsolete lines
In reply to Robert Yang* The SRC_URI and S in portmap.inc was for portmap 5, but we don't have it any more.
* Remove DEPENDS = "virtual/fakeroot-native" and fakeroot before do_install.
* Remove sbindir = "/sbin" and use "${base_sbindir}" in FILES.
* Move patches from dir portmap-6.0 to portmap.
Signed-off-by Robert Yang <[email protected]>
---
meta/recipes-connectivity/portmap/portmap.inc | 19 +------------------
.../destdir-no-strip.patch | 0
.../{portmap-6.0 => portmap}/tcpd-config.patch | 0
meta/recipes-connectivity/portmap/portmap_6.0.bb | 2 +-
4 files changed, 2 insertions(+), 19 deletions(-)
rename meta/recipes-connectivity/portmap/{portmap-6.0 => portmap}/destdir-no-strip.patch (100%)
rename meta/recipes-connectivity/portmap/{portmap-6.0 => portmap}/tcpd-config.patch (100%)meta/recipes-connectivity/portmap/portmap.inc +1 -18
@@ -4,14 +4,6 @@ SECTION = "console/network" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://portmap.c;beginline=2;endline=31;md5=51ff67e66ec84b2009b017b1f94afbf4 \ file://from_local.c;beginline=9;endline=35;md5=1bec938a2268b8b423c58801ace3adc1" -DEPENDS = "virtual/fakeroot-native" - -SRC_URI = "${DEBIAN_MIRROR}/main/p/portmap/portmap_5.orig.tar.gz \ - ${DEBIAN_MIRROR}/main/p/portmap/portmap_${PV}.diff.gz \ - file://portmap.init \ - file://make.patch;apply=yes" - -S = "${WORKDIR}/portmap_5beta" INITSCRIPT_NAME = "portmap" INITSCRIPT_PARAMS = "start 10 2 3 4 5 . stop 32 0 1 6 ."
@@ -20,15 +12,6 @@ inherit update-rc.d systemd SYSTEMD_SERVICE_${PN} = "portmap.service" -sbindir = "/sbin" - -fakeroot do_install() { - install -d ${D}${sysconfdir}/init.d - install -d ${D}${base_sbindir} - install -m 0755 ${WORKDIR}/portmap.init ${D}${sysconfdir}/init.d/portmap - oe_runmake 'docdir=${docdir}/portmap' 'DESTDIR=${D}' install -} - PACKAGES =+ "portmap-utils" -FILES_portmap-utils = "/sbin/pmap_set /sbin/pmap_dump" +FILES_portmap-utils = "${base_sbindir}/pmap_set ${base_sbindir}/pmap_dump" FILES_${PN}-doc += "${docdir}"
meta/recipes-connectivity/portmap/portmap/destdir-no-strip.patch renamed from meta/recipes-connectivity/portmap/portmap-6.0/destdir-no-strip.patch +0 -0
meta/recipes-connectivity/portmap/portmap/tcpd-config.patch renamed from meta/recipes-connectivity/portmap/portmap-6.0/tcpd-config.patch +0 -0
meta/recipes-connectivity/portmap/portmap_6.0.bb +1 -1
@@ -20,7 +20,7 @@ CPPFLAGS += "-DFACILITY=LOG_DAEMON -DENABLE_DNS -DHOSTS_ACCESS" CFLAGS += "-Wall -Wstrict-prototypes -fPIC" EXTRA_OEMAKE += "'NO_TCP_WRAPPER=${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', '', '1', d)}'" -fakeroot do_install() { +do_install() { install -d ${D}${mandir}/man8/ ${D}${base_sbindir} ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/portmap.init ${D}${sysconfdir}/init.d/portmap oe_runmake install DESTDIR=${D}
Signature · 1 line
1.7.9.5