Patchwork [meta-oe] cramfs_cvs.bb: fix compile step so it can be rerun without failing

login
register
mail settings
Submitter Matthew McClintock
Date July 20, 2012, 4:35 p.m.
Message ID <1342802112-9917-1-git-send-email-msm@freescale.com>
Download mbox | patch
Permalink /patch/32743/
State New, archived
Headers show

Comments

Matthew McClintock - July 20, 2012, 4:35 p.m.
Signed-off-by: Matthew McClintock <msm@freescale.com>
---
 meta-oe/recipes-support/cramfs/cramfs_cvs.bb |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
McClintock Matthew-B29882 - July 23, 2012, 2:48 p.m.
Koen,

To get the applied against the denzil branch do I need to submit again
with a for-denzil or should I just request a cherry-pick?

-M

On Fri, Jul 20, 2012 at 11:35 AM, Matthew McClintock <msm@freescale.com> wrote:
> Signed-off-by: Matthew McClintock <msm@freescale.com>
> ---
>  meta-oe/recipes-support/cramfs/cramfs_cvs.bb |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/meta-oe/recipes-support/cramfs/cramfs_cvs.bb b/meta-oe/recipes-support/cramfs/cramfs_cvs.bb
> index 667097c..d9b6c06 100644
> --- a/meta-oe/recipes-support/cramfs/cramfs_cvs.bb
> +++ b/meta-oe/recipes-support/cramfs/cramfs_cvs.bb
> @@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/linux/COPYING;md5=9579385572eb40eded61dcb0
>  DEPENDS = "zlib"
>  SRCDATE = "20110110"
>  PV = "1.1+cvs${SRCDATE}"
> +PR = "r1"
>
>  SRC_URI = "cvs://anonymous@cramfs.cvs.sourceforge.net/cvsroot/cramfs;module=linux"
>  S = "${WORKDIR}/linux/scripts/cramfs"
> @@ -16,7 +17,7 @@ EXTRA_OEMAKE = "\
>
>
>  do_compile_prepend() {
> -        ln -s GNUmakefile Makefile
> +        ln -sf GNUmakefile Makefile
>  }
>
>  do_install() {
> --
> 1.7.10
>
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Koen Kooi - July 23, 2012, 2:49 p.m.
Op 23 jul. 2012, om 16:48 heeft McClintock Matthew-B29882 het volgende geschreven:

> Koen,
> 
> To get the applied against the denzil branch do I need to submit again
> with a for-denzil or should I just request a cherry-pick?

Cherry-pick it into the denzil branch, then git-send-email that with the for-denzil tag.

regards,

Koen

> 
> -M
> 
> On Fri, Jul 20, 2012 at 11:35 AM, Matthew McClintock <msm@freescale.com> wrote:
>> Signed-off-by: Matthew McClintock <msm@freescale.com>
>> ---
>> meta-oe/recipes-support/cramfs/cramfs_cvs.bb |    3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>> 
>> diff --git a/meta-oe/recipes-support/cramfs/cramfs_cvs.bb b/meta-oe/recipes-support/cramfs/cramfs_cvs.bb
>> index 667097c..d9b6c06 100644
>> --- a/meta-oe/recipes-support/cramfs/cramfs_cvs.bb
>> +++ b/meta-oe/recipes-support/cramfs/cramfs_cvs.bb
>> @@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/linux/COPYING;md5=9579385572eb40eded61dcb0
>> DEPENDS = "zlib"
>> SRCDATE = "20110110"
>> PV = "1.1+cvs${SRCDATE}"
>> +PR = "r1"
>> 
>> SRC_URI = "cvs://anonymous@cramfs.cvs.sourceforge.net/cvsroot/cramfs;module=linux"
>> S = "${WORKDIR}/linux/scripts/cramfs"
>> @@ -16,7 +17,7 @@ EXTRA_OEMAKE = "\
>> 
>> 
>> do_compile_prepend() {
>> -        ln -s GNUmakefile Makefile
>> +        ln -sf GNUmakefile Makefile
>> }
>> 
>> do_install() {
>> --
>> 1.7.10
>> 
>> 
>> 
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-oe/recipes-support/cramfs/cramfs_cvs.bb b/meta-oe/recipes-support/cramfs/cramfs_cvs.bb
index 667097c..d9b6c06 100644
--- a/meta-oe/recipes-support/cramfs/cramfs_cvs.bb
+++ b/meta-oe/recipes-support/cramfs/cramfs_cvs.bb
@@ -4,6 +4,7 @@  LIC_FILES_CHKSUM = "file://${WORKDIR}/linux/COPYING;md5=9579385572eb40eded61dcb0
 DEPENDS = "zlib"
 SRCDATE = "20110110"
 PV = "1.1+cvs${SRCDATE}"
+PR = "r1"
 
 SRC_URI = "cvs://anonymous@cramfs.cvs.sourceforge.net/cvsroot/cramfs;module=linux"
 S = "${WORKDIR}/linux/scripts/cramfs"
@@ -16,7 +17,7 @@  EXTRA_OEMAKE = "\
 
 
 do_compile_prepend() {
-        ln -s GNUmakefile Makefile
+        ln -sf GNUmakefile Makefile
 }
 
 do_install() {