From 468ddde8a5fc444b4480b82ea102bf7dc5cfd191 Mon Sep 17 00:00:00 2001 From: Amy Fong Date: Thu, 22 May 2014 15:09:14 -0400 Subject: 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 --- .../recipes-extended/rabbitmq/files/cleanup_install.patch | 14 ++++++++++++++ .../recipes-extended/rabbitmq/rabbitmq-server_3.2.4.bb | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 meta-openstack/recipes-extended/rabbitmq/files/cleanup_install.patch 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 @@ +Index: rabbitmq-server-3.2.4/Makefile +=================================================================== +--- rabbitmq-server-3.2.4.orig/Makefile ++++ rabbitmq-server-3.2.4/Makefile +@@ -326,7 +326,8 @@ + install: install_bin + + install_bin: all install_dirs +- cp -r ebin include LICENSE* INSTALL $(TARGET_DIR) ++ cp -r ebin include $(TARGET_DIR) ++ cp -r LICENSE* INSTALL $(DOC_INSTALL_DIR) + + chmod 0755 scripts/* + 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" LIC_FILES_CHKSUM = "file://LICENSE-MPL-RabbitMQ;md5=b651d0a6feaaf2bf5eb9d36b2495c510" SECTION = "network" DEPENDS = "erlang-native libxslt python-simplejson zip-native unzip-native libxslt-native" -PR = "r0" +PR = "r1" SRC_URI = "http://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/${PN}-${PV}.tar.gz \ file://rabbitmq-server \ file://remove-docs.patch \ + file://cleanup_install.patch \ " SRC_URI[md5sum] = "09d1af64c005bc680d6790b90655d021" -- cgit v1.2.3-54-g00ecf