mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-07 05:10:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote branch 'meta-oe-contrib/jansa/meta-oe'

Browse Source
This commit is contained in:
Koen Kooi
2011-08-22 21:52:04 +02:00
parent 30fb538629 3ee3add90d
commit ce68029c62
12 changed files with 291 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.0/remove.ntoh64.definition.patch
-42
View File
@@ -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
meta-oe/recipes-connectivity/bluez/bluez-hcidump_2.0.bb
-20
View File
@@ -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
meta-oe/recipes-connectivity/bluez/bluez4/bluetooth.conf
-16
View File
@@ -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
-20
View File
@@ -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;
}
meta-oe/recipes-connectivity/bluez/bluez4_4.96.bb
-69
View File
@@ -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 \
"
meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/elf.patch
+94
View File
@@ -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
+13
View File
@@ -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>
meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/other.patch
+97
View File
@@ -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)
meta-oe/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/string.patch
+11
View File
@@ -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
+46
View File
@@ -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);
}
meta-oe/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb
+26
View File
@@ -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"
meta-oe/recipes-kernel/kexec/kexec-tools_2.0.2.bbappend
+4
View File
@@ -0,0 +1,4 @@
PACKAGES =+ "kexec kdump"
FILES_kexec = "${sbindir}/kexec"
FILES_kdump = "${sbindir}/kdump"