diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-05-09 22:48:10 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-05-09 22:48:10 +0000 |
| commit | 24d6c02c8e1eb7408f1fd09eb87c9eb63355da92 (patch) | |
| tree | 7736651422af3e340d967dcf29139a9b381b1886 | |
| parent | 32652cd6ccd916670df6975cf89aebe93c4f9c31 (diff) | |
| parent | fc672056c4760b31597316f58fa2a804f966118b (diff) | |
merge of '5917d0f1af10ed2d5da45d6f72d648b629e1cb40'
and '5bd5703a4e0b185912bdd76a025e64b961d8044b'
116 files changed, 3129 insertions, 11963 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index b653bec83f..64a179f182 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -287,7 +287,16 @@ oe_libinstall() { if [ -z "$dir" ]; then dir=`pwd` fi + dotlai=$libname.lai + + # Sanity check that the libname.lai is unique + number_of_files=`(cd $dir; find . -name "$dotlai") | wc -l` + if [ $number_of_files -gt 1 ]; then + oefatal "oe_libinstall: $dotlai is not unique in $dir" + fi + + dir=$dir`(cd $dir;find . -name "$dotlai") | sed "s/^\.//;s/\/$dotlai\$//;q"` olddir=`pwd` __runcmd cd $dir diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index c1cfde23db..6c7464c528 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -156,6 +156,7 @@ PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" PREFERRED_PROVIDER_ntp ?= "ntp" PREFERRED_PROVIDER_hotplug = "udev" PREFERRED_PROVIDER_libxss = "libxss" +PREFERRED_PROVIDER_bluez-utils-dbus = "bluez-utils" # we don't ship gtk-directfb by default PREFERRED_PROVIDER_gtk+ ?= "gtk+" diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index 2c2bffea96..0edb4ef0ae 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -1,9 +1,11 @@ +EFL_SRCDATE = "${@time.strftime('%Y%m%d', time.gmtime())}" SRCREV_pn-assassin ?= "${AUTOREV}" SRCREV_pn-dfu-util ?= "${AUTOREV}" SRCREV_pn-dfu-util-native ?= "${AUTOREV}" SRCREV_pn-diversity-daemon ?= "${AUTOREV}" SRCREV_pn-diversity-nav ?= "${AUTOREV}" SRCREV_pn-illume ?= "${AUTOREV}" +SRCREV_pn-illume-theme ?= "${AUTOREV}" SRCREV_pn-libgsmd ?= "${AUTOREV}" SRCREV_pn-libjana ?= "${AUTOREV}" SRCREV_pn-libmokogsmd2 ?= "${AUTOREV}" @@ -14,11 +16,13 @@ SRCREV_pn-linux-openmoko ?= "${AUTOREV}" SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}" SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}" SRCREV_pn-multitap-pad ?= "${AUTOREV}" +SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}" SRCREV_pn-neod ?= "${AUTOREV}" SRCREV_pn-openmoko-agpsui ?= "${AUTOREV}" SRCREV_pn-openmoko-alsa-scenarios ?= "${AUTOREV}" SRCREV_pn-openmoko-appearance ?= "${AUTOREV}" SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}" +SRCREV_pn-openmoko-appearance ?= "${AUTOREV}" SRCREV_pn-openmoko-browser2 ?= "${AUTOREV}" SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}" SRCREV_pn-openmoko-common2 ?= "${AUTOREV}" @@ -52,8 +56,10 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "${AUTOREV}" SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}" SRCREV_pn-openocd ?= "${AUTOREV}" SRCREV_pn-openocd-native ?= "${AUTOREV}" -#SRCREV_pn-opkg ?= "${AUTOREV}" -#SRCREV_pn-opkg-native ?= "${AUTOREV}" +SRCREV_pn-opkg ?= "${AUTOREV}" +SRCREV_pn-opkg-native ?= "${AUTOREV}" +SRCREV_pn-opkg-sdk ?= "${AUTOREV}" +SRCREV_pn-python-etk ?= "${AUTOREV}" SRCREV_pn-python-gsmd ?= "${AUTOREV}" SRCREV_pn-u-boot-openmoko ?= "${AUTOREV}" SRCREV_pn-u-boot-openmoko-devel ?= "${AUTOREV}" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 23093ef2c1..7721d97ce6 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323" |