Misc tidy-ups

The following changes since commit 8d8b9e77aa3403e880cbbdfefc7f24a993b3161f:

linux-yocto/3.4: perf scripting & unionfs fixes (2012-07-09 17:06:09 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib paule/cleanup2
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/cleanup2

Paul Eggleton (3):
libgsmd - remove
core-image-minimal-dev: base on core-image-minimal core-image-*: remove copyright notices

 meta/conf/multilib.conf                            |    1 -
 .../gsm/files/0001-Introduce-ports.patch           |  712 --------------------
 ...ending-commands-before-restarting-the-mod.patch |   76 ---
 ...-segment-incoming-usock-data-into-packets.patch |   79 ---
 .../0004-Handle-read-and-write-return-values.patch |  178 -----
 .../gsm/files/0005-Add-ask-ds-option-forSMS.patch  |  132 ----
 .../gsm/files/024_sms-text-in-bracket.patch        |   72 --
 .../gsm/files/025_sms-status-report.patch          |  135 ----
 ...027_phonebook-find-and-read-range-support.patch |  425 ------------
 ...ell-phonebook-find-and-read-range-support.patch |  266 --------
 meta/recipes-connectivity/gsm/files/default        |   59 --
 .../gsm/files/fix_machine_init.patch               |   28 -
 meta/recipes-connectivity/gsm/files/gsmd           |   47 --
 .../gsm/files/install-ts-headers.patch             |   13 -
 .../gsm/files/lgsm_send_fix_return_value.patch     |   13 -
 meta/recipes-connectivity/gsm/gsmd.inc             |  108 ---
 meta/recipes-connectivity/gsm/libgsmd_svn.bb       |    6 -
 meta/recipes-core/images/core-image-base.bb        |    3 -
 meta/recipes-core/images/core-image-core.bb        |    3 -
 meta/recipes-core/images/core-image-minimal-dev.bb |   15 +-
 .../images/core-image-minimal-mtdutils.bb          |    3 -
 meta/recipes-core/images/core-image-minimal.bb     |    3 -
 meta/recipes-core/tasks/task-base.bb               |    5 +-
 meta/recipes-rt/images/core-image-rt-sdk.bb        |    3 -
 meta/recipes-rt/images/core-image-rt.bb            |    3 -
 meta/recipes-sato/images/core-image-sato-dev.bb    |    3 -
 meta/recipes-sato/images/core-image-sato-sdk.bb    |    3 -
 meta/recipes-sato/images/core-image-sato.bb        |    3 -
 28 files changed, 4 insertions(+), 2393 deletions(-)
 delete mode 100644 meta/recipes-connectivity/gsm/files/0001-Introduce-ports.patch
 delete mode 100644 meta/recipes-connectivity/gsm/files/0002-Flush-all-pending-commands-before-restarting-the-mod.patch
 delete mode 100644 meta/recipes-connectivity/gsm/files/0003-Correctly-segment-incoming-usock-data-into-packets.patch
 delete mode 100644 meta/recipes-connectivity/gsm/files/0004-Handle-read-and-write-return-values.patch
 delete mode 100644 meta/recipes-connectivity/gsm/files/0005-Add-ask-ds-option-forSMS.patch
 delete mode 100644 meta/recipes-connectivity/gsm/files/024_sms-text-in-bracket.patch
 delete mode 100644 meta/recipes-connectivity/gsm/files/025_sms-status-report.patch
 delete mode 100644 meta/recipes-connectivity/gsm/files/027_phonebook-find-and-read-range-support.patch
 delete mode 100644 meta/recipes-connectivity/gsm/files/028_shell-phonebook-find-and-read-range-support.patch
 delete mode 100644 meta/recipes-connectivity/gsm/files/default
 delete mode 100644 meta/recipes-connectivity/gsm/files/fix_machine_init.patch
 delete mode 100644 meta/recipes-connectivity/gsm/files/gsmd
 delete mode 100644 meta/recipes-connectivity/gsm/files/install-ts-headers.patch
 delete mode 100644 meta/recipes-connectivity/gsm/files/lgsm_send_fix_return_value.patch
 delete mode 100644 meta/recipes-connectivity/gsm/gsmd.inc
 delete mode 100644 meta/recipes-connectivity/gsm/libgsmd_svn.bb

1.7.9.5

This project has been unmaintained for some time, and even the OpenMoko project is not using it any more (in favour of FSO). Since we have ofono in OE-Core which replaces and surpasses its functionality, we can remove libgsmd.

---
 meta/conf/multilib.conf                            |    1 -
 .../gsm/files/0001-Introduce-ports.patch           |  712 --------------------
 ...ending-commands-before-restarting-the-mod.patch |   76 ---
 ...-segment-incoming-usock-data-into-packets.patch |   79 ---
 .../0004-Handle-read-and-write-return-values.patch |  178 -----
 .../gsm/files/0005-Add-ask-ds-option-forSMS.patch  |  132 ----
 .../gsm/files/024_sms-text-in-bracket.patch        |   72 --
 .../gsm/files/025_sms-status-report.patch          |  135 ----
 ...027_phonebook-find-and-read-range-support.patch |  425 ------------
 ...ell-phonebook-find-and-read-range-support.patch |  266 --------
 meta/recipes-connectivity/gsm/files/default        |   59 --
 .../gsm/files/fix_machine_init.patch               |   28 -
 meta/recipes-connectivity/gsm/files/gsmd           |   47 --
 .../gsm/files/install-ts-headers.patch             |   13 -
 .../gsm/files/lgsm_send_fix_return_value.patch     |   13 -
 meta/recipes-connectivity/gsm/gsmd.inc             |  108 ---
 meta/recipes-connectivity/gsm/libgsmd_svn.bb       |    6 -
 meta/recipes-core/tasks/task-base.bb               |    5 +-
 18 files changed, 2 insertions(+), 2353 deletions(-)
 delete mode 100644 meta/recipes-connectivity/gsm/files/0001-Introduce-ports.patch
 delete mode 100644 meta/recipes-connectivity/gsm/files/0002-Flush-all-pending-commands-before-restarting-the-mod.patch
 delete mode 100644 meta/recipes-connectivity/gsm/files/0003-Correctly-segment-incoming-usock-data-into-packets.patch
 delete mode 100644 meta/recipes-connectivity/gsm/files/0004-Handle-read-and-write-return-values.patch
 delete mode 100644 meta/recipes-connectivity/gsm/files/0005-Add-ask-ds-option-forSMS.patch
 delete mode 100644 meta/recipes-connectivity/gsm/files/024_sms-text-in-bracket.patch
 delete mode 100644 meta/recipes-connectivity/gsm/files/025_sms-status-report.patch
 delete mode 100644 meta/recipes-connectivity/gsm/files/027_phonebook-find-and-read-range-support.patch
 delete mode 100644 meta/recipes-connectivity/gsm/files/028_shell-phonebook-find-and-read-range-support.patch
 delete mode 100644 meta/recipes-connectivity/gsm/files/default
 delete mode 100644 meta/recipes-connectivity/gsm/files/fix_machine_init.patch
 delete mode 100644 meta/recipes-connectivity/gsm/files/gsmd
 delete mode 100644 meta/recipes-connectivity/gsm/files/install-ts-headers.patch
 delete mode 100644 meta/recipes-connectivity/gsm/files/lgsm_send_fix_return_value.patch
 delete mode 100644 meta/recipes-connectivity/gsm/gsmd.inc
 delete mode 100644 meta/recipes-connectivity/gsm/libgsmd_svn.bb

index 92a7813..bb21815 100644
@@ -297,7 +297,6 @@ BBCLASSEXTEND_append_pn-libgnomekbd = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-libgnome-keyring = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-libgpg-error = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-libgsf = " ${MULTILIBS}"
-BBCLASSEXTEND_append_pn-libgsmd = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-libgtkstylus = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-libical = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-libice = " ${MULTILIBS}"

deleted file mode 100644
index 1f135d5..0000000
@@ -1,28 +0,0 @@
-Rebase the patch to latest version.
-
-By Dongxiao Xu <[email protected]>
-
-Upstream-Status: Pending
-
-diff -ruN gsm-orig/src/gsmd/gsmd.c gsm/src/gsmd/gsmd.c
---- gsm-orig/src/gsmd/gsmd.c	2010-11-25 10:14:22.000000000 +0800
-+++ gsm/src/gsmd/gsmd.c	2010-11-25 10:14:52.000000000 +0800
-@@ -196,14 +196,11 @@
- 
- 	sms_cb_init(gsmd);
- 
--	if (gsmd->vendorpl && gsmd->vendorpl->initsettings){
-+	if (gsmd->vendorpl && gsmd->vendorpl->initsettings)
- 		rc |= gsmd->vendorpl->initsettings(gsmd);
--		if (gsmd->machinepl && gsmd->machinepl->initsettings)
--			rc |= gsmd->machinepl->initsettings(gsmd);
--		return rc;
--	}	
--	else
--		return rc;
-+	if (gsmd->machinepl && gsmd->machinepl->initsettings)
-+		rc |= gsmd->machinepl->initsettings(gsmd);
-+	return rc;
- }
- 
- static int firstcmd_response = 0;

