Skip to contentSkip to conversation

Pull request #20

PATCH Applied Martin Jansa 3 participants 9 messages Aug 18, 2011 – Aug 22, 2011

lore
Share & tools
lore

Martin Jansa

author
#0 lore raw

cover Pull request #20

The following changes since commit 3d0b866967529a14268541b85e79cb35981e1aed:

xdotool: import from OE rev 5350bbef01b8979617e3d0fd38939f94f1fa5315 (2011-08-17 23:11:55 +0200)

are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib jansa/meta-oe
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/meta-oe

Martin Jansa (3):
kexec-tools-klibc: import from meta-zaurus layer
kexec-tools: add bbappend to keep old packaging with separate kexec
and kdump
bluez-hcidump: remove older 2.0

 .../remove.ntoh64.definition.patch                 |   42 ---------
 .../bluez/bluez-hcidump_2.0.bb                     |   20 ----
 .../kexec/kexec-tools-klibc-2.0.2/elf.patch        |   94 +++++++++++++++++++
 .../kexec/kexec-tools-klibc-2.0.2/errno.patch      |   13 +++
 .../kexec/kexec-tools-klibc-2.0.2/other.patch      |   97 ++++++++++++++++++++
 .../kexec/kexec-tools-klibc-2.0.2/string.patch     |   11 ++
 .../kexec/kexec-tools-klibc-2.0.2/syscall.patch    |   46 +++++++++
 .../kexec/kexec-tools-klibc_2.0.2.bb               |   27 ++++++
 .../kexec/kexec-tools_2.0.2.bbappend               |    4 +
 9 files changed, 292 insertions(+), 62 deletions(-)
 delete mode 100644 meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.0/remove.ntoh64.definition.patch
 delete mode 100644 meta-oe/recipes-connectivity/bluez/bluez-hcidump_2.0.bb
 create mode 100644 meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/elf.patch
 create mode 100644 meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/errno.patch
 create mode 100644 meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/other.patch
 create mode 100644 meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/string.patch
 create mode 100644 meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/syscall.patch
 create mode 100644 meta-oe/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb
 create mode 100644 meta-oe/recipes-kernel/kexec/kexec-tools_2.0.2.bbappend
Signature · 1 line
1.7.6
author
#1 lore raw

PATCH 1/3 kexec-tools-klibc: import from meta-zaurus layer

Signed-off-by Martin Jansa <[email protected]>
---
 .../kexec/kexec-tools-klibc-2.0.2/elf.patch        |   94 +++++++++++++++++++
 .../kexec/kexec-tools-klibc-2.0.2/errno.patch      |   13 +++
 .../kexec/kexec-tools-klibc-2.0.2/other.patch      |   97 ++++++++++++++++++++
 .../kexec/kexec-tools-klibc-2.0.2/string.patch     |   11 ++
 .../kexec/kexec-tools-klibc-2.0.2/syscall.patch    |   46 +++++++++
 .../kexec/kexec-tools-klibc_2.0.2.bb               |   27 ++++++
 6 files changed, 288 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/elf.patch
 create mode 100644 meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/errno.patch
 create mode 100644 meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/other.patch
 create mode 100644 meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/string.patch
 create mode 100644 meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/syscall.patch
 create mode 100644 meta-oe/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb
meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/elf.patch new file +94 -0
new file mode 100644
index 0000000..0eef4b4
@@ -0,0 +1,94 @@
+Index: kexec-tools-2.0.2/kexec/kexec-elf-rel.c
+===================================================================
+--- kexec-tools-2.0.2.orig/kexec/kexec-elf-rel.c	2009-09-24 14:15:34.025828340 +0100
++++ kexec-tools-2.0.2/kexec/kexec-elf-rel.c	2009-09-24 14:15:47.030825302 +0100
+@@ -4,7 +4,7 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <stdlib.h>
+-#include "elf.h"
++#include "../include/elf.h"
+ #include <boot/elf_boot.h>
+ #include "kexec.h"
+ #include "kexec-elf.h"
+Index: kexec-tools-2.0.2/kexec/crashdump.c
+===================================================================
+--- kexec-tools-2.0.2.orig/kexec/crashdump.c	2008-10-31 03:00:38.000000000 +0100
++++ kexec-tools-2.0.2/kexec/crashdump.c	2009-09-26 11:16:27.000000000 +0200
+@@ -26,7 +26,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+-#include <elf.h>
++#include "../../../include/elf.h"
+ #include "kexec.h"
+ #include "crashdump.h"
+ #include "kexec-syscall.h"
+
+Index: kexec-tools-2.0.2/kexec/crashdump-xen.c
+===================================================================
+--- kexec-tools-2.0.2.orig/kexec/crashdump-xen.c	2008-07-15 02:46:43.000000000 +0200
++++ kexec-tools-2.0.2/kexec/crashdump-xen.c	2009-09-26 11:16:41.000000000 +0200
+@@ -3,7 +3,7 @@
+ #include <stdarg.h>
+ #include <string.h>
+ #include <stdlib.h>
+-#include <elf.h>
++#include "../../../include/elf.h"
+ #include <errno.h>
+ #include <limits.h>
+ #include <sys/types.h>
+
+Index: kexec-tools-2.0.2/kexec/arch/arm/kexec-elf-rel-arm.c
+===================================================================
+--- kexec-tools-2.0.2.orig/kexec/arch/arm/kexec-elf-rel-arm.c	2009-04-24 14:15:46.934825202 +0100
++++ kexec-tools-2.0.2/kexec/arch/arm/kexec-elf-rel-arm.c	2009-09-24 14:15:47.014827381 +0100
+@@ -1,5 +1,5 @@
+ #include <stdio.h>
+-#include <elf.h>
++#include "../../../include/elf.h"
+ #include "../../kexec.h"
+ #include "../../kexec-elf.h"
+
+Index: kexec-tools-2.0.2/kexec/kexec-elf-boot.c
+===================================================================
+--- kexec-tools-2.0.2.orig/kexec/kexec-elf-boot.c	2009-05-16 13:28:19.000000000 +0200
++++ kexec-tools-2.0.2/kexec/kexec-elf-boot.c	2009-09-16 11:13:28.000000000 +0200
+@@ -22,7 +22,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <errno.h>
+-#include <elf.h>
++#include "../include/elf.h"
+ #include <boot/elf_boot.h>
+ #include <ip_checksum.h>
+ #include <x86/x86-linux.h>
+
+Index: kexec-tools-2.0.2/kdump/kdump.c
+===================================================================
+--- kexec-tools-2.0.2.orig/kdump/kdump.c	2009-05-16 13:28:19.000000000 +0200
++++ kexec-tools-2.0.2/kdump/kdump.c	2009-09-16 11:13:08.000000000 +0200
+@@ -8,7 +8,7 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <endian.h>
+-#include <elf.h>
++#include "../include/elf.h"
+
+ #if !defined(__BYTE_ORDER) || !defined(__LITTLE_ENDIAN) || !defined(__BIG_ENDIAN)
+ #error Endian defines missing
+
+Index: kexec-tools-2.0.2/kexec/arch/arm/crashdump-arm.c
+===================================================================
+--- kexec-tools-2.0.2.old/kexec/arch/arm/crashdump-arm.c	2010-08-01 15:07:47.000000000 +0200
++++ kexec-tools-2.0.2/kexec/arch/arm/crashdump-arm.c	2010-07-29 06:19:59.000000000 +0200
+@@ -20,7 +20,7 @@
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+-#include <elf.h>
++#include "../../../include/elf.h"
+ #include <errno.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+
meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/errno.patch new file +13 -0
new file mode 100644
index 0000000..c56b5a9
@@ -0,0 +1,13 @@
+Index: kexec-tools-2.0.2/kexec/ifdown.c
+===================================================================
+--- kexec-tools-2.0.2.orig/kexec/ifdown.c	2009-09-24 14:15:34.025828340 +0100
++++ kexec-tools-2.0.2/kexec/ifdown.c	2009-09-24 14:15:47.014827381 +0100
+@@ -14,7 +14,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <sys/time.h>
+-#include <sys/errno.h>
++#include <errno.h>
+
+ #include <net/if.h>
+ #include <netinet/in.h>
\ No newline at end of file
meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/other.patch new file +97 -0

97 lines not on this page · raw message

meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/string.patch new file +11 -0
new file mode 100644
index 0000000..7d27e39
@@ -0,0 +1,11 @@
+Index: kexec-tools-2.0.2/purgatory/string.c
+===================================================================
+--- kexec-tools-2.0.2.orig/purgatory/string.c	2008-05-16 13:28:19.000000000 +0200
++++ kexec-tools-2.0.2/purgatory/string.c	2009-09-16 17:49:04.000000000 +0200
+@@ -1,5 +1,5 @@
+ #include <stddef.h>
+-#include <string.h>
++/* #include <string.h> */
+
+ size_t strnlen(const char *s, size_t max)
+ {
meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/syscall.patch new file +46 -0

46 lines not on this page · raw message

meta-oe/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb new file +27 -0
new file mode 100644
index 0000000..e4f126e
@@ -0,0 +1,27 @@
+# the binaries are statically linked against klibc
+require recipes-kernel/kexec/kexec-tools.inc
+SRC_URI[md5sum] = "bc401cf3262b25ff7c9a51fc76c8ab91"
+SRC_URI[sha256sum] = "549ab65c18a2229b6bf21b6875ca6bbe0e579bca08c3543ce6aaf8287a0b4188"
+
+PR = "r6"
+inherit klibc
+
+FILESPATH =. "${FILE_DIRNAME}/kexec-tools-${PV}:"
+
+SRC_URI += "file://elf.patch \
+            file://errno.patch \
+            file://string.patch \
+            file://syscall.patch \
+            file://other.patch \
+            "
+
+S = "${WORKDIR}/kexec-tools-${PV}"
+
+EXTRA_OECONF = " --without-zlib"
+
+PACKAGES =+ "kexec-klibc kdump-klibc"
+
+CFLAGS += "-I${STAGING_DIR_HOST}${base_libdir}/klibc/include -I${STAGING_DIR_HOST}${base_libdir}/klibc/include/bits32"
+
+FILES_kexec-klibc = "${sbindir}/kexec"
+FILES_kdump-klibc = "${sbindir}/kdump"
Signature · 1 line
1.7.6
author
#2 lore raw

PATCH 2/3 kexec-tools: add bbappend to keep old packaging with separate kexec and kdump

Signed-off-by Martin Jansa <[email protected]>
---
 .../kexec/kexec-tools_2.0.2.bbappend               |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-kernel/kexec/kexec-tools_2.0.2.bbappend
meta-oe/recipes-kernel/kexec/kexec-tools_2.0.2.bbappend new file +4 -0
new file mode 100644
index 0000000..c59c916
@@ -0,0 +1,4 @@
+PACKAGES =+ "kexec kdump"
+
+FILES_kexec = "${sbindir}/kexec"
+FILES_kdump = "${sbindir}/kdump"
Signature · 1 line
1.7.6
author
#3 lore raw

PATCH 3/3 bluez-hcidump: remove older 2.0

In reply to Martin Jansa

* there is 2.1 now in oe-core

Signed-off-by Martin Jansa <[email protected]>
---
 .../remove.ntoh64.definition.patch                 |   42 --------------------
 .../bluez/bluez-hcidump_2.0.bb                     |   20 ---------
 2 files changed, 0 insertions(+), 62 deletions(-)
 delete mode 100644 meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.0/remove.ntoh64.definition.patch
 delete mode 100644 meta-oe/recipes-connectivity/bluez/bluez-hcidump_2.0.bb
meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.0/remove.ntoh64.definition.patch deleted +0 -42
deleted file mode 100644
index 9943265..0000000
@@ -1,42 +0,0 @@
-Upstream-Status: Accepted, already in git, expected to be included in next version after 2.0
-From 95ea4ff5c9c7dbda2f3faaef4e5cd46d542a48c8 Mon Sep 17 00:00:00 2001
-From: Anderson Lizardo <[email protected]>
-Date: Fri, 18 Mar 2011 15:10:19 -0400
-Subject: [PATCH] Fix compilation against latest BlueZ
-
-BlueZ now has ntoh64()/hton64() functions in bluetooth.h, therefore the
-hcidump local copy is not necessary.
----
- src/hcidump.c |   16 ----------------
- 1 files changed, 0 insertions(+), 16 deletions(-)
-
-diff --git a/src/hcidump.c b/src/hcidump.c
-index af086c7..2023130 100644
---- a/src/hcidump.c
-+++ b/src/hcidump.c
-@@ -50,22 +50,6 @@
- #include "parser/parser.h"
- #include "parser/sdp.h"
- 
--#if __BYTE_ORDER == __LITTLE_ENDIAN
--static inline uint64_t ntoh64(uint64_t n)
--{
--	uint64_t h;
--	uint64_t tmp = ntohl(n & 0x00000000ffffffff);
--	h = ntohl(n >> 32);
--	h |= tmp << 32;
--	return h;
--}
--#elif __BYTE_ORDER == __BIG_ENDIAN
--#define ntoh64(x) (x)
--#else
--#error "Unknown byte order"
--#endif
--#define hton64(x) ntoh64(x)
--
- #define SNAP_LEN 	HCI_MAX_FRAME_SIZE
- #define DEFAULT_PORT	"10839";
- 
--- 
-1.7.4.4
-
meta-oe/recipes-connectivity/bluez/bluez-hcidump_2.0.bb deleted +0 -20
deleted file mode 100644
index f269045..0000000
@@ -1,20 +0,0 @@
-SUMMARY = "Linux Bluetooth Stack HCI Debugger Tool."
-DESCRIPTION = "The hcidump tool reads raw HCI data coming from and going to a Bluetooth device \
-and displays the commands, events and data in a human-readable form."
-
-SECTION = "console"
-DEPENDS = "bluez4"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
-                    file://src/hcidump.c;beginline=1;endline=23;md5=3bee3a162dff43a5be7470710b99fbcf"
-PR = "r0"
-
-SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/${P}.tar.gz \
-           file://remove.ntoh64.definition.patch"
-
-SRC_URI[md5sum] = "5c2e3ef0a68b2845047867ba51ff8ac9"
-SRC_URI[sha256sum] = "b3b64fd0b18301df07d3aaf34c037c1e4808b4aaf702294822d62b5424f617fd"
-
-EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}"
-
-inherit autotools
Signature · 1 line
1.7.6
Reviewed-by on v1 1/3
#4 lore raw

