diff options
author | Amy Fong <amy.fong@windriver.com> | 2014-05-22 15:09:14 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-05-24 00:13:14 -0400 |
commit | bef7a148d3fe5069a5d1f98ee73fc23227b365c6 (patch) | |
tree | 4a9bf33fac83766f541f1acd9b2b8bb11e9dc082 | |
parent | 8d35303d46a080fd974a949ce0ca8c137224e4e9 (diff) | |
download | meta-cloud-services-bef7a148d3fe5069a5d1f98ee73fc23227b365c6.tar.gz |
rabbitmq-server: the following files/directories were installed but not shipped in any package
A number of license and installation files were installed to ${D}, move these to
${D}/usr/share/doc
Signed-off-by: Amy Fong <amy.fong@windriver.com>
-rw-r--r-- | meta-openstack/recipes-extended/rabbitmq/files/cleanup_install.patch | 14 | ||||
-rw-r--r-- | meta-openstack/recipes-extended/rabbitmq/rabbitmq-server_3.2.4.bb | 3 |
2 files changed, 16 insertions, 1 deletions
diff --git a/meta-openstack/recipes-extended/rabbitmq/files/cleanup_install.patch b/meta-openstack/recipes-extended/rabbitmq/files/cleanup_install.patch new file mode 100644 index 0000000..19aa2c2 --- /dev/null +++ b/meta-openstack/recipes-extended/rabbitmq/files/cleanup_install.patch | |||
@@ -0,0 +1,14 @@ | |||
1 | Index: rabbitmq-server-3.2.4/Makefile | ||
2 | =================================================================== | ||
3 | --- rabbitmq-server-3.2.4.orig/Makefile | ||
4 | +++ rabbitmq-server-3.2.4/Makefile | ||
5 | @@ -326,7 +326,8 @@ | ||
6 | install: install_bin | ||
7 | |||
8 | install_bin: all install_dirs | ||
9 | - cp -r ebin include LICENSE* INSTALL $(TARGET_DIR) | ||
10 | + cp -r ebin include $(TARGET_DIR) | ||
11 | + cp -r LICENSE* INSTALL $(DOC_INSTALL_DIR) | ||
12 | |||
13 | chmod 0755 scripts/* | ||
14 | for script in rabbitmq-env rabbitmq-server rabbitmqctl rabbitmq-plugins rabbitmq-defaults; do \ | ||
diff --git a/meta-openstack/recipes-extended/rabbitmq/rabbitmq-server_3.2.4.bb b/meta-openstack/recipes-extended/rabbitmq/rabbitmq-server_3.2.4.bb index ad2e180..1c5344d 100644 --- a/meta-openstack/recipes-extended/rabbitmq/rabbitmq-server_3.2.4.bb +++ b/meta-openstack/recipes-extended/rabbitmq/rabbitmq-server_3.2.4.bb | |||
@@ -4,11 +4,12 @@ LICENSE = "MPL-1.1" | |||
4 | LIC_FILES_CHKSUM = "file://LICENSE-MPL-RabbitMQ;md5=b651d0a6feaaf2bf5eb9d36b2495c510" | 4 | LIC_FILES_CHKSUM = "file://LICENSE-MPL-RabbitMQ;md5=b651d0a6feaaf2bf5eb9d36b2495c510" |
5 | SECTION = "network" | 5 | SECTION = "network" |
6 | DEPENDS = "erlang-native libxslt python-simplejson zip-native unzip-native libxslt-native" | 6 | DEPENDS = "erlang-native libxslt python-simplejson zip-native unzip-native libxslt-native" |
7 | PR = "r0" | 7 | PR = "r1" |
8 | 8 | ||
9 | SRC_URI = "http://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/${PN}-${PV}.tar.gz \ | 9 | SRC_URI = "http://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/${PN}-${PV}.tar.gz \ |
10 | file://rabbitmq-server \ | 10 | file://rabbitmq-server \ |
11 | file://remove-docs.patch \ | 11 | file://remove-docs.patch \ |
12 | file://cleanup_install.patch \ | ||
12 | " | 13 | " |
13 | 14 | ||
14 | SRC_URI[md5sum] = "09d1af64c005bc680d6790b90655d021" | 15 | SRC_URI[md5sum] = "09d1af64c005bc680d6790b90655d021" |