[oe-commits] org.oe.dev merge of '4ea1a0b7c2e8cc96e7303233217fd57efa3b1b5b'

[oe commit]

merge of '4ea1a0b7c2e8cc96e7303233217fd57efa3b1b5b'
     and 'd1b0e1fcb5380bef0abd58faae2693512c88903c'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 6e8259e13dda6b19a59db6751153b5e9583486e2
ViewMTN: http://monotone.openembedded.org/revision.psp?id=6e8259e13dda6b19a59db6751153b5e9583486e2
Files:
1
packages/automake/automake-native_1.10.bb
packages/automake/automake_1.10.bb
conf/machine/fic-gta01.conf
conf/machine/fic-gta02.conf
packages/tasks/task-openmoko.bb
Diffs:

#
# mt diff -r4ea1a0b7c2e8cc96e7303233217fd57efa3b1b5b -r6e8259e13dda6b19a59db6751153b5e9583486e2
#
# 
# 
# add_file "packages/automake/automake-native_1.10.bb"
#  content [515a0d90c13871057bedf62fc57fab2658deedf4]
# 
# add_file "packages/automake/automake_1.10.bb"
#  content [2ae0e8bb93521eb42b59f40ca0d76baee5220450]
# 
============================================================
--- packages/automake/automake-native_1.10.bb	515a0d90c13871057bedf62fc57fab2658deedf4
+++ packages/automake/automake-native_1.10.bb	515a0d90c13871057bedf62fc57fab2658deedf4
@@ -0,0 +1,3 @@
+PV := "${PV}"
+
+require automake-native.inc
============================================================
--- packages/automake/automake_1.10.bb	2ae0e8bb93521eb42b59f40ca0d76baee5220450
+++ packages/automake/automake_1.10.bb	2ae0e8bb93521eb42b59f40ca0d76baee5220450
@@ -0,0 +1,31 @@
+DESCRIPTION = "A tool for automatically generating Makefiles."
+LICENSE = "GPL"
+HOMEPAGE = "http://www.gnu.org/software/automake/"
+SECTION = "devel"
+
+SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \
+	${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}"
+
+S = "${WORKDIR}/automake-${PV}"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/automake-${PV}"
+
+inherit autotools
+
+export AUTOMAKE = "${@bb.which('automake', bb.data.getVar('PATH', d, 1))}"
+FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
+
+require automake.inc
+
+do_install () {
+	oe_runmake 'DESTDIR=${D}' install
+	install -d ${D}${datadir}
+	if [ ! -e ${D}${datadir}/aclocal ]; then
+		ln -sf aclocal-1.9 ${D}${datadir}/aclocal
+	fi
+	if [ ! -e ${D}${datadir}/automake ]; then
+		ln -sf automake-1.9 ${D}${datadir}/automake
+	fi
+}
+
+DEFAULT_PREFERENCE = "-1"


#
# mt diff -rd1b0e1fcb5380bef0abd58faae2693512c88903c -r6e8259e13dda6b19a59db6751153b5e9583486e2
#
# 
# 
# patch "conf/machine/fic-gta01.conf"
#  from [1c3c67459b5584e2defd8c40e278b0e5bfff7066]
#    to [23aa3fc9534120dd38935869df0535f58909579d]
# 
# patch "conf/machine/fic-gta02.conf"
#  from [f432dd6889c55c316032a7acbf4d55670603e3e1]
#    to [dbb06e41897ef8d2e5a888b86e3e8157bb667557]
# 
# patch "packages/tasks/task-openmoko.bb"
#  from [4c34acfd5d530e57627e163ab546ffbfebf5988d]
#    to [ec3fef5477399d4762dbd4338b3c5f44bafa2f96]
# 
============================================================
--- conf/machine/fic-gta01.conf	1c3c67459b5584e2defd8c40e278b0e5bfff7066
+++ conf/machine/fic-gta01.conf	23aa3fc9534120dd38935869df0535f58909579d
@@ -13,7 +13,7 @@ MACHINE_EXTRA_RDEPENDS = "alsa-state"
 
 MACHINE_EXTRA_RDEPENDS = "alsa-state"
 
-# package gta01 specific modules
+# package machine specific modules
 MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-gta01-pm-bt  \
   kernel-module-gta01-pm-gps \
@@ -26,7 +26,10 @@ MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-snd-soc-smdk2440 \
   kernel-module-nls-iso8859-1 \
   kernel-module-nls-cp437 \
-  alsa-state"
+  \
+  alsa-state \
+  alsa-states \
+"
 
 # do not outcomment, we bypass the sysvinit.bb logic here -- see FIC GTA01 inittab
 #SERIAL_CONSOLE = "115200 ttySAC0"
============================================================
--- conf/machine/fic-gta02.conf	f432dd6889c55c316032a7acbf4d55670603e3e1
+++ conf/machine/fic-gta02.conf	dbb06e41897ef8d2e5a888b86e3e8157bb667557
@@ -13,7 +13,7 @@ MACHINE_EXTRA_RDEPENDS = "alsa-state"
 
 MACHINE_EXTRA_RDEPENDS = "alsa-state"
 
-# package gta01 specific modules
+# package machine specific modules
 MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-gta01-pm-bt  \
   kernel-module-gta01-pm-gps \
@@ -21,7 +21,15 @@ MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-gta01kbd \
   kernel-module-s3cmci \
   kernel-module-ext2 \
-  alsa-state"
+  kernel-module-vfat \
+  kernel-module-snd-soc-neo1973-wm8753 \
+  kernel-module-snd-soc-smdk2440 \
+  kernel-module-nls-iso8859-1 \
+  kernel-module-nls-cp437 \
+  \
+  alsa-state \
+  alsa-states \
+"
 
 SERIAL_CONSOLE = "115200 ttySAC2"
 
============================================================
--- packages/tasks/task-openmoko.bb	4c34acfd5d530e57627e163ab546ffbfebf5988d
+++ packages/tasks/task-openmoko.bb	ec3fef5477399d4762dbd4338b3c5f44bafa2f96
@@ -1,8 +1,8 @@ PROVIDES = "task-openmoko-everything"
 DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
 PROVIDES = "task-openmoko-everything"
-PR = "r47"
+PR = "r49"
 
 ALLOW_EMPTY = "1"
 PACKAGE_ARCH = "all"
@@ -169,7 +169,6 @@ RDEPENDS_task-openmoko-debug = "\
 #
 DESCRIPTION_task-openmoko-debug = "OpenMoko: Debugging Tools"
 RDEPENDS_task-openmoko-debug = "\
-  alsa-state \
   alsa-utils-amixer \
   alsa-utils-aplay \
   alsa-utils-aconnect \