Re: [meta-oe][PATCH 1/3] kexec-tools-klibc: import from meta-zaurus layer

In reply to Martin Jansa

Dear Martin,

Am Donnerstag, den 18.08.2011, 10:14 +0200 schrieb Martin Jansa:

Quoted 1 line
Signed-off-by Martin Jansa <[email protected]>

please include the commit id as documented in the Commit Patch Message Guidelines [1].

Why was is not included into meta-oe in the first place? Should it be included in oe-core right away?

Quoted 14 lines
---
 .../kexec/kexec-tools-klibc-2.0.2/elf.patch        |   94 +++++++++++++++++++
 .../kexec/kexec-tools-klibc-2.0.2/errno.patch      |   13 +++
 .../kexec/kexec-tools-klibc-2.0.2/other.patch      |   97 ++++++++++++++++++++
 .../kexec/kexec-tools-klibc-2.0.2/string.patch     |   11 ++
 .../kexec/kexec-tools-klibc-2.0.2/syscall.patch    |   46 +++++++++
 .../kexec/kexec-tools-klibc_2.0.2.bb               |   27 ++++++
 6 files changed, 288 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/elf.patch
 create mode 100644 meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/errno.patch
 create mode 100644 meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/other.patch
 create mode 100644 meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/string.patch
 create mode 100644 meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/syscall.patch
 create mode 100644 meta-oe/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb

[…]

meta-oe/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb line 6

Quoted 12 lines
meta-oe/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb new file +6 -0
new file mode 100644
index 0000000..e4f126e
@@ -0,0 +1,27 @@
+# the binaries are statically linked against klibc
+require recipes-kernel/kexec/kexec-tools.inc
+SRC_URI[md5sum] = "bc401cf3262b25ff7c9a51fc76c8ab91"
+SRC_URI[sha256sum] = "549ab65c18a2229b6bf21b6875ca6bbe0e579bca08c3543ce6aaf8287a0b4188"
+
+PR = "r6"

Start with "r0" or will that cause problems for the meta-zaurus users?

Quoted 4 lines
meta-oe/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb new file +4 -0
+inherit klibc
+
+FILESPATH =. "${FILE_DIRNAME}/kexec-tools-${PV}:"
+

meta-oe/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb line 20

Quoted 10 lines
meta-oe/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb new file +10 -0
+SRC_URI += "file://elf.patch \
+            file://errno.patch \
+            file://string.patch \
+            file://syscall.patch \
+            file://other.patch \
+            "
+
+S = "${WORKDIR}/kexec-tools-${PV}"
+
+EXTRA_OECONF = " --without-zlib"

