From e30dc57c1d794b3a2ecec7414acba7b6ef0e3747 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Mon, 30 Jul 2007 21:24:02 +0000 Subject: It's OpenMoko not OpenMoKo. --- conf/distro/include/openmoko.inc | 2 +- conf/distro/openmoko.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/distro/include/openmoko.inc b/conf/distro/include/openmoko.inc index 457aa997dd..7c3c4a8f41 100644 --- a/conf/distro/include/openmoko.inc +++ b/conf/distro/include/openmoko.inc @@ -1,7 +1,7 @@ # # Header # -DISTRO_NAME = "OpenMoKo" +DISTRO_NAME = "OpenMoko" # # Naming schemes diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index 1f46be09d6..3788b54637 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -9,7 +9,7 @@ require conf/distro/angstrom-2007.1.conf # # Header # -DISTRO_NAME = "OpenMoKo" +DISTRO_NAME = "OpenMoko" DISTRO_VERSION = ".dev-snapshot-${DATE}" #DISTRO_TYPE = "release" DISTRO_TYPE = "debug" -- cgit v1.2.3 From 8f9ec3748314f3992b7c71700b07a2d6a0068dae Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 30 Jul 2007 22:01:41 +0000 Subject: sane-srcdates.inc: openmoko*: add SRCDATE = now until the integration work for new OpenMoko stuff has been done. --- conf/distro/include/sane-srcdates.inc | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 59e8b81fb1..9a5e2f330e 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -1,4 +1,5 @@ -# Lock down some SRCDATEs, see http://svn.o-hand.com/view/poky/trunk/openembedded/conf/distro/poky.conf for the original version +# Lock down some SRCDATEs +# (see http://svn.o-hand.com/view/poky/trunk/meta/conf/distro/poky.conf for wher it comes from) # Kernel modules SRCDATE_at76c503a-modules ?= "20060814" @@ -31,6 +32,7 @@ SRCDATE_matchbox-desktop ?= "20060612" SRCDATE_matchbox-keyboard ?= "20060725" SRCDATE_matchbox-panel ?= "20060612" SRCDATE_matchbox-panel-manager ?= "20060612" +SRCDATE_matchbox-panel-2 ?= "20070720" SRCDATE_matchbox-stroke ?= "20060612" SRCDATE_matchbox-themes-extra ?= "20060612" SRCDATE_matchbox-wm ?= "20060612" @@ -50,7 +52,7 @@ SRCDATE_gconf-dbus ?= "20070512" SRCDATE_gnome-vfs ?= "20060119" SRCDATE_gtkhtml2 ?= "20060323" -# Enlightenment Foundation Libraries +# Enlightenment Foundation Libraries (EFL) # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. SRCDATE_edb-native = "20070721" @@ -138,3 +140,20 @@ SRCDATE_zroadmap ?= "20060814" # Freedesktop.org SRCDATE_poppler0.6 = "20070708" +# OpenMoko +SRCDATE_libgsmd ?= "now" +SRCDATE_libmokogsmd2 ?= "now" +SRCDATE_libmokoui2 ?= "now" +SRCDATE_libmokojournal2 ?= "now" +SRCDATE_libmokopanelui2 ?= "now" +SRCDATE_openmoko-today2 ?= "now" +SRCDATE_openmoko-dialer2 ?= "now" +SRCDATE_openmoko-contacts2 ?= "now" + +SRCDATE_openmoko-panel-battery ?= "now" +SRCDATE_openmoko-panel-clock ?= "now" +SRCDATE_openmoko-panel-gsm ?= "now" +SRCDATE_openmoko-panel-usb ?= "now" +SRCDATE_openmoko-panel-bt ?= "now" +SRCDATE_openmoko-panel-gps ?= "now" + -- cgit v1.2.3 From 936b86600b1a0daae20157a57f7e5945d7c35771 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 30 Jul 2007 23:01:14 +0000 Subject: bitbake.conf: Add SRCREV definiton. This is for developers offline use only until we increase the bitbake version requirements. --- conf/bitbake.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'conf') diff --git a/conf/bitbake.conf b/conf/bitbake.conf index e305dc3251..38a716af00 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -365,6 +365,7 @@ UPDATECOMMAND = "ERROR, this must be a BitBake bug" UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}" UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}" SRCDATE = "${DATE}" +SRCREV = "${@bb.fetch.get_srcrev(d)}" SRC_URI = "file://${FILE}" -- cgit v1.2.3 From b8bf7e6b8135bc0b2ed345488ffd6908a9ce9799 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 31 Jul 2007 07:17:17 +0000 Subject: disapproval of revision '595f85835a210f4f204d60ffa60017c0d342736b' --- conf/distro/include/sane-srcdates.inc | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) (limited to 'conf') diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 9a5e2f330e..59e8b81fb1 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -1,5 +1,4 @@ -# Lock down some SRCDATEs -# (see http://svn.o-hand.com/view/poky/trunk/meta/conf/distro/poky.conf for wher it comes from) +# Lock down some SRCDATEs, see http://svn.o-hand.com/view/poky/trunk/openembedded/conf/distro/poky.conf for the original version # Kernel modules SRCDATE_at76c503a-modules ?= "20060814" @@ -32,7 +31,6 @@ SRCDATE_matchbox-desktop ?= "20060612" SRCDATE_matchbox-keyboard ?= "20060725" SRCDATE_matchbox-panel ?= "20060612" SRCDATE_matchbox-panel-manager ?= "20060612" -SRCDATE_matchbox-panel-2 ?= "20070720" SRCDATE_matchbox-stroke ?= "20060612" SRCDATE_matchbox-themes-extra ?= "20060612" SRCDATE_matchbox-wm ?= "20060612" @@ -52,7 +50,7 @@ SRCDATE_gconf-dbus ?= "20070512" SRCDATE_gnome-vfs ?= "20060119" SRCDATE_gtkhtml2 ?= "20060323" -# Enlightenment Foundation Libraries (EFL) +# Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. SRCDATE_edb-native = "20070721" @@ -140,20 +138,3 @@ SRCDATE_zroadmap ?= "20060814" # Freedesktop.org SRCDATE_poppler0.6 = "20070708" -# OpenMoko -SRCDATE_libgsmd ?= "now" -SRCDATE_libmokogsmd2 ?= "now" -SRCDATE_libmokoui2 ?= "now" -SRCDATE_libmokojournal2 ?= "now" -SRCDATE_libmokopanelui2 ?= "now" -SRCDATE_openmoko-today2 ?= "now" -SRCDATE_openmoko-dialer2 ?= "now" -SRCDATE_openmoko-contacts2 ?= "now" - -SRCDATE_openmoko-panel-battery ?= "now" -SRCDATE_openmoko-panel-clock ?= "now" -SRCDATE_openmoko-panel-gsm ?= "now" -SRCDATE_openmoko-panel-usb ?= "now" -SRCDATE_openmoko-panel-bt ?= "now" -SRCDATE_openmoko-panel-gps ?= "now" - -- cgit v1.2.3 From 0b7cddd799839c6fc82ae0dc25443835ce05faa2 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 31 Jul 2007 07:46:35 +0000 Subject: openmoko: move NOW srcdates to its own include file and only include it in the openmoko distro --- conf/distro/include/openmoko-srcdate-now.inc | 18 ++++++++++++++++++ conf/distro/openmoko.conf | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 conf/distro/include/openmoko-srcdate-now.inc (limited to 'conf') diff --git a/conf/distro/include/openmoko-srcdate-now.inc b/conf/distro/include/openmoko-srcdate-now.inc new file mode 100644 index 0000000000..7ca0768819 --- /dev/null +++ b/conf/distro/include/openmoko-srcdate-now.inc @@ -0,0 +1,18 @@ +# Warning! Builds unupgradable packages! + +# OpenMoko +SRCDATE_libgsmd ?= "now" +SRCDATE_libmokogsmd2 ?= "now" +SRCDATE_libmokoui2 ?= "now" +SRCDATE_libmokojournal2 ?= "now" +SRCDATE_libmokopanelui2 ?= "now" +SRCDATE_openmoko-today2 ?= "now" +SRCDATE_openmoko-dialer2 ?= "now" +SRCDATE_openmoko-contacts2 ?= "now" + +SRCDATE_openmoko-panel-battery ?= "now" +SRCDATE_openmoko-panel-clock ?= "now" +SRCDATE_openmoko-panel-gsm ?= "now" +SRCDATE_openmoko-panel-usb ?= "now" +SRCDATE_openmoko-panel-bt ?= "now" +SRCDATE_openmoko-panel-gps ?= "now" diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index 3788b54637..bd4e2076ca 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -5,6 +5,8 @@ #----------------------------------------------------------------------------- require conf/distro/angstrom-2007.1.conf +require conf/distro/include/openmoko-srcdate-now.inc + # # Header -- cgit v1.2.3 From 0adc9ee1289b5437b6386a44060117a8a5207f01 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 31 Jul 2007 15:57:04 +0000 Subject: base.bbclass: Remove warnings for older bitbake users --- conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 38a716af00..19910d32e7 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -365,7 +365,7 @@ UPDATECOMMAND = "ERROR, this must be a BitBake bug" UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}" UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}" SRCDATE = "${DATE}" -SRCREV = "${@bb.fetch.get_srcrev(d)}" +SRCREV = "${@base_get_srcrev(d)}" SRC_URI = "file://${FILE}" -- cgit v1.2.3