From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from dan.rpsys.net ([93.97.175.187]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1UHPFx-000627-Qr for openembedded-core@lists.openembedded.org; Mon, 18 Mar 2013 02:52:58 +0100 Received: from localhost (dan.rpsys.net [127.0.0.1]) by dan.rpsys.net (8.14.4/8.14.4/Debian-2.1ubuntu1) with ESMTP id r2I1jCjH022737 for ; Mon, 18 Mar 2013 01:45:12 GMT X-Virus-Scanned: Debian amavisd-new at dan.rpsys.net Received: from dan.rpsys.net ([127.0.0.1]) by localhost (dan.rpsys.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id wS7P6W7h3a+R for ; Mon, 18 Mar 2013 01:45:12 +0000 (GMT) Received: from [192.168.3.10] (rpvlan0 [192.168.3.10]) (authenticated bits=0) by dan.rpsys.net (8.14.4/8.14.4/Debian-2.1ubuntu1) with ESMTP id r2I1j6hV022715 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NOT) for ; Mon, 18 Mar 2013 01:45:09 GMT Message-ID: <1363570556.4315.33.camel@ted> From: Richard Purdie To: openembedded-core Date: Mon, 18 Mar 2013 01:35:56 +0000 X-Mailer: Evolution 3.6.2-0ubuntu0.1 Mime-Version: 1.0 Subject: [PATCH] rsync: Fix case where ${B} != ${S} X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Mar 2013 01:52:58 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Allow out of tree builds to work by removing assumptions about cwd. Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-devtools/rsync/rsync_3.0.9.bb b/meta/recipes-devtools/rsync/rsync_3.0.9.bb index 74eacc9..e296555 100644 --- a/meta/recipes-devtools/rsync/rsync_3.0.9.bb +++ b/meta/recipes-devtools/rsync/rsync_3.0.9.bb @@ -12,7 +12,7 @@ EXTRA_OECONF += "--disable-xattr-support --disable-acl-support" # rsync 3.0 uses configure.sh instead of configure, and # makefile checks the existence of configure.sh do_configure_prepend () { - rm -f configure configure.sh + rm -f ${S}/configure ${S}/configure.sh cp -f ${WORKDIR}/acinclude.m4 ${S}/ # by default, if crosscompiling, rsync @@ -23,5 +23,5 @@ do_configure_prepend () { } do_configure_append () { - cp -f configure configure.sh + cp -f ${S}/configure ${S}/configure.sh }