* [meta-oe][PATCH 0/3] Pull request #20
@ 2011-08-18 8:14 Martin Jansa
2011-08-18 8:14 ` [meta-oe][PATCH 1/3] kexec-tools-klibc: import from meta-zaurus layer Martin Jansa
` (4 more replies)
0 siblings, 5 replies; 9+ messages in thread
From: Martin Jansa @ 2011-08-18 8:14 UTC (permalink / raw)
To: openembedded-devel
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
--
1.7.6
^ permalink raw reply [flat|nested] 9+ messages in thread* [meta-oe][PATCH 1/3] kexec-tools-klibc: import from meta-zaurus layer 2011-08-18 8:14 [meta-oe][PATCH 0/3] Pull request #20 Martin Jansa @ 2011-08-18 8:14 ` Martin Jansa 2011-08-18 8:40 ` Paul Menzel 2011-08-18 8:14 ` [meta-oe][PATCH 2/3] kexec-tools: add bbappend to keep old packaging with separate kexec and kdump Martin Jansa ` (3 subsequent siblings) 4 siblings, 1 reply; 9+ messages in thread From: Martin Jansa @ 2011-08-18 8:14 UTC (permalink / raw) To: openembedded-devel Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- .../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 diff --git a/meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/elf.patch b/meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/elf.patch new file mode 100644 index 0000000..0eef4b4 --- /dev/null +++ b/meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/elf.patch @@ -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> + diff --git a/meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/errno.patch b/meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/errno.patch new file mode 100644 index 0000000..c56b5a9 --- /dev/null +++ b/meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/errno.patch @@ -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 diff --git a/meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/other.patch b/meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/other.patch new file mode 100644 index 0000000..f6efaeb --- /dev/null +++ b/meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/other.patch @@ -0,0 +1,97 @@ +Index: kexec-tools-2.0.2/kexec/crashdump-elf.c +=================================================================== +--- kexec-tools-2.0.2.orig/kexec/crashdump-elf.c 2008-10-31 03:00:38.000000000 +0100 ++++ kexec-tools-2.0.2/kexec/crashdump-elf.c 2009-09-26 11:17:57.000000000 +0200 +@@ -47,7 +47,8 @@ + if (xen_present()) + nr_cpus = xen_get_nr_phys_cpus(); + else +- nr_cpus = sysconf(_SC_NPROCESSORS_CONF); ++ /*nr_cpus = sysconf(_SC_NPROCESSORS_CONF);*/ ++ nr_cpus = 1; + + if (nr_cpus < 0) { + return -1; + +Index: kexec-tools-2.0.2/kexec/arch/arm/kexec-zImage-arm.c +=================================================================== +--- kexec-tools-2.0.2.orig/kexec/arch/arm/kexec-zImage-arm.c 2009-04-24 14:15:46.982825391 +0100 ++++ kexec-tools-2.0.2/kexec/arch/arm/kexec-zImage-arm.c 2009-09-26 01:58:20.838624318 +0200 +@@ -2,6 +2,10 @@ + * - 08/21/2007 ATAG support added by Uli Luckas <u.luckas@road.de> + * + */ ++ ++/* work around for linux header files */ ++#define __deprecated ++ + #define _GNU_SOURCE + #define _XOPEN_SOURCE + #include <stdio.h> + +Index: kexec-tools-2.0.2/kexec/kexec.h +=================================================================== +--- kexec-tools-2.0.2.orig/kexec/kexec.h 2008-05-16 13:28:19.000000000 +0200 ++++ kexec-tools-2.0.2/kexec/kexec.h 2009-09-16 17:32:15.000000000 +0200 +@@ -204,7 +204,7 @@ + extern char *slurp_file(const char *filename, off_t *r_size); + extern char *slurp_file_len(const char *filename, off_t size); + extern char *slurp_decompress_file(const char *filename, off_t *r_size); +-extern unsigned long virt_to_phys(unsigned long addr); ++/* extern unsigned long virt_to_phys(unsigned long addr); */ + extern void add_segment(struct kexec_info *info, + const void *buf, size_t bufsz, unsigned long base, size_t memsz); + extern void add_segment_phys_virt(struct kexec_info *info, + +Index: kexec-tools-2.0.2/Makefile.in +=================================================================== +--- kexec-tools-2.0.2.orig/Makefile.in 2009-09-29 23:49:47.000000000 +0200 ++++ kexec-tools-2.0.2/Makefile.in 2009-09-29 23:49:09.000000000 +0200 +@@ -46,7 +46,7 @@ + # where necessary. + CPPFLAGS = @CPPFLAGS@ -I$(srcdir)/include -I$(srcdir)/util_lib/include \ + -Iinclude/ +-CFLAGS = @CFLAGS@ -fno-strict-aliasing -Wall -Wstrict-prototypes ++CFLAGS = @CFLAGS@ -static -fno-strict-aliasing -Wall -Wstrict-prototypes + PURGATORY_EXTRA_CFLAGS = @PURGATORY_EXTRA_CFLAGS@ + ASFLAGS = @ASFLAGS@ + LDFLAGS = @LDFLAGS@ + +Index: kexec-tools-2.0.2/util_lib/include/sha256.h +=================================================================== +--- kexec-tools-2.0.2.orig/util_lib/include/sha256.h 2008-07-15 02:46:43.000000000 +0200 ++++ kexec-tools-2.0.2/util_lib/include/sha256.h 2009-10-02 18:28:45.000000000 +0200 +@@ -1,7 +1,8 @@ + #ifndef SHA256_H + #define SHA256_H + +-#include <sys/types.h> ++//#include <sys/types.h> ++#include <stddef.h> + #include <stdint.h> + + typedef struct + +Index: kexec-tools-2.0.2/purgatory/Makefile +=================================================================== +--- kexec-tools-2.0.2.orig/purgatory/Makefile 2008-10-09 00:32:14.000000000 +0200 ++++ kexec-tools-2.0.2.orig/purgatory/Makefile 2009-10-03 00:28:45.000000000 +0200 +@@ -47,7 +47,7 @@ + $(PURGATORY): CC=$(TARGET_CC) + $(PURGATORY): CFLAGS+=$(PURGATORY_EXTRA_CFLAGS) \ + $($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ +- -Os -fno-builtin -ffreestanding ++ -Os -fno-builtin -ffreestanding -nostdinc + + $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ + -I$(srcdir)/purgatory/include \ +@@ -61,7 +61,8 @@ + + $(PURGATORY): $(PURGATORY_OBJS) + $(MKDIR) -p $(@D) +- $(CC) $(LDFLAGS) -o $@ $^ ++# $(CC) $(LDFLAGS) -o $@ $^ ++ $(LD) $(LDFLAGS) -o $@ $^ + + # $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) --no-undefined -e purgatory_start -r -o $@ $(PURGATORY_OBJS) $(UTIL_LIB) + diff --git a/meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/string.patch b/meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/string.patch new file mode 100644 index 0000000..7d27e39 --- /dev/null +++ b/meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/string.patch @@ -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) + { diff --git a/meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/syscall.patch b/meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/syscall.patch new file mode 100644 index 0000000..ae2e3f6 --- /dev/null +++ b/meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/syscall.patch @@ -0,0 +1,46 @@ +Index: kexec-tools-2.0.2/kexec/kexec-syscall.h +=================================================================== +--- kexec-tools-2.0.2.orig/kexec/kexec-syscall.h 2010-07-29 06:19:59.000000000 +0200 ++++ kexec-tools-2.0.2/kexec/kexec-syscall.h 2010-08-02 00:13:39.000000000 +0200 +@@ -2,7 +2,7 @@ + #define KEXEC_SYSCALL_H + + #define __LIBRARY__ +-#include <syscall.h> ++/*#include <syscall.h>*/ + #include <sys/syscall.h> + #include <unistd.h> + +@@ -23,6 +23,7 @@ + #define LINUX_REBOOT_CMD_KEXEC 0x45584543 + + #ifndef __NR_kexec_load ++/* + #ifdef __i386__ + #define __NR_kexec_load 283 + #endif +@@ -61,19 +62,21 @@ + #ifndef __NR_kexec_load + #error Unknown processor architecture. Needs a kexec_load syscall number. + #endif ++*/ + #endif /*ifndef __NR_kexec_load*/ + + struct kexec_segment; +- ++/* + static inline long kexec_load(void *entry, unsigned long nr_segments, + struct kexec_segment *segments, unsigned long flags) + { + return (long) syscall(__NR_kexec_load, entry, nr_segments, segments, flags); + } +- ++*/ + static inline long kexec_reboot(void) + { +- return (long) syscall(__NR_reboot, LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_KEXEC, 0); ++ //return (long) syscall(__NR_reboot, LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_KEXEC, 0); ++ return __reboot(LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_KEXEC, 0); + } + + diff --git a/meta-oe/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb b/meta-oe/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb new file mode 100644 index 0000000..e4f126e --- /dev/null +++ b/meta-oe/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb @@ -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" -- 1.7.6 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [meta-oe][PATCH 1/3] kexec-tools-klibc: import from meta-zaurus layer 2011-08-18 8:14 ` [meta-oe][PATCH 1/3] kexec-tools-klibc: import from meta-zaurus layer Martin Jansa @ 2011-08-18 8:40 ` Paul Menzel 2011-08-18 8:48 ` Martin Jansa 0 siblings, 1 reply; 9+ messages in thread From: Paul Menzel @ 2011-08-18 8:40 UTC (permalink / raw) To: openembedded-devel [-- Attachment #1: Type: text/plain, Size: 2905 bytes --] Dear Martin, Am Donnerstag, den 18.08.2011, 10:14 +0200 schrieb Martin Jansa: > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 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? > --- > .../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 […] > diff --git a/meta-oe/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb b/meta-oe/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb > new file mode 100644 > index 0000000..e4f126e > --- /dev/null > +++ b/meta-oe/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb > @@ -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? > +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" Is `+=` needed? Either way the space could be removed in a fix up patch. > + > +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 <paulepanter@users.sourceforge.net> Thanks, Paul [1] http://wiki.openembedded.org/index.php/Commit_Patch_Message_Guidelines#Importing_from_Elsewhere [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [meta-oe][PATCH 1/3] kexec-tools-klibc: import from meta-zaurus layer 2011-08-18 8:40 ` Paul Menzel @ 2011-08-18 8:48 ` Martin Jansa 2011-08-18 8:54 ` [meta-oe][PATCHv2] " Martin Jansa 0 siblings, 1 reply; 9+ messages in thread From: Martin Jansa @ 2011-08-18 8:48 UTC (permalink / raw) To: openembedded-devel [-- Attachment #1: Type: text/plain, Size: 4099 bytes --] On Thu, Aug 18, 2011 at 10:40:46AM +0200, Paul Menzel wrote: > Dear Martin, > > > Am Donnerstag, den 18.08.2011, 10:14 +0200 schrieb Martin Jansa: > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> > > 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. > 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. > > > --- > > .../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 > > […] > > > diff --git a/meta-oe/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb b/meta-oe/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb > > new file mode 100644 > > index 0000000..e4f126e > > --- /dev/null > > +++ b/meta-oe/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb > > @@ -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.. > > +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" > > 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). > > + > > +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 <paulepanter@users.sourceforge.net> > > > Thanks, Thanks for review!. > > Paul > > > [1] http://wiki.openembedded.org/index.php/Commit_Patch_Message_Guidelines#Importing_from_Elsewhere > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* [meta-oe][PATCHv2] kexec-tools-klibc: import from meta-zaurus layer 2011-08-18 8:48 ` Martin Jansa @ 2011-08-18 8:54 ` Martin Jansa 0 siblings, 0 replies; 9+ messages in thread From: Martin Jansa @ 2011-08-18 8:54 UTC (permalink / raw) To: openembedded-devel * 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 <paulepanter@users.sourceforge.net> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- .../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 diff --git a/meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/elf.patch b/meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/elf.patch new file mode 100644 index 0000000..0eef4b4 --- /dev/null +++ b/meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/elf.patch @@ -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> + diff --git a/meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/errno.patch b/meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/errno.patch new file mode 100644 index 0000000..c56b5a9 --- /dev/null +++ b/meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/errno.patch @@ -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 diff --git a/meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/other.patch b/meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/other.patch new file mode 100644 index 0000000..f6efaeb --- /dev/null +++ b/meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/other.patch @@ -0,0 +1,97 @@ +Index: kexec-tools-2.0.2/kexec/crashdump-elf.c +=================================================================== +--- kexec-tools-2.0.2.orig/kexec/crashdump-elf.c 2008-10-31 03:00:38.000000000 +0100 ++++ kexec-tools-2.0.2/kexec/crashdump-elf.c 2009-09-26 11:17:57.000000000 +0200 +@@ -47,7 +47,8 @@ + if (xen_present()) + nr_cpus = xen_get_nr_phys_cpus(); + else +- nr_cpus = sysconf(_SC_NPROCESSORS_CONF); ++ /*nr_cpus = sysconf(_SC_NPROCESSORS_CONF);*/ ++ nr_cpus = 1; + + if (nr_cpus < 0) { + return -1; + +Index: kexec-tools-2.0.2/kexec/arch/arm/kexec-zImage-arm.c +=================================================================== +--- kexec-tools-2.0.2.orig/kexec/arch/arm/kexec-zImage-arm.c 2009-04-24 14:15:46.982825391 +0100 ++++ kexec-tools-2.0.2/kexec/arch/arm/kexec-zImage-arm.c 2009-09-26 01:58:20.838624318 +0200 +@@ -2,6 +2,10 @@ + * - 08/21/2007 ATAG support added by Uli Luckas <u.luckas@road.de> + * + */ ++ ++/* work around for linux header files */ ++#define __deprecated ++ + #define _GNU_SOURCE + #define _XOPEN_SOURCE + #include <stdio.h> + +Index: kexec-tools-2.0.2/kexec/kexec.h +=================================================================== +--- kexec-tools-2.0.2.orig/kexec/kexec.h 2008-05-16 13:28:19.000000000 +0200 ++++ kexec-tools-2.0.2/kexec/kexec.h 2009-09-16 17:32:15.000000000 +0200 +@@ -204,7 +204,7 @@ + extern char *slurp_file(const char *filename, off_t *r_size); + extern char *slurp_file_len(const char *filename, off_t size); + extern char *slurp_decompress_file(const char *filename, off_t *r_size); +-extern unsigned long virt_to_phys(unsigned long addr); ++/* extern unsigned long virt_to_phys(unsigned long addr); */ + extern void add_segment(struct kexec_info *info, + const void *buf, size_t bufsz, unsigned long base, size_t memsz); + extern void add_segment_phys_virt(struct kexec_info *info, + +Index: kexec-tools-2.0.2/Makefile.in +=================================================================== +--- kexec-tools-2.0.2.orig/Makefile.in 2009-09-29 23:49:47.000000000 +0200 ++++ kexec-tools-2.0.2/Makefile.in 2009-09-29 23:49:09.000000000 +0200 +@@ -46,7 +46,7 @@ + # where necessary. + CPPFLAGS = @CPPFLAGS@ -I$(srcdir)/include -I$(srcdir)/util_lib/include \ + -Iinclude/ +-CFLAGS = @CFLAGS@ -fno-strict-aliasing -Wall -Wstrict-prototypes ++CFLAGS = @CFLAGS@ -static -fno-strict-aliasing -Wall -Wstrict-prototypes + PURGATORY_EXTRA_CFLAGS = @PURGATORY_EXTRA_CFLAGS@ + ASFLAGS = @ASFLAGS@ + LDFLAGS = @LDFLAGS@ + +Index: kexec-tools-2.0.2/util_lib/include/sha256.h +=================================================================== +--- kexec-tools-2.0.2.orig/util_lib/include/sha256.h 2008-07-15 02:46:43.000000000 +0200 ++++ kexec-tools-2.0.2/util_lib/include/sha256.h 2009-10-02 18:28:45.000000000 +0200 +@@ -1,7 +1,8 @@ + #ifndef SHA256_H + #define SHA256_H + +-#include <sys/types.h> ++//#include <sys/types.h> ++#include <stddef.h> + #include <stdint.h> + + typedef struct + +Index: kexec-tools-2.0.2/purgatory/Makefile +=================================================================== +--- kexec-tools-2.0.2.orig/purgatory/Makefile 2008-10-09 00:32:14.000000000 +0200 ++++ kexec-tools-2.0.2.orig/purgatory/Makefile 2009-10-03 00:28:45.000000000 +0200 +@@ -47,7 +47,7 @@ + $(PURGATORY): CC=$(TARGET_CC) + $(PURGATORY): CFLAGS+=$(PURGATORY_EXTRA_CFLAGS) \ + $($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ +- -Os -fno-builtin -ffreestanding ++ -Os -fno-builtin -ffreestanding -nostdinc + + $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ + -I$(srcdir)/purgatory/include \ +@@ -61,7 +61,8 @@ + + $(PURGATORY): $(PURGATORY_OBJS) + $(MKDIR) -p $(@D) +- $(CC) $(LDFLAGS) -o $@ $^ ++# $(CC) $(LDFLAGS) -o $@ $^ ++ $(LD) $(LDFLAGS) -o $@ $^ + + # $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) --no-undefined -e purgatory_start -r -o $@ $(PURGATORY_OBJS) $(UTIL_LIB) + diff --git a/meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/string.patch b/meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/string.patch new file mode 100644 index 0000000..7d27e39 --- /dev/null +++ b/meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/string.patch @@ -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) + { diff --git a/meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/syscall.patch b/meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/syscall.patch new file mode 100644 index 0000000..ae2e3f6 --- /dev/null +++ b/meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/syscall.patch @@ -0,0 +1,46 @@ +Index: kexec-tools-2.0.2/kexec/kexec-syscall.h +=================================================================== +--- kexec-tools-2.0.2.orig/kexec/kexec-syscall.h 2010-07-29 06:19:59.000000000 +0200 ++++ kexec-tools-2.0.2/kexec/kexec-syscall.h 2010-08-02 00:13:39.000000000 +0200 +@@ -2,7 +2,7 @@ + #define KEXEC_SYSCALL_H + + #define __LIBRARY__ +-#include <syscall.h> ++/*#include <syscall.h>*/ + #include <sys/syscall.h> + #include <unistd.h> + +@@ -23,6 +23,7 @@ + #define LINUX_REBOOT_CMD_KEXEC 0x45584543 + + #ifndef __NR_kexec_load ++/* + #ifdef __i386__ + #define __NR_kexec_load 283 + #endif +@@ -61,19 +62,21 @@ + #ifndef __NR_kexec_load + #error Unknown processor architecture. Needs a kexec_load syscall number. + #endif ++*/ + #endif /*ifndef __NR_kexec_load*/ + + struct kexec_segment; +- ++/* + static inline long kexec_load(void *entry, unsigned long nr_segments, + struct kexec_segment *segments, unsigned long flags) + { + return (long) syscall(__NR_kexec_load, entry, nr_segments, segments, flags); + } +- ++*/ + static inline long kexec_reboot(void) + { +- return (long) syscall(__NR_reboot, LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_KEXEC, 0); ++ //return (long) syscall(__NR_reboot, LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_KEXEC, 0); ++ return __reboot(LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_KEXEC, 0); + } + + diff --git a/meta-oe/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb b/meta-oe/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb new file mode 100644 index 0000000..9c35330 --- /dev/null +++ b/meta-oe/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb @@ -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" -- 1.7.6 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [meta-oe][PATCH 2/3] kexec-tools: add bbappend to keep old packaging with separate kexec and kdump 2011-08-18 8:14 [meta-oe][PATCH 0/3] Pull request #20 Martin Jansa 2011-08-18 8:14 ` [meta-oe][PATCH 1/3] kexec-tools-klibc: import from meta-zaurus layer Martin Jansa @ 2011-08-18 8:14 ` Martin Jansa 2011-08-18 8:14 ` [meta-oe][PATCH 3/3] bluez-hcidump: remove older 2.0 Martin Jansa ` (2 subsequent siblings) 4 siblings, 0 replies; 9+ messages in thread From: Martin Jansa @ 2011-08-18 8:14 UTC (permalink / raw) To: openembedded-devel Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- .../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 diff --git a/meta-oe/recipes-kernel/kexec/kexec-tools_2.0.2.bbappend b/meta-oe/recipes-kernel/kexec/kexec-tools_2.0.2.bbappend new file mode 100644 index 0000000..c59c916 --- /dev/null +++ b/meta-oe/recipes-kernel/kexec/kexec-tools_2.0.2.bbappend @@ -0,0 +1,4 @@ +PACKAGES =+ "kexec kdump" + +FILES_kexec = "${sbindir}/kexec" +FILES_kdump = "${sbindir}/kdump" -- 1.7.6 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [meta-oe][PATCH 3/3] bluez-hcidump: remove older 2.0 2011-08-18 8:14 [meta-oe][PATCH 0/3] Pull request #20 Martin Jansa 2011-08-18 8:14 ` [meta-oe][PATCH 1/3] kexec-tools-klibc: import from meta-zaurus layer Martin Jansa 2011-08-18 8:14 ` [meta-oe][PATCH 2/3] kexec-tools: add bbappend to keep old packaging with separate kexec and kdump Martin Jansa @ 2011-08-18 8:14 ` Martin Jansa 2011-08-19 16:12 ` [PATCH] bluez4: remove from meta-oe, fixed version is now in oe-core Martin Jansa 2011-08-22 19:53 ` [meta-oe][PATCH 0/3] Pull request #20 Koen Kooi 4 siblings, 0 replies; 9+ messages in thread From: Martin Jansa @ 2011-08-18 8:14 UTC (permalink / raw) To: openembedded-devel * there is 2.1 now in oe-core Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- .../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 diff --git a/meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.0/remove.ntoh64.definition.patch b/meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.0/remove.ntoh64.definition.patch deleted file mode 100644 index 9943265..0000000 --- a/meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.0/remove.ntoh64.definition.patch +++ /dev/null @@ -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 <anderson.lizardo@openbossa.org> -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 - diff --git a/meta-oe/recipes-connectivity/bluez/bluez-hcidump_2.0.bb b/meta-oe/recipes-connectivity/bluez/bluez-hcidump_2.0.bb deleted file mode 100644 index f269045..0000000 --- a/meta-oe/recipes-connectivity/bluez/bluez-hcidump_2.0.bb +++ /dev/null @@ -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 -- 1.7.6 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH] bluez4: remove from meta-oe, fixed version is now in oe-core 2011-08-18 8:14 [meta-oe][PATCH 0/3] Pull request #20 Martin Jansa ` (2 preceding siblings ...) 2011-08-18 8:14 ` [meta-oe][PATCH 3/3] bluez-hcidump: remove older 2.0 Martin Jansa @ 2011-08-19 16:12 ` Martin Jansa 2011-08-22 19:53 ` [meta-oe][PATCH 0/3] Pull request #20 Koen Kooi 4 siblings, 0 replies; 9+ messages in thread From: Martin Jansa @ 2011-08-19 16:12 UTC (permalink / raw) To: openembedded-devel Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- .../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 diff --git a/meta-oe/recipes-connectivity/bluez/bluez4/bluetooth.conf b/meta-oe/recipes-connectivity/bluez/bluez4/bluetooth.conf deleted file mode 100644 index ca5e9e4..0000000 --- a/meta-oe/recipes-connectivity/bluez/bluez4/bluetooth.conf +++ /dev/null @@ -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> diff --git a/meta-oe/recipes-connectivity/bluez/bluez4/fix-dfutool-usb-declaration-mismatch.patch b/meta-oe/recipes-connectivity/bluez/bluez4/fix-dfutool-usb-declaration-mismatch.patch deleted file mode 100644 index 27dead0..0000000 --- a/meta-oe/recipes-connectivity/bluez/bluez4/fix-dfutool-usb-declaration-mismatch.patch +++ /dev/null @@ -1,20 +0,0 @@ -# bluez4: add compile patch fixing some usb declaration mismatch -# Author: Michael 'Mickey' Lauer <mickey@vanille-media.de> -# 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; - } diff --git a/meta-oe/recipes-connectivity/bluez/bluez4_4.96.bb b/meta-oe/recipes-connectivity/bluez/bluez4_4.96.bb deleted file mode 100644 index 211e910..0000000 --- a/meta-oe/recipes-connectivity/bluez/bluez4_4.96.bb +++ /dev/null @@ -1,69 +0,0 @@ -SUMMARY = "Linux Bluetooth Stack Userland V4" -DESCRIPTION = "Linux Bluetooth stack V4 userland components. These include a system configurations, daemons, tools and system libraries." -HOMEPAGE = "http://www.bluez.org" -SECTION = "libs" -LICENSE = "GPLv2+ & LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ - file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \ - file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \ - file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191" -DEPENDS = "udev gst-plugins-base alsa-lib libusb dbus-glib usbpath" -RDEPENDS_${PN}-dev = "bluez-hcidump" - -ASNEEDED = "" - -PR = "r0" - -SRC_URI = "\ - ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz \ - file://fix-dfutool-usb-declaration-mismatch.patch \ - file://bluetooth.conf \ -" - -SRC_URI[md5sum] = "296111afac49e3f9035085ac14daf518" -SRC_URI[sha256sum] = "c06fd50fd77909cad55e3181a42c6bce7cfcf7abb8cd87871c13d0d70f87fa99" - -S = "${WORKDIR}/bluez-${PV}" - -inherit autotools - -EXTRA_OECONF = "\ - --enable-gstreamer \ - --enable-alsa \ - --enable-usb \ - --enable-tools \ - --enable-bccmd \ - --enable-hid2hci \ - --enable-dfutool \ - --enable-hidd \ - --enable-pand \ - --enable-dund \ - --disable-cups \ - --enable-test \ - --enable-configfiles \ -" - -do_install_append() { - install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/ - install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/ - install -m 0644 ${S}/input/input.conf ${D}/${sysconfdir}/bluetooth/ - # at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT - install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/ -} - -PACKAGES =+ "gst-plugin-bluez libasound-module-bluez" - -FILES_gst-plugin-bluez = "${libdir}/gstreamer-0.10/lib*.so" -FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa" -FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${base_libdir}/systemd/" -FILES_${PN}-dev += "\ - ${libdir}/bluetooth/plugins/*.la \ - ${libdir}/alsa-lib/*.la \ - ${libdir}/gstreamer-0.10/*.la \ -" - -FILES_${PN}-dbg += "\ - ${libdir}/bluetooth/plugins/.debug \ - ${libdir}/*/.debug \ - ${base_libdir}/udev/.debug \ -" -- 1.7.6 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [meta-oe][PATCH 0/3] Pull request #20 2011-08-18 8:14 [meta-oe][PATCH 0/3] Pull request #20 Martin Jansa ` (3 preceding siblings ...) 2011-08-19 16:12 ` [PATCH] bluez4: remove from meta-oe, fixed version is now in oe-core Martin Jansa @ 2011-08-22 19:53 ` Koen Kooi 4 siblings, 0 replies; 9+ messages in thread From: Koen Kooi @ 2011-08-22 19:53 UTC (permalink / raw) To: openembedded-devel -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Op 18-08-11 10:14, Martin Jansa schreef: > 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----- ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2011-08-22 20:14 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-08-18 8:14 [meta-oe][PATCH 0/3] Pull request #20 Martin Jansa 2011-08-18 8:14 ` [meta-oe][PATCH 1/3] kexec-tools-klibc: import from meta-zaurus layer Martin Jansa 2011-08-18 8:40 ` Paul Menzel 2011-08-18 8:48 ` Martin Jansa 2011-08-18 8:54 ` [meta-oe][PATCHv2] " Martin Jansa 2011-08-18 8:14 ` [meta-oe][PATCH 2/3] kexec-tools: add bbappend to keep old packaging with separate kexec and kdump Martin Jansa 2011-08-18 8:14 ` [meta-oe][PATCH 3/3] bluez-hcidump: remove older 2.0 Martin Jansa 2011-08-19 16:12 ` [PATCH] bluez4: remove from meta-oe, fixed version is now in oe-core Martin Jansa 2011-08-22 19:53 ` [meta-oe][PATCH 0/3] Pull request #20 Koen Kooi
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.