From bad0b950a0ecded3a228fb6fb742f508b6af02a1 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Tue, 15 May 2007 09:11:25 +0000 Subject: gdb-cross: unify --- packages/gdb/gdb-cross.inc | 25 +++++++++++++++++++++++++ packages/gdb/gdb-cross_6.3.bb | 24 ++---------------------- packages/gdb/gdb-cross_6.4.bb | 24 +----------------------- packages/gdb/gdb-cross_6.6.bb | 25 ++----------------------- 4 files changed, 30 insertions(+), 68 deletions(-) create mode 100644 packages/gdb/gdb-cross.inc diff --git a/packages/gdb/gdb-cross.inc b/packages/gdb/gdb-cross.inc new file mode 100644 index 0000000000..33ca380464 --- /dev/null +++ b/packages/gdb/gdb-cross.inc @@ -0,0 +1,25 @@ +DESCRIPTION = "gdb - GNU debugger" +HOMEPAGE = "http://www.gnu.org/software/gdb/" +LICENSE="GPL" +SECTION = "base" +PRIORITY = "optional" +DEPENDS = "ncurses-native" + +SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz" + +S = "${WORKDIR}/gdb-${PV}" + +inherit autotools sdk + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gdb-${PV}" + +export CC_FOR_BUILD = "${BUILD_CC}" +export CXX_FOR_BUILD = "${BUILD_CXX}" +export CPP_FOR_BUILD = "${BUILD_CPP}" +export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" +export CXXFLAGS_FOR_BUILD = "${BUILD_CXXFLAGS}" +export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}" + +EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils' LDFLAGS='${BUILD_LDFLAGS}'" + +EXTRA_OECONF = "--with-curses --with-readline" diff --git a/packages/gdb/gdb-cross_6.3.bb b/packages/gdb/gdb-cross_6.3.bb index 5dd5cf5ac5..5419872bc9 100644 --- a/packages/gdb/gdb-cross_6.3.bb +++ b/packages/gdb/gdb-cross_6.3.bb @@ -1,30 +1,10 @@ -require gdb.inc - -SECTION = "base" -DEPENDS = "ncurses-native" - -inherit autotools sdk +require gdb-cross.inc PR = "r1" -S = "${WORKDIR}/gdb-${PV}" -SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \ - file://sim-install-makefile.patch;patch=1 \ +SRC_URI += "file://sim-install-makefile.patch;patch=1 \ file://sim-install-makefile-common.patch;patch=1" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gdb-${PV}" - -export CC_FOR_BUILD = "${BUILD_CC}" -export CXX_FOR_BUILD = "${BUILD_CXX}" -export CPP_FOR_BUILD = "${BUILD_CPP}" -export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" -export CXXFLAGS_FOR_BUILD = "${BUILD_CXXFLAGS}" -export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}" - -EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils' LDFLAGS='${BUILD_LDFLAGS}'" - -EXTRA_OECONF = "--with-curses --with-readline" - do_configure () { # override this function to avoid the autoconf/automake/aclocal/autoheader # calls for now diff --git a/packages/gdb/gdb-cross_6.4.bb b/packages/gdb/gdb-cross_6.4.bb index 3a108d568b..2f93e6b28e 100644 --- a/packages/gdb/gdb-cross_6.4.bb +++ b/packages/gdb/gdb-cross_6.4.bb @@ -1,26 +1,4 @@ -require gdb.inc - -SECTION = "base" -DEPENDS = "ncurses-native" - -SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz" - -S = "${WORKDIR}/gdb-${PV}" - -inherit autotools sdk - -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gdb-${PV}" - -export CC_FOR_BUILD = "${BUILD_CC}" -export CXX_FOR_BUILD = "${BUILD_CXX}" -export CPP_FOR_BUILD = "${BUILD_CPP}" -export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" -export CXXFLAGS_FOR_BUILD = "${BUILD_CXXFLAGS}" -export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}" - -EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils' LDFLAGS='${BUILD_LDFLAGS}'" - -EXTRA_OECONF = "--with-curses --with-readline" +require gdb-cross.inc do_configure () { # override this function to avoid the autoconf/automake/aclocal/autoheader diff --git a/packages/gdb/gdb-cross_6.6.bb b/packages/gdb/gdb-cross_6.6.bb index 03d9cda12c..f32ee32a5d 100644 --- a/packages/gdb/gdb-cross_6.6.bb +++ b/packages/gdb/gdb-cross_6.6.bb @@ -1,29 +1,8 @@ -LICENSE = "GPL" -DESCRIPTION = "gdb - GNU debugger" -SECTION = "base" -PRIORITY = "optional" -DEPENDS = "ncurses-native" - -inherit autotools sdk +require gdb-cross.inc PR = "r1" -S = "${WORKDIR}/gdb-${PV}" -SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \ - file://sim-install-makefile.patch;patch=1" - -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gdb-${PV}" - -export CC_FOR_BUILD = "${BUILD_CC}" -export CXX_FOR_BUILD = "${BUILD_CXX}" -export CPP_FOR_BUILD = "${BUILD_CPP}" -export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" -export CXXFLAGS_FOR_BUILD = "${BUILD_CXXFLAGS}" -export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}" - -EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils' LDFLAGS='${BUILD_LDFLAGS}'" - -EXTRA_OECONF = "--with-curses --with-readline" +SRC_URI += "file://sim-install-makefile.patch;patch=1" do_configure () { # override this function to avoid the autoconf/automake/aclocal/autoheader -- cgit v1.2.3 From 860acaa07277881258b8457d58c3af2fcc985e54 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Tue, 15 May 2007 09:47:39 +0000 Subject: gdb: unify --- packages/gdb/gdb.inc | 43 +++++++++++++++++++++++++++++++++++++++++++ packages/gdb/gdb_6.3.bb | 42 ------------------------------------------ packages/gdb/gdb_6.4.bb | 42 ------------------------------------------ packages/gdb/gdb_6.6.bb | 49 ++----------------------------------------------- 4 files changed, 45 insertions(+), 131 deletions(-) diff --git a/packages/gdb/gdb.inc b/packages/gdb/gdb.inc index 168e85f5ba..7eeda45081 100644 --- a/packages/gdb/gdb.inc +++ b/packages/gdb/gdb.inc @@ -3,3 +3,46 @@ HOMEPAGE = "http://www.gnu.org/software/gdb/" LICENSE="GPL" SECTION = "devel" PRIORITY = "optional" + +DEPENDS = "ncurses readline" + +PACKAGES =+ 'gdbserver ' +FILES_gdbserver = '${bindir}/gdbserver' + +inherit autotools gettext + +SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.bz2 \ +#FIXME file://uclibc.patch;patch=1 \ + file://kill_arm_map_symbols.patch;patch=1 \ + file://gdbserver-cflags-last.diff;patch=1;pnum=0" + +LDFLAGS_append = " -s" +export CC_FOR_BUILD = "${BUILD_CC}" +export CXX_FOR_BUILD = "${BUILD_CXX}" +export CPP_FOR_BUILD = "${BUILD_CPP}" +export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" +export CXXFLAGS_FOR_BUILD = "${BUILD_CXXFLAGS}" +export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}" +export CFLAGS_append=" -L${STAGING_LIBDIR}" +EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'" + +EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \ + --with-curses --disable-multilib --with-readline --disable-sim \ + --program-prefix=''" + +S = "${WORKDIR}/gdb-${PV}" +B = "${WORKDIR}/build-${TARGET_SYS}" + +do_configure () { +# override this function to avoid the autoconf/automake/aclocal/autoheader +# calls for now + (cd ${S} && gnu-configize) || die "failure in running gnu-configize" + CPPFLAGS="" oe_runconf +} + +do_install () { + make -C bfd/doc chew LDFLAGS= CFLAGS=-O2 + oe_runmake DESTDIR='${D}' install + install -d ${D}${bindir} + install -m 0755 gdb/gdbserver/gdbserver ${D}${bindir} +} diff --git a/packages/gdb/gdb_6.3.bb b/packages/gdb/gdb_6.3.bb index a1c9f9ede4..e5b055299a 100644 --- a/packages/gdb/gdb_6.3.bb +++ b/packages/gdb/gdb_6.3.bb @@ -1,46 +1,4 @@ require gdb.inc -DEPENDS = "ncurses readline" RDEPENDS_openmn = "libthread-db1" PR = "r2" - -PACKAGES =+ 'gdbserver ' -FILES_gdbserver = '${bindir}/gdbserver' - -inherit autotools gettext - -SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \ - file://uclibc.patch;patch=1 \ - file://kill_arm_map_symbols.patch;patch=1 \ - file://gdbserver-cflags-last.diff;patch=1;pnum=0" - -LDFLAGS_append = " -s" -export CC_FOR_BUILD = "${BUILD_CC}" -export CXX_FOR_BUILD = "${BUILD_CXX}" -export CPP_FOR_BUILD = "${BUILD_CPP}" -export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" -export CXXFLAGS_FOR_BUILD = "${BUILD_CXXFLAGS}" -export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}" -export CFLAGS_append=" -L${STAGING_LIBDIR}" -EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'" - -EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \ - --with-curses --disable-multilib --with-readline --disable-sim \ - --program-prefix=''" - -S = "${WORKDIR}/gdb-${PV}" -B = "${WORKDIR}/build-${TARGET_SYS}" - -do_configure () { -# override this function to avoid the autoconf/automake/aclocal/autoheader -# calls for now - (cd ${S} && gnu-configize) || die "failure in running gnu-configize" - CPPFLAGS="" oe_runconf -} - -do_install () { - make -C bfd/doc chew LDFLAGS= CFLAGS=-O2 - oe_runmake DESTDIR='${D}' install - install -d ${D}${bindir} - install -m 0755 gdb/gdbserver/gdbserver ${D}${bindir} -} diff --git a/packages/gdb/gdb_6.4.bb b/packages/gdb/gdb_6.4.bb index 0452fda1a1..e5d2b2af60 100644 --- a/packages/gdb/gdb_6.4.bb +++ b/packages/gdb/gdb_6.4.bb @@ -1,45 +1,3 @@ require gdb.inc -DEPENDS = "ncurses readline" RDEPENDS_openmn = "libthread-db1" - -PACKAGES =+ 'gdbserver ' -FILES_gdbserver = '${bindir}/gdbserver' - -inherit autotools gettext - -SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.bz2 \ -#FIXME: file://uclibc.patch;patch=1 \ - file://kill_arm_map_symbols.patch;patch=1 \ - file://gdbserver-cflags-last.diff;patch=1;pnum=0" - -LDFLAGS_append = " -s" -export CC_FOR_BUILD = "${BUILD_CC}" -export CXX_FOR_BUILD = "${BUILD_CXX}" -export CPP_FOR_BUILD = "${BUILD_CPP}" -export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" -export CXXFLAGS_FOR_BUILD = "${BUILD_CXXFLAGS}" -export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}" -export CFLAGS_append=" -L${STAGING_LIBDIR}" -EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'" - -EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \ - --with-curses --disable-multilib --with-readline --disable-sim \ - --program-prefix=''" - -S = "${WORKDIR}/gdb-${PV}" -B = "${WORKDIR}/build-${TARGET_SYS}" - -do_configure () { -# override this function to avoid the autoconf/automake/aclocal/autoheader -# calls for now - (cd ${S} && gnu-configize) || die "failure in running gnu-configize" - CPPFLAGS="" oe_runconf -} - -do_install () { - make -C bfd/doc chew LDFLAGS= CFLAGS=-O2 - oe_runmake DESTDIR='${D}' install - install -d ${D}${bindir} - install -m 0755 gdb/gdbserver/gdbserver ${D}${bindir} -} diff --git a/packages/gdb/gdb_6.6.bb b/packages/gdb/gdb_6.6.bb index 7be444012d..2c0f2c67d9 100644 --- a/packages/gdb/gdb_6.6.bb +++ b/packages/gdb/gdb_6.6.bb @@ -1,51 +1,6 @@ -DESCRIPTION = "gdb - GNU debugger" -HOMEPAGE = "http://www.gnu.org/software/gdb/" -LICENSE="GPL" -SECTION = "devel" -PRIORITY = "optional" -DEPENDS = "ncurses readline" -PR = "r1" +require gdb.inc -PACKAGES =+ 'gdbserver ' -FILES_gdbserver = '${bindir}/gdbserver' +PR = "r1" #only append it for glib, not for uclibcc RRECOMMENDS_gdb_append_linux = " glibc-thread-db " - -inherit autotools gettext - -SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \ -#FIXME file://uclibc.patch;patch=1 \ - file://kill_arm_map_symbols.patch;patch=1 \ - file://gdbserver-cflags-last.diff;patch=1;pnum=0" - -LDFLAGS_append = " -s" -export CC_FOR_BUILD = "${BUILD_CC}" -export CXX_FOR_BUILD = "${BUILD_CXX}" -export CPP_FOR_BUILD = "${BUILD_CPP}" -export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" -export CXXFLAGS_FOR_BUILD = "${BUILD_CXXFLAGS}" -export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}" -export CFLAGS_append=" -L${STAGING_LIBDIR}" -EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'" - -EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \ - --with-curses --disable-multilib --with-readline --disable-sim \ - --program-prefix=''" - -S = "${WORKDIR}/gdb-${PV}" -B = "${WORKDIR}/build-${TARGET_SYS}" - -do_configure () { -# override this function to avoid the autoconf/automake/aclocal/autoheader -# calls for now - (cd ${S} && gnu-configize) || die "failure in running gnu-configize" - CPPFLAGS="" oe_runconf -} - -do_install () { - make -C bfd/doc chew LDFLAGS= CFLAGS=-O2 - oe_runmake DESTDIR='${D}' install - install -d ${D}${bindir} - install -m 0755 gdb/gdbserver/gdbserver ${D}${bindir} -} -- cgit v1.2.3 From e36a372161f93068f9100ddb52ca5f0ceac7c7bc Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 16 May 2007 14:25:25 +0000 Subject: evince, pimlico: bump PR for latest icon-cache change --- packages/evince/evince_0.9.0.bb | 2 +- packages/pimlico/dates_0.4.2.bb | 2 ++ packages/pimlico/tasks_0.4.bb | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/evince/evince_0.9.0.bb b/packages/evince/evince_0.9.0.bb index 40494aa402..8689d1d371 100644 --- a/packages/evince/evince_0.9.0.bb +++ b/packages/evince/evince_0.9.0.bb @@ -4,7 +4,7 @@ SECTION = "x11/office" DEPENDS = "tiff libxt espgs gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring " RDEPENDS = "espgs " RRECOMMENDS = "gnome-vfs-plugin-file" -PR = "r0" +PR = "r1" inherit gnome pkgconfig gtk-icon-cache diff --git a/packages/pimlico/dates_0.4.2.bb b/packages/pimlico/dates_0.4.2.bb index d7f0185b86..51d3acc9ed 100644 --- a/packages/pimlico/dates_0.4.2.bb +++ b/packages/pimlico/dates_0.4.2.bb @@ -1,3 +1,5 @@ require dates.inc +PR = "r1" + SRC_URI = "http://projects.o-hand.com/sources/dates/dates-${PV}.tar.gz" diff --git a/packages/pimlico/tasks_0.4.bb b/packages/pimlico/tasks_0.4.bb index 9601abae47..391828430a 100644 --- a/packages/pimlico/tasks_0.4.bb +++ b/packages/pimlico/tasks_0.4.bb @@ -1,6 +1,6 @@ require tasks.inc -PR = "r1" +PR = "r2" SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz \ file://tasks-single.diff;patch=1" -- cgit v1.2.3 From 3a125d8470d9734d4813ad4d2b46971cf65a8b64 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 16 May 2007 15:35:22 +0000 Subject: powertop: update to 1.2 --- packages/powertop/powertop_1.0.bb | 17 ----------------- packages/powertop/powertop_1.2.bb | 9 +++++++++ 2 files changed, 9 insertions(+), 17 deletions(-) delete mode 100644 packages/powertop/powertop_1.0.bb create mode 100644 packages/powertop/powertop_1.2.bb diff --git a/packages/powertop/powertop_1.0.bb b/packages/powertop/powertop_1.0.bb deleted file mode 100644 index a06397bfc4..0000000000 --- a/packages/powertop/powertop_1.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "PowerTOP, a tool that helps you find what software is using the most power." -LICENSE = "GPLv2" - -SRC_URI = "http://www.linuxpowertop.org/download/powertop-${PV}.tar.gz" - -S = "${WORKDIR}/${PN}" - - -do_compile() { - ${CC} -Wall -W -O1 -g powertop.c config.c -o powertop -} - -do_install() { - install -d ${D}${bindir} - install -m 755 powertop ${D}${bindir} -} - diff --git a/packages/powertop/powertop_1.2.bb b/packages/powertop/powertop_1.2.bb new file mode 100644 index 0000000000..2f9c7e44b0 --- /dev/null +++ b/packages/powertop/powertop_1.2.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "PowerTOP, a tool that helps you find what software is using the most power." +HOMEPAGE = "http://www.linuxpowertop.org/" +LICENSE = "GPLv2" + +SRC_URI = "http://www.linuxpowertop.org/download/powertop-${PV}.tar.gz" + +do_install() { + oe_runmake install DESTDIR=${D} +} -- cgit v1.2.3 From e4419d398aef55be11ef328e77529478a1008b37 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 16 May 2007 19:39:56 +0000 Subject: gcc-cross-sdk 4.1.2: remove obsolete patch --- packages/gcc/gcc-cross-sdk_4.1.2.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/gcc/gcc-cross-sdk_4.1.2.bb b/packages/gcc/gcc-cross-sdk_4.1.2.bb index f3968f512d..c95c2e5953 100644 --- a/packages/gcc/gcc-cross-sdk_4.1.2.bb +++ b/packages/gcc/gcc-cross-sdk_4.1.2.bb @@ -27,7 +27,6 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 \ file://602-sdk-libstdc++-includes.patch;patch=1 \ file://740-sh-pr24836.patch;patch=1 \ file://800-arm-bigendian.patch;patch=1 \ - file://801-arm-bigendian-eabi.patch;patch=1 \ file://arm-nolibfloat.patch;patch=1 \ file://arm-softfloat.patch;patch=1 \ file://gcc41-configure.in.patch;patch=1 \ -- cgit v1.2.3 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 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 16ece46b049659d5fa1a9be61c955afa714fcb7a Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Thu, 17 May 2007 02:23:59 +0000 Subject: site: Update the site files to handle glibc having sys_siglist while uclibc doesn't. It was only enabled for arm and ixp4xx in older version of uclibc but not for anything else. Uclibc says it'll go away in uclibc soon and so shouldn't be used. --- site/arm-common | 3 --- site/common-glibc | 7 +++++++ site/common-uclibc | 6 ++++++ site/ix86-common | 3 --- site/mipsel-linux | 3 --- site/mipsel-linux-uclibc | 3 --- site/powerpc-common | 3 --- site/sh-common | 3 --- 8 files changed, 13 insertions(+), 18 deletions(-) diff --git a/site/arm-common b/site/arm-common index 6ed62fd459..d3c6f0a862 100644 --- a/site/arm-common +++ b/site/arm-common @@ -18,8 +18,6 @@ bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes} bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=missing} bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no} bash_cv_func_strcoll_broken=${bash_cv_func_strcoll_broken=no} -bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=yes} -bash_cv_sys_siglist=${bash_cv_sys_siglist=yes} bash_cv_dup2_broken=${bash_cv_dup2_broken=no} bash_cv_opendir_not_robust=${bash_cv_opendir_not_robust=no} bash_cv_type_rlimit=${bash_cv_type_rlimit=rlim_t} @@ -31,7 +29,6 @@ bash_cv_pgrp_pipe=${bash_cv_pgrp_pipe=no} bash_cv_job_control_missing=${bash_cv_job_control_missing=present} bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present} bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no} -ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=yes} # coreutils utils_cv_sys_open_max=${utils_cv_sys_open_max=1019} diff --git a/site/common-glibc b/site/common-glibc index 9358856856..13e82beba3 100644 --- a/site/common-glibc +++ b/site/common-glibc @@ -1,3 +1,10 @@ +# general +ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=yes} + +# bash +bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=yes} +bash_cv_sys_siglist=${bash_cv_sys_siglist=yes} + # clamav clamav_av_func_working_snprintf_long=${clamav_av_func_working_snprintf_long=yes} clamav_av_have_in_port_t=${clamav_av_have_in_port_t=yes} diff --git a/site/common-uclibc b/site/common-uclibc index e69de29bb2..a57abdbef8 100644 --- a/site/common-uclibc +++ b/site/common-uclibc @@ -0,0 +1,6 @@ +# general +ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=no} + +# bash +bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=no} +bash_cv_sys_siglist=${bash_cv_sys_siglist=no} diff --git a/site/ix86-common b/site/ix86-common index 96a36cf9c8..f114710ac9 100644 --- a/site/ix86-common +++ b/site/ix86-common @@ -59,8 +59,6 @@ bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes} bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=missing} bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no} bash_cv_func_strcoll_broken=${bash_cv_func_strcoll_broken=no} -bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=yes} -bash_cv_sys_siglist=${bash_cv_sys_siglist=yes} bash_cv_dup2_broken=${bash_cv_dup2_broken=no} bash_cv_opendir_not_robust=${bash_cv_opendir_not_robust=no} bash_cv_type_rlimit=${bash_cv_type_rlimit=rlim_t} @@ -72,7 +70,6 @@ bash_cv_pgrp_pipe=${bash_cv_pgrp_pipe=no} bash_cv_job_control_missing=${bash_cv_job_control_missing=present} bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present} bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no} -ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=yes} # clamav clamav_av_func_working_snprintf_long=${clamav_av_func_working_snprintf_long=yes} diff --git a/site/mipsel-linux b/site/mipsel-linux index 3412c112ed..8a6b919b99 100644 --- a/site/mipsel-linux +++ b/site/mipsel-linux @@ -12,8 +12,6 @@ bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes} bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=present} bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no} bash_cv_func_strcoll_broken=${bash_cv_func_strcoll_broken=no} -bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=yes} -bash_cv_sys_siglist=${bash_cv_sys_siglist=yes} bash_cv_dup2_broken=${bash_cv_dup2_broken=no} bash_cv_opendir_not_robust=${bash_cv_opendir_not_robust=no} bash_cv_type_rlimit=${bash_cv_type_rlimit=rlim_t} @@ -25,7 +23,6 @@ bash_cv_pgrp_pipe=${bash_cv_pgrp_pipe=no} bash_cv_job_control_missing=${bash_cv_job_control_missing=present} bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present} bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no} -ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=yes} # openssh ac_cv_have_accrights_in_msghdr=${ac_cv_have_accrights_in_msghdr=no} diff --git a/site/mipsel-linux-uclibc b/site/mipsel-linux-uclibc index 8ac42316dd..f36a30aa64 100644 --- a/site/mipsel-linux-uclibc +++ b/site/mipsel-linux-uclibc @@ -12,8 +12,6 @@ bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes} bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=present} bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no} bash_cv_func_strcoll_broken=${bash_cv_func_strcoll_broken=no} -bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=yes} -bash_cv_sys_siglist=${bash_cv_sys_siglist=yes} bash_cv_dup2_broken=${bash_cv_dup2_broken=no} bash_cv_opendir_not_robust=${bash_cv_opendir_not_robust=no} bash_cv_type_rlimit=${bash_cv_type_rlimit=rlim_t} @@ -25,7 +23,6 @@ bash_cv_pgrp_pipe=${bash_cv_pgrp_pipe=no} bash_cv_job_control_missing=${bash_cv_job_control_missing=present} bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present} bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no} -ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=yes} # openssh ac_cv_have_accrights_in_msghdr=${ac_cv_have_accrights_in_msghdr=no} diff --git a/site/powerpc-common b/site/powerpc-common index 9b2d990380..46dd9680fa 100644 --- a/site/powerpc-common +++ b/site/powerpc-common @@ -209,8 +209,6 @@ bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes} bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=missing} bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no} bash_cv_func_strcoll_broken=${bash_cv_func_strcoll_broken=no} -bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=yes} -bash_cv_sys_siglist=${bash_cv_sys_siglist=yes} bash_cv_dup2_broken=${bash_cv_dup2_broken=no} bash_cv_opendir_not_robust=${bash_cv_opendir_not_robust=no} bash_cv_type_rlimit=${bash_cv_type_rlimit=rlim_t} @@ -222,7 +220,6 @@ bash_cv_pgrp_pipe=${bash_cv_pgrp_pipe=no} bash_cv_job_control_missing=${bash_cv_job_control_missing=present} bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present} bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no} -ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=yes} # openssh ac_cv_have_broken_dirname=${ac_cv_have_broken_dirname='yes'} diff --git a/site/sh-common b/site/sh-common index 76c464da20..e8228fdb31 100644 --- a/site/sh-common +++ b/site/sh-common @@ -228,8 +228,6 @@ bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes} bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=missing} bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no} bash_cv_func_strcoll_broken=${bash_cv_func_strcoll_broken=no} -bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=yes} -bash_cv_sys_siglist=${bash_cv_sys_siglist=yes} bash_cv_dup2_broken=${bash_cv_dup2_broken=no} bash_cv_opendir_not_robust=${bash_cv_opendir_not_robust=no} bash_cv_type_rlimit=${bash_cv_type_rlimit=rlim_t} @@ -241,7 +239,6 @@ bash_cv_pgrp_pipe=${bash_cv_pgrp_pipe=no} bash_cv_job_control_missing=${bash_cv_job_control_missing=present} bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present} bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no} -ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=yes} # mono cv_mono_sizeof_sunpath=108 -- 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 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 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 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 From b693890af8ab12e32df75e920d711790fcbd7364 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 17 May 2007 08:02:40 +0000 Subject: gcc4-build-sdk: fix USE_NLS --- packages/gcc/gcc4-build-sdk.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/gcc/gcc4-build-sdk.inc b/packages/gcc/gcc4-build-sdk.inc index 86aa566e5c..b75e8a57c9 100644 --- a/packages/gcc/gcc4-build-sdk.inc +++ b/packages/gcc/gcc4-build-sdk.inc @@ -1,4 +1,6 @@ USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' +USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d )}' + STAGING_TARGET_INCDIR = "${STAGING_DIR}/${TARGET_SYS}/include" STAGING_TARGET_LIBDIR = "${STAGING_DIR}/${TARGET_SYS}/lib" -- cgit v1.2.3 From 9df6b90150a759edd06afae0ea5f362650cff8cd Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 17 May 2007 08:04:19 +0000 Subject: insane.bbclass: fix sdk builds --- classes/insane.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 385db31784..9f243c8c9a 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -273,7 +273,7 @@ def package_qa_check_arch(path,name,d): target_arch = bb.data.getVar('TARGET_ARCH', d, True) # FIXME: Cross package confuse this check, so just skip them - if bb.data.inherits_class('cross', d): + if bb.data.inherits_class('cross', d) or bb.data.inherits_class('sdk', d): return True # avoid following links to /usr/bin (e.g. on udev builds) -- cgit v1.2.3 From 0426f652aa877ed70e4a974a2be5048eebba4382 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 17 May 2007 08:31:26 +0000 Subject: sdk.bbclass: also package debug files --- classes/sdk.bbclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/classes/sdk.bbclass b/classes/sdk.bbclass index bcabbc79bd..834081fccc 100644 --- a/classes/sdk.bbclass +++ b/classes/sdk.bbclass @@ -20,7 +20,11 @@ prefix = "/usr/local/${SDK_NAME}" exec_prefix = "${prefix}" base_prefix = "${exec_prefix}" -FILES_${PN} = "${prefix}" +PACKAGES =+ "${PN}-dbg" +FILES_${PN} = "${prefix}" +FILES_${PN}-dbg += "${prefix}/bin/.debug \ + ${prefix}/sbin/.debug \ + " -- cgit v1.2.3 From 6c17a5707a13b8e875a78105d9d3a5a6f2ecc695 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 17 May 2007 08:39:03 +0000 Subject: binutils-cross-sdk: add 2.17.50.0.5 --- packages/binutils/binutils-cross-sdk_2.17.50.0.5.bb | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 packages/binutils/binutils-cross-sdk_2.17.50.0.5.bb diff --git a/packages/binutils/binutils-cross-sdk_2.17.50.0.5.bb b/packages/binutils/binutils-cross-sdk_2.17.50.0.5.bb new file mode 100644 index 0000000000..7d3bb6c09c --- /dev/null +++ b/packages/binutils/binutils-cross-sdk_2.17.50.0.5.bb @@ -0,0 +1,20 @@ +SECTION = "devel" +require binutils_${PV}.bb +inherit sdk +DEPENDS += "flex-native bison-native" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}" +EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \ + --program-prefix=${TARGET_PREFIX}" + +do_stage() { + : +} + +do_install () { + autotools_do_install + + # Install the libiberty header + install -d ${D}${includedir} + install -m 644 ${S}/include/ansidecl.h ${D}${includedir} + install -m 644 ${S}/include/libiberty.h ${D}${includedir} +} -- cgit v1.2.3 From b25fdfe1a1e400affa15dfc6c417c65651d9102d Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 17 May 2007 14:50:05 +0000 Subject: linux-handhelds-2.6: Update defconfigs, from defconfigman r230. * Also htcuniversal defconfig, contributed by tsdogs (#htc-linux). --- packages/linux/linux-handhelds-2.6/h3900/defconfig | 18 +- packages/linux/linux-handhelds-2.6/h4000/defconfig | 5 +- packages/linux/linux-handhelds-2.6/h5000/defconfig | 18 +- .../htcuniversal/.mtn2git_empty | 0 .../linux-handhelds-2.6/htcuniversal/defconfig | 1400 ++++++++++++++++++++ .../linux/linux-handhelds-2.6/hx4700/defconfig | 18 +- .../linux/linux-handhelds-2.6/magician/defconfig | 26 +- 7 files changed, 1467 insertions(+), 18 deletions(-) create mode 100644 packages/linux/linux-handhelds-2.6/htcuniversal/.mtn2git_empty create mode 100644 packages/linux/linux-handhelds-2.6/htcuniversal/defconfig diff --git a/packages/linux/linux-handhelds-2.6/h3900/defconfig b/packages/linux/linux-handhelds-2.6/h3900/defconfig index 0e3ab524b4..297be698cb 100644 --- a/packages/linux/linux-handhelds-2.6/h3900/defconfig +++ b/packages/linux/linux-handhelds-2.6/h3900/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh2 -# Sat May 12 20:38:51 2007 +# Thu May 17 14:41:30 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -669,7 +669,8 @@ CONFIG_TOUCHSCREEN_ASIC2=y # CONFIG_TOUCHSCREEN_ADC is not set # CONFIG_TOUCHSCREEN_ADC_DEBOUNCE is not set # CONFIG_TOUCHSCREEN_UCB1400 is not set -# CONFIG_INPUT_MISC is not set +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=m # # Hardware I/O ports @@ -1081,7 +1082,18 @@ CONFIG_RAMFS=y # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -# CONFIG_JFFS2_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_JFFS2_CMODE_NONE is not set +CONFIG_JFFS2_CMODE_PRIORITY=y +# CONFIG_JFFS2_CMODE_SIZE is not set # CONFIG_CRAMFS is not set # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set diff --git a/packages/linux/linux-handhelds-2.6/h4000/defconfig b/packages/linux/linux-handhelds-2.6/h4000/defconfig index 0d9df7a76b..3662bc062d 100644 --- a/packages/linux/linux-handhelds-2.6/h4000/defconfig +++ b/packages/linux/linux-handhelds-2.6/h4000/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh2 -# Sat May 12 20:38:53 2007 +# Thu May 17 14:41:32 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -745,7 +745,8 @@ CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_ADC is not set CONFIG_TOUCHSCREEN_ADC_DEBOUNCE=y # CONFIG_TOUCHSCREEN_UCB1400 is not set -# CONFIG_INPUT_MISC is not set +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=m # # Hardware I/O ports diff --git a/packages/linux/linux-handhelds-2.6/h5000/defconfig b/packages/linux/linux-handhelds-2.6/h5000/defconfig index 6038879254..20685be413 100644 --- a/packages/linux/linux-handhelds-2.6/h5000/defconfig +++ b/packages/linux/linux-handhelds-2.6/h5000/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh2 -# Sat May 12 20:38:57 2007 +# Thu May 17 14:41:35 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -683,7 +683,8 @@ CONFIG_TOUCHSCREEN_SAMCOP=y # CONFIG_TOUCHSCREEN_ADC is not set CONFIG_TOUCHSCREEN_ADC_DEBOUNCE=y # CONFIG_TOUCHSCREEN_UCB1400 is not set -# CONFIG_INPUT_MISC is not set +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=m # # Hardware I/O ports @@ -1073,7 +1074,18 @@ CONFIG_RAMFS=y # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -# CONFIG_JFFS2_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_JFFS2_CMODE_NONE is not set +CONFIG_JFFS2_CMODE_PRIORITY=y +# CONFIG_JFFS2_CMODE_SIZE is not set # CONFIG_CRAMFS is not set # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set diff --git a/packages/linux/linux-handhelds-2.6/htcuniversal/.mtn2git_empty b/packages/linux/linux-handhelds-2.6/htcuniversal/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig b/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig new file mode 100644 index 0000000000..eaffec6517 --- /dev/null +++ b/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig @@ -0,0 +1,1400 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.21-hh2 +# Thu May 17 14:41:38 2007 +# +CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_TIME=y +CONFIG_MMU=y +# CONFIG_NO_IOPORT is not set +CONFIG_GENERIC_HARDIRQS=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ZONE_DMA=y +CONFIG_ARCH_MTD_XIP=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_IPC_NS is not set +CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set +# CONFIG_AUDIT is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_SYSFS_DEPRECATED=y +# CONFIG_RELAY is not set +# CONFIG_BLK_DEV_INITRD is not set +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_EMBEDDED=y +# CONFIG_UID16 is not set +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_SLAB=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y + +# +# Block layer +# +CONFIG_BLOCK=y +# CONFIG_LBD is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +# CONFIG_IOSCHED_CFQ is not set +CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="anticipatory" + +# +# System Type +# +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_PNX4008 is not set +CONFIG_ARCH_PXA=y +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_OMAP is not set +# CONFIG_BOARD_IRQ_MAP_SMALL is not set +CONFIG_BOARD_IRQ_MAP_BIG=y + +# +# Intel PXA2xx Implementations +# +# CONFIG_ARCH_LUBBOCK is not set +# CONFIG_MACH_LOGICPD_PXA270 is not set +# CONFIG_MACH_MAINSTONE is not set +# CONFIG_ARCH_PXA_IDP is not set +# CONFIG_TOSHIBA_TMIO_OHCI is not set +# CONFIG_ARCH_ESERIES is not set +# CONFIG_MACH_A620 is not set +# CONFIG_MACH_A716 is not set +# CONFIG_MACH_A730 is not set +# CONFIG_ARCH_H1900 is not set +# CONFIG_ARCH_H2200 is not set +# CONFIG_MACH_H3900 is not set +# CONFIG_MACH_H4000 is not set +# CONFIG_MACH_H4700 is not set +# CONFIG_MACH_HX2750 is not set +# CONFIG_ARCH_H5400 is not set +# CONFIG_MACH_HIMALAYA is not set +CONFIG_MACH_HTCUNIVERSAL=y +CONFIG_HTCUNIVERSAL_CORE=y +CONFIG_HTCUNIVERSAL_UDC=y +CONFIG_HTCUNIVERSAL_POWER=y +CONFIG_HTCUNIVERSAL_BACKLIGHT=y +CONFIG_HTCUNIVERSAL_LCD=y +CONFIG_HTCUNIVERSAL_TS2=y +CONFIG_HTCUNIVERSAL_BUTTONS=y +CONFIG_HTCUNIVERSAL_BLUETOOTH=m +CONFIG_HTCUNIVERSAL_ASIC3_LEDS=y +CONFIG_HTCUNIVERSAL_PHONE=m +CONFIG_HTCUNIVERSAL_AK4641=m +# CONFIG_MACH_HTCALPINE is not set +# CONFIG_MACH_MAGICIAN is not set +# CONFIG_MACH_HTCAPACHE is not set +# CONFIG_MACH_BLUEANGEL is not set +# CONFIG_MACH_HTCBEETLES is not set +# CONFIG_MACH_HW6900 is not set +# CONFIG_MACH_HTCATHENA is not set +# CONFIG_ARCH_AXIMX3 is not set +# CONFIG_ARCH_AXIMX5 is not set +# CONFIG_MACH_X30 is not set +# CONFIG_MACH_X50 is not set +# CONFIG_ARCH_ROVERP1 is not set +# CONFIG_ARCH_ROVERP5P is not set +# CONFIG_MACH_XSCALE_PALMLD is not set +# CONFIG_MACH_T3XSCALE is not set +# CONFIG_MACH_RECON is not set +# CONFIG_PXA_SHARPSL is not set +# CONFIG_MACH_TRIZEPS4 is not set +CONFIG_PXA27x=y +# CONFIG_PXA27x_VOLTAGE is not set + +# +# Linux As Bootloader +# +# CONFIG_LAB is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_XSCALE=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5T=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_OUTER_CACHE is not set +CONFIG_IWMMXT=y +CONFIG_XSCALE_PMU=y + +# +# Bus support +# + +# +# PCCARD (PCMCIA/CardBus) support +# +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +CONFIG_PREEMPT=y +CONFIG_NO_IDLE_HZ=y +CONFIG_HZ=100 +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="keepinitrd" +# CONFIG_XIP_KERNEL is not set +CONFIG_KEXEC=y + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_DEBUG=y +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_STAT_DETAILS=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set +CONFIG_CPU_FREQ_GOV_USERSPACE=y +# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_FREQ_PXA=y +CONFIG_PXA25x_ALTERNATE_FREQS=y + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_FASTFPE is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set + +# +# Power management options +# +CONFIG_PM=y +# CONFIG_PM_LEGACY is not set +# CONFIG_PM_DEBUG is not set +CONFIG_DPM_DEBUG=y +CONFIG_PM_SYSFS_DEPRECATED=y +CONFIG_APM_EMULATION=y + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +# CONFIG_NET_KEY is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_PNP=y +# CONFIG_IP_PNP_DHCP is not set +# CONFIG_IP_PNP_BOOTP is not set +# CONFIG_IP_PNP_RARP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_IP_MROUTE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_INET_DIAG is not set +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set + +# +# IP: Virtual Server Configuration +# +# CONFIG_IP_VS is not set +# CONFIG_IPV6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +# CONFIG_NETWORK_SECMARK is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set + +# +# Core Netfilter Configuration +# +# CONFIG_NETFILTER_NETLINK is not set +# CONFIG_NF_CONNTRACK_ENABLED is not set +# CONFIG_NETFILTER_XTABLES is not set + +# +# IP: Netfilter Configuration +# +# CONFIG_IP_NF_QUEUE is not set +# CONFIG_IP_NF_IPTABLES is not set +# CONFIG_IP_NF_ARPTABLES is not set + +# +# DCCP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +CONFIG_IRDA=y + +# +# IrDA protocols +# +CONFIG_IRLAN=y +# CONFIG_IRNET is not set +CONFIG_IRCOMM=y +# CONFIG_IRDA_ULTRA is not set + +# +# IrDA options +# +# CONFIG_IRDA_CACHE_LAST_LSAP is not set +# CONFIG_IRDA_FAST_RR is not set +CONFIG_IRDA_DEBUG=y + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=y + +# +# Dongle support +# +# CONFIG_DONGLE is not set + +# +# Old SIR device drivers +# +# CONFIG_IRPORT_SIR is not set + +# +# Old Serial dongle support +# + +# +# FIR device drivers +# +CONFIG_PXA_FICP=y +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +# CONFIG_BT_HCIVHCI is not set +# CONFIG_IEEE80211 is not set +CONFIG_WIRELESS_EXT=y + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_CONCAT is not set +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +# CONFIG_MTD_CMDLINE_PARTS is not set +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +# CONFIG_MTD_CHAR is not set +# CONFIG_MTD_BLKDEVS is not set +# CONFIG_MTD_BLOCK is not set +# CONFIG_MTD_BLOCK_RO is not set +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_SHARP_SL is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set + +# +# NAND Flash Device Drivers +# +# CONFIG_MTD_NAND is not set + +# +# OneNAND Flash Device Drivers +# +# CONFIG_MTD_ONENAND is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# +# CONFIG_PNPACPI is not set + +# +# Block devices +# +# CONFIG_BLK_DEV_COW_COMMON is not set +# CONFIG_BLK_DEV_LOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_RAM is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set + +# +# ATA/ATAPI/MFM/RLL support +# +# CONFIG_IDE is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +# CONFIG_SCSI is not set +# CONFIG_SCSI_NETLINK is not set + +# +# Serial ATA (prod) and Parallel ATA (experimental) drivers +# +# CONFIG_ATA is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# I2O device support +# + +# +# Network device support +# +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set + +# +# PHY device support +# + +# +# Ethernet (10 or 100Mbit) +# +# CONFIG_NET_ETHERNET is not set + +# +# Ethernet (1000 Mbit) +# + +# +# Ethernet (10000 Mbit) +# + +# +# Token Ring devices +# + +# +# Wireless LAN (non-hamradio) +# +CONFIG_NET_RADIO=y +# CONFIG_NET_WIRELESS_RTNETLINK is not set + +# +# Obsolete Wireless cards support (pre-802.11) +# +# CONFIG_STRIP is not set +# CONFIG_HOSTAP is not set +CONFIG_ACX=m +CONFIG_ACX_MEM=y +CONFIG_ACX_HTCUNIVERSAL=m + +# +# Wan interfaces +# +# CONFIG_WAN is not set +CONFIG_PPP=m +# CONFIG_PPP_MULTILINK is not set +# CONFIG_PPP_FILTER is not set +CONFIG_PPP_ASYNC=m +# CONFIG_PPP_SYNC_TTY is not set +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +# CONFIG_PPPOE is not set +# CONFIG_SLIP is not set +CONFIG_SLHC=m +# CONFIG_SHAPER is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +#