From e91abeaddf46d56068a3c335fa28fbc822ea969a Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 1 Dec 2012 12:35:55 +0200 Subject: [PATCH] freeciv: reorganize recipe segments Moved everything common between freeciv-2.3 and freeciv-2.4 from version specific file to freeciv.inc, and everything specific to freeciv-2.3 from freeciv.inc to version specific file. Signed-off-by: Marko Lindqvist --- recipes-games/freeciv/freeciv.inc | 8 +++++--- recipes-games/freeciv/freeciv_2.3.2.bb | 7 ++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/recipes-games/freeciv/freeciv.inc b/recipes-games/freeciv/freeciv.inc index ccb460e..6a3d4e2 100644 --- a/recipes-games/freeciv/freeciv.inc +++ b/recipes-games/freeciv/freeciv.inc @@ -12,9 +12,9 @@ SECTION = "games" DEPENDS = "gtk+ readline" -SRC_URI = "${SOURCEFORGE_MIRROR}/freeciv/freeciv-${PV}.tar.gz \ - file://allow-root.patch \ - file://wait-server-start.patch \ +SRC_URI = "\ +file://allow-root.patch \ +file://wait-server-start.patch \ " S = "${WORKDIR}/freeciv-${PV}" @@ -26,6 +26,8 @@ EXTRA_OECONF = "\ --with-sdl-prefix=${STAGING_BINDIR_CROSS} \ " +acpaths = "-I ${S}/m4 -I ${S}/dependencies/m4" + PACKAGES =+ "${PN}-common ${PN}-server ${PN}-client-common ${PN}-gtk2" RDEPENDS_${PN} = "freeciv-server freeciv-client" diff --git a/recipes-games/freeciv/freeciv_2.3.2.bb b/recipes-games/freeciv/freeciv_2.3.2.bb index 0aafbfc..9446f93 100644 --- a/recipes-games/freeciv/freeciv_2.3.2.bb +++ b/recipes-games/freeciv/freeciv_2.3.2.bb @@ -3,10 +3,7 @@ LICENSE = "GPLv2" PR = "r0" +SRC_URI += "${SOURCEFORGE_MIRROR}/freeciv/freeciv-${PV}.tar.gz" + SRC_URI[md5sum] = "90d2c95a74398616b385bf6dbd1f813e" SRC_URI[sha256sum] = "15d886759a13a546985bf3e6824ca2dfbefb568f12d85ac63da06ff013d91f7a" - -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" - -acpaths = "-I ${S}/m4 -I ${S}/dependencies/m4" -