Skip to contentSkip to conversation

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

meta-oe Matthew McClintock 3 participants 3 messages Jul 20, 2012 – Jul 23, 2012

lore
Share & tools
lore
#0 lore raw
---
 meta-oe/recipes-support/cramfs/cramfs_cvs.bb |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta-oe/recipes-support/cramfs/cramfs_cvs.bb +2 -1
index 667097c..d9b6c06 100644
@@ -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://[email protected]/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() {
Signature · 1 line
1.7.10
#1 lore raw

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

Quoted 35 lines · Matthew McClintock
---
 meta-oe/recipes-support/cramfs/cramfs_cvs.bb |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta-oe/recipes-support/cramfs/cramfs_cvs.bb +2 -2
index 667097c..d9b6c06 100644
@@ -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://[email protected]/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
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

#2 lore raw

Op 23 jul. 2012, om 16:48 heeft McClintock Matthew-B29882 het volgende geschreven:

Quoted 4 lines

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

Quoted 39 lines

-M

Quoted 35 lines · Matthew McClintock

---
meta-oe/recipes-support/cramfs/cramfs_cvs.bb | 3 ++-

1 file changed, 2 insertions(+), 1 deletion(-)
meta-oe/recipes-support/cramfs/cramfs_cvs.bb +0 -0
index 667097c..d9b6c06 100644
@@ -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://[email protected]/cvsroot/cramfs;module=linux" S = "${WORKDIR}/linux/scripts/cramfs"

meta-oe/recipes-support/cramfs/cramfs_cvs.bb +1 -2
@@ -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
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel