Send commitlog mailing list submissions to
commitlog@lists.openmoko.org
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. org.openmoko.april-update:
083c85544a6e460740bde19d5712dec0f40da16d ([EMAIL PROTECTED])
2. org.openmoko.april-update:
083c85544a6e460740bde19d5712dec0f40da16d ([EMAIL PROTECTED])
3. org.openmoko.april-update:
178c97ae0a693edea4d65673050d3cf8080f2bba ([EMAIL PROTECTED])
4. org.openmoko.april-update:
178c97ae0a693edea4d65673050d3cf8080f2bba ([EMAIL PROTECTED])
--- Begin Message ---
revision: 083c85544a6e460740bde19d5712dec0f40da16d
date: 2008-05-19T12:27:24
author: [EMAIL PROTECTED]
branch: org.openmoko.april-update
changelog:
illume: Update illume and illume-theme to r86 and install the new files
manifest:
format_version "1"
new_manifest [0c46c0dc0816f7cca442e45c0a2d845fe4cad34f]
old_revision [178c97ae0a693edea4d65673050d3cf8080f2bba]
patch "conf/distro/include/sane-srcrevs.inc"
from [89166126a8a5d503bb8c5e0e511be56b37659832]
to [4fb30221d410d02cf18dc64f454f5708196060d6]
patch "packages/openmoko-projects/illume-theme_svn.bb"
from [a5b248c743b547dd436dd3ee40850b98a7f125e6]
to [a426add7f3c8b72e40e7865aa85755e8a677a2b7]
#
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [89166126a8a5d503bb8c5e0e511be56b37659832]
# to [4fb30221d410d02cf18dc64f454f5708196060d6]
#
# patch "packages/openmoko-projects/illume-theme_svn.bb"
# from [a5b248c743b547dd436dd3ee40850b98a7f125e6]
# to [a426add7f3c8b72e40e7865aa85755e8a677a2b7]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc
89166126a8a5d503bb8c5e0e511be56b37659832
+++ conf/distro/include/sane-srcrevs.inc
4fb30221d410d02cf18dc64f454f5708196060d6
@@ -42,8 +42,8 @@ SRCREV_pn-hildon-1 ?= "14429"
SRCREV_pn-gtkhtml2 ?= "1158"
SRCREV_pn-gypsy ?= "134"
SRCREV_pn-hildon-1 ?= "14429"
-SRCREV_pn-illume ?= "79"
-SRCREV_pn-illume-theme ?= "79"
+SRCREV_pn-illume ?= "86"
+SRCREV_pn-illume-theme ?= "86"
SRCREV_pn-kismet ?= "2285"
SRCREV_pn-kismet-newcore ?= "2285"
SRCREV_pn-libcalenabler2 ?= "1410"
============================================================
--- packages/openmoko-projects/illume-theme_svn.bb
a5b248c743b547dd436dd3ee40850b98a7f125e6
+++ packages/openmoko-projects/illume-theme_svn.bb
a426add7f3c8b72e40e7865aa85755e8a677a2b7
@@ -4,7 +4,7 @@ PV = "0.0+svnr${SRCPV}"
PACKAGE_ARCH="all"
PV = "0.0+svnr${SRCPV}"
-PR = "r5"
+PR = "r5.02"
SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=illume;proto=https"
S = "${WORKDIR}/illume"
@@ -15,9 +15,11 @@ do_install() {
do_install() {
install -d ${D}${sysconfdir}/enlightenment
install -d ${D}${datadir}/enlightenment/data/themes/
+ install -d ${D}${datadir}/enlightenment/data/init/
# Make illume the default profile
echo 'E_PROFILE="-profile illume"' >
${D}${sysconfdir}/enlightenment/default_profile
install -m 0644 ${S}/misc-data/illume.edj
${D}${datadir}/enlightenment/data/themes/
+ install -m 0644 ${S}/misc-data/illume_init.edj
${D}${datadir}/enlightenment/data/init/
}
--- End Message ---
--- Begin Message ---
revision: 083c85544a6e460740bde19d5712dec0f40da16d
date: 2008-05-19T12:27:24
author: [EMAIL PROTECTED]
branch: org.openmoko.april-update
changelog:
illume: Update illume and illume-theme to r86 and install the new files
manifest:
format_version "1"
new_manifest [0c46c0dc0816f7cca442e45c0a2d845fe4cad34f]
old_revision [178c97ae0a693edea4d65673050d3cf8080f2bba]
patch "conf/distro/include/sane-srcrevs.inc"
from [89166126a8a5d503bb8c5e0e511be56b37659832]
to [4fb30221d410d02cf18dc64f454f5708196060d6]
patch "packages/openmoko-projects/illume-theme_svn.bb"
from [a5b248c743b547dd436dd3ee40850b98a7f125e6]
to [a426add7f3c8b72e40e7865aa85755e8a677a2b7]
#
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [89166126a8a5d503bb8c5e0e511be56b37659832]
# to [4fb30221d410d02cf18dc64f454f5708196060d6]
#
# patch "packages/openmoko-projects/illume-theme_svn.bb"
# from [a5b248c743b547dd436dd3ee40850b98a7f125e6]
# to [a426add7f3c8b72e40e7865aa85755e8a677a2b7]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc
89166126a8a5d503bb8c5e0e511be56b37659832
+++ conf/distro/include/sane-srcrevs.inc
4fb30221d410d02cf18dc64f454f5708196060d6
@@ -42,8 +42,8 @@ SRCREV_pn-hildon-1 ?= "14429"
SRCREV_pn-gtkhtml2 ?= "1158"
SRCREV_pn-gypsy ?= "134"
SRCREV_pn-hildon-1 ?= "14429"
-SRCREV_pn-illume ?= "79"
-SRCREV_pn-illume-theme ?= "79"
+SRCREV_pn-illume ?= "86"
+SRCREV_pn-illume-theme ?= "86"
SRCREV_pn-kismet ?= "2285"
SRCREV_pn-kismet-newcore ?= "2285"
SRCREV_pn-libcalenabler2 ?= "1410"
============================================================
--- packages/openmoko-projects/illume-theme_svn.bb
a5b248c743b547dd436dd3ee40850b98a7f125e6
+++ packages/openmoko-projects/illume-theme_svn.bb
a426add7f3c8b72e40e7865aa85755e8a677a2b7
@@ -4,7 +4,7 @@ PV = "0.0+svnr${SRCPV}"
PACKAGE_ARCH="all"
PV = "0.0+svnr${SRCPV}"
-PR = "r5"
+PR = "r5.02"
SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=illume;proto=https"
S = "${WORKDIR}/illume"
@@ -15,9 +15,11 @@ do_install() {
do_install() {
install -d ${D}${sysconfdir}/enlightenment
install -d ${D}${datadir}/enlightenment/data/themes/
+ install -d ${D}${datadir}/enlightenment/data/init/
# Make illume the default profile
echo 'E_PROFILE="-profile illume"' >
${D}${sysconfdir}/enlightenment/default_profile
install -m 0644 ${S}/misc-data/illume.edj
${D}${datadir}/enlightenment/data/themes/
+ install -m 0644 ${S}/misc-data/illume_init.edj
${D}${datadir}/enlightenment/data/init/
}
--- End Message ---
--- Begin Message ---
revision: 178c97ae0a693edea4d65673050d3cf8080f2bba
date: 2008-05-17T20:33:07
author: [EMAIL PROTECTED]
branch: org.openmoko.april-update
changelog:
base.bbclass: Use git-log to get a possible git-revision and populate
OE_REVISION with that
Prepare for the switch to git and to have accurate OE_REVISION even on git
manifest:
format_version "1"
new_manifest [1ae26a15613ea55f1d87a9f851da56e3bf5851ea]
old_revision [5d9397e8336d1ce179a66966e2d064a6e4ecfe9f]
patch "classes/base.bbclass"
from [cf57311376e9ff8f4bd87f3ffdaad688ef85ea51]
to [d26debb0f94b1091c3bbf203084c6a5f1f1909bb]
#
#
# patch "classes/base.bbclass"
# from [cf57311376e9ff8f4bd87f3ffdaad688ef85ea51]
# to [d26debb0f94b1091c3bbf203084c6a5f1f1909bb]
#
============================================================
--- classes/base.bbclass cf57311376e9ff8f4bd87f3ffdaad688ef85ea51
+++ classes/base.bbclass d26debb0f94b1091c3bbf203084c6a5f1f1909bb
@@ -720,15 +720,22 @@ python base_eventhandler() {
bb.data.setVar( 'BB_VERSION', bb.__version__, e.data )
path_to_bbfiles = bb.data.getVar( 'BBFILES', e.data, 1 )
path_to_packages = path_to_bbfiles[:path_to_bbfiles.rindex(
"packages" )]
- monotone_revision = "<unknown>"
+ scm_revision = "<unknown>"
+
try:
- monotone_revision = file( "%s/_MTN/revision" %
path_to_packages ).read().strip()
- if monotone_revision.startswith( "format_version" ):
- monotone_revision_words =
monotone_revision.split()
- monotone_revision = monotone_revision_words[
monotone_revision_words.index( "old_revision" )+1][1:-1]
+ scm_revision = file( "%s/_MTN/revision" %
path_to_packages ).read().strip()
+ if scm_revision.startswith( "format_version" ):
+ scm_revision_words = scm_revision.split()
+ scm_revision = scm_revision_words[
scm_revision_words.index( "old_revision" )+1][1:-1]
except IOError:
pass
- bb.data.setVar( 'OE_REVISION', monotone_revision, e.data )
+
+ if scm_revision == "<unknown>":
+ rev = os.popen("cd %s; git-log -n 1 --pretty=oneline
--" % path_to_packages).read().split(" ")[0]
+ if len(rev) != 0:
+ scm_revision = rev
+
+ bb.data.setVar( 'OE_REVISION', scm_revision, e.data )
statusvars = ['BB_VERSION', 'OE_REVISION', 'TARGET_ARCH',
'TARGET_OS', 'MACHINE', 'DISTRO', 'DISTRO_VERSION','TARGET_FPU']
statuslines = ["%-14s = \"%s\"" % (i, bb.data.getVar(i, e.data,
1) or '') for i in statusvars]
statusmsg = "\nOE Build Configuration:\n%s\n" %
'\n'.join(statuslines)
--- End Message ---
--- Begin Message ---
revision: 178c97ae0a693edea4d65673050d3cf8080f2bba
date: 2008-05-17T20:33:07
author: [EMAIL PROTECTED]
branch: org.openmoko.april-update
changelog:
base.bbclass: Use git-log to get a possible git-revision and populate
OE_REVISION with that
Prepare for the switch to git and to have accurate OE_REVISION even on git
manifest:
format_version "1"
new_manifest [1ae26a15613ea55f1d87a9f851da56e3bf5851ea]
old_revision [5d9397e8336d1ce179a66966e2d064a6e4ecfe9f]
patch "classes/base.bbclass"
from [cf57311376e9ff8f4bd87f3ffdaad688ef85ea51]
to [d26debb0f94b1091c3bbf203084c6a5f1f1909bb]
#
#
# patch "classes/base.bbclass"
# from [cf57311376e9ff8f4bd87f3ffdaad688ef85ea51]
# to [d26debb0f94b1091c3bbf203084c6a5f1f1909bb]
#
============================================================
--- classes/base.bbclass cf57311376e9ff8f4bd87f3ffdaad688ef85ea51
+++ classes/base.bbclass d26debb0f94b1091c3bbf203084c6a5f1f1909bb
@@ -720,15 +720,22 @@ python base_eventhandler() {
bb.data.setVar( 'BB_VERSION', bb.__version__, e.data )
path_to_bbfiles = bb.data.getVar( 'BBFILES', e.data, 1 )
path_to_packages = path_to_bbfiles[:path_to_bbfiles.rindex(
"packages" )]
- monotone_revision = "<unknown>"
+ scm_revision = "<unknown>"
+
try:
- monotone_revision = file( "%s/_MTN/revision" %
path_to_packages ).read().strip()
- if monotone_revision.startswith( "format_version" ):
- monotone_revision_words =
monotone_revision.split()
- monotone_revision = monotone_revision_words[
monotone_revision_words.index( "old_revision" )+1][1:-1]
+ scm_revision = file( "%s/_MTN/revision" %
path_to_packages ).read().strip()
+ if scm_revision.startswith( "format_version" ):
+ scm_revision_words = scm_revision.split()
+ scm_revision = scm_revision_words[
scm_revision_words.index( "old_revision" )+1][1:-1]
except IOError:
pass
- bb.data.setVar( 'OE_REVISION', monotone_revision, e.data )
+
+ if scm_revision == "<unknown>":
+ rev = os.popen("cd %s; git-log -n 1 --pretty=oneline
--" % path_to_packages).read().split(" ")[0]
+ if len(rev) != 0:
+ scm_revision = rev
+
+ bb.data.setVar( 'OE_REVISION', scm_revision, e.data )
statusvars = ['BB_VERSION', 'OE_REVISION', 'TARGET_ARCH',
'TARGET_OS', 'MACHINE', 'DISTRO', 'DISTRO_VERSION','TARGET_FPU']
statuslines = ["%-14s = \"%s\"" % (i, bb.data.getVar(i, e.data,
1) or '') for i in statusvars]
statusmsg = "\nOE Build Configuration:\n%s\n" %
'\n'.join(statuslines)
--- End Message ---
_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog
