Patchwork cramfs_cvs.bb: fix compile step so it can be rerun without failing

login
register
mail settings
Submitter Matthew McClintock
Date July 6, 2012, 3:26 p.m.
Message ID <1341588382-17688-1-git-send-email-msm@freescale.com>
Download mbox | patch
Permalink /patch/31321/
State Superseded
Headers show

Comments

Matthew McClintock - July 6, 2012, 3:26 p.m.
Signed-off-by: Matthew McClintock <msm@freescale.com>
---
 meta-oe/recipes-support/cramfs/cramfs_cvs.bb |    2 ++
 1 file changed, 2 insertions(+)
McClintock Matthew-B29882 - July 6, 2012, 3:44 p.m.
Ugh, this is for meta-openembedded...

-M

On Fri, Jul 6, 2012 at 10:26 AM, Matthew McClintock <msm@freescale.com> wrote:
> Signed-off-by: Matthew McClintock <msm@freescale.com>
> ---
>  meta-oe/recipes-support/cramfs/cramfs_cvs.bb |    2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/meta-oe/recipes-support/cramfs/cramfs_cvs.bb b/meta-oe/recipes-support/cramfs/cramfs_cvs.bb
> index 667097c..61a3fdd 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,6 +17,7 @@ EXTRA_OEMAKE = "\
>
>
>  do_compile_prepend() {
> +       unlink Makefile || true
>          ln -s GNUmakefile Makefile
>  }
>
> --
> 1.7.10
>
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Khem Raj - July 6, 2012, 3:57 p.m.
On Fri, Jul 6, 2012 at 8:26 AM, Matthew McClintock <msm@freescale.com> wrote:
>
>  do_compile_prepend() {
> +       unlink Makefile || true
>          ln -s GNUmakefile Makefile
>  }

why not just ln -sf ?
McClintock Matthew-B29882 - July 6, 2012, 4:01 p.m.
On Fri, Jul 6, 2012 at 10:57 AM, Khem Raj <raj.khem@gmail.com> wrote:
> On Fri, Jul 6, 2012 at 8:26 AM, Matthew McClintock <msm@freescale.com> wrote:
>>
>>  do_compile_prepend() {
>> +       unlink Makefile || true
>>          ln -s GNUmakefile Makefile
>>  }
>
> why not just ln -sf ?

No reason... I guess that's better... v2 coming.

-M


>
> _______________________________________________
> 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..61a3fdd 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,6 +17,7 @@  EXTRA_OEMAKE = "\
 
 
 do_compile_prepend() {
+	unlink Makefile || true
         ln -s GNUmakefile Makefile
 }