[oe-commits] org.oe.dev merge of '19bacabe62a70bf0818d663c4cd3bc168e5cf49e'
daniel commit
openembedded-commits at lists.openembedded.org
Thu Jan 17 21:00:18 UTC 2008
merge of '19bacabe62a70bf0818d663c4cd3bc168e5cf49e'
and '812ef7daa38cb7e71c9e1bb3ef0358566d20c3ee'
Author: daniel at openembedded.org
Branch: org.openembedded.dev
Revision: ad95f08d419bba954eab21c0d4ef155b70f86dbc
ViewMTN: http://monotone.openembedded.org/revision/info/ad95f08d419bba954eab21c0d4ef155b70f86dbc
Files:
1
packages/wesnoth
packages/subversion/subversion_1.4.5.bb
packages/wesnoth/wesnoth_svn.bb
conf/distro/include/sane-srcrevs.inc
packages/zaurusd/zaurusd_svn.bb
packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-rtc.patch
packages/linux/linux_2.6.23.bb
Diffs:
#
# mt diff -r19bacabe62a70bf0818d663c4cd3bc168e5cf49e -rad95f08d419bba954eab21c0d4ef155b70f86dbc
#
#
#
# add_dir "packages/wesnoth"
#
# add_file "packages/subversion/subversion_1.4.5.bb"
# content [680bf01cbd49adaec6a24e728327d7aec6fbaa94]
#
# add_file "packages/wesnoth/wesnoth_svn.bb"
# content [de8bbc9e99d99055231c5edc26d756f2d06012dc]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [9f3cdfb4521c1a35261f43b7b2016b5f26a65a26]
# to [d1197862572f9af8fe6c4149155a577f214c326d]
#
# patch "packages/zaurusd/zaurusd_svn.bb"
# from [fd7e6ab176fd80995c6a4aa697765dd21900decd]
# to [f709b2aca8b8c4c78926edcec52fc48ed0c06540]
#
============================================================
--- packages/subversion/subversion_1.4.5.bb 680bf01cbd49adaec6a24e728327d7aec6fbaa94
+++ packages/subversion/subversion_1.4.5.bb 680bf01cbd49adaec6a24e728327d7aec6fbaa94
@@ -0,0 +1,33 @@
+DESCRIPTION = "The Subversion (svn) client"
+SECTION = "console/network"
+DEPENDS = "apr-util neon"
+RDEPENDS = "neon"
+LICENSE = "Apache BSD"
+HOMEPAGE = "http://subversion.tigris.org"
+
+PR = "r0"
+
+SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
+ file://disable-revision-install.patch;patch=1 \
+ file://neon-detection.patch;patch=1"
+
+EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${TARGET_SYS} \
+ --without-berkeley-db --without-apxs --without-apache \
+ --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
+ --with-apr-util=${STAGING_BINDIR_CROSS}"
+
+
+inherit autotools
+
+export LDFLAGS += " -L${STAGING_LIBDIR} "
+
+do_configure() {
+ gnu-configize
+ libtoolize --force
+ aclocal -I build/ -I build/ac-macros/ && autoconf
+ oe_runconf
+}
+
+do_stage() {
+ autotools_stage_all
+}
============================================================
--- packages/wesnoth/wesnoth_svn.bb de8bbc9e99d99055231c5edc26d756f2d06012dc
+++ packages/wesnoth/wesnoth_svn.bb de8bbc9e99d99055231c5edc26d756f2d06012dc
@@ -0,0 +1,19 @@
+DESCRIPTION = "fantasy turn-based strategy game"
+PV = "0.01+svnr${SRCREV}"
+PR = "r1"
+SECTION = "games"
+LICENSE = "GPL"
+DEPENDS += "libsdl-image libsdl-mixer libsdl-net"
+SRC_URI = "svn://svn.gna.org/svn/wesnoth;module=trunk;proto=http"
+
+EXTRA_OECONF += " --enable-tinygui --disable-python --enable-lite --enable-lowmem"
+
+S = "${WORKDIR}/trunk"
+
+inherit autotools
+
+addtask autogen after do_patch before do_configure
+
+do_autogen() {
+ cd ${WORKDIR}/trunk/ && ./autogen.sh --host=armv4t-angstrom-linux-gnueabi
+}
============================================================
--- conf/distro/include/sane-srcrevs.inc 9f3cdfb4521c1a35261f43b7b2016b5f26a65a26
+++ conf/distro/include/sane-srcrevs.inc d1197862572f9af8fe6c4149155a577f214c326d
@@ -123,6 +123,7 @@ SRCREV_pn-webkit-qtopia ?= "27222"
SRCREV_pn-webkit-gtk ?= "27222"
SRCREV_pn-webkit-qt ?= "27222"
SRCREV_pn-webkit-qtopia ?= "27222"
+SRCREV_pn-wesnoth ?= "22021"
SRCREV_pn-xoo ?= "1623"
SRCREV_pn-mplayer ?= "24587"
SRCREV_pn-networkmanager ?= "2887"
============================================================
--- packages/zaurusd/zaurusd_svn.bb fd7e6ab176fd80995c6a4aa697765dd21900decd
+++ packages/zaurusd/zaurusd_svn.bb f709b2aca8b8c4c78926edcec52fc48ed0c06540
@@ -1,10 +1,10 @@ LICENSE = "GPL"
DESCRIPTION = "Daemon to handle device specifc features."
SECTION = "base"
LICENSE = "GPL"
-DEPENDS = "tslib gpe-conf"
-RDEPENDS = "procps gpe-conf"
+DEPENDS = "tslib"
+RDEPENDS = "procps"
PV = "0.0+svn${SRCDATE}"
-PR = "r12"
+PR = "r13"
SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \
file://zaurus-hinge.in \
#
# mt diff -r812ef7daa38cb7e71c9e1bb3ef0358566d20c3ee -rad95f08d419bba954eab21c0d4ef155b70f86dbc
#
#
#
# add_file "packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-rtc.patch"
# content [953bccbd5cef5767c0a922ebc7eeae4691dbfb65]
#
# patch "packages/linux/linux_2.6.23.bb"
# from [24ff32f454e2986756b191f3d2024191467b032b]
# to [1ad744b33520a65188c10577d6ef70a69a3554aa]
#
============================================================
--- packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-rtc.patch 953bccbd5cef5767c0a922ebc7eeae4691dbfb65
+++ packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-rtc.patch 953bccbd5cef5767c0a922ebc7eeae4691dbfb65
@@ -0,0 +1,32 @@
+diff -urN linux-2.6.23.orig/arch/powerpc/boot/dts/mpc8313erdb.dts linux-2.6.23/arch/powerpc/boot/dts/mpc8313erdb.dts
+--- linux-2.6.23.orig/arch/powerpc/boot/dts/mpc8313erdb.dts 2007-10-09 22:31:38.000000000 +0200
++++ linux-2.6.23/arch/powerpc/boot/dts/mpc8313erdb.dts 2007-11-29 19:32:21.000000000 +0100
+@@ -60,6 +60,12 @@
+ interrupts = <e 8>;
+ interrupt-parent = < &ipic >;
+ dfsrr;
++
++ rtc at 68 {
++ device_type = "rtc";
++ compatible = "dallas,ds1339";
++ reg = <68>;
++ };
+ };
+
+ i2c at 3100 {
+diff -urN linux-2.6.23.orig/arch/powerpc/sysdev/fsl_soc.c linux-2.6.23/arch/powerpc/sysdev/fsl_soc.c
+--- linux-2.6.23.orig/arch/powerpc/sysdev/fsl_soc.c 2007-10-09 22:31:38.000000000 +0200
++++ linux-2.6.23/arch/powerpc/sysdev/fsl_soc.c 2007-11-29 19:31:58.000000000 +0100
+@@ -319,6 +319,12 @@
+ {"ricoh,rs5c372b", "rtc-rs5c372", "rs5c372b",},
+ {"ricoh,rv5c386", "rtc-rs5c372", "rv5c386",},
+ {"ricoh,rv5c387a", "rtc-rs5c372", "rv5c387a",},
++ {"dallas,ds1307", "rtc-ds1307", "ds1307",},
++ {"dallas,ds1337", "rtc-ds1307", "ds1337",},
++ {"dallas,ds1338", "rtc-ds1307", "ds1338",},
++ {"dallas,ds1339", "rtc-ds1307", "ds1339",},
++ {"dallas,ds1340", "rtc-ds1307", "ds1340",},
++ {"stm,m41t00", "rtc-ds1307", "m41t00"},
+ };
+
+ static int __init of_find_i2c_driver(struct device_node *node, struct i2c_board_info *info)
============================================================
--- packages/linux/linux_2.6.23.bb 24ff32f454e2986756b191f3d2024191467b032b
+++ packages/linux/linux_2.6.23.bb 1ad744b33520a65188c10577d6ef70a69a3554aa
@@ -25,7 +25,8 @@ SRC_URI_append_mpc8313e-rdb = "\
SRC_URI_append_mpc8313e-rdb = "\
file://mpc831x-nand.patch;patch=1 \
- file://mpc8313e-rdb-leds.patch;patch=1"
+ file://mpc8313e-rdb-leds.patch;patch=1 \
+ file://mpc8313e-rdb-rtc.patch;patch=1"
SRC_URI_append_mpc8323e-rdb = "\
file://mpc832x-leds.patch;patch=1"
More information about the Openembedded-commits
mailing list