diff options
59 files changed, 244 insertions, 126 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 3c6f5a15a1..540b891669 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -999,10 +999,12 @@ def base_after_parse(d): depends = depends + " git-native:do_populate_staging" bb.data.setVarFlag('do_fetch', 'depends', depends, d) + # 'multimachine' handling mach_arch = bb.data.getVar('MACHINE_ARCH', d, 1) - old_arch = bb.data.getVar('PACKAGE_ARCH', d, 1) - if (old_arch == mach_arch): - # Nothing to do + pkg_arch = bb.data.getVar('PACKAGE_ARCH', d, 1) + + if (pkg_arch == mach_arch): + # Already machine specific - nothing further to do return # @@ -1010,26 +1012,38 @@ def base_after_parse(d): # unless the package sets SRC_URI_OVERRIDES_PACKAGE_ARCH=0 # override = bb.data.getVar('SRC_URI_OVERRIDES_PACKAGE_ARCH', d, 1) - if override == '0': - return - - paths = [] - for p in [ "${PF}", "${P}", "${PN}", "files", "" ]: - path = bb.data.expand(os.path.join("${FILE_DIRNAME}", p, "${MACHINE}"), d) - if os.path.isdir(path): - paths.append(path) - if len(paths) == 0: - return - - for s in srcuri.split(): - if not s.startswith("file://"): - continue - local = bb.data.expand(bb.fetch.localpath(s, d), d) - for mp in paths: - if local.startswith(mp): - #bb.note("overriding PACKAGE_ARCH from %s to %s" % (old_arch, mach_arch)) - bb.data.setVar('PACKAGE_ARCH', "${MACHINE_ARCH}", d) - return + if override != '0': + paths = [] + for p in [ "${PF}", "${P}", "${PN}", "files", "" ]: + path = bb.data.expand(os.path.join("${FILE_DIRNAME}", p, "${MACHINE}"), d) + if os.path.isdir(path): + paths.append(path) + if len(paths) != 0: + for s in srcuri.split(): + if not s.startswith("file://"): + continue + local = bb.data.expand(bb.fetch.localpath(s, d), d) + for mp in paths: + if local.startswith(mp): + #bb.note("overriding PACKAGE_ARCH from %s to %s" % (pkg_arch, mach_arch)) + bb.data.setVar('PACKAGE_ARCH', "${MACHINE_ARCH}", d) + bb.data.setVar('MULTIMACH_ARCH', mach_arch, d) + return + + multiarch = pkg_arch + + packages = bb.data.getVar('PACKAGES', d, 1).split() + for pkg in packages: + pkgarch = bb.data.getVar("PACKAGE_ARCH_%s" % pkg, d, 1) + + # We could look for != PACKAGE_ARCH here but how to choose + # if multiple differences are present? + # Look through PACKAGE_ARCHS for the priority order? + if pkgarch and pkgarch == mach_arch: + multiarch = mach_arch + break + + bb.data.setVar('MULTIMACH_ARCH', multiarch, d) python () { import bb diff --git a/classes/multimachine.bbclass b/classes/multimachine.bbclass deleted file mode 100644 index 945d22bfe0..0000000000 --- a/classes/multimachine.bbclass +++ /dev/null @@ -1,30 +0,0 @@ -STAMP = "${TMPDIR}/stamps/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/${PF}" -WORKDIR = "${TMPDIR}/work/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/${PF}" -STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/kernel" -PKGDATA_DIR = "${STAGING_DIR}/pkgdata/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}" - -# Find any machine specific sub packages and if present, mark the -# whole package as machine specific for multimachine purposes. - - -def multi_machine_after_parse(d): - import bb - packages = bb.data.getVar('PACKAGES', d, 1).split() - macharch = bb.data.getVar('MACHINE_ARCH', d, 1) - multiarch = bb.data.getVar('PACKAGE_ARCH', d, 1) - - for pkg in packages: - pkgarch = bb.data.getVar("PACKAGE_ARCH_%s" % pkg, d, 1) - - # We could look for != PACKAGE_ARCH here but how to choose - # if multiple differences are present? - # Look through PACKAGE_ARCHS for the priority order? - if pkgarch and pkgarch == macharch: - multiarch = macharch - - bb.data.setVar('MULTIMACH_ARCH', multiarch, d) - - -python __anonymous () { - multi_machine_after_parse(d) -} diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index 5de5970880..77fd8a92c3 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -19,9 +19,6 @@ PSTAGE_PKGPN = "${@bb.data.expand('staging-${PN}-${MULTIMACH_ARCH}${TARGET_ PSTAGE_PKGNAME = "${PSTAGE_PKGPN}_${PSTAGE_PKGVERSION}_${PSTAGE_PKGARCH}.ipk" PSTAGE_PKG = "${DEPLOY_DIR_PSTAGE}/${PSTAGE_PKGPATH}/${PSTAGE_PKGNAME}" -# multimachine.bbclass will override this but add a default in case we're not using it -MULTIMACH_ARCH ?= "${PACKAGE_ARCH}" - PSTAGE_NATIVEDEPENDS = "\ shasum-native \ stagemanager-native \ diff --git a/classes/singlemachine.bbclass b/classes/singlemachine.bbclass new file mode 100644 index 0000000000..e4b2b6f7b3 --- /dev/null +++ b/classes/singlemachine.bbclass @@ -0,0 +1,12 @@ +# +# Emulates the old mode of OE operation where only one machine can be targetted. +# + +MULTIMACH_TARGET_SYS = "${TARGET_SYS}" +MULTIMACH_HOST_SYS = "${HOST_SYS}" + +STAMP = "${TMPDIR}/stamps/${PF}" +WORKDIR = "${TMPDIR}/work/${PF}" +PKGDATA_DIR = "${STAGING_DIR}/pkgdata" +STAGING_KERNEL_DIR = "${STAGING_DIR_HOST}/kernel" + diff --git a/conf/bitbake.conf b/conf/bitbake.conf index b5b25407c3..9ce51821b1 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -86,10 +86,15 @@ TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS' TARGET_PREFIX = "${TARGET_SYS}-" TARGET_CC_ARCH = "" -PACKAGE_ARCH = "${HOST_ARCH}" +BASE_PACKAGE_ARCH = "${HOST_ARCH}" +PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}" MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}" PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}" +MULTIMACH_ARCH = "${PACKAGE_ARCH}" +MULTIMACH_TARGET_SYS = "${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}" +MULTIMACH_HOST_SYS = "${MULTIMACH_ARCH}${HOST_VENDOR}-${HOST_OS}" + # select proper CPU to get binary locales generated QEMU_OPTIONS = "" QEMU_OPTIONS_iwmmxt = "-cpu pxa270-c5" @@ -160,6 +165,8 @@ RPROVIDES = "" MULTI_PROVIDER_WHITELIST = "virtual/libintl" PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale" +#enable this when bitbake is upgraded to cope with ++ values in the field +#PACKAGES_DYNAMIC = "${PN}-locale-*" FILES = "" FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ @@ -209,8 +216,8 @@ SVNDIR = "${CO_DIR}/svn" GITDIR = "${CO_DIR}/git" BZRDIR = "${CO_DIR}/bzr" -STAMP = "${TMPDIR}/stamps/${PF}" -WORKDIR = "${TMPDIR}/work/${PF}" +STAMP = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PF}" +WORKDIR = "${TMPDIR}/work/${MULTIMACH_TARGET_SYS}/${PF}" T = "${WORKDIR}/temp" D = "${WORKDIR}/image" S = "${WORKDIR}/${P}" @@ -246,7 +253,7 @@ DEPLOY_DIR_DEB = "${DEPLOY_DIR}/deb" DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images" DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools" -PKGDATA_DIR = "${STAGING_DIR}/pkgdata" +PKGDATA_DIR = "${STAGING_DIR}/pkgdata/${MULTIMACH_TARGET_SYS}" SDK_NAME = "${DISTRO}/${TARGET_ARCH}" SDK_PREFIX = "/usr/local/${SDK_NAME}" @@ -256,7 +263,7 @@ SDK_PREFIX = "/usr/local/${SDK_NAME}" ################################################################## OLDEST_KERNEL = "2.4.0" -STAGING_KERNEL_DIR = "${STAGING_DIR_HOST}/kernel" +STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/kernel" ################################################################## # Specific image creation and rootfs population info. @@ -380,6 +387,7 @@ export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} \ ALLOWED_FLAGS = "-O -mcpu -march -pipe" # Pass parallel make options to the compile task only +EXTRA_OEMAKE_prepend_task_do_compile = "${PARALLEL_MAKE} " EXTRA_OEMAKE_prepend_task-compile = "${PARALLEL_MAKE} " ################################################################## diff --git a/conf/distro/celinux-test.conf b/conf/distro/celinux-test.conf index 03dcd22d79..ad7a34d97c 100644 --- a/conf/distro/celinux-test.conf +++ b/conf/distro/celinux-test.conf @@ -11,9 +11,6 @@ # we want IPKG packages and Debian style naming INHERIT += " package_ipk debian" -# enable if build for many machines -#INHERIT += " multimachine" - # we want images supporting the following features (for task-base) DISTRO_FEATURES = "nfs pcmcia usbhost" diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index bbdbe7f80b..4ada4a89d4 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -35,9 +35,6 @@ MAINTAINER = "Angstrom Developers <angstrom-distro-devel@linuxtogo.org>" #use debian style naming INHERIT += "debian" -#use multimachine buildrules -INHERIT += "multimachine" - #activate config checker INHERIT += "sanity" diff --git a/conf/distro/include/oplinux.inc b/conf/distro/include/oplinux.inc index a7eac524bc..36eca58241 100644 --- a/conf/distro/include/oplinux.inc +++ b/conf/distro/include/oplinux.inc @@ -9,9 +9,6 @@ BB_MIN_VERSION = "1.8.10" #OPLinux and OPLinux-uclibc source mirrors INHERIT += "oplinux-mirrors" -#oplinux is a multimachine distro -INHERIT += "multimachine" - # check for required tools and minimal BitBake version INHERIT += "sanity" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 7d3f4b63c1..de0f6a2a0f 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -141,6 +141,8 @@ SRCREV_pn-openocd-native ?= "517" SRCREV_pn-opkg ?= "4488" SRCREV_pn-opkg-native ?= "4491" SRCREV_pn-opkg-sdk ?= "4488" +SRCREV_pn-opkg-utils ?= "4534" +SRCREV_pn-opkg-utils-native ?= "4534" SRCREV_pn-oprofileui ?= "173" SRCREV_pn-packagekit ?= "813fa8cfb139246cf180d52895b52b28616ae2f5" SRCREV_pn-psplash ?= "249" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 8661e5b065..b149f65f11 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -42,7 +42,7 @@ TARGET_FPU = "soft" # glib-2.0 builds require USE_NLS to be overridden USE_NLS_glib-2.0 = "yes" -INHERIT += "package_ipk debian multimachine" +INHERIT += "package_ipk debian" # FULL_OPTIMIZATION # Optimization settings. Os works fine and is significantly better than O2. diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf index b8c7dae22e..d5b994c55c 100644 --- a/conf/distro/jlime-donkey.conf +++ b/conf/distro/jlime-donkey.conf @@ -81,7 +81,7 @@ PREFERRED_VERSION_busybox = "1.9.1" #<>It will use different folders depending on Arch (set in local.conf) #<>------------------------------------------------------------------< SRC_DIST_LOCAL = "copy" -INHERIT += "package_ipk package_tar multimachine src_distribute_local" +INHERIT += "package_ipk package_tar src_distribute_local" BBINCLUDELOGS = "yes" IMAGE_FSTYPES = "tar.bz2" TARGET_OS = "linux" diff --git a/conf/distro/jlime-henchman.conf b/conf/distro/jlime-henchman.conf index 68353b0bd9..646d335390 100644 --- a/conf/distro/jlime-henchman.conf +++ b/conf/distro/jlime-henchman.conf @@ -32,7 +32,7 @@ IMAGE_NAME = "${IMAGE_BASENAME}-Henchman-${MACHINE}" # # Naming schemes # -INHERIT += "debian multimachine" +INHERIT += "debian" # # Packaging and output format diff --git a/conf/distro/jlime-mongo.conf b/conf/distro/jlime-mongo.conf index 6fb00f1452..e2b2e8b7db 100644 --- a/conf/distro/jlime-mongo.conf +++ b/conf/distro/jlime-mongo.conf @@ -32,7 +32,7 @@ IMAGE_NAME = "${IMAGE_BASENAME}-Mongo-${MACHINE}" # # Naming schemes # -INHERIT += "debian multimachine" +INHERIT += "debian" # # Packaging and output format diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf index b54b0c8c8b..e86cf5cd4f 100644 --- a/conf/distro/minimal.conf +++ b/conf/distro/minimal.conf @@ -19,7 +19,7 @@ DISTRO_TYPE = "debug" # # Naming schemes # -INHERIT += "debian multimachine" +INHERIT += "debian" # # Packaging and output format diff --git a/conf/distro/openprotium.conf b/conf/distro/openprotium.conf index 533b41526b..4b620fe6be 100644 --- a/conf/distro/openprotium.conf +++ b/conf/distro/openprotium.conf @@ -17,7 +17,7 @@ MACHINE_TASK_PROVIDER = "task-openprotium" # # Naming schemes # -INHERIT += "debian multimachine" +INHERIT += "debian" # # Packaging and output format diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf index 65a82d1e0b..4657d48b79 100644 --- a/conf/machine/h6300.conf +++ b/conf/machine/h6300.conf @@ -6,7 +6,7 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_ARCH = "arm" +BASE_PACKAGE_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t" #Use OMAP 1510 cpu specifig arm9tdmi options for gcc diff --git a/conf/machine/htckaiser.conf b/conf/machine/htckaiser.conf index f5f6cb5c66..eba677fae7 100644 --- a/conf/machine/htckaiser.conf +++ b/conf/machine/htckaiser.conf @@ -13,7 +13,7 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "320" TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s" FEED_ARCH = "armv6" -PACKAGE_ARCH = "armv6" +BASE_PACKAGE_ARCH = "armv6" IMAGE_FSTYPES ?= "tar.gz cpio.gz" diff --git a/conf/machine/include/tune-arm1136jf-s.inc b/conf/machine/include/tune-arm1136jf-s.inc index a69df825c0..0f5aef5ea4 100644 --- a/conf/machine/include/tune-arm1136jf-s.inc +++ b/conf/machine/include/tune-arm1136jf-s.inc @@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s -mfpu=vfp -mfloat-abi=softfp" FEED_ARCH = "armv6" -PACKAGE_ARCH = "armv6" +BASE_PACKAGE_ARCH = "armv6" diff --git a/conf/machine/include/tune-arm920t.inc b/conf/machine/include/tune-arm920t.inc index b142d3325a..1f7a04bb3b 100644 --- a/conf/machine/include/tune-arm920t.inc +++ b/conf/machine/include/tune-arm920t.inc @@ -1,4 +1,4 @@ FEED_ARCH = "armv4t" -PACKAGE_ARCH = "armv4t" +BASE_PACKAGE_ARCH = "armv4t" TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t" diff --git a/conf/machine/include/tune-arm926ejs.inc b/conf/machine/include/tune-arm926ejs.inc index c3e8d7aefc..e80ef10490 100644 --- a/conf/machine/include/tune-arm926ejs.inc +++ b/conf/machine/include/tune-arm926ejs.inc @@ -4,4 +4,4 @@ FEED_ARCH = "armv5te" #TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs" # For gcc 4.x you need: TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s" -PACKAGE_ARCH = "armv5te" +BASE_PACKAGE_ARCH = "armv5te" diff --git a/conf/machine/include/tune-arm9tdmi.inc b/conf/machine/include/tune-arm9tdmi.inc index ded2c1b732..50aaec1320 100644 --- a/conf/machine/include/tune-arm9tdmi.inc +++ b/conf/machine/include/tune-arm9tdmi.inc @@ -1,3 +1,3 @@ FEED_ARCH = "armv4t" -PACKAGE_ARCH = "armv4t" +BASE_PACKAGE_ARCH = "armv4t" TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi" diff --git a/conf/machine/include/tune-armv7.inc b/conf/machine/include/tune-armv7.inc index 6276fe6798..96c8c64904 100644 --- a/conf/machine/include/tune-armv7.inc +++ b/conf/machine/include/tune-armv7.inc @@ -3,4 +3,4 @@ # This will NOT compile programs in 'ARM' mode, which is what you really want TARGET_CC_ARCH = "-march=armv7 -mfpu=vfp -mfloat-abi=softfp" FEED_ARCH = "armv7" -PACKAGE_ARCH = "armv7" +BASE_PACKAGE_ARCH = "armv7" diff --git a/conf/machine/include/tune-at32ap7000.inc b/conf/machine/include/tune-at32ap7000.inc index 2efe0bb3e2..666dd21a01 100644 --- a/conf/machine/include/tune-at32ap7000.inc +++ b/conf/machine/include/tune-at32ap7000.inc @@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-march=ap" -PACKAGE_ARCH = "avr32" +BASE_PACKAGE_ARCH = "avr32" FEED_ARCH = "avr32" diff --git a/conf/machine/include/tune-athlonmp.inc b/conf/machine/include/tune-athlonmp.inc index 167559aa85..313300d9cd 100644 --- a/conf/machine/include/tune-athlonmp.inc +++ b/conf/machine/include/tune-athlonmp.inc @@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-march=i686" -PACKAGE_ARCH = "i686" +BASE_PACKAGE_ARCH = "i686" FEED_ARCH = "i686" diff --git a/conf/machine/include/tune-c3.inc b/conf/machine/include/tune-c3.inc index 00db9d0445..43849086f4 100644 --- a/conf/machine/include/tune-c3.inc +++ b/conf/machine/include/tune-c3.inc @@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-march=c3 -mtune=c3" -PACKAGE_ARCH = "i586" +BASE_PACKAGE_ARCH = "i586" FEED_ARCH = "i586" diff --git a/conf/machine/include/tune-cortexa8.inc b/conf/machine/include/tune-cortexa8.inc index 51f6f3d72b..4216255102 100644 --- a/conf/machine/include/tune-cortexa8.inc +++ b/conf/machine/include/tune-cortexa8.inc @@ -5,4 +5,4 @@ TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp" FEED_ARCH = "armv7a" -PACKAGE_ARCH = "armv7a" +BASE_PACKAGE_ARCH = "armv7a" diff --git a/conf/machine/include/tune-cortexm1.inc b/conf/machine/include/tune-cortexm1.inc index a0d18b69c6..6c4a70a24d 100644 --- a/conf/machine/include/tune-cortexm1.inc +++ b/conf/machine/include/tune-cortexm1.inc @@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-march=armv7 -mtune=cortex-m1 -mfpu=vfp -mfloat-abi=softfp" FEED_ARCH = "armv6" -PACKAGE_ARCH = "armv6" +BASE_PACKAGE_ARCH = "armv6" diff --git a/conf/machine/include/tune-cortexm3.inc b/conf/machine/include/tune-cortexm3.inc index 3598998a74..6da9aeedda 100644 --- a/conf/machine/include/tune-cortexm3.inc +++ b/conf/machine/include/tune-cortexm3.inc @@ -1,4 +1,4 @@ # valid options for -march: `armv7', `armv7-m' TARGET_CC_ARCH = "-march=armv7-m -mtune=cortex-m3 -mfpu=vfp -mfloat-abi=softfp" FEED_ARCH = "armv7" -PACKAGE_ARCH = "armv7" +BASE_PACKAGE_ARCH = "armv7" diff --git a/conf/machine/include/tune-cortexr4.inc b/conf/machine/include/tune-cortexr4.inc index 93c82e8607..b8bb7f50ae 100644 --- a/conf/machine/include/tune-cortexr4.inc +++ b/conf/machine/include/tune-cortexr4.inc @@ -1,4 +1,4 @@ # valid options for -march: `armv7', `armv7-r' TARGET_CC_ARCH = "-march=armv7-r -mtune=cortex-r4 -mfpu=vfp -mfloat-abi=softfp" FEED_ARCH = "armv7" -PACKAGE_ARCH = "armv7" +BASE_PACKAGE_ARCH = "armv7" diff --git a/conf/machine/include/tune-ep9312.inc b/conf/machine/include/tune-ep9312.inc index 76ccc1a1e3..7da1cb50c8 100644 --- a/conf/machine/include/tune-ep9312.inc +++ b/conf/machine/include/tune-ep9312.inc @@ -2,6 +2,6 @@ TARGET_CC_ARCH = "-march=ep9312 -mtune=ep9312 -mcpu=ep9312" # add "-mfp=maverick" for newer gcc versions > 4.0 #set arch to ep9312 for all generated packages -PACKAGE_ARCH = "ep9312" +BASE_PACKAGE_ARCH = "ep9312" FEED_ARCH = "ep9312" diff --git a/conf/machine/include/tune-geodelx.inc b/conf/machine/include/tune-geodelx.inc index c167515d46..7e6562ad46 100644 --- a/conf/machine/include/tune-geodelx.inc +++ b/conf/machine/include/tune-geodelx.inc @@ -2,6 +2,6 @@ # in older versions k6-2 is closest # TARGET_CC_ARCH = "-march=k6-2" -PACKAGE_ARCH = "geode" +BASE_PACKAGE_ARCH = "geode" FEED_ARCH = "geode" diff --git a/conf/machine/include/tune-iwmmxt.inc b/conf/machine/include/tune-iwmmxt.inc index 20fe82b584..aa5aaee901 100644 --- a/conf/machine/include/tune-iwmmxt.inc +++ b/conf/machine/include/tune-iwmmxt.inc @@ -1,7 +1,7 @@ # Configurations for the Intel PXA27x Appications Processor Family. # Please use tune-xscale for PXA255/PXA26x based processors. TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt -mtune=iwmmxt" -PACKAGE_ARCH = "iwmmxt" +BASE_PACKAGE_ARCH = "iwmmxt" PACKAGE_EXTRA_ARCHS += "iwmmxt" FEED_ARCH = "iwmmxt" diff --git a/conf/machine/include/tune-pentium.inc b/conf/machine/include/tune-pentium.inc index 008d63daa8..6b8c9b521f 100644 --- a/conf/machine/include/tune-pentium.inc +++ b/conf/machine/include/tune-pentium.inc @@ -1,4 +1,4 @@ TARGET_CC_ARCH = "-march=pentium" -PACKAGE_ARCH = "i586" +BASE_PACKAGE_ARCH = "i586" FEED_ARCH = "i586" diff --git a/conf/machine/include/tune-pentium4c.inc b/conf/machine/include/tune-pentium4c.inc index 092f705d1d..302eb3c4a0 100644 --- a/conf/machine/include/tune-pentium4c.inc +++ b/conf/machine/include/tune-pentium4c.inc @@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-march=prescott" -PACKAGE_ARCH = "i686p4c" +BASE_PACKAGE_ARCH = "i686p4c" diff --git a/conf/machine/include/tune-pentiumpro.inc b/conf/machine/include/tune-pentiumpro.inc index 3406bb0c71..88fe7d7445 100644 --- a/conf/machine/include/tune-pentiumpro.inc +++ b/conf/machine/include/tune-pentiumpro.inc @@ -1,4 +1,4 @@ TARGET_CC_ARCH = "-march=pentiumpro" -PACKAGE_ARCH = "i686" +BASE_PACKAGE_ARCH = "i686" FEED_ARCH = "i686" diff --git a/conf/machine/include/tune-ppc405.inc b/conf/machine/include/tune-ppc405.inc index f798df837c..a54aec0336 100644 --- a/conf/machine/include/tune-ppc405.inc +++ b/conf/machine/include/tune-ppc405.inc @@ -1,5 +1,5 @@ #default to soft-floats if distro/machine/local.conf don't define anything else TARGET_FPU ?= "soft" TARGET_CC_ARCH = "-mcpu=405" -PACKAGE_ARCH = "ppc405" +BASE_PACKAGE_ARCH = "ppc405" FEED_ARCH = "ppc405" diff --git a/conf/machine/include/tune-ppc440.inc b/conf/machine/include/tune-ppc440.inc index d38adac008..7d7ca0ea11 100644 --- a/conf/machine/include/tune-ppc440.inc +++ b/conf/machine/include/tune-ppc440.inc @@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-mcpu=440" -PACKAGE_ARCH = "ppc440" +BASE_PACKAGE_ARCH = "ppc440" FEED_ARCH = "ppc440" diff --git a/conf/machine/include/tune-ppc440e.inc b/conf/machine/include/tune-ppc440e.inc index 539fa2d065..cbcef8a573 100644 --- a/conf/machine/include/tune-ppc440e.inc +++ b/conf/machine/include/tune-ppc440e.inc @@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-mcpu=440fp -mhard-float" -PACKAGE_ARCH = "ppc440e" +BASE_PACKAGE_ARCH = "ppc440e" FEED_ARCH = "ppc440e" diff --git a/conf/machine/include/tune-ppc603e.inc b/conf/machine/include/tune-ppc603e.inc index 0305a129b9..f48dc26e05 100644 --- a/conf/machine/include/tune-ppc603e.inc +++ b/conf/machine/include/tune-ppc603e.inc @@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-mcpu=603e -mhard-float" -PACKAGE_ARCH = "ppc603e" +BASE_PACKAGE_ARCH = "ppc603e" FEED_ARCH = "ppc603e" diff --git a/conf/machine/include/tune-ppce300c2.inc b/conf/machine/include/tune-ppce300c2.inc index ddf9de00ce..41ddd4151a 100644 --- a/conf/machine/include/tune-ppce300c2.inc +++ b/conf/machine/include/tune-ppce300c2.inc @@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-mcpu=e300c2" -PACKAGE_ARCH = "ppce300c2" +BASE_PACKAGE_ARCH = "ppce300c2" FEED_ARCH = "ppce300c2" diff --git a/conf/machine/include/tune-ppce300c3.inc b/conf/machine/include/tune-ppce300c3.inc index 769c18720d..24af11a8ba 100644 --- a/conf/machine/include/tune-ppce300c3.inc +++ b/conf/machine/include/tune-ppce300c3.inc @@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-mcpu=e300c3" -PACKAGE_ARCH = "ppce300c3" +BASE_PACKAGE_ARCH = "ppce300c3" FEED_ARCH = "ppce300c3" diff --git a/conf/machine/include/tune-ppce500.inc b/conf/machine/include/tune-ppce500.inc index 7a0476e5b7..9c8c68c342 100644 --- a/conf/machine/include/tune-ppce500.inc +++ b/conf/machine/include/tune-ppce500.inc @@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-mcpu=8540" -PACKAGE_ARCH = "ppce500" +BASE_PACKAGE_ARCH = "ppce500" FEED_ARCH = "ppce500" diff --git a/conf/machine/include/tune-supersparc.inc b/conf/machine/include/tune-supersparc.inc index 5fbfabe8d3..a402e7cd2b 100644 --- a/conf/machine/include/tune-supersparc.inc +++ b/conf/machine/include/tune-supersparc.inc @@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-mcpu=supersparc" -PACKAGE_ARCH = "supersparc" +BASE_PACKAGE_ARCH = "supersparc" FEED_ARCH = "supersparc" diff --git a/conf/machine/include/tune-xscale.inc b/conf/machine/include/tune-xscale.inc index d5ef105e97..eb16651ae3 100644 --- a/conf/machine/include/tune-xscale.inc +++ b/conf/machine/include/tune-xscale.inc @@ -2,4 +2,4 @@ FEED_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, TARGET_CC_ARCH = "-march=armv5te -mtune=xscale" TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale" -PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" +BASE_PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" diff --git a/packages/alsa/alsa-lib/fix_libmath.patch b/packages/alsa/alsa-lib/fix_libmath.patch new file mode 100644 index 0000000000..23309ce381 --- /dev/null +++ b/packages/alsa/alsa-lib/fix_libmath.patch @@ -0,0 +1,17 @@ +Index: alsa-lib-1.0.15/configure.in +=================================================================== +--- alsa-lib-1.0.15.orig/configure.in 2007-10-15 10:45:26.000000000 +0200 ++++ alsa-lib-1.0.15/configure.in 2008-07-19 15:51:34.177119589 +0200 +@@ -191,9 +191,9 @@ + AC_MSG_RESULT(no) + fi + +-ALSA_DEPLIBS="" +-if test "$softfloat" != "yes"; then +- ALSA_DEPLIBS="-lm" ++ALSA_DEPLIBS="-lm" ++if test "$softfloat" = "yes"; then ++ AC_CHECK_LIB([m], [floor], , [ALSA_DEPLIBS=""]) + fi + + dnl Check for libdl diff --git a/packages/alsa/alsa-lib_1.0.15.bb b/packages/alsa/alsa-lib_1.0.15.bb index 60b44dbc8e..399352f299 100644 --- a/packages/alsa/alsa-lib_1.0.15.bb +++ b/packages/alsa/alsa-lib_1.0.15.bb @@ -2,6 +2,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" LICENSE = "GPL" +PR = "1" # configure.in sets -D__arm__ on the command line for any arm system # (not just those with the ARM instruction set), this should be removed, @@ -10,14 +11,23 @@ LICENSE = "GPL" ARM_INSTRUCTION_SET = "arm" SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \ - file://fix-tstamp-declaration.patch;patch=1" + file://fix-tstamp-declaration.patch;patch=1 \ + file://fix_libmath.patch;patch=1 \ + " inherit autotools pkgconfig + +EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes --disable-python" + + require alsa-fpu.inc EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} " -EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes --disable-python" + +require alsa-versym.inc +EXTRA_OECONF += "${@get_alsa_versym_setting(bb, d)} " + do_stage () { oe_libinstall -so -C src libasound ${STAGING_LIBDIR}/ diff --git a/packages/alsa/alsa-versym.inc b/packages/alsa/alsa-versym.inc new file mode 100644 index 0000000000..6d585ecf4a --- /dev/null +++ b/packages/alsa/alsa-versym.inc @@ -0,0 +1,21 @@ + +def get_alsa_versym_setting(bb, d): + # Versioned symbols don't work propery with uClibc + if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0: + return "--with-versioned=no" + return "" + + +def get_alsa_versym_setting(bb, d): + # Versioned symbols don't work propery with uClibc + if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0: + return "--with-versioned=no" + return "" + + +def get_alsa_versym_setting(bb, d): + # Versioned symbols don't work propery with uClibc + if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0: + return "--with-versioned=no" + return "" + diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb index 979da0362e..b0c57288a1 100644 --- a/packages/ffmpeg/ffmpeg_git.bb +++ b/packages/ffmpeg/ffmpeg_git.bb @@ -3,7 +3,7 @@ require ffmpeg.inc DEPENDS += "libgsm" PV = "0.4.9+${PR}+gitr${SRCREV}" -PR = "r15" +PR = "r16" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_armv7a = "1" @@ -12,7 +12,7 @@ FFBRANCH_arm = "arm-neon" FFBRANCH ?= "master" SRCREV = "dee1c2d60a67dc6411ed3fcbe26db5113cb1a371" -SRCREV_arm = "7137e7907e706300183c120703d4c9b46db93029" +SRCREV_arm = "699f491ee2d3c3216ef16ea30ec3956f4cb583db" SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \ " diff --git a/packages/ffmpeg/omapfbplay_git.bb b/packages/ffmpeg/omapfbplay_git.bb index 9494e57d33..dd89b8eae8 100644 --- a/packages/ffmpeg/omapfbplay_git.bb +++ b/packages/ffmpeg/omapfbplay_git.bb @@ -2,13 +2,13 @@ DESCRIPTION = "Simple ffmpeg-based player that uses the omapfb overlays" DEPENDS = "bzip2 lame ffmpeg virtual/kernel" LICENSE = "MIT" -PR = "r5" +PR = "r6" inherit module-base PV = "0.0+${PR}+gitr${SRCREV}" -SRCREV = "5d0a1fd4c9733ef8c57823c368e21688344bbeb4" +SRCREV = "0e4b69dbdc807da9b51e97fcffd8e26427b57162" SRC_URI = "git://git.mansr.com/${PN};protocol=git \ file://fbplay-static.diff;patch=1 " diff --git a/packages/freesmartphone/frameworkd/magician/.mtn2git_empty b/packages/freesmartphone/frameworkd/magician/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/freesmartphone/frameworkd/magician/.mtn2git_empty diff --git a/packages/freesmartphone/frameworkd/magician/frameworkd.conf b/packages/freesmartphone/frameworkd/magician/frameworkd.conf new file mode 100644 index 0000000000..cbafb1925f --- /dev/null +++ b/packages/freesmartphone/frameworkd/magician/frameworkd.conf @@ -0,0 +1,17 @@ +[idlenotifier] + +[input] +# magician doesn't have AUX, use the CAMERA key for now +# (it's in about the same place as AUX on gta01/02) +report1 = AUX,key,212,1 +report2 = POWER,key,116,1 +# magician doesn't use KEY_POWER2 for the charger, need to fix +report3 = CHARGER,key,356,0 +report4 = HEADSET,switch,2,0 + +[ophoned] +# Magician has TI Calypso +modemtype = ti_calypso + +[opreferencesd] +rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences diff --git a/packages/linux/linux-neuros_git.bb b/packages/linux/linux-neuros_git.bb index 1a5bd607fa..2fe367cd49 100644 --- a/packages/linux/linux-neuros_git.bb +++ b/packages/linux/linux-neuros_git.bb @@ -2,10 +2,10 @@ require linux.inc DESCRIPTION = "Linux kernel for Neuros OSD devices" -SRCREV = "a4701816600fbfc6d3144fa169a27a57d05d2682" +SRCREV = "e014243410af1c7c214e6974f5fc2f23c0a1c1ee" PV = "2.6.23-${PR}+git${SRCREV}" -PR = "r6" +PR = "r7" COMPATIBLE_MACHINE = "(neuros-osd|neuros-osd2)" diff --git a/packages/opkg-utils/.mtn2git_empty b/packages/opkg-utils/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/opkg-utils/.mtn2git_empty diff --git a/packages/opkg-utils/opkg-utils-native_svn.bb b/packages/opkg-utils/opkg-utils-native_svn.bb new file mode 100644 index 0000000000..0495b1eda3 --- /dev/null +++ b/packages/opkg-utils/opkg-utils-native_svn.bb @@ -0,0 +1,10 @@ +require opkg-utils_svn.bb + +RDEPENDS = "" + +inherit native + +# Avoid circular dependencies from package_ipk.bbclass +PACKAGES = "" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/opkg-utils" + diff --git a/packages/opkg-utils/opkg-utils_svn.bb b/packages/opkg-utils/opkg-utils_svn.bb new file mode 100644 index 0000000000..4c3c0905ea --- /dev/null +++ b/packages/opkg-utils/opkg-utils_svn.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "OPKG Package Manager Utilities" +SECTION = "base" +PRIORITY = "optional" +LICENSE = "GPL" +RDEPENDS = "python" +PR = "r2" + +SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http" + +S = "${WORKDIR}/opkg-utils" + +inherit autotools + +S = "${WORKDIR}/opkg-utils" + +do_stage () { + autotools_stage_all +} diff --git a/packages/pulseaudio/pulseaudio-0.9.10/libiconv.patch b/packages/pulseaudio/pulseaudio-0.9.10/libiconv.patch new file mode 100644 index 0000000000..273b446d78 --- /dev/null +++ b/packages/pulseaudio/pulseaudio-0.9.10/libiconv.patch @@ -0,0 +1,22 @@ +Index: pulseaudio-0.9.10/src/Makefile.am +=================================================================== +--- pulseaudio-0.9.10.orig/src/Makefile.am 2008-07-20 13:16:51.548858829 +0200 ++++ pulseaudio-0.9.10/src/Makefile.am 2008-07-20 13:43:39.842031837 +0200 +@@ -551,7 +551,7 @@ + + libpulse_la_CFLAGS = $(AM_CFLAGS) + libpulse_la_LDFLAGS = -version-info $(LIBPULSE_VERSION_INFO) -Wl,-version-script=$(srcdir)/map-file +-libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LIBICONV) ++libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LTLIBICONV) + + if HAVE_X11 + libpulse_la_CFLAGS += $(X_CFLAGS) +@@ -771,7 +771,7 @@ + + libpulsecore_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBOIL_CFLAGS) + libpulsecore_la_LDFLAGS = -version-info $(LIBPULSECORE_VERSION_INFO) +-libpulsecore_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LIBOIL_LIBS) $(LIBICONV) libspeex-resampler-fixed.la libspeex-resampler-float.la libffmpeg-resampler.la ++libpulsecore_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LIBOIL_LIBS) $(LTLIBICONV) libspeex-resampler-fixed.la libspeex-resampler-float.la libffmpeg-resampler.la + + ################################### + # Plug-in support libraries # diff --git a/packages/pulseaudio/pulseaudio_0.9.10.bb b/packages/pulseaudio/pulseaudio_0.9.10.bb index 8c858f9015..8da4a1c7da 100644 --- a/packages/pulseaudio/pulseaudio_0.9.10.bb +++ b/packages/pulseaudio/pulseaudio_0.9.10.bb @@ -1,7 +1,7 @@ require pulseaudio.inc DEPENDS += "dbus" -PR = "r3" +PR = "r4" SRC_URI += "\ file://disable-using-glibc-tls.patch;patch=1 \ @@ -10,6 +10,7 @@ SRC_URI += "\ # file://libtool2.patch;patch=1 \ file://2113.diff;patch=1;pnum=0 \ file://2114.diff;patch=1;pnum=0 \ + file://libiconv.patch;patch=1 \ " do_compile_prepend() { diff --git a/packages/speech-dispatcher/files/configure_fix.patch b/packages/speech-dispatcher/files/configure_fix.patch index 19feabf379..d593d4e0ab 100644 --- a/packages/speech-dispatcher/files/configure_fix.patch +++ b/packages/speech-dispatcher/files/configure_fix.patch @@ -1,8 +1,16 @@ -Index: speech-dispatcher-0.6.5/configure.in +Index: speech-dispatcher-0.6.6/configure.in =================================================================== ---- speech-dispatcher-0.6.5.orig/configure.in 2008-03-10 23:11:42.000000000 +0000 -+++ speech-dispatcher-0.6.5/configure.in 2008-03-10 23:14:02.000000000 +0000 -@@ -134,12 +134,15 @@ +--- speech-dispatcher-0.6.6.orig/configure.in 2008-07-20 13:10:44.208894676 +0200 ++++ speech-dispatcher-0.6.6/configure.in 2008-07-20 13:11:16.946093820 +0200 +@@ -5,6 +5,7 @@ + + dnl progs + AC_PROG_CC ++AC_PROG_CXX + + dnl info + AM_INIT_AUTOMAKE("speech-dispatcher", "`cat version.sh|grep '^VERSION'|awk -F= '{print $2}'`") +@@ -134,12 +135,15 @@ AC_SUBST(ibmtts_include) dnl check for espeak support @@ -18,10 +26,10 @@ Index: speech-dispatcher-0.6.5/configure.in AC_ARG_WITH(espeak, AS_HELP_STRING(--with-espeak, Compile with espeak support), if test $withval = "no"; then echo "Forced compilation without espeak support."; -Index: speech-dispatcher-0.6.5/src/modules/Makefile.am +Index: speech-dispatcher-0.6.6/src/modules/Makefile.am =================================================================== ---- speech-dispatcher-0.6.5.orig/src/modules/Makefile.am 2008-03-10 23:18:50.000000000 +0000 -+++ speech-dispatcher-0.6.5/src/modules/Makefile.am 2008-03-10 23:25:39.000000000 +0000 +--- speech-dispatcher-0.6.6.orig/src/modules/Makefile.am 2008-07-20 13:10:51.768895801 +0200 ++++ speech-dispatcher-0.6.6/src/modules/Makefile.am 2008-07-20 13:10:57.665559805 +0200 @@ -8,6 +8,7 @@ EXTRA_DIST = module_main.c module_utils_addvoice.c festival_client.c festival_client.h @@ -32,15 +40,15 @@ Index: speech-dispatcher-0.6.5/src/modules/Makefile.am if ibmtts_support @@ -45,6 +46,6 @@ sd_cicero_SOURCES = cicero.c module_utils.c module_utils.h - sd_cicero_LDADD = -lm -lpthread -ldotconf @glib_libs@ + sd_cicero_LDADD = -lpthread -ldotconf @glib_libs@ @gthread_libs@ -sd_espeak_SOURCES = espeak.c module_utils.c module_utils.h +sd_espeak_SOURCES = espeak.c module_utils.c module_utils.h dummy.cpp sd_espeak_LDFLAGS = -rpath '$(spdlibdir)' - sd_espeak_LDADD = -lsdaudio -lm -lespeak -lpthread -ldotconf @SNDFILE_LIBS@ @gthread_libs@ -Index: speech-dispatcher-0.6.5/src/modules/dummy.cpp + sd_espeak_LDADD = -lsdaudio -lespeak -lpthread -ldotconf @glib_libs@ @SNDFILE_LIBS@ @gthread_libs@ +Index: speech-dispatcher-0.6.6/src/modules/dummy.cpp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ speech-dispatcher-0.6.5/src/modules/dummy.cpp 2008-03-10 23:26:50.000000000 +0000 ++++ speech-dispatcher-0.6.6/src/modules/dummy.cpp 2008-07-20 13:10:57.668895216 +0200 @@ -0,0 +1 @@ + diff --git a/packages/speech-dispatcher/speech-dispatcher_0.6.6.bb b/packages/speech-dispatcher/speech-dispatcher_0.6.6.bb index 302f642d67..105c32312f 100644 --- a/packages/speech-dispatcher/speech-dispatcher_0.6.6.bb +++ b/packages/speech-dispatcher/speech-dispatcher_0.6.6.bb @@ -5,7 +5,7 @@ LICENSE = "GPLv2" DEPENDS = "espeak flite pulseaudio libdotconf glib-2.0" RPROVIDES_${PN} += "speechd" -PR = "r0" +PR = "r1" inherit autotools update-rc.d |