diff options
37 files changed, 187 insertions, 291 deletions
diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass index 5d6d5649c7..80e6e32af7 100644 --- a/classes/siteinfo.bbclass +++ b/classes/siteinfo.bbclass @@ -40,7 +40,8 @@ def get_siteinfo_list(d): "mipsel-linux": "endian-little bit-32 common-glibc",\ "mipsel-linux-uclibc": "endian-little bit-32 common-uclibc",\ "powerpc-darwin": "endian-big bit-32 common-darwin",\ - "powerpc-linux": "endian-big bit-32 common-glibc",\ + "ppc-linux": "endian-big bit-32 common-glibc",\ + "powerpc-linux": "endian-big bit-32 common-glibc",\ "powerpc-linux-uclibc": "endian-big bit-32 common-uclibc",\ "sh3-linux": "endian-little bit-32 common-glibc sh-common",\ "sh4-linux": "endian-little bit-32 common-glibc sh-common",\ diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf index 925096813d..59123fd6b5 100644 --- a/conf/distro/debianslug.conf +++ b/conf/distro/debianslug.conf @@ -2,6 +2,10 @@ #@NAME: DebianSlug #@DESCRIPTION: DebianSlug Linux Distribution for the NSLU2 -SLUGOS_DISTRO = "debianslug" +DISTRO_NAME = "DebianSlug" +IMAGE_BASENAME = "debianslug" +TARGET_ARCH = "arm" +ARM_INSTRUCTION_SET = "arm" +TARGET_OS = "linux" -require conf/distro/slugosle.conf +require conf/distro/slugos.conf diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index aef4abf55d..9efe1d5d90 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -46,4 +46,4 @@ DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove thi # We want images supporting the following features (for task-base) DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost pci" -DISTRO_FEATURES_nslu2le = "nfs smbfs alsa bluetooth ext2 usbhost pci" +DISTRO_FEATURES_nslu2 = "nfs smbfs alsa bluetooth ext2 usbhost pci" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 52b9e5bef5..a26a069fa0 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -23,9 +23,7 @@ DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # DISTRO_FEED ?= "${SLUGOS_VERSION}-${DISTRO_TYPE}" DISTRO_FEED ?= "unstable" -SLUGOS_DISTRO ?= "slugos" - -IMAGE_BASENAME = "${SLUGOS_DISTRO}" +IMAGE_BASENAME = "${@['slugos${SITEINFO_ENDIANESS}', 'ucslugc'][bb.data.getVar('TARGET_OS', d, 1) == 'linux-uclibc']}" # The following need not be set, the defaults should be adequate #USE_NLS = "no" or "yes" @@ -41,9 +39,7 @@ TARGET_FPU = "soft" # glib-2.0 builds require USE_NLS to be overridden USE_NLS_glib-2.0 = "yes" -INHERIT += "package_ipk debian" - -DISTRO_BASE = ":slugos" +INHERIT += "package_ipk debian multimachine" # FULL_OPTIMIZATION # Optimization settings. Os works fine and is significantly better than O2. @@ -64,8 +60,8 @@ FULL_OPTIMIZATION = "-Os -fomit-frame-pointer -frename-registers \ # (such as a local feed) can be defined in local.conf #---------------------------------------------------------------------------------- # -FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/${SLUGOS_DISTRO}/cross/${DISTRO_FEED}" -FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/${SLUGOS_DISTRO}/native/${DISTRO_FEED}" +FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/${IMAGE_BASENAME}/cross/${DISTRO_FEED}" +FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/${IMAGE_BASENAME}/native/${DISTRO_FEED}" #---------------------------------------------------------------------------------- # FIRMWARE CONFIGURATION diff --git a/conf/distro/openslug-native.conf b/conf/distro/openslug-native.conf index 2bcf6dd980..ac77532697 100644 --- a/conf/distro/openslug-native.conf +++ b/conf/distro/openslug-native.conf @@ -1,9 +1,7 @@ -SLUGOS_DISTRO = "openslug" - # Our build host is armeb, not armv5eb that the kernel reports BUILD_ARCH = "armeb" -require conf/distro/slugosbe.conf +require conf/distro/openslug.conf # Corresponding packages should be in openslug-native.bb, # currently missing: ipkg-utils libtool quilt pkgconfig diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index 943ce1a985..f03c4f653e 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -2,6 +2,10 @@ #@NAME: OpenSlug #@DESCRIPTION: OpenSlug Linux Distribution for the NSLU2 -SLUGOS_DISTRO = "openslug" +DISTRO_NAME = "OpenSlug" +IMAGE_BASENAME = "openslug" +TARGET_ARCH = "armeb" +ARM_INSTRUCTION_SET = "arm" +TARGET_OS = "linux" -require conf/distro/slugosbe.conf +require conf/distro/slugos.conf diff --git a/conf/distro/slugosbe.conf b/conf/distro/slugos.conf index 4f664c58c3..32b047aeae 100644 --- a/conf/distro/slugosbe.conf +++ b/conf/distro/slugos.conf @@ -1,17 +1,15 @@ #@TYPE: Distribution -#@NAME: SlugOS/BE -#@DESCRIPTION: SlugOS/BE Linux Distribution for the NSLU2 +#@NAME: SlugOS +#@DESCRIPTION: SlugOS Linux Distribution for the NSLU2 #---------------------------------------------------------------------------------- # STANDARD SlugOS/BE DEFINITIONS #---------------------------------------------------------------------------------- -DISTRO_NAME = "SlugOS/BE" +DISTRO_NAME = "SlugOS" # DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # DISTRO_FEED = "unstable" DISTRO_TYPE = "beta" -SLUGOS_DISTRO ?= "slugosbe" - -TARGET_ARCH = "armeb" +TARGET_ARCH ?= "armeb" ARM_INSTRUCTION_SET = "arm" TARGET_OS = "linux" @@ -25,14 +23,13 @@ TARGET_OS = "linux" # not absolutely required for boot. # NOTE: only jffs2 support is an absolute requirement of boot, even # the ext2/ext3 support is optional! -SLUGOSBE_EXT2_PROGS = "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck e2fsprogs-badblocks" +SLUGOS_EXT2_PROGS = "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck e2fsprogs-badblocks" # The standard firmware contents and additional packages built as requirements -# of the firmware are defined here in SLUGOSBE_STANDARD_RDEPENDS and -# SLUGOSBE_STANDARD_DEPENDS respectively. -SLUGOSBE_STANDARD_RDEPENDS = "" +# of the firmware are defined here in SLUGOS_STANDARD_RDEPENDS. +SLUGOS_STANDARD_RDEPENDS = "" -# Support for a variety of file systems is built in to the slugosbe +# Support for a variety of file systems is built in to the slugos # image, programs to format disks with these file systems may be # added or removed. By default ext2 and ext3 support # is included by the following lines. @@ -40,12 +37,12 @@ SLUGOSBE_STANDARD_RDEPENDS = "" # These lines add support for formatting ext2 and ext3 file systems # on a hard disk attached to the NSLU2. ext3 is the standard Linux # file system. -SLUGOSBE_STANDARD_RDEPENDS += "${SLUGOSBE_EXT2_PROGS}" +SLUGOS_STANDARD_RDEPENDS += "${SLUGOS_EXT2_PROGS}" # These lines add support for an X/Y/ZModem package called lrzsz # (this is of use for people with modified NSLU2 hardware which # supports a serial port.) -SLUGOSBE_STANDARD_RDEPENDS += "lrzsz" +SLUGOS_STANDARD_RDEPENDS += "lrzsz" # Filesystem selection. Adding entries here adds the module to the # image. The module must be built as part of nslu2-kernel (i.e. it @@ -63,7 +60,7 @@ SLUGOSBE_STANDARD_RDEPENDS += "lrzsz" # NOTE: removing kernel-module-nfs from this list will prevent NFS # boot (however you can do a simple flash file system boot - no # attached disk - and install the nfs modules from ssh.) -SLUGOSBE_STANDARD_RDEPENDS += "\ +SLUGOS_STANDARD_RDEPENDS += "\ kernel-module-ext2 \ kernel-module-jbd \ kernel-module-ext3 \ @@ -76,24 +73,24 @@ kernel-module-nls-utf8 \ " # Add daemon required for HW RNG support -SLUGOSBE_STANDARD_RDEPENDS += "\ +SLUGOS_STANDARD_RDEPENDS += "\ rng-tools \ " # Add modules required for usb support -SLUGOSBE_STANDARD_RDEPENDS += "\ +SLUGOS_STANDARD_RDEPENDS += "\ kernel-module-ohci-hcd \ kernel-module-uhci-hcd \ " # Add modules required for IDE support -SLUGOSBE_STANDARD_RDEPENDS += "\ +SLUGOS_STANDARD_RDEPENDS += "\ kernel-module-libata \ kernel-module-pata-artop \ " # Add modules required for Network support -SLUGOSBE_STANDARD_RDEPENDS += "\ +SLUGOS_STANDARD_RDEPENDS += "\ kernel-module-via-velocity \ " @@ -107,9 +104,7 @@ kernel-module-via-velocity \ # The 'standard' values are the defaults for the 'extra' packages added # to the firmware image. None of these things are requirements to have # a bootable, useable, system however they *are* expected to be present -# in SlugOS/BE - see nslu2-bag for a more minimal configuration and some -# more instructions about how to make a non-slugosbe image. -SLUGOSBE_EXTRA_RDEPENDS ?= "" -SLUGOS_EXTRA_RDEPENDS = "${SLUGOSBE_STANDARD_RDEPENDS} ${SLUGOSBE_EXTRA_RDEPENDS}" +# in SlugOS. +SLUGOS_EXTRA_RDEPENDS = "${SLUGOS_STANDARD_RDEPENDS}" require conf/distro/include/slugos.inc diff --git a/conf/distro/slugosle.conf b/conf/distro/slugosle.conf deleted file mode 100644 index e703fe4553..0000000000 --- a/conf/distro/slugosle.conf +++ /dev/null @@ -1,115 +0,0 @@ -#@TYPE: Distribution -#@NAME: SlugOS/LE -#@DESCRIPTION: SlugOS/LE Linux Distribution for the NSLU2 - -#---------------------------------------------------------------------------------- -# STANDARD SlugOS/LE DEFINITIONS -#---------------------------------------------------------------------------------- -DISTRO_NAME = "SlugOS/LE" -# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" -# DISTRO_FEED = "unstable" -DISTRO_TYPE = "beta" -SLUGOS_DISTRO ?= "slugosle" - -TARGET_ARCH = "arm" -ARM_INSTRUCTION_SET = "arm" -TARGET_OS = "linux" - -#---------------------------------------------------------------------------------- -# FIRMWARE CONFIGURATION -#---------------------------------------------------------------------------------- -# EXTRA PACKAGES -# -------------- -# Filesystem support modules are listed in here for easy removal, -# as is the lrzsz serial package and other kernel modules which are -# not absolutely required for boot. -# NOTE: only jffs2 support is an absolute requirement of boot, even -# the ext2/ext3 support is optional! -SLUGOSLE_EXT2_PROGS = "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck e2fsprogs-badblocks" - -# The standard firmware contents and additional packages built as requirements -# of the firmware are defined here in SLUGOSLE_STANDARD_RDEPENDS and -# SLUGOSLE_STANDARD_DEPENDS respectively. -SLUGOSLE_STANDARD_RDEPENDS = "" - -# Support for a variety of file systems is built in to the slugosle -# image, programs to format disks with these file systems may be -# added or removed. By default ext2 and ext3 support -# is included by the following lines. -# -# These lines add support for formatting ext2 and ext3 file systems -# on a hard disk attached to the NSLU2. ext3 is the standard Linux -# file system. -SLUGOSLE_STANDARD_RDEPENDS += "${SLUGOSLE_EXT2_PROGS}" - -# These lines add support for an X/Y/ZModem package called lrzsz -# (this is of use for people with modified NSLU2 hardware which -# supports a serial port.) -SLUGOSLE_STANDARD_RDEPENDS += "lrzsz" - -# Filesystem selection. Adding entries here adds the module to the -# image. The module must be built as part of nslu2-kernel (i.e. it -# must be specified as a module in the defconfig file). The NLS -# support charset modules must be given explicitly and must match -# the codepage/iocharset and NLS handling for the file systems which -# require them. The installed lanugage set is minimal but sufficient -# for any file system (since it uses utf8). See -# http://www.nslu2-linux.orgwiki/HowTo/MountFATFileSystems -# for more information on the language behaviour of the DOS file -# systems. -# -# KERNEL LEVEL FILE SYSTEM SUPPORT -# -------------------------------- -# NOTE: removing kernel-module-nfs from this list will prevent NFS -# boot (however you can do a simple flash file system boot - no -# attached disk - and install the nfs modules from ssh.) -SLUGOSLE_STANDARD_RDEPENDS += "\ -kernel-module-ext2 \ -kernel-module-jbd \ -kernel-module-ext3 \ -kernel-module-vfat \ -kernel-module-ntfs \ -kernel-module-isofs \ -kernel-module-udf \ -kernel-module-nls-cp437 \ -kernel-module-nls-utf8 \ -" - -# Add daemon required for HW RNG support -SLUGOSLE_STANDARD_RDEPENDS += "\ -rng-tools \ -" - -# Add modules required for usb support -SLUGOSLE_STANDARD_RDEPENDS += "\ -kernel-module-ohci-hcd \ -kernel-module-uhci-hcd \ -" - -# Add modules required for IDE support -SLUGOSLE_STANDARD_RDEPENDS += "\ -kernel-module-libata \ -kernel-module-pata-artop \ -" - -# Add modules required for Network support -OPENSLUG_STANDARD_RDEPENDS += "\ -kernel-module-via-velocity \ -" - -# This documents other file systems which are built but not installed -# by default in the flash image. -# -# kernel-module-msdos - mounts a FAT file system without long file names -# (use kernel-module-vfat, it shows the long names -# if present.) - -# The 'standard' values are the defaults for the 'extra' packages added -# to the firmware image. None of these things are requirements to have -# a bootable, useable, system however they *are* expected to be present -# in Slugosle - see slugos-lag for a more minimal configuration and some -# more instructions about how to make a non-slugosle image. -SLUGOSLE_EXTRA_RDEPENDS ?= "" -SLUGOS_EXTRA_RDEPENDS = "${SLUGOSLE_STANDARD_RDEPENDS} ${SLUGOSLE_EXTRA_RDEPENDS}" - -require conf/distro/include/slugos.inc diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf index 526b8f11b4..8b64746fe3 100644 --- a/conf/distro/ucslugc.conf +++ b/conf/distro/ucslugc.conf @@ -3,11 +3,7 @@ #@DESCRIPTION: UcSlugC Linux Distribution for the NSLU2 DISTRO_NAME = "UcSlugC" -# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" -# DISTRO_FEED = "unstable" -DISTRO_TYPE = "beta" -SLUGOS_DISTRO = "ucslugc" - +IMAGE_BASENAME = "ucslugc" TARGET_ARCH = "armeb" ARM_INSTRUCTION_SET = "thumb" TARGET_OS = "linux-uclibc" diff --git a/conf/machine/include/ixp4xx.conf b/conf/machine/include/ixp4xx.conf index 582306bea0..1bab2f5fc7 100644 --- a/conf/machine/include/ixp4xx.conf +++ b/conf/machine/include/ixp4xx.conf @@ -8,36 +8,6 @@ EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n" PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel" -#------------------------------------------------------------------------------- -# INPUTS -#------------------------------------------------------------------------------- -# conf/${DISTRO}.conf is included after this file and should be used to modify -# variables identified as 'INPUTS' to the required values for the DISTRO, this -# will cause the board specific settings (which depend for the most part on the -# exact CPU used) to be set correctly within this file. The results are the -# variables identifies here as 'OUTPUTS' -# -#variable = "default" -# <possible values> -# description - -DISTRO_BASE = "" -# "" ":<base>" -# If given this must be the name of a 'distro' to add to the bitbake OVERRIDES -# after ${DISTRO}, this allows different distros to share a common base of -# overrides. The value given must include a leading ':' or chaos will result. - -#------------------------------------------------------------------------------- -# OUTPUTS -#------------------------------------------------------------------------------- - -#OVERRIDES -# The standard ':' separated list of overrides used by bitbake - see the -# basic setting in bitbake.conf. This list is based on that used for the -# standard setting however :<base> will be -# inserted at appropriate points if a base distro is enabled in the inputs. -OVERRIDES = "local:${MACHINE}:ixp4xx:${DISTRO}${DISTRO_BASE}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast" - require conf/machine/include/tune-xscale.conf require conf/machine/include/tune-thumb.conf diff --git a/conf/machine/ixp4xx.conf b/conf/machine/ixp4xx.conf index 3397d170f8..0a1e54c324 100644 --- a/conf/machine/ixp4xx.conf +++ b/conf/machine/ixp4xx.conf @@ -2,4 +2,4 @@ #@NAME: Generic IXP4XX kernel #@DESCRIPTION: Machine configuration for a generic ixp4xx board -require conf/machine/include/ixp4xx.conf +MACHINE_CHECK := ${@bb.fatal('You must set MACHINE to ixp4xxle or ixp4xxbe.')} diff --git a/conf/machine/ixp4xxbe.conf b/conf/machine/ixp4xxbe.conf index d9737c9964..f208852d3a 100644 --- a/conf/machine/ixp4xxbe.conf +++ b/conf/machine/ixp4xxbe.conf @@ -3,10 +3,8 @@ #@DESCRIPTION: Machine configuration for a generic ixp4xx board in big-endian mode TARGET_ARCH = "armeb" -# PACKAGE_ARCH is set in tune-xscale.conf -PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb" -MACHINE_ARCH = "ixp4xxbe" +PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb" require conf/machine/include/ixp4xx.conf diff --git a/conf/machine/ixp4xxle.conf b/conf/machine/ixp4xxle.conf index 4747fa50c4..d39fa1f603 100644 --- a/conf/machine/ixp4xxle.conf +++ b/conf/machine/ixp4xxle.conf @@ -3,10 +3,8 @@ #@DESCRIPTION: Machine configuration for a generic ixp4xx board in little-endian mode TARGET_ARCH = "arm" -# PACKAGE_ARCH is set in tune-xscale.conf -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" -MACHINE_ARCH = "ixp4xxle" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" require conf/machine/include/ixp4xx.conf diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf index 966334a0d6..7e45825f69 100644 --- a/conf/machine/nslu2.conf +++ b/conf/machine/nslu2.conf @@ -2,20 +2,4 @@ #@NAME: Linksys NSLU2 #@DESCRIPTION: Machine configuration for the Linksys NSLU2 product -# Note that TARGET_ARCH gets set by the DISTRO for the "nslu2" machine. -# (Yes, this was a mistake, but it's legacy and can't be easily changed now.) -# The "nslu2" machine is deprecated - use "nslu2le" or "nslu2be" instead. - -require conf/machine/include/ixp4xx.conf - -# This should eventually be removed (when we move from nslu2 to nslu2le/nslu2be). -MACHINE_ARCH = "${@['ixp4xxbe', 'ixp4xxle'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" - -# This should eventually be removed (when we move from nslu2 to nslu2le/nslu2be). -PACKAGE_ARCH = "${@['armeb', 'arm'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" - -# This should eventually be removed (when we move from nslu2 to nslu2le/nslu2be). -PACKAGE_EXTRA_ARCHS = "${@['ixp4xxbe nslu2be', 'ixp4xxle nslu2le'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" - -# This should eventually be removed (when we move from nslu2 to nslu2le/nslu2be). -EXTRA_IMAGECMD_jffs2 += "${@['--big-endian', '--little-endian'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" +MACHINE_CHECK := ${@bb.fatal('You must set MACHINE to nslu2le or nslu2be.')} diff --git a/conf/machine/nslu2be.conf b/conf/machine/nslu2be.conf index 7cbdd80c1b..16d1ed8508 100644 --- a/conf/machine/nslu2be.conf +++ b/conf/machine/nslu2be.conf @@ -2,8 +2,15 @@ #@NAME: Linksys NSLU2 (big-endian) #@DESCRIPTION: Machine configuration for an NSLU2 in big-endian mode -require conf/machine/ixp4xxbe.conf +TARGET_ARCH = "armeb" + +PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb ixp4xxbe" MACHINE_ARCH = "ixp4xxbe" +IXP4XX_MACHINE_OVERRIDE = ":nslu2:ixp4xx" + +require conf/machine/include/ixp4xx.conf + +EXTRA_IMAGECMD_jffs2 += "--big-endian" -PACKAGE_EXTRA_ARCHS += "ixp4xxbe" +OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" diff --git a/conf/machine/nslu2le.conf b/conf/machine/nslu2le.conf index cc8e8b8b98..1dd1ddaf2f 100644 --- a/conf/machine/nslu2le.conf +++ b/conf/machine/nslu2le.conf @@ -2,8 +2,15 @@ #@NAME: Linksys NSLU2 (little-endian) #@DESCRIPTION: Machine configuration for an NSLU2 in little-endian mode -require conf/machine/ixp4xxle.conf +TARGET_ARCH = "arm" + +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xxle" MACHINE_ARCH = "ixp4xxle" -PACKAGE_EXTRA_ARCHS += "ixp4xxle" +require conf/machine/include/ixp4xx.conf + +EXTRA_IMAGECMD_jffs2 += "--little-endian" + +OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" + diff --git a/packages/arm-kernel-shim/arm-kernel-shim_1.3.bb b/packages/arm-kernel-shim/arm-kernel-shim_1.3.bb index ac9df9579b..a4f5f8f7e9 100644 --- a/packages/arm-kernel-shim/arm-kernel-shim_1.3.bb +++ b/packages/arm-kernel-shim/arm-kernel-shim_1.3.bb @@ -3,7 +3,7 @@ SECTION = "" PRIORITY = "optional" HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" LICENSE = "GPL" -PR = "r1" +PR = "r2" COMPATIBLE_MACHINE = "(ixp4xx|nslu2)" @@ -20,22 +20,46 @@ EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}" oe_runmake() { mv ${S}/config.h ${S}/config.h.orig # NSLU2 - cp ${WORKDIR}/config-nslu2.h ${S}/config.h + if [ ${SITEINFO_ENDIANESS} == "be" ] ; then + sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \ + ${WORKDIR}/config-nslu2.h > ${S}/config.h + else + sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \ + ${WORKDIR}/config-nslu2.h > ${S}/config.h + fi rm -f ${S}/main.o oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2 make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2 || die "oe_runmake failed" # NAS100d - cp ${WORKDIR}/config-nas100d.h ${S}/config.h + if [ ${SITEINFO_ENDIANESS} == "be" ] ; then + sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \ + ${WORKDIR}/config-nas100d.h > ${S}/config.h + else + sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \ + ${WORKDIR}/config-nas100d.h > ${S}/config.h + fi rm -f ${S}/main.o oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d || die "oe_runmake failed" # DSMG-600 - cp ${WORKDIR}/config-dsmg600.h ${S}/config.h + if [ ${SITEINFO_ENDIANESS} == "be" ] ; then + sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \ + ${WORKDIR}/config-dsmg600.h > ${S}/config.h + else + sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \ + ${WORKDIR}/config-dsmg600.h > ${S}/config.h + fi rm -f ${S}/main.o oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600 make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600 || die "oe_runmake failed" # FSG-3 - cp ${WORKDIR}/config-fsg3.h ${S}/config.h + if [ ${SITEINFO_ENDIANESS} == "be" ] ; then + sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \ + ${WORKDIR}/config-fsg3.h > ${S}/config.h + else + sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \ + ${WORKDIR}/config-fsg3.h > ${S}/config.h + fi rm -f ${S}/main.o oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3 make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3 || die "oe_runmake failed" diff --git a/packages/arm-kernel-shim/files/config-dsmg600.h b/packages/arm-kernel-shim/files/config-dsmg600.h index cd331159e0..56b4035408 100644 --- a/packages/arm-kernel-shim/files/config-dsmg600.h +++ b/packages/arm-kernel-shim/files/config-dsmg600.h @@ -27,4 +27,9 @@ #define MACH_TYPE 964 +/* Uncomment one of these if you need to switch the CPU into a + specific mode. */ +//#define FORCE_LITTLEENDIAN +//#define FORCE_BIGENDIAN + #endif /* __CONFIG_H__ */ diff --git a/packages/arm-kernel-shim/files/config-fsg3.h b/packages/arm-kernel-shim/files/config-fsg3.h index e2cdf8abd4..08684d708e 100644 --- a/packages/arm-kernel-shim/files/config-fsg3.h +++ b/packages/arm-kernel-shim/files/config-fsg3.h @@ -27,4 +27,9 @@ #define MACH_TYPE 1091 +/* Uncomment one of these if you need to switch the CPU into a + specific mode. */ +//#define FORCE_LITTLEENDIAN +//#define FORCE_BIGENDIAN + #endif /* __CONFIG_H__ */ diff --git a/packages/arm-kernel-shim/files/config-nas100d.h b/packages/arm-kernel-shim/files/config-nas100d.h index 4389644cf0..846161d016 100644 --- a/packages/arm-kernel-shim/files/config-nas100d.h +++ b/packages/arm-kernel-shim/files/config-nas100d.h @@ -23,8 +23,13 @@ //#define RAM_BANK1_LENGTH 0x10000000 #define COMMANDLINE\ - "init=/linuxrc root=/dev/mtdblock2 rootfstype=jffs rw noirqdebug console=ttyS0,115200n8" + "init=/linuxrc root=/dev/mtdblock2 rootfstype=jffs2 rw noirqdebug console=ttyS0,115200n8" #define MACH_TYPE 865 +/* Uncomment one of these if you need to switch the CPU into a + specific mode. */ +//#define FORCE_LITTLEENDIAN +//#define FORCE_BIGENDIAN + #endif /* __CONFIG_H__ */ diff --git a/packages/arm-kernel-shim/files/config-nslu2.h b/packages/arm-kernel-shim/files/config-nslu2.h index 2262b57668..d641523841 100644 --- a/packages/arm-kernel-shim/files/config-nslu2.h +++ b/packages/arm-kernel-shim/files/config-nslu2.h @@ -23,8 +23,13 @@ //#define RAM_BANK1_LENGTH 0x10000000 #define COMMANDLINE\ - "init=/linuxrc root=/dev/mtdblock4 rootfstype=jffs rw noirqdebug console=ttyS0,115200n8" + "init=/linuxrc root=/dev/mtdblock4 rootfstype=jffs2 rw noirqdebug console=ttyS0,115200n8" #define MACH_TYPE 597 +/* Uncomment one of these if you need to switch the CPU into a + specific mode. */ +//#define FORCE_LITTLEENDIAN +//#define FORCE_BIGENDIAN + #endif /* __CONFIG_H__ */ diff --git a/packages/busybox/busybox.inc b/packages/busybox/busybox.inc index 37a9676257..ab17d96db4 100644 --- a/packages/busybox/busybox.inc +++ b/packages/busybox/busybox.inc @@ -42,8 +42,8 @@ INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" INITSCRIPT_NAME_${PN} = "syslog" CONFFILES_${PN} = "${sysconfdir}/syslog.conf" -# This disables the syslog startup links in openslug (see openslug-init) -INITSCRIPT_PARAMS_${PN}_openslug = "start 20 ." +# This disables the syslog startup links in slugos (see slugos-init) +INITSCRIPT_PARAMS_${PN}_slugos = "start 20 ." inherit cml1 update-rc.d diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb index 1ca30f9d9d..ce591f7e4e 100644 --- a/packages/images/slugos-image.bb +++ b/packages/images/slugos-image.bb @@ -7,11 +7,10 @@ DESCRIPTION = "Generic SlugOS image" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" PR = "r45" -PROVIDES += "${SLUGOS_DISTRO}-image" COMPATIBLE_MACHINE = "nslu2" -IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DISTRO_VERSION}" +IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}" IMAGE_FSTYPES = "jffs2" EXTRA_IMAGECMD_jffs2 += " -D ${SLUGOS_DEVICE_TABLE}" IMAGE_LINGUAS = "" diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc index 3a80703420..d848427921 100644 --- a/packages/linux/ixp4xx-kernel.inc +++ b/packages/linux/ixp4xx-kernel.inc @@ -26,6 +26,8 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for the Intel IXP4xx device" LICENSE = "GPL" +DEPENDS = "arm-kernel-shim devio-native" + # Linux kernel source has the general form linux-X.Y.Z-patchP, # X.Y is the major version number, Z (which may have multiple # parts) is a sub-version and 'patch' is something like 'mm' or @@ -298,12 +300,8 @@ pkg_postrm_kernel-image-fsg3 () { update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${SITEINFO_ENDIANESS}-${KERNEL_VERSION} || true } -#FIXUP: the correct instructions to copy the kernel prepended with the le fixup -#FIXME: do a fixup for BE too... -FIXUP_armeb = "cp$" -FIXUP_arm = "wb 0xee110f10,4;wb 0xe3c00080,4;wb 0xee010f10,4;xp $,4" - -DEPENDS += "devio-native" +BYTESWAP_armeb = "cp$" +BYTESWAP_arm = "xp $,4" # We need the alternatives to happen in the kernel-image packages, not in # the kernel package, because only the images know the name of the kernel. @@ -312,22 +310,23 @@ pkg_postinst_kernel () { pkg_postrm_kernel () { } -# copy_image <dest> <cmdline> <machine-id> +# copy_image <dest> <machine> # copy the zImage and append the appropriate shim # dest: where to copy to -# cmdline: command line to pass to image -# machine-id: decimal machine id to prepend, empty for none +# machine: machine shim to prepend, empty for none copy_image() { - local setmach + local shim - setmach="" - test -n "$2" && setmach="wb $2 . 256/ 255& 0xe3a01c00+, 4; wb 255& 0xe3811000+, 4;" + shim="/dev/null" + test -n "$2" && shim="${STAGING_LOADER_DIR}/arm-kernel-shim-$2.bin" - rm -f "$1".new - devio '<<${KERNEL_OUTPUT}' >"$1".new "$setmach"'${FIXUP}' || { + rm -f "$1".new "$1".shimmed + cat $shim ${KERNEL_OUTPUT} > "$1".shimmed + devio '<<'"$1"'.shimmed' >"$1".new '${BYTESWAP}' || { echo 'ERROR: ${KERNEL_OUTPUT}: failed to copy zImage' >&2 return 1 } + rm -f "$1".shimmed mv "$1".new "$1" } @@ -342,10 +341,10 @@ do_install_append() { install_image '${MACHINE_ARCH}' # Add the machine specific images, with appropriate suffixes - install_image 'nslu2${SITEINFO_ENDIANESS}' '${nslu2_MACHID}' - install_image 'nas100d${SITEINFO_ENDIANESS}' '${nas100d_MACHID}' - install_image 'dsmg600${SITEINFO_ENDIANESS}' '${dsmg600_MACHID}' - install_image 'fsg3${SITEINFO_ENDIANESS}' '${fsg3_MACHID}' + install_image 'nslu2${SITEINFO_ENDIANESS}' 'nslu2' + install_image 'nas100d${SITEINFO_ENDIANESS}' 'nas100d' + install_image 'dsmg600${SITEINFO_ENDIANESS}' 'dsmg600' + install_image 'fsg3${SITEINFO_ENDIANESS}' 'fsg3' } do_deploy[dirs] = "${S}" @@ -359,10 +358,10 @@ do_deploy() { deploy_image '${MACHINE_ARCH}' # And the machine specific images - deploy_image 'nslu2${SITEINFO_ENDIANESS}' '${nslu2_MACHID}' - deploy_image 'nas100d${SITEINFO_ENDIANESS}' '${nas100d_MACHID}' - deploy_image 'dsmg600${SITEINFO_ENDIANESS}' '${dsmg600_MACHID}' - deploy_image 'fsg3${SITEINFO_ENDIANESS}' '${fsg3_MACHID}' + deploy_image 'nslu2${SITEINFO_ENDIANESS}' 'nslu2' + deploy_image 'nas100d${SITEINFO_ENDIANESS}' 'nas100d' + deploy_image 'dsmg600${SITEINFO_ENDIANESS}' 'dsmg600' + deploy_image 'fsg3${SITEINFO_ENDIANESS}' 'fsg3' } addtask deploy before do_build after do_compile diff --git a/packages/linux/ixp4xx-kernel/2.6.19/defconfig b/packages/linux/ixp4xx-kernel/2.6.19/defconfig index 00750f843a..56eaea7a27 100644 --- a/packages/linux/ixp4xx-kernel/2.6.19/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.19/defconfig @@ -189,7 +189,8 @@ CONFIG_PCI=y CONFIG_PREEMPT=y # CONFIG_NO_IDLE_HZ is not set CONFIG_HZ=100 -# CONFIG_AEABI is not set +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y diff --git a/packages/linux/ixp4xx-kernel/2.6.19/series b/packages/linux/ixp4xx-kernel/2.6.19/series index ec0e7a81c5..e7ef3083dd 100644 --- a/packages/linux/ixp4xx-kernel/2.6.19/series +++ b/packages/linux/ixp4xx-kernel/2.6.19/series @@ -39,8 +39,6 @@ squashfs/squashfs-Makefile.patch 86-nas100d-rtc-fixup.patch 87-dsmg600-rtc-fixup.patch 88-dsmg600-dflt-cmdline.patch -88-nas100d-dflt-cmdline.patch -88-nslu2-dflt-cmdline.patch 95-pata-ixp4xx.patch 96-fsg3-support.patch 97-avila-setup-pata.patch diff --git a/packages/linux/ixp4xx-kernel/2.6.20/defconfig b/packages/linux/ixp4xx-kernel/2.6.20/defconfig index a7cdacc960..93380dd3b9 100644 --- a/packages/linux/ixp4xx-kernel/2.6.20/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.20/defconfig @@ -196,7 +196,8 @@ CONFIG_PCI=y CONFIG_PREEMPT=y # CONFIG_NO_IDLE_HZ is not set CONFIG_HZ=100 -# CONFIG_AEABI is not set +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y diff --git a/packages/linux/ixp4xx-kernel/2.6.20/series b/packages/linux/ixp4xx-kernel/2.6.20/series index 64339d47b0..7100d2f806 100644 --- a/packages/linux/ixp4xx-kernel/2.6.20/series +++ b/packages/linux/ixp4xx-kernel/2.6.20/series @@ -36,8 +36,6 @@ squashfs/squashfs-Makefile.patch 86-nas100d-rtc-fixup.patch 87-dsmg600-rtc-fixup.patch 88-dsmg600-dflt-cmdline.patch -88-nas100d-dflt-cmdline.patch -88-nslu2-dflt-cmdline.patch 96-fsg3-support.patch 98-sata_via-pata-support-upstream.patch 99-avila-mtd-microcode.patch diff --git a/packages/linux/ixp4xx-kernel_2.6.19.bb b/packages/linux/ixp4xx-kernel_2.6.19.bb index f10af6c050..eba9d6a404 100644 --- a/packages/linux/ixp4xx-kernel_2.6.19.bb +++ b/packages/linux/ixp4xx-kernel_2.6.19.bb @@ -6,7 +6,7 @@ # http://trac.nslu2-linux.org/kernel/ # # The revision that is pulled from SVN is specified below -IXP4XX_KERNEL_SVN_REV = "683" +IXP4XX_KERNEL_SVN_REV = "693" # # The directory containing the patches to be applied is # specified below @@ -23,16 +23,3 @@ require ixp4xx-kernel-svnpatch.inc SRC_URI += "file://defconfig" SRC_URI += "file://series" - -# Remove the specific cmdline hacking patches if we are not building for nslu2. -addtask remove_cmdline_hacks before do_patch after do_unpack -do_remove_cmdline_hacks() { - -# if [ "${MACHINE}" != "nslu2" ] ; then - sed -e '/88-nas100d-dflt-cmdline.patch/d' \ - -e '/88-nslu2-dflt-cmdline.patch/d' \ - '${WORKDIR}/series' > '${WORKDIR}/series.new' - mv '${WORKDIR}/series.new' '${WORKDIR}/series' -# fi - -} diff --git a/packages/linux/ixp4xx-kernel_2.6.20.bb b/packages/linux/ixp4xx-kernel_2.6.20.bb index 6fd1330cbd..2e768b133b 100644 --- a/packages/linux/ixp4xx-kernel_2.6.20.bb +++ b/packages/linux/ixp4xx-kernel_2.6.20.bb @@ -6,7 +6,7 @@ # http://trac.nslu2-linux.org/kernel/ # # The revision that is pulled from SVN is specified below -IXP4XX_KERNEL_SVN_REV = "686" +IXP4XX_KERNEL_SVN_REV = "693" # # The directory containing the patches to be applied is # specified below @@ -23,16 +23,3 @@ require ixp4xx-kernel-svnpatch.inc SRC_URI += "file://defconfig" SRC_URI += "file://series" - -# Remove the specific cmdline hacking patches if we are not building for nslu2. -addtask remove_cmdline_hacks before do_patch after do_unpack -do_remove_cmdline_hacks() { - - if [ "${MACHINE}" != "nslu2" ] ; then - sed -e '/88-nas100d-dflt-cmdline.patch/d' \ - -e '/88-nslu2-dflt-cmdline.patch/d' \ - '${WORKDIR}/series' > '${WORKDIR}/series.new' - mv '${WORKDIR}/series.new' '${WORKDIR}/series' - fi - -} diff --git a/packages/madwifi/madwifi-ng_r.inc b/packages/madwifi/madwifi-ng_r.inc index 4f38799a8d..6e4483f6f3 100644 --- a/packages/madwifi/madwifi-ng_r.inc +++ b/packages/madwifi/madwifi-ng_r.inc @@ -22,8 +22,7 @@ inherit module-base EXTRA_OEMAKE = "LDFLAGS= KERNELPATH=${STAGING_KERNEL_DIR} KERNELRELEASE=${KERNEL_VERSION} TOOLPREFIX=${TARGET_PREFIX}" -EXTRA_OEMAKE_prepend_ixp4xxle = "TARGET=xscale-le-elf " -EXTRA_OEMAKE_prepend_ixp4xxbe = "TARGET=xscale-be-elf " +EXTRA_OEMAKE_prepend_ixp4xx = "TARGET=xscale-${SITEINFO_ENDIANESS}-elf " do_compile() { oe_runmake all diff --git a/packages/meta/slugos-native-packages.bb b/packages/meta/slugos-native-packages.bb index db2ab46a3c..4505c9979c 100644 --- a/packages/meta/slugos-native-packages.bb +++ b/packages/meta/slugos-native-packages.bb @@ -2,7 +2,6 @@ DESCRIPTION = "Packages that are to be compiled natively for the SlugOS firmware" LICENSE = "MIT" PR = "r1" -PROVIDES += "${SLUGOS_DISTRO}-native-packages" INHIBIT_DEFAULT_DEPS = "1" EXCLUDE_FROM_WORLD = "1" diff --git a/packages/meta/slugos-native.bb b/packages/meta/slugos-native.bb index 9a4e17d56a..3b4023ba45 100644 --- a/packages/meta/slugos-native.bb +++ b/packages/meta/slugos-native.bb @@ -11,7 +11,6 @@ INHIBIT_DEFAULT_DEPS = "1" EXCLUDE_FROM_WORLD = "1" ALLOW_EMPTY = "1" PACKAGES = "${PN}" -PROVIDES += "${SLUGOS_DISTRO}-native" # Run-time only (RDEPENDS) stuff - no package explicitly provides # these targets. diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 507600df32..064adaf03e 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -5,9 +5,8 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r17" +PR = "r18" CONFLICTS = "db3" -PROVIDES += "${SLUGOS_DISTRO}-packages" COMPATIBLE_MACHINE = "nslu2" EXCLUDE_FROM_WORLD = "1" @@ -106,6 +105,7 @@ SLUGOS_PACKAGES = "\ make \ masqmail \ mdadm \ + mediatomb \ memtester \ mgetty \ miau \ diff --git a/packages/opie-bluetoothapplet/files/.mtn2git_empty b/packages/opie-bluetoothapplet/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/opie-bluetoothapplet/files/.mtn2git_empty diff --git a/packages/opie-bluetoothapplet/files/sysconfig-bluetooth.patch b/packages/opie-bluetoothapplet/files/sysconfig-bluetooth.patch new file mode 100644 index 0000000000..83ee765b12 --- /dev/null +++ b/packages/opie-bluetoothapplet/files/sysconfig-bluetooth.patch @@ -0,0 +1,40 @@ +--- applet.org/bluezapplet.cpp.org 2007-02-11 16:48:06.000000000 +0000 ++++ applet/bluezapplet.cpp 2007-02-11 16:56:57.000000000 +0000 +@@ -52,6 +52,8 @@ + #include <qtimer.h> + #include <qpopupmenu.h> + #include <qmessagebox.h> ++#include <qfile.h> ++#include <qtextstream.h> + + /* STD */ + #include <device.h> +@@ -124,6 +126,28 @@ + int BluezApplet::setBluezStatus(int c, bool sync) { + + if ( c == 1 ) { ++ ++ QFile cfg("/etc/sysconfig/bluetooth"); ++ if(cfg.open(IO_ReadOnly)) { ++ QTextStream stream (&cfg); ++ QString streamIn = stream.read(); ++ QStringList list = QStringList::split("\n", streamIn); ++ cfg.close(); ++ if(list.grep("BLUETOOTH_PORT=").count() > 0 && ++ list.grep("BLUETOOTH_PROTOCOL=").count() > 0 && ++ list.grep("BLUETOOTH_SPEED=").count() > 0) { ++ btDevice = new Device( list.grep("BLUETOOTH_PORT=")[0]. ++ replace((QString)"BLUETOOTH_PORT=", ""), ++ list.grep("BLUETOOTH_PROTOCOL=")[0]. ++ replace((QString)"BLUETOOTH_PROTOCOL=", ""), ++ list.grep("BLUETOOTH_SPEED=")[0]. ++ replace((QString)"BLUETOOTH_SPEED=", "")); ++ return 0; ++ } ++ } ++ ++ // Device-specific stuff - should be removed ++ + switch ( ODevice::inst()->model() ) { + case Model_iPAQ_H39xx: + btDevice = new Device( "/dev/tts/1", "bcsp", "921600" ); diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb index bf9cc5689b..a919c3094b 100644 --- a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb +++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb @@ -1,6 +1,8 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/applet \ - ${HANDHELDS_CVS};module=opie/pics/bluetoothapplet" + ${HANDHELDS_CVS};module=opie/pics/bluetoothapplet \ + file://sysconfig-bluetooth.patch;patch=1" |