[oe-commits] org.oe.dev merge of '6e8259e13dda6b19a59db6751153b5e9583486e2'

[mickeyl commit]

merge of '6e8259e13dda6b19a59db6751153b5e9583486e2'
     and '79a8be76eb7e634035b02729b67f9179fabb8711'

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

#
# mt diff -r6e8259e13dda6b19a59db6751153b5e9583486e2 -r330fb172df78da5ccf19876c4fa2be87783aea08
#
# 
# 
# patch "conf/machine/fic-gta01.conf"
#  from [23aa3fc9534120dd38935869df0535f58909579d]
#    to [1c8e90287feedbc8f33cb1859b4e13cbf1007c10]
# 
# patch "conf/machine/fic-gta02.conf"
#  from [dbb06e41897ef8d2e5a888b86e3e8157bb667557]
#    to [35a3ed508f3117b908249db21b5778bc4578be37]
# 
# patch "packages/tasks/task-base.bb"
#  from [8063e1b226de759fef34b1a23b3845f05b89bb7c]
#    to [2b89141c35420f2a2ec89ff47305e1e4034c4067]
# 
============================================================
--- conf/machine/fic-gta01.conf	23aa3fc9534120dd38935869df0535f58909579d
+++ conf/machine/fic-gta01.conf	1c8e90287feedbc8f33cb1859b4e13cbf1007c10
@@ -11,8 +11,6 @@ MACHINE_FEATURES = "kernel26 apm alsa bl
 
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone"
 
-MACHINE_EXTRA_RDEPENDS = "alsa-state"
-
 # package machine specific modules
 MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-gta01-pm-bt  \
@@ -26,9 +24,6 @@ MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-snd-soc-smdk2440 \
   kernel-module-nls-iso8859-1 \
   kernel-module-nls-cp437 \
-  \
-  alsa-state \
-  alsa-states \
 "
 
 # do not outcomment, we bypass the sysvinit.bb logic here -- see FIC GTA01 inittab
============================================================
--- conf/machine/fic-gta02.conf	dbb06e41897ef8d2e5a888b86e3e8157bb667557
+++ conf/machine/fic-gta02.conf	35a3ed508f3117b908249db21b5778bc4578be37
@@ -11,8 +11,6 @@ MACHINE_FEATURES = "kernel26 apm alsa bl
 
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone wifi"
 
-MACHINE_EXTRA_RDEPENDS = "alsa-state"
-
 # package machine specific modules
 MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-gta01-pm-bt  \
@@ -26,9 +24,6 @@ MACHINE_EXTRA_RRECOMMENDS = "\
   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-base.bb	8063e1b226de759fef34b1a23b3845f05b89bb7c
+++ packages/tasks/task-base.bb	2b89141c35420f2a2ec89ff47305e1e4034c4067
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro 
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r39"
+PR = "r40"
 
 DEPENDS = "task-boot"
 PROVIDES = "${PACKAGES}"
@@ -190,10 +190,11 @@ RDEPENDS_task-base-alsa = "\
     alsa-utils-alsamixer"
 
 #
-# alsa-state is machine related so can be missing in feed, OSS support is optional
+# alsa-states are machine related so can be missing in feed, OSS support is optional
 #
 RRECOMMENDS_task-base-alsa = "\
     alsa-state \
+    alsa-states \
     kernel-module-snd-mixer-oss \
     kernel-module-snd-pcm-oss"
 


#
# mt diff -r79a8be76eb7e634035b02729b67f9179fabb8711 -r330fb172df78da5ccf19876c4fa2be87783aea08
#
# 
# 
# 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"