[oe-commits] org.oe.dev merge of '16286a015e02dffbcbc2f42586e7402f16dba818'
mickeyl commit
oe at amethyst.openembedded.net
Thu Jul 24 09:01:22 UTC 2008
merge of '16286a015e02dffbcbc2f42586e7402f16dba818'
and '4e6e5c3a6954f62ae6b6233d225415fb8a185151'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: c2a1dc8f3ba7a333027a3d1d18caf51f6508b723
ViewMTN: http://monotone.openembedded.org/revision/info/c2a1dc8f3ba7a333027a3d1d18caf51f6508b723
Files:
1
packages/neuros-public/neuros-mainmenu_git.bb
packages/neuros-public/neuros-nwm_git.bb
packages/linux/linux-omap2_git.bb
packages/neuros-public/neuros-lib-widgets_git.bb
packages/neuros-public/neuros-qt-plugins_git.bb
packages/python/python-setuptools
packages/python/python-setuptools/fix-log-usage.patch
packages/python/python-setuptools-native_0.6c8.bb
packages/python/python-setuptools_0.6c8.bb
Diffs:
#
# mt diff -r16286a015e02dffbcbc2f42586e7402f16dba818 -rc2a1dc8f3ba7a333027a3d1d18caf51f6508b723
#
#
#
# add_file "packages/neuros-public/neuros-mainmenu_git.bb"
# content [556d6e6f57c68b97712cda2ea1ed2e9ada27b4fa]
#
# add_file "packages/neuros-public/neuros-nwm_git.bb"
# content [8066ae3bdfcaa465ac10245698627f7a5653631c]
#
# patch "packages/linux/linux-omap2_git.bb"
# from [b1840f168d4f2b64adb1e1cb52561e0aa47ecb53]
# to [ef14668a9a1c7d97225d194c81aa52ace025f767]
#
# patch "packages/neuros-public/neuros-lib-widgets_git.bb"
# from [99e7d5a361229e9fc69cb3d4fdefab5c3fe84ce8]
# to [066f779d14370cd80cffd7fd784d04df7990a255]
#
# patch "packages/neuros-public/neuros-qt-plugins_git.bb"
# from [a8b5931e6c77fb22d956e58b1f601344a24ad80b]
# to [8e03d1bc20bb51c31f921404d846b4c6fa902d59]
#
============================================================
--- packages/neuros-public/neuros-mainmenu_git.bb 556d6e6f57c68b97712cda2ea1ed2e9ada27b4fa
+++ packages/neuros-public/neuros-mainmenu_git.bb 556d6e6f57c68b97712cda2ea1ed2e9ada27b4fa
@@ -0,0 +1,23 @@
+DESCRIPTION = "Neuros window manager"
+LICENSE = "GPL"
+
+PV = "0.0+${PR}+gitr${SRCREV}"
+PR = "r0"
+
+DEPENDS = "qt-embedded"
+
+inherit qtopia4core
+
+SRCREV = "27fc35bd349ccbac1226ebb3d41417d8164b7dd1"
+SRC_URI = "git://git.neurostechnology.com/git/app-mainmenu;protocol=git"
+S = "${WORKDIR}/git/"
+
+do_install() {
+ install -d ${D}/${bindir}
+ install -m 0755 ${S}/build/main-menu ${D}/${bindir}
+
+ install -d ${D}/${sysconfdir}/menu
+ install -m 0644 ${S}/resources/menu/* ${D}/${sysconfdir}/menu
+}
+
+
============================================================
--- packages/neuros-public/neuros-nwm_git.bb 8066ae3bdfcaa465ac10245698627f7a5653631c
+++ packages/neuros-public/neuros-nwm_git.bb 8066ae3bdfcaa465ac10245698627f7a5653631c
@@ -0,0 +1,22 @@
+DESCRIPTION = "Neuros window manager"
+LICENSE = "GPL"
+
+PV = "0.0+${PR}+gitr${SRCREV}"
+PR = "r2"
+
+DEPENDS = "qt-embedded"
+
+inherit qtopia4core
+
+SRCREV = "d0b6789dde38d321d3c90c04512a4ea43e28e79e"
+SRC_URI = "git://git.neurostechnology.com/git/app-nwm;protocol=git"
+S = "${WORKDIR}/git/"
+
+do_configure_prepend() {
+ rm ${S}/src/Makefile || true
+}
+
+do_install() {
+ install -d ${D}/${bindir}
+ install -m 0755 ${S}/build/nwm ${D}/${bindir}
+}
============================================================
--- packages/linux/linux-omap2_git.bb b1840f168d4f2b64adb1e1cb52561e0aa47ecb53
+++ packages/linux/linux-omap2_git.bb ef14668a9a1c7d97225d194c81aa52ace025f767
@@ -6,7 +6,7 @@ PV = "2.6.26"
PV = "2.6.26"
#PV = "2.6.25+2.6.26-rc9+${PR}+git${SRCREV}"
-PR = "r47"
+PR = "r48"
SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
file://defconfig"
@@ -43,6 +43,8 @@ SRC_URI_append_beagleboard = " file://no
file://mru-clocks1.diff;patch=1 \
file://mru-clocks2.diff;patch=1 \
file://mru-clocks3.diff;patch=1 \
+ file://4bitmmc.diff;patch=1 \
+ file://400khz-i2c.diff;patch=1 \
"
SRC_URI_append_omap3evm = " file://no-harry-potter.diff;patch=1 \
============================================================
--- packages/neuros-public/neuros-lib-widgets_git.bb 99e7d5a361229e9fc69cb3d4fdefab5c3fe84ce8
+++ packages/neuros-public/neuros-lib-widgets_git.bb 066f779d14370cd80cffd7fd784d04df7990a255
@@ -1,6 +1,9 @@ LICENSE = "GPL"
DESCRIPTION = "Neuros qt-plugins"
LICENSE = "GPL"
+PV = "0.0+${PR}+gitr${SRCREV}"
+PR = "r1"
+
DEPENDS = "qt-embedded"
inherit qtopia4core
@@ -14,4 +17,7 @@ do_install() {
install -m 0755 ${S}/build/lib* ${D}/${libdir}
}
+do_stage() {
+ install -d ${STAGING_LIBDIR}
+ install -m 0755 ${S}/build/lib* ${STAGING_LIBDIR}
+}
-
============================================================
--- packages/neuros-public/neuros-qt-plugins_git.bb a8b5931e6c77fb22d956e58b1f601344a24ad80b
+++ packages/neuros-public/neuros-qt-plugins_git.bb 8e03d1bc20bb51c31f921404d846b4c6fa902d59
@@ -1,7 +1,8 @@ LICENSE = "GPL"
DESCRIPTION = "Neuros qt-plugins"
LICENSE = "GPL"
-PR = "r1"
+PV = "0.0+${PR}+gitr${SRCREV}"
+PR = "r2"
DEPENDS = "qt-embedded"
#
# mt diff -r4e6e5c3a6954f62ae6b6233d225415fb8a185151 -rc2a1dc8f3ba7a333027a3d1d18caf51f6508b723
#
#
#
# add_dir "packages/python/python-setuptools"
#
# add_file "packages/python/python-setuptools/fix-log-usage.patch"
# content [1ee527f30af93cafced84bcc0d71b52bf1c1f1fd]
#
# patch "packages/python/python-setuptools-native_0.6c8.bb"
# from [98f58e21bf03997cb61c8459da61b888c73364f9]
# to [f5d6011427a630faa2fa13103a2503e98045d9ea]
#
# patch "packages/python/python-setuptools_0.6c8.bb"
# from [122ed3dd626cef08ab8b57defb23846772fdaa38]
# to [ed9de0fbcfd567e9243041f0ccaa8e7893a9c7f7]
#
============================================================
--- packages/python/python-setuptools/fix-log-usage.patch 1ee527f30af93cafced84bcc0d71b52bf1c1f1fd
+++ packages/python/python-setuptools/fix-log-usage.patch 1ee527f30af93cafced84bcc0d71b52bf1c1f1fd
@@ -0,0 +1,13 @@
+Index: setuptools-0.6c8/setuptools/command/sdist.py
+===================================================================
+--- setuptools-0.6c8.orig/setuptools/command/sdist.py
++++ setuptools-0.6c8/setuptools/command/sdist.py
+@@ -95,7 +95,7 @@ def entries_finder(dirname, filename):
+ for match in entries_pattern.finditer(data):
+ yield joinpath(dirname,unescape(match.group(1)))
+ else:
+- log.warn("unrecognized .svn/entries format in %s", dirname)
++ print ("unrecognized .svn/entries format in %s", dirname)
+
+
+ finders = [
============================================================
--- packages/python/python-setuptools-native_0.6c8.bb 98f58e21bf03997cb61c8459da61b888c73364f9
+++ packages/python/python-setuptools-native_0.6c8.bb f5d6011427a630faa2fa13103a2503e98045d9ea
@@ -1,9 +1,9 @@ inherit native
require python-setuptools_${PV}.bb
inherit native
+FILESPATH = "${FILE_DIRNAME}/python-setuptools"
DEPENDS = "python-native"
do_stage() {
- BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
- ${STAGING_BINDIR_NATIVE}/python setup.py install
+ distutils_stage_all
}
============================================================
--- packages/python/python-setuptools_0.6c8.bb 122ed3dd626cef08ab8b57defb23846772fdaa38
+++ packages/python/python-setuptools_0.6c8.bb ed9de0fbcfd567e9243041f0ccaa8e7893a9c7f7
@@ -5,9 +5,12 @@ SRCNAME = "setuptools"
LICENSE = "MIT-like"
RDEPENDS = "python-distutils python-compression"
SRCNAME = "setuptools"
-PR = "ml0"
+PR = "ml1"
-SRC_URI = "http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz"
+SRC_URI = "\
+ http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz\
+ file://fix-log-usage.patch;patch=1 \
+"
S = "${WORKDIR}/${SRCNAME}-${PV}"
inherit distutils
More information about the Openembedded-commits
mailing list