summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2010-11-30 16:34:52 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-06 22:02:25 +0000
commit48ba76afdf360261f91eccf0deee5a0767adf8b5 (patch)
tree95949e27c2927bbdc1f16f269f19c47a6366bdd2
parentccdd26d18ad4cb50e3f74ba0aead20776da05d1f (diff)
downloadopenembedded-core-48ba76afdf360261f91eccf0deee5a0767adf8b5.tar.gz
openembedded-core-48ba76afdf360261f91eccf0deee5a0767adf8b5.tar.bz2
openembedded-core-48ba76afdf360261f91eccf0deee5a0767adf8b5.zip
puzzles: Update to svn r9023
Removed makedist_hack.patch, as makedist.sh is no longer exist in upstream and mkfiles.pl is called directly now. Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
-rw-r--r--meta/recipes-sato/puzzles/files/makedist_hack.patch17
-rw-r--r--meta/recipes-sato/puzzles/puzzles_r9023.bb (renamed from meta/recipes-sato/puzzles/puzzles_r7593.bb)14
2 files changed, 8 insertions, 23 deletions
diff --git a/meta/recipes-sato/puzzles/files/makedist_hack.patch b/meta/recipes-sato/puzzles/files/makedist_hack.patch
deleted file mode 100644
index d07e066026..0000000000
--- a/meta/recipes-sato/puzzles/files/makedist_hack.patch
+++ /dev/null
@@ -1,17 +0,0 @@
----
- makedist.sh | 2 ++
- 1 file changed, 2 insertions(+)
-
-Index: puzzles/makedist.sh
-===================================================================
---- puzzles.orig/makedist.sh 2007-05-17 11:49:59.000000000 +0100
-+++ puzzles/makedist.sh 2007-05-17 12:07:39.000000000 +0100
-@@ -30,6 +30,8 @@ fi
-
- perl mkfiles.pl
-
-+exit 0
-+
- mkdir tmp.$$
- mkdir tmp.$$/puzzles$arcsuffix
-
diff --git a/meta/recipes-sato/puzzles/puzzles_r7593.bb b/meta/recipes-sato/puzzles/puzzles_r9023.bb
index 7471352b2d..e51bd7a560 100644
--- a/meta/recipes-sato/puzzles/puzzles_r7593.bb
+++ b/meta/recipes-sato/puzzles/puzzles_r9023.bb
@@ -1,18 +1,20 @@
+DESCRIPTION="Simon Tatham's Portable Puzzle Collection"
+HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
DEPENDS = "gtk+ libxt"
-PR = "r8"
+PR = "r0"
MOD_PV = "${@bb.data.getVar('PV',d,1)[1:]}"
LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENCE;md5=9928b60f3b78be315b7ab699c1b03ff5"
-#SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar.gz"
-SRC_URI = "svn://ixion.tartarus.org/main;module=puzzles;rev=${MOD_PV} \
- file://makedist_hack.patch;patch=1"
+SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar.gz"
+#SRC_URI = "svn://ixion.tartarus.org/main;module=puzzles;rev=${MOD_PV}"
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/${PN}-${PV}"
do_configure () {
- ./makedist.sh ${MOD_PV}
+ ./mkfiles.pl
}
do_compile_prepend = " \