[oe-commits] org.oe.dev merge of '5f324e98b61ec50554d929eb59723aaef495ef64'
rwhitby commit
openembedded-commits at lists.openembedded.org
Sat Aug 18 06:04:41 UTC 2007
merge of '5f324e98b61ec50554d929eb59723aaef495ef64'
and 'f857f14193d6f1cf2150da9e6a84070b69b7dd1d'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 6a1478f79899529e74775c3d0e95626ecd6e31a2
ViewMTN: http://monotone.openembedded.org/revision.psp?id=6a1478f79899529e74775c3d0e95626ecd6e31a2
Files:
1
packages/openssh/openssh_4.6p1.bb
packages/gsm/files/extreplychars.patch
packages/gsm/files/getopt-wait-interpreter-ready.patch
packages/gsm/files/libgsmd-tool-fix.patch
packages/gsm/files/mlbuf-in-gsmd-struct.patch
packages/gsm/files/sms-hacks.patch
packages/gsm/files/tihtc-csq-fix.patch
packages/gsm/files/universal-wcdma.patch
classes/sanity.bbclass
packages/gsm/libgsmd_svn.bb
packages/matchbox-keyboard/files/2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch
packages/matchbox-keyboard/files/3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch
packages/matchbox-keyboard/files/4-Add-rendering-debug-logging.patch
packages/uboot/u-boot_1.1.2.bb
packages/uboot/u-boot_1.1.4.bb
packages/uboot/uboot-utils_1.2.0.bb
packages/xorg-util/makedepend-native_1.0.1.bb
packages/xorg-util/makedepend_1.0.1.bb
Diffs:
#
# mt diff -r5f324e98b61ec50554d929eb59723aaef495ef64 -r6a1478f79899529e74775c3d0e95626ecd6e31a2
#
#
#
# patch "packages/openssh/openssh_4.6p1.bb"
# from [af980ce34132a255f09adfcc9c6dca24ba3fa96a]
# to [b6dd08fb7fd9e64409034815aef2658608f0968f]
#
============================================================
--- packages/openssh/openssh_4.6p1.bb af980ce34132a255f09adfcc9c6dca24ba3fa96a
+++ packages/openssh/openssh_4.6p1.bb b6dd08fb7fd9e64409034815aef2658608f0968f
@@ -1,5 +1,3 @@
-DEFAULT_PREFERENCE = "-1"
-
DEPENDS = "zlib openssl"
RCONFLICTS_openssh = "dropbear"
#
# mt diff -rf857f14193d6f1cf2150da9e6a84070b69b7dd1d -r6a1478f79899529e74775c3d0e95626ecd6e31a2
#
#
#
# delete "packages/gsm/files/extreplychars.patch"
#
# delete "packages/gsm/files/getopt-wait-interpreter-ready.patch"
#
# delete "packages/gsm/files/libgsmd-tool-fix.patch"
#
# delete "packages/gsm/files/mlbuf-in-gsmd-struct.patch"
#
# delete "packages/gsm/files/sms-hacks.patch"
#
# delete "packages/gsm/files/tihtc-csq-fix.patch"
#
# delete "packages/gsm/files/universal-wcdma.patch"
#
# patch "classes/sanity.bbclass"
# from [808f5e34043a37c456f2b223aace94f414b22349]
# to [994303fc1fb3b4f460621e0ee691d88588acaf70]
#
# patch "packages/gsm/libgsmd_svn.bb"
# from [93be8aaf85e129126e05afcdbd9748e3387c3d47]
# to [8f6e0a51dc6a9690a8c44a5d73a3289745b547cf]
#
# patch "packages/matchbox-keyboard/files/2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch"
# from [d37f4c2f59e428172f8a70481172f2c8813790b4]
# to [abb667bd8d124acc351a36f00c0d452e094e105d]
#
# patch "packages/matchbox-keyboard/files/3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch"
# from [f1007f312f166afc1af40a84f7d2cee5f1e5e9d2]
# to [9f4820b13f07c71e14826caa39826628e064679c]
#
# patch "packages/matchbox-keyboard/files/4-Add-rendering-debug-logging.patch"
# from [caf942b51b36963448104e736cae985e67435a8c]
# to [edcdbeb783f5016e7bde8344932aaa73ac22e0b9]
#
# patch "packages/uboot/u-boot_1.1.2.bb"
# from [16bfcf693d217b7d96a053df2b2eb514bbadc898]
# to [92cf95f3cb2183350d8652417e5b8c2a831c602c]
#
# patch "packages/uboot/u-boot_1.1.4.bb"
# from [3abf6a09c1cf0e95c0a731971469e8adcae0e02f]
# to [d038552bd2f9296f6e46ab33c2c4ebb364477fec]
#
# patch "packages/uboot/uboot-utils_1.2.0.bb"
# from [b72d6934fb848bef58cebbfbbc5593cefebcfca5]
# to [f7517fc7aea30f86896606bcfc953b6fe63234e0]
#
# patch "packages/xorg-util/makedepend-native_1.0.1.bb"
# from [2fa373a4635f8f5e54384a66aacd2efbfe8a2fe7]
# to [43d5452f9fc931479b465cbc961c32c71bed94d5]
#
# patch "packages/xorg-util/makedepend_1.0.1.bb"
# from [06790d0adb7f2e5412286abfeb7413e26d11acdc]
# to [46d1427414623a18096276050e119095dac43e3d]
#
============================================================
--- classes/sanity.bbclass 808f5e34043a37c456f2b223aace94f414b22349
+++ classes/sanity.bbclass 994303fc1fb3b4f460621e0ee691d88588acaf70
@@ -90,7 +90,7 @@ def check_sanity(e):
if not check_app_exists('${BUILD_PREFIX}g++', e.data):
missing = missing + "C++ Compiler (${BUILD_PREFIX}g++),"
- required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk md5sum"
+ required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk md5sum stty"
for util in required_utilities.split():
if not check_app_exists( util, e.data ):
@@ -109,6 +109,11 @@ def check_sanity(e):
if not oes_bb_conf:
messages = messages + 'You do not include OpenEmbeddeds version of conf/bitbake.conf\n'
+ # Check if the terminal has stty +tostop
+ if "tostop" in os.popen("stty").read():
+ messages = messages + "You have tostop in your stty terminal setting. This will make BitBake hang when executing. Execute stty -tostop fix this.\n"
+
+
if messages != "":
raise_sanity_error(messages)
============================================================
--- packages/gsm/libgsmd_svn.bb 93be8aaf85e129126e05afcdbd9748e3387c3d47
+++ packages/gsm/libgsmd_svn.bb 8f6e0a51dc6a9690a8c44a5d73a3289745b547cf
@@ -1,20 +1,16 @@ PV = "0.1+svn${SRCDATE}"
DESCRIPTION = "GSM libraries and daemons implementing the 07.10 specification"
HOMEPAGE = "http://www.openmoko.org"
LICENSE = "GPL LGPL"
SECTION = "libs/gsm"
PROVIDES += "gsmd"
PV = "0.1+svn${SRCDATE}"
-PR = "r18"
+PR = "r19"
SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
file://gsmd \
- file://default \
- file://extreplychars.patch;patch=1 \
- file://getopt-wait-interpreter-ready.patch;patch=1 \
- file://tihtc-csq-fix.patch;patch=1 \
- file://universal-wcdma.patch;patch=1"
+ file://default"
S = "${WORKDIR}/gsm"
inherit autotools pkgconfig update-rc.d
============================================================
--- packages/matchbox-keyboard/files/2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch d37f4c2f59e428172f8a70481172f2c8813790b4
+++ packages/matchbox-keyboard/files/2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch abb667bd8d124acc351a36f00c0d452e094e105d
@@ -71,15 +71,15 @@ diff -r 96305d94eb31 -r ff9cf1fd8177 src
diff -r 96305d94eb31 -r ff9cf1fd8177 src/matchbox-keyboard.h
--- a/src/matchbox-keyboard.h Sun Apr 08 23:28:43 2007 +0000
+++ b/src/matchbox-keyboard.h Sun Apr 08 23:56:09 2007 +0000
-@@ -148,6 +148,7 @@ struct MBKeyboard
-
+@@ -153,6 +153,7 @@
+ char *config_file;
List *layouts;
MBKeyboardLayout *selected_layout;
-+ int selected_layout_no;
-
++ int selected_layout_no;
int key_border, key_pad, key_margin;
int row_spacing, col_spacing;
-@@ -177,6 +178,9 @@ int
+ boolean extended; /* are we showing extended keys ? */
+@@ -179,6 +180,9 @@
int
mb_kbd_ui_init(MBKeyboard *kbd);
============================================================
--- packages/matchbox-keyboard/files/3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch f1007f312f166afc1af40a84f7d2cee5f1e5e9d2
+++ packages/matchbox-keyboard/files/3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch 9f4820b13f07c71e14826caa39826628e064679c
@@ -43,52 +43,51 @@ diff -r ff9cf1fd8177 -r b010d54a6c50 src
layout = mb_kbd_get_selected_layout(ui->kbd);
row_item = mb_kbd_layout_rows(layout);
-diff -r ff9cf1fd8177 -r b010d54a6c50 src/matchbox-keyboard.c
---- a/src/matchbox-keyboard.c Sun Apr 08 23:56:09 2007 +0000
-+++ b/src/matchbox-keyboard.c Mon Apr 09 00:06:34 2007 +0000
-@@ -23,8 +23,9 @@ mb_kbd_usage (char *progname)
- mb_kbd_usage (char *progname)
- {
- fprintf(stderr, "Usage:\n %s [Options ] [ Layout Variant ]\n", progname);
-- fprintf(stderr, "\nOptions are;\n"
-- " -xid,--xid Print window ID to stdout ( for embedding )\n");
-+ fprintf(stderr, "\nOptions are:\n"
-+ " -xid,--xid Print window ID to stdout ( for embedding )\n"
-+ " --hfactor <percent> Fix keyboard window size in percentage of desktop height\n");
- fprintf(stderr, "\nmatchbox-keyboard %s \nCopyright (C) 2005 Matthew Allum, OpenedHand Ltd.\n", VERSION);
+--- a/src/matchbox-keyboard.c 2007-08-17 17:09:05.240878162 +0300
++++ b/src/matchbox-keyboard.c 2007-08-17 17:11:36.749512174 +0300
+@@ -27,7 +27,9 @@
+ " -xid,--xid Print window ID to stdout ( for embedding )\n"
+ " -d,--daemon Run in 'daemon' mode (for remote control)\n"
+ " -o,--orientation <portrait|landscape>\n"
+- " Use to limit visibility with screen orientation \n");
++ " Use to limit visibility with screen orientation \n"
++ " -h,--hfactor <percent>\n"
++ " Fix keyboard window size in percentage of desktop height\n");
+ fprintf(stderr, "\nmatchbox-keyboard %s \nCopyright (C) 2007 OpenedHand Ltd.\n", VERSION);
exit(-1);
-@@ -58,6 +59,13 @@ mb_kbd_new (int argc, char **argv)
- want_embedding = True;
- continue;
- }
-+ if (streq ("-hfactor", argv[i]) || streq ("--hfactor", argv[i]))
-+ {
-+ if (i + 1 < argc) {
-+ kb->hfactor = atoi(argv[i + 1]);
-+ }
-+ continue;
-+ }
+@@ -52,7 +53,7 @@
+ kb->row_spacing = 5;
- if (i == (argc-1) && argv[i][0] != '-')
- variant = argv[i];
-@@ -77,7 +85,7 @@ mb_kbd_new (int argc, char **argv)
- kb->key_pad = 0;
- kb->col_spacing = 0;
- kb->row_spacing = 0;
-- kb->font_pt_size = 5;
-+ kb->font_pt_size = 6;
- }
+ kb->font_family = strdup("sans");
+- kb->font_pt_size = 5;
++ kb->font_pt_size = 6;
+ kb->font_variant = strdup("bold");
- if (!mb_kbd_config_load(kb, variant))
+ for (i = 1; i < argc; i++)
+@@ -63,6 +64,14 @@
+ continue;
+ }
+
++ if (streq ("-h", argv[i]) || streq ("--hfactor", argv[i]))
++ {
++ if (i + 1 < argc) {
++ kb->hfactor = atoi(argv[i + 1]);
++ }
++ continue;
++ }
++
+ if (streq ("-d", argv[i]) || streq ("--daemon", argv[i]))
+ {
+ want_daemon = True;
diff -r ff9cf1fd8177 -r b010d54a6c50 src/matchbox-keyboard.h
--- a/src/matchbox-keyboard.h Sun Apr 08 23:56:09 2007 +0000
+++ b/src/matchbox-keyboard.h Mon Apr 09 00:06:34 2007 +0000
-@@ -143,6 +143,7 @@ struct MBKeyboard
+@@ -150,6 +150,7 @@
char *font_family;
int font_pt_size;
char *font_variant;
+ int hfactor;
-
char *config_file;
+ List *layouts;
+ MBKeyboardLayout *selected_layout;
-
============================================================
--- packages/matchbox-keyboard/files/4-Add-rendering-debug-logging.patch caf942b51b36963448104e736cae985e67435a8c
+++ packages/matchbox-keyboard/files/4-Add-rendering-debug-logging.patch edcdbeb783f5016e7bde8344932aaa73ac22e0b9
@@ -44,14 +44,14 @@ diff -r b010d54a6c50 -r 38c3459f2e1a src
width_diff = width - ui->base_alloc_width;
height_diff = height - ui->base_alloc_height;
-@@ -1125,6 +1133,7 @@ mb_kbd_ui_event_loop(MBKeyboardUI *ui)
+@@ -1178,6 +1178,7 @@
}
break;
case ConfigureNotify:
+ DBG("ConfigureNotify %i,%i", xev.xconfigure.width, xev.xconfigure.height);
- if (xev.xconfigure.width != ui->xwin_width
- || xev.xconfigure.height != ui->xwin_height)
- mb_kbd_ui_handle_configure(ui,
+ if (xev.xconfigure.window == ui->xwin
+ && (xev.xconfigure.width != ui->xwin_width
+ || xev.xconfigure.height != ui->xwin_height))
diff -r b010d54a6c50 -r 38c3459f2e1a src/matchbox-keyboard.h
--- a/src/matchbox-keyboard.h Mon Apr 09 00:06:34 2007 +0000
+++ b/src/matchbox-keyboard.h Mon Apr 09 00:08:07 2007 +0000
============================================================
--- packages/uboot/u-boot_1.1.2.bb 16bfcf693d217b7d96a053df2b2eb514bbadc898
+++ packages/uboot/u-boot_1.1.2.bb 92cf95f3cb2183350d8652417e5b8c2a831c602c
@@ -1,7 +1,7 @@ require u-boot.inc
PR = "r1"
require u-boot.inc
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
+SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
file://arm_flags.patch;patch=1 "
SRC_URI_append_vibren = "ftp://bec-systems.com/pub/pxa255_idp/u-boot/uboot_pxa255-idp_2005-03-23.patch;patch=1"
SRC_URI_append_mnci = "file://mnci.patch;patch=1 \
============================================================
--- packages/uboot/u-boot_1.1.4.bb 3abf6a09c1cf0e95c0a731971469e8adcae0e02f
+++ packages/uboot/u-boot_1.1.4.bb d038552bd2f9296f6e46ab33c2c4ebb364477fec
@@ -1,8 +1,8 @@ DEFAULT_PREFERENCE = "-1"
require u-boot.inc
DEFAULT_PREFERENCE = "-1"
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
+SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
file://u-boot-make381-fix.patch;patch=1"
SRC_URI_append_gumstix = "\
============================================================
--- packages/uboot/uboot-utils_1.2.0.bb b72d6934fb848bef58cebbfbbc5593cefebcfca5
+++ packages/uboot/uboot-utils_1.2.0.bb f7517fc7aea30f86896606bcfc953b6fe63234e0
@@ -1,10 +1,10 @@ PR = "r6"
DESCRIPTION = "U-boot bootloader OS env. access tools for PPC"
SECTION = "bootloaders"
PRIORITY = "optional"
LICENSE = "GPL"
PR = "r6"
-SRC_URI = "${SOURCEFORGE_MIRROR}/u-boot/u-boot-${PV}.tar.bz2"
+SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2"
S = "${WORKDIR}/u-boot-${PV}"
============================================================
--- packages/xorg-util/makedepend-native_1.0.1.bb 2fa373a4635f8f5e54384a66aacd2efbfe8a2fe7
+++ packages/xorg-util/makedepend-native_1.0.1.bb 43d5452f9fc931479b465cbc961c32c71bed94d5
@@ -1,9 +1,9 @@ DESCRIPTION = "create dependencies in ma
require xorg-util-common.inc
inherit native
DESCRIPTION = "create dependencies in makefiles"
-DEPENDS = "xproto-native"
-PR = "r1"
+DEPENDS = "xproto-native util-macros-native"
+PR = "r2"
PE = "1"
XORG_PN = "makedepend"
============================================================
--- packages/xorg-util/makedepend_1.0.1.bb 06790d0adb7f2e5412286abfeb7413e26d11acdc
+++ packages/xorg-util/makedepend_1.0.1.bb 46d1427414623a18096276050e119095dac43e3d
@@ -1,5 +1,6 @@ DESCRIPTION = "create dependencies in ma
require xorg-util-common.inc
DESCRIPTION = "create dependencies in makefiles"
-PR = "r1"
+DEPENDS = "xproto util-macros"
+PR = "r2"
PE = "1"
More information about the Openembedded-commits
mailing list