summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJamie Lenehan <lenehan@twibble.org>2006-09-10 03:02:05 +0000
committerJamie Lenehan <lenehan@twibble.org>2006-09-10 03:02:05 +0000
commit0fae41734192470283bfda8ccf507c5fcc5a9015 (patch)
treedb777ea64feab0b12d3b791e582e89fc45779798
parent3331ba73ef138361a88431626db11e7a3c80a58a (diff)
conserver: Run sanitize.py over all the files.
-rw-r--r--packages/conserver/conserver.inc33
-rw-r--r--packages/conserver/conserver_8.1.14.bb3
-rw-r--r--packages/conserver/conserver_8.1.2.bb3
3 files changed, 21 insertions, 18 deletions
diff --git a/packages/conserver/conserver.inc b/packages/conserver/conserver.inc
index a12dab5f9d..ff8314fc6e 100644
--- a/packages/conserver/conserver.inc
+++ b/packages/conserver/conserver.inc
@@ -5,30 +5,31 @@ SECTION = "console/network"
LICENSE = "BSD"
SRC_URI = "http://www.conserver.com/conserver-${PV}.tar.gz \
- file://conserver.init \
- file://conserver.default"
+ file://conserver.init \
+ file://conserver.default"
inherit autotools update-rc.d
-# Settings for the initscript
-INITSCRIPT_NAME = "conserver"
-INITSCRIPT_PARAMS = "defaults 98 2"
-
# Stop install being called with -s so it doesn't try and run the host strip command
-EXTRA_OEMAKE=" INSTALL_PROGRAM=install"
-
-# Include the examples in the documentation package
-FILES_${PN}-doc += "${datadir}/examples/conserver"
-
-# Indicate that the default file is a configuation file
-CONFFILES_${PN} = "${sysconfdir}/default/conserver"
+EXTRA_OEMAKE = " INSTALL_PROGRAM=install"
# Include the init script and default settings in the package
do_install_append () {
- install -m 0755 -d ${D}${sysconfdir}/default ${D}${sysconfdir}/init.d
- install -m 0644 ${WORKDIR}/conserver.default ${D}${sysconfdir}/default/conserver
- install -m 0755 ${WORKDIR}/conserver.init ${D}${sysconfdir}/init.d/conserver
+ install -m 0755 -d ${D}${sysconfdir}/default ${D}${sysconfdir}/init.d
+ install -m 0644 ${WORKDIR}/conserver.default ${D}${sysconfdir}/default/conserver
+ install -m 0755 ${WORKDIR}/conserver.init ${D}${sysconfdir}/init.d/conserver
}
+# Include the examples in the documentation package
+FILES_${PN}-doc += "${datadir}/examples/conserver"
+
+# Make sure .debug files end up in the correct place
FILES_${PN} = "${sysconfdir} ${bindir}/* ${libdir}/${PN}/* ${sbindir}/*"
FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libdir}/${PN}/.debug"
+
+# Indicate that the default file is a configuation file
+CONFFILES_${PN} = "${sysconfdir}/default/conserver"
+
+# Settings for the initscript
+INITSCRIPT_NAME = "conserver"
+INITSCRIPT_PARAMS = "defaults 98 2"
diff --git a/packages/conserver/conserver_8.1.14.bb b/packages/conserver/conserver_8.1.14.bb
index 37d33431b6..884d196681 100644
--- a/packages/conserver/conserver_8.1.14.bb
+++ b/packages/conserver/conserver_8.1.14.bb
@@ -1,2 +1,3 @@
-require conserver.inc
PR = "r3"
+
+require conserver.inc
diff --git a/packages/conserver/conserver_8.1.2.bb b/packages/conserver/conserver_8.1.2.bb
index 443add1be6..3aa11df94b 100644
--- a/packages/conserver/conserver_8.1.2.bb
+++ b/packages/conserver/conserver_8.1.2.bb
@@ -1,2 +1,3 @@
-require conserver.inc
PR = "r4"
+
+require conserver.inc