deleted file mode 100644
index b77b6d9..0000000
@@ -1,13 +0,0 @@
-Upstream-Status: Inappropriate [not used]
-
-Index: gsm/include/gsmd/Makefile.am
-===================================================================
---- gsm.orig/include/gsmd/Makefile.am	2007-10-29 21:05:57.000000000 +0100
-+++ gsm/include/gsmd/Makefile.am	2007-10-29 21:06:03.000000000 +0100
-@@ -1,4 +1,4 @@
- 
--pkginclude_HEADERS = event.h usock.h
-+pkginclude_HEADERS = event.h ts0705.h ts0707.h usock.h
- 
--noinst_HEADERS = atcmd.h gsmd.h select.h ts0705.h ts0707.h unsolicited.h usock.h vendorplugin.h
-+noinst_HEADERS = atcmd.h gsmd.h select.h unsolicited.h usock.h vendorplugin.h

deleted file mode 100644
index 9ff1c9d..0000000
@@ -1,13 +0,0 @@
-Upstream-Status: Inappropriate [not used]
-
---- gsm/src/libgsmd/libgsmd.c.orig	2007-09-25 00:41:56.000000000 -0500
-+++ gsm/src/libgsmd/libgsmd.c	2007-09-25 00:43:44.000000000 -0500
-@@ -210,7 +210,7 @@
- 			pos += rc;
- 		}
- 	}
--	return 0;
-+	return (sizeof(*gmh) + gmh->len);
- }
- 
- struct gsmd_msg_hdr *lgsm_gmh_fill(int type, int subtype, int payload_len)