Is += needed? Either way the space could be removed in a fix up patch.

meta-oe/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb line 27

Quoted 7 lines
meta-oe/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb new file +7 -0
+
+PACKAGES =+ "kexec-klibc kdump-klibc"
+
+CFLAGS += "-I${STAGING_DIR_HOST}${base_libdir}/klibc/include -I${STAGING_DIR_HOST}${base_libdir}/klibc/include/bits32"
+
+FILES_kexec-klibc = "${sbindir}/kexec"
+FILES_kdump-klibc = "${sbindir}/kdump"
Reviewed-by Paul Menzel <[email protected]>

Thanks,

Paul

[1] http://wiki.openembedded.org/index.php/Commit_Patch_Message_Guidelines#Importing_from_Elsewhere

author
#5 lore raw

Re: [meta-oe][PATCH 1/3] kexec-tools-klibc: import from meta-zaurus layer

Quoted 8 lines · Paul Menzel

Dear Martin,

Am Donnerstag, den 18.08.2011, 10:14 +0200 schrieb Martin Jansa:

Quoted 1 line
Signed-off-by Martin Jansa <[email protected]>

please include the commit id as documented in the Commit Patch Message Guidelines [1].

OK, I'll add it, but meta-zaurus is just temporary layer so later it will be removed completely.

Quoted 2 lines

Why was is not included into meta-oe in the first place? Should it be included in oe-core right away?

It's easier to test it somewhere first and as zaurus layer was first to use kexec-tools-klibc for linux-kexecboot then it was added to meta-zaurus first and now after tests and cleanup, it's good enough to be moved to meta-oe.

It cannot be moved to oe-core, because klibc was added few days ago only to meta-oe.

Quoted 18 lines
Quoted 15 lines
---
 .../kexec/kexec-tools-klibc-2.0.2/elf.patch        |   94 +++++++++++++++++++
 .../kexec/kexec-tools-klibc-2.0.2/errno.patch      |   13 +++
 .../kexec/kexec-tools-klibc-2.0.2/other.patch      |   97 ++++++++++++++++++++
 .../kexec/kexec-tools-klibc-2.0.2/string.patch     |   11 ++
 .../kexec/kexec-tools-klibc-2.0.2/syscall.patch    |   46 +++++++++
 .../kexec/kexec-tools-klibc_2.0.2.bb               |   27 ++++++
 6 files changed, 288 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/elf.patch
 create mode 100644 meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/errno.patch
 create mode 100644 meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/other.patch
 create mode 100644 meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/string.patch
 create mode 100644 meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/syscall.patch
 create mode 100644 meta-oe/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb

[…]

Quoted 14 lines

meta-oe/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb line 6

Quoted 12 lines
meta-oe/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb new file +6 -0
new file mode 100644
index 0000000..e4f126e
@@ -0,0 +1,27 @@
+# the binaries are statically linked against klibc
+require recipes-kernel/kexec/kexec-tools.inc
+SRC_URI[md5sum] = "bc401cf3262b25ff7c9a51fc76c8ab91"
+SRC_URI[sha256sum] = "549ab65c18a2229b6bf21b6875ca6bbe0e579bca08c3543ce6aaf8287a0b4188"
+
+PR = "r6"

Start with "r0" or will that cause problems for the meta-zaurus users?

I can reset it if we don't care about upgrade-path for meta-zaurus users..

Quoted 8 lines
Quoted 8 lines
meta-oe/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb new file +8 -0
+inherit klibc
+
+FILESPATH =. "${FILE_DIRNAME}/kexec-tools-${PV}:"
+
+SRC_URI += "file://elf.patch \
+            file://errno.patch \
+            file://string.patch \
+            file://syscall.patch \
Quoted 8 lines

meta-oe/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb line 20

Quoted 6 lines
meta-oe/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb new file +6 -0
+            file://other.patch \
+            "
+
+S = "${WORKDIR}/kexec-tools-${PV}"
+
+EXTRA_OECONF = " --without-zlib"

Is += needed? Either way the space could be removed in a fix up patch.

klibc.bbclass doesn't add anything to EXTRA_OECONF but you're right += can be usefull later when someone finds some option usefull for all klibc builds (but I doubt that).

