[oe-commits] org.oe.dev merge of '79a8be76eb7e634035b02729b67f9179fabb8711'
pfalcon commit
openembedded-commits at lists.openembedded.org
Fri Jul 13 10:49:14 UTC 2007
merge of '79a8be76eb7e634035b02729b67f9179fabb8711'
and '9b3f781313b3e47faa28044336efce829a2c5a40'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 1de364fbbc0efdbe8f12facadb69f65193d6402b
ViewMTN: http://monotone.openembedded.org/revision.psp?id=1de364fbbc0efdbe8f12facadb69f65193d6402b
Files:
1
packages/gparted
packages/gparted/files
packages/parted/files
packages/automake/automake-native_1.10.bb
packages/automake/automake_1.10.bb
packages/gparted/files/cross.patch
packages/gparted/files/gparted-0.3.3-llabs.patch
packages/gparted/gparted_0.3.3.bb
packages/linux/linux-handhelds-2.6_2.6.21-hh11.bb
packages/parted/files/cross-gross-hack.patch
packages/parted/files/syscalls.h
packages/parted/files/syscalls.patch
conf/distro/angstrom-2007.1.conf
conf/machine/h4000.conf
conf/machine/htcblueangel.conf
packages/parted/parted_1.8.7.bb
site/common-glibc
conf/machine/fic-gta01.conf
conf/machine/fic-gta02.conf
packages/tasks/task-base.bb
Diffs:
#
# mt diff -r79a8be76eb7e634035b02729b67f9179fabb8711 -r1de364fbbc0efdbe8f12facadb69f65193d6402b
#
#
#
# add_dir "packages/gparted"
#
# add_dir "packages/gparted/files"
#
# add_dir "packages/parted/files"
#
# add_file "packages/automake/automake-native_1.10.bb"
# content [515a0d90c13871057bedf62fc57fab2658deedf4]
#
# add_file "packages/automake/automake_1.10.bb"
# content [2ae0e8bb93521eb42b59f40ca0d76baee5220450]
#
# add_file "packages/gparted/files/cross.patch"
# content [2a152c6b48120b9b9a1b3db21b186a1da798b917]
#
# add_file "packages/gparted/files/gparted-0.3.3-llabs.patch"
# content [9242da34ef46c00a04dababab07118a03585a308]
#
# add_file "packages/gparted/gparted_0.3.3.bb"
# content [a638e0b0aafd82a9f334598772c46d4af04360af]
#
# add_file "packages/linux/linux-handhelds-2.6_2.6.21-hh11.bb"
# content [252b9c26ddd2fda4271f4352999ce0facbfece99]
#
# add_file "packages/parted/files/cross-gross-hack.patch"
# content [4442d2403c1b2ad039f7f337220985ca4e31dfb3]
#
# add_file "packages/parted/files/syscalls.h"
# content [9ff44c11dc2d4a6ce3154f105c87965271e7da07]
#
# add_file "packages/parted/files/syscalls.patch"
# content [f02b0412dedb9f31aa19360d79847f6b176d75c4]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [492fb6241aa69eb82747c0c5b369480a2ed86c6f]
# to [8b80a1c95dae22cddbcc5efbca4f834aab273d56]
#
# patch "conf/machine/h4000.conf"
# from [1d9bd156a1998140041d4a105ac52b00cf910841]
# to [0f9f407e263722cada91fcbbddd485ba1f0a85b9]
#
# patch "conf/machine/htcblueangel.conf"
# from [c6770b35cf50ebebdd92334753ebe6f8c86bdaaa]
# to [29e2ddc11eb786ac0f566be156d09a5f96617a8b]
#
# patch "packages/parted/parted_1.8.7.bb"
# from [35f9b305760bd77fe10ab9d0cbac3681d29a911f]
# to [d6afd38558136f4935253ac51b004acc3fd7bbdd]
#
# patch "site/common-glibc"
# from [b92f57d8679d30d91088f81d8515234d2f26b728]
# to [7048580f000406f0acd052f1c85074d6d322c430]
#
============================================================
--- 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"
============================================================
--- packages/gparted/files/cross.patch 2a152c6b48120b9b9a1b3db21b186a1da798b917
+++ packages/gparted/files/cross.patch 2a152c6b48120b9b9a1b3db21b186a1da798b917
@@ -0,0 +1,12 @@
+diff -ur gparted-0.3.3.org/configure.in gparted-0.3.3/configure.in
+--- gparted-0.3.3.org/configure.in 2006-12-06 15:23:35.000000000 +0200
++++ gparted-0.3.3/configure.in 2007-07-10 02:10:59.000000000 +0300
+@@ -37,7 +37,7 @@
+ AC_MSG_CHECKING(for libparted >= $LIBPARTED_VERSION)
+ LIBS_save="$LIBS"
+ LIBS="-lparted -luuid -ldl"
+-AC_TRY_RUN(
++AC_TRY_LINK(
+ #include <stdio.h>
+ #include <parted/parted.h>
+
============================================================
--- packages/gparted/files/gparted-0.3.3-llabs.patch 9242da34ef46c00a04dababab07118a03585a308
+++ packages/gparted/files/gparted-0.3.3-llabs.patch 9242da34ef46c00a04dababab07118a03585a308
@@ -0,0 +1,72 @@
+--- src/GParted_Core.cc 2006/09/25 21:49:32 1.1
++++ src/GParted_Core.cc 2006/09/25 22:03:31
+@@ -1604,7 +1604,7 @@ bool GParted_Core::copy_filesystem( cons
+
+ while ( succes &&
+ timer .elapsed() <= smallest_time &&
+- std::llabs( done ) + N <= length &&
++ llabs( done ) + N <= length &&
+ optimal_blocksize * 2 < N )
+ {
+ if ( done != 0 )
+@@ -1648,7 +1648,7 @@ bool GParted_Core::copy_filesystem( cons
+ dst_device,
+ src_start + ( dst_start > src_start ? 0 : done ),
+ dst_start + ( dst_start > src_start ? 0 : done ),
+- length - std::llabs( done ),
++ length - llabs( done ),
+ optimal_blocksize,
+ operationdetail,
+ readonly,
+@@ -1822,7 +1822,7 @@ bool GParted_Core::copy_blocks( const Gl
+ if ( lp_device_src && lp_device_dst && ped_device_open( lp_device_src ) && ped_device_open( lp_device_dst ) )
+ {
+ Glib::ustring error_message ;
+- buf = static_cast<char *>( malloc( std::llabs( blocksize ) * 512 ) ) ;
++ buf = static_cast<char *>( malloc( llabs( blocksize ) * 512 ) ) ;
+ if ( buf )
+ {
+ ped_device_sync( lp_device_dst ) ;
+@@ -1843,7 +1843,7 @@ bool GParted_Core::copy_blocks( const Gl
+ operationdetail .get_last_child() .add_child( OperationDetail( "", STATUS_NONE ) ) ;
+
+ Glib::Timer timer_progress_timeout, timer_total ;
+- while( succes && std::llabs( done ) < length )
++ while( succes && llabs( done ) < length )
+ {
+ succes = copy_block( lp_device_src,
+ lp_device_dst,
+@@ -1858,7 +1858,7 @@ bool GParted_Core::copy_blocks( const Gl
+ if ( timer_progress_timeout .elapsed() >= 0.5 )
+ {
+ set_progress_info( length,
+- std::llabs( done + blocksize ),
++ llabs( done + blocksize ),
+ timer_total,
+ operationdetail .get_last_child() .get_last_child(),
+ readonly ) ;
+@@ -1877,13 +1877,13 @@ bool GParted_Core::copy_blocks( const Gl
+
+ //final description
+ operationdetail .get_last_child() .get_last_child() .set_description(
+- String::ucompose( readonly ? _("%1 of %2 read") : _("%1 of %2 copied"), std::llabs( done ), length ), FONT_ITALIC ) ;
++ String::ucompose( readonly ? _("%1 of %2 read") : _("%1 of %2 copied"), llabs( done ), length ), FONT_ITALIC ) ;
+
+ if ( ! succes && ! error_message .empty() )
+ operationdetail .get_last_child() .add_child(
+ OperationDetail( error_message, STATUS_NONE, FONT_ITALIC ) ) ;
+
+- total_done += std::llabs( done ) ;
++ total_done += llabs( done ) ;
+
+ //close and destroy the devices..
+ ped_device_close( lp_device_src ) ;
+@@ -1912,7 +1912,7 @@ bool GParted_Core::copy_block( PedDevice
+
+ if ( blocksize < 0 )
+ {
+- blocksize = std::llabs( blocksize ) ;
++ blocksize = llabs( blocksize ) ;
+ offset_src -= ( blocksize -1 ) ;
+ offset_dst -= ( blocksize -1 ) ;
+ }
============================================================
--- packages/gparted/gparted_0.3.3.bb a638e0b0aafd82a9f334598772c46d4af04360af
+++ packages/gparted/gparted_0.3.3.bb a638e0b0aafd82a9f334598772c46d4af04360af
@@ -0,0 +1,10 @@
+DESCRIPTION = "GNOME Partition Manager"
+LICENSE = "GPL"
+DEPENDS = "gtkmm parted"
+PR = "r1"
+
+inherit autotools
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gparted/gparted-${PV}.tar.bz2 \
+ file://cross.patch;patch=1 \
+ file://gparted-0.3.3-llabs.patch;patch=1;pnum=0"
============================================================
--- packages/linux/linux-handhelds-2.6_2.6.21-hh11.bb 252b9c26ddd2fda4271f4352999ce0facbfece99
+++ packages/linux/linux-handhelds-2.6_2.6.21-hh11.bb 252b9c26ddd2fda4271f4352999ce0facbfece99
@@ -0,0 +1,11 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
+LICENSE = "GPL"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+ file://defconfig"
+
+require linux-handhelds-2.6.inc
============================================================
--- packages/parted/files/cross-gross-hack.patch 4442d2403c1b2ad039f7f337220985ca4e31dfb3
+++ packages/parted/files/cross-gross-hack.patch 4442d2403c1b2ad039f7f337220985ca4e31dfb3
@@ -0,0 +1,33 @@
+diff -ur parted-1.8.7.org/configure parted-1.8.7/configure
+--- parted-1.8.7.org/configure 2007-05-10 00:01:27.000000000 +0300
++++ parted-1.8.7/configure 2007-07-10 15:46:42.000000000 +0300
+@@ -12556,7 +12556,7 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test "$cross_compiling" = yes; then
+- ac_cv_func_malloc_0_nonnull=no
++ ac_cv_func_malloc_0_nonnull=yes
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+diff -ur parted-1.8.7.org/configure parted-1.8.7/configure
+--- parted-1.8.7.org/configure 2007-07-10 15:48:07.000000000 +0300
++++ parted-1.8.7/configure 2007-07-10 15:57:26.000000000 +0300
+@@ -12889,7 +12889,7 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test "$cross_compiling" = yes; then
+- ac_cv_func_memcmp_working=no
++ ac_cv_func_memcmp_working=yes
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -13574,7 +13574,7 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test "$cross_compiling" = yes; then
+- ac_cv_func_realloc_0_nonnull=no
++ ac_cv_func_realloc_0_nonnull=yes
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
============================================================
--- packages/parted/files/syscalls.h 9ff44c11dc2d4a6ce3154f105c87965271e7da07
+++ packages/parted/files/syscalls.h 9ff44c11dc2d4a6ce3154f105c87965271e7da07
@@ -0,0 +1,166 @@
+/*
+ * linux/include/asm-arm/unistd.h
+ *
+ * Copyright (C) 2001-2005 Russell King
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Please forward _all_ changes to this file to rmk at arm.linux.org.uk,
+ * no matter what the change is. Thanks!
+ */
+#ifndef __ASM_ARM_UNISTD_H2
+#define __ASM_ARM_UNISTD_H2
+
+
+#define __sys2(x) #x
+#define __sys1(x) __sys2(x)
+
+#ifndef __syscall
+#if defined(__thumb__) || defined(__ARM_EABI__)
+#define __SYS_REG(name) register long __sysreg __asm__("r7") = __NR_##name;
+#define __SYS_REG_LIST(regs...) "r" (__sysreg) , ##regs
+#define __syscall(name) "swi\t0"
+#else
+#define __SYS_REG(name)
+#define __SYS_REG_LIST(regs...) regs
+#define __syscall(name) "swi\t" __sys1(__NR_##name) ""
+#endif
+#endif
+
+#define __syscall_return(type, res) \
+do { \
+ if ((unsigned long)(res) >= (unsigned long)(-129)) { \
+ errno = -(res); \
+ res = -1; \
+ } \
+ return (type) (res); \
+} while (0)
+
+#define _syscall0(type,name) \
+type name(void) { \
+ __SYS_REG(name) \
+ register long __res_r0 __asm__("r0"); \
+ long __res; \
+ __asm__ __volatile__ ( \
+ __syscall(name) \
+ : "=r" (__res_r0) \
+ : __SYS_REG_LIST() ); \
+ __res = __res_r0; \
+ __syscall_return(type,__res); \
+}
+
+#define _syscall1(type,name,type1,arg1) \
+type name(type1 arg1) { \
+ __SYS_REG(name) \
+ register long __r0 __asm__("r0") = (long)arg1; \
+ register long __res_r0 __asm__("r0"); \
+ long __res; \
+ __asm__ __volatile__ ( \
+ __syscall(name) \
+ : "=r" (__res_r0) \
+ : __SYS_REG_LIST( "0" (__r0) ) ); \
+ __res = __res_r0; \
+ __syscall_return(type,__res); \
+}
+
+#define _syscall2(type,name,type1,arg1,type2,arg2) \
+type name(type1 arg1,type2 arg2) { \
+ __SYS_REG(name) \
+ register long __r0 __asm__("r0") = (long)arg1; \
+ register long __r1 __asm__("r1") = (long)arg2; \
+ register long __res_r0 __asm__("r0"); \
+ long __res; \
+ __asm__ __volatile__ ( \
+ __syscall(name) \
+ : "=r" (__res_r0) \
+ : __SYS_REG_LIST( "0" (__r0), "r" (__r1) ) ); \
+ __res = __res_r0; \
+ __syscall_return(type,__res); \
+}
+
+
+#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
+type name(type1 arg1,type2 arg2,type3 arg3) { \
+ __SYS_REG(name) \
+ register long __r0 __asm__("r0") = (long)arg1; \
+ register long __r1 __asm__("r1") = (long)arg2; \
+ register long __r2 __asm__("r2") = (long)arg3; \
+ register long __res_r0 __asm__("r0"); \
+ long __res; \
+ __asm__ __volatile__ ( \
+ __syscall(name) \
+ : "=r" (__res_r0) \
+ : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2) ) ); \
+ __res = __res_r0; \
+ __syscall_return(type,__res); \
+}
+
+
+#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4)\
+type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4) { \
+ __SYS_REG(name) \
+ register long __r0 __asm__("r0") = (long)arg1; \
+ register long __r1 __asm__("r1") = (long)arg2; \
+ register long __r2 __asm__("r2") = (long)arg3; \
+ register long __r3 __asm__("r3") = (long)arg4; \
+ register long __res_r0 __asm__("r0"); \
+ long __res; \
+ __asm__ __volatile__ ( \
+ __syscall(name) \
+ : "=r" (__res_r0) \
+ : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2), "r" (__r3) ) ); \
+ __res = __res_r0; \
+ __syscall_return(type,__res); \
+}
+
+
+#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \
+type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) { \
+ __SYS_REG(name) \
+ register long __r0 __asm__("r0") = (long)arg1; \
+ register long __r1 __asm__("r1") = (long)arg2; \
+ register long __r2 __asm__("r2") = (long)arg3; \
+ register long __r3 __asm__("r3") = (long)arg4; \
+ register long __r4 __asm__("r4") = (long)arg5; \
+ register long __res_r0 __asm__("r0"); \
+ long __res; \
+ __asm__ __volatile__ ( \
+ __syscall(name) \
+ : "=r" (__res_r0) \
+ : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2), \
+ "r" (__r3), "r" (__r4) ) ); \
+ __res = __res_r0; \
+ __syscall_return(type,__res); \
+}
+
+#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5,type6,arg6) \
+type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6) { \
+ __SYS_REG(name) \
+ register long __r0 __asm__("r0") = (long)arg1; \
+ register long __r1 __asm__("r1") = (long)arg2; \
+ register long __r2 __asm__("r2") = (long)arg3; \
+ register long __r3 __asm__("r3") = (long)arg4; \
+ register long __r4 __asm__("r4") = (long)arg5; \
+ register long __r5 __asm__("r5") = (long)arg6; \
+ register long __res_r0 __asm__("r0"); \
+ long __res; \
+ __asm__ __volatile__ ( \
+ __syscall(name) \
+ : "=r" (__res_r0) \
+ : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2), \
+ "r" (__r3), "r" (__r4), "r" (__r5) ) ); \
+ __res = __res_r0; \
+ __syscall_return(type,__res); \
+}
+
+/*
+ * "Conditional" syscalls
+ *
+ * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
+ * but it doesn't work on all toolchains, so we just do it by hand
+ */
+#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
+
+#endif /* __ASM_ARM_UNISTD_H2 */
============================================================
--- packages/parted/files/syscalls.patch f02b0412dedb9f31aa19360d79847f6b176d75c4
+++ packages/parted/files/syscalls.patch f02b0412dedb9f31aa19360d79847f6b176d75c4
@@ -0,0 +1,10 @@
+--- parted-1.8.7/libparted/arch/linux.c.org 2007-05-09 23:40:13.000000000 +0300
++++ parted-1.8.7/libparted/arch/linux.c 2007-07-10 18:20:27.000000000 +0300
+@@ -32,6 +32,7 @@
+ #include <stdio.h>
+ #include <syscall.h>
+ #include <unistd.h>
++#include "syscalls.h"
+ #include <dirent.h>
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
============================================================
--- conf/distro/angstrom-2007.1.conf 492fb6241aa69eb82747c0c5b369480a2ed86c6f
+++ conf/distro/angstrom-2007.1.conf 8b80a1c95dae22cddbcc5efbca4f834aab273d56
@@ -127,7 +127,7 @@ PCMCIA%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r9b3f781313b3e47faa28044336efce829a2c5a40 -r1de364fbbc0efdbe8f12facadb69f65193d6402b
#
#
#
# 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"
More information about the Openembedded-commits
mailing list