deleted file mode 100644
index ea8eaae..0000000
@@ -1,6 +0,0 @@
-BASEPN = "gsmd"
-CONFLICTNAME = "gsmd-devel"
-
-SRCREV = "5394"
-require gsmd.inc
-

index ddae7ae..b9bc3aa 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/p
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r73"
+PR = "r74"
 
 inherit task
 

@@ -357,5 +357,4 @@ RDEPENDS_task-base-serial = "\
     lrzsz "
 
 RDEPENDS_task-base-phone = "\
-    gsmd \
-    libgsmd-tools"
+    ofono"

1.7.9.5

When core-image-minimal has been updated in the past, we have on several occasions missed applying those updates to this recipe, so let's just base it directly on core-image-minimal and completely avoid that problem in future.

---
 meta/recipes-core/images/core-image-minimal-dev.bb |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

index 67c7790..4e9cb35 100644
@@ -1,18 +1,10 @@
 #
 # Copyright (C) 2007 OpenedHand Ltd.
 #
+require core-image-minimal.bb
+
 DESCRIPTION = "A small image just capable of allowing a device to boot and \
 is suitable for development work."
 
-IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE}"
-
 IMAGE_FEATURES += "dev-pkgs"
 
-IMAGE_LINGUAS = " "
-
-LICENSE = "MIT"
-
-inherit core-image
-
-# remove not needed ipkg informations
-ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; "

