diff options
author | Paul Sokolovsky <pmiscml@gmail.com> | 2008-02-21 16:46:21 +0000 |
---|---|---|
committer | Paul Sokolovsky <pmiscml@gmail.com> | 2008-02-21 16:46:21 +0000 |
commit | 1005a94277a4c6c1e36caa5b460b7082ae96bc65 (patch) | |
tree | 009a71f304306ff28cb860835e9aa111c9e96154 /conf | |
parent | bf2139a143b3dc66c0e7c04b327eb4e28fb6562f (diff) | |
parent | 5a780d6069d6bf4ed678cb2ebe1d907c8df71df1 (diff) |
merge of '3859c4593b2a4ff696a5e81383ed8bc6dd957598'
and '9dc2c816a6357d501b8f697a70f48287da272ed0'
Diffstat (limited to 'conf')
-rw-r--r-- | conf/bitbake.conf | 1 | ||||
-rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 18 |
2 files changed, 13 insertions, 6 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 4caa55c0b6..d0aa47a143 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -228,6 +228,7 @@ STAGING_BINDIR = "${STAGING_DIR_HOST}${layout_bindir}" STAGING_LIBDIR = "${STAGING_DIR_HOST}${layout_libdir}" STAGING_INCDIR = "${STAGING_DIR_HOST}${layout_includedir}" STAGING_DATADIR = "${STAGING_DIR_HOST}${layout_datadir}" +STAGING_EXECPREFIXDIR = "${STAGING_DIR_HOST}${layout_exec_prefix}" STAGING_LOADER_DIR = "${STAGING_DIR_HOST}/loader" STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware" STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 3784303d19..34c0717543 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -7,6 +7,10 @@ # this is alphabetical! +# yes, really! + +# you know what that means? like... a, b, c, d, e, f, g... + SRCREV_pn-aircrack-ng ?= "802" SRCREV_pn-bfin-uclibc ?= "1857" SRCREV_pn-contact ?= "1410" @@ -41,6 +45,7 @@ SRCREV_pn-libmokogsmd2 ?= "3663" SRCREV_pn-libmokojournal2 ?= "3217" SRCREV_pn-libmokopanelui2 ?= "3349" SRCREV_pn-libmokoui2 ?= "3688" +SRCREV_pn-libw100 ?= "47" SRCREV_pn-libowl ?= "277" SRCREV_pn-libxosd ?= "627" SRCREV_pn-lightmediascanner ?= "68" @@ -57,7 +62,10 @@ SRCREV_pn-matchbox-keyboard-inputmethod ?= "1739" SRCREV_pn-matchbox-panel-2 ?= "1626" SRCREV_pn-moko-gtk-engine ?= "3405" SRCREV_pn-mpd-alsa ?= "6952" +SRCREV_pn-mplayer ?= "24587" SRCREV_pn-neod ?= "3421" +SRCREV_pn-networkmanager ?= "2887" +SRCREV_pn-networkmanager-applet ?= "200" SRCREV_pn-oh-puzzles ?= "22" SRCREV_pn-osb-browser ?= "125" SRCREV_pn-osb-jscore ?= "117" @@ -132,14 +140,12 @@ SRCREV_pn-settings-daemon ?= "1755" SRCREV_pn-sjf2410-linux-native ?= "933" SRCREV_pn-sphyrna ?= "45" SRCREV_pn-tmut ?= "60" +SRCREV_pn-u-boot-openmoko ?= "4100" +SRCREV_pn-usbpath ?= "3108" +SRCREV_pn-usbpath-native ?= "3108" SRCREV_pn-webkit-gtk ?= "28656" SRCREV_pn-webkit-qt ?= "28656" SRCREV_pn-webkit-qtopia ?= "28656" SRCREV_pn-wesnoth ?= "22021" SRCREV_pn-xoo ?= "1623" -SRCREV_pn-mplayer ?= "24587" -SRCREV_pn-networkmanager ?= "2887" -SRCREV_pn-networkmanager-applet ?= "200" -SRCREV_pn-libw100 ?= "47" -SRCREV_pn-usbpath ?= "3108" -SRCREV_pn-usbpath-native ?= "3108" + |