summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Boor <florian.boor@kernelconcepts.de>2005-11-24 01:05:48 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-11-24 01:05:48 +0000
commite92947233f868b0495ff2f19c5522f799f517f27 (patch)
tree79ca329b65f34e4c0ab677cc08fcda6e53e8d89b
parent5a263bb9eff4fcd9a34ab77f91d6f45c19e9b078 (diff)
parent4883b94c9f2fb4f5817577e61901dc14b08427c8 (diff)
merge of 6ab2f457e844b836d62477722d28ecf0f43b8572
and 903d95abd719ae9ee7621a75ccf9ddace7ea1bbb
-rw-r--r--packages/cyrus-imapd/cyrus-imapd_2.2.12.bb4
-rw-r--r--packages/upslug/upslug2-native_11.bb2
-rw-r--r--packages/upslug/upslug2-native_3.bb2
-rw-r--r--packages/upslug/upslug2-native_4.bb2
-rw-r--r--packages/upslug/upslug2-native_5.bb2
-rw-r--r--packages/upslug/upslug2_11.bb (renamed from packages/upslug/upslug2_4.bb)0
-rw-r--r--packages/upslug/upslug2_3.bb1
-rw-r--r--packages/upslug/upslug2_5.bb1
8 files changed, 5 insertions, 9 deletions
diff --git a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
index 72dc846e24..e18f21bf6f 100644
--- a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
+++ b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
@@ -1,7 +1,7 @@
SECTION = "console/network"
DEPENDS = "cyrus-sasl virtual/db"
LICENSE = "BSD"
-PR = "r7"
+PR = "r8"
DEPENDS += "install-native"
SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-${PV}.tar.gz \
@@ -33,9 +33,11 @@ FILES_${PN} += "${prefix}/cyrus/bin"
BUILD_CPPFLAGS += " -I${S} -I${S}/et"
do_install_append () {
+ install -d ${D}${sysconfdir}/init.d
install -m 755 ${WORKDIR}/cyrus ${D}${sysconfdir}/init.d/cyrus
install -m 644 ${WORKDIR}/cyrus.conf_2.2 ${D}${sysconfdir}/cyrus.conf
install -m 644 ${WORKDIR}/imapd.conf_2.2 ${D}${sysconfdir}/imapd.conf
+ install -d ${D}${sysconfdir}/default/volatiles
install -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/01_cyrus-imapd
}
diff --git a/packages/upslug/upslug2-native_11.bb b/packages/upslug/upslug2-native_11.bb
new file mode 100644
index 0000000000..e9ece6a426
--- /dev/null
+++ b/packages/upslug/upslug2-native_11.bb
@@ -0,0 +1,2 @@
+include upslug2_${PV}.bb
+inherit native
diff --git a/packages/upslug/upslug2-native_3.bb b/packages/upslug/upslug2-native_3.bb
deleted file mode 100644
index d0e010198d..0000000000
--- a/packages/upslug/upslug2-native_3.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include upslug2_3.bb
-inherit native
diff --git a/packages/upslug/upslug2-native_4.bb b/packages/upslug/upslug2-native_4.bb
deleted file mode 100644
index 0227255d29..0000000000
--- a/packages/upslug/upslug2-native_4.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include upslug2_4.bb
-inherit native
diff --git a/packages/upslug/upslug2-native_5.bb b/packages/upslug/upslug2-native_5.bb
deleted file mode 100644
index 75870a9950..0000000000
--- a/packages/upslug/upslug2-native_5.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include upslug2_5.bb
-inherit native
diff --git a/packages/upslug/upslug2_4.bb b/packages/upslug/upslug2_11.bb
index de9c427303..de9c427303 100644
--- a/packages/upslug/upslug2_4.bb
+++ b/packages/upslug/upslug2_11.bb
diff --git a/packages/upslug/upslug2_3.bb b/packages/upslug/upslug2_3.bb
deleted file mode 100644
index 5fa7c29185..0000000000
--- a/packages/upslug/upslug2_3.bb
+++ /dev/null
@@ -1 +0,0 @@
-include upslug2-cvs.inc
diff --git a/packages/upslug/upslug2_5.bb b/packages/upslug/upslug2_5.bb
deleted file mode 100644
index de9c427303..0000000000
--- a/packages/upslug/upslug2_5.bb
+++ /dev/null
@@ -1 +0,0 @@
-include upslug2.inc