diff options
Diffstat (limited to 'recipes')
-rw-r--r-- | recipes/bluez/bluez-utils-3.33/hciattach-ti-bts.patch | 3 | ||||
-rw-r--r-- | recipes/bluez/bluez-utils-3.x/hciattach-ti-bts.patch | 3 | ||||
-rw-r--r-- | recipes/bluez/bluez4_4.39.bb | 7 | ||||
-rw-r--r-- | recipes/hal/consolekit_0.3.0.bb | 6 | ||||
-rw-r--r-- | recipes/linux/linux-handhelds-2.6-2.6.21/0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch | 34 | ||||
-rw-r--r-- | recipes/linux/linux-handhelds-2.6_2.6.21-hh20.bb | 3 | ||||
-rw-r--r-- | recipes/qemu/qemu-native.inc | 3 | ||||
-rw-r--r-- | recipes/wget/wget.inc | 34 | ||||
-rw-r--r-- | recipes/wget/wget_1.11.4.bb | 8 | ||||
-rw-r--r-- | recipes/wget/wget_1.9.1.bb | 41 | ||||
-rw-r--r-- | recipes/xorg-lib/pixman_0.15.6.bb | 13 |
11 files changed, 120 insertions, 35 deletions
diff --git a/recipes/bluez/bluez-utils-3.33/hciattach-ti-bts.patch b/recipes/bluez/bluez-utils-3.33/hciattach-ti-bts.patch index 1b208f7979..3d84a4c20c 100644 --- a/recipes/bluez/bluez-utils-3.33/hciattach-ti-bts.patch +++ b/recipes/bluez/bluez-utils-3.33/hciattach-ti-bts.patch @@ -1,3 +1,6 @@ +upstream: accepted, this patch has landed upstream albeit in a different form +sometime between 3.35 and 3.36. see the commit message in "git log e1d12d8bb5b40a6313cce52974f174fd76cbf32c" + --- bluez-utils-3.1/tools/hciattach.c.orig 2006-07-23 14:02:14.000000000 +0200 +++ bluez-utils-3.1/tools/hciattach.c 2006-07-23 14:06:29.000000000 +0200 @@ -60,6 +60,8 @@ diff --git a/recipes/bluez/bluez-utils-3.x/hciattach-ti-bts.patch b/recipes/bluez/bluez-utils-3.x/hciattach-ti-bts.patch index 8fe37de9d3..f3a417dbc7 100644 --- a/recipes/bluez/bluez-utils-3.x/hciattach-ti-bts.patch +++ b/recipes/bluez/bluez-utils-3.x/hciattach-ti-bts.patch @@ -1,3 +1,6 @@ +upstream: accepted, this patch has landed upstream albeit in a different form +sometime between 3.35 and 3.36. see the commit message in "git log e1d12d8bb5b40a6313cce52974f174fd76cbf32c" + --- bluez-utils-2.24/tools/hciattach.c.orig 2005-12-10 15:14:36.000000000 +0100 +++ bluez-utils-2.24/tools/hciattach.c 2006-01-22 13:56:13.000000000 +0100 @@ -57,6 +57,8 @@ diff --git a/recipes/bluez/bluez4_4.39.bb b/recipes/bluez/bluez4_4.39.bb index c28f260761..531eedf6da 100644 --- a/recipes/bluez/bluez4_4.39.bb +++ b/recipes/bluez/bluez4_4.39.bb @@ -5,6 +5,8 @@ DEPENDS = "gst-plugins-base alsa-lib libusb-compat dbus-glib" HOMEPAGE = "http://www.bluez.org" LICENSE = "GPL" +PR = "r1" + # For angstrom we want this to replace at least bluez-libs PROVIDES_append_angstrom = " bluez-utils bluez-libs" @@ -16,7 +18,7 @@ SRC_URI = "\ " S = "${WORKDIR}/bluez-${PV}" -inherit autotools_stage +inherit autotools_stage update-rc.d AUTOTOOLS_STAGE_PKGCONFIG = "1" EXTRA_OECONF = "\ @@ -47,6 +49,9 @@ do_install_append() { install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/ } +INITSCRIPT_NAME = "bluetooth" +INITSCRIPT_PARAMS = "defaults 23 19" + PACKAGES =+ "gst-plugin-bluez libasound-module-bluez" FILES_gst-plugin-bluez = "${libdir}/gstreamer-0.10/lib*.so" diff --git a/recipes/hal/consolekit_0.3.0.bb b/recipes/hal/consolekit_0.3.0.bb index 9e100b60ca..10f1879e38 100644 --- a/recipes/hal/consolekit_0.3.0.bb +++ b/recipes/hal/consolekit_0.3.0.bb @@ -1,6 +1,8 @@ DESCRIPTION = "ConsoleKit is a framework for defining and tracking users, login sessions, and seats." LICENSE = "GPLv2" -DEPENDS = "libpam dbus" +DEPENDS = "policykit libpam dbus" + +PR = "r1" inherit gnome @@ -11,7 +13,7 @@ do_stage () { autotools_stage_all } -FILES_${PN} += "${libdir}/ConsoleKit ${datadir}/dbus-1" +FILES_${PN} += "${libdir}/ConsoleKit ${datadir}/dbus-1 ${datadir}/PolicyKit" diff --git a/recipes/linux/linux-handhelds-2.6-2.6.21/0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch b/recipes/linux/linux-handhelds-2.6-2.6.21/0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch new file mode 100644 index 0000000000..ad10b67639 --- /dev/null +++ b/recipes/linux/linux-handhelds-2.6-2.6.21/0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch @@ -0,0 +1,34 @@ +From 38332cb98772f5ea757e6486bed7ed0381cb5f98 Mon Sep 17 00:00:00 2001 +From: Segher Boessenkool <segher@kernel.crashing.org> +Date: Tue, 4 Mar 2008 14:59:54 -0800 +Subject: [PATCH] time: prevent the loop in timespec_add_ns() from being optimised away + +Since some architectures don't support __udivdi3(). + +Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org> +Cc: john stultz <johnstul@us.ibm.com> +Cc: Ingo Molnar <mingo@elte.hu> +Signed-off-by: Andrew Morton <akpm@linux-foundation.org> +Signed-off-by: Thomas Gleixner <tglx@linutronix.de> +--- + include/linux/time.h | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/include/linux/time.h b/include/linux/time.h +index 2091a19..d32ef0a 100644 +--- a/include/linux/time.h ++++ b/include/linux/time.h +@@ -174,6 +174,10 @@ static inline void timespec_add_ns(struct timespec *a, u64 ns) + { + ns += a->tv_nsec; + while(unlikely(ns >= NSEC_PER_SEC)) { ++ /* The following asm() prevents the compiler from ++ * optimising this loop into a modulo operation. */ ++ asm("" : "+r"(ns)); ++ + ns -= NSEC_PER_SEC; + a->tv_sec++; + } +-- +1.6.0.6 + diff --git a/recipes/linux/linux-handhelds-2.6_2.6.21-hh20.bb b/recipes/linux/linux-handhelds-2.6_2.6.21-hh20.bb index f6bb17302d..d955c0ab39 100644 --- a/recipes/linux/linux-handhelds-2.6_2.6.21-hh20.bb +++ b/recipes/linux/linux-handhelds-2.6_2.6.21-hh20.bb @@ -1,7 +1,7 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." LICENSE = "GPL" -PR = "r25" +PR = "r26" DEFAULT_PREFERENCE = "-1" @@ -13,6 +13,7 @@ SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('P file://linux-2.6.git-9d20fdd58e74d4d26dc5216efaaa0f800c23dd3a.patch;patch=1 \ http://www.rpsys.net/openzaurus/patches/archive/export_atags-r0a.patch;patch=1 \ file://gcc4x-limits.patch;patch=1 \ + file://0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch;patch=1 \ file://defconfig" require linux-handhelds-2.6.inc diff --git a/recipes/qemu/qemu-native.inc b/recipes/qemu/qemu-native.inc index e4064a2f75..9edad6609d 100644 --- a/recipes/qemu/qemu-native.inc +++ b/recipes/qemu/qemu-native.inc @@ -1,3 +1,6 @@ inherit native DEPENDS = "libsdl-native zlib-native" + +export OS_CFLAGS="${CFLAGS} ${LDFLAGS}" + diff --git a/recipes/wget/wget.inc b/recipes/wget/wget.inc new file mode 100644 index 0000000000..21814c8d66 --- /dev/null +++ b/recipes/wget/wget.inc @@ -0,0 +1,34 @@ +DESCRIPTION = "A console URL download utility featuring HTTP, FTP, and more." +SECTION = "console/network" +DEPENDS = "" +INC_PR = "r7" +LICENSE = "GPL" + +S = "${WORKDIR}/wget-${PV}" + +inherit autotools gettext + +# Disable checking for SSL since that searches the system paths +EXTRA_OECONF = "--enable-ipv6 --without-ssl" + +# The unslung kernel does not support ipv6 +EXTRA_OECONF_unslung = "--without-ssl" +# SlugOS kernels do not support ipv6. Can be loaded as a module. +EXTRA_OECONF_slugos = "--without-ssl" + +do_configure() { + autotools_do_configure +} + +do_install () { + autotools_do_install + mv ${D}${bindir}/wget ${D}${bindir}/wget.${PN} +} + +pkg_postinst_${PN} () { + update-alternatives --install ${bindir}/wget wget wget.${PN} 100 +} + +pkg_prerm_${PN} () { + update-alternatives --remove wget wget.${PN} +} diff --git a/recipes/wget/wget_1.11.4.bb b/recipes/wget/wget_1.11.4.bb new file mode 100644 index 0000000000..4a20bab4e8 --- /dev/null +++ b/recipes/wget/wget_1.11.4.bb @@ -0,0 +1,8 @@ +PR="${INC_PR}.1" + +DEFAULT_PREFERENCE="-1" +SRC_URI = " \ + ${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ +" + +require wget.inc diff --git a/recipes/wget/wget_1.9.1.bb b/recipes/wget/wget_1.9.1.bb index b1e9404c01..50974ed87b 100644 --- a/recipes/wget/wget_1.9.1.bb +++ b/recipes/wget/wget_1.9.1.bb @@ -1,40 +1,19 @@ -DESCRIPTION = "A console URL download utility featuring HTTP, FTP, and more." -SECTION = "console/network" -DEPENDS = "" -PR = "r7" -LICENSE = "GPL" +PR = "${INC_PR}.1" -SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ - file://m4macros.patch;patch=1 \ - file://autotools.patch;patch=1 \ - file://ipv6-fix.patch;patch=1" -S = "${WORKDIR}/wget-${PV}" - -inherit autotools gettext - -# Disable checking for SSL since that searches the system paths -EXTRA_OECONF = "--enable-ipv6 --without-ssl" +SRC_URI = " \ + ${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ + file://m4macros.patch;patch=1 \ + file://autotools.patch;patch=1 \ + file://ipv6-fix.patch;patch=1 \ +" -# SlugOS kernels do not support ipv6. Can be loaded as a module. -EXTRA_OECONF_slugos = "--without-ssl" +S = "${WORKDIR}/wget-${PV}" -do_configure () { +do_configure_prepend () { if [ ! -e acinclude.m4 ]; then mv aclocal.m4 acinclude.m4 fi rm -f libtool.m4 - autotools_do_configure } -do_install () { - autotools_do_install - mv ${D}${bindir}/wget ${D}${bindir}/wget.${PN} -} - -pkg_postinst_${PN} () { - update-alternatives --install ${bindir}/wget wget wget.${PN} 100 -} - -pkg_prerm_${PN} () { - update-alternatives --remove wget wget.${PN} -} +require wget.inc diff --git a/recipes/xorg-lib/pixman_0.15.6.bb b/recipes/xorg-lib/pixman_0.15.6.bb new file mode 100644 index 0000000000..2517f8f354 --- /dev/null +++ b/recipes/xorg-lib/pixman_0.15.6.bb @@ -0,0 +1,13 @@ +SECTION = "libs" +PRIORITY = "optional" +DESCRIPTION = "Low-level pixel manipulation library." +LICENSE = "X11" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "http://cairographics.org/releases/pixman-${PV}.tar.gz \ + " + +inherit autotools_stage +AUTOTOOLS_STAGE_PKGCONFIG = "1" + |