[oe-commits] org.oe.dev merge of '1de364fbbc0efdbe8f12facadb69f65193d6402b'
mickeyl commit
openembedded-commits at lists.openembedded.org
Fri Jul 13 10:51:04 UTC 2007
merge of '1de364fbbc0efdbe8f12facadb69f65193d6402b'
and '9a6a3b6cdbc4ad0d70f25990c813207b33b2a5a2'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: c4c04abd2d37ccffd14f985a7cb5384d5e73cfb0
ViewMTN: http://monotone.openembedded.org/revision.psp?id=c4c04abd2d37ccffd14f985a7cb5384d5e73cfb0
Files:
1
packages/gparted
packages/gparted/files
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
conf/distro/angstrom-2007.1.conf
conf/machine/h4000.conf
conf/machine/htcblueangel.conf
site/common-glibc
Diffs:
#
# mt diff -r1de364fbbc0efdbe8f12facadb69f65193d6402b -rc4c04abd2d37ccffd14f985a7cb5384d5e73cfb0
#
#
# no changes
#
#
# mt diff -r9a6a3b6cdbc4ad0d70f25990c813207b33b2a5a2 -rc4c04abd2d37ccffd14f985a7cb5384d5e73cfb0
#
#
#
# add_dir "packages/gparted"
#
# add_dir "packages/gparted/files"
#
# 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]
#
# 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 "site/common-glibc"
# from [b92f57d8679d30d91088f81d8515234d2f26b728]
# to [7048580f000406f0acd052f1c85074d6d322c430]
#
============================================================
--- 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
============================================================
--- conf/distro/angstrom-2007.1.conf 492fb6241aa69eb82747c0c5b369480a2ed86c6f
+++ conf/distro/angstrom-2007.1.conf 8b80a1c95dae22cddbcc5efbca4f834aab273d56
@@ -127,7 +127,7 @@ PCMCIA_MANAGER = "pcmciautils"
PCMCIA_MANAGER = "pcmciautils"
#Preferred version for the kernel on various machines
-PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh10"
+PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh11"
PREFERRED_VERSION_linux_at91sam9263ek ?= "2.6.20"
============================================================
--- conf/machine/h4000.conf 1d9bd156a1998140041d4a105ac52b00cf910841
+++ conf/machine/h4000.conf 0f9f407e263722cada91fcbbddd485ba1f0a85b9
@@ -13,7 +13,7 @@ GUI_MACHINE_CLASS = "smallscreen"
ROOT_FLASH_SIZE = "32"
VOLATILE_STORAGE_SIZE = "64"
GUI_MACHINE_CLASS = "smallscreen"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen"
#
# Software/packages selection
@@ -22,7 +22,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kd
PCMCIA_MANAGER = "pcmciautils"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware"
+MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware ${PCMCIA_MANAGER}"
MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-h4000-audio \
kernel-module-i2c-pxa \
kernel-module-acx \
============================================================
--- conf/machine/htcblueangel.conf c6770b35cf50ebebdd92334753ebe6f8c86bdaaa
+++ conf/machine/htcblueangel.conf 29e2ddc11eb786ac0f566be156d09a5f96617a8b
@@ -23,7 +23,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kd
PCMCIA_MANAGER = "pcmciautils"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-MACHINE_EXTRA_RDEPENDS = "acx-firmware"
+MACHINE_EXTRA_RDEPENDS = "acx-firmware ${PCMCIA_MANAGER}"
MACHINE_EXTRA_RRECOMMENDS = "kernel-module-blueangel_pcmcia \
kernel-module-blueangel_audio \
kernel-module-blueangel_rom \
============================================================
--- site/common-glibc b92f57d8679d30d91088f81d8515234d2f26b728
+++ site/common-glibc 7048580f000406f0acd052f1c85074d6d322c430
@@ -1,5 +1,7 @@ ac_cv_have_decl_sys_siglist=${ac_cv_have
# general
ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=yes}
+ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes}
+ac_cv_func_memcmp_working=${ac_cv_func_memcmp_working=yes}
# bash
bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=yes}
More information about the Openembedded-commits
mailing list