Quoted 11 lines

meta-oe/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb line 27

Quoted 7 lines
meta-oe/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb new file +7 -0
+
+PACKAGES =+ "kexec-klibc kdump-klibc"
+
+CFLAGS += "-I${STAGING_DIR_HOST}${base_libdir}/klibc/include -I${STAGING_DIR_HOST}${base_libdir}/klibc/include/bits32"
+
+FILES_kexec-klibc = "${sbindir}/kexec"
+FILES_kdump-klibc = "${sbindir}/kdump"
Reviewed-by Paul Menzel <[email protected]>
Quoted 1 line

Thanks,

Thanks for review!.

Quoted 12 lines

Paul

[1] http://wiki.openembedded.org/index.php/Commit_Patch_Message_Guidelines#Importing_from_Elsewhere

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
author
#6 lore raw

PATCH v2 1/1 kexec-tools-klibc: import from meta-zaurus layer

* http://git.shr-project.org/git/?p=meta-smartphone.git;a=commit;h=437022644822e16804537e42ecfaa011f9e61bc6
* V2: reset PR (meta-zaurus users have to downgrade or reflash)
* V2: += used in EXTRA_OECONF, just in case for future changes

Reviewed-by Paul Menzel <[email protected]>
Signed-off-by Martin Jansa <[email protected]>
---
 .../kexec/kexec-tools-klibc-2.0.2/elf.patch        |   94 +++++++++++++++++++
 .../kexec/kexec-tools-klibc-2.0.2/errno.patch      |   13 +++
 .../kexec/kexec-tools-klibc-2.0.2/other.patch      |   97 ++++++++++++++++++++
 .../kexec/kexec-tools-klibc-2.0.2/string.patch     |   11 ++
 .../kexec/kexec-tools-klibc-2.0.2/syscall.patch    |   46 +++++++++
 .../kexec/kexec-tools-klibc_2.0.2.bb               |   26 +++++
 6 files changed, 287 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/elf.patch
 create mode 100644 meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/errno.patch
 create mode 100644 meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/other.patch
 create mode 100644 meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/string.patch
 create mode 100644 meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/syscall.patch
 create mode 100644 meta-oe/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb
meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/elf.patch new file +94 -0
new file mode 100644
index 0000000..0eef4b4
@@ -0,0 +1,94 @@
+Index: kexec-tools-2.0.2/kexec/kexec-elf-rel.c
+===================================================================
+--- kexec-tools-2.0.2.orig/kexec/kexec-elf-rel.c	2009-09-24 14:15:34.025828340 +0100
++++ kexec-tools-2.0.2/kexec/kexec-elf-rel.c	2009-09-24 14:15:47.030825302 +0100
+@@ -4,7 +4,7 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <stdlib.h>
+-#include "elf.h"
++#include "../include/elf.h"
+ #include <boot/elf_boot.h>
+ #include "kexec.h"
+ #include "kexec-elf.h"
+Index: kexec-tools-2.0.2/kexec/crashdump.c
+===================================================================
+--- kexec-tools-2.0.2.orig/kexec/crashdump.c	2008-10-31 03:00:38.000000000 +0100
++++ kexec-tools-2.0.2/kexec/crashdump.c	2009-09-26 11:16:27.000000000 +0200
+@@ -26,7 +26,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+-#include <elf.h>
++#include "../../../include/elf.h"
+ #include "kexec.h"
+ #include "crashdump.h"
+ #include "kexec-syscall.h"
+
+Index: kexec-tools-2.0.2/kexec/crashdump-xen.c
+===================================================================
+--- kexec-tools-2.0.2.orig/kexec/crashdump-xen.c	2008-07-15 02:46:43.000000000 +0200
++++ kexec-tools-2.0.2/kexec/crashdump-xen.c	2009-09-26 11:16:41.000000000 +0200
+@@ -3,7 +3,7 @@
+ #include <stdarg.h>
+ #include <string.h>
+ #include <stdlib.h>
+-#include <elf.h>
++#include "../../../include/elf.h"
+ #include <errno.h>
+ #include <limits.h>
+ #include <sys/types.h>
+
+Index: kexec-tools-2.0.2/kexec/arch/arm/kexec-elf-rel-arm.c
+===================================================================
+--- kexec-tools-2.0.2.orig/kexec/arch/arm/kexec-elf-rel-arm.c	2009-04-24 14:15:46.934825202 +0100
++++ kexec-tools-2.0.2/kexec/arch/arm/kexec-elf-rel-arm.c	2009-09-24 14:15:47.014827381 +0100
+@@ -1,5 +1,5 @@
+ #include <stdio.h>
+-#include <elf.h>
++#include "../../../include/elf.h"
+ #include "../../kexec.h"
+ #include "../../kexec-elf.h"
+
+Index: kexec-tools-2.0.2/kexec/kexec-elf-boot.c
+===================================================================
+--- kexec-tools-2.0.2.orig/kexec/kexec-elf-boot.c	2009-05-16 13:28:19.000000000 +0200
++++ kexec-tools-2.0.2/kexec/kexec-elf-boot.c	2009-09-16 11:13:28.000000000 +0200
+@@ -22,7 +22,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <errno.h>
+-#include <elf.h>
++#include "../include/elf.h"
+ #include <boot/elf_boot.h>
+ #include <ip_checksum.h>
+ #include <x86/x86-linux.h>
+
+Index: kexec-tools-2.0.2/kdump/kdump.c
+===================================================================
+--- kexec-tools-2.0.2.orig/kdump/kdump.c	2009-05-16 13:28:19.000000000 +0200
++++ kexec-tools-2.0.2/kdump/kdump.c	2009-09-16 11:13:08.000000000 +0200
+@@ -8,7 +8,7 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <endian.h>
+-#include <elf.h>
++#include "../include/elf.h"
+
+ #if !defined(__BYTE_ORDER) || !defined(__LITTLE_ENDIAN) || !defined(__BIG_ENDIAN)
+ #error Endian defines missing
+
+Index: kexec-tools-2.0.2/kexec/arch/arm/crashdump-arm.c
+===================================================================
+--- kexec-tools-2.0.2.old/kexec/arch/arm/crashdump-arm.c	2010-08-01 15:07:47.000000000 +0200
++++ kexec-tools-2.0.2/kexec/arch/arm/crashdump-arm.c	2010-07-29 06:19:59.000000000 +0200
+@@ -20,7 +20,7 @@
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+-#include <elf.h>
++#include "../../../include/elf.h"
+ #include <errno.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+
meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/errno.patch new file +13 -0
new file mode 100644
index 0000000..c56b5a9
@@ -0,0 +1,13 @@
+Index: kexec-tools-2.0.2/kexec/ifdown.c
+===================================================================
+--- kexec-tools-2.0.2.orig/kexec/ifdown.c	2009-09-24 14:15:34.025828340 +0100
++++ kexec-tools-2.0.2/kexec/ifdown.c	2009-09-24 14:15:47.014827381 +0100
+@@ -14,7 +14,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <sys/time.h>
+-#include <sys/errno.h>
++#include <errno.h>
+
+ #include <net/if.h>
+ #include <netinet/in.h>
\ No newline at end of file
meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/other.patch new file +97 -0

97 lines not on this page · raw message

meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/string.patch new file +11 -0
new file mode 100644
index 0000000..7d27e39
@@ -0,0 +1,11 @@
+Index: kexec-tools-2.0.2/purgatory/string.c
+===================================================================
+--- kexec-tools-2.0.2.orig/purgatory/string.c	2008-05-16 13:28:19.000000000 +0200
++++ kexec-tools-2.0.2/purgatory/string.c	2009-09-16 17:49:04.000000000 +0200
+@@ -1,5 +1,5 @@
+ #include <stddef.h>
+-#include <string.h>
++/* #include <string.h> */
+
+ size_t strnlen(const char *s, size_t max)
+ {
meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/syscall.patch new file +46 -0

46 lines not on this page · raw message

meta-oe/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb new file +26 -0
new file mode 100644
index 0000000..9c35330
@@ -0,0 +1,26 @@
+# the binaries are statically linked against klibc
+require recipes-kernel/kexec/kexec-tools.inc
+SRC_URI[md5sum] = "bc401cf3262b25ff7c9a51fc76c8ab91"
+SRC_URI[sha256sum] = "549ab65c18a2229b6bf21b6875ca6bbe0e579bca08c3543ce6aaf8287a0b4188"
+
+inherit klibc
+
+FILESPATH =. "${FILE_DIRNAME}/kexec-tools-${PV}:"
+
+SRC_URI += "file://elf.patch \
+            file://errno.patch \
+            file://string.patch \
+            file://syscall.patch \
+            file://other.patch \
+            "
+
+S = "${WORKDIR}/kexec-tools-${PV}"
+
+EXTRA_OECONF += "--without-zlib"
+
+PACKAGES =+ "kexec-klibc kdump-klibc"
+
+CFLAGS += "-I${STAGING_DIR_HOST}${base_libdir}/klibc/include -I${STAGING_DIR_HOST}${base_libdir}/klibc/include/bits32"
+
+FILES_kexec-klibc = "${sbindir}/kexec"
+FILES_kdump-klibc = "${sbindir}/kdump"
Signature · 1 line
1.7.6
author
#7 lore raw

PATCH 1/1 bluez4: remove from meta-oe, fixed version is now in oe-core

In reply to Martin Jansa
Signed-off-by Martin Jansa <[email protected]>
---
 .../bluez/bluez4/bluetooth.conf                    |   16 -----
 .../fix-dfutool-usb-declaration-mismatch.patch     |   20 ------
 meta-oe/recipes-connectivity/bluez/bluez4_4.96.bb  |   69 --------------------
 3 files changed, 0 insertions(+), 105 deletions(-)
 delete mode 100644 meta-oe/recipes-connectivity/bluez/bluez4/bluetooth.conf
 delete mode 100644 meta-oe/recipes-connectivity/bluez/bluez4/fix-dfutool-usb-declaration-mismatch.patch
 delete mode 100644 meta-oe/recipes-connectivity/bluez/bluez4_4.96.bb
meta-oe/recipes-connectivity/bluez/bluez4/bluetooth.conf deleted +0 -16
deleted file mode 100644
index ca5e9e4..0000000
@@ -1,16 +0,0 @@
-<!-- This configuration file specifies the required security policies
-     for Bluetooth core daemon to work. -->
-
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-
-  <!-- ../system.conf have denied everything, so we just punch some holes -->
-
-  <policy context="default">
-    <allow own="org.bluez"/>
-    <allow send_destination="org.bluez"/>
-    <allow send_interface="org.bluez.Agent"/>
-  </policy>
-
-</busconfig>
meta-oe/recipes-connectivity/bluez/bluez4/fix-dfutool-usb-declaration-mismatch.patch deleted +0 -20
deleted file mode 100644
index 27dead0..0000000
@@ -1,20 +0,0 @@
-# bluez4: add compile patch fixing some usb declaration mismatch
-# Author: Michael 'Mickey' Lauer <[email protected]>
-# Date:   Thu Jan 29 16:52:21 2009 +0000
-#
-# Acquired from OpenEmbedded
-Upstream-Status: Pending
-
-Index: bluez-4.27/tools/dfutool.c
-===================================================================
---- bluez-4.27.orig/tools/dfutool.c
-+++ bluez-4.27/tools/dfutool.c
-@@ -59,7 +59,7 @@
- #endif
- 
- #ifdef NEED_USB_GET_BUSSES
--static inline struct usb_bus *usb_get_busses(void)
-+inline struct usb_bus *usb_get_busses(void)
- {
- 	return usb_busses;
- }
meta-oe/recipes-connectivity/bluez/bluez4_4.96.bb deleted +0 -69

69 lines not on this page · raw message

Signature · 1 line
1.7.6
Applied
#8 lore raw
In reply to Martin Jansa

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 18-08-11 10:14, Martin Jansa schreef:

Quoted 7 lines

The following changes since commit 3d0b866967529a14268541b85e79cb35981e1aed:

xdotool: import from OE rev 5350bbef01b8979617e3d0fd38939f94f1fa5315 (2011-08-17 23:11:55 +0200)

are available in the git repository at: git://git.openembedded.org/meta-openembedded-contrib jansa/meta-oe http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/meta-oe

Martin Jansa (3): kexec-tools-klibc: import from meta-zaurus layer kexec-tools: add bbappend to keep old packaging with separate kexec and kdump bluez-hcidump: remove older 2.0

merged, thanks!
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFOUrOzMkyGM64RGpERAmb0AKCgpe9fJVdlCZCcE36ZHMZ1DZL99QCbBRSr EYoTnuFGoUjm0drv8Q+jqlE=
=YTqq
-----END PGP SIGNATURE-----