From d30433fa7c88037145e36f167809d7bf1fa0d21c Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Wed, 16 May 2007 22:57:42 +0000 Subject: altboot: Add SVNR48, completing Flash, HDD and CF booting on spitz. --- packages/altboot/altboot_1.1.1+wip-SVNR44.bb | 124 --------------------------- packages/altboot/altboot_1.1.1+wip-SVNR48.bb | 124 +++++++++++++++++++++++++++ packages/altboot/altboot_svn.bb | 4 +- 3 files changed, 126 insertions(+), 126 deletions(-) delete mode 100644 packages/altboot/altboot_1.1.1+wip-SVNR44.bb create mode 100644 packages/altboot/altboot_1.1.1+wip-SVNR48.bb (limited to 'packages') diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR44.bb b/packages/altboot/altboot_1.1.1+wip-SVNR44.bb deleted file mode 100644 index 34c8c7a3b6..0000000000 --- a/packages/altboot/altboot_1.1.1+wip-SVNR44.bb +++ /dev/null @@ -1,124 +0,0 @@ -#! /bin/sh -# -# Copyright Matthias Hentges (c) 2006 -# License: MIT (see COPYING.MIT) -# -# Filename: altboot_1.0.5-rc2.bb -# Date: 21-Feb-06 - -DESCRIPTION = "The altboot bootmanager" -MAINTAINER = "Matthias 'CoreDump' Hentges " -HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" -LICENSE = "GPL" - -###################################################################################### - -RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools" -RRECOMMENDS_${PN}_append_akita = " kexec-tools" -RRECOMMENDS_${PN}_append_spitz = " kexec-tools" -RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools" - -RDEPENDS_${PN} = "${PN}-conf" -RDEPENDS_${PN}-conf = "${PN}" - -###################################################################################### - -SVN_REV = "44" -PR = "r0" - -###################################################################################### - -PACKAGES = "${PN}-conf ${PN}-doc ${PN}" - -PACKAGE_ARCH_${PN} = "${MACHINE}" -PACKAGE_ARCH_${PN}-doc = "all" -PACKAGE_ARCH_${PN}-conf = "${MACHINE}" - -SRC_URI = "svn://hentges.net/altboot;module=trunk;rev=${SVN_REV}" - -S = "${WORKDIR}/trunk/" - -###################################################################################### - -FILES_${PN}-conf = "/etc/altboot*cfg" - -###################################################################################### - -MACHINE_DIR = "${MACHINE}" -MACHINE_DIR_nslu2be = "nslu2le" - -do_install() { - install -d ${D}/sbin - install -d ${D}/etc/altboot-menu - install -d ${D}/etc/altboot.rc - install -d ${D}/usr/share/doc/altboot - install -d ${D}/usr/share/sounds - - if test -d ${S}/${MACHINE_DIR} - then - install -m 0644 ${S}/${MACHINE_DIR}/altboot*.cfg ${D}/etc/ - else - install -m 0644 ${S}/altboot*.cfg ${D}/etc/ - fi - - install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds - install -m 0644 ${S}/altboot.func ${D}/etc - install -m 0644 ${S}/altboot.sbin ${D}/etc - install -m 0644 ${S}/altbootctl.conf ${D}/etc - install -m 0755 ${S}/init.altboot ${D}/sbin - install -m 0755 ${S}/altbootctl ${D}/sbin - - ln -s /sbin/init.altboot ${D}/sbin/altboot - - if test -d ${S}/${MACHINE_DIR}/altboot-menu - then - install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/*-* ${D}/etc/altboot-menu - - if test -d ${S}/${MACHINE_DIR}/altboot-menu/Advanced - then - install -d ${D}/etc/altboot-menu/Advanced - install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced - fi - else - install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu - - if test -d ${S}/altboot-menu/Advanced - then - install -d ${D}/etc/altboot-menu/Advanced - install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced - fi - fi - - if test -d ${S}/${MACHINE_DIR}/altboot.rc - then - install -m 0755 ${S}/${MACHINE_DIR}/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${S}/${MACHINE_DIR}/altboot.rc/*.txt ${D}/etc/altboot.rc - else - install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc - fi -} - -###################################################################################### - -do_configure() { - cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}-${PR}\"/" > ${S}/init.altboot_ - mv ${S}/init.altboot_ ${S}/init.altboot -} - -###################################################################################### - -pkg_postinst_${PN}() { - test -L /linuxrc && update-alternatives --install /linuxrc linuxrc /sbin/init.altboot 55 - - update-alternatives --install /sbin/init init /sbin/init.altboot 55 -} - -###################################################################################### - -pkg_postrm_${PN}() { - test -L /linuxrc && update_alternatives --remove linuxrc /sbin/init.altboot - - update-alternatives --remove init /sbin/init.altboot -} - diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR48.bb b/packages/altboot/altboot_1.1.1+wip-SVNR48.bb new file mode 100644 index 0000000000..244b8950aa --- /dev/null +++ b/packages/altboot/altboot_1.1.1+wip-SVNR48.bb @@ -0,0 +1,124 @@ +#! /bin/sh +# +# Copyright Matthias Hentges (c) 2006 +# License: MIT (see COPYING.MIT) +# +# Filename: altboot_1.0.5-rc2.bb +# Date: 21-Feb-06 + +DESCRIPTION = "The altboot bootmanager" +MAINTAINER = "Matthias 'CoreDump' Hentges " +HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" +LICENSE = "GPL" + +###################################################################################### + +RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools" +RRECOMMENDS_${PN}_append_akita = " kexec-tools" +RRECOMMENDS_${PN}_append_spitz = " kexec-tools kernel-module-jffs2" +RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools" + +RDEPENDS_${PN} = "${PN}-conf" +RDEPENDS_${PN}-conf = "${PN}" + +###################################################################################### + +SVN_REV = "48" +PR = "r0" + +###################################################################################### + +PACKAGES = "${PN}-conf ${PN}-doc ${PN}" + +PACKAGE_ARCH_${PN} = "${MACHINE}" +PACKAGE_ARCH_${PN}-doc = "all" +PACKAGE_ARCH_${PN}-conf = "${MACHINE}" + +SRC_URI = "svn://hentges.net/altboot;module=trunk;rev=${SVN_REV}" + +S = "${WORKDIR}/trunk/" + +###################################################################################### + +FILES_${PN}-conf = "/etc/altboot*cfg" + +###################################################################################### + +MACHINE_DIR = "${MACHINE}" +MACHINE_DIR_nslu2be = "nslu2le" + +do_install() { + install -d ${D}/sbin + install -d ${D}/etc/altboot-menu + install -d ${D}/etc/altboot.rc + install -d ${D}/usr/share/doc/altboot + install -d ${D}/usr/share/sounds + + if test -d ${S}/${MACHINE_DIR} + then + install -m 0644 ${S}/${MACHINE_DIR}/altboot*.cfg ${D}/etc/ + else + install -m 0644 ${S}/altboot*.cfg ${D}/etc/ + fi + + install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds + install -m 0644 ${S}/altboot.func ${D}/etc + install -m 0644 ${S}/altboot.sbin ${D}/etc + install -m 0644 ${S}/altbootctl.conf ${D}/etc + install -m 0755 ${S}/init.altboot ${D}/sbin + install -m 0755 ${S}/altbootctl ${D}/sbin + + ln -s /sbin/init.altboot ${D}/sbin/altboot + + if test -d ${S}/${MACHINE_DIR}/altboot-menu + then + install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/*-* ${D}/etc/altboot-menu + + if test -d ${S}/${MACHINE_DIR}/altboot-menu/Advanced + then + install -d ${D}/etc/altboot-menu/Advanced + install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + fi + else + install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu + + if test -d ${S}/altboot-menu/Advanced + then + install -d ${D}/etc/altboot-menu/Advanced + install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + fi + fi + + if test -d ${S}/${MACHINE_DIR}/altboot.rc + then + install -m 0755 ${S}/${MACHINE_DIR}/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${S}/${MACHINE_DIR}/altboot.rc/*.txt ${D}/etc/altboot.rc + else + install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc + fi +} + +###################################################################################### + +do_configure() { + cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}-${PR}\"/" > ${S}/init.altboot_ + mv ${S}/init.altboot_ ${S}/init.altboot +} + +###################################################################################### + +pkg_postinst_${PN}() { + test -L /linuxrc && update-alternatives --install /linuxrc linuxrc /sbin/init.altboot 55 + + update-alternatives --install /sbin/init init /sbin/init.altboot 55 +} + +###################################################################################### + +pkg_postrm_${PN}() { + test -L /linuxrc && update_alternatives --remove linuxrc /sbin/init.altboot + + update-alternatives --remove init /sbin/init.altboot +} + diff --git a/packages/altboot/altboot_svn.bb b/packages/altboot/altboot_svn.bb index ef77412d08..6de92bf420 100644 --- a/packages/altboot/altboot_svn.bb +++ b/packages/altboot/altboot_svn.bb @@ -15,7 +15,7 @@ LICENSE = "GPL" RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools" RRECOMMENDS_${PN}_append_akita = " kexec-tools" -RRECOMMENDS_${PN}_append_spitz = " kexec-tools" +RRECOMMENDS_${PN}_append_spitz = " kexec-tools kernel-module-jffs2" RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools" RDEPENDS_${PN} = "${PN}-conf" @@ -24,7 +24,7 @@ RDEPENDS_${PN}-conf = "${PN}" ###################################################################################### PV = "1.1.1+wip-${SRCDATE}" -PR = "r1" +PR = "r2" ###################################################################################### -- cgit v1.2.3 From 4ecdf75489db4f447420ebf293912c50a9ea7437 Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Thu, 17 May 2007 03:15:07 +0000 Subject: blueprobe 0.18: Fix for uclibc. Termios speed above 115k are not supported, so check for the defintion of the faster speeds before trying to use them. --- packages/blueprobe/blueprobe-0.18/uclibc-fix.patch | 30 ++++++++++++++++++++++ packages/blueprobe/blueprobe_0.18.bb | 5 ++-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 packages/blueprobe/blueprobe-0.18/uclibc-fix.patch (limited to 'packages') diff --git a/packages/blueprobe/blueprobe-0.18/uclibc-fix.patch b/packages/blueprobe/blueprobe-0.18/uclibc-fix.patch new file mode 100644 index 0000000000..34a1711e60 --- /dev/null +++ b/packages/blueprobe/blueprobe-0.18/uclibc-fix.patch @@ -0,0 +1,30 @@ +Uclibc doesn't define or support speeds above 115200. So check the existence +of the defines before allowing them to actually be used. + +Index: blueprobe-0.18/blueprobe.c +=================================================================== +--- blueprobe-0.18.orig/blueprobe.c 2006-10-12 20:33:01.000000000 +1000 ++++ blueprobe-0.18/blueprobe.c 2007-05-17 12:29:20.000000000 +1000 +@@ -25,14 +25,22 @@ + return B57600; + case 115200: + return B115200; ++#ifdef B230400 + case 230400: + return B230400; ++#endif ++#ifdef B460800 + case 460800: + return B460800; ++#endif ++#ifdef B921600 + case 921600: + return B921600; ++#endif ++#ifdef B1000000 + case 1000000: + return B1000000; ++#endif + default: + return B57600; + } diff --git a/packages/blueprobe/blueprobe_0.18.bb b/packages/blueprobe/blueprobe_0.18.bb index ca455401e0..5db1bc4337 100644 --- a/packages/blueprobe/blueprobe_0.18.bb +++ b/packages/blueprobe/blueprobe_0.18.bb @@ -1,5 +1,6 @@ require blueprobe.inc -PR = "r1" +PR = "r2" -SRC_URI += "file://h4000.patch;patch=1" +SRC_URI += "file://h4000.patch;patch=1 \ + file://uclibc-fix.patch;patch=1" -- cgit v1.2.3 From 8d9362d4ea1de600511064f798f53c47ced916f6 Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Thu, 17 May 2007 03:16:05 +0000 Subject: bluez-utils 3.9: Fix for uclibc. Termios speed above 115k are not supported, so check for the definition of the faster speeds before trying to use them. --- packages/bluez/bluez-utils/uclibc-fix.patch | 46 +++++++++++++++++++++++++++++ packages/bluez/bluez-utils_3.9.bb | 4 ++- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 packages/bluez/bluez-utils/uclibc-fix.patch (limited to 'packages') diff --git a/packages/bluez/bluez-utils/uclibc-fix.patch b/packages/bluez/bluez-utils/uclibc-fix.patch new file mode 100644 index 0000000000..6d4753c2e5 --- /dev/null +++ b/packages/bluez/bluez-utils/uclibc-fix.patch @@ -0,0 +1,46 @@ +Uclibc doesn't define or support speeds above 115200. So check the existence +of the defines before allowing them to actually be used. + +Index: bluez-utils-3.9/tools/hciattach.c +=================================================================== +--- bluez-utils-3.9.orig/tools/hciattach.c 2007-05-17 12:34:28.000000000 +1000 ++++ bluez-utils-3.9/tools/hciattach.c 2007-05-17 12:40:20.000000000 +1000 +@@ -105,22 +105,38 @@ + return B57600; + case 115200: + return B115200; ++#ifdef B230400 + case 230400: + return B230400; ++#endif ++#ifdef B460800 + case 460800: + return B460800; ++#endif ++#ifdef B500000 + case 500000: + return B500000; ++#endif ++#ifdef B576000 + case 576000: + return B576000; ++#endif ++#ifdef B921600 + case 921600: + return B921600; ++#endif ++#ifdef B1000000 + case 1000000: + return B1000000; ++#endif ++#ifdef B1152000 + case 1152000: + return B1152000; ++#endif ++#ifdef B1500000 + case 1500000: + return B1500000; ++#endif + default: + return B57600; + } diff --git a/packages/bluez/bluez-utils_3.9.bb b/packages/bluez/bluez-utils_3.9.bb index fba32e08e6..60b5becd99 100644 --- a/packages/bluez/bluez-utils_3.9.bb +++ b/packages/bluez/bluez-utils_3.9.bb @@ -2,9 +2,11 @@ require bluez-utils.inc PACKAGES =+ "${PN}-ciptool" +SRC_URI += "file://uclibc-fix.patch;patch=1" + FILES_${PN}-ciptool = "/bin/ciptool" RREPLACES_${PN}-ciptool = "bluez-utils-dbus-ciptool" RCONFLICTS_${PN}-ciptool = "bluez-utils-dbus-ciptool bluez-utils-nodbus" -PR = "r4" +PR = "r5" -- cgit v1.2.3 From 535777c244a0277d692e6651b36ab168c3eed58e Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Thu, 17 May 2007 04:15:09 +0000 Subject: grep 2.5.1: Fix for uclibc. Grep uses __mempcpy which glibc provides but uclibc doesn't. Since both glibc and uclibc provide the mempcpy version use that instead. --- packages/grep/grep-2.5.1/.mtn2git_empty | 0 packages/grep/grep-2.5.1/uclibc-fix.patch | 52 +++++++++++++++++++++++++++++++ packages/grep/grep-native_2.5.1.bb | 2 ++ packages/grep/grep_2.5.1.bb | 5 +-- 4 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 packages/grep/grep-2.5.1/.mtn2git_empty create mode 100644 packages/grep/grep-2.5.1/uclibc-fix.patch (limited to 'packages') diff --git a/packages/grep/grep-2.5.1/.mtn2git_empty b/packages/grep/grep-2.5.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/grep/grep-2.5.1/uclibc-fix.patch b/packages/grep/grep-2.5.1/uclibc-fix.patch new file mode 100644 index 0000000000..f67177f6ab --- /dev/null +++ b/packages/grep/grep-2.5.1/uclibc-fix.patch @@ -0,0 +1,52 @@ +Fix to use mempcpy instead of __mempcpy. This is needed for uclibc which +doesn't define __mempcpy only mempcpy. Since both uclibc and glibc have +mempcpy we'll just use that instead. + +Index: grep-2.5.1/intl/localealias.c +=================================================================== +--- grep-2.5.1.orig/intl/localealias.c 2002-03-14 00:39:06.000000000 +1100 ++++ grep-2.5.1/intl/localealias.c 2007-05-17 13:53:58.000000000 +1000 +@@ -65,7 +65,7 @@ + # define strcasecmp __strcasecmp + + # ifndef mempcpy +-# define mempcpy __mempcpy ++# error "mempcpy not detected" + # endif + # define HAVE_MEMPCPY 1 + # define HAVE___FSETLOCKING 1 +Index: grep-2.5.1/lib/getopt.c +=================================================================== +--- grep-2.5.1.orig/lib/getopt.c 2001-03-04 16:33:12.000000000 +1100 ++++ grep-2.5.1/lib/getopt.c 2007-05-17 13:51:44.000000000 +1000 +@@ -326,7 +326,7 @@ + nonoption_flags_len = nonoption_flags_max_len = 0; + else + { +- memset (__mempcpy (new_str, __getopt_nonoption_flags, ++ memset (mempcpy (new_str, __getopt_nonoption_flags, + nonoption_flags_max_len), + '\0', top + 1 - nonoption_flags_max_len); + nonoption_flags_max_len = top + 1; +@@ -437,7 +437,7 @@ + if (__getopt_nonoption_flags == NULL) + nonoption_flags_max_len = -1; + else +- memset (__mempcpy (__getopt_nonoption_flags, orig_str, len), ++ memset (mempcpy (__getopt_nonoption_flags, orig_str, len), + '\0', nonoption_flags_max_len - len); + } + } +Index: grep-2.5.1/lib/regex.c +=================================================================== +--- grep-2.5.1.orig/lib/regex.c 2001-04-03 04:04:45.000000000 +1000 ++++ grep-2.5.1/lib/regex.c 2007-05-17 13:51:48.000000000 +1000 +@@ -7842,7 +7842,7 @@ + if (msg_size > errbuf_size) + { + #if defined HAVE_MEMPCPY || defined _LIBC +- *((char *) __mempcpy (errbuf, msg, errbuf_size - 1)) = '\0'; ++ *((char *) mempcpy (errbuf, msg, errbuf_size - 1)) = '\0'; + #else + memcpy (errbuf, msg, errbuf_size - 1); + errbuf[errbuf_size - 1] = 0; diff --git a/packages/grep/grep-native_2.5.1.bb b/packages/grep/grep-native_2.5.1.bb index cacd675928..abc2ea46cb 100644 --- a/packages/grep/grep-native_2.5.1.bb +++ b/packages/grep/grep-native_2.5.1.bb @@ -9,3 +9,5 @@ do_stage () { install -m 755 src/egrep ${STAGING_BINDIR} install -m 755 src/fgrep ${STAGING_BINDIR} } + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/grep-${PV}" diff --git a/packages/grep/grep_2.5.1.bb b/packages/grep/grep_2.5.1.bb index 7bcabef167..6d184b8c4c 100644 --- a/packages/grep/grep_2.5.1.bb +++ b/packages/grep/grep_2.5.1.bb @@ -1,9 +1,10 @@ LICENSE = "GPL" SECTION = "console/utils" DESCRIPTION = "grep GNU utility" -PR = "r1" +PR = "r2" -SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2" +SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \ + file://uclibc-fix.patch;patch=1" inherit autotools -- cgit v1.2.3