From ef3d4d744d5f27d235c11ca8727ee7ac3c521788 Mon Sep 17 00:00:00 2001
From: Robert Bradford <rob@openedhand.com>
Date: Thu, 1 Feb 2007 14:57:56 +0000
Subject: Add patch that adds a "--list-files/-l" to oparchive that just lists
 what would be copied rather than copying them.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1247 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../oprofile/oprofile/oparchive-list-files.patch   | 60 ++++++++++++++++++++++
 meta/packages/oprofile/oprofile_cvs.bb             |  1 +
 2 files changed, 61 insertions(+)
 create mode 100644 meta/packages/oprofile/oprofile/oparchive-list-files.patch

(limited to 'meta/packages/oprofile')

diff --git a/meta/packages/oprofile/oprofile/oparchive-list-files.patch b/meta/packages/oprofile/oprofile/oparchive-list-files.patch
new file mode 100644
index 000000000..fc8a6271b
--- /dev/null
+++ b/meta/packages/oprofile/oprofile/oparchive-list-files.patch
@@ -0,0 +1,60 @@
+Index: oprofile/pp/oparchive.cpp
+===================================================================
+--- oprofile.orig/pp/oparchive.cpp	2007-01-22 12:23:51.000000000 +0000
++++ oprofile/pp/oparchive.cpp	2007-01-22 12:23:56.000000000 +0000
+@@ -35,6 +35,11 @@
+ 
+ void copy_one_file(image_error err, string const & source, string const & dest)
+ {
++	if (options::list_files) {
++		cout << source << endl;
++		return;
++	}
++
+ 	if (!copy_file(source, dest) && err == image_ok) {
+ 		cerr << "can't copy from " << source << " to " << dest
+ 		     << " cause: " << strerror(errno) << endl;
+Index: oprofile/pp/oparchive_options.cpp
+===================================================================
+--- oprofile.orig/pp/oparchive_options.cpp	2007-01-22 12:22:44.000000000 +0000
++++ oprofile/pp/oparchive_options.cpp	2007-01-22 12:23:03.000000000 +0000
+@@ -36,6 +36,7 @@
+ 	bool exclude_dependent;
+ 	merge_option merge_by;
+ 	string outdirectory;
++	bool list_files;
+ }
+ 
+ 
+@@ -47,7 +48,9 @@
+ 	popt::option(options::outdirectory, "output-directory", 'o',
+ 	             "output to the given directory", "directory"),
+ 	popt::option(options::exclude_dependent, "exclude-dependent", 'x',
+-		     "exclude libs, kernel, and module samples for applications")
++		     "exclude libs, kernel, and module samples for applications"),
++	popt::option(options::list_files, "list-files", 'l',
++		     "just list the files necessary, don't produce the archive")
+ };
+ 
+ 
+@@ -60,7 +63,7 @@
+ 	using namespace options;
+ 
+ 	/* output directory is required */
+-	if (outdirectory.size() == 0) {
++	if (outdirectory.size() == 0 && !list_files) {
+ 		cerr << "Requires --output-directory option." << endl;
+ 		exit(EXIT_FAILURE);
+ 	}
+Index: oprofile/pp/oparchive_options.h
+===================================================================
+--- oprofile.orig/pp/oparchive_options.h	2007-01-22 12:23:14.000000000 +0000
++++ oprofile/pp/oparchive_options.h	2007-01-22 12:23:30.000000000 +0000
+@@ -22,6 +22,7 @@
+ 	extern bool exclude_dependent;
+ 	extern merge_option merge_by;
+ 	extern std::string outdirectory;
++	extern bool list_files;
+ }
+ 
+ /// All the chosen sample files.
diff --git a/meta/packages/oprofile/oprofile_cvs.bb b/meta/packages/oprofile/oprofile_cvs.bb
index 71cf31ae2..008b2a7ff 100644
--- a/meta/packages/oprofile/oprofile_cvs.bb
+++ b/meta/packages/oprofile/oprofile_cvs.bb
@@ -9,6 +9,7 @@ DEPENDS = "popt binutils"
 SRC_URI = "cvs://anonymous@oprofile.cvs.sourceforge.net/cvsroot/oprofile;module=oprofile \
 	   file://oprofile_eabi.patch;patch=1 \
 	   file://oparchive-debug-dir.patch;patch=1 \
+	   file://oparchive-list-files.patch;patch=1 \
 	   file://acinclude.m4"
 S = "${WORKDIR}/oprofile"
 
-- 
cgit v1.2.3