1.7.9.5

These image recipes are meant to be examples that people can copy and modify completely for their own purposes, and most of them are so trivial they don't really need copyright notices anyway, so trim them off.

---
 meta/recipes-core/images/core-image-base.bb        |    3 ---
 meta/recipes-core/images/core-image-core.bb        |    3 ---
 meta/recipes-core/images/core-image-minimal-dev.bb |    3 ---
 .../images/core-image-minimal-mtdutils.bb          |    3 ---
 meta/recipes-core/images/core-image-minimal.bb     |    3 ---
 meta/recipes-rt/images/core-image-rt-sdk.bb        |    3 ---
 meta/recipes-rt/images/core-image-rt.bb            |    3 ---
 meta/recipes-sato/images/core-image-sato-dev.bb    |    3 ---
 meta/recipes-sato/images/core-image-sato-sdk.bb    |    3 ---
 meta/recipes-sato/images/core-image-sato.bb        |    3 ---
 10 files changed, 30 deletions(-)

index 71ff3b9..30c8dd1 100644
@@ -1,6 +1,3 @@
-#
-# Copyright (C) 2007 OpenedHand Ltd.
-#
 DESCRIPTION = "A console-only image that fully supports the target device \
 hardware."
 

index ae32be8..ed33e12 100644
@@ -1,6 +1,3 @@
-#
-# Copyright (C) 2007 OpenedHand Ltd.
-#
 DESCRIPTION = "An X11 image with simple applications such as terminal, editor, \
 and file manager."
 

index 4e9cb35..93ead20 100644
@@ -1,6 +1,3 @@
-#
-# Copyright (C) 2007 OpenedHand Ltd.
-#
 require core-image-minimal.bb
 
 DESCRIPTION = "A small image just capable of allowing a device to boot and \

index 331f16c..c92234c 100644
@@ -1,6 +1,3 @@
-#
-# Copyright (C) 2008 OpenedHand Ltd.
-#
 require core-image-minimal.bb
 
 DESCRIPTION = "Small image capable of booting a device with support for the \

index 7953b80..089a728 100644
@@ -1,6 +1,3 @@
-#
-# Copyright (C) 2007 OpenedHand Ltd.
-#
 DESCRIPTION = "A small image just capable of allowing a device to boot."
 
 IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}"

index 29512e3..f994a04 100644
@@ -1,6 +1,3 @@
-#
-# Copyright (C) 2011 Intel Corporation.
-#
 require recipes-core/images/core-image-minimal.bb
 
 DESCRIPTION = "Small image capable of booting a device with a test suite and \

index 9b816bb..f749bfe 100644
@@ -1,6 +1,3 @@
-#
-# Copyright (C) 2010 Intel Corporation.
-#
 require recipes-core/images/core-image-minimal.bb
 
 DESCRIPTION = "A small image just capable of allowing a device to boot plus a \

index bd31727..5ee9a04 100644
@@ -1,6 +1,3 @@
-#
-# Copyright (C) 2007 OpenedHand Ltd.
-#
 DESCRIPTION = "Image with Sato for development work. It includes everything \
 within core-image-sato plus a native toolchain, application development and \
 testing libraries, profiling and debug symbols."

index 39742ef..bc942ad 100644
@@ -1,6 +1,3 @@
-#
-# Copyright (C) 2007 OpenedHand Ltd.
-#
 DESCRIPTION = "Image with Sato support that includes everything within \
 core-image-sato plus meta-toolchain, development headers and libraries to \
 form a standalone SDK."

index b6c51fb..c228a35 100644
@@ -1,6 +1,3 @@
-#
-# Copyright (C) 2007 OpenedHand Ltd.
-#
 DESCRIPTION = "Image with Sato, a mobile environment and visual style for \
 mobile devices. The image supports X11 with a Sato theme, Pimlico \
 applications, and contains terminal, editor, and file manager."

1.7.9.5

Merged into OE-Core

Thanks
Sau!