[oe-commits] org.oe.dev merge of '59a848bab30b6f09ae13f3d51b2db712a8e660d9'

[pfalcon commit]

merge of '59a848bab30b6f09ae13f3d51b2db712a8e660d9'
     and '82e025b5fb67d750a67c0db1bb958a82ca1f7ec7'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 69c4f23827bd5d45cfcc6008cf24a3877da4126e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=69c4f23827bd5d45cfcc6008cf24a3877da4126e
Files:
1
packages/parted/parted_1.8.7.bb
conf/machine/fic-gta01.conf
packages/tasks/task-gpephone.bb
Diffs:

#
# mt diff -r59a848bab30b6f09ae13f3d51b2db712a8e660d9 -r69c4f23827bd5d45cfcc6008cf24a3877da4126e
#
# 
# 
# patch "packages/parted/parted_1.8.7.bb"
#  from [869ca28033957bf8a0406bc4d16876bd71dff378]
#    to [35f9b305760bd77fe10ab9d0cbac3681d29a911f]
# 
============================================================
--- packages/parted/parted_1.8.7.bb	869ca28033957bf8a0406bc4d16876bd71dff378
+++ packages/parted/parted_1.8.7.bb	35f9b305760bd77fe10ab9d0cbac3681d29a911f
@@ -1,9 +1,9 @@ DEPENDS = "readline e2fsprogs-libs"
 DESCRIPTION = "parted, the GNU partition resizing program"
 HOMEPAGE = "http://www.gnu.org/software/parted/parted.html"
 LICENSE = "GPLv2"
 SECTION = "console/tools"
 DEPENDS = "readline e2fsprogs-libs"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz"
            
@@ -20,3 +20,8 @@ do_stage() {
 do_stage() {
 	autotools_stage_all
 }
+
+# Requires autoconf 2.61. Without it, will build, but there
+# will be link errors when some other package will link against
+# libparted.
+DEFAULT_PREFERENCE = "-1"


#
# mt diff -r82e025b5fb67d750a67c0db1bb958a82ca1f7ec7 -r69c4f23827bd5d45cfcc6008cf24a3877da4126e
#
# 
# 
# patch "conf/machine/fic-gta01.conf"
#  from [d56f1f82dbbb488e26ee4937693060e3d26c9edb]
#    to [1c3c67459b5584e2defd8c40e278b0e5bfff7066]
# 
# patch "packages/tasks/task-gpephone.bb"
#  from [b6fcf7da200e26f6d129146ad6a7c3120ba4697e]
#    to [722a1f220d1d05ba19002f0f73a5c742112064b8]
# 
============================================================
--- conf/machine/fic-gta01.conf	d56f1f82dbbb488e26ee4937693060e3d26c9edb
+++ conf/machine/fic-gta01.conf	1c3c67459b5584e2defd8c40e278b0e5bfff7066
@@ -21,6 +21,11 @@ MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-gta01kbd \
   kernel-module-s3cmci \
   kernel-module-ext2 \
+  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"
 
 # do not outcomment, we bypass the sysvinit.bb logic here -- see FIC GTA01 inittab
@@ -30,7 +35,7 @@ ROOT_FLASH_SIZE = "60"
 ROOT_FLASH_SIZE = "60"
 
 # extra jffs2 tweaks
-EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 -n"
+EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 --pad -n"
 
 # build tools
 EXTRA_IMAGEDEPENDS += "sjf2410-linux-native"
============================================================
--- packages/tasks/task-gpephone.bb	b6fcf7da200e26f6d129146ad6a7c3120ba4697e
+++ packages/tasks/task-gpephone.bb	722a1f220d1d05ba19002f0f73a5c742112064b8
@@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for GPE Pal
 DESCRIPTION = "Task packages for GPE Palmtop Environment Phone Edition"
-PR = "r4"
+PR = "r5"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
@@ -18,12 +18,13 @@ RDEPENDS_gpephone-task-development = "\
 
 RDEPENDS_gpephone-task-development = "\
     rxvt-unicode \
-    xmonobut \
     gpe-terminal \
     gpe-edit \
     gdb \
     strace \
-    e2fsprogs"
+    e2fsprogs \
+    bluez-utils-compat \
+    minicom"
 
 RDEPENDS_gpephone-task-base = "\
     cms92init \