[oe-commits] org.oe.dev distcc: fix host file and CONFFILES

[koen commit]

distcc: fix host file and CONFFILES

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 728b58626c50e060bf71960029afce111427d6a0
ViewMTN: http://monotone.openembedded.org/revision/info/728b58626c50e060bf71960029afce111427d6a0
Files:
1
packages/distcc/files/no-man.patch
packages/distcc/distcc_2.18.3.bb
Diffs:

#
# mt diff -r718d6389d03e6899ca6c6b7ff65639c21e6544bf -r728b58626c50e060bf71960029afce111427d6a0
#
# 
# 
# add_file "packages/distcc/files/no-man.patch"
#  content [d340b667a5cb5703952649cdcc5321e6e14dea85]
# 
# patch "packages/distcc/distcc_2.18.3.bb"
#  from [980168c7626a06af4ee3c091da786c662f16fad8]
#    to [761cc7f2560dbb4f9a2c2717f0b21dd831649fb3]
# 
============================================================
--- packages/distcc/files/no-man.patch	d340b667a5cb5703952649cdcc5321e6e14dea85
+++ packages/distcc/files/no-man.patch	d340b667a5cb5703952649cdcc5321e6e14dea85
@@ -0,0 +1,11 @@
+--- /tmp/Makefile.in	2008-01-06 16:44:45.696595605 +0100
++++ distcc-2.18.3/Makefile.in	2008-01-06 16:44:56.879181132 +0100
+@@ -556,7 +556,7 @@
+ # install-sh can't handle multiple arguments, but we don't need any
+ # tricky features so mkinstalldirs and cp will do
+ 
+-install: showpaths install-doc install-man install-programs install-example @INSTALL_GNOME@
++install: showpaths install-doc install-programs install-example @INSTALL_GNOME@
+ 
+ install-programs: $(bin_PROGRAMS)
+ 	$(mkinstalldirs) $(DESTDIR)$(bindir)
============================================================
--- packages/distcc/distcc_2.18.3.bb	980168c7626a06af4ee3c091da786c662f16fad8
+++ packages/distcc/distcc_2.18.3.bb	761cc7f2560dbb4f9a2c2717f0b21dd831649fb3
@@ -1,15 +1,16 @@ LICENSE = "GPLv2"
 DESCRIPTION = "distcc is a parallel build system that distributes \
 compilation of C/C++/ObjC code across machines on a network."
 SECTION = "devel"
 LICENSE = "GPLv2"
-PR = "r2"
+PR = "r3"
 
 DEPENDS = "avahi gtk+"
 RRECOMMENDS = "avahi-daemon"
 
 SRC_URI = "http://distcc.samba.org/ftp/distcc/distcc-${PV}.tar.bz2 \
 	   file://distcc-avahi.patch;patch=1 \
-	   file://default \
+	   file://no-man.patch;patch=1 \
+           file://default \
 	   file://distcc"
 
 inherit autotools pkgconfig update-rc.d
@@ -21,8 +22,10 @@ do_install_append() {
 do_install_append() {
     install -d ${D}${sysconfdir}/init.d/
     install -d ${D}${sysconfdir}/default
+    install -d ${D}${sysconfdir}/distcc
     install -m 0755 ${WORKDIR}/distcc ${D}${sysconfdir}/init.d/
     install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/distcc
+    echo "+zeroconf" > ${D}${sysconfdir}/distcc/hosts
 }
 
 PACKAGES += "distcc-distmon-gnome"
@@ -31,5 +34,11 @@ FILES_${PN} = " ${sysconfdir} \
 		${bindir}/distcc \
 		${bindir}/distccd \
 		${bindir}/distccmon-text"
+
+CONFFILES_${PN} += "${sysconfdir}/default/distcc \
+                    ${sysconfdir}/distcc/hosts \
+                    ${sysconfdir}/init.d/distcc \
+                   " 
+
 FILES_distcc-distmon-gnome = "  ${bindir}/distccmon-gnome \
 				${datadir}/distcc"