diff options
| author |   Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-06-12 22:21:07 +0200 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-06-12 22:21:07 +0200 |
| commit | c326ad5a1960df22c5efd71bd815b9b12688556e (patch) | |
| tree | 09bd868c4446f3510a070ed601e7b67c6b791cde | |
| parent | dd0fdfe9ed922189f4251c688b7a16faa76cd904 (diff) | |
| parent | 2bca6bd1a15123af28ff5ef8fd6ebb417a3a4dee (diff) | |
| download | openembedded-c326ad5a1960df22c5efd71bd815b9b12688556e.tar.gz | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Conflicts:
recipes/tgt/tgt_1.0.5.bb
969 files changed, 6885 insertions, 2309 deletions
diff --git a/classes/openmoko-base.bbclass b/classes/openmoko-base.bbclass index 8cbf7df884..f1ca536c54 100644 --- a/classes/openmoko-base.bbclass +++ b/classes/openmoko-base.bbclass @@ -13,7 +13,7 @@ def openmoko_base_get_subdir(d): SUBDIR = "${@openmoko_base_get_subdir(d)}" -SRC_URI := "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/${SUBDIR};module=${PN};proto=http" +SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/${SUBDIR};module=${PN};proto=http" S = "${WORKDIR}/${PN}" FILES_${PN} += "${datadir}/icons" diff --git a/classes/openmoko2.bbclass b/classes/openmoko2.bbclass index 233c721ff7..1dfef64963 100644 --- a/classes/openmoko2.bbclass +++ b/classes/openmoko2.bbclass @@ -22,7 +22,7 @@ def openmoko_two_get_subdir(d): LICENSE = "${@openmoko_two_get_license(d)}" SUBDIR = "${@openmoko_two_get_subdir(d)}" -SRC_URI := "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/${SUBDIR};module=${PN};proto=http" +SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/${SUBDIR};module=${PN};proto=http" S = "${WORKDIR}/${PN}" FILES_${PN} += "${datadir}/icons" diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index 68c973a9c7..8a98940c09 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -28,16 +28,6 @@ PSTAGE_NATIVEDEPENDS = "\ BB_STAMP_WHITELIST = "${PSTAGE_NATIVEDEPENDS}" -def _package_unlink (f): - import os, errno - try: - os.unlink(f) - return True - except OSError, e: - if e.errno == errno.ENOENT: - return False - raise - python () { pstage_allowed = True @@ -47,7 +37,7 @@ python () { path = bb.data.getVar('PSTAGE_PKGPATH', d, 1) path = path + bb.data.getVar('TMPDIR', d, 1).replace('/', '-') bb.data.setVar('PSTAGE_PKGPATH', path, d) - scan_cmd = "grep -Irl ${STAGING_DIR} ${PSTAGE_TMDPDIR_STAGE}" + scan_cmd = "grep -Irl ${STAGING_DIR} ${PSTAGE_TMPDIR_STAGE}" bb.data.setVar('PSTAGE_SCAN_CMD', scan_cmd, d) # PSTAGE_NATIVEDEPENDS lists the packages we need before we can use packaged @@ -106,7 +96,7 @@ def pstage_manualclean(srcname, destvarname, d): if (file == "staging.lock"): continue filepath = os.path.join(walkroot, file).replace(src, dest) - _package_unlink(filepath) + oe.path.remove(filepath) def pstage_set_pkgmanager(d): path = bb.data.getVar("PATH", d, 1) @@ -148,10 +138,10 @@ do_clean_prepend() { pstage_cleanpackage(removepkg, d) stagepkg = bb.data.expand("${PSTAGE_PKG}", d) - bb.note("Removing staging package %s" % base_path_out(stagepkg, d)) - # Add a wildcard to the end of stagepkg to also get its md5 - # if it's a fetched package - os.system('rm -rf ' + stagepkg + '*') + if os.path.exists(stagepkg): + bb.note("Removing staging package %s" % base_path_out(stagepkg, d)) + oe.path.remove(stagepkg) + oe.path.remove(stagepkg + ".md5") } staging_helper () { @@ -270,10 +260,9 @@ python packagestage_scenefunc () { # Remove the stamps and files we added above # FIXME - we should really only remove the stamps we added for fname in glob.glob(stamp + '.*'): - _package_unlink(fname) - - os.system(bb.data.expand("rm -rf ${WORKDIR}/tstage", d)) + oe.path.remove(fname) + oe.path.remove(bb.data.expand("${WORKDIR}/tstage", d)) if stageok: bb.note("Staging package found, using it for %s." % file) installcmd = bb.data.getVar("PSTAGE_INSTALL_CMD", d, 1) @@ -305,9 +294,9 @@ python packagedstage_stampfixing_eventhandler() { # We're targetting a task which was skipped with packaged staging # so we need to remove the autogenerated stamps. for task in taskscovered: - dir = "%s.do_%s" % (e.stampPrefix[fn], task) - _package_unlink(dir) - _package_unlink(stamp) + covered = "%s.do_%s" % (e.stampPrefix[fn], task) + oe.path.remove(covered) + oe.path.remove(stamp) } populate_sysroot_preamble () { @@ -417,7 +406,7 @@ python staging_package_libtoolhack () { fixmefd = open(fixmefn,"r") fixmefiles = fixmefd.readlines() fixmefd.close() - os.system('rm -f ' + fixmefn) + oe.path.remove(fixmefn) for file in fixmefiles: os.system("sed -i -e s:FIXMESTAGINGDIR:%s:g %s" % (staging, tmpdir + '/' + file)) except IOError: diff --git a/classes/qmake_base.bbclass b/classes/qmake_base.bbclass index 4fbe21f2e1..577c0fab3b 100644 --- a/classes/qmake_base.bbclass +++ b/classes/qmake_base.bbclass @@ -1,6 +1,6 @@ OE_QMAKE_PLATFORM = "${TARGET_OS}-oe-g++" -QMAKESPEC := "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}" +QMAKESPEC = "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}" # We override this completely to eliminate the -e normally passed in EXTRA_OEMAKE = ' MAKEFLAGS= ' diff --git a/classes/relocatable.bbclass b/classes/relocatable.bbclass index eb5b9e62ed..e4ababa57d 100644 --- a/classes/relocatable.bbclass +++ b/classes/relocatable.bbclass @@ -75,7 +75,8 @@ def process_dir (directory, d): if len(new_rpaths): args = ":".join(new_rpaths) #bb.note("Setting rpath for %s to %s" %(fpath,args)) - sub.call([cmd, '-r', args, fpath]) + oe_system(d, [cmd, '-r', args, fpath], shell=False, + stdout=open("/dev/null", "a")) if perms: os.chmod(fpath, perms) diff --git a/classes/utils.bbclass b/classes/utils.bbclass index 4e352e3b9c..64d6c231ec 100644 --- a/classes/utils.bbclass +++ b/classes/utils.bbclass @@ -61,13 +61,16 @@ def oe_popen(d, cmd, **kwargs): d.setVar("__oe_popen_env", env) kwargs["env"] = env + kwargs["close_fds"] = True kwargs["preexec_fn"] = subprocess_setup return Popen(cmd, **kwargs) -def oe_system(d, cmd): +def oe_system(d, cmd, **kwargs): """ Popen based version of os.system. """ - return oe_popen(d, cmd, shell=True).wait() + if not "shell" in kwargs: + kwargs["shell"] = True + return oe_popen(d, cmd, **kwargs).wait() # for MD5/SHA handling def base_chk_load_parser(config_paths): diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 12a5522029..397dbc2701 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -90,8 +90,8 @@ target_datadir := "${datadir}" # Architecture-dependent build variables. ################################################################## -BUILD_ARCH = "${@os.uname()[4]}" -BUILD_OS = "${@os.uname()[0].lower()}" +BUILD_ARCH := "${@os.uname()[4]}" +BUILD_OS := "${@os.uname()[0].lower()}" BUILD_VENDOR = "" BUILD_SYS = "${BUILD_ARCH}${BUILD_VENDOR}-${BUILD_OS}" BUILD_PREFIX = "" @@ -128,7 +128,8 @@ EXEEXT = "${HOST_EXEEXT}" BASE_PACKAGE_ARCH = "${HOST_ARCH}" PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}" PACKAGE_EXTRA_ARCHS ?= "" -MACHINE_ARCH = "${@[bb.data.getVar('BASE_PACKAGE_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}" +MACHINE_ARCH = "${@oe.utils.ifelse(bool(d.getVar('MACHINE', True)), '${MACHINE}', \ + 'BASE_PACKAGE_ARCH')}" PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}" MULTIMACH_ARCH = "${PACKAGE_ARCH}" @@ -174,12 +175,13 @@ ASSUME_PROVIDED = "\ ################################################################## # Package default variables. ################################################################## -PN = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[0] or 'defaultpkgname'}" -PV = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[1] or '1.0'}" -PR = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[2] or 'r0'}" +PN = "${@bb.parse.BBHandler.vars_from_file('${FILE}', d)[0] or 'defaultpkgname'}" +PV = "${@bb.parse.BBHandler.vars_from_file('${FILE}', d)[1] or '1.0'}" +PR = "${@bb.parse.BBHandler.vars_from_file('${FILE}', d)[2] or 'r0'}" PF = "${PN}-${EXTENDPE}${PV}-${PR}" -EXTENDPE = "${@['','${PE\x7d_'][bb.data.getVar('PE',d,1) > 0]}" -EXTENDPEVER = "${@['','${PE\x7d:'][bb.data.getVar('PE',d,1) > 0]}" +PE ?= "0" +EXTENDPE = "${@int('${PE}') and '${PE}_' or ''}" +EXTENDPEVER = "${@int('${PE}') and '${PE}:' or ''}" EXTENDPV = "${EXTENDPEVER}${PV}-${PR}${DISTRO_PR}" P = "${PN}-${PV}" @@ -191,7 +193,7 @@ MACHINE_KERNEL_PR = "" # Automatically derives "foo" from "foo-native", "foo-cross" or "foo-initial" # otherwise it is the same as PN and P SPECIAL_PKGSUFFIX = "-native -cross -initial -intermediate -nativesdk -crosssdk -cross-canadian -sdk" -BPN = "${@base_prune_suffix(bb.data.getVar('PN', d, True), bb.data.getVar('SPECIAL_PKGSUFFIX', d, True).split(), d)}" +BPN = "${@base_prune_suffix('${PN}', '${SPECIAL_PKGSUFFIX}'.split(), d)}" BP = "${BPN}-${PV}" # Package info. @@ -272,7 +274,7 @@ export MANIFEST = "${FILESDIR}/manifest" FILE_DIRNAME = "${@os.path.dirname(bb.data.getVar('FILE', d))}" FILESPATHBASE = "${FILE_DIRNAME}" FILESPATHPKG = "${PF}:${P}:${PN}:${BP}:${BPN}:files:." -FILESPATH = "${@':'.join([os.path.normpath(os.path.join(fp, p, o)) for fp in d.getVar('FILESPATHBASE', 1).split(':') for p in d.getVar('FILESPATHPKG', 1).split(':') for o in (d.getVar('OVERRIDES', 1) + ':').split(':') if os.path.exists(os.path.join(fp, p, o))])}" +FILESPATH = "${@':'.join([os.path.normpath(os.path.join(fp, p, o)) for fp in d.getVar('FILESPATHBASE', 1).split(':') for p in d.getVar('FILESPATHPKG', 1).split(':') for o in (d.getVar('OVERRIDES', 1) + ':').split(':')])}" FILESDIR = "${@bb.which(d.getVar('FILESPATH', 1), '.')}" ################################################################## diff --git a/conf/distro/include/kaeilos-2009-preferred-versions.inc b/conf/distro/include/kaeilos-2009-preferred-versions.inc index 55fd6dbda8..34da301af2 100644 --- a/conf/distro/include/kaeilos-2009-preferred-versions.inc +++ b/conf/distro/include/kaeilos-2009-preferred-versions.inc @@ -4,7 +4,7 @@ #@NAME: KaeilOS(R) - http://www.kaeilos.com #@DESCRIPTION: KaeilOS Linux Distribution preferred version #@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com> -#@VERSION: 20-01-2010 +#@VERSION: 09-06-2010 # # KaeilOS is a registered trade mark of KOAN - Bergamo - Italia # Product website : http://www.KaeilOS.com @@ -12,7 +12,7 @@ PREFERRED_VERSION_autoconf = "2.65" PREFERRED_VERSION_autoconf-native = "2.65" -PREFERRED_VERSION_automake-native = "1.10.3" +PREFERRED_VERSION_automake-native = "1.11.1" PREFERRED_VERSION_busybox = "1.13.2" PREFERRED_VERSION_cairo = "1.8.10" PREFERRED_VERSION_dbus = "1.2.22" @@ -87,5 +87,9 @@ SRCREV_pn-mutter ?= "aff4cf110307e149d3497d20543cde27b9699758" SRCREV_pn-twitter-glib ?= "849bec29292df88590e0b2898b50b9b8d766817e" SRCREV_pn-xf86-video-psb ?= "b6b3bba06fe5a3fe0b1bd6e31a7369dd83812bab" - +# +# Apache2 +# +PREFERRED_VERSION_apache2 ?= "2.2.3" +PREFERRED_VERSION_apache2-native ?= "2.2.3" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 6b2aa8fc72..de841adb86 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -1,5 +1,5 @@ # this is alphabetical! # only SRCREVs included in more recipes should be here, otherwise put sane SRCREV to recipe directly -OPKG_SRCREV ?= "531" +OPKG_SRCREV ?= "536" EFL_SRCREV ?= "49539" diff --git a/conf/distro/minimal-uclibc.conf b/conf/distro/minimal-uclibc.conf index df727697e2..a0af3a6640 100644 --- a/conf/distro/minimal-uclibc.conf +++ b/conf/distro/minimal-uclibc.conf @@ -38,4 +38,5 @@ require conf/distro/minimal.conf DISTRO_FEATURES = "nfs smbfs wifi ppp alsa ext2 vfat pcmcia usbgadget usbhost pci" # Following features are for ARM and E500 based machines DISTRO_FEATURES += "eabi" - +# pam is needed on uclibc if using shadow +DISTRO_FEATURES += "pam" diff --git a/conf/machine/lite5200.conf b/conf/machine/lite5200.conf index 16a723cd1c..4a963ce822 100644 --- a/conf/machine/lite5200.conf +++ b/conf/machine/lite5200.conf @@ -1,7 +1,10 @@ TARGET_ARCH = "powerpc" UBOOT_MACHINE = "Lite5200" -SERIAL_CONSOLE="38400 ttyS0" +SERIAL_CONSOLE="115200 ttyPSC0" IMAGE_FSTYPES = "jffs2 tar.bz2" +PREFERRED_PROVIDER_virtual/kernel = "linux" +KERNEL_IMAGETYPE = "uImage" + require conf/machine/include/tune-ppc603e.inc diff --git a/contrib/qemu/run-qemu.sh b/contrib/qemu/run-qemu.sh index ec863c2a12..7f832609a1 100755 --- a/contrib/qemu/run-qemu.sh +++ b/contrib/qemu/run-qemu.sh @@ -55,7 +55,7 @@ # is disabled supported_archs="{arm mips ppc sh4 x86}" -if [ $# -ne 2 ]; then +if [ $# -lt 2 ]; then echo -en " Usage: `basename $0` <arch> <libc> where <arch> is one $supported_archs @@ -83,7 +83,7 @@ case $arch in rootdisk="sda" qemuopts="-nographic" kernel="zImage" - image="minimalist-image" + image="native-sdk-image" ;; mips) address="10.0.1.102" @@ -187,7 +187,7 @@ else netopt="-net none" fi -if [ "x$2" == "xsingle" ]; then +if [ "x$3" == "xsingle" ]; then init="init=/bin/sh" else init="" diff --git a/lib/oe/patch.py b/lib/oe/patch.py index 7f6b0fe8de..607ad44321 100644 --- a/lib/oe/patch.py +++ b/lib/oe/patch.py @@ -230,15 +230,10 @@ class QuiltTree(PatchSet): if not self.initialized: self.InitFromDir() PatchSet.Import(self, patch, force) - - args = ["import", "-p", patch["strippath"]] - if force: - args.append("-f") - args.append("-dn") - args.append(patch["file"]) - - self._runcmd(args) - + os.symlink(patch["file"], self._quiltpatchpath(patch["file"])) + f = open(os.path.join(self.dir, "patches","series"), "a"); + f.write(os.path.basename(patch["file"]) + " -p" + patch["strippath"]+"\n") + f.close() patch["quiltfile"] = self._quiltpatchpath(patch["file"]) patch["quiltfilemd5"] = bb.utils.md5_file(patch["quiltfile"]) diff --git a/lib/oe/path.py b/lib/oe/path.py index 8902951581..a145456659 100644 --- a/lib/oe/path.py +++ b/lib/oe/path.py @@ -42,3 +42,14 @@ def format_display(path, metadata): return path else: return rel + +def remove(path): + """Equivalent to rm -f or rm -rf""" + import os, errno, shutil + try: + os.unlink(path) + except OSError, exc: + if exc.errno == errno.EISDIR: + shutil.rmtree(path) + elif exc.errno != errno.ENOENT: + raise diff --git a/recipes/abiword/abiword-embedded_2.4.6.bb b/recipes/abiword/abiword-embedded_2.4.6.bb index 84bb8f1706..8ec952648f 100644 --- a/recipes/abiword/abiword-embedded_2.4.6.bb +++ b/recipes/abiword/abiword-embedded_2.4.6.bb @@ -2,8 +2,8 @@ require abiword.inc EXTRA_OECONF += "--enable-embedded" -RCONFLICTS = "abiword" -RPROVIDES += "abiword" +RCONFLICTS_${PN} = "abiword" +RPROVIDES_${PN} += "abiword" do_compile_prepend() { cp ${S}/src/af/xap/unix/hildon/xap_EmbeddedFeatures.h ${S}/src/af/xap/unix/ diff --git a/recipes/abiword/abiword-embedded_2.5.2.bb b/recipes/abiword/abiword-embedded_2.5.2.bb index 67f516e10a..459cc277ed 100644 --- a/recipes/abiword/abiword-embedded_2.5.2.bb +++ b/recipes/abiword/abiword-embedded_2.5.2.bb @@ -4,8 +4,8 @@ EXTRA_OECONF += "--enable-embedded" S = "${WORKDIR}/abiword-${PV}" -RCONFLICTS = "abiword" -RPROVIDES += "abiword" +RCONFLICTS_${PN} = "abiword" +RPROVIDES_${PN} += "abiword" diff --git a/recipes/abiword/abiword-embedded_2.6.4.bb b/recipes/abiword/abiword-embedded_2.6.4.bb index 35808413cd..13951f862c 100644 --- a/recipes/abiword/abiword-embedded_2.6.4.bb +++ b/recipes/abiword/abiword-embedded_2.6.4.bb @@ -4,8 +4,8 @@ EXTRA_OECONF += "--enable-embedded" S = "${WORKDIR}/abiword-${PV}" -RCONFLICTS = "abiword" -RPROVIDES += "abiword" +RCONFLICTS_${PN} = "abiword" +RPROVIDES_${PN} += "abiword" SRC_URI[md5sum] = "16748b2d6e318e0e2a25581005e1943a" SRC_URI[sha256sum] = "4d2d7a6b69b00ffe603a136a9df7ecda9f43448c7bc723503e76eaec9ab8e9fe" diff --git a/recipes/abiword/abiword-embedded_2.6.8.bb b/recipes/abiword/abiword-embedded_2.6.8.bb index fc6e2d504b..ca48d77fef 100644 --- a/recipes/abiword/abiword-embedded_2.6.8.bb +++ b/recipes/abiword/abiword-embedded_2.6.8.bb @@ -4,8 +4,8 @@ EXTRA_OECONF += "--enable-embedded" S = "${WORKDIR}/abiword-${PV}" -RCONFLICTS = "abiword" -RPROVIDES += "abiword" +RCONFLICTS_${PN} = "abiword" +RPROVIDES_${PN} += "abiword" SRC_URI[md5sum] = "fab04d8ef999c303f720197adf261310" SRC_URI[sha256sum] = "b6656a0da13d94b334f02637c89d8fe13aa54752040ad1b8f14f668d8cb96e93" diff --git a/recipes/abiword/abiword-plugins_2.4.6.bb b/recipes/abiword/abiword-plugins_2.4.6.bb index 805576140b..8acfae3523 100644 --- a/recipes/abiword/abiword-plugins_2.4.6.bb +++ b/recipes/abiword/abiword-plugins_2.4.6.bb @@ -5,7 +5,7 @@ LICENSE = "GPLv2" DEPENDS = "libwpd librsvg goffice poppler" RDEPENDS_${PN} = "abiword" -PR = "r1" +PR = "r2" SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \ file://abiword-plugin-pdf-poppler.patch;striplevel=2" diff --git a/recipes/abiword/abiword-plugins_2.5.1.bb b/recipes/abiword/abiword-plugins_2.5.1.bb index fd524f9fad..10baa041a1 100644 --- a/recipes/abiword/abiword-plugins_2.5.1.bb +++ b/recipes/abiword/abiword-plugins_2.5.1.bb @@ -5,7 +5,7 @@ LICENSE = "GPLv2" DEPENDS = "libwpd librsvg goffice poppler libglade" RDEPENDS_${PN} = "abiword" -PR = "r1" +PR = "r2" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/abiword/abiword-plugins_2.5.2.bb b/recipes/abiword/abiword-plugins_2.5.2.bb index eb4d007820..ec905f9ddc 100644 --- a/recipes/abiword/abiword-plugins_2.5.2.bb +++ b/recipes/abiword/abiword-plugins_2.5.2.bb @@ -5,7 +5,7 @@ LICENSE = "GPLv2" DEPENDS = "boost loudmouth libwpd librsvg goffice poppler libglade" RDEPENDS_${PN} = "abiword" -PR = "r1" +PR = "r2" DEFAULT_PREFERENCE = "1" diff --git a/recipes/abiword/abiword-plugins_2.6.4.bb b/recipes/abiword/abiword-plugins_2.6.4.bb index 333e9b02ad..5e09b0d3ef 100644 --- a/recipes/abiword/abiword-plugins_2.6.4.bb +++ b/recipes/abiword/abiword-plugins_2.6.4.bb @@ -5,7 +5,7 @@ LICENSE = "GPLv2" DEPENDS = "asio boost loudmouth libwpd librsvg goffice poppler libglade" RDEPENDS_${PN} = "abiword" -PR = "r1" +PR = "r2" SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz;name=plugins \ http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz;name=archive \ diff --git a/recipes/abiword/abiword.inc b/recipes/abiword/abiword.inc index 0cbb8dba90..25a6f71639 100644 --- a/recipes/abiword/abiword.inc +++ b/recipes/abiword/abiword.inc @@ -6,7 +6,7 @@ DEPENDS = "perl-native libgsf libgnomeprint libgnomeprintui libglade libfrib RDEPENDS_${PN} = "enchant " RDEPENDS_linux += "glibc-gconv-ibm850 glibc-gconv-cp1252 \ glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" -PR = "r2" +PR = "r3" SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz" S = "${WORKDIR}/abiword-${PV}/abi" diff --git a/recipes/abiword/abiword_2.4.6.bb b/recipes/abiword/abiword_2.4.6.bb index 7911571079..af0b5d4a58 100644 --- a/recipes/abiword/abiword_2.4.6.bb +++ b/recipes/abiword/abiword_2.4.6.bb @@ -1,6 +1,6 @@ require abiword.inc -RCONFLICTS = "abiword-embedded" +RCONFLICTS_${PN} = "abiword-embedded" SRC_URI[md5sum] = "30fbd0a9b539f15f54f90d3812a75266" diff --git a/recipes/abiword/abiword_2.5.1.bb b/recipes/abiword/abiword_2.5.1.bb index fdf8fc6be1..eaee1640ca 100644 --- a/recipes/abiword/abiword_2.5.1.bb +++ b/recipes/abiword/abiword_2.5.1.bb @@ -2,9 +2,9 @@ require abiword-2.5.inc DEFAULT_PREFERENCE = "-1" -PR = "r2" +PR = "r3" -RCONFLICTS = "abiword-embedded" +RCONFLICTS_${PN} = "abiword-embedded" SRC_URI[md5sum] = "11d022458e0e090846b35ed4873c2e6e" SRC_URI[sha256sum] = "482891fb0e376e2aaeee25afa8b4913e6dc50f4fdc280f9f152b3ee8745d735d" diff --git a/recipes/abiword/abiword_2.5.2.bb b/recipes/abiword/abiword_2.5.2.bb index a9e644db0c..f4202aa4ad 100644 --- a/recipes/abiword/abiword_2.5.2.bb +++ b/recipes/abiword/abiword_2.5.2.bb @@ -2,9 +2,9 @@ require abiword-2.5.inc DEFAULT_PREFERENCE = "-1" -PR = "r1" +PR = "r2" -RCONFLICTS = "abiword-embedded" +RCONFLICTS_${PN} = "abiword-embedded" SRC_URI[md5sum] = "bbc9c124f8072875129bd67092f0fa0b" SRC_URI[sha256sum] = "db34eeb5457fb7572fc76ec2a73cdb4f7a67307e7468b6c4bde820b58c598b3f" diff --git a/recipes/abiword/abiword_2.6.0.bb b/recipes/abiword/abiword_2.6.0.bb index 9e9e43b3ae..d017966577 100644 --- a/recipes/abiword/abiword_2.6.0.bb +++ b/recipes/abiword/abiword_2.6.0.bb @@ -1,6 +1,6 @@ require abiword-2.5.inc -RCONFLICTS = "abiword-embedded" +RCONFLICTS_${PN} = "abiword-embedded" SRC_URI[md5sum] = "d627a5d1061160c683f2257da498355b" SRC_URI[sha256sum] = "35b1ced07bed8706a81c2c26c42bf95bdf7a4a9c1fba98935cc5ecb5c674f0bb" diff --git a/recipes/abiword/abiword_2.6.3.bb b/recipes/abiword/abiword_2.6.3.bb index 960ae979ae..b086795309 100644 --- a/recipes/abiword/abiword_2.6.3.bb +++ b/recipes/abiword/abiword_2.6.3.bb @@ -1,8 +1,8 @@ require abiword-2.5.inc -PR = "r1" +PR = "r2" -RCONFLICTS = "abiword-embedded" +RCONFLICTS_${PN} = "abiword-embedded" FILES_${PN} += "${datadir}/mime-info" FILES_abiword-strings += "${datadir}/abiword-${SHRT_VER}/strings" diff --git a/recipes/abiword/abiword_2.6.4.bb b/recipes/abiword/abiword_2.6.4.bb index 711074e798..284e564543 100644 --- a/recipes/abiword/abiword_2.6.4.bb +++ b/recipes/abiword/abiword_2.6.4.bb @@ -1,8 +1,8 @@ require abiword-2.5.inc -PR = "r2" +PR = "r3" -RCONFLICTS = "abiword-embedded" +RCONFLICTS_${PN} = "abiword-embedded" FILES_${PN} += "${datadir}/mime-info" FILES_abiword-strings += "${datadir}/abiword-${SHRT_VER}/strings" diff --git a/recipes/abiword/abiword_2.6.8.bb b/recipes/abiword/abiword_2.6.8.bb index f18bd430bb..4399371bc8 100644 --- a/recipes/abiword/abiword_2.6.8.bb +++ b/recipes/abiword/abiword_2.6.8.bb @@ -1,6 +1,6 @@ require abiword-2.5.inc -RCONFLICTS = "abiword-embedded" +RCONFLICTS_${PN} = "abiword-embedded" FILES_${PN} += "${datadir}/mime-info" FILES_abiword-strings += "${datadir}/abiword-${SHRT_VER}/strings" diff --git a/recipes/abiword/abiword_2.8.1.bb b/recipes/abiword/abiword_2.8.1.bb index 96bc03c17e..42ed2e3b68 100644 --- a/recipes/abiword/abiword_2.8.1.bb +++ b/recipes/abiword/abiword_2.8.1.bb @@ -1,6 +1,6 @@ require abiword-2.5.inc -PR = "r5" +PR = "r6" SRC_URI = "http://www.abisource.com/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \ file://autogen-common.sh \ @@ -18,7 +18,7 @@ EXTRA_OECONF = " --disable-static \ --with-libwmf-config=${STAGING_DIR} \ " DEPENDS += " libwmf-native gtkmathview " -RCONFLICTS = "abiword-embedded" +RCONFLICTS_${PN} = "abiword-embedded" FILES_${PN} += "${libdir}/libabiword-*.so ${datadir}/mime-info ${datadir}/abiword-${SHRT_VER}/certs ${datadir}/abiword-${SHRT_VER}/ui ${datadir}/abiword-${SHRT_VER}/xsl* ${datadir}/abiword-${SHRT_VER}/mime-info ${datadir}/abiword-${SHRT_VER}/Pr*.xml" FILES_abiword-strings += "${datadir}/abiword-${SHRT_VER}/strings" diff --git a/recipes/accelges/accelges_svn.bb b/recipes/accelges/accelges_svn.bb index 941a5a6202..21efa56d46 100644 --- a/recipes/accelges/accelges_svn.bb +++ b/recipes/accelges/accelges_svn.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" SECTION = "openmoko/utilities" PV = "0.2+svnr${SRCPV}" -PR = "r2" +PR = "r3" PE = "1" SRCREV = "206" diff --git a/recipes/aceofpenguins/aceofpenguins-launcher_0.4.bb b/recipes/aceofpenguins/aceofpenguins-launcher_0.4.bb index 9e69000a77..3e01b62d1f 100644 --- a/recipes/aceofpenguins/aceofpenguins-launcher_0.4.bb +++ b/recipes/aceofpenguins/aceofpenguins-launcher_0.4.bb @@ -8,7 +8,7 @@ SECTION = "x11/application" PACKAGE_ARCH = "all" -PR = "r0" +PR = "r1" inherit setuptools diff --git a/recipes/angstrom/angstrom-x11-base-depends.bb b/recipes/angstrom/angstrom-x11-base-depends.bb index ec55f60087..7e2d9ee5e5 100644 --- a/recipes/angstrom/angstrom-x11-base-depends.bb +++ b/recipes/angstrom/angstrom-x11-base-depends.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r43" +PR = "r44" inherit task diff --git a/recipes/angstrom/angstrom-zeroconf-audio.bb b/recipes/angstrom/angstrom-zeroconf-audio.bb index 66290504e2..5d6d9ff480 100644 --- a/recipes/angstrom/angstrom-zeroconf-audio.bb +++ b/recipes/angstrom/angstrom-zeroconf-audio.bb @@ -13,7 +13,7 @@ RDEPENDS_${PN} = " \ pulseaudio-module-zeroconf-publish \ " -PR = "r3" +PR = "r4" S = "${WORKDIR}" diff --git a/recipes/angstrom/epiphany-firefox-replacement.bb b/recipes/angstrom/epiphany-firefox-replacement.bb index 50de217f82..ca08cf348c 100644 --- a/recipes/angstrom/epiphany-firefox-replacement.bb +++ b/recipes/angstrom/epiphany-firefox-replacement.bb @@ -1,7 +1,7 @@ # This is a hack because $*#($*($# e17 doesn't check if firefox is present and puts it in the menu blindly RDEPENDS_${PN} = "epiphany" -RCONFLICTS = "firefox" +RCONFLICTS_${PN} = "firefox" do_install() { install -d ${D}/${bindir} diff --git a/recipes/anki/anki_0.4.3.bb b/recipes/anki/anki_0.4.3.bb index 93682f7a77..b1a2158f97 100644 --- a/recipes/anki/anki_0.4.3.bb +++ b/recipes/anki/anki_0.4.3.bb @@ -1,7 +1,7 @@ require anki.inc RDEPENDS_${PN} += "libanki" -PR = "r2" +PR = "r3" export PV := "${PV}" diff --git a/recipes/aoetools/aoetools_29.bb b/recipes/aoetools/aoetools_29.bb index 638d05ce44..0e4eee3977 100644 --- a/recipes/aoetools/aoetools_29.bb +++ b/recipes/aoetools/aoetools_29.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ATA over Ethernet Tools" SECTION = "console/network" RRECOMMENDS_${PN} = "kernel-module-aoe" -PR = "r0" +PR = "r1" LICENSE = "GPL" SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz" diff --git a/recipes/apache2/apache2_2.2.14.bb b/recipes/apache2/apache2_2.2.14.bb index 2018dda753..1c425b70fe 100644 --- a/recipes/apache2/apache2_2.2.14.bb +++ b/recipes/apache2/apache2_2.2.14.bb @@ -3,7 +3,7 @@ DESCRIPTION = "The apache v2 web server" DEPENDS = "apache2-native openssl expat pcre" RDEPENDS_${PN} += "openssl" -PR = "r1" +PR = "r2" SRC_URI = "http://apache.mirrors.tds.net/httpd/httpd-${PV}.tar.bz2 \ file://apr-sockets-patch;apply=yes \ diff --git a/recipes/apache2/apache2_2.2.3.bb b/recipes/apache2/apache2_2.2.3.bb index 8d631f14a0..9280a3e729 100644 --- a/recipes/apache2/apache2_2.2.3.bb +++ b/recipes/apache2/apache2_2.2.3.bb @@ -3,7 +3,7 @@ DESCRIPTION = "The apache v2 web server" DEPENDS = "apache2-native openssl expat pcre" RDEPENDS_${PN} += "openssl" -PR = "r6" +PR = "r7" SRC_URI = "http://apache.mirrors.tds.net/httpd/httpd-2.2.3.tar.bz2 \ file://dftables-makefile-patch;apply=yes \ diff --git a/recipes/application-registry/application-registry_0.1.bb b/recipes/application-registry/application-registry_0.1.bb index 2dce770d11..3ea4762269 100644 --- a/recipes/application-registry/application-registry_0.1.bb +++ b/recipes/application-registry/application-registry_0.1.bb @@ -1,4 +1,4 @@ -PR = "r3" +PR = "r4" DESCRIPTION = "additional application registry files" DEPENDS = "shared-mime-info" diff --git a/recipes/apt/apt_0.7.14.bb b/recipes/apt/apt_0.7.14.bb index d6f4623427..1f31b0860a 100644 --- a/recipes/apt/apt_0.7.14.bb +++ b/recipes/apt/apt_0.7.14.bb @@ -5,7 +5,7 @@ require apt.inc SRC_URI += "file://no-ko-translation.patch \ file://use-host.patch " -PR = "r3" +PR = "r4" SRC_URI += "file://nodoc.patch" diff --git a/recipes/apt/apt_0.7.19.bb b/recipes/apt/apt_0.7.19.bb index bfc85da609..23b321733c 100644 --- a/recipes/apt/apt_0.7.19.bb +++ b/recipes/apt/apt_0.7.19.bb @@ -5,7 +5,7 @@ require apt.inc SRC_URI += "file://no-ko-translation.patch \ file://use-host.patch " -PR = "r3" +PR = "r4" SRC_URI += "file://nodoc.patch" diff --git a/recipes/apt/apt_0.7.20.2.bb b/recipes/apt/apt_0.7.20.2.bb index e635841027..bd0f41ebae 100644 --- a/recipes/apt/apt_0.7.20.2.bb +++ b/recipes/apt/apt_0.7.20.2.bb @@ -6,7 +6,7 @@ require apt.inc SRC_URI += "file://no-doxygen.patch \ file://no-ko-translation.patch \ file://use-host.patch " -PR = "r1" +PR = "r2" require apt-package.inc diff --git a/recipes/ark3116/ark3116_0.4.1.bb b/recipes/ark3116/ark3116_0.4.1.bb index e308dc244f..89ae45d0d0 100644 --- a/recipes/ark3116/ark3116_0.4.1.bb +++ b/recipes/ark3116/ark3116_0.4.1.bb @@ -6,7 +6,7 @@ HOMEPAGE = "http://avr.auctionant.de/ark3116_linux_driver/" PRIORITY = "optional" SECTION = "kernel/modules" LICENSE = "GPL" -PR = "r2" +PR = "r3" RRECOMMENDS_${PN} = "kernel-module-usbserial" SRC_URI = "http://avr.auctionant.de/ark3116_linux_driver/releases/ark3116-0.4.1.tgz \ diff --git a/recipes/arpwatch/arpwatch_2.1a15.bb b/recipes/arpwatch/arpwatch_2.1a15.bb index 704cc862d1..92cadbff04 100644 --- a/recipes/arpwatch/arpwatch_2.1a15.bb +++ b/recipes/arpwatch/arpwatch_2.1a15.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www-nrg.ee.lbl.gov/" SECTION = "network" LICENSE = "BSD" RRECOMMENDS_${PN} = "arpwatch-data" -PR = "r2" +PR = "r3" SRC_URI = "ftp://ftp.ee.lbl.gov/arpwatch-${PV}.tar.gz \ file://05debian_fhs.patch \ diff --git a/recipes/at/at-3.1.8/use-ldflags.patch b/recipes/at/at-3.1.8/use-ldflags.patch new file mode 100644 index 0000000000..57e411ddbc --- /dev/null +++ b/recipes/at/at-3.1.8/use-ldflags.patch @@ -0,0 +1,18 @@ +--- a/Makefile.in 2010-04-16 17:35:22.000000000 +0400 ++++ b/Makefile.in 2010-04-16 17:36:37.000000000 +0400 +@@ -70,13 +70,13 @@ LIST = Filelist Filelist.asc + all: at atd atrun + + at: $(ATOBJECTS) +- $(CC) $(CFLAGS) -o at $(ATOBJECTS) $(LIBS) $(LEXLIB) ++ $(CC) $(CFLAGS) -o at $(ATOBJECTS) $(LIBS) $(LEXLIB) $(LDFLAGS) + rm -f $(CLONES) + $(LN_S) -f at atq + $(LN_S) -f at atrm + + atd: $(RUNOBJECTS) +- $(CC) $(CFLAGS) -o atd $(RUNOBJECTS) $(LIBS) ++ $(CC) $(CFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(LDFLAGS) + + y.tab.c y.tab.h: parsetime.y + $(YACC) -d parsetime.y diff --git a/recipes/at/at_3.1.8.bb b/recipes/at/at_3.1.8.bb index e6aaba4522..052ab9dafa 100644 --- a/recipes/at/at_3.1.8.bb +++ b/recipes/at/at_3.1.8.bb @@ -1,15 +1,16 @@ DESCRIPTION = "Delayed job execution and batch processing." SECTION = "base" LICENSE="BSD" -DEPENDS = "flex" -RCONFLICTS = "atd" -RREPLACES = "atd" +DEPENDS = "flex-native" +RCONFLICTS_${PN} = "atd" +RREPLACES_${PN} = "atd" -PR = "r1" +PR = "r3" SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}-11.tar.gz \ file://configure.patch \ - file://nonrootinstall.patch" + file://nonrootinstall.patch \ + file://use-ldflags.patch" inherit autotools diff --git a/recipes/at76c503a/at76c503a-modules_0.17.bb b/recipes/at76c503a/at76c503a-modules_0.17.bb index bc588dfea1..e291227974 100644 --- a/recipes/at76c503a/at76c503a-modules_0.17.bb +++ b/recipes/at76c503a/at76c503a-modules_0.17.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Driver for at76 based usb-wifi devices" SECTION = "base" LICENSE = "GPL" -PR = "r2" +PR = "r3" RDEPENDS_${PN} = "at76c503-firmware" diff --git a/recipes/atd/atd_0.70.bb b/recipes/atd/atd_0.70.bb index 5ffb3869f3..67595dd8d0 100644 --- a/recipes/atd/atd_0.70.bb +++ b/recipes/atd/atd_0.70.bb @@ -1,10 +1,10 @@ DESCRIPTION = "Lightweight At Daemon" SECTION = "base" LICENSE = "GPLv2" -RCONFLICTS = "at" -RREPLACES = "at" +RCONFLICTS_${PN} = "at" +RREPLACES_${PN} = "at" -PR = "r5" +PR = "r6" SRC_URI = "${HANDHELDS_CVS};module=apps/atd;tag=ATD-0_70 \ file://atd-startup.patch;striplevel=0" diff --git a/recipes/atd/atd_0.80.bb b/recipes/atd/atd_0.80.bb index 6ec1928def..2c634f82f0 100644 --- a/recipes/atd/atd_0.80.bb +++ b/recipes/atd/atd_0.80.bb @@ -1,10 +1,10 @@ DESCRIPTION = "Lightweight At Daemon" SECTION = "base" LICENSE = "GPLv2" -RCONFLICTS = "at" -RREPLACES = "at" +RCONFLICTS_${PN} = "at" +RREPLACES_${PN} = "at" -PR = "r1" +PR = "r2" SRC_URI = "http://projects.linuxtogo.org/frs/download.php/222/${P}.tar.gz" diff --git a/recipes/balsa/balsa_2.0.17.bb b/recipes/balsa/balsa_2.0.17.bb index 9f53b4762f..b374a7835f 100644 --- a/recipes/balsa/balsa_2.0.17.bb +++ b/recipes/balsa/balsa_2.0.17.bb @@ -5,7 +5,7 @@ SECTION = "x11/network" LICENSE = "GPL" DEPENDS = "libesmtp glib-2.0 libgnome libgnomeui gtk+ gnome-vfs libbonobo aspell libpcre libtool openssl gtkhtml-3.0" RDEPENDS_${PN} = "gdk-pixbuf-loader-xpm" -PR = "r3" +PR = "r4" SRC_URI = "http://talinux.fi.tal.org/pub/talinux/sources/balsa-${PV}.tar.bz2 \ file://libmutt-cross.patch \ diff --git a/recipes/barnyard/barnyard_0.2.0.bb b/recipes/barnyard/barnyard_0.2.0.bb index 8ce14a0c28..686b7f0e5f 100644 --- a/recipes/barnyard/barnyard_0.2.0.bb +++ b/recipes/barnyard/barnyard_0.2.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.snort.org/" LICENSE = "QPL" DEPENDS = "libpcap" RDEPENDS_${PN} = "libpcap" -PR = "r1" +PR = "r2" SRC_URI = " http://dl.snort.org/barnyard/${P}.tar.gz;name=tarball \ " diff --git a/recipes/batmand/batmand.inc b/recipes/batmand/batmand.inc index ef87dad9f7..24019dac4d 100644 --- a/recipes/batmand/batmand.inc +++ b/recipes/batmand/batmand.inc @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" HOMEPAGE = "http://www.open-mesh.net/" -INC_PR = "r1" +INC_PR = "r2" RDEPENDS_${PN} = "kernel-module-tun" diff --git a/recipes/blipomoko/blipomoko_git.bb b/recipes/blipomoko/blipomoko_git.bb index 8b1cc9bea3..1b450f1d78 100644 --- a/recipes/blipomoko/blipomoko_git.bb +++ b/recipes/blipomoko/blipomoko_git.bb @@ -10,7 +10,7 @@ S = "${WORKDIR}/git" SRCREV = "93295f36f7b45c691df247cb2a65227facf13654" PV = "0.0+gitr${SRCPV}" -PR = "r0" +PR = "r1" inherit distutils diff --git a/recipes/blueman/blueman_1.10.bb b/recipes/blueman/blueman_1.10.bb index 2cd06efd91..0cdfe521a9 100644 --- a/recipes/blueman/blueman_1.10.bb +++ b/recipes/blueman/blueman_1.10.bb @@ -5,7 +5,7 @@ DEPENDS = "gtk+ glib-2.0 bluez4 intltool python python-native python-pyrex start RDEPENDS_${PN} = "python-dbus python-pygobject python dbus bluez4 python-pygtk python-notify obex-data-server \ " -PR = "r1" +PR = "r2" inherit autotools pkgconfig python-dir diff --git a/recipes/blueman/blueman_1.21.bb b/recipes/blueman/blueman_1.21.bb index e6cfee7ad8..c3e3e34f4e 100644 --- a/recipes/blueman/blueman_1.21.bb +++ b/recipes/blueman/blueman_1.21.bb @@ -11,7 +11,7 @@ RDEPENDS_${PN} = "python-dbus python-pygobject python \ dbus bluez4 python-pygtk obex-data-server \ " -PR = "r1" +PR = "r2" SRC_URI = "http://download.tuxfamily.org/blueman/blueman-${PV}.tar.gz" diff --git a/recipes/bluez/bluez-gnome_1.8.bb b/recipes/bluez/bluez-gnome_1.8.bb index 28c513bbca..66956f64d5 100644 --- a/recipes/bluez/bluez-gnome_1.8.bb +++ b/recipes/bluez/bluez-gnome_1.8.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Bluetooth configuration applet" LICENSE = "GPL+LGPL" -PR = "r1" +PR = "r2" DEPENDS = "dbus-glib gconf libnotify gtk+" RRECOMMENDS_${PN} = "gnome-icon-theme" diff --git a/recipes/bluez/bluez-utils.inc b/recipes/bluez/bluez-utils.inc index 9933748eb6..dfe64c3bb5 100644 --- a/recipes/bluez/bluez-utils.inc +++ b/recipes/bluez/bluez-utils.inc @@ -4,7 +4,7 @@ PRIORITY = "optional" DEPENDS = "gstreamer gst-plugins-base bluez-libs-${PV} virtual/libusb0 dbus cups" PROVIDES = "bluez-utils-dbus" RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus" -RREPLACES = "bluez-utils-dbus" +RREPLACES_${PN} = "bluez-utils-dbus" RCONFLICTS_${PN} = "bluez-utils-nodbus" LICENSE = "GPL" diff --git a/recipes/bluez/bluez-utils3.inc b/recipes/bluez/bluez-utils3.inc index d75745954d..c3899dbb68 100644 --- a/recipes/bluez/bluez-utils3.inc +++ b/recipes/bluez/bluez-utils3.inc @@ -4,11 +4,11 @@ PRIORITY = "optional" DEPENDS = "gstreamer gst-plugins-base bluez-libs-${PV} virtual/libusb0 dbus glib-2.0" PROVIDES = "bluez-utils-dbus" RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus" -RREPLACES = "bluez-utils-dbus" +RREPLACES_${PN} = "bluez-utils-dbus" RCONFLICTS_${PN} = "bluez-utils-nodbus" LICENSE = "GPL" -FILESPATH = "${FILE_DIRNAME}/bluez-utils-${PV}:${FILE_DIRNAME}/bluez-utils" +FILESPATHPKG =. "bluez-utils-${PV}:bluez-utils:" SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ file://hcid.conf \ diff --git a/recipes/bluez/bluez.inc b/recipes/bluez/bluez.inc index e4202f3bd5..039a4d83ea 100644 --- a/recipes/bluez/bluez.inc +++ b/recipes/bluez/bluez.inc @@ -3,15 +3,15 @@ SECTION = "console" PRIORITY = "optional" HOMEPAGE = "http://www.bluez.org" LICENSE = "GPL" -PR = "r0" +PR = "r1" DEPENDS = "gstreamer gst-plugins-base dbus glib-2.0" PROVIDES = "bluez-utils-dbus" RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus" -RREPLACES = "bluez-utils-dbus" +RREPLACES_${PN} = "bluez-utils-dbus" RCONFLICTS_${PN} = "bluez-utils-nodbus" -FILESPATH = "${FILE_DIRNAME}/bluez-utils-${PV}:${FILE_DIRNAME}/bluez-utils" +FILESPATHPKG =. "bluez-utils-${PV}:bluez-utils:" S = "${WORKDIR}/bluez-${PV}" diff --git a/recipes/boa/boa_0.94.13.bb b/recipes/boa/boa_0.94.13.bb index 1356529c11..7e42cf7e35 100644 --- a/recipes/boa/boa_0.94.13.bb +++ b/recipes/boa/boa_0.94.13.bb @@ -2,8 +2,8 @@ DESCRIPTION = "Lightweight and High Performance WebServer" SECTION = "console/network" LICENSE = "GPL" RDEPENDS_${PN} = "mime-support" -RPROVIDES = "httpd" -PR = "r3" +RPROVIDES_${PN} = "httpd" +PR = "r4" SRC_URI = "http://www.boa.org/boa-${PV}.tar.gz \ file://cgi.patch;striplevel=2 \ diff --git a/recipes/bogofilter/bogofilter_0.96.6.bb b/recipes/bogofilter/bogofilter_0.96.6.bb index 800338480b..eb930eb249 100644 --- a/recipes/bogofilter/bogofilter_0.96.6.bb +++ b/recipes/bogofilter/bogofilter_0.96.6.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Bogofilter is a mail filter that classifies mail as spam or ham ( by a statistical analysis of the message's header and content (body). \ The program is able to learn from the user's classifications and corrections." LICENSE = "GPL" -PR = "r8" +PR = "r9" PRIORITY = "optional" SRC_URI = "http://launchpad.net/bogofilter/main/0.96.6/+download/bogofilter-0.96.6.tar.gz;name=src \ diff --git a/recipes/bootchart/bootchart_0.9.bb b/recipes/bootchart/bootchart_0.9.bb index 91a6f0bb65..e9fdd3a9b7 100644 --- a/recipes/bootchart/bootchart_0.9.bb +++ b/recipes/bootchart/bootchart_0.9.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Bootchart is a tool for performance analysis and visualization of the GNU/Linux boot process." LICENSE = "GPLv2" HOMEPAGE = "http://www.bootchart.org/" -PR = "r1" +PR = "r2" #this only installs the loggers, you will need to run the renderers on your workstation #boot with 'init=/sbin/bootchartd' and do '/sbin/bootchartd stop' to end the logging diff --git a/recipes/bt-configure/bt-configure_git.bb b/recipes/bt-configure/bt-configure_git.bb index 827c16fa57..6ff6eb4ce8 100644 --- a/recipes/bt-configure/bt-configure_git.bb +++ b/recipes/bt-configure/bt-configure_git.bb @@ -6,7 +6,7 @@ RDEPENDS_${PN} = "python python-pygtk bluez4" SRCREV = "9654c88ff74bca89cf747937cbec67421d2f1cbc" PV = "1.0.0+gitr${SRCPV}" -PR = "r1" +PR = "r2" ARCH_bt-configure = "all" diff --git a/recipes/bt950-cs/bt950-cs_0.1.bb b/recipes/bt950-cs/bt950-cs_0.1.bb index e38cdab1bb..ec90c813d6 100644 --- a/recipes/bt950-cs/bt950-cs_0.1.bb +++ b/recipes/bt950-cs/bt950-cs_0.1.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2" HOMEPAGE = "http://www.holtmann.org/linux/bluetooth/bt950.html" DEPENDS = "pcmcia-cs" RDEPENDS_${PN} = "pcmcia-cs" -PR = "r1" +PR = "r2" SRC_URI = "http://www.holtmann.org/linux/bluetooth/bt950-${PV}.tar.gz \ file://makefile.patch" diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc index f554478b51..a5346bd324 100644 --- a/recipes/busybox/busybox.inc +++ b/recipes/busybox/busybox.inc @@ -11,7 +11,7 @@ LICENSE = "GPLv2" SECTION = "base" PRIORITY = "required" -INC_PR = "r29" +INC_PR = "r30" SRC_URI = "\ file://busybox-cron \ diff --git a/recipes/cairo/cairo-directfb_1.4.8.bb b/recipes/cairo/cairo-directfb_1.4.8.bb index d9d3715510..3ae8344bca 100644 --- a/recipes/cairo/cairo-directfb_1.4.8.bb +++ b/recipes/cairo/cairo-directfb_1.4.8.bb @@ -1,6 +1,6 @@ require cairo.inc -RCONFLICTS = "cairo" -RPROVIDES = "cairo-directfb" +RCONFLICTS_${PN} = "cairo" +RPROVIDES_${PN} = "cairo-directfb" DEPENDS = "directfb libsm libpng fontconfig" SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \ file://cairo_directfb_is_similar-typo.patch \ @@ -13,7 +13,7 @@ EXTRA_OECONF += " --enable-directfb \ LDFLAGS_append += " -ldirectfb" CFLAGS_append += " -I${STAGING_INCDIR}/directfb" -PR = "r2" +PR = "r3" S = "${WORKDIR}/cairo-${PV}" diff --git a/recipes/cairo/cairo-directfb_1.6.4.bb b/recipes/cairo/cairo-directfb_1.6.4.bb index 55064ce8c6..b4fea9a497 100644 --- a/recipes/cairo/cairo-directfb_1.6.4.bb +++ b/recipes/cairo/cairo-directfb_1.6.4.bb @@ -1,6 +1,6 @@ require cairo.inc -RCONFLICTS = "cairo" -RPROVIDES = "cairo-directfb" +RCONFLICTS_${PN} = "cairo" +RPROVIDES_${PN} = "cairo-directfb" DEPENDS = "directfb pixman libsm libpng fontconfig" SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \ file://configure_fix.patch " @@ -12,7 +12,7 @@ EXTRA_OECONF += " --enable-directfb \ LDFLAGS_append += " -ldirectfb" CFLAGS_append += " -I${STAGING_INCDIR}/directfb" -PR = "r0" +PR = "r1" S = "${WORKDIR}/cairo-${PV}" diff --git a/recipes/callrec/callrec_svn.bb b/recipes/callrec/callrec_svn.bb index 8f0bfe7d86..091016adad 100644 --- a/recipes/callrec/callrec_svn.bb +++ b/recipes/callrec/callrec_svn.bb @@ -6,7 +6,7 @@ SRCNAME = "callrec" DEPENDS = "gtk+" RDEPENDS_${PN} += "alsa-utils-alsactl alsa-utils-aplay" PV = "0.2.4+svnr${SRCPV}" -PR = "r0" +PR = "r1" S = "${WORKDIR}/trunk" inherit autotools diff --git a/recipes/callweaver/callweaver-perl.bb b/recipes/callweaver/callweaver-perl.bb index c98d24a839..bdd33ae943 100644 --- a/recipes/callweaver/callweaver-perl.bb +++ b/recipes/callweaver/callweaver-perl.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.callweaver.org" SECTION = "libs" LICENSE = "GPL" RDEPENDS_${PN} = "perl callweaver-ogi" -PR = "r0" +PR = "r1" S = "${WORKDIR}/callweaver-1.2-${CWRCV}/contrib/ogi-perl/callweaver-perl-0.0.1" CWRCV = "rc5" diff --git a/recipes/callweaver/callweaver_1.2.0-rc5.bb b/recipes/callweaver/callweaver_1.2.0-rc5.bb index 9280e465e5..200448c452 100644 --- a/recipes/callweaver/callweaver_1.2.0-rc5.bb +++ b/recipes/callweaver/callweaver_1.2.0-rc5.bb @@ -11,7 +11,7 @@ DEPENDS = "openssl zlib tiff libcap spandsp (>= 0.0.3+0.0.4pre10) speex readline sox-native findutils-native" RRECOMMENDS_${PN} = "logrotate" RRECOMMENDS_${PN}-ogi = "perl perl-module-strict callweaver-perl" -PR = "r1" +PR = "r2" S = "${WORKDIR}/callweaver-1.2-rc5" CWRCV = "rc5" diff --git a/recipes/cbrpager/cbrpager.inc b/recipes/cbrpager/cbrpager.inc index c39a0bd673..3ad17c2fae 100644 --- a/recipes/cbrpager/cbrpager.inc +++ b/recipes/cbrpager/cbrpager.inc @@ -5,7 +5,7 @@ LICENSE = "GPL" DEPENDS = "gtk+ libgnomeui" RDEPENDS_${PN} = "unzip" -INC_PR = "r2" +INC_PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz" diff --git a/recipes/ccid/ccid_1.3.8.bb b/recipes/ccid/ccid_1.3.8.bb index 03e48c2184..899ee6b9f3 100644 --- a/recipes/ccid/ccid_1.3.8.bb +++ b/recipes/ccid/ccid_1.3.8.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Generic USB CCID smart card reader driver" HOMEPAGE = "http://pcsclite.alioth.debian.org/ccid.html" LICENSE = "GPL" -PR = "r0" +PR = "r1" DEPENDS = "virtual/libusb0 pcsc-lite" RDEPENDS_${PN} = "pcsc-lite" diff --git a/recipes/cellhunter/cellhunter_0.5.0.bb b/recipes/cellhunter/cellhunter_0.5.0.bb index bd2577c93d..57de369964 100644 --- a/recipes/cellhunter/cellhunter_0.5.0.bb +++ b/recipes/cellhunter/cellhunter_0.5.0.bb @@ -2,7 +2,7 @@ DESCRIPTION = "CellHunter - A game to collect information about mobile phone cel SECTION = "x11/utils" DEPENDS = "python" RDEPENDS_${PN} = "python-subprocess python-netclient python-math python-core python-io python-pygtk python-dbus frameworkd" -PR = "r0" +PR = "r1" SRC_URI = "\ http://ch.omoco.de/cellhunter/files/cellhunter-${PV}.tar.gz \ diff --git a/recipes/cfu1/cfu1-modules_2.6.bb b/recipes/cfu1/cfu1-modules_2.6.bb index 75344352fa..303c63dda2 100644 --- a/recipes/cfu1/cfu1-modules_2.6.bb +++ b/recipes/cfu1/cfu1-modules_2.6.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" DEPENDS = "virtual/kernel" LICENSE = "GPL" RDEPENDS_${PN} = "kernel-module-usbcore" -PR = "r2" +PR = "r3" SRC_URI = "file://rex-cfu1.conf \ file://Makefile \ diff --git a/recipes/char-driver/char-driver.bb b/recipes/char-driver/char-driver.bb index a4758fe87e..9a623d4e21 100644 --- a/recipes/char-driver/char-driver.bb +++ b/recipes/char-driver/char-driver.bb @@ -8,7 +8,7 @@ LICENSE = "GPL" RDEPENDS_${PN} = "kernel (${KERNEL_VERSION})" DEPENDS = "virtual/kernel" -PR = "r3" +PR = "r4" SRC_URI = "http://www.davehylands.com/gumstix-wiki/char-driver/char-driver-2.6.21.tar.gz \ file://makefile.patch \ diff --git a/recipes/chicken/chicken_4.2.0.bb b/recipes/chicken/chicken_4.2.0.bb index 3547d94f74..c4a65e257c 100644 --- a/recipes/chicken/chicken_4.2.0.bb +++ b/recipes/chicken/chicken_4.2.0.bb @@ -2,7 +2,7 @@ require chicken.inc DEPENDS = "gcc-cross-sdk" RDEPENDS_${PN} = "gcc-cross-sdk" -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" do_compile() { make PLATFORM="linux" DESTDIR="${D}" PREFIX="${prefix}" HOSTSYSTEM="${TARGET_SYS}" ARCH=${CHICKEN_ARCH} diff --git a/recipes/chillispot/chillispot_0.98.bb b/recipes/chillispot/chillispot_0.98.bb index 0b086edda6..687b17f26f 100644 --- a/recipes/chillispot/chillispot_0.98.bb +++ b/recipes/chillispot/chillispot_0.98.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ChilliSpot is an open source captive portal or wireless LAN access point controller. It is used for authenticating users of a wireless LAN." HOMEPAGE = "http://www.chillispot.org/" LICENSE = "GPL" -PR = "r1" +PR = "r2" SRC_URI = "http://www.chillispot.org/download/chillispot-${PV}.tar.gz \ file://no-ansi.patch \ diff --git a/recipes/clamav/clamav-0.96.1/fix-llvm-cross-configure.patch b/recipes/clamav/clamav-0.96.1/fix-llvm-cross-configure.patch new file mode 100644 index 0000000000..17cfb2b3e4 --- /dev/null +++ b/recipes/clamav/clamav-0.96.1/fix-llvm-cross-configure.patch @@ -0,0 +1,13 @@ +Index: clamav-0.96.1/libclamav/c++/llvm/configure +=================================================================== +--- clamav-0.96.1.orig/libclamav/c++/llvm/configure 2010-05-21 15:09:40.000000000 +0400 ++++ clamav-0.96.1/libclamav/c++/llvm/configure 2010-05-21 15:11:09.000000000 +0400 +@@ -4502,7 +4502,7 @@ + fi + fi + test -z "$BUILD_CC" && as_fn_error "no acceptable cc found in \$PATH" "$LINENO" 5 +- ac_build_link='${BUILD_CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ++ ac_build_link='${BUILD_CC-cc} -o conftest $BUILD_CPPFLAGS $BUILD_LDFLAGS conftest.$ac_ext $LIBS 1>&5' + rm -f conftest* + echo 'int main () { return 0; }' > conftest.$ac_ext + ac_cv_build_exeext= diff --git a/recipes/clamav/clamav.inc b/recipes/clamav/clamav.inc index 91aca57497..5c91b448d3 100644 --- a/recipes/clamav/clamav.inc +++ b/recipes/clamav/clamav.inc @@ -18,7 +18,7 @@ RRECOMMENDS_${PN} = "${PN}-freshclam" RRECOMMENDS_${PN}-daemon = "${PN}-freshclam" RPROVIDES_${PN}-freshclam = "${PN}-data" -INC_PR = "r3" +INC_PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/clamav/clamav-${PV}.tar.gz;name=clamav-${PV} \ file://clamav-daemon.init \ @@ -29,7 +29,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/clamav/clamav-${PV}.tar.gz;name=clamav-${PV} \ file://volatiles.03_clamav-daemon \ file://volatiles.03_clamav-freshclam" -inherit autotools update-rc.d binconfig +inherit autotools update-rc.d binconfig pkgconfig # Don't check for clamav uid/gid - they don't exist on the host # Put virus definitions in /var/lib not /usr/lib @@ -61,11 +61,6 @@ do_install_append() { install -m 0644 ${WORKDIR}/volatiles.$i ${D}${sysconfdir}/default/volatiles/$i done } -do_stage () { - oe_libinstall -a -so libclamav ${STAGING_LIBDIR} - rm -f ${STAGING_LIBDIR}/libclamav.la - install -m 0644 libclamav/clamav.h ${STAGING_INCDIR} -} PACKAGES += "${PN}-freshclam ${PN}-daemon ${PN}-conf ${PN}-data ${PN}-lib \ ${PN}-clamconf" diff --git a/recipes/clamav/clamav_0.96.1.bb b/recipes/clamav/clamav_0.96.1.bb new file mode 100644 index 0000000000..bf1aa1cd1c --- /dev/null +++ b/recipes/clamav/clamav_0.96.1.bb @@ -0,0 +1,20 @@ +require clamav.inc + +SRC_URI += " file://fix-llvm-cross-configure.patch;patch=1" + +SRC_URI[clamav-0.96.1.md5sum] = "38e7870db6e9ad0e569518499a6f3651" +SRC_URI[clamav-0.96.1.sha256sum] = "413dd25907059068da2a367d2b330fbc37d5d2764eb3b047214ce754a9ca74ea" + +PR = "${INC_PR}.0" + +EXTRA_OECONF_append_libc-uclibc = " --disable-llvm" + +# Autoreconf breaks on llvm with +# gnu-configize: `configure.ac' or `configure.in' is required +# +# Works good enough without autoreconf +do_configure() { + oe_runconf +} + +FILES_${PN}_append = " ${bindir}/clambc"
\ No newline at end of file diff --git a/recipes/classpath/classpath.inc b/recipes/classpath/classpath.inc index ab47635d78..41c7888702 100644 --- a/recipes/classpath/classpath.inc +++ b/recipes/classpath/classpath.inc @@ -6,7 +6,7 @@ LICENSE = "Classpath" PBN = "classpath" DEPENDS = "virtual/javac-native fastjar-native zip-native gmp antlr-native" -RPROVIDES = "" +RPROVIDES_${PN} = "" RDEPENDS_${PN} = "${PBN}-common (>= ${PV})" RDEPENDS_${PN}-examples = "java2-runtime ${PN}-awt" diff --git a/recipes/clutter/clutter-gtk.inc b/recipes/clutter/clutter-gtk.inc index bbecee548c..c2fa28fdde 100644 --- a/recipes/clutter/clutter-gtk.inc +++ b/recipes/clutter/clutter-gtk.inc @@ -4,8 +4,6 @@ LICENSE = "LGPL" DEPENDS = "gtk+" -FILESPATH = "${FILE_DIRNAME}/clutter-gtk" - PACKAGES =+ "${PN}-examples" FILES_${PN}-examples = "${bindir}/gtk-clutter-test ${bindir}/gtk-clutter-events ${bindir}/gtk-clutter-multistage" diff --git a/recipes/cmake/cmake-2.6.4/fix_fortify_source_compilation.patch b/recipes/cmake/cmake-2.6.4/fix_fortify_source_compilation.patch new file mode 100644 index 0000000000..316ab0c061 --- /dev/null +++ b/recipes/cmake/cmake-2.6.4/fix_fortify_source_compilation.patch @@ -0,0 +1,32 @@ +upstream: http://public.kitware.com/mantis/view.php?id=9267 +status: pending +origin: http://sisyphus.ru/ru/srpm/Sisyphus/cmake/patches/0 +comment: fix cmake building when FORTIFY_SOURCE is enabled +--- a/Source/kwsys/SystemInformation.cxx ++++ b/Source/kwsys/SystemInformation.cxx +@@ -1896,9 +1896,14 @@ + case 5: sprintf (this->ChipID.ProcessorName,"Pentium II (0.25 micron)"); break; + case 6: sprintf (this->ChipID.ProcessorName,"Pentium II With On-Die L2 Cache"); break; + case 7: sprintf (this->ChipID.ProcessorName,"Pentium III (0.25 micron)"); break; ++/* + case 8: sprintf (this->ChipID.ProcessorName,"Pentium III (0.18 micron) With 256 KB On-Die L2 Cache "); break; + case 0xa: sprintf (this->ChipID.ProcessorName,"Pentium III (0.18 micron) With 1 Or 2 MB On-Die L2 Cache "); break; + case 0xb: sprintf (this->ChipID.ProcessorName,"Pentium III (0.13 micron) With 256 Or 512 KB On-Die L2 Cache "); break; ++*/ ++ case 8: sprintf (this->ChipID.ProcessorName,"Pentium III (0.18 micron) With 256 KB L2 Cache "); break; ++ case 0xa: sprintf (this->ChipID.ProcessorName,"Pentium III (0.18 micron), 1/2 MB L2 Cache "); break; ++ case 0xb: sprintf (this->ChipID.ProcessorName,"Pentium III (0.13 micron), 256/512 KB L2 Cache "); break; + default: sprintf (this->ChipID.ProcessorName,"Unknown P6 family"); return false; + } + break; +--- a/Utilities/cmtar/encode.c ++++ b/Utilities/cmtar/encode.c +@@ -32,7 +32,7 @@ th_finish(TAR *t) + int i, sum = 0; + + if (t->options & TAR_GNU) +- strncpy(t->th_buf.magic, "ustar ", 8); ++ memcpy(t->th_buf.magic, "ustar ", 8); + else + { + strncpy(t->th_buf.version, TVERSION, TVERSLEN); diff --git a/recipes/cmake/cmake-native_2.6.4.bb b/recipes/cmake/cmake-native_2.6.4.bb index 887db1432d..aab6b62a0c 100644 --- a/recipes/cmake/cmake-native_2.6.4.bb +++ b/recipes/cmake/cmake-native_2.6.4.bb @@ -5,5 +5,6 @@ do_install() { oe_runmake install } +SRC_URI += "file://fix_fortify_source_compilation.patch" SRC_URI[md5sum] = "50f387d0436696c4a68b5512a72c9cde" SRC_URI[sha256sum] = "9cdd2152e37b05d0d40d334a1bb2dfc0250021797360f971c6ea3d457ac9fdf2" diff --git a/recipes/cmake/cmake_2.6.4.bb b/recipes/cmake/cmake_2.6.4.bb index 15981ce3a5..b5a47a88f0 100644 --- a/recipes/cmake/cmake_2.6.4.bb +++ b/recipes/cmake/cmake_2.6.4.bb @@ -6,6 +6,6 @@ do_configure_append() { sed -i -e 's,HAVE_GLIBC_STRERROR_R__TRYRUN_OUTPUT-ADVANCED:INTERNAL=1,HAVE_GLIBC_STRERROR_R__TRYRUN_OUTPUT-ADVANCED:INTERNAL=0,' CMakeCache.txt } - +SRC_URI += "file://fix_fortify_source_compilation.patch" SRC_URI[md5sum] = "50f387d0436696c4a68b5512a72c9cde" SRC_URI[sha256sum] = "9cdd2152e37b05d0d40d334a1bb2dfc0250021797360f971c6ea3d457ac9fdf2" diff --git a/recipes/connman/mokonnect_svn.bb b/recipes/connman/mokonnect_svn.bb index 9d267aa7e2..4f146e83a7 100644 --- a/recipes/connman/mokonnect_svn.bb +++ b/recipes/connman/mokonnect_svn.bb @@ -7,7 +7,7 @@ RDEPENDS_${PN} = "python-elementary connman connman-plugin-wifi connman-plugin-u SRCREV = "113" PV = "0.4+svnr${SRCPV}" -PR = "r3" +PR = "r4" SRC_URI = "svn://subversion.assembla.com/svn/shrdev;module=Mokonnect/trunk;proto=http" diff --git a/recipes/coreutils/coreutils.inc b/recipes/coreutils/coreutils.inc index 38dbd1d4f2..9242c5196a 100644 --- a/recipes/coreutils/coreutils.inc +++ b/recipes/coreutils/coreutils.inc @@ -2,7 +2,7 @@ DESCRIPTION = "A collection of core GNU utilities." HOMEPAGE = "http://www.gnu.org/software/coreutils" LICENSE = "GPL" SECTION = "base" -RREPLACES = "textutils shellutils fileutils" -RPROVIDES = "textutils shellutils fileutils" +RREPLACES_${PN} = "textutils shellutils fileutils" +RPROVIDES_${PN} = "textutils shellutils fileutils" inherit autotools diff --git a/recipes/corosync/corosync_1.2.1.bb b/recipes/corosync/corosync_1.2.3.bb index 9ebea888c6..9aa1528163 100644 --- a/recipes/corosync/corosync_1.2.1.bb +++ b/recipes/corosync/corosync_1.2.3.bb @@ -4,14 +4,14 @@ LICENSE = "BSD" PR = "r0" SRC_URI = " \ - ftp://ftp@corosync.org/downloads/corosync-${PV}/corosync-${PV}.tar.gz;name=tar \ + ftp://ftp@corosync.org/downloads/corosync-${PV}/corosync-${PV}.tar.gz \ file://fix-lcrso-linkage.patch \ file://init \ file://corosync.conf \ file://volatiles \ " -SRC_URI[tar.md5sum] = "cba5eb5da41630f53e54b90c449c056d" -SRC_URI[tar.sha256sum] = "d919d9817c4cde9e3d38e6f79731d9e1cd53485c6160bd253d888fa58a87a43d" +SRC_URI[md5sum] = "03b8cc311619c07ae1a84a5d59f13d0b" +SRC_URI[sha256sum] = "4dd2aa43d82bb22c9bfed146da4ea2e07134d413a42f164dff86da9f34719fc9" inherit autotools_stage update-rc.d @@ -24,6 +24,8 @@ FILES_${PN}-dbg += "${libexecdir}/lcrso/.debug" do_install_append() { install -d ${D}/${sysconfdir}/init.d install -d ${D}${sysconfdir}/default/volatiles + # Original init script is too bashy + rm -f ${D}/${sysconfdir}/init.d/corosync install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/corosync-daemon install -m 0644 ${WORKDIR}/corosync.conf ${D}/${sysconfdir}/corosync/corosync.conf.example install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/05_corosync diff --git a/recipes/corsair/corsair_0.2.6.bb b/recipes/corsair/corsair_0.2.6.bb index 3b8b66b0ce..0a566df2be 100644 --- a/recipes/corsair/corsair_0.2.6.bb +++ b/recipes/corsair/corsair_0.2.6.bb @@ -5,7 +5,7 @@ AUTHOR = "Joe Rumsey <joe@rumsey.org>" HOMEPAGE = "http://corsair.sf.net/" RDEPENDS_${PN} = "opie-pics" -PR = "r1" +PR = "r2" inherit palmtop diff --git a/recipes/crda/crda_1.1.1.bb b/recipes/crda/crda_1.1.1.bb index 9acf947164..a5947edd36 100644 --- a/recipes/crda/crda_1.1.1.bb +++ b/recipes/crda/crda_1.1.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://wireless.kernel.org/en/developers/Regulatory/CRDA" SECTION = "base" PRIORITY = "optional" LICENSE = "ISC" -PR = "r0" +PR = "r1" DEPENDS = "libgcrypt libnl python-native python-m2crypto-native" RDEPENDS_${PN} = "udev" diff --git a/recipes/cryptsetup/cryptsetup_1.0.5.bb b/recipes/cryptsetup/cryptsetup_1.0.5.bb index 000c6ac2ec..637a64cadb 100644 --- a/recipes/cryptsetup/cryptsetup_1.0.5.bb +++ b/recipes/cryptsetup/cryptsetup_1.0.5.bb @@ -13,7 +13,7 @@ RRECOMMENDS_${PN} = "kernel-module-aes \ kernel-module-cbc \ kernel-module-sha256 \ " -PR = "r2" +PR = "r3" SRC_URI = "http://luks.endorphin.org/source/cryptsetup-${PV}.tar.bz2" diff --git a/recipes/db/db4.inc b/recipes/db/db4.inc index 73d339d7fe..7e5c327d01 100644 --- a/recipes/db/db4.inc +++ b/recipes/db/db4.inc @@ -17,7 +17,7 @@ LICENSE = "BSD" VIRTUAL_NAME ?= "virtual/db" CONFLICTS = "db3" -SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz" +SRC_URI = "ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/bdb/db-${PV}.tar.gz" inherit autotools diff --git a/recipes/db/db5.inc b/recipes/db/db5.inc index 599093e3f7..557cb4c6eb 100644 --- a/recipes/db/db5.inc +++ b/recipes/db/db5.inc @@ -17,7 +17,7 @@ LICENSE = "BSD" VIRTUAL_NAME ?= "virtual/db" CONFLICTS = "db3 db4" -SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz" +SRC_URI = "ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/bdb/db-${PV}.tar.gz" inherit autotools diff --git a/recipes/detect-stylus/detect-stylus_0.10.bb b/recipes/detect-stylus/detect-stylus_0.10.bb index f80e45f536..98db4a64e1 100644 --- a/recipes/detect-stylus/detect-stylus_0.10.bb +++ b/recipes/detect-stylus/detect-stylus_0.10.bb @@ -1,7 +1,7 @@ inherit gpe pkgconfig LICENSE = "GPL" -PR = "r2" +PR = "r3" DEPENDS = "virtual/libx11 xrdb xcursor-transparent-theme" RDEPENDS_${PN} = "xrdb xcursor-transparent-theme" diff --git a/recipes/detect-stylus/detect-stylus_0.13.bb b/recipes/detect-stylus/detect-stylus_0.13.bb index 29e5121c1d..54c223bc16 100644 --- a/recipes/detect-stylus/detect-stylus_0.13.bb +++ b/recipes/detect-stylus/detect-stylus_0.13.bb @@ -1,7 +1,7 @@ inherit gpe pkgconfig LICENSE = "GPL" -PR = "r2" +PR = "r3" DEPENDS = "virtual/libx11 xcursor-transparent-theme xrdb" SECTION = "gpe" diff --git a/recipes/detect-stylus/detect-stylus_svn.bb b/recipes/detect-stylus/detect-stylus_svn.bb index 3208fef551..ff58080020 100644 --- a/recipes/detect-stylus/detect-stylus_svn.bb +++ b/recipes/detect-stylus/detect-stylus_svn.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" DEPENDS = "virtual/libx11 xcursor-transparent-theme xrdb" RDEPENDS_${PN} = "xrdb" PV = "0.13+svnr${SRCPV}" -PR = "r0" +PR = "r1" inherit gpe pkgconfig diff --git a/recipes/devlabel/devlabel_0.48.01.bb b/recipes/devlabel/devlabel_0.48.01.bb index 991d1fbbb0..d3d0397a02 100644 --- a/recipes/devlabel/devlabel_0.48.01.bb +++ b/recipes/devlabel/devlabel_0.48.01.bb @@ -4,7 +4,7 @@ DESCRIPTION = "tool for user-define static device labels" DEPENDS = "util-linux-ng" RDEPENDS_${PN} = "bash util-linux-ng" LICENSE = "GPL" -PR = "r0" +PR = "r1" SRC_URI = "http://linux.dell.com/devlabel/permalink/devlabel-${PV}.tar.gz" diff --git a/recipes/dhcdbd/dhcdbd_2.0.bb b/recipes/dhcdbd/dhcdbd_2.0.bb index d2108b232e..dac90e1be7 100644 --- a/recipes/dhcdbd/dhcdbd_2.0.bb +++ b/recipes/dhcdbd/dhcdbd_2.0.bb @@ -3,7 +3,7 @@ SECTION = "net" LICENSE = "GPL" DEPENDS = "dbus" RDEPENDS_${PN} = "dhcp-client" -PR = "r1" +PR = "r2" SRC_URI = "https://fedorahosted.org/releases/d/h/dhcdbd/dhcdbd-${PV}.tar.bz2 \ file://dbus_connection_unref.patch \ diff --git a/recipes/dhcdbd/dhcdbd_3.0.bb b/recipes/dhcdbd/dhcdbd_3.0.bb index c894c7a366..0186d3f6fb 100644 --- a/recipes/dhcdbd/dhcdbd_3.0.bb +++ b/recipes/dhcdbd/dhcdbd_3.0.bb @@ -3,7 +3,7 @@ SECTION = "net" LICENSE = "GPL" DEPENDS = "dbus" RDEPENDS_${PN} = "dhcp-client" -PR = "r1" +PR = "r2" SRC_URI = "https://fedorahosted.org/releases/d/h/dhcdbd/dhcdbd-${PV}.tar.bz2 \ file://dbus_connection_unref.patch \ diff --git a/recipes/dictator/dictator_0.2.bb b/recipes/dictator/dictator_0.2.bb index 31a473cb97..3a2e0f9e12 100644 --- a/recipes/dictator/dictator_0.2.bb +++ b/recipes/dictator/dictator_0.2.bb @@ -3,7 +3,7 @@ SECTION = "utils" PRIORITY = "optional" LICENSE = "GPL" RDEPENDS_${PN} = "python python-pygtk python-xml python-netclient pydes python-audio" -PR="r2" +PR = "r3" ARCH_pyring = "all" diff --git a/recipes/dillo/dillo2_2.1.1.bb b/recipes/dillo/dillo2_2.1.1.bb index 20a6c16c26..45eb35b87f 100644 --- a/recipes/dillo/dillo2_2.1.1.bb +++ b/recipes/dillo/dillo2_2.1.1.bb @@ -8,7 +8,7 @@ RDEPENDS_${PN} = "fltk2-images" SRC_URI="http://www.dillo.org/download/dillo-${PV}.tar.bz2 \ file://dillo.desktop \ file://dillo.png" -PR = "r3" +PR = "r4" S = "${WORKDIR}/dillo-${PV}/" diff --git a/recipes/dillo/dillo_0.8.6.bb b/recipes/dillo/dillo_0.8.6.bb index bcfb8ea308..626116a734 100644 --- a/recipes/dillo/dillo_0.8.6.bb +++ b/recipes/dillo/dillo_0.8.6.bb @@ -4,8 +4,8 @@ SECTION = "x11/network" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "gtk+-1.2 libpng openssl" -RCONFLICTS = "dillo2" -PR = "r2" +RCONFLICTS_${PN} = "dillo2" +PR = "r3" SRC_URI="http://www.dillo.org/download/dillo-${PV}.tar.bz2 \ file://dillo-i18n.diff \ file://dillo.desktop \ diff --git a/recipes/distcc/distcc_2.18.3.bb b/recipes/distcc/distcc_2.18.3.bb index 2b33bb14c2..0afc589010 100644 --- a/recipes/distcc/distcc_2.18.3.bb +++ b/recipes/distcc/distcc_2.18.3.bb @@ -2,7 +2,7 @@ DESCRIPTION = "distcc is a parallel build system that distributes \ compilation of C/C++/ObjC code across machines on a network." SECTION = "devel" LICENSE = "GPLv2" -PR = "r4" +PR = "r5" DEPENDS = "avahi gtk+" RRECOMMENDS_${PN} = "avahi-daemon" diff --git a/recipes/distcc/distcc_3.1.bb b/recipes/distcc/distcc_3.1.bb index 71fc4e4471..6f0bea564d 100644 --- a/recipes/distcc/distcc_3.1.bb +++ b/recipes/distcc/distcc_3.1.bb @@ -3,7 +3,7 @@ compilation of C/C++/ObjC code across machines on a network." SECTION = "devel" LICENSE = "GPLv2" -PR = "r1" +PR = "r2" DEPENDS = "avahi gtk+" RRECOMMENDS_${PN} = "avahi-daemon" diff --git a/recipes/dpkg/dpkg-native.inc b/recipes/dpkg/dpkg-native.inc index e2041cfe05..a230f29f66 100644 --- a/recipes/dpkg/dpkg-native.inc +++ b/recipes/dpkg/dpkg-native.inc @@ -6,7 +6,6 @@ DEPENDS = "perl-native bzip2-native zlib-native virtual/update-alternatives-nati RDEPENDS_${PN} = "" SRC_URI += "file://noman.patch" -FILESPATH += "dpkg-${PV}" # We need to do this so our perl is picked up. do_configure_prepend() { diff --git a/recipes/dropbear/dropbear-early_1.0.bb b/recipes/dropbear/dropbear-early_1.0.bb index 2042400b8b..ea815f2a0e 100644 --- a/recipes/dropbear/dropbear-early_1.0.bb +++ b/recipes/dropbear/dropbear-early_1.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Allow to start dropbear soon after boot, depending on kernel command line option." SECTION = "devel" RDEPENDS_${PN} = "dropbear" -PR = "r3" +PR = "r4" SRC_URI = "file://dropbear-early" diff --git a/recipes/dropbear/dropbear.inc b/recipes/dropbear/dropbear.inc index 056732fab3..af00129632 100644 --- a/recipes/dropbear/dropbear.inc +++ b/recipes/dropbear/dropbear.inc @@ -4,7 +4,9 @@ SECTION = "console/network" LICENSE = "MIT" DEPENDS = "zlib" PROVIDES = "ssh sshd" -RPROVIDES = "ssh sshd" +RPROVIDES_${PN} = "ssh sshd" + +INC_PR = "r4" SRC_URI = "\ http://matt.ucc.asn.au/dropbear/dropbear-${PV}.tar.bz2 \ diff --git a/recipes/dropbear/dropbear/init b/recipes/dropbear/dropbear/init index 5c8dfc12a8..275aa328df 100755 --- a/recipes/dropbear/dropbear/init +++ b/recipes/dropbear/dropbear/init @@ -19,6 +19,9 @@ test "$NO_START" = "0" || exit 0 test -x "$DAEMON" || exit 0 test ! -h /var/service/dropbear || exit 0 +# Allows comma-separated list of addresses/ports +DROPBEAR_PORT=`echo $DROPBEAR_PORT | sed "s/,/ -p /g"` + readonly_rootfs=0 for flag in `awk '{ if ($2 == "/") { split($4,FLAGS,",") } }; END { for (f in FLAGS) print FLAGS[f] }' </proc/mounts`; do case $flag in @@ -74,7 +77,7 @@ case "$1" in test -f $DROPBEAR_RSAKEY && KEY_ARGS="$KEY_ARGS -r $DROPBEAR_RSAKEY" start-stop-daemon -S \ -x "$DAEMON" -- $KEY_ARGS \ - -p "$DROPBEAR_PORT" $DROPBEAR_EXTRA_ARGS + -p $DROPBEAR_PORT $DROPBEAR_EXTRA_ARGS echo "$NAME." ;; stop) @@ -91,7 +94,7 @@ case "$1" in test -f $DROPBEAR_RSAKEY && KEY_ARGS="$KEY_ARGS -r $DROPBEAR_RSAKEY" start-stop-daemon -S \ -x "$DAEMON" -- $KEY_ARGS \ - -p "$DROPBEAR_PORT" $DROPBEAR_EXTRA_ARGS + -p $DROPBEAR_PORT $DROPBEAR_EXTRA_ARGS echo "$NAME." ;; *) diff --git a/recipes/dropbear/dropbear_0.49.bb b/recipes/dropbear/dropbear_0.49.bb index 79a2de6630..9ebce14c91 100644 --- a/recipes/dropbear/dropbear_0.49.bb +++ b/recipes/dropbear/dropbear_0.49.bb @@ -1,6 +1,6 @@ require dropbear.inc -PR = "r2" +PR = "${INC_PR}.0" SRC_URI += "file://scp-argument-fix.patch" diff --git a/recipes/dropbear/dropbear_0.51.bb b/recipes/dropbear/dropbear_0.51.bb index 168f5bbe00..b927f3203b 100644 --- a/recipes/dropbear/dropbear_0.51.bb +++ b/recipes/dropbear/dropbear_0.51.bb @@ -1,5 +1,5 @@ require dropbear.inc -PR = "r1.01" +PR = "${INC_PR}.0" SRC_URI += "file://no-host-lookup.patch" diff --git a/recipes/dropbear/dropbear_0.52.bb b/recipes/dropbear/dropbear_0.52.bb index 0e36b99509..975788a175 100644 --- a/recipes/dropbear/dropbear_0.52.bb +++ b/recipes/dropbear/dropbear_0.52.bb @@ -1,5 +1,5 @@ require dropbear.inc -PR = "r0" +PR = "${INC_PR}.0" SRC_URI += "file://no-host-lookup.patch" diff --git a/recipes/dvd+rw-tools/dvd+rw-tools_7.1.bb b/recipes/dvd+rw-tools/dvd+rw-tools_7.1.bb index bca36a16c0..169d0dd2ad 100644 --- a/recipes/dvd+rw-tools/dvd+rw-tools_7.1.bb +++ b/recipes/dvd+rw-tools/dvd+rw-tools_7.1.bb @@ -1,5 +1,5 @@ DESCRIPTION = "tools to write DVDs" -PR = "r2" +PR = "r3" DEPENDS += "m4-native" RDEPENDS_${PN} += "cdrkit" SRC_URI = "http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-${PV}.tar.gz \ diff --git a/recipes/e17/elementary-alarm_svn.bb b/recipes/e17/elementary-alarm_svn.bb index 8635959075..24bbd60945 100644 --- a/recipes/e17/elementary-alarm_svn.bb +++ b/recipes/e17/elementary-alarm_svn.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" DEPENDS = "elementary" SECTION = "x11" PV = "0.0.0+svnr${SRCPV}" -PR = "r1" +PR = "r2" SRCREV = "${EFL_SRCREV}" inherit e diff --git a/recipes/e17/entrance_0.9.0.010.bb b/recipes/e17/entrance_0.9.0.010.bb index 1ef9abe696..e72e4a6acc 100644 --- a/recipes/e17/entrance_0.9.0.010.bb +++ b/recipes/e17/entrance_0.9.0.010.bb @@ -3,7 +3,7 @@ LICENSE = "MIT BSD" # can also use pam and crypt DEPENDS = "evas ecore edje esmart bash keylaunch xserver-common login-manager" RDEPENDS_${PN} += "glibc-gconv-iso8859-1 entrance-themes" -PR = "r2" +PR = "r3" # entrance and estickies were removed in 46590 for rewrite, move back to EFL_SRCREV when they're back SRCREV = "46589" diff --git a/recipes/e17/expedite_svn.bb b/recipes/e17/expedite_svn.bb index 31b43cda1c..b88ca4a266 100644 --- a/recipes/e17/expedite_svn.bb +++ b/recipes/e17/expedite_svn.bb @@ -3,7 +3,7 @@ DEPENDS = "eet evas" RDEPENDS_${PN} = "expedite-themes evas-engine-buffer evas-engine-fb evas-engine-software-generic evas-engine-software-x11 evas-loader-png" LICENSE = "MIT BSD" PV = "0.6.0+svnr${SRCPV}" -PR = "r3" +PR = "r4" SRCREV = "${EFL_SRCREV}" inherit e diff --git a/recipes/e17/exquisite_svn.bb b/recipes/e17/exquisite_svn.bb index f9f55e577f..d58d26bbc9 100644 --- a/recipes/e17/exquisite_svn.bb +++ b/recipes/e17/exquisite_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A psplash replacement for display" LICENSE = "MIT BSD" DEPENDS = "eet evas ecore embryo edje" PV = "0.0.1+svnr${SRCPV}" -PR = "r9" +PR = "r11" SRCREV = "${EFL_SRCREV}" RDEPENDS_${PN} = "initscripts" RRECOMMENDS_${PN} = "exquisite-themes" diff --git a/recipes/e2fsprogs/e2fsprogs.inc b/recipes/e2fsprogs/e2fsprogs.inc index f9dae6ecf0..37d3b6d2de 100644 --- a/recipes/e2fsprogs/e2fsprogs.inc +++ b/recipes/e2fsprogs/e2fsprogs.inc @@ -9,7 +9,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz" S = "${WORKDIR}/e2fsprogs-${PV}" -INC_PR = "r23" +INC_PR = "r24" inherit autotools diff --git a/recipes/ebrainy/ebrainy_svn.bb b/recipes/ebrainy/ebrainy_svn.bb index eb9fc46bc0..6e482c4469 100644 --- a/recipes/ebrainy/ebrainy_svn.bb +++ b/recipes/ebrainy/ebrainy_svn.bb @@ -6,7 +6,7 @@ SECTION = "e/apps" RDEPENDS_${PN} = "elementary sqlite3 python-sqlalchemy python-mysqldb python-netserver" PV = "0.0.1+svnr${SRCPV}" -PR = "r2" +PR = "r3" SRCREV = "21" SRC_URI = "svn://ebrainy.googlecode.com/svn/trunk;module=.;proto=http" S = "${WORKDIR}" diff --git a/recipes/ebtables/ebtables-2.0.9-2/01debian_defaultconfig.patch b/recipes/ebtables/ebtables-2.0.9-2/01debian_defaultconfig.patch new file mode 100644 index 0000000000..c260403eaf --- /dev/null +++ b/recipes/ebtables/ebtables-2.0.9-2/01debian_defaultconfig.patch @@ -0,0 +1,50 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## debian_defaultconfig.dpatch by <hesso@pool.math.tu-berlin.de> +## +## DP: Debian enhancements to the ebtables "sysconfig" default settings. + +@DPATCH@ + +--- ebtables-2.0.8.1.orig/ebtables-config ++++ ebtables-2.0.8.1/ebtables-config +@@ -1,17 +1,3 @@ +-# Save (and possibly restore) in text format. +-# Value: yes|no, default: yes +-# Save the firewall rules in text format to __SYSCONFIG__/ebtables +-# If EBTABLES_BINARY_FORMAT="no" then restoring the firewall rules +-# is done using this text format. +-EBTABLES_TEXT_FORMAT="yes" +- +-# Save (and restore) in binary format. +-# Value: yes|no, default: yes +-# Save (and restore) the firewall rules in binary format to (and from) +-# __SYSCONFIG__/ebtables.<chain>. Enabling this option will make +-# firewall initialisation a lot faster. +-EBTABLES_BINARY_FORMAT="yes" +- + # Unload modules on restart and stop + # Value: yes|no, default: yes + # This option has to be 'yes' to get to a sane state for a firewall +@@ -19,6 +5,12 @@ + # modules. + EBTABLES_MODULES_UNLOAD="yes" + ++# Load firewall rules on system startup. ++# Value: yes|no, default: no ++# Restores the ebtables rulesets from the last saved state when the ++# system boots up. ++EBTABLES_LOAD_ON_START="no" ++ + # Save current firewall rules on stop. + # Value: yes|no, default: no + # Saves all firewall rules if firewall gets stopped +@@ -35,3 +27,9 @@ + # Save rule counters when saving a kernel table to a file. If the + # rule counters were saved, they will be restored when restoring the table. + EBTABLES_SAVE_COUNTER="no" ++ ++# Backup suffix for ruleset save files. ++# Value: <string>, default: "~" ++# Keep one backup level of saved rules. ++# Set this variable to the empty string to disable backups. ++EBTABLES_BACKUP_SUFFIX="~" diff --git a/recipes/ebtables/ebtables-2.0.9-2/ebtables.init b/recipes/ebtables/ebtables-2.0.9-2/ebtables.init new file mode 100755 index 0000000000..0044e9825e --- /dev/null +++ b/recipes/ebtables/ebtables-2.0.9-2/ebtables.init @@ -0,0 +1,186 @@ +#!/bin/sh +# +# init script for the Ethernet Bridge filter tables +# +# Written by Dag Wieers <dag@wieers.com> +# Modified by Rok Papez <rok.papez@arnes.si> +# Bart De Schuymer <bdschuym@pandora.be> +# Adapted to Debian by Jan Christoph Nordholz <hesso@pool.math.tu-berlin.de> +# Adapted to OpenEmbedded by Roman I Khimov <khimov@altell.ru> +# +# chkconfig: - 15 85 +# description: Ethernet Bridge filtering tables +# +### BEGIN INIT INFO +# Provides: ebtables +# Required-Start: +# Required-Stop: +# Should-Start: $local_fs +# Should-Stop: $local_fs +# Default-Start: S +# Default-Stop: 0 6 +# Short-Description: ebtables ruleset management +# Description: Saves and restores the state of the ebtables rulesets. +### END INIT INFO + +[ -x /sbin/ebtables ] || exit 1 + +EBTABLES_DUMPFILE_STEM=/etc/ebtables/dump + +RETVAL=0 +prog="ebtables" +desc="Ethernet bridge filtering" +umask 0077 + +#default configuration +EBTABLES_MODULES_UNLOAD="yes" +EBTABLES_LOAD_ON_START="no" +EBTABLES_SAVE_ON_STOP="no" +EBTABLES_SAVE_ON_RESTART="no" +EBTABLES_SAVE_COUNTER="no" +EBTABLES_BACKUP_SUFFIX="~" + +config=/etc/default/$prog +[ -f "$config" ] && . "$config" + +function get_supported_tables() { + EBTABLES_SUPPORTED_TABLES= + /sbin/ebtables -t filter -L 2>&1 1>/dev/null | grep -q permission + if [ $? -eq 0 ]; then + echo "Error: insufficient privileges to access the ebtables rulesets." + exit 1 + fi + for table in filter nat broute; do + /sbin/ebtables -t $table -L &> /dev/null + if [ $? -eq 0 ]; then + EBTABLES_SUPPORTED_TABLES="${EBTABLES_SUPPORTED_TABLES} $table" + fi + done +} + +function load() { + RETVAL=0 + get_supported_tables + echo -n "Restoring ebtables rulesets: " + for table in $EBTABLES_SUPPORTED_TABLES; do + echo -n "$table " + if [ -s ${EBTABLES_DUMPFILE_STEM}.$table ]; then + /sbin/ebtables -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table --atomic-commit + RET=$? + if [ $RET -ne 0 ]; then + echo -n "(failed) " + RETVAL=$RET + fi + else + echo -n "(no saved state) " + fi + done + if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then + echo -n "no kernel support. " + else + echo -n "done. " + fi + if [ $RETVAL -eq 0 ]; then + echo "ok" + else + echo "fail" + fi +} + +function clear() { + RETVAL=0 + get_supported_tables + echo -n "Clearing ebtables rulesets: " + for table in $EBTABLES_SUPPORTED_TABLES; do + echo -n "$table " + /sbin/ebtables -t $table --init-table + done + + if [ "$EBTABLES_MODULES_UNLOAD" = "yes" ]; then + for mod in $(grep -E '^(ebt|ebtable)_' /proc/modules | cut -d' ' -f1) ebtables; do + rmmod $mod 2> /dev/null + done + fi + if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then + echo -n "no kernel support. " + else + echo -n "done. " + fi + if [ $RETVAL -eq 0 ]; then + echo "ok" + else + echo "fail" + fi +} + +function save() { + RETVAL=0 + get_supported_tables + echo -n "Saving ebtables rulesets: " + for table in $EBTABLES_SUPPORTED_TABLES; do + echo -n "$table " + [ -n "$EBTABLES_BACKUP_SUFFIX" ] && [ -s ${EBTABLES_DUMPFILE_STEM}.$table ] && \ + mv ${EBTABLES_DUMPFILE_STEM}.$table ${EBTABLES_DUMPFILE_STEM}.$table$EBTABLES_BACKUP_SUFFIX + /sbin/ebtables -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table --atomic-save + RET=$? + if [ $RET -ne 0 ]; then + echo -n "(failed) " + RETVAL=$RET + else + if [ "$EBTABLES_SAVE_COUNTER" = "no" ]; then + /sbin/ebtables -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table -Z + fi + fi + done + if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then + echo -n "no kernel support. " + else + echo -n "done. " + fi + if [ $RETVAL -eq 0 ]; then + echo "ok" + else + echo "fail" + fi +} + +case "$1" in + start) + [ "$EBTABLES_LOAD_ON_START" = "yes" ] && load + ;; + stop) + [ "$EBTABLES_SAVE_ON_STOP" = "yes" ] && save + clear + ;; + restart|reload|force-reload) + [ "$EBTABLES_SAVE_ON_RESTART" = "yes" ] && save + clear + [ "$EBTABLES_LOAD_ON_START" = "yes" ] && load + ;; + load) + load + ;; + save) + save + ;; + status) + get_supported_tables + if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then + echo "No kernel support for ebtables." + RETVAL=1 + else + echo -n "Ebtables support available, number of installed rules: " + for table in $EBTABLES_SUPPORTED_TABLES; do + COUNT=$(( $(/sbin/ebtables -t $table -L | sed -e "/^Bridge chain/! d" -e "s/^.*entries: //" -e "s/,.*$/ +/") 0 )) + echo -n "$table($COUNT) " + done + echo ok + RETVAL=0 + fi + ;; + *) + echo "Usage: $0 {start|stop|restart|reload|force-reload|load|save|status}" >&2 + RETVAL=1 +esac + +exit $RETVAL diff --git a/recipes/ebtables/ebtables-2.0.9-2/installcreatedirs.patch b/recipes/ebtables/ebtables-2.0.9-2/installcreatedirs.patch new file mode 100644 index 0000000000..86bc4f0a44 --- /dev/null +++ b/recipes/ebtables/ebtables-2.0.9-2/installcreatedirs.patch @@ -0,0 +1,25 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- ebtables-v2.0.6/Makefile~installcreatedirs 2004-06-03 13:34:17.000000000 -0500 ++++ ebtables-v2.0.6/Makefile 2004-06-03 13:35:21.000000000 -0500 +@@ -47,14 +47,17 @@ + + $(MANDIR)/man8/ebtables.8: ebtables.8 + mkdir -p $(@D) ++ install -d $(MANDIR)/man8 + install -m 0644 $(INSTALLOWN) $< $@ + + $(ETHERTYPESFILE): ethertypes + mkdir -p $(@D) ++ install -d $(ETHERTYPESPATH) + install -m 0644 $(INSTALLOWN) $< $@ + + .PHONY: exec + exec: ebtables ++ install -d $(BINPATH) + install -m 0755 $(INSTALLOWN) $< $(BINFILE) + + .PHONY: install diff --git a/recipes/ebtables/ebtables-2.0.9-2/installnonroot.patch b/recipes/ebtables/ebtables-2.0.9-2/installnonroot.patch new file mode 100644 index 0000000000..4d42cc09ed --- /dev/null +++ b/recipes/ebtables/ebtables-2.0.9-2/installnonroot.patch @@ -0,0 +1,45 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +Index: ebtables-v2.0.9-2/Makefile +=================================================================== +--- ebtables-v2.0.9-2.orig/Makefile 2010-02-04 00:17:45.000000000 +0300 ++++ ebtables-v2.0.9-2/Makefile 2010-05-24 16:15:35.000000000 +0400 +@@ -154,28 +154,28 @@ + .PHONY: scripts + scripts: ebtables-save ebtables.sysv ebtables-config + cat ebtables-save | sed 's/__EXEC_PATH__/$(tmp1)/g' > ebtables-save_ +- install -m 0755 -o root -g root ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save ++ install -m 0755 ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save + cat ebtables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables.sysv_ +- install -m 0755 -o root -g root ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables ++ install -m 0755 ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables + cat ebtables-config | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables-config_ +- install -m 0600 -o root -g root ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config ++ install -m 0600 ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config + rm -f ebtables-save_ ebtables.sysv_ ebtables-config_ + + $(MANDIR)/man8/ebtables.8: ebtables.8 + mkdir -p $(DESTDIR)$(@D) + sed 's/$$(VERSION)/$(PROGVERSION)/' ebtables.8 | sed 's/$$(DATE)/$(PROGDATE)/' > ebtables.8_ +- install -m 0644 -o root -g root ebtables.8_ $(DESTDIR)$@ ++ install -m 0644 ebtables.8_ $(DESTDIR)$@ + rm -f ebtables.8_ + + $(ETHERTYPESFILE): ethertypes + mkdir -p $(DESTDIR)$(@D) +- install -m 0644 -o root -g root $< $(DESTDIR)$@ ++ install -m 0644 $< $(DESTDIR)$@ + + .PHONY: exec + exec: ebtables ebtables-restore + mkdir -p $(DESTDIR)$(BINDIR) +- install -m 0755 -o root -g root $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME) +- install -m 0755 -o root -g root ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore ++ install -m 0755 $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME) ++ install -m 0755 ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore + + .PHONY: install + install: $(MANDIR)/man8/ebtables.8 $(ETHERTYPESFILE) exec scripts diff --git a/recipes/ebtables/ebtables_2.0.9-2.bb b/recipes/ebtables/ebtables_2.0.9-2.bb new file mode 100644 index 0000000000..b1fe7a2fb8 --- /dev/null +++ b/recipes/ebtables/ebtables_2.0.9-2.bb @@ -0,0 +1,50 @@ +DESCRIPTION = "Utility that enables basic Ethernet frame filtering on a Linux bridge, MAC NAT and brouting." +PRIORITY = "optional" +LICENSE = "GPL" +SECTION = "console/network" +PR = "r0" + +TARGET_CC_ARCH += "${LDFLAGS}" + +SRC_URI = " \ + ${SOURCEFORGE_MIRROR}/ebtables/ebtables-v${PV}.tar.gz \ + file://installnonroot.patch \ + file://01debian_defaultconfig.patch \ + file://ebtables.init \ + " + +SRC_URI[md5sum] = "b880429a6424186728eb57ae80ef878a" +SRC_URI[sha256sum] = "98855f644d43c615a8e663197978e49c95642f46f2bbf8e6f3213af87f8ad6a3" + +S = "${WORKDIR}/ebtables-v${PV}" + +EXTRA_OEMAKE = " \ + BINDIR=${base_sbindir} \ + MANDIR=${mandir} \ + ETHERTYPESPATH=${sysconfdir} \ + INITDIR=${sysconfdir}/init.d \ + SYSCONFIGDIR=${sysconfdir}/default \ + LIBDIR=${base_libdir}/ebtables \ + 'CC=${CC}' \ + 'CFLAGS=${CFLAGS}' \ + 'LD=${LD}' \ + " + +do_install () { + install -d ${D}${sysconfdir}/init.d + install -d ${D}${sysconfdir}/default + install -d ${D}${sysconfdir}/ebtables + oe_runmake DESTDIR='${D}' install + install -m 0755 ${WORKDIR}/ebtables.init ${D}/${sysconfdir}/init.d/ebtables + mv ${D}${sysconfdir}/default/ebtables-config ${D}${sysconfdir}/default/ebtables +} + +CONFFILES_${PN} += "${sysconfdir}/default/ebtables" + +inherit update-rc.d + +INITSCRIPT_NAME = "ebtables" +INITSCRIPT_PARAMS = "start 41 S . stop 41 6 ." + +FILES_${PN}-dbg += "${base_libdir}/ebtables/.debug" +FILES_${PN} += "${base_libdir}/ebtables/*.so" diff --git a/recipes/efl1/elementary_svn.bb b/recipes/efl1/elementary_svn.bb index 1ee8f37dbb..2ce61dfbb2 100644 --- a/recipes/efl1/elementary_svn.bb +++ b/recipes/efl1/elementary_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "EFL based widget set for mobile devices" LICENSE = "LGPL" DEPENDS = "eet-native efreet evas ecore edje eet edbus" PV = "0.0.0+svnr${SRCPV}" -PR = "r8" +PR = "r9" SRCREV = "${EFL_SRCREV}" inherit efl @@ -50,3 +50,5 @@ FILES_${PN}-tests = "\ ${libdir}/elementary/modules/test_entry/* \ " +RREPLACES_${PN}-themes = "libelementary-ver-pre-svn-05-themes" +RREPLACES_${PN}-configs = "libelementary-ver-pre-svn-05-configs" diff --git a/recipes/eglibc/eglibc.inc b/recipes/eglibc/eglibc.inc index c40bc37b5a..66bb90e83f 100644 --- a/recipes/eglibc/eglibc.inc +++ b/recipes/eglibc/eglibc.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.eglibc.org/home" SECTION = "libs" PRIORITY = "required" LICENSE = "LGPL" -INC_PR = "r10" +INC_PR = "r11" # nptl needs unwind support in gcc, which can't be built without glibc. DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers" #this leads to circular deps, so lets not add it yet diff --git a/recipes/eglibc/eglibc_2.11.bb b/recipes/eglibc/eglibc_2.11.bb index 26bef4c90e..5d9b8e2d45 100644 --- a/recipes/eglibc/eglibc_2.11.bb +++ b/recipes/eglibc/eglibc_2.11.bb @@ -4,9 +4,9 @@ DEFAULT_PREFERENCE = "-1" DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" PV = "2.11" -PR = "${INC_PR}.5" +PR = "${INC_PR}.6" PR_append = "+svnr${SRCPV}" -SRCREV="10454" +SRCREV="10690" EGLIBC_BRANCH="eglibc-2_11" SRC_URI = "svn://svn.eglibc.org/branches;module=${EGLIBC_BRANCH};proto=svn \ file://eglibc-svn-arm-lowlevellock-include-tls.patch \ diff --git a/recipes/eglibc/eglibc_2.12.bb b/recipes/eglibc/eglibc_2.12.bb index a040c76456..a22b2b2fc3 100644 --- a/recipes/eglibc/eglibc_2.12.bb +++ b/recipes/eglibc/eglibc_2.12.bb @@ -4,9 +4,9 @@ DEFAULT_PREFERENCE = "-1" DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" PV = "2.12" -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" PR_append = "+svnr${SRCPV}" -SRCREV="10495" +SRCREV="10689" EGLIBC_BRANCH="eglibc-2_12" SRC_URI = "svn://svn.eglibc.org/branches;module=${EGLIBC_BRANCH};proto=svn \ file://eglibc-svn-arm-lowlevellock-include-tls.patch \ diff --git a/recipes/eglibc/eglibc_svn.bb b/recipes/eglibc/eglibc_svn.bb index bd42030d58..36592c9aba 100644 --- a/recipes/eglibc/eglibc_svn.bb +++ b/recipes/eglibc/eglibc_svn.bb @@ -1,11 +1,11 @@ require eglibc.inc DEPENDS += "gperf-native" -SRCREV = "10505" +SRCREV = "10688" DEFAULT_PREFERENCE = "-1" FILESPATHPKG =. "eglibc-svn:" -PV = "2.11+svnr${SRCPV}" -PR = "${INC_PR}.4" +PV = "2.12+svnr${SRCPV}" +PR = "${INC_PR}.0" EGLIBC_BRANCH="trunk" SRC_URI = "svn://svn.eglibc.org;module=${EGLIBC_BRANCH} \ file://eglibc-svn-arm-lowlevellock-include-tls.patch \ diff --git a/recipes/ekiga/ekiga_3.0.2.bb b/recipes/ekiga/ekiga_3.0.2.bb index 3ea11f567e..72113c35b9 100644 --- a/recipes/ekiga/ekiga_3.0.2.bb +++ b/recipes/ekiga/ekiga_3.0.2.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Gnome videoconferencing application" LICENSE = "GPLv2" -PR = "r1" +PR = "r2" ARM_INSTRUCTION_SET = "arm" diff --git a/recipes/ekiga/ekiga_3.1.0.bb b/recipes/ekiga/ekiga_3.1.0.bb index e2ed15b540..3daa6d404c 100644 --- a/recipes/ekiga/ekiga_3.1.0.bb +++ b/recipes/ekiga/ekiga_3.1.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Gnome videoconferencing application" LICENSE = "GPLv2" -PR = "r3" +PR = "r4" ARM_INSTRUCTION_SET = "arm" diff --git a/recipes/ekiga/ekiga_git.bb b/recipes/ekiga/ekiga_git.bb index ed9cd67d98..1167449b9b 100644 --- a/recipes/ekiga/ekiga_git.bb +++ b/recipes/ekiga/ekiga_git.bb @@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm" DEFAULT_PREFERENCE = "1" PV = "3.3.1+git" -PR = "r3+gitr${SRCREV}" +PR = "r4+gitr${SRCREV}" SRCREV = "c81cabbee7901b6643907d08f9a530308044ec22" inherit gnome diff --git a/recipes/emacs/emacs-x11_22.3.bb b/recipes/emacs/emacs-x11_22.3.bb index f00b285157..c198a1fd94 100644 --- a/recipes/emacs/emacs-x11_22.3.bb +++ b/recipes/emacs/emacs-x11_22.3.bb @@ -5,7 +5,7 @@ DEPENDS += "gtk+ libungif" EXTRA_OECONF = "--without-sound --with-x-toolkit=gtk" -RREPLACES = "emacs" +RREPLACES_${PN} = "emacs" FILESPATHPKG =. "emacs-${PV}:" SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz \ diff --git a/recipes/emacs/emacs-x11_23.1.bb b/recipes/emacs/emacs-x11_23.1.bb index f060e8244a..aa535aa9ec 100644 --- a/recipes/emacs/emacs-x11_23.1.bb +++ b/recipes/emacs/emacs-x11_23.1.bb @@ -3,13 +3,13 @@ require emacs.inc # full X (non-diet) is needed for X support DEPENDS += "gtk+ libungif dbus" -PR = "r1" +PR = "r2" EXTRA_OECONF = "--without-sound --with-x-toolkit=gtk" DEFAULT_PREFERENCE = "-1" -RREPLACES = "emacs" +RREPLACES_${PN} = "emacs" FILESPATHPKG =. "emacs-${PV}:" SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz;name=tarball \ diff --git a/recipes/emacs/emacs-x11_cvs.bb b/recipes/emacs/emacs-x11_cvs.bb index 809176a3c3..92dcce1a44 100644 --- a/recipes/emacs/emacs-x11_cvs.bb +++ b/recipes/emacs/emacs-x11_cvs.bb @@ -5,4 +5,4 @@ DEPENDS += "libx11" EXTRA_OECONF = "--without-sound" -RREPLACES = "emacs" +RREPLACES_${PN} = "emacs" diff --git a/recipes/enchant/enchant_1.1.3.bb b/recipes/enchant/enchant_1.1.3.bb index 5556e7846b..ab544f1fdc 100644 --- a/recipes/enchant/enchant_1.1.3.bb +++ b/recipes/enchant/enchant_1.1.3.bb @@ -7,7 +7,7 @@ RDEPENDS_${PN} = "aspell" inherit autotools pkgconfig -PR = "r0" +PR = "r1" S = "${WORKDIR}/enchant-${PV}" diff --git a/recipes/enchant/enchant_1.2.5.bb b/recipes/enchant/enchant_1.2.5.bb index 5537ae2331..2c3be164f7 100644 --- a/recipes/enchant/enchant_1.2.5.bb +++ b/recipes/enchant/enchant_1.2.5.bb @@ -7,7 +7,7 @@ RDEPENDS_${PN} = "aspell" inherit autotools pkgconfig -PR = "r1" +PR = "r2" S = "${WORKDIR}/enchant-${PV}" diff --git a/recipes/enchant/enchant_1.3.0.bb b/recipes/enchant/enchant_1.3.0.bb index bb11cb7015..813451732e 100644 --- a/recipes/enchant/enchant_1.3.0.bb +++ b/recipes/enchant/enchant_1.3.0.bb @@ -7,7 +7,7 @@ RDEPENDS_${PN} = "aspell" inherit autotools pkgconfig -PR = "r1" +PR = "r2" S = "${WORKDIR}/enchant-${PV}" diff --git a/recipes/evince/evince_0.5.2.bb b/recipes/evince/evince_0.5.2.bb index 5c5061585e..2b79397967 100644 --- a/recipes/evince/evince_0.5.2.bb +++ b/recipes/evince/evince_0.5.2.bb @@ -4,7 +4,7 @@ SECTION = "x11/office" DEPENDS = "tiff espgs poppler gtk+ libgnomeui libgnomeprint libgnomeprintui" RDEPENDS_${PN} = "espgs gconf" RRECOMMENDS_${PN} = "gnome-vfs-plugin-file" -PR = "r2" +PR = "r3" inherit gnome pkgconfig diff --git a/recipes/evince/evince_0.6.1.bb b/recipes/evince/evince_0.6.1.bb index 5c3a83fd46..b2c90b1506 100644 --- a/recipes/evince/evince_0.6.1.bb +++ b/recipes/evince/evince_0.6.1.bb @@ -4,7 +4,7 @@ SECTION = "x11/office" DEPENDS = "tiff libxt espgs poppler gtk+ libgnomeui libgnomeprint libgnomeprintui" RDEPENDS_${PN} = "espgs gconf" RRECOMMENDS_${PN} = "gnome-vfs-plugin-file" -PR = "r1" +PR = "r2" inherit gnome pkgconfig diff --git a/recipes/evince/evince_0.9.0.bb b/recipes/evince/evince_0.9.0.bb index 87b8218ea5..aac8b1f16e 100644 --- a/recipes/evince/evince_0.9.0.bb +++ b/recipes/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_${PN} = "espgs " RRECOMMENDS_${PN} = "gnome-vfs-plugin-file" -PR = "r2" +PR = "r3" inherit gnome pkgconfig gtk-icon-cache diff --git a/recipes/evince/evince_0.9.2.bb b/recipes/evince/evince_0.9.2.bb index 6ddab2705a..39ec48cf3a 100644 --- a/recipes/evince/evince_0.9.2.bb +++ b/recipes/evince/evince_0.9.2.bb @@ -4,7 +4,7 @@ SECTION = "x11/office" DEPENDS = "tiff djvulibre libxt espgs gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring " RDEPENDS_${PN} = "espgs " RRECOMMENDS_${PN} = "gnome-vfs-plugin-file" -PR = "r2" +PR = "r3" inherit gnome pkgconfig gtk-icon-cache diff --git a/recipes/evince/evince_2.20.0.bb b/recipes/evince/evince_2.20.0.bb index 8118c920fc..72f6043c60 100644 --- a/recipes/evince/evince_2.20.0.bb +++ b/recipes/evince/evince_2.20.0.bb @@ -4,7 +4,7 @@ SECTION = "x11/office" DEPENDS = "tiff djvulibre libxt espgs gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring " RDEPENDS_${PN} = "espgs " RRECOMMENDS_${PN} = "gnome-vfs-plugin-file" -PR = "r2" +PR = "r3" inherit gnome pkgconfig gtk-icon-cache diff --git a/recipes/evince/evince_2.23.4.bb b/recipes/evince/evince_2.23.4.bb index 17cb21926a..2408974d08 100644 --- a/recipes/evince/evince_2.23.4.bb +++ b/recipes/evince/evince_2.23.4.bb @@ -4,7 +4,7 @@ SECTION = "x11/office" DEPENDS = "gnome-icon-theme tiff libxt espgs gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring " RDEPENDS_${PN} = "espgs gnome-icon-theme" RRECOMMENDS_${PN} = "gnome-vfs-plugin-file" -PR = "r2" +PR = "r3" inherit gnome pkgconfig gtk-icon-cache diff --git a/recipes/evince/evince_2.24.1.bb b/recipes/evince/evince_2.24.1.bb index a1a531297f..06c4efe8bb 100644 --- a/recipes/evince/evince_2.24.1.bb +++ b/recipes/evince/evince_2.24.1.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" SECTION = "x11/office" DEPENDS = "nautilus gnome-icon-theme tiff libxt espgs gnome-doc-utils poppler libxml2 gtk+ gconf libglade gnome-keyring " RDEPENDS_${PN} = "espgs gnome-icon-theme" -PR = "r2" +PR = "r3" inherit gnome pkgconfig gtk-icon-cache diff --git a/recipes/evince/evince_2.28.0.bb b/recipes/evince/evince_2.28.0.bb index 43460f0fc7..50e5134e3e 100644 --- a/recipes/evince/evince_2.28.0.bb +++ b/recipes/evince/evince_2.28.0.bb @@ -4,7 +4,7 @@ SECTION = "x11/office" DEPENDS = "nautilus gnome-icon-theme tiff libxt espgs gnome-doc-utils poppler libxml2 gtk+ gconf libglade gnome-keyring " RDEPENDS_${PN} = "espgs gnome-icon-theme" -PR = "r1" +PR = "r2" inherit gnome pkgconfig gtk-icon-cache diff --git a/recipes/evopedia/evopedia_git.bb b/recipes/evopedia/evopedia_git.bb index de53ecf77b..2840879d4f 100644 --- a/recipes/evopedia/evopedia_git.bb +++ b/recipes/evopedia/evopedia_git.bb @@ -9,7 +9,7 @@ RRECOMMENDS_${PN} = "midori" RRECOMMENDS_shr = "ventura" PV = "0.3.0-rc3+gitr${SRCPV}" -PR = "r1" +PR = "r2" SRC_URI = "git://github.com/crei/evopedia.git;protocol=http;branch=master" diff --git a/recipes/fakeroot/fakeroot_1.9.6.bb b/recipes/fakeroot/fakeroot_1.9.6.bb index cdb410ab60..6326d4c07e 100644 --- a/recipes/fakeroot/fakeroot_1.9.6.bb +++ b/recipes/fakeroot/fakeroot_1.9.6.bb @@ -4,7 +4,7 @@ SECTION = "base" LICENSE = "GPL" # fakeroot needs getopt which is provided by the util-linux package RDEPENDS_${PN} = "util-linux" -PR = "r1" +PR = "r2" SRC_URI = "${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.tar.gz \ file://configure-libtool.patch" diff --git a/recipes/fbida/fbida_2.07.bb b/recipes/fbida/fbida_2.07.bb index 2406157c59..8eca8bc052 100644 --- a/recipes/fbida/fbida_2.07.bb +++ b/recipes/fbida/fbida_2.07.bb @@ -8,7 +8,7 @@ DESCRIPTION = "frame buffer image and doc viewer tools" AUTHOR = "Gerd Knorr" LICENSE = "GPL2" SECTION = "utils" -PR = "r3" +PR = "r4" DEPENDS = "virtual/libiconv jpeg fontconfig freetype libexif" RDEPENDS_${PN} = "ttf-dejavu-sans-mono" diff --git a/recipes/fbset/fbset_2.1.bb b/recipes/fbset/fbset_2.1.bb index e64ae942ca..029f7514a5 100644 --- a/recipes/fbset/fbset_2.1.bb +++ b/recipes/fbset/fbset_2.1.bb @@ -9,7 +9,7 @@ DESCRIPTION = "The fbset console tool" LICENSE = "GPLv2" RRECOMMENDS_${PN} = "fbset-modes" -PR = "r2" +PR = "r3" SRC_URI = "http://ftp.debian.org/debian/pool/main/f/fbset/fbset_2.1.orig.tar.gz \ file://makefile.patch" diff --git a/recipes/ffalarms/atd-over-fso_0.70.bb b/recipes/ffalarms/atd-over-fso_0.70.bb index f73ecb8172..9a9c80905d 100644 --- a/recipes/ffalarms/atd-over-fso_0.70.bb +++ b/recipes/ffalarms/atd-over-fso_0.70.bb @@ -13,7 +13,7 @@ RPROVIDES_${PN}-dev = "atd-dev" DEPENDS = "dbus-glib pkgconfig" RDEPENDS_${PN} += "dbus dbus-glib frameworkd" -PR = "r4" +PR = "r5" SRC_URI = "${HANDHELDS_CVS};module=apps/atd;tag=ATD-0_70 \ file://atd-startup.patch;striplevel=0 \ diff --git a/recipes/ffalarms/ffalarms_git.bb b/recipes/ffalarms/ffalarms_git.bb index 07fe60f4aa..d20b090860 100644 --- a/recipes/ffalarms/ffalarms_git.bb +++ b/recipes/ffalarms/ffalarms_git.bb @@ -6,9 +6,9 @@ PRIORITY = "optional" LICENSE = "GPLv3" DEPENDS = "elementary libeflvala libical" RDEPENDS_${PN} = "atd alsa-utils-amixer ttf-dejavu-sans libical" -RSUGGESTS = "mplayer alsa-utils-aplay frameworkd" +RSUGGESTS_${PN} = "mplayer alsa-utils-aplay frameworkd" PV = "0.4+gitr${SRCPV}" -PR = "r2" +PR = "r3" SRC_URI = "git://git.shr-project.org/repo/ffalarms.git;protocol=http;branch=master" diff --git a/recipes/ffmpeg/ffmpeg.inc b/recipes/ffmpeg/ffmpeg.inc index 2b4d26e8f6..c3380dd376 100644 --- a/recipes/ffmpeg/ffmpeg.inc +++ b/recipes/ffmpeg/ffmpeg.inc @@ -10,9 +10,9 @@ ARM_INSTRUCTION_SET = "arm" PE = "2" DEPENDS = "zlib libogg libvorbis libtheora faac faad2 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'lame liba52', d)}" -RSUGGESTS = "mplayer" +RSUGGESTS_${PN} = "mplayer" -INC_PR = "r13" +INC_PR = "r14" inherit autotools pkgconfig diff --git a/recipes/fftw/fftw.inc b/recipes/fftw/fftw.inc index acd1b27f4b..5c381e32f0 100644 --- a/recipes/fftw/fftw.inc +++ b/recipes/fftw/fftw.inc @@ -2,9 +2,9 @@ DESCRIPTION = "FFTW" SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL" -RPROVIDES += "libfftw3" +RPROVIDES_${PN} += "libfftw3" -PR = "r1" +PR = "r2" SRC_URI = "http://www.fftw.org/fftw-${PV}.tar.gz" diff --git a/recipes/file-roller/file-roller_2.28.0.bb b/recipes/file-roller/file-roller_2.28.0.bb index 2bb91ef9d3..d73bf81b31 100644 --- a/recipes/file-roller/file-roller_2.28.0.bb +++ b/recipes/file-roller/file-roller_2.28.0.bb @@ -4,7 +4,7 @@ SECTION = "x11/gnome" DEPENDS="gtk+ libgnomeui gnome-common gnome-vfs libglade libbonoboui" RDEPENDS_${PN} = "unzip" -PR = "r2" +PR = "r3" inherit gnome diff --git a/recipes/flex/flex.inc b/recipes/flex/flex.inc index a61ad1ee95..49b26e8b61 100644 --- a/recipes/flex/flex.inc +++ b/recipes/flex/flex.inc @@ -4,6 +4,8 @@ LICENSE = "BSD" DEPENDS = "gettext" +INC_PR = "r5" + S = "${WORKDIR}/flex-${PV}" inherit autotools gettext diff --git a/recipes/flex/flex_2.5.31.bb b/recipes/flex/flex_2.5.31.bb index b7cb0f7d5a..87a0b8d801 100644 --- a/recipes/flex/flex_2.5.31.bb +++ b/recipes/flex/flex_2.5.31.bb @@ -1,5 +1,5 @@ require flex.inc -PR = "r5" +PR = "${INC_PR}.0" SRC_URI = "${SOURCEFORGE_MIRROR}/flex/flex-${PV}.tar.bz2 \ file://flex-lvalue.diff \ diff --git a/recipes/flex/flex_2.5.35.bb b/recipes/flex/flex_2.5.35.bb index 4099f20658..82e2417758 100644 --- a/recipes/flex/flex_2.5.35.bb +++ b/recipes/flex/flex_2.5.35.bb @@ -1,5 +1,7 @@ require flex.inc +PR = "${INC_PR}.0" + SRC_URI = "${SOURCEFORGE_MIRROR}/flex/flex-${PV}.tar.bz2;name=flex \ " @@ -8,3 +10,9 @@ SRC_URI[flex.sha256sum] = "0becbd4b2b36b99c67f8c22ab98f7f80c9860aec70f0350a0018f NATIVE_INSTALL_WORKS = "1" BBCLASSEXTEND = "native" + +do_install_append () { + ln -sf flex ${D}${bindir}/lex + ln -sf flex ${D}${bindir}/lex++ +} + diff --git a/recipes/fltk/fltkcocktailbar_svn.bb b/recipes/fltk/fltkcocktailbar_svn.bb index ca08c463cf..10666c3827 100644 --- a/recipes/fltk/fltkcocktailbar_svn.bb +++ b/recipes/fltk/fltkcocktailbar_svn.bb @@ -7,7 +7,7 @@ DEPENDS = "fltk zlib cairo" RDEPENDS_${PN} = "curl" SRCREV = "52" PV = "1.0+svnr${SRCPV}" -PR = "r0" +PR = "r1" S = "${WORKDIR}/trunk" inherit autotools diff --git a/recipes/fltk/fltkcurrency_svn.bb b/recipes/fltk/fltkcurrency_svn.bb index 39ef44d22a..a42d9b8c80 100644 --- a/recipes/fltk/fltkcurrency_svn.bb +++ b/recipes/fltk/fltkcurrency_svn.bb @@ -7,7 +7,7 @@ DEPENDS = "fltk" RDEPENDS_${PN} = "curl" SRCREV = "10" PV = "1.0+svnr${SRCPV}" -PR = "r0" +PR = "r1" S = "${WORKDIR}/trunk" RDEPENDS_${PN} = "bash wget" diff --git a/recipes/fltk/fltkhackdiet_svn.bb b/recipes/fltk/fltkhackdiet_svn.bb index 0347e12d35..a933286961 100644 --- a/recipes/fltk/fltkhackdiet_svn.bb +++ b/recipes/fltk/fltkhackdiet_svn.bb @@ -7,7 +7,7 @@ DEPENDS = "fltk" RDEPENDS_${PN} = "curl" SRCREV = "67" PV = "1.0+svnr${SRCPV}" -PR = "r0" +PR = "r1" S = "${WORKDIR}/trunk" inherit autotools diff --git a/recipes/flumotion/flumotion_0.4.1.bb b/recipes/flumotion/flumotion_0.4.1.bb index e96d160ab4..ce64bb1ce5 100644 --- a/recipes/flumotion/flumotion_0.4.1.bb +++ b/recipes/flumotion/flumotion_0.4.1.bb @@ -9,7 +9,7 @@ RDEPENDS_${PN} = "python-resource python-pprint python-threading \ python-lang python-zopeinterface python-textutils \ python-gst python-misc" RDEPENDS_${PN}-gui = "${PN} python-pygtk python-pycairo" -PR = "r10" +PR = "r11" SRC_URI = "http://www.flumotion.net/src/flumotion/flumotion-${PV}.tar.bz2 \ file://python-path.patch \ diff --git a/recipes/foonas-init/foonas-init_0.10.bb b/recipes/foonas-init/foonas-init_0.10.bb index 18eaf77979..584b2765ee 100644 --- a/recipes/foonas-init/foonas-init_0.10.bb +++ b/recipes/foonas-init/foonas-init_0.10.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS_${PN} = "busybox devio" -PR = "r1" +PR = "r2" SRC_URI = "file://initscripts/fixfstab \ file://initscripts/syslog.buffer \ diff --git a/recipes/fpdf/fpdf_1.53.bb b/recipes/fpdf/fpdf_1.53.bb index 13f7674ff1..6218b71ca4 100644 --- a/recipes/fpdf/fpdf_1.53.bb +++ b/recipes/fpdf/fpdf_1.53.bb @@ -3,7 +3,7 @@ SECTION = "libs" DEPENDS = "" RDEPENDS_${PN} = "php" LICENSE = "FREEWARE" -PR = "r0" +PR = "r1" SRC_URI = "http://www.fpdf.org/en/download/fpdf153.tgz \ " diff --git a/recipes/freesmartphone/fso-apm_git.bb b/recipes/freesmartphone/fso-apm_git.bb index 004786028e..389cce6713 100644 --- a/recipes/freesmartphone/fso-apm_git.bb +++ b/recipes/freesmartphone/fso-apm_git.bb @@ -5,9 +5,9 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" SECTION = "console" LICENSE = "GPLv2" PE = "1" -RCONFLICTS = "apm" +RCONFLICTS_${PN} = "apm" SRCREV = "${FSO_CORNUCOPIA_SRCREV}" PV = "2.0.0+gitr${SRCPV}" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" S = "${WORKDIR}/git/tools/apm2" diff --git a/recipes/freesmartphone/fso-gsm0710muxd_git.bb b/recipes/freesmartphone/fso-gsm0710muxd_git.bb index 6fae6af421..a85a796e5d 100644 --- a/recipes/freesmartphone/fso-gsm0710muxd_git.bb +++ b/recipes/freesmartphone/fso-gsm0710muxd_git.bb @@ -6,7 +6,7 @@ LICENSE = "GPL" SRCREV = "1d69fb5b666ac2a9e54e46978c7afa8fe5dfc3c9" PV = "0.9.3.1+gitr${SRCPV}" PE = "1" -PR = "r0" +PR = "r1" SRC_URI = "${FREESMARTPHONE_GIT}/gsm0710muxd.git;protocol=git;branch=master" S = "${WORKDIR}/git" @@ -14,7 +14,7 @@ S = "${WORKDIR}/git" inherit autotools RDEPENDS_${PN} = "dbus dbus-glib" -RCONFLICTS = "gsm0710muxd" -RREPLACES = "gsm0710muxd" +RCONFLICTS_${PN} = "gsm0710muxd" +RREPLACES_${PN} = "gsm0710muxd" FILES_${PN} += "${datadir} ${sysconfdir}" diff --git a/recipes/freesmartphone/fsodatad_git.bb b/recipes/freesmartphone/fsodatad_git.bb index 1ee76cf0ef..9d921cb531 100644 --- a/recipes/freesmartphone/fsodatad_git.bb +++ b/recipes/freesmartphone/fsodatad_git.bb @@ -1,7 +1,7 @@ require cornucopia.inc inherit fso-plugin SRCREV = "${FSO_CORNUCOPIA_SRCREV}" -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" PV = "0.1.0+gitr${SRCPV}" PE = "1" diff --git a/recipes/freesmartphone/fsodeviced_git.bb b/recipes/freesmartphone/fsodeviced_git.bb index 2ceff82247..bc973a310e 100644 --- a/recipes/freesmartphone/fsodeviced_git.bb +++ b/recipes/freesmartphone/fsodeviced_git.bb @@ -9,7 +9,7 @@ RPROVIDES_${PN} = "openmoko-alsa-scenarios virtual/alsa-scenarios" SRCREV = "${FSO_CORNUCOPIA_SRCREV}" PV = "0.9.0+gitr${SRCPV}" PE = "2" -PR = "${INC_PR}.12" +PR = "${INC_PR}.13" EXTRA_OECONF = "\ --enable-kernel26-rfkill \ diff --git a/recipes/freesmartphone/fsomusicd_git.bb b/recipes/freesmartphone/fsomusicd_git.bb index e542205e2c..31143fcc15 100644 --- a/recipes/freesmartphone/fsomusicd_git.bb +++ b/recipes/freesmartphone/fsomusicd_git.bb @@ -7,7 +7,7 @@ require cornucopia.inc DEPENDS += "gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugins-ugly', d)}" SRCREV = "${FSO_CORNUCOPIA_SRCREV}" PV = "0.0.1+gitr${SRCPV}" -PR = "${INC_PR}.3" +PR = "${INC_PR}.4" PE = "1" RDEPENDS_${PN} += "\ diff --git a/recipes/freesmartphone/fsonetworkd_git.bb b/recipes/freesmartphone/fsonetworkd_git.bb index 9c6c7ba73b..6a18a97a6f 100644 --- a/recipes/freesmartphone/fsonetworkd_git.bb +++ b/recipes/freesmartphone/fsonetworkd_git.bb @@ -3,5 +3,5 @@ inherit fso-plugin SRCREV = "${FSO_CORNUCOPIA_SRCREV}" PV = "0.1.0.0+gitr${SRCPV}" PE = "1" -PR = "${INC_PR}.3" +PR = "${INC_PR}.4" RDEPENDS_${PN} += "iptables" diff --git a/recipes/freesmartphone/gsmd2_git.bb b/recipes/freesmartphone/gsmd2_git.bb index 777a6f5dc4..391c45a5cd 100644 --- a/recipes/freesmartphone/gsmd2_git.bb +++ b/recipes/freesmartphone/gsmd2_git.bb @@ -7,7 +7,7 @@ LICENSE = "GPL" SRCREV = "c16883a079aeff8780e5d461ec4e8348537ab4d8" PV = "0.1.0+gitr${SRCPV}" PE = "1" -PR = "r1" +PR = "r2" SRC_URI = "${FREESMARTPHONE_GIT}/gsmd2.git;protocol=git;branch=master" S = "${WORKDIR}/git" diff --git a/recipes/freesmartphone/opimd-utils_git.bb b/recipes/freesmartphone/opimd-utils_git.bb index 34d18a0acf..d3509eab7b 100644 --- a/recipes/freesmartphone/opimd-utils_git.bb +++ b/recipes/freesmartphone/opimd-utils_git.bb @@ -6,7 +6,7 @@ RDEPENDS_${PN} = "python-elementary python-dbus python-codecs python-shell pytho SECTION = "x11/application" SRCREV = "98ccc66d1e0e5e74bd8ea8c761116fb6a1844fc7" PV = "0.0.3+gitr${SRCPV}" -PR = "r0" +PR = "r1" PE = "1" inherit setuptools diff --git a/recipes/freesmartphone/zhone_git.bb b/recipes/freesmartphone/zhone_git.bb index 86327bd8a3..1cf28d3cf8 100644 --- a/recipes/freesmartphone/zhone_git.bb +++ b/recipes/freesmartphone/zhone_git.bb @@ -5,7 +5,7 @@ DEPENDS = "edje-native python-pyrex-native python-cython-native" SRCREV = "bd1e895f73a0e5beb2608ebe111d7ef32ee3adbc" PV = "0.0.2+gitr${SRCPV}" PE = "1" -PR = "r13" +PR = "r14" SRC_URI = "${FREESMARTPHONE_GIT}/zhone.git;protocol=git;branch=master \ file://80zhone" diff --git a/recipes/fuse/curlftpfs_0.9.2.bb b/recipes/fuse/curlftpfs_0.9.2.bb index ae9ae91998..53d44a8c7f 100644 --- a/recipes/fuse/curlftpfs_0.9.2.bb +++ b/recipes/fuse/curlftpfs_0.9.2.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" LICENSE = "GPLv2" DEPENDS = "glib-2.0 fuse curl" RDEPENDS_${PN} += " libcurl " -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/curlftpfs/${P}.tar.gz" diff --git a/recipes/fuse/fuse-module_2.6.5.bb b/recipes/fuse/fuse-module_2.6.5.bb index 3fea537536..ddfd953cca 100644 --- a/recipes/fuse/fuse-module_2.6.5.bb +++ b/recipes/fuse/fuse-module_2.6.5.bb @@ -1,7 +1,7 @@ require fuse.inc RRECOMMENDS_${PN} = "fuse" -PR = "r1" +PR = "r2" S = "${WORKDIR}/fuse-${PV}" FILES_${PN} = "/dev ${base_libdir}/modules ${sysconfdir}" diff --git a/recipes/fuse/fuse-module_2.7.1.bb b/recipes/fuse/fuse-module_2.7.1.bb index d3a4f471d8..e9773e8b28 100644 --- a/recipes/fuse/fuse-module_2.7.1.bb +++ b/recipes/fuse/fuse-module_2.7.1.bb @@ -1,7 +1,7 @@ require fuse.inc RRECOMMENDS_${PN} = "fuse" -PR = "r0" +PR = "r1" S = "${WORKDIR}/fuse-${PV}" FILES_${PN} = "/dev ${base_libdir}/modules ${sysconfdir}" diff --git a/recipes/fuse/fuse-module_2.7.4.bb b/recipes/fuse/fuse-module_2.7.4.bb index ee2afd857e..21263d6989 100644 --- a/recipes/fuse/fuse-module_2.7.4.bb +++ b/recipes/fuse/fuse-module_2.7.4.bb @@ -1,7 +1,7 @@ require fuse.inc RRECOMMENDS_${PN} = "fuse" -PR = "r0" +PR = "r1" S = "${WORKDIR}/fuse-${PV}" FILES_${PN} = "/dev ${base_libdir}/modules ${sysconfdir}" diff --git a/recipes/g15daemon/g15daemon_1.2.6a.bb b/recipes/g15daemon/g15daemon_1.2.6a.bb index b2f2e1e2ca..31f92690eb 100644 --- a/recipes/g15daemon/g15daemon_1.2.6a.bb +++ b/recipes/g15daemon/g15daemon_1.2.6a.bb @@ -11,7 +11,7 @@ PRIORITY = "optional" DEPENDS = "libdaemon libg15" RDEPENDS_${PN} = "libg15" RRECOMMENDS_${PN} = "kernel-module-uinput" -PR ="r2" +PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/g15daemon/g15daemon-${PV}.tar.bz2" diff --git a/recipes/galculator/galculator_1.2.3.bb b/recipes/galculator/galculator_1.2.3.bb index 48a6f47288..0254b6ba22 100644 --- a/recipes/galculator/galculator_1.2.3.bb +++ b/recipes/galculator/galculator_1.2.3.bb @@ -1,5 +1,5 @@ LICENSE = "GPL" -PR = "r7" +PR = "r8" inherit autotools pkgconfig gconf diff --git a/recipes/gallery/gallery_1.5.5.bb b/recipes/gallery/gallery_1.5.5.bb index 98b15e573e..8c6e5934bd 100644 --- a/recipes/gallery/gallery_1.5.5.bb +++ b/recipes/gallery/gallery_1.5.5.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The Gallery v1 web image gallery" SECTION = "apps" LICENSE = "GPL" RDEPENDS_${PN} = "apache2 modphp imagemagick jhead" -PR = "r2" +PR = "r3" SRC_URI = "http://{SOURCEFORGE_MIRROR}/sourceforge/gallery/gallery-${PV}-pl1.tar.gz" diff --git a/recipes/gcc/gcc-cross_4.5.bb b/recipes/gcc/gcc-cross_4.5.bb index 825a7bde8a..a2da4a88e8 100644 --- a/recipes/gcc/gcc-cross_4.5.bb +++ b/recipes/gcc/gcc-cross_4.5.bb @@ -1,9 +1,8 @@ -PR = "r0" +PR = "r1" require gcc-${PV}.inc require gcc-cross4.inc -DEPENDS += "libmpc-native" - +NATIVEDEPS += "libmpc-native libelf-native" SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch " EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} --with-system-zlib" diff --git a/recipes/gcc/gcc-csl-arm-2007q3.inc b/recipes/gcc/gcc-csl-arm-2007q3.inc index 7242313036..dfee6f74fa 100644 --- a/recipes/gcc/gcc-csl-arm-2007q3.inc +++ b/recipes/gcc/gcc-csl-arm-2007q3.inc @@ -3,7 +3,7 @@ require gcc-common.inc BINV = "4.2.1" PV = "4.2.1+csl-arm-2007q3-53" -FILESPATH = "${FILE_DIRNAME}/gcc-csl-arm-2007q3:${FILE_DIRNAME}/gcc-csl-arm" +FILESPATHPKG =. "gcc-csl-arm-2007q3:gcc-csl-arm:" SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2007q3-53-arm-none-eabi.src.tar.bz2;name=archive \ file://gcc-new-makeinfo.patch \ diff --git a/recipes/gcc/gcc_4.5.bb b/recipes/gcc/gcc_4.5.bb index 2ef7229271..ad71ada0f9 100644 --- a/recipes/gcc/gcc_4.5.bb +++ b/recipes/gcc/gcc_4.5.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" require gcc-${PV}.inc require gcc-configure-target.inc require gcc-package-target.inc @@ -6,6 +6,8 @@ require gcc-package-target.inc # Gcc 4.3.3 installs crt* in a '4.3.1' dir.... FILES_${PN} += "\ ${gcclibdir}/${TARGET_SYS}/*/*.o \ + ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lto1 \ + ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lto-wrapper \ " SRC_URI_append = "file://fortran-cross-compile-hack.patch" diff --git a/recipes/gdb/gdb-7.1/gdb-tcsetpgrp.patch b/recipes/gdb/gdb-7.1/gdb-tcsetpgrp.patch new file mode 100644 index 0000000000..d642721127 --- /dev/null +++ b/recipes/gdb/gdb-7.1/gdb-tcsetpgrp.patch @@ -0,0 +1,43 @@ +Stuart Hughes, stuarth@freescale.com 8th April 05 + +Extracted from: + +From: Davin Milun (milun@cs.buffalo.edu) +Subject: Re: xxgdb for Solaris +View: Complete Thread (4 articles) +Original Format +Newsgroups: comp.unix.solaris +Date: 1995/05/05 + +Geraldo Veiga <ggv@research.att.com> wrote: +>Now, how do I avoid those +> +>[tcsetpgrp failed in terminal_inferior: Inappropriate ioctl for device] +> +>messages at every step the program takes under mxgdb (and xxgdb)?. I am +>running GDB4.13 under Solaris 2.4. + +You need to patch inflow.c. + + + diff --exclude CVS -uNr gdb-6.0/gdb/inflow.c gdb-6.0.modified/gdb/inflow.c +Index: gdb-7.1/gdb/inflow.c +=================================================================== +--- gdb-7.1.orig/gdb/inflow.c 2010-01-21 06:26:12.000000000 -0800 ++++ gdb-7.1/gdb/inflow.c 2010-06-09 13:59:33.761358724 -0700 +@@ -308,13 +308,13 @@ terminal_inferior (void) + { + #ifdef HAVE_TERMIOS + result = tcsetpgrp (0, tinfo->process_group); +- if (!inf->attach_flag) ++ if (!inf->attach_flag && errno != ENOTTY) + OOPSY ("tcsetpgrp"); + #endif + + #ifdef HAVE_SGTTY + result = ioctl (0, TIOCSPGRP, &tinfo->process_group); +- if (!inf->attach_flag) ++ if (!inf->attach_flag && errno != ENOTTY) + OOPSY ("TIOCSPGRP"); + #endif + } diff --git a/recipes/gdb/gdb_7.1.bb b/recipes/gdb/gdb_7.1.bb index 5489c80b61..a73eb72a7d 100644 --- a/recipes/gdb/gdb_7.1.bb +++ b/recipes/gdb/gdb_7.1.bb @@ -1,8 +1,11 @@ require gdb.inc LICENSE = "GPLv3" -SRC_URI += "\ - file://gdb-6.8-fix-compile-karmic.patch" +PR = "r1" + +SRC_URI += "file://gdb-6.8-fix-compile-karmic.patch \ + file://gdb-tcsetpgrp.patch \ + " # Work-around problems while creating libbfd.a EXTRA_OECONF += "--enable-static" diff --git a/recipes/geda/geda-xgsch2pcb_0.1.2.bb b/recipes/geda/geda-xgsch2pcb_0.1.2.bb index 9cb3e611d1..99acc60852 100644 --- a/recipes/geda/geda-xgsch2pcb_0.1.2.bb +++ b/recipes/geda/geda-xgsch2pcb_0.1.2.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Graphical front-end for the gschem -> pcb workflow" LICENSE = "GPLv2" HOMEPAGE = "http://www.gpleda.org/" FILES_${PN} += "${datadir}/icons" -PR = "r1" +PR = "r2" DEPENDS = "python-native" # python-codecs for gettext.py diff --git a/recipes/geda/geda_1.4.3.bb b/recipes/geda/geda_1.4.3.bb index 1655a14701..eb33d3560b 100644 --- a/recipes/geda/geda_1.4.3.bb +++ b/recipes/geda/geda_1.4.3.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Virtual package including the whole gEDA suite" LICENSE = "GPLv2" HOMEPAGE = "http://www.gpleda.org/" PACKAGE_ARCH = "all" -PR = "r1" +PR = "r2" DEPENDS = "libgeda gtk+" DEPENDS += "geda-utils geda-gattrib geda-gnetlist geda-gschem geda-gsymcheck geda-symbols geda-docs geda-examples pcb" diff --git a/recipes/gkdial/gkdial_1.8.1.bb b/recipes/gkdial/gkdial_1.8.1.bb index 41d55c4bc0..9c51c03b01 100644 --- a/recipes/gkdial/gkdial_1.8.1.bb +++ b/recipes/gkdial/gkdial_1.8.1.bb @@ -6,7 +6,7 @@ RDEPENDS_${PN} = "ppp gconf gpe-su" SECTION = "gpe" PRIORITY = "optional" -PR = "r4" +PR = "r5" SRC_URI = "http://familiar.handhelds.org/source/v0.8.2/${PN}-${PV}.tar.gz \ file://gkdial-pgpe.patch \ diff --git a/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb b/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb index 785a4e16f4..95377a4b99 100644 --- a/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb +++ b/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" DEPENDS = "firefox gtk+ gconf dbus-glib" RDEPENDS_${PN} = "firefox gnome-mplayer" -PR = "r8" +PR = "r9" inherit autotools diff --git a/recipes/gnome-mplayer/gnome-mplayer.inc b/recipes/gnome-mplayer/gnome-mplayer.inc index a46bfb8940..c9ef1118d3 100644 --- a/recipes/gnome-mplayer/gnome-mplayer.inc +++ b/recipes/gnome-mplayer/gnome-mplayer.inc @@ -8,7 +8,7 @@ RDEPENDS_${PN} = "mplayer" inherit gnome -INC_PR = "r10" +INC_PR = "r11" SRC_URI = "http://gnome-mplayer.googlecode.com/files/${P}.tar.gz;name=gnomemplayer" diff --git a/recipes/gnome/epiphany_2.21.92.bb b/recipes/gnome/epiphany_2.21.92.bb index d39bf1eae1..f1ea1ced3d 100644 --- a/recipes/gnome/epiphany_2.21.92.bb +++ b/recipes/gnome/epiphany_2.21.92.bb @@ -1,7 +1,7 @@ DESCRIPTION = "GNOME default webbrowser" DEPENDS = "gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification" RDEPENDS_${PN} = "gnome-vfs-plugin-http iso-codes" -PR ="r2" +PR = "r3" inherit gnome diff --git a/recipes/gnome/epiphany_2.22.1.bb b/recipes/gnome/epiphany_2.22.1.bb index eff32d759e..6d851c8b16 100644 --- a/recipes/gnome/epiphany_2.22.1.bb +++ b/recipes/gnome/epiphany_2.22.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "GNOME default webbrowser" DEPENDS = "libsoup-2.4 gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification" RDEPENDS_${PN} = "gnome-vfs-plugin-http iso-codes" -PR = "r2" +PR = "r3" inherit gnome diff --git a/recipes/gnome/epiphany_2.24.0.bb b/recipes/gnome/epiphany_2.24.0.bb index cfdb9e35dd..d0a985660a 100644 --- a/recipes/gnome/epiphany_2.24.0.bb +++ b/recipes/gnome/epiphany_2.24.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "GNOME default webbrowser" DEPENDS = "libsoup-2.4 gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification" RDEPENDS_${PN} = "gnome-vfs-plugin-http iso-codes" -PR = "r1" +PR = "r2" inherit gnome diff --git a/recipes/gnome/epiphany_2.24.2.bb b/recipes/gnome/epiphany_2.24.2.bb index 1fbe9bd9c7..5ff779aa4b 100644 --- a/recipes/gnome/epiphany_2.24.2.bb +++ b/recipes/gnome/epiphany_2.24.2.bb @@ -4,7 +4,7 @@ RDEPENDS_${PN} = "gnome-vfs-plugin-http iso-codes" inherit gnome -PR = "r2" +PR = "r3" EXTRA_OECONF = "--with-engine=webkit --with-distributor-name=${DISTRO}" diff --git a/recipes/gnome/epiphany_2.27.1.bb b/recipes/gnome/epiphany_2.27.1.bb index 3d890bf964..eb4cbf4f6a 100644 --- a/recipes/gnome/epiphany_2.27.1.bb +++ b/recipes/gnome/epiphany_2.27.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "GNOME default webbrowser" DEPENDS = "libsoup-2.4 gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification" RDEPENDS_${PN} = "gnome-vfs-plugin-http iso-codes" -PR = "r1" +PR = "r2" inherit gnome diff --git a/recipes/gnome/epiphany_svn.bb b/recipes/gnome/epiphany_svn.bb index 63e2e3477d..c0f297f689 100644 --- a/recipes/gnome/epiphany_svn.bb +++ b/recipes/gnome/epiphany_svn.bb @@ -4,7 +4,7 @@ RDEPENDS_${PN} = "gnome-vfs-plugin-http iso-codes" SRCREV = "7837" PV = "2.20.1+svnr${SRCPV}" -PR = "r1" +PR = "r2" inherit gnome diff --git a/recipes/gnome/gconf_2.28.0.bb b/recipes/gnome/gconf_2.28.0.bb index 59e913fe84..fcc2606591 100644 --- a/recipes/gnome/gconf_2.28.0.bb +++ b/recipes/gnome/gconf_2.28.0.bb @@ -10,7 +10,7 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/GConf/2.28/GConf-${PV}.tar.bz2 SRC_URI[archive.md5sum] = "ad2aeb9c7d906b274954c51a615caeac" SRC_URI[archive.sha256sum] = "d057dcfe2bfb2a80e592349c2a78d7dce12d19542aeced466c64fb701c806ac8" -PR="r1" +PR = "r2" RDEPENDS_${PN} += "dbus-x11" diff --git a/recipes/gnome/gedit_2.28.0.bb b/recipes/gnome/gedit_2.28.0.bb index 9bf3841e42..cbf1507199 100644 --- a/recipes/gnome/gedit_2.28.0.bb +++ b/recipes/gnome/gedit_2.28.0.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" DEPENDS = "iso-codes gnome-common glib-2.0 gtk+ gconf gtksourceview2" RDEPENDS_${PN} += " gtksourceview2" -PR = "r2" +PR = "r3" inherit gnome pkgconfig diff --git a/recipes/gnome/gnome-icon-theme_2.28.0.bb b/recipes/gnome/gnome-icon-theme_2.28.0.bb index 6493d9275b..a97da76cc7 100644 --- a/recipes/gnome/gnome-icon-theme_2.28.0.bb +++ b/recipes/gnome/gnome-icon-theme_2.28.0.bb @@ -5,7 +5,7 @@ DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native" RDEPENDS_${PN} = "hicolor-icon-theme" RRECOMMENDS_${PN} = "librsvg-gtk" -PR = "r3" +PR = "r4" inherit gnome diff --git a/recipes/gnome/gnome-mime-data_2.4.2.bb b/recipes/gnome/gnome-mime-data_2.4.2.bb index d5c874b8bd..20ea1366a3 100644 --- a/recipes/gnome/gnome-mime-data_2.4.2.bb +++ b/recipes/gnome/gnome-mime-data_2.4.2.bb @@ -4,7 +4,7 @@ inherit gnome DEPENDS += "libxml-parser-perl-native shared-mime-info intltool-native" RDEPENDS_${PN} = "shared-mime-info" -PR = "r2" +PR = "r3" SRC_URI[archive.md5sum] = "37242776b08625fa10c73c18b790e552" SRC_URI[archive.sha256sum] = "e8ee6534bd142ee0ed55134a5eb95f6e7f4b8640df2d3669ebd202f6d82f9a0d" diff --git a/recipes/gnome/gnome-python_2.22.1.bb b/recipes/gnome/gnome-python_2.22.1.bb index 7316114b86..8fd78cb790 100644 --- a/recipes/gnome/gnome-python_2.22.1.bb +++ b/recipes/gnome/gnome-python_2.22.1.bb @@ -3,7 +3,7 @@ LICENSE = "LGPL" DEPENDS = "libgnomeui pyorbit python-pygtk" RDEPENDS_${PN} = "pyorbit" -PR = "r2" +PR = "r3" inherit gnome distutils-base pkgconfig diff --git a/recipes/gnome/gnome-python_2.26.1.bb b/recipes/gnome/gnome-python_2.26.1.bb index 9b858c7c29..ecd9080be9 100644 --- a/recipes/gnome/gnome-python_2.26.1.bb +++ b/recipes/gnome/gnome-python_2.26.1.bb @@ -3,7 +3,7 @@ LICENSE = "LGPL" DEPENDS = "libgnomeui pyorbit python-pygtk" RDEPENDS_${PN} = "pyorbit" -PR = "r1" +PR = "r2" inherit gnome distutils-base pkgconfig diff --git a/recipes/gnome/gnome-python_2.28.0.bb b/recipes/gnome/gnome-python_2.28.0.bb index fc217bc3fc..8028bd786e 100644 --- a/recipes/gnome/gnome-python_2.28.0.bb +++ b/recipes/gnome/gnome-python_2.28.0.bb @@ -3,7 +3,7 @@ LICENSE = "LGPL" DEPENDS = "libgnomeui pyorbit python-pygtk" RDEPENDS_${PN} = "pyorbit" -PR = "r2" +PR = "r3" inherit gnome distutils-base pkgconfig diff --git a/recipes/gnome/gnome-vfs_2.22.0.bb b/recipes/gnome/gnome-vfs_2.22.0.bb index e0dc46fa15..70c563aa4e 100644 --- a/recipes/gnome/gnome-vfs_2.22.0.bb +++ b/recipes/gnome/gnome-vfs_2.22.0.bb @@ -3,7 +3,7 @@ DEPENDS = "libxml2 gconf gnutls avahi dbus dbus-glib bzip2 gnome-mime-data zlib" RRECOMMENDS_${PN} = "gnome-vfs-plugin-file shared-mime-info" # Some legacy packages will require gnome-mime-data to be installed, but use of # it is deprecated. -PR = "r1" +PR = "r2" inherit gnome @@ -12,7 +12,7 @@ SRC_URI += "file://gconftool-lossage.patch \ # This is to provide compatibility with the gnome-vfs DBus fork PROVIDES = "gnome-vfs-plugin-dbus" -RREPLACES = "gnome-vfs-dbus" +RREPLACES_${PN} = "gnome-vfs-dbus" EXTRA_OECONF = " \ --disable-openssl \ diff --git a/recipes/gnome/gnome-vfs_2.24.1.bb b/recipes/gnome/gnome-vfs_2.24.1.bb index 19104d479a..7e2af8e6b0 100644 --- a/recipes/gnome/gnome-vfs_2.24.1.bb +++ b/recipes/gnome/gnome-vfs_2.24.1.bb @@ -3,7 +3,7 @@ DEPENDS = "libxml2 gconf gnutls avahi dbus dbus-glib bzip2 gnome-mime-data zlib RRECOMMENDS_${PN} = "gnome-vfs-plugin-file shared-mime-info" # Some legacy packages will require gnome-mime-data to be installed, but use of # it is deprecated. -PR = "r2" +PR = "r3" inherit gnome @@ -13,7 +13,7 @@ SRC_URI += "file://gconftool-lossage.patch \ # This is to provide compatibility with the gnome-vfs DBus fork PROVIDES = "gnome-vfs-plugin-dbus" -RREPLACES = "gnome-vfs-dbus" +RREPLACES_${PN} = "gnome-vfs-dbus" EXTRA_OECONF = " \ --disable-openssl \ diff --git a/recipes/gnome/libgsf_1.13.3.bb b/recipes/gnome/libgsf_1.13.3.bb index 5bae38db34..710abe2bc9 100644 --- a/recipes/gnome/libgsf_1.13.3.bb +++ b/recipes/gnome/libgsf_1.13.3.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" SECTION = "libs" -PR = "r1" +PR = "r2" DEPENDS= "libxml2 glib-2.0 zlib gtk-doc libbonobo gnome-vfs" RDEPENDS_${PN} = "gconf gnome-vfs" diff --git a/recipes/gnome/libgsf_1.14.8.bb b/recipes/gnome/libgsf_1.14.8.bb index 49deeb9c19..c6bc01ae62 100644 --- a/recipes/gnome/libgsf_1.14.8.bb +++ b/recipes/gnome/libgsf_1.14.8.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" SECTION = "libs" -PR = "r0" +PR = "r1" DEPENDS= "libxml2 bzip2 glib-2.0 zlib gtk-doc libbonobo gnome-vfs" RDEPENDS_${PN} = "gconf gnome-vfs" diff --git a/recipes/gnome/system-tools-backends_2.8.3.bb b/recipes/gnome/system-tools-backends_2.8.3.bb index b555795a62..a0b0c9872d 100644 --- a/recipes/gnome/system-tools-backends_2.8.3.bb +++ b/recipes/gnome/system-tools-backends_2.8.3.bb @@ -1,7 +1,7 @@ DESCRIPTION = "gnome system tools backends" LICENSE = "GPL" -PR = "r2" +PR = "r3" DEPENDS = "dbus dbus-glib glib-2.0 policykit" diff --git a/recipes/gpe-aerial/gpe-aerial_0.2.11.bb b/recipes/gpe-aerial/gpe-aerial_0.2.11.bb index ac78aec34c..c857b9899d 100644 --- a/recipes/gpe-aerial/gpe-aerial_0.2.11.bb +++ b/recipes/gpe-aerial/gpe-aerial_0.2.11.bb @@ -1,6 +1,6 @@ inherit gpe pkgconfig -PR = "r1" +PR = "r2" DESCRIPTION = "GPE wireless LAN communication applet" DEPENDS = "gtk+ libgpewidget prismstumbler" diff --git a/recipes/gpe-aerial/gpe-aerial_0.2.12.bb b/recipes/gpe-aerial/gpe-aerial_0.2.12.bb index 9c62357bf5..4e4634b430 100644 --- a/recipes/gpe-aerial/gpe-aerial_0.2.12.bb +++ b/recipes/gpe-aerial/gpe-aerial_0.2.12.bb @@ -1,6 +1,6 @@ inherit gpe pkgconfig -PR = "r1" +PR = "r2" DESCRIPTION = "GPE wireless LAN communication applet" DEPENDS = "gtk+ libgpewidget prismstumbler" diff --git a/recipes/gpe-aerial/gpe-aerial_0.2.13.bb b/recipes/gpe-aerial/gpe-aerial_0.2.13.bb index 1448cb9e4c..82415a547f 100644 --- a/recipes/gpe-aerial/gpe-aerial_0.2.13.bb +++ b/recipes/gpe-aerial/gpe-aerial_0.2.13.bb @@ -1,6 +1,6 @@ inherit gpe pkgconfig -PR = "r1" +PR = "r2" DESCRIPTION = "GPE wireless LAN communication applet" diff --git a/recipes/gpe-aerial/gpe-aerial_0.3.0.bb b/recipes/gpe-aerial/gpe-aerial_0.3.0.bb index 36a8dd2d38..8bb13502f1 100644 --- a/recipes/gpe-aerial/gpe-aerial_0.3.0.bb +++ b/recipes/gpe-aerial/gpe-aerial_0.3.0.bb @@ -1,6 +1,6 @@ inherit gpe autotools -PR = "r0" +PR = "r1" DESCRIPTION = "GPE wireless LAN communication applet" DEPENDS = "gtk+ libgpewidget prismstumbler" RDEPENDS_${PN} = "prismstumbler" diff --git a/recipes/gpe-aerial/gpe-aerial_svn.bb b/recipes/gpe-aerial/gpe-aerial_svn.bb index c8a597a257..83eb906e67 100644 --- a/recipes/gpe-aerial/gpe-aerial_svn.bb +++ b/recipes/gpe-aerial/gpe-aerial_svn.bb @@ -6,7 +6,7 @@ RDEPENDS_${PN} = "prismstumbler" SECTION = "gpe" PRIORITY = "optional" LICENSE = "GPL" -PR = "r0" +PR = "r1" PV = "0.3.0+svn${SRCDATE}" SRC_URI = "${GPE_EXTRA_SVN}" diff --git a/recipes/gpe-beam/gpe-beam_0.2.6.bb b/recipes/gpe-beam/gpe-beam_0.2.6.bb index 6d6569eea3..f939d53231 100644 --- a/recipes/gpe-beam/gpe-beam_0.2.6.bb +++ b/recipes/gpe-beam/gpe-beam_0.2.6.bb @@ -1,7 +1,7 @@ require ${PN}.inc RDEPENDS_${PN} = "libopenobex-1.0-1 irda-utils" -PR = "r1" +PR = "r2" SRC_URI += "file://vcard-send.patch;striplevel=0" diff --git a/recipes/gpe-beam/gpe-beam_0.2.7.bb b/recipes/gpe-beam/gpe-beam_0.2.7.bb index 2effb37721..172b2c830c 100644 --- a/recipes/gpe-beam/gpe-beam_0.2.7.bb +++ b/recipes/gpe-beam/gpe-beam_0.2.7.bb @@ -1,7 +1,7 @@ require ${PN}.inc RDEPENDS_${PN} = "libopenobex-1.0-1 irda-utils" -PR = "r1" +PR = "r2" SRC_URI += "file://decl.patch;striplevel=0" diff --git a/recipes/gpe-bootsplash/gpe-bootsplash-theme-e.bb b/recipes/gpe-bootsplash/gpe-bootsplash-theme-e.bb index 6b8eab025e..5b612690fd 100644 --- a/recipes/gpe-bootsplash/gpe-bootsplash-theme-e.bb +++ b/recipes/gpe-bootsplash/gpe-bootsplash-theme-e.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "gpe-bootsplash" RDEPENDS_${PN} = "gpe-bootsplash" -PR = "r1" +PR = "r2" export THEME = "e" diff --git a/recipes/gpe-bootsplash/gpe-bootsplash-theme-gpephone.bb b/recipes/gpe-bootsplash/gpe-bootsplash-theme-gpephone.bb index 041cdb16f8..11c1932dc7 100644 --- a/recipes/gpe-bootsplash/gpe-bootsplash-theme-gpephone.bb +++ b/recipes/gpe-bootsplash/gpe-bootsplash-theme-gpephone.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "LiPS" DEPENDS = "gpe-bootsplash" RDEPENDS_${PN} = "gpe-bootsplash" -PR = "r0" +PR = "r1" export THEME = "gpephone" diff --git a/recipes/gpe-bootsplash/gpe-bootsplash-theme-opie.bb b/recipes/gpe-bootsplash/gpe-bootsplash-theme-opie.bb index 8e2338e565..5df5b987da 100644 --- a/recipes/gpe-bootsplash/gpe-bootsplash-theme-opie.bb +++ b/recipes/gpe-bootsplash/gpe-bootsplash-theme-opie.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "gpe-bootsplash" RDEPENDS_${PN} = "gpe-bootsplash" -PR = "r1" +PR = "r2" export THEME = "opie" diff --git a/recipes/gpe-calendar/gpe-calendar_0.72.bb b/recipes/gpe-calendar/gpe-calendar_0.72.bb index 4b367eefcc..15f513c4b7 100644 --- a/recipes/gpe-calendar/gpe-calendar_0.72.bb +++ b/recipes/gpe-calendar/gpe-calendar_0.72.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" DEPENDS = "dbus-glib libeventdb libschedule libxsettings-client libgpepimc libgpevtype" RDEPENDS_${PN} = "gpe-icons" -PR = "r0" +PR = "r1" GPE_TARBALL_SUFFIX = "bz2" diff --git a/recipes/gpe-calendar/gpe-calendar_0.90.bb b/recipes/gpe-calendar/gpe-calendar_0.90.bb index 308560e3f9..70786ea8ff 100644 --- a/recipes/gpe-calendar/gpe-calendar_0.90.bb +++ b/recipes/gpe-calendar/gpe-calendar_0.90.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" DEPENDS = "libhandoff libsoup libeventdb libschedule libxsettings libxsettings-client libgpepimc libdisplaymigration libgpevtype" RDEPENDS_${PN} = "gpe-icons" -PR = "r0" +PR = "r1" GPE_TARBALL_SUFFIX = "bz2" diff --git a/recipes/gpe-calendar/gpe-calendar_0.91.bb b/recipes/gpe-calendar/gpe-calendar_0.91.bb index 7a89d39167..98a9193fac 100644 --- a/recipes/gpe-calendar/gpe-calendar_0.91.bb +++ b/recipes/gpe-calendar/gpe-calendar_0.91.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" DEPENDS = "libhandoff libsoup libeventdb libschedule libxsettings libxsettings-client libgpepimc libdisplaymigration libgpevtype libsoundgen" RDEPENDS_${PN} = "gpe-icons" -PR = "r0" +PR = "r1" GPE_TARBALL_SUFFIX = "bz2" diff --git a/recipes/gpe-calendar/gpe-calendar_0.92.bb b/recipes/gpe-calendar/gpe-calendar_0.92.bb index 2e2101ccec..32da0a2b66 100644 --- a/recipes/gpe-calendar/gpe-calendar_0.92.bb +++ b/recipes/gpe-calendar/gpe-calendar_0.92.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" DEPENDS = "libhandoff libsoup libeventdb libschedule libxsettings libxsettings-client libgpepimc libdisplaymigration libgpevtype libsoundgen" RDEPENDS_${PN} = "gpe-icons" -PR = "r0" +PR = "r1" GPE_TARBALL_SUFFIX = "bz2" diff --git a/recipes/gpe-calendar/gpe-calendar_svn.bb b/recipes/gpe-calendar/gpe-calendar_svn.bb index cb18609d71..f0bf30ea03 100644 --- a/recipes/gpe-calendar/gpe-calendar_svn.bb +++ b/recipes/gpe-calendar/gpe-calendar_svn.bb @@ -11,7 +11,7 @@ inherit autotools gpe PV = "0.91+svn${SRCDATE}" -PR = "r0" +PR = "r1" SRC_URI = "${GPE_SVN}" S = "${WORKDIR}/${PN}" diff --git a/recipes/gpe-clock/gpe-clock.inc b/recipes/gpe-clock/gpe-clock.inc index ff59d93143..ccce0e90d3 100644 --- a/recipes/gpe-clock/gpe-clock.inc +++ b/recipes/gpe-clock/gpe-clock.inc @@ -5,6 +5,6 @@ LICENSE = "GPL" DEPENDS = "gtk+ libschedule libgpewidget gpe-announce libgpelaunch" RDEPENDS_${PN} = "gpe-announce atd" -INC_PR = "r2" +INC_PR = "r3" inherit gpe diff --git a/recipes/gpe-contacts/gpe-contacts.inc b/recipes/gpe-contacts/gpe-contacts.inc index b98d6b36d9..7a7fdbecfd 100644 --- a/recipes/gpe-contacts/gpe-contacts.inc +++ b/recipes/gpe-contacts/gpe-contacts.inc @@ -1,7 +1,7 @@ LICENSE = "GPL" inherit gpe autotools pkgconfig -PR = "r0" +PR = "r1" DEPENDS = "libgpewidget libdisplaymigration libgpevtype dbus" SECTION = "gpe" diff --git a/recipes/gpe-contacts/gpe-contacts_0.45.bb b/recipes/gpe-contacts/gpe-contacts_0.45.bb index 65c4e11611..b33f945a39 100644 --- a/recipes/gpe-contacts/gpe-contacts_0.45.bb +++ b/recipes/gpe-contacts/gpe-contacts_0.45.bb @@ -1,7 +1,7 @@ LICENSE = "GPL" inherit gpe autotools -PR = "r0" +PR = "r1" DEPENDS = "libcontactsdb libgpewidget libgpepimc libdisplaymigration libgpevtype dbus-glib" SECTION = "gpe" diff --git a/recipes/gpe-contacts/gpe-contacts_svn.bb b/recipes/gpe-contacts/gpe-contacts_svn.bb index a818910f22..33a8858ebd 100644 --- a/recipes/gpe-contacts/gpe-contacts_svn.bb +++ b/recipes/gpe-contacts/gpe-contacts_svn.bb @@ -5,7 +5,7 @@ DEPENDS = "libcontactsdb libgpewidget libgpepimc libdisplaymigration libgpevtype RDEPENDS_${PN} = "gpe-icons" SRCREV = "9312" PV = "0.47+svnr${SRCPV}" -PR = "r2" +PR = "r3" inherit autotools gpe diff --git a/recipes/gpe-filemanager/gpe-filemanager_0.23.bb b/recipes/gpe-filemanager/gpe-filemanager_0.23.bb index 7388bc5ca8..1f448a32bd 100644 --- a/recipes/gpe-filemanager/gpe-filemanager_0.23.bb +++ b/recipes/gpe-filemanager/gpe-filemanager_0.23.bb @@ -1,7 +1,7 @@ inherit gpe -PR = "r0" +PR = "r1" LICENSE = "GPL" DESCRIPTION = "GPE file manager" DEPENDS = "libgpewidget gnome-vfs dbus-glib" diff --git a/recipes/gpe-filemanager/gpe-filemanager_0.24.bb b/recipes/gpe-filemanager/gpe-filemanager_0.24.bb index 8d919e5d67..1ad48196ba 100644 --- a/recipes/gpe-filemanager/gpe-filemanager_0.24.bb +++ b/recipes/gpe-filemanager/gpe-filemanager_0.24.bb @@ -1,7 +1,7 @@ inherit gpe -PR = "r0" +PR = "r1" LICENSE = "GPL" DESCRIPTION = "GPE file manager" DEPENDS = "libgpewidget gnome-vfs dbus-glib" diff --git a/recipes/gpe-filemanager/gpe-filemanager_0.25.bb b/recipes/gpe-filemanager/gpe-filemanager_0.25.bb index beddbf7f91..70ab21d32c 100644 --- a/recipes/gpe-filemanager/gpe-filemanager_0.25.bb +++ b/recipes/gpe-filemanager/gpe-filemanager_0.25.bb @@ -1,7 +1,7 @@ inherit gpe -PR = "r1" +PR = "r2" LICENSE = "GPL" DESCRIPTION = "GPE file manager" DEPENDS = "libgpewidget gnome-vfs dbus-glib" diff --git a/recipes/gpe-filemanager/gpe-filemanager_0.30.bb b/recipes/gpe-filemanager/gpe-filemanager_0.30.bb index 25f5e7d061..7d0003ce90 100644 --- a/recipes/gpe-filemanager/gpe-filemanager_0.30.bb +++ b/recipes/gpe-filemanager/gpe-filemanager_0.30.bb @@ -2,7 +2,7 @@ GPE_TARBALL_SUFFIX = "bz2" inherit autotools gpe -PR = "r0" +PR = "r1" LICENSE = "GPL" DESCRIPTION = "GPE file manager" DEPENDS = "libgpewidget gnome-vfs dbus-glib" diff --git a/recipes/gpe-filemanager/gpe-filemanager_0.31.bb b/recipes/gpe-filemanager/gpe-filemanager_0.31.bb index ab33a9ae4f..69ec3cbeab 100644 --- a/recipes/gpe-filemanager/gpe-filemanager_0.31.bb +++ b/recipes/gpe-filemanager/gpe-filemanager_0.31.bb @@ -2,7 +2,7 @@ GPE_TARBALL_SUFFIX = "bz2" inherit autotools gpe -PR = "r0" +PR = "r1" LICENSE = "GPL" DESCRIPTION = "GPE file manager" DEPENDS = "libgpewidget gnome-vfs dbus-glib" diff --git a/recipes/gpe-filemanager/gpe-filemanager_svn.bb b/recipes/gpe-filemanager/gpe-filemanager_svn.bb index 184a9415e6..415269af07 100644 --- a/recipes/gpe-filemanager/gpe-filemanager_svn.bb +++ b/recipes/gpe-filemanager/gpe-filemanager_svn.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" DEPENDS = "libgpewidget gnome-vfs dbus-glib" RDEPENDS_${PN} = "gpe-icons" RRECOMMENDS_${PN} = "gnome-vfs-plugin-file gnome-vfs-plugin-smb gnome-vfs-plugin-ftp gnome-vfs-plugin-computer gnome-vfs-plugin-network gnome-vfs-plugin-sftp gnome-vfs-plugin-http" -PR = "r1" +PR = "r2" PV = "0.25+svn-${SRCDATE}" inherit autotools diff --git a/recipes/gpe-go/gpe-go_0.05.bb b/recipes/gpe-go/gpe-go_0.05.bb index abf507eb29..5740f8789d 100644 --- a/recipes/gpe-go/gpe-go_0.05.bb +++ b/recipes/gpe-go/gpe-go_0.05.bb @@ -5,7 +5,7 @@ DEPENDS = "gtk+ libgpewidget gpe-icons" RDEPENDS_${PN} = "gdk-pixbuf-loader-jpeg" SECTION = "gpe" PRIORITY = "optional" -PR = "r1" +PR = "r2" SRC_URI += "file://fix-make.patch" diff --git a/recipes/gpe-helpviewer/gpe-helpviewer_1.0.bb b/recipes/gpe-helpviewer/gpe-helpviewer_1.0.bb index 2aea095df0..e279e924e2 100644 --- a/recipes/gpe-helpviewer/gpe-helpviewer_1.0.bb +++ b/recipes/gpe-helpviewer/gpe-helpviewer_1.0.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A helpviewer based on gtk+webcore" LICENSE = "GPL" DEPENDS = "osb-nrcit" RDEPENDS_${PN} = "gpe-helpviewer-doc" -PR = "r2" +PR = "r3" SRC_URI = "http://stag.mind.be/gpe-helpviewer-${PV}.tar.bz2" diff --git a/recipes/gpe-icons/gpe-icons.inc b/recipes/gpe-icons/gpe-icons.inc index d5644acfe2..69c4ff21a2 100644 --- a/recipes/gpe-icons/gpe-icons.inc +++ b/recipes/gpe-icons/gpe-icons.inc @@ -4,7 +4,7 @@ RDEPENDS_${PN} += "gdk-pixbuf-loader-png" #only icons present in the package PACKAGE_ARCH = "all" -INC_PR = "r5" +INC_PR = "r6" ALTERNATIVE_NAME = "gpe-pixmaps" ALTERNATIVE_LINK = "${datadir}/gpe/pixmaps" diff --git a/recipes/gpe-icons/gpe-theme-neo_git.bb b/recipes/gpe-icons/gpe-theme-neo_git.bb index 1de7fba702..275c079d0b 100644 --- a/recipes/gpe-icons/gpe-theme-neo_git.bb +++ b/recipes/gpe-icons/gpe-theme-neo_git.bb @@ -1,12 +1,12 @@ DESCRIPTION = "nEo GPE theme - a very fast, high contrast GPE theme" HOMEPAGE = "http://jmccloud.jm.funpic.de" AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com" -RSUGGESTS = "gpe-filemanager gpe-sketchbook elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo etk-theme-neo icon-theme-neo" +RSUGGESTS_${PN} = "gpe-filemanager gpe-sketchbook elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo etk-theme-neo icon-theme-neo" LICENSE = "unknown" SRCREV = "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" PV = "0.2-${EFL_SRCREV}+gitr${SRCPV}" -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/gpe-login/gpe-login_0.93.bb b/recipes/gpe-login/gpe-login_0.93.bb index 85b8d4749c..b2dd185b10 100644 --- a/recipes/gpe-login/gpe-login_0.93.bb +++ b/recipes/gpe-login/gpe-login_0.93.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd" RDEPENDS_${PN} = "xkbd gpe-theme-clearlooks" RPROVIDES_${PN} = "gpe-session-starter" -PR = "r1" +PR = "r2" SRC_URI_OVERRIDES_PACKAGE_ARCH = "1" diff --git a/recipes/gpe-mini-browser/gpe-mini-browser_0.19.bb b/recipes/gpe-mini-browser/gpe-mini-browser_0.19.bb index eb3b2dc8c8..0a9c78d350 100644 --- a/recipes/gpe-mini-browser/gpe-mini-browser_0.19.bb +++ b/recipes/gpe-mini-browser/gpe-mini-browser_0.19.bb @@ -4,7 +4,7 @@ SRC_URI = "http://gpe.linuxtogo.org/download/source/gpe-mini-browser-${PV}.tar.g DEPENDS = "osb-nrcit sqlite libgpewidget" RRECOMMENDS_${PN} = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg" -PR = "r1" +PR = "r2" S = "${WORKDIR}/gpe-mini-browser-${PV}" diff --git a/recipes/gpe-mini-browser/gpe-mini-browser_0.20.bb b/recipes/gpe-mini-browser/gpe-mini-browser_0.20.bb index b472c7cb98..1bff97bb48 100644 --- a/recipes/gpe-mini-browser/gpe-mini-browser_0.20.bb +++ b/recipes/gpe-mini-browser/gpe-mini-browser_0.20.bb @@ -4,7 +4,7 @@ SRC_URI = "http://gpe.linuxtogo.org/download/source/gpe-mini-browser-${PV}.tar.g DEPENDS = "osb-nrcit sqlite libgpewidget" RRECOMMENDS_${PN} = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg" -PR = "r1" +PR = "r2" S = "${WORKDIR}/gpe-mini-browser-${PV}" diff --git a/recipes/gpe-mini-browser/gpe-mini-browser_0.21.bb b/recipes/gpe-mini-browser/gpe-mini-browser_0.21.bb index ad80370881..824a4168f0 100644 --- a/recipes/gpe-mini-browser/gpe-mini-browser_0.21.bb +++ b/recipes/gpe-mini-browser/gpe-mini-browser_0.21.bb @@ -4,7 +4,7 @@ SRC_URI = "http://gpe.linuxtogo.org/download/source/gpe-mini-browser-${PV}.tar.g DEPENDS = "osb-nrcit sqlite libgpewidget" RRECOMMENDS_${PN} = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg" -PR = "r1" +PR = "r2" SRC_URI += "file://mini-browser-desktop-fix.patch" diff --git a/recipes/gpe-mini-browser/gpe-mini-browser_svn.bb b/recipes/gpe-mini-browser/gpe-mini-browser_svn.bb index a68c6e87d6..0ebff73d36 100644 --- a/recipes/gpe-mini-browser/gpe-mini-browser_svn.bb +++ b/recipes/gpe-mini-browser/gpe-mini-browser_svn.bb @@ -3,7 +3,7 @@ RRECOMMENDS_${PN} = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-load SRCREV = "9900" PV = "0.20+svn${SRCDATE}" -PR = "r0" +PR = "r1" inherit autotools diff --git a/recipes/gpe-mininet/gpe-mininet_0.6.bb b/recipes/gpe-mininet/gpe-mininet_0.6.bb index 5bc072d3c7..1534627d7f 100644 --- a/recipes/gpe-mininet/gpe-mininet_0.6.bb +++ b/recipes/gpe-mininet/gpe-mininet_0.6.bb @@ -1,6 +1,6 @@ inherit autotools gpe pkgconfig -PR = "r0" +PR = "r1" LICENSE = "GPL" DEPENDS = "libgpewidget gpe-icons gpe-conf" RRECOMMENDS_${PN} = "gpe-conf" diff --git a/recipes/gpe-mininet/gpe-mininet_0.7.bb b/recipes/gpe-mininet/gpe-mininet_0.7.bb index 3a360fb5d4..f3687faf0c 100644 --- a/recipes/gpe-mininet/gpe-mininet_0.7.bb +++ b/recipes/gpe-mininet/gpe-mininet_0.7.bb @@ -1,6 +1,6 @@ inherit autotools gpe pkgconfig -PR = "r0" +PR = "r1" LICENSE = "GPL" DEPENDS = "libgpewidget gpe-icons gpe-conf" RRECOMMENDS_${PN} = "gpe-conf" diff --git a/recipes/gpe-mininet/gpe-mininet_svn.bb b/recipes/gpe-mininet/gpe-mininet_svn.bb index 49f0d74fe8..7a478833be 100644 --- a/recipes/gpe-mininet/gpe-mininet_svn.bb +++ b/recipes/gpe-mininet/gpe-mininet_svn.bb @@ -3,7 +3,7 @@ SECTION = "gpe" LICENSE = "GPL" DEPENDS = "libgpewidget gpe-icons gpe-conf" RRECOMMENDS_${PN} = "gpe-conf" -PR = "r0" +PR = "r1" PV = "0.7+svn-${SRCDATE}" inherit autotools pkgconfig diff --git a/recipes/gpe-nmf/gpe-nmf_0.20.bb b/recipes/gpe-nmf/gpe-nmf_0.20.bb index 331897d867..3a938b9b55 100644 --- a/recipes/gpe-nmf/gpe-nmf_0.20.bb +++ b/recipes/gpe-nmf/gpe-nmf_0.20.bb @@ -1,7 +1,7 @@ require gpe-nmf.inc RRECOMMENDS_${PN} += "gst-plugin-tcp" -PR = "r1" +PR = "r2" SRC_URI[md5sum] = "28e1ff870af9b38d0cce345d339b857a" SRC_URI[sha256sum] = "e3f89854fde8db448bd60fad1dce9a89aae994e75fa0cfdf97888891563e7232" diff --git a/recipes/gpe-nmf/gpe-nmf_0.22.bb b/recipes/gpe-nmf/gpe-nmf_0.22.bb index fd249e4807..005e554bd7 100644 --- a/recipes/gpe-nmf/gpe-nmf_0.22.bb +++ b/recipes/gpe-nmf/gpe-nmf_0.22.bb @@ -2,7 +2,7 @@ require gpe-nmf.inc RDEPENDS_${PN} += "gst-plugin-decodebin" RRECOMMENDS_${PN} += "gst-plugin-ivorbis gst-plugin-tcp" -PR = "r3" +PR = "r4" SRC_URI += " file://playlist-segfault.patch;striplevel=0 \ file://fix-includepath.patch" diff --git a/recipes/gpe-package/gpe-package_0.2.bb b/recipes/gpe-package/gpe-package_0.2.bb index 3840d39fea..dcf6b149d5 100644 --- a/recipes/gpe-package/gpe-package_0.2.bb +++ b/recipes/gpe-package/gpe-package_0.2.bb @@ -1,5 +1,5 @@ LICENSE = "GPL" -PR = "r2" +PR = "r3" inherit gpe pkgconfig DESCRIPTION = "A package manager GUI for GPE" diff --git a/recipes/gpe-package/gpe-package_0.3.bb b/recipes/gpe-package/gpe-package_0.3.bb index 80807488f1..964a2d634c 100644 --- a/recipes/gpe-package/gpe-package_0.3.bb +++ b/recipes/gpe-package/gpe-package_0.3.bb @@ -1,5 +1,5 @@ LICENSE = "GPL" -PR = "r3" +PR = "r4" inherit gpe pkgconfig DESCRIPTION = "A package manager GUI for GPE" diff --git a/recipes/gpe-package/gpe-package_0.4.bb b/recipes/gpe-package/gpe-package_0.4.bb index 5e9a436459..2ac9c250be 100644 --- a/recipes/gpe-package/gpe-package_0.4.bb +++ b/recipes/gpe-package/gpe-package_0.4.bb @@ -1,5 +1,5 @@ LICENSE = "GPL" -PR = "r0" +PR = "r1" inherit gpe pkgconfig DESCRIPTION = "A package manager GUI for GPE" diff --git a/recipes/gpe-plucker/gpe-plucker_0.4.bb b/recipes/gpe-plucker/gpe-plucker_0.4.bb index e753c78aa1..487345e65b 100644 --- a/recipes/gpe-plucker/gpe-plucker_0.4.bb +++ b/recipes/gpe-plucker/gpe-plucker_0.4.bb @@ -5,7 +5,7 @@ DEPENDS = "gtk+ libgpewidget gpe-icons" RDEPENDS_${PN} = "gpe-icons" SECTION = "gpe" PRIORITY = "optional" -PR = "r3" +PR = "r4" SRC_URI += " \ file://plucker-no-host-includes.patch \ diff --git a/recipes/gpe-scap/gpe-scap_1.2.bb b/recipes/gpe-scap/gpe-scap_1.2.bb index 899b872b50..c22afdfcc4 100644 --- a/recipes/gpe-scap/gpe-scap_1.2.bb +++ b/recipes/gpe-scap/gpe-scap_1.2.bb @@ -2,9 +2,9 @@ DESCRIPTION = "GPE screenshot application" LICENSE = "GPL" PRIORITY = "optional" SECTION = "gpe" -PR = "r1" +PR = "r2" -RREPLACES = "gpe-screenshot" +RREPLACES_${PN} = "gpe-screenshot" DEPENDS = "glib-2.0 gtk+ libgpewidget libglade libsoup" diff --git a/recipes/gpe-scap/gpe-scap_1.3.bb b/recipes/gpe-scap/gpe-scap_1.3.bb index edbe529ad5..f4ae81fb51 100644 --- a/recipes/gpe-scap/gpe-scap_1.3.bb +++ b/recipes/gpe-scap/gpe-scap_1.3.bb @@ -2,9 +2,9 @@ DESCRIPTION = "A GPE application that allows you to take screenshots." LICENSE = "GPL" PRIORITY = "optional" SECTION = "gpe" -PR = "r2" +PR = "r3" -RREPLACES = "gpe-screenshot" +RREPLACES_${PN} = "gpe-screenshot" DEPENDS = "glib-2.0 gtk+ libgpewidget libglade libsoup" diff --git a/recipes/gpe-scap/gpe-scap_1.4.bb b/recipes/gpe-scap/gpe-scap_1.4.bb index 2e2906756c..9e560e640a 100644 --- a/recipes/gpe-scap/gpe-scap_1.4.bb +++ b/recipes/gpe-scap/gpe-scap_1.4.bb @@ -2,9 +2,9 @@ DESCRIPTION = "A GPE application that allows you to take screenshots." LICENSE = "GPL" PRIORITY = "optional" SECTION = "gpe" -PR = "r0" +PR = "r1" -RREPLACES = "gpe-screenshot" +RREPLACES_${PN} = "gpe-screenshot" DEPENDS = "glib-2.0 gtk+ libgpewidget libglade libsoup" diff --git a/recipes/gpe-scap/gpe-scap_svn.bb b/recipes/gpe-scap/gpe-scap_svn.bb index 04010d7435..29a3f412ea 100644 --- a/recipes/gpe-scap/gpe-scap_svn.bb +++ b/recipes/gpe-scap/gpe-scap_svn.bb @@ -1,7 +1,7 @@ DEPENDS = "glib-2.0 gtk+ libgpewidget libglade libsoup" -RREPLACES = "gpe-screenshot" +RREPLACES_${PN} = "gpe-screenshot" PV = "1.4+svn-${SRCDATE}" -PR = "r1" +PR = "r2" inherit autotools diff --git a/recipes/gpe-shield/gpe-shield_0.9.bb b/recipes/gpe-shield/gpe-shield_0.9.bb index f2b2ad5ec2..31a2da5dd7 100644 --- a/recipes/gpe-shield/gpe-shield_0.9.bb +++ b/recipes/gpe-shield/gpe-shield_0.9.bb @@ -6,7 +6,7 @@ DEPENDS = "libgpewidget iptables virtual/kernel" RDEPENDS_${PN} = "iptables" RRECOMMENDS_${PN} = "kernel-module-ipt-state" -PR = "r1" +PR = "r2" inherit gpe pkgconfig diff --git a/recipes/gpe-sketchbook/gpe-sketchbook_0.2.9.bb b/recipes/gpe-sketchbook/gpe-sketchbook_0.2.9.bb index bc0b751338..3b33f0db83 100644 --- a/recipes/gpe-sketchbook/gpe-sketchbook_0.2.9.bb +++ b/recipes/gpe-sketchbook/gpe-sketchbook_0.2.9.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" DESCRIPTION = "A GPE notebook to sketch your notes" export CVSBUILD = "no" -PR = "r1" +PR = "r2" inherit gpe pkgconfig diff --git a/recipes/gpe-terminal/gpe-terminal_1.1.bb b/recipes/gpe-terminal/gpe-terminal_1.1.bb index a7554361c3..2ff41277bd 100644 --- a/recipes/gpe-terminal/gpe-terminal_1.1.bb +++ b/recipes/gpe-terminal/gpe-terminal_1.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "GPE terminal wrapper" SECTION = "gpe" LICENSE = "GPL" RRECOMMENDS_${PN} = "rxvt-unicode" -PR = "r1" +PR = "r2" SRC_URI = "file://${PN}.desktop file://${PN}.png" diff --git a/recipes/gpe-terminal/gpe-terminal_svn.bb b/recipes/gpe-terminal/gpe-terminal_svn.bb index 904ef84585..0167b1a6b8 100644 --- a/recipes/gpe-terminal/gpe-terminal_svn.bb +++ b/recipes/gpe-terminal/gpe-terminal_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "GPE terminal wrapper" SECTION = "gpe" LICENSE = "GPL" RRECOMMENDS_${PN} = "rxvt-unicode" -PR = "r1" +PR = "r2" PV = "1.1+svn-${SRCDATE}" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/gpe-themes/gpe-theme-clearlooks_0.2.bb b/recipes/gpe-themes/gpe-theme-clearlooks_0.2.bb index cf6182d5e6..b11cafb507 100644 --- a/recipes/gpe-themes/gpe-theme-clearlooks_0.2.bb +++ b/recipes/gpe-themes/gpe-theme-clearlooks_0.2.bb @@ -1,6 +1,6 @@ DESCRIPTION = "GTK+ clearlooks theme adjusted for GPE" LICENSE = "GPL" -PR = "r1" +PR = "r2" #it doesn't really depends on it, but it's nice to make OE build it DEPENDS = "gtk-engines" diff --git a/recipes/gpe-themes/gpe-theme-e17_0.1.bb b/recipes/gpe-themes/gpe-theme-e17_0.1.bb index 833a78bc9d..bf29f9b402 100644 --- a/recipes/gpe-themes/gpe-theme-e17_0.1.bb +++ b/recipes/gpe-themes/gpe-theme-e17_0.1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "GTK+ enlightenment theme adjusted for GPE" LICENSE = "MIT + GPL" -PR = "r0" +PR = "r1" #it doesn't really depends on it, but it's nice to make OE build it RDEPENDS_${PN} = "gtk+" diff --git a/recipes/gpe-themes/gpe-theme-foxbox_0.1.bb b/recipes/gpe-themes/gpe-theme-foxbox_0.1.bb index 770627b212..beb345fd1b 100644 --- a/recipes/gpe-themes/gpe-theme-foxbox_0.1.bb +++ b/recipes/gpe-themes/gpe-theme-foxbox_0.1.bb @@ -1,7 +1,7 @@ inherit gpe LICENSE = "gpe-theme-foxbox" -PR = "r2" +PR = "r3" SECTION = "x11/base" DESCRIPTION = "Simple GPE theme using the Smooth theming engine." DEPENDS = "gtk-engines" diff --git a/recipes/gpe-themes/gpe-theme-industrial_0.1.bb b/recipes/gpe-themes/gpe-theme-industrial_0.1.bb index 1dea097f61..6204bc72e1 100644 --- a/recipes/gpe-themes/gpe-theme-industrial_0.1.bb +++ b/recipes/gpe-themes/gpe-theme-industrial_0.1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "GTK+ industrial theme adjusted for GPE" LICENSE = "GPL" -PR = "r0" +PR = "r1" #it doesn't really depends on it, but it's nice to make OE build it DEPENDS = "gtk-engines" diff --git a/recipes/gpe-todo/gpe-todo-hildon_0.54.bb b/recipes/gpe-todo/gpe-todo-hildon_0.54.bb index bbbe807537..9954d51833 100644 --- a/recipes/gpe-todo/gpe-todo-hildon_0.54.bb +++ b/recipes/gpe-todo/gpe-todo-hildon_0.54.bb @@ -1,5 +1,5 @@ LICENSE = "GPL" -PR = "r0" +PR = "r1" DESCRIPTION = "GPE to-do list" DEPENDS = "libgpewidget-hildon libgpepimc-hildon libtododb sdk-default-icons libosso" RDEPENDS_${PN} = "sdk-default-icons" diff --git a/recipes/gpe-todo/gpe-todo-hildon_0.55.bb b/recipes/gpe-todo/gpe-todo-hildon_0.55.bb index a535e18a0a..d71f86228c 100644 --- a/recipes/gpe-todo/gpe-todo-hildon_0.55.bb +++ b/recipes/gpe-todo/gpe-todo-hildon_0.55.bb @@ -1,5 +1,5 @@ LICENSE = "GPL" -PR = "r0" +PR = "r1" DESCRIPTION = "GPE to-do list" DEPENDS = "libgpewidget-hildon libgpepimc-hildon libtododb sdk-default-icons libosso" RDEPENDS_${PN} = "sdk-default-icons" diff --git a/recipes/gphoto2/ptp-gadget_git.bb b/recipes/gphoto2/ptp-gadget_git.bb index 5d89712f0f..4a82f0602f 100644 --- a/recipes/gphoto2/ptp-gadget_git.bb +++ b/recipes/gphoto2/ptp-gadget_git.bb @@ -5,7 +5,7 @@ DEPENDS = "virtual/kernel" RDEPENDS_${PN} = "imagemagick" PV = "1.1" -PR = "r1" +PR = "r2" PR_append = "+gitr${SRCREV}" SRCREV = "ef7ef29b5cdcf8630c901362a66905b956242e0d" diff --git a/recipes/gpio-event/gpio-event.bb b/recipes/gpio-event/gpio-event.bb index 946d283df1..ae82d22031 100644 --- a/recipes/gpio-event/gpio-event.bb +++ b/recipes/gpio-event/gpio-event.bb @@ -8,7 +8,7 @@ LICENSE = "GPL" RDEPENDS_${PN} = "kernel (${KERNEL_VERSION})" DEPENDS = "virtual/kernel" -PR = "r4" +PR = "r5" SRC_URI = "http://davehylands.com/gumstix-wiki/gpio-event/gpio-event-2.6.21-1444-select.tar.gz \ file://makefile.patch \ diff --git a/recipes/gqview/gqview_2.1.5.bb b/recipes/gqview/gqview_2.1.5.bb index c07e209a51..076924103b 100644 --- a/recipes/gqview/gqview_2.1.5.bb +++ b/recipes/gqview/gqview_2.1.5.bb @@ -4,7 +4,7 @@ DEPENDS = "gtk+" LICENSE = "GPL" HOMEPAGE = "http://gqview.sourceforge.net/" RRECOMMENDS_${PN} = "gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png gdk-pixbuf-loader-gif" -PR = "r2" +PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/gqview/gqview-2.1.5.tar.gz \ file://include-path-fix.patch \ diff --git a/recipes/grdesktop/grdesktop_0.23.bb b/recipes/grdesktop/grdesktop_0.23.bb index 860934b4d1..15648ff773 100644 --- a/recipes/grdesktop/grdesktop_0.23.bb +++ b/recipes/grdesktop/grdesktop_0.23.bb @@ -10,7 +10,7 @@ DEPENDS = "gtk+ libgnomeui" RDEPENDS_${PN} ="rdesktop gail orbit2 gnome-vfs gnome-keyring libbonobo libbonoboui \ libart-lgpl libgnome libidl libglade libgnomecanvas " -PR = "r1" +PR = "r2" SRC_URI = "http://download.savannah.nongnu.org/releases/grdesktop/grdesktop-${PV}.tar.gz \ file://fr.po.patch \ diff --git a/recipes/gsm/gsmd.inc b/recipes/gsm/gsmd.inc index 64393e5d86..445e2dbbaa 100644 --- a/recipes/gsm/gsmd.inc +++ b/recipes/gsm/gsmd.inc @@ -6,7 +6,7 @@ PROVIDES += "gsmd" RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel" SRCREV = "4505" PV = "0.1+svnr${SRCPV}" -PR = "r44" +PR = "r45" SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ file://gsmd \ diff --git a/recipes/gspcav1/gspcav1_20070110.bb b/recipes/gspcav1/gspcav1_20070110.bb index e894a53fa5..33bcd63cfa 100644 --- a/recipes/gspcav1/gspcav1_20070110.bb +++ b/recipes/gspcav1/gspcav1_20070110.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" SECTION = "kernel/modules" LICENSE = "GPL" -PR = "r2" +PR = "r3" RRECOMMENDS_${PN} = "kernel-module-videodev kernel-module-v4l1-compat kernel-module-v4l2-common" diff --git a/recipes/gspcav1/gspcav1_20070508.bb b/recipes/gspcav1/gspcav1_20070508.bb index 1cdc3b9ec5..a4b5a66ba9 100644 --- a/recipes/gspcav1/gspcav1_20070508.bb +++ b/recipes/gspcav1/gspcav1_20070508.bb @@ -6,7 +6,7 @@ LICENSE = "GPL" DEFAULT_PREFERENCE = "-1" -PR = "r2" +PR = "r3" RRECOMMENDS_${PN} = "kernel-module-videodev kernel-module-v4l1-compat kernel-module-v4l2-common" diff --git a/recipes/gstreamer/gst-player_svn.bb b/recipes/gstreamer/gst-player_svn.bb index e0022a4614..dfc402a152 100644 --- a/recipes/gstreamer/gst-player_svn.bb +++ b/recipes/gstreamer/gst-player_svn.bb @@ -9,7 +9,7 @@ SRC_URI = "svn://gstplayer.googlecode.com/svn;module=trunk;proto=http" S = "${WORKDIR}/trunk/gstplayer" PV = "svnr${SRCREV}" -PR = "r2" +PR = "r3" TARGET_CC_ARCH += "${LDFLAGS}" diff --git a/recipes/gtk+/gtk+-fastscaling_2.10.14.bb b/recipes/gtk+/gtk+-fastscaling_2.10.14.bb index d2b3347d82..9dd78a4562 100644 --- a/recipes/gtk+/gtk+-fastscaling_2.10.14.bb +++ b/recipes/gtk+/gtk+-fastscaling_2.10.14.bb @@ -1,6 +1,6 @@ require gtk+_${PV}.bb -FILESPATH_prepend = "${FILE_DIRNAME}/gtk+-${PV}:" +FILESPATHPKG =. "gtk+-${PV}:" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/gtk-webcore/osb-browser_20050430.bb b/recipes/gtk-webcore/osb-browser_20050430.bb index 4877f4a65a..c084eae91e 100644 --- a/recipes/gtk-webcore/osb-browser_20050430.bb +++ b/recipes/gtk-webcore/osb-browser_20050430.bb @@ -6,7 +6,7 @@ SECTION = "gpe" FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" PV = "0.5.0+cvs${FIXEDSRCDATE}" -PR = "r1" +PR = "r2" DEPENDS = "osb-nrcit gtk+ glib-2.0 libglade" RRECOMMENDS_${PN} = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-ico gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png" diff --git a/recipes/gtk-webcore/osb-browser_20060212.bb b/recipes/gtk-webcore/osb-browser_20060212.bb index f9cede0d9c..e5b490024e 100644 --- a/recipes/gtk-webcore/osb-browser_20060212.bb +++ b/recipes/gtk-webcore/osb-browser_20060212.bb @@ -6,7 +6,7 @@ SECTION = "gpe" FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" PV = "0.5.0+cvs${FIXEDSRCDATE}" -PR = "r0" +PR = "r1" DEPENDS = "osb-nrcit gtk+ glib-2.0 libglade" RRECOMMENDS_${PN} = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-ico gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png" diff --git a/recipes/gtk-webcore/osb-browser_svn.bb b/recipes/gtk-webcore/osb-browser_svn.bb index ddfd829d5a..c0c65bed4b 100644 --- a/recipes/gtk-webcore/osb-browser_svn.bb +++ b/recipes/gtk-webcore/osb-browser_svn.bb @@ -7,7 +7,7 @@ DEPENDS = "osb-nrcit gtk+ glib-2.0 libglade" RRECOMMENDS_${PN} = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-ico gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png" SRCREV = "125" PV = "0.5.0+svnr${SRCPV}" -PR = "r0" +PR = "r1" inherit autotools diff --git a/recipes/gtk2-theme-angelistic/gtk2-theme-angelistic_0.3.bb b/recipes/gtk2-theme-angelistic/gtk2-theme-angelistic_0.3.bb index 3e20a98442..301a9e54df 100644 --- a/recipes/gtk2-theme-angelistic/gtk2-theme-angelistic_0.3.bb +++ b/recipes/gtk2-theme-angelistic/gtk2-theme-angelistic_0.3.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" SRC_URI = "file://gtkrc file://gtkrc-global" DEPENDS = "gnome-themes" RDEPENDS_${PN} = "gtk-engine-mist" -PR = "r3" +PR = "r4" FILES_${PN} += "${datadir}/themes" diff --git a/recipes/gxine/gxine_0.4.1.bb b/recipes/gxine/gxine_0.4.1.bb index dbf86ba7be..22281bb173 100644 --- a/recipes/gxine/gxine_0.4.1.bb +++ b/recipes/gxine/gxine_0.4.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "gxine is a front-end for libxine." SECTION = "x11/multimedia" LICENSE = "GPL" DEPENDS = "gtk+ libxine" -PR = "r2" +PR = "r3" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/gxine/gxine_0.4.1enhanced.bb b/recipes/gxine/gxine_0.4.1enhanced.bb index f0ba73fa32..6514208174 100644 --- a/recipes/gxine/gxine_0.4.1enhanced.bb +++ b/recipes/gxine/gxine_0.4.1enhanced.bb @@ -2,7 +2,7 @@ DESCRIPTION = "gxine is a front-end for libxine." SECTION = "x11/multimedia" LICENSE = "GPL" DEPENDS = "gtk+ libxine" -PR = "r1" +PR = "r2" # Long list of RDEPENDS_${PN} required to playback mp3/ogg audio and mpeg/mpeg4 video RDEPENDS_${PN} = "libxine-plugin-vo-out-xshm \ diff --git a/recipes/help2man/help2man_1.36.4.bb b/recipes/help2man/help2man_1.36.4.bb index 103971968b..34d9c00dcd 100644 --- a/recipes/help2man/help2man_1.36.4.bb +++ b/recipes/help2man/help2man_1.36.4.bb @@ -11,7 +11,7 @@ SRC_URI = "${GNU_MIRROR}/help2man/${P}.tar.gz" inherit autotools -PR = "r0" +PR = "r1" EXTRA_OECONF += "PERL=/usr/bin/perl" diff --git a/recipes/hostap/hostap-conf_1.0.bb b/recipes/hostap/hostap-conf_1.0.bb index 70ff05dcef..a3c56d6694 100644 --- a/recipes/hostap/hostap-conf_1.0.bb +++ b/recipes/hostap/hostap-conf_1.0.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" RDEPENDS_${PN} = "update-modules" PACKAGE_ARCH = "all" -PR = "r9" +PR = "r11" SRC_URI = "file://hostap_cs.conf \ file://hostap_cs.modalias \ diff --git a/recipes/hotplug-dbus/hotplug-dbus_0.9.bb b/recipes/hotplug-dbus/hotplug-dbus_0.9.bb index 284c049ee0..baf2878197 100644 --- a/recipes/hotplug-dbus/hotplug-dbus_0.9.bb +++ b/recipes/hotplug-dbus/hotplug-dbus_0.9.bb @@ -1,4 +1,4 @@ -PR = "r1" +PR = "r2" SECTION = "base" DESCRIPTION = "D-BUS glue for hotplug system" # DEPENDS = "dbus hotplug" diff --git a/recipes/hotplug-ng/hotplug-ng_001.bb b/recipes/hotplug-ng/hotplug-ng_001.bb index 1b0185c9fc..7038298a0e 100644 --- a/recipes/hotplug-ng/hotplug-ng_001.bb +++ b/recipes/hotplug-ng/hotplug-ng_001.bb @@ -2,10 +2,10 @@ DESCRIPTION = "This collection of code replaces the existing linux-hotplug \ package with very tiny, compiled executable programs, instead of the \ existing bash scripts." LICENSE = "GPL" -RPROVIDES = "hotplug" -RCONFLICTS = "hotplug" -RREPLACES = "hotplug" -PR = "r1" +RPROVIDES_${PN} = "hotplug" +RCONFLICTS_${PN} = "hotplug" +RREPLACES_${PN} = "hotplug" +PR = "r2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/hotplug-ng-${PV}.tar.gz \ file://flags.patch" diff --git a/recipes/hotplug-qcop/hotplug-qcop_cvs.bb b/recipes/hotplug-qcop/hotplug-qcop_cvs.bb index 55a91b2651..daf0a8bb18 100644 --- a/recipes/hotplug-qcop/hotplug-qcop_cvs.bb +++ b/recipes/hotplug-qcop/hotplug-qcop_cvs.bb @@ -2,7 +2,7 @@ DESCRIPTION = "HotPlug -> QCOP Event Bridge" SECTION = "opie/base" RDEPENDS_${PN} = "opie-qcop hotplug" LICENSE = "GPL" -PR = "r0" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/tools/hotplug-qcop" S = "${WORKDIR}/hotplug-qcop" diff --git a/recipes/htb-init/htb-init_0.8.5.bb b/recipes/htb-init/htb-init_0.8.5.bb index 52956483e6..9fde8c9bf4 100644 --- a/recipes/htb-init/htb-init_0.8.5.bb +++ b/recipes/htb-init/htb-init_0.8.5.bb @@ -1,7 +1,7 @@ DESCRIPTION = "HTB.init is a shell script that allows for easy setup of HTB-based traffic control on Linux." HOMEPAGE = "http://sourceforge.net/projects/htbinit" LICENSE = "GPL" -PR = "r2" +PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/htbinit/htb.init-v${PV} \ file://htb.init+ingress+predef+verbose.diff;striplevel=0 \ diff --git a/recipes/icewm/icewm_1.2.30.bb b/recipes/icewm/icewm_1.2.30.bb index 6e3de764b9..f14a44f541 100644 --- a/recipes/icewm/icewm_1.2.30.bb +++ b/recipes/icewm/icewm_1.2.30.bb @@ -3,7 +3,7 @@ SECTION = "x11/wm" LICENSE = "GPL" DEPENDS = "virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native" RRECOMMENDS_${PN} = "ttf-dejavu-sans" -PR = "r2" +PR = "r3" SRC_URI = "\ ${SOURCEFORGE_MIRROR}/icewm/icewm-${PV}.tar.gz \ diff --git a/recipes/images/shr-image.inc b/recipes/images/shr-image.inc index f369a8e120..aa21b28310 100644 --- a/recipes/images/shr-image.inc +++ b/recipes/images/shr-image.inc @@ -3,7 +3,7 @@ #------------------------------------------------------ PV = "2.0" -PR = "r13" +PR = "r14" DEPENDS += "task-shr-minimal" diff --git a/recipes/initrdscripts/initramfs-jffs2_0.1.bb b/recipes/initrdscripts/initramfs-jffs2_0.1.bb index cbb476f431..95e9f08db1 100644 --- a/recipes/initrdscripts/initramfs-jffs2_0.1.bb +++ b/recipes/initrdscripts/initramfs-jffs2_0.1.bb @@ -1,5 +1,5 @@ SRC_URI = "file://jffs2boot.sh" -PR = "r3" +PR = "r4" RRECOMMENDS_${PN} = "kernel-module-mtdblock kernel-module-mtdram" do_install() { diff --git a/recipes/initrdscripts/initramfs-module-aufs_1.0.bb b/recipes/initrdscripts/initramfs-module-aufs_1.0.bb index 1b8721b6ef..a29b19356b 100644 --- a/recipes/initrdscripts/initramfs-module-aufs_1.0.bb +++ b/recipes/initrdscripts/initramfs-module-aufs_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://98-aufs.sh" -PR = "r1" +PR = "r2" DESCRIPTION = "An initramfs module for mount aufs." RDEPENDS_${PN} = "initramfs-uniboot aufs" diff --git a/recipes/initrdscripts/initramfs-module-block_1.0.bb b/recipes/initrdscripts/initramfs-module-block_1.0.bb index f715eae2dd..5d4c8468fc 100644 --- a/recipes/initrdscripts/initramfs-module-block_1.0.bb +++ b/recipes/initrdscripts/initramfs-module-block_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://85-blockboot.sh" -PR = "r3" +PR = "r4" RDEPENDS_${PN} = "initramfs-uniboot" DESCRIPTION = "An initramfs module for booting off normal block devices." diff --git a/recipes/initrdscripts/initramfs-module-bootldr-buster_1.0.bb b/recipes/initrdscripts/initramfs-module-bootldr-buster_1.0.bb index f33ecd34f3..dc47c86806 100644 --- a/recipes/initrdscripts/initramfs-module-bootldr-buster_1.0.bb +++ b/recipes/initrdscripts/initramfs-module-bootldr-buster_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://01-bootldr-buster.sh" -PR = "r2" +PR = "r3" DESCRIPTION = "An initramfs module for ignoring bogus kernel commandline from Compaq bootldr" RDEPENDS_${PN} = "initramfs-uniboot" diff --git a/recipes/initrdscripts/initramfs-module-bootmenu_1.0.bb b/recipes/initrdscripts/initramfs-module-bootmenu_1.0.bb index 50f9519c2a..890fef3c10 100644 --- a/recipes/initrdscripts/initramfs-module-bootmenu_1.0.bb +++ b/recipes/initrdscripts/initramfs-module-bootmenu_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://30-bootmenu.sh" -PR = "r18" +PR = "r19" DESCRIPTION = "An initramfs module with UI for selection of boot device." RDEPENDS_${PN} = "klibc-utils-static-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop initramfs-module-nfs" # For VFAT mounting. diff --git a/recipes/initrdscripts/initramfs-module-check-modules_1.0.bb b/recipes/initrdscripts/initramfs-module-check-modules_1.0.bb index e1eeb6f23d..343f9d1e0a 100644 --- a/recipes/initrdscripts/initramfs-module-check-modules_1.0.bb +++ b/recipes/initrdscripts/initramfs-module-check-modules_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://90-check-modules.sh" -PR = "r0" +PR = "r1" DESCRIPTION = "An initramfs module for checking that kernel modules exist in rootfs" RDEPENDS_${PN} = "initramfs-uniboot" diff --git a/recipes/initrdscripts/initramfs-module-ext3_1.0.bb b/recipes/initrdscripts/initramfs-module-ext3_1.0.bb index ad483c47f8..869ff05925 100644 --- a/recipes/initrdscripts/initramfs-module-ext3_1.0.bb +++ b/recipes/initrdscripts/initramfs-module-ext3_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://80-ext3.sh" -PR = "r1" +PR = "r2" DESCRIPTION = "An initramfs module for mount ext3." RDEPENDS_${PN} = "initramfs-uniboot" diff --git a/recipes/initrdscripts/initramfs-module-initfs_1.0.bb b/recipes/initrdscripts/initramfs-module-initfs_1.0.bb index a7ca82bdff..9e7b5a863c 100644 --- a/recipes/initrdscripts/initramfs-module-initfs_1.0.bb +++ b/recipes/initrdscripts/initramfs-module-initfs_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://10-initfs.sh" -PR = "r4" +PR = "r5" DESCRIPTION = "An initramfs module for initializing filesystems." RDEPENDS_${PN} = "initramfs-uniboot" RRECOMMENDS_${PN} = "kernel-module-vfat kernel-module-ext2" diff --git a/recipes/initrdscripts/initramfs-module-kexecboot_1.0.bb b/recipes/initrdscripts/initramfs-module-kexecboot_1.0.bb index 585ea9a2c8..e153d2b67e 100644 --- a/recipes/initrdscripts/initramfs-module-kexecboot_1.0.bb +++ b/recipes/initrdscripts/initramfs-module-kexecboot_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://87-kexecboot.sh" -PR = "r2" +PR = "r3" DESCRIPTION = "An initramfs module for kexecing kernel from rootfs." RDEPENDS_${PN} = "initramfs-uniboot kexec-klibc-static" diff --git a/recipes/initrdscripts/initramfs-module-loop_1.0.bb b/recipes/initrdscripts/initramfs-module-loop_1.0.bb index 5d10bd3f79..270f2befea 100644 --- a/recipes/initrdscripts/initramfs-module-loop_1.0.bb +++ b/recipes/initrdscripts/initramfs-module-loop_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://80-loopboot.sh" -PR = "r2" +PR = "r3" DESCRIPTION = "An initramfs module for booting a filesystem image by loopback \ mounting it." RDEPENDS_${PN} = "initramfs-uniboot initramfs-module-initfs" diff --git a/recipes/initrdscripts/initramfs-module-nfs_1.0.bb b/recipes/initrdscripts/initramfs-module-nfs_1.0.bb index 0c303cbeb8..a757003e60 100644 --- a/recipes/initrdscripts/initramfs-module-nfs_1.0.bb +++ b/recipes/initrdscripts/initramfs-module-nfs_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://80-nfsboot.sh" -PR = "r2" +PR = "r3" DESCRIPTION = "An initramfs module for booting via NFS." RDEPENDS_${PN} = "initramfs-uniboot" RRECOMMENDS_${PN} = "kernel-module-g-ether kernel-module-nfs" diff --git a/recipes/initrdscripts/initramfs-module-psplash_1.0.bb b/recipes/initrdscripts/initramfs-module-psplash_1.0.bb index 0a44966d7f..9f9dc471c4 100644 --- a/recipes/initrdscripts/initramfs-module-psplash_1.0.bb +++ b/recipes/initrdscripts/initramfs-module-psplash_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://00-psplash.sh file://99-psplash.sh" -PR = "r5" +PR = "r6" RDEPENDS_${PN} = "initramfs-uniboot virtual-psplash" DESCRIPTION = "An initramfs module to enable psplash." diff --git a/recipes/initrdscripts/initramfs-module-squashfs_1.0.bb b/recipes/initrdscripts/initramfs-module-squashfs_1.0.bb index c8e04b09d6..fcf3f97a90 100644 --- a/recipes/initrdscripts/initramfs-module-squashfs_1.0.bb +++ b/recipes/initrdscripts/initramfs-module-squashfs_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://80-squashfs.sh" -PR = "r1" +PR = "r2" DESCRIPTION = "An initramfs module for mount squashfs." RDEPENDS_${PN} = "initramfs-uniboot" diff --git a/recipes/initrdscripts/initramfs-uniboot_1.0.bb b/recipes/initrdscripts/initramfs-uniboot_1.0.bb index 2ceea68001..96a7edc659 100644 --- a/recipes/initrdscripts/initramfs-uniboot_1.0.bb +++ b/recipes/initrdscripts/initramfs-uniboot_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://init.sh" -PR = "r11" +PR = "r12" DESCRIPTON = "A modular initramfs init script system." RRECOMMENDS_${PN} = "kernel-module-mtdblock" diff --git a/recipes/initscripts/initscripts-openprotium_1.0.bb b/recipes/initscripts/initscripts-openprotium_1.0.bb index aa20e29644..cb08741a35 100644 --- a/recipes/initscripts/initscripts-openprotium_1.0.bb +++ b/recipes/initscripts/initscripts-openprotium_1.0.bb @@ -7,11 +7,11 @@ # in. include initscripts_${PV}.bb -RCONFLICTS = "initscripts" +RCONFLICTS_${PN} = "initscripts" # All other standard definitions inherited from initscripts # Except the PR which is hacked here. The format used is # a suffix -PR := "${PR}.11" +PR := "${PR}.12" FILESPATHPKG =. "${P}:initscripts-${PV}:" diff --git a/recipes/initscripts/initscripts-slugos_1.0.bb b/recipes/initscripts/initscripts-slugos_1.0.bb index b79351445a..f4bf263ef3 100644 --- a/recipes/initscripts/initscripts-slugos_1.0.bb +++ b/recipes/initscripts/initscripts-slugos_1.0.bb @@ -6,7 +6,7 @@ include initscripts_${PV}.bb -RCONFLICTS = "initscripts" +RCONFLICTS_${PN} = "initscripts" # SlugOS uses the busybox makedevs, so until that dependency gets virtualized # the below lines serve to remove the dependency on the full makedevs package, @@ -17,7 +17,7 @@ RDEPENDS_${PN} = "update-rc.d" # All other standard definitions inherited from initscripts # Except the PR which is hacked here. The format used is # a suffix -PR := "${PR}.23" +PR := "${PR}.24" # Avoid a clash on /etc/device_table by ensuring that it gets removed # from the list of configuration files handled specially by opkg. diff --git a/recipes/initscripts/initscripts_1.0.bb b/recipes/initscripts/initscripts_1.0.bb index 601622f241..1b0a94c221 100644 --- a/recipes/initscripts/initscripts_1.0.bb +++ b/recipes/initscripts/initscripts_1.0.bb @@ -4,7 +4,7 @@ PRIORITY = "required" DEPENDS = "makedevs" RDEPENDS_${PN} = "makedevs" LICENSE = "GPL" -PR = "r120" +PR = "r121" SRC_URI = "file://functions \ file://halt \ diff --git a/recipes/intltool/intltool_0.35.0.bb b/recipes/intltool/intltool_0.35.0.bb index 966e373778..3f820c1316 100644 --- a/recipes/intltool/intltool_0.35.0.bb +++ b/recipes/intltool/intltool_0.35.0.bb @@ -3,7 +3,7 @@ require intltool.inc #RDEPENDS_${PN} = "libxml-parser-perl" RRECOMMENDS_${PN} = "perl-modules" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI[md5sum] = "95c4bd2a91419083ee880a3f53f86edf" SRC_URI[sha256sum] = "4ebece4bb752e22b2f15a9fe24e83aec59a3a41b67a9fa9ffd6b805c519e90ba" diff --git a/recipes/intltool/intltool_0.35.2.bb b/recipes/intltool/intltool_0.35.2.bb index dd308fcc73..a7c1606d96 100644 --- a/recipes/intltool/intltool_0.35.2.bb +++ b/recipes/intltool/intltool_0.35.2.bb @@ -3,7 +3,7 @@ require intltool.inc RDEPENDS_${PN} = "perl-module-text-wrap perl-module-re" RRECOMMENDS_${PN} = "perl-modules" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI[md5sum] = "7cf1a436882a62d420a0fa00ace02a55" SRC_URI[sha256sum] = "04aed43abc77fccf20e91b1ba3659c0870c50091d9ce3472ac73a40a704c2fe2" diff --git a/recipes/intltool/intltool_0.35.5.bb b/recipes/intltool/intltool_0.35.5.bb index fb8b941a3a..7b494d8355 100644 --- a/recipes/intltool/intltool_0.35.5.bb +++ b/recipes/intltool/intltool_0.35.5.bb @@ -3,7 +3,7 @@ require intltool.inc RDEPENDS_${PN} = "perl-module-text-wrap perl-module-re" RRECOMMENDS_${PN} = "perl-modules" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/intone-video/intone-video_svn.bb b/recipes/intone-video/intone-video_svn.bb index a88606aac9..90a2761923 100644 --- a/recipes/intone-video/intone-video_svn.bb +++ b/recipes/intone-video/intone-video_svn.bb @@ -8,7 +8,7 @@ RDEPENDS_${PN} = "mplayer lame libxv libsdl-x11" SRCREV = "12" PV = "0.13+svnr${SRCPV}" -PR = "r2" +PR = "r3" SRC_URI = "svn://intone-video.googlecode.com/svn;module=trunk;proto=http" S = "${WORKDIR}/trunk" diff --git a/recipes/intone/intone_svn.bb b/recipes/intone/intone_svn.bb index 952593353d..4b62f551d1 100644 --- a/recipes/intone/intone_svn.bb +++ b/recipes/intone/intone_svn.bb @@ -8,7 +8,7 @@ RDEPENDS_${PN} = "mplayer lame libxv libsdl-x11" SRCREV = "76" PV = "0.66+svnr${SRCPV}" -PR = "r4" +PR = "r5" SRC_URI = "svn://intone.googlecode.com/svn;module=trunk;proto=http \ file://vorbis-include-id3tag.patch;maxrev=18" diff --git a/recipes/iotop/iotop_0.2.1.bb b/recipes/iotop/iotop_0.2.1.bb index e00d8d809d..12ccc77708 100644 --- a/recipes/iotop/iotop_0.2.1.bb +++ b/recipes/iotop/iotop_0.2.1.bb @@ -1,6 +1,6 @@ HOMEPAGE = "http://guichaz.free.fr/iotop/" LICENSE = "GPL" -PR = "r2" +PR = "r3" RDEPENDS_${PN} = "python-distutils python-curses python-setuptools python-textutils" diff --git a/recipes/ipaq-sleep/ipaq-sleep_0.9.bb b/recipes/ipaq-sleep/ipaq-sleep_0.9.bb index 62cff956a2..91ae6cb471 100644 --- a/recipes/ipaq-sleep/ipaq-sleep_0.9.bb +++ b/recipes/ipaq-sleep/ipaq-sleep_0.9.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" DEPENDS = "apmd virtual/xserver libxext virtual/libx11 libxau xscrnsaverh libxss" DISTRO_APM ?= "apm" RDEPENDS_${PN} = "${DISTRO_APM}" -PR = "r7" +PR = "r8" inherit gpe pkgconfig diff --git a/recipes/iperf/iperf-1.7.0/socketaddr-h-errno.diff b/recipes/iperf/iperf-1.7.0/socketaddr-h-errno.diff deleted file mode 100644 index 4f32e7498f..0000000000 --- a/recipes/iperf/iperf-1.7.0/socketaddr-h-errno.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./../lib/SocketAddr.cpp.orig 2004-10-05 12:10:06.763746800 +0200 -+++ ./../lib/SocketAddr.cpp 2004-10-05 12:10:21.079570464 +0200 -@@ -65,7 +65,7 @@ - - - #ifndef WIN32 --extern int h_errno; -+//extern int h_errno; - #endif - - Socklen_t SocketAddr::mAddress_size = sizeof(iperf_sockaddr); diff --git a/recipes/iperf/iperf-2.0.4/000-Iperf_Fix-CPU-Usage.diff b/recipes/iperf/iperf-2.0.4/000-Iperf_Fix-CPU-Usage.diff new file mode 100644 index 0000000000..7e8995383b --- /dev/null +++ b/recipes/iperf/iperf-2.0.4/000-Iperf_Fix-CPU-Usage.diff @@ -0,0 +1,164 @@ +[Thread]: Replace thread_rest() with condition variables + +This applies the patch by Ingo Molnar from + + http://marc.info/?l=linux-kernel&m=119088670113210&w=2 + +by reverting previous changes that coincided with changes made by this +patch. Other than that, the patch is the original from the above URL. + +Gerrit +--- + compat/Thread.c | 6 ------ + src/Reporter.c | 37 +++++++++---------------------------- + src/main.cpp | 2 ++ + 3 files changed, 11 insertions(+), 34 deletions(-) + +rover: changed two remaining thread_rest. + +--- a/compat/Thread.c ++++ b/compat/Thread.c +@@ -405,12 +405,6 @@ int thread_numuserthreads( void ) { + void thread_rest ( void ) { + #if defined( HAVE_THREAD ) + #if defined( HAVE_POSIX_THREAD ) +-#if defined( _POSIX_PRIORITY_SCHEDULING ) +- sched_yield(); +-#else +- usleep( 0 ); +-#endif +- + #else // Win32 + SwitchToThread( ); + #endif +--- a/src/Reporter.c ++++ b/src/Reporter.c +@@ -110,9 +110,8 @@ + + char buffer[64]; // Buffer for printing + ReportHeader *ReportRoot = NULL; +-int threadWait = 0; +-int threadSleeping = 0; + extern Condition ReportCond; ++extern Condition ReportDoneCond; + int reporter_process_report ( ReportHeader *report ); + void process_report ( ReportHeader *report ); + int reporter_handle_packet( ReportHeader *report ); +@@ -340,7 +339,7 @@ + // item + while ( index == 0 ) { + Condition_Signal( &ReportCond ); +- thread_rest(); ++ Condition_Wait( &ReportDoneCond ); + index = agent->reporterindex; + } + agent->agentindex = 0; +@@ -348,11 +347,9 @@ + // Need to make sure that reporter is not about to be "lapped" + while ( index - 1 == agent->agentindex ) { + Condition_Signal( &ReportCond ); +- thread_rest(); ++ Condition_Wait( &ReportDoneCond ); + index = agent->reporterindex; + } +- if (threadSleeping) +- Condition_Signal( &ReportCond ); + + // Put the information there + memcpy( agent->data + agent->agentindex, packet, sizeof(ReportStruct) ); +@@ -382,9 +379,6 @@ + packet->packetLen = 0; + ReportPacket( agent, packet ); + packet->packetID = agent->report.cntDatagrams; +- if (threadSleeping) +- Condition_Signal( &ReportCond ); +- + } + } + +@@ -396,11 +390,8 @@ + void EndReport( ReportHeader *agent ) { + if ( agent != NULL ) { + int index = agent->reporterindex; +- if (threadSleeping) +- Condition_Signal( &ReportCond ); +- + while ( index != -1 ) { +- thread_rest(); ++ Condition_Wait( &ReportDoneCond ); + index = agent->reporterindex; + } + agent->agentindex = -1; +@@ -421,7 +412,7 @@ + Transfer_Info *GetReport( ReportHeader *agent ) { + int index = agent->reporterindex; + while ( index != -1 ) { +- thread_rest(); ++ Condition_Wait( &ReportDoneCond ); + index = agent->reporterindex; + } + return &agent->report.info; +@@ -467,10 +458,6 @@ + * Update the ReportRoot to include this report. + */ + Condition_Lock( ReportCond ); +- if ( isUDP(agent) ) +- threadWait = 0; +- else +- threadWait = 1; + reporthdr->next = ReportRoot; + ReportRoot = reporthdr; + Condition_Signal( &ReportCond ); +@@ -567,6 +554,7 @@ + } + Condition_Unlock ( ReportCond ); + ++again: + if ( ReportRoot != NULL ) { + ReportHeader *temp = ReportRoot; + //Condition_Unlock ( ReportCond ); +@@ -589,19 +577,12 @@ + // finished with report so free it + free( temp ); + Condition_Unlock ( ReportCond ); ++ Condition_Signal( &ReportDoneCond ); ++ if (ReportRoot) ++ goto again; + } +- // yield control of CPU is another thread is waiting +- // sleep on a condition variable, as it is much cheaper +- // on most platforms than issuing schedyield or usleep +- // syscalls +- Condition_Lock ( ReportCond ); +- if ( threadWait && ReportRoot != NULL) { +- threadSleeping = 1; +- Condition_TimedWait (& ReportCond, 1 ); +- threadSleeping = 0; +- } +- Condition_Unlock ( ReportCond ); +- ++ Condition_Signal( &ReportDoneCond ); ++ usleep(10000); + } else { + //Condition_Unlock ( ReportCond ); + } +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -96,6 +96,7 @@ extern "C" { + // records being accessed in a report and also to + // serialize modification of the report list + Condition ReportCond; ++ Condition ReportDoneCond; + } + + // global variables only accessed within this file +@@ -142,6 +143,7 @@ int main( int argc, char **argv ) { + + // Initialize global mutexes and conditions + Condition_Initialize ( &ReportCond ); ++ Condition_Initialize ( &ReportDoneCond ); + Mutex_Initialize( &groupCond ); + Mutex_Initialize( &clients_mutex ); + + + diff --git a/recipes/iperf/iperf-2.0.4/001-cast-to-max_size_t-instead-of-int.patch b/recipes/iperf/iperf-2.0.4/001-cast-to-max_size_t-instead-of-int.patch new file mode 100644 index 0000000000..3a90175191 --- /dev/null +++ b/recipes/iperf/iperf-2.0.4/001-cast-to-max_size_t-instead-of-int.patch @@ -0,0 +1,11 @@ +--- iperf-2.0.4.orig/src/Settings.cpp.orig 2008-04-08 04:37:54.000000000 +0200 ++++ iperf-2.0.4/src/Settings.cpp 2008-05-07 17:41:03.923942801 +0200 +@@ -458,7 +458,7 @@ + case 't': // seconds to write for + // time mode (instead of amount mode) + setModeTime( mExtSettings ); +- mExtSettings->mAmount = (int) (atof( optarg ) * 100.0); ++ mExtSettings->mAmount = (max_size_t) (atof( optarg ) * 100.0); + break; + + case 'u': // UDP instead of TCP diff --git a/recipes/iperf/iperf-2.0.4/003-fix-hyphen-used-as-minus-sign.patch b/recipes/iperf/iperf-2.0.4/003-fix-hyphen-used-as-minus-sign.patch new file mode 100644 index 0000000000..54896b1091 --- /dev/null +++ b/recipes/iperf/iperf-2.0.4/003-fix-hyphen-used-as-minus-sign.patch @@ -0,0 +1,174 @@ +--- iperf-2.0.4.orig/man/iperf.1 2008-08-21 00:21:49.290527643 +0200 ++++ iperf-2.0.4/man/iperf.1 2008-08-21 00:35:17.850640445 +0200 +@@ -2,21 +2,21 @@ + .SH NAME + iperf \- perform network throughput tests + .SH SYNOPSIS +-.B iperf -s [ ++.B iperf \-s [ + .I options + .B ] + +-.B iperf -c ++.B iperf \-c + .I server + .B [ + .I options + .B ] + +-.B iperf -u -s [ ++.B iperf \-u \-s [ + .I options + .B ] + +-.B iperf -u -c ++.B iperf \-u \-c + .I server + .B [ + .I options +@@ -28,103 +28,103 @@ + traffic). + .SH "GENERAL OPTIONS" + .TP +-.BR -f ", " --format " " ++.BR \-f ", " \-\-format " " + [kmKM] format to report: Kbits, Mbits, KBytes, MBytes + .TP +-.BR -h ", " --help " " ++.BR \-h ", " \-\-help " " + print a help synopsis + .TP +-.BR -i ", " --interval " \fIn\fR" ++.BR \-i ", " \-\-interval " \fIn\fR" + pause \fIn\fR seconds between periodic bandwidth reports + .TP +-.BR -l ", " --len " \fIn\fR[KM]" ++.BR \-l ", " \-\-len " \fIn\fR[KM]" + set length read/write buffer to \fIn\fR (default 8 KB) + .TP +-.BR -m ", " --print_mss " " ++.BR \-m ", " \-\-print_mss " " + print TCP maximum segment size (MTU - TCP/IP header) + .TP +-.BR -o ", " --output " <filename>" ++.BR \-o ", " \-\-output " <filename>" + output the report or error message to this specified file + .TP +-.BR -p ", " --port " \fIn\fR" ++.BR \-p ", " \-\-port " \fIn\fR" + set server port to listen on/connect to to \fIn\fR (default 5001) + .TP +-.BR -u ", " --udp " " ++.BR \-u ", " \-\-udp " " + use UDP rather than TCP + .TP +-.BR -w ", " --window " \fIn\fR[KM]" ++.BR \-w ", " \-\-window " \fIn\fR[KM]" + TCP window size (socket buffer size) + .TP +-.BR -B ", " --bind " <host>" ++.BR \-B ", " \-\-bind " <host>" + bind to <host>, an interface or multicast address + .TP +-.BR -C ", " --compatibility " " ++.BR \-C ", " \-\-compatibility " " + for use with older versions does not sent extra msgs + .TP +-.BR -M ", " --mss " \fIn\fR" ++.BR \-M ", " \-\-mss " \fIn\fR" + set TCP maximum segment size (MTU - 40 bytes) + .TP +-.BR -N ", " --nodelay " " ++.BR \-N ", " \-\-nodelay " " + set TCP no delay, disabling Nagle's Algorithm + .TP +-.BR -v ", " --version " " ++.BR \-v ", " \-\-version " " + print version information and quit + .TP +-.BR -V ", " --IPv6Version " " ++.BR \-V ", " \-\-IPv6Version " " + Set the domain to IPv6 + .TP +-.BR -x ", " --reportexclude " " ++.BR \-x ", " \-\-reportexclude " " + [CDMSV] exclude C(connection) D(data) M(multicast) S(settings) V(server) reports + .TP +-.BR -y ", " --reportstyle " C|c" ++.BR \-y ", " \-\-reportstyle " C|c" + if set to C or c report results as CSV (comma separated values) + .SH "SERVER SPECIFIC OPTIONS" + .TP +-.BR -s ", " --server " " ++.BR \-s ", " \-\-server " " + run in server mode + .TP +-.BR -U ", " --single_udp " " ++.BR \-U ", " \-\-single_udp " " + run in single threaded UDP mode + .TP +-.BR -D ", " --daemon " " ++.BR \-D ", " \-\-daemon " " + run the server as a daemon + .SH "CLIENT SPECIFIC OPTIONS" + .TP +-.BR -b ", " --bandwidth " \fIn\fR[KM]" ++.BR \-b ", " \-\-bandwidth " \fIn\fR[KM]" + set target bandwidth to \fIn\fR bits/sec (default 1 Mbit/sec). +-This setting requires UDP (-u). ++This setting requires UDP (\-u). + .TP +-.BR -c ", " --client " <host>" ++.BR \-c ", " \-\-client " <host>" + run in client mode, connecting to <host> + .TP +-.BR -d ", " --dualtest " " ++.BR \-d ", " \-\-dualtest " " + Do a bidirectional test simultaneously + .TP +-.BR -n ", " --num " \fIn\fR[KM]" +-number of bytes to transmit (instead of -t) ++.BR \-n ", " \-\-num " \fIn\fR[KM]" ++number of bytes to transmit (instead of \-t) + .TP +-.BR -r ", " --tradeoff " " ++.BR \-r ", " \-\-tradeoff " " + Do a bidirectional test individually + .TP +-.BR -t ", " --time " \fIn\fR" ++.BR \-t ", " \-\-time " \fIn\fR" + time in seconds to transmit for (default 10 secs) + .TP +-.BR -F ", " --fileinput " <name>" ++.BR \-F ", " \-\-fileinput " <name>" + input the data to be transmitted from a file + .TP +-.BR -I ", " --stdin " " ++.BR \-I ", " \-\-stdin " " + input the data to be transmitted from stdin + .TP +-.BR -L ", " --listenport " \fIn\fR" ++.BR \-L ", " \-\-listenport " \fIn\fR" + port to recieve bidirectional tests back on + .TP +-.BR -P ", " --parallel " \fIn\fR" ++.BR \-P ", " \-\-parallel " \fIn\fR" + number of parallel client threads to run + .TP +-.BR -T ", " --ttl " \fIn\fR" ++.BR \-T ", " \-\-ttl " \fIn\fR" + time-to-live, for multicast (default 1) + .TP +-.BR -Z ", " --linux-congestion " <algo>" ++.BR \-Z ", " \-\-linux\-congestion " <algo>" + set TCP congestion control algorithm (Linux only) + .SH ENVIRONMENT + .TP +@@ -143,6 +143,6 @@ + Kevin Gibbs, + John Estabrook <jestabro at ncsa.uiuc.edu>, + Andrew Gallatin <gallatin at gmail.com>, +-Stephen Hemminger <shemminger at linux-foundation.org> ++Stephen Hemminger <shemminger at linux\-foundation.org> + .SH "SEE ALSO" + http://iperf.sourceforge.net/ diff --git a/recipes/iperf/iperf-2.0.4/004-svn-r43-ro.patch b/recipes/iperf/iperf-2.0.4/004-svn-r43-ro.patch new file mode 100644 index 0000000000..cab9e18a41 --- /dev/null +++ b/recipes/iperf/iperf-2.0.4/004-svn-r43-ro.patch @@ -0,0 +1,113 @@ +--- iperf-2.0.4-4/AUTHORS 2009-07-06 12:02:24.159696747 +0200 ++++ iperf-2.0.4/AUTHORS 2009-07-06 12:14:32.236079541 +0200 +@@ -28,3 +28,7 @@ + + Stephen Hemminger <shemminger@linux-foundation.org> + * Linux congestion control selection and theading improvements ++ ++Nathan Jones <nmjones@users.sourceforge.net> ++ * patch for underflow when value specified in -n is not a multiple of -l ++ +--- iperf-2.0.4-4/ChangeLog 2009-07-06 12:02:24.166276642 +0200 ++++ iperf-2.0.4/ChangeLog 2009-07-06 12:15:28.883699655 +0200 +@@ -1,3 +1,18 @@ ++2008-05-09 Jon Dugan <jdugan@x1024.net> ++ ++* change currLen to unsigned to squelch warning generated by Nathan's patch ++ ++2008-05-09 Nathan Jones <nmjones@users.sourceforge.net> ++ ++* prevent underflow when the amount of data to be transmitted (-n) is not a ++multiple of the buffer size (-l) Patch: ++https://sourceforge.net/tracker/index.php?func=detail&aid=1943432&group_id=128336&atid=711373 ++ ++2008-04-08 Jon Dugan <jdugan@x1024.net> ++ ++* print report headers only once ++* use appropriate report header for UDP tests ++ + 2008-04-07 Jon Dugan <jdugan@x1024.net> + + * Add man page to autoconf goo +diff -urN 204orig/src/Client.cpp trunk/src/Client.cpp +--- 204orig/src/Client.cpp 2008-04-08 04:37:54.000000000 +0200 ++++ trunk/src/Client.cpp 2008-05-10 05:18:35.000000000 +0200 +@@ -116,7 +116,7 @@ + const int kBytes_to_Bits = 8; + + void Client::RunTCP( void ) { +- long currLen = 0; ++ unsigned long currLen = 0; + struct itimerval it; + max_size_t totLen = 0; + +@@ -170,7 +170,12 @@ + } + + if ( !mMode_Time ) { +- mSettings->mAmount -= currLen; ++ /* mAmount may be unsigned, so don't let it underflow! */ ++ if( mSettings->mAmount >= currLen ) { ++ mSettings->mAmount -= currLen; ++ } else { ++ mSettings->mAmount = 0; ++ } + } + + } while ( ! (sInterupted || +@@ -198,7 +203,7 @@ + + void Client::Run( void ) { + struct UDP_datagram* mBuf_UDP = (struct UDP_datagram*) mBuf; +- long currLen = 0; ++ unsigned long currLen = 0; + + int delay_target = 0; + int delay = 0; +@@ -310,7 +315,12 @@ + delay_loop( delay ); + } + if ( !mMode_Time ) { +- mSettings->mAmount -= currLen; ++ /* mAmount may be unsigned, so don't let it underflow! */ ++ if( mSettings->mAmount >= currLen ) { ++ mSettings->mAmount -= currLen; ++ } else { ++ mSettings->mAmount = 0; ++ } + } + + } while ( ! (sInterupted || +diff -urN 204orig/src/ReportDefault.c trunk/src/ReportDefault.c +--- 204orig/src/ReportDefault.c 2008-04-08 04:37:54.000000000 +0200 ++++ trunk/src/ReportDefault.c 2008-04-09 02:08:11.000000000 +0200 +@@ -67,6 +67,7 @@ + * Prints transfer reports in default style + */ + void reporter_printstats( Transfer_Info *stats ) { ++ static char header_printed = 0; + + byte_snprintf( buffer, sizeof(buffer)/2, (double) stats->TotalLen, + toupper( stats->mFormat)); +@@ -76,13 +77,19 @@ + + if ( stats->mUDP != (char)kMode_Server ) { + // TCP Reporting +- printf( report_bw_header); ++ if( !header_printed ) { ++ printf( report_bw_header); ++ header_printed = 1; ++ } + printf( report_bw_format, stats->transferID, + stats->startTime, stats->endTime, + buffer, &buffer[sizeof(buffer)/2] ); + } else { + // UDP Reporting +- printf( report_bw_jitter_loss_header); ++ if( !header_printed ) { ++ printf( report_bw_jitter_loss_header); ++ header_printed = 1; ++ } + printf( report_bw_jitter_loss_format, stats->transferID, + stats->startTime, stats->endTime, + buffer, &buffer[sizeof(buffer)/2], diff --git a/recipes/iperf/iperf-2.0.4/005-iperf-die-on-bind-fail.patch b/recipes/iperf/iperf-2.0.4/005-iperf-die-on-bind-fail.patch new file mode 100644 index 0000000000..29500d3877 --- /dev/null +++ b/recipes/iperf/iperf-2.0.4/005-iperf-die-on-bind-fail.patch @@ -0,0 +1,11 @@ +--- iperf-2.0.4/src/Listener.cpp 2009-02-23 16:20:31.000000000 -0500 ++++ iperf-2.0.4-fixed/src/Listener.cpp 2009-02-23 16:20:40.000000000 -0500 +@@ -333,7 +333,7 @@ + #endif + { + rc = bind( mSettings->mSock, (sockaddr*) &mSettings->local, mSettings->size_local ); +- WARN_errno( rc == SOCKET_ERROR, "bind" ); ++ FAIL_errno( rc == SOCKET_ERROR, "bind", mSettings ); + } + // listen for connections (TCP only). + // default backlog traditionally 5 diff --git a/recipes/iperf/iperf-2.0.4/006-iperf-die-on-connect-fail.patch b/recipes/iperf/iperf-2.0.4/006-iperf-die-on-connect-fail.patch new file mode 100644 index 0000000000..968a19aa48 --- /dev/null +++ b/recipes/iperf/iperf-2.0.4/006-iperf-die-on-connect-fail.patch @@ -0,0 +1,11 @@ +--- iperf-2.0.4/src/Client.cpp 2008-04-07 22:37:54.000000000 -0400 ++++ iperf-2.0.4-fixed/src/Client.cpp 2009-03-03 12:30:02.000000000 -0500 +@@ -403,7 +403,7 @@ + // connect socket + rc = connect( mSettings->mSock, (sockaddr*) &mSettings->peer, + SockAddr_get_sizeof_sockaddr( &mSettings->peer )); +- WARN_errno( rc == SOCKET_ERROR, "connect" ); ++ FAIL_errno( rc == SOCKET_ERROR, "connect", mSettings ); + + getsockname( mSettings->mSock, (sockaddr*) &mSettings->local, + &mSettings->size_local ); diff --git a/recipes/iperf/iperf-2.0.4/007-iperf-reporter-deadlock.patch b/recipes/iperf/iperf-2.0.4/007-iperf-reporter-deadlock.patch new file mode 100644 index 0000000000..1383548170 --- /dev/null +++ b/recipes/iperf/iperf-2.0.4/007-iperf-reporter-deadlock.patch @@ -0,0 +1,65 @@ +# by Kirby Zhou < kirbyzhou \x40 sohu-rd.com > +# add a Condition_Wait_Event for ReporterDoneCond +--- iperf-2.0.4.orig/include/Condition.h 2007-08-30 00:06:19.000000000 +0200 ++++ iperf-2.0.4/include/Condition.h 2009-07-06 11:45:02.407700310 +0200 +@@ -115,6 +115,11 @@ typedef struct Condition { + // sleep this thread, waiting for condition signal + #if defined( HAVE_POSIX_THREAD ) + #define Condition_Wait( Cond ) pthread_cond_wait( &(Cond)->mCondition, &(Cond)->mMutex ) ++ #define Condition_Wait_Event( Cond ) do { \ ++ Mutex_Lock( &(Cond)->mMutex ); \ ++ pthread_cond_wait( &(Cond)->mCondition, &(Cond)->mMutex ); \ ++ Mutex_Unlock( &(Cond)->mMutex ); \ ++ } while ( 0 ) + #elif defined( HAVE_WIN32_THREAD ) + // atomically release mutex and wait on condition, + // then re-acquire the mutex +@@ -122,6 +127,10 @@ typedef struct Condition { + SignalObjectAndWait( (Cond)->mMutex, (Cond)->mCondition, INFINITE, false ); \ + Mutex_Lock( &(Cond)->mMutex ); \ + } while ( 0 ) ++ #define Condition_Wait_Event( Cond ) do { \ ++ Mutex_Lock( &(Cond)->mMutex ); \ ++ SignalObjectAndWait( (Cond)->mMutex, (Cond)->mCondition, INFINITE, false ); \ ++ } while ( 0 ) + #else + #define Condition_Wait( Cond ) + #endif +--- iperf-2.0.4.orig/src/Reporter.c 2009-07-06 11:49:05.996443011 +0200 ++++ iperf-2.0.4/src/Reporter.c 2009-07-06 11:46:52.919699530 +0200 +@@ -339,7 +339,7 @@ void ReportPacket( ReportHeader* agent, + // item + while ( index == 0 ) { + Condition_Signal( &ReportCond ); +- Condition_Wait( &ReportDoneCond ); ++ Condition_Wait_Event( &ReportDoneCond ); + index = agent->reporterindex; + } + agent->agentindex = 0; +@@ -347,7 +347,7 @@ void ReportPacket( ReportHeader* agent, + // Need to make sure that reporter is not about to be "lapped" + while ( index - 1 == agent->agentindex ) { + Condition_Signal( &ReportCond ); +- Condition_Wait( &ReportDoneCond ); ++ Condition_Wait_Event( &ReportDoneCond ); + index = agent->reporterindex; + } + +@@ -391,7 +391,7 @@ void EndReport( ReportHeader *agent ) { + if ( agent != NULL ) { + int index = agent->reporterindex; + while ( index != -1 ) { +- Condition_Wait( &ReportDoneCond ); ++ Condition_Wait_Event( &ReportDoneCond ); + index = agent->reporterindex; + } + agent->agentindex = -1; +@@ -412,7 +412,7 @@ void EndReport( ReportHeader *agent ) { + Transfer_Info *GetReport( ReportHeader *agent ) { + int index = agent->reporterindex; + while ( index != -1 ) { +- Condition_Wait( &ReportDoneCond ); ++ Condition_Wait_Event( &ReportDoneCond ); + index = agent->reporterindex; + } + return &agent->report.info; diff --git a/recipes/iperf/iperf-2.0.4/008-numofreport.patch b/recipes/iperf/iperf-2.0.4/008-numofreport.patch new file mode 100644 index 0000000000..0c6d312f40 --- /dev/null +++ b/recipes/iperf/iperf-2.0.4/008-numofreport.patch @@ -0,0 +1,13 @@ +# by Kirby Zhou < kirbyzhou \x40 sohu-rd.com > +# increase the queue length to avoid thread racing +--- iperf-2.0.4.orig/include/Reporter.h 2008-04-08 04:37:54.000000000 +0200 ++++ iperf-2.0.4/include/Reporter.h 2009-07-06 11:53:58.700541554 +0200 +@@ -61,7 +61,7 @@ struct server_hdr; + + #include "Settings.hpp" + +-#define NUM_REPORT_STRUCTS 700 ++#define NUM_REPORT_STRUCTS 5700 + #define NUM_MULTI_SLOTS 5 + + #ifdef __cplusplus diff --git a/recipes/iperf/iperf-2.0.4/009-delayloop.patch b/recipes/iperf/iperf-2.0.4/009-delayloop.patch new file mode 100644 index 0000000000..a1f8dac9f5 --- /dev/null +++ b/recipes/iperf/iperf-2.0.4/009-delayloop.patch @@ -0,0 +1,19 @@ +# by Kirby Zhou < kirbyzhou \x40 sohu-rd.com > +# using sched_yield to schedule other threads, so multiple iperf can run simultaneously +# using usleep with delay-loop between 2 package is long than 1.25ms. +--- iperf-2.0.4-4/compat/delay.cpp 2009-07-06 12:02:24.166276642 +0200 ++++ iperf-2.0.4/compat/delay.cpp 2009-07-06 12:01:33.858384005 +0200 +@@ -69,6 +69,13 @@ void delay_loop( unsigned long usec ) { + + Timestamp now; + while ( now.before( end ) ) { ++ long diff = end.subUsec(now); ++ if (diff >= 1250) { ++ usleep(0); ++ } ++ if (diff >= 2) { ++ sched_yield(); ++ } + now.setnow(); + } + } diff --git a/recipes/iperf/iperf.inc b/recipes/iperf/iperf.inc index f409c17240..138ba292bd 100644 --- a/recipes/iperf/iperf.inc +++ b/recipes/iperf/iperf.inc @@ -2,17 +2,22 @@ SECTION = "console/network" DESCRIPTION = "Iperf is a tool to measure maximum TCP bandwidth, allowing the tuning of various parameters and UDP characteristics" HOMEPAGE = "http://dast.nlanr.net/Projects/Iperf/" LICENSE = "BSD" -PR = "r0" +INC_PR = "r1" inherit autotools S="${WORKDIR}/iperf-${PV}" +EXTRA_OECONF = "--exec-prefix=${STAGING_DIR_HOST}${layout_exec_prefix}" + # --disable-threads is needed on epia/x86 with uclibc +# RIK: or probably not with recent uclibc with NPTL +EXTRA_OECONF_append_epia = " --disable-threads" + do_configure() { export ac_cv_func_malloc_0_nonnull=yes gnu-configize - oe_runconf --exec-prefix=${STAGING_DIR_HOST}${layout_exec_prefix} --disable-threads + oe_runconf } do_compile() { diff --git a/recipes/iperf/iperf_1.7.0.bb b/recipes/iperf/iperf_1.7.0.bb deleted file mode 100644 index d1a1262dc9..0000000000 --- a/recipes/iperf/iperf_1.7.0.bb +++ /dev/null @@ -1,29 +0,0 @@ -SECTION = "console/network" -DESCRIPTION = "Iperf is a tool to measure maximum TCP bandwidth, allowing the tuning of various parameters and UDP characteristics" -HOMEPAGE = "http://dast.nlanr.net/Projects/Iperf/" -LICENSE = "BSD" -PR = "r1" - -SRC_URI = "http://dast.nlanr.net/Projects/Iperf/iperf-${PV}-source.tar.gz \ - file://socketaddr-h-errno.diff" - -inherit autotools - -S="${WORKDIR}/iperf-${PV}/cfg" - -do_configure() { - oe_runconf -} - -do_compile() { - cd ${WORKDIR}/iperf-${PV} - oe_runmake -} - -do_install() { - cd ${WORKDIR}/iperf-${PV}/src - oe_runmake INSTALL_DIR=${D}${bindir} install -} - -SRC_URI[md5sum] = "3e4aea85822bcf10ed14040f4b26bd26" -SRC_URI[sha256sum] = "f54fabaf344b1120e8682c7e5f1ef80d08d88f0b8640037f92e261e51c9c1672" diff --git a/recipes/iperf/iperf_2.0.2.bb b/recipes/iperf/iperf_2.0.2.bb index 58a53bce99..f5fa592f41 100644 --- a/recipes/iperf/iperf_2.0.2.bb +++ b/recipes/iperf/iperf_2.0.2.bb @@ -1,7 +1,8 @@ require iperf.inc -SRC_URI = "http://dast.nlanr.net/Projects/Iperf2.0/iperf-${PV}.tar.gz" +PR = "${INC_PR}.0" +SRC_URI = "http://dast.nlanr.net/Projects/Iperf2.0/iperf-${PV}.tar.gz" SRC_URI[md5sum] = "bb658aba58a5af0356f5b1342dfe8f53" SRC_URI[sha256sum] = "e9baea8cb516b5d83013f746f9fa104abb45fcf15d444a03add06769916e41d6" diff --git a/recipes/iperf/iperf_2.0.4.bb b/recipes/iperf/iperf_2.0.4.bb index 29e96c9c90..b302aa2add 100644 --- a/recipes/iperf/iperf_2.0.4.bb +++ b/recipes/iperf/iperf_2.0.4.bb @@ -1,6 +1,19 @@ require iperf.inc -SRC_URI = "${SOURCEFORGE_MIRROR}/iperf/iperf-${PV}.tar.gz" +PR = "${INC_PR}.1" + +SRC_URI = " \ + ${SOURCEFORGE_MIRROR}/iperf/iperf-${PV}.tar.gz \ + file://000-Iperf_Fix-CPU-Usage.diff \ + file://001-cast-to-max_size_t-instead-of-int.patch \ + file://003-fix-hyphen-used-as-minus-sign.patch \ + file://004-svn-r43-ro.patch \ + file://005-iperf-die-on-bind-fail.patch \ + file://006-iperf-die-on-connect-fail.patch \ + file://007-iperf-reporter-deadlock.patch \ + file://008-numofreport.patch \ + file://009-delayloop.patch \ + " SRC_URI[md5sum] = "8c5bc14cc2ea55f18f22afe3c23e3dcb" diff --git a/recipes/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb b/recipes/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb index 2ae1d5cb2a..98cc7f114d 100644 --- a/recipes/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb +++ b/recipes/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb @@ -1,7 +1,7 @@ require ipkg-utils_${PV}.bb RDEPENDS_${PN} = "" -PR = "r21" +PR = "r22" inherit native diff --git a/recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb b/recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb index bc3ea7fcca..fe1f28be44 100644 --- a/recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb +++ b/recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" CONFLICTS = "ipkg-link" RDEPENDS_${PN} = "python" SRCDATE = "20050930" -PR = "r24" +PR = "r25" SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \ file://ipkg-utils-fix.patch \ diff --git a/recipes/iproute2/iproute2_2.6.34.bb b/recipes/iproute2/iproute2_2.6.34.bb new file mode 100644 index 0000000000..fb84cb1285 --- /dev/null +++ b/recipes/iproute2/iproute2_2.6.34.bb @@ -0,0 +1,10 @@ +require iproute2.inc + +PR = "${INC_PR}.0" + +SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}.tar.bz2" + +SRC_URI[md5sum] = "5c5742bdac05a1688f266512e685b83c" +SRC_URI[sha256sum] = "f7feb3c34df4714cae0265f7629863af8b0a88550f4f38aba0ffc81a10c29bbb" + +S = "${WORKDIR}/iproute2-${PV}"
\ No newline at end of file diff --git a/recipes/ipset/files/Makefile.patch b/recipes/ipset/files/Makefile.patch new file mode 100644 index 0000000000..e7fbd73048 --- /dev/null +++ b/recipes/ipset/files/Makefile.patch @@ -0,0 +1,10 @@ +--- a/Makefile 2010-01-24 17:43:22.000000000 +0300 ++++ b/Makefile 2010-04-20 12:33:33.000000000 +0400 +@@ -66,7 +66,6 @@ endif + ABI_FLAGS:= + CFLAGS:=$(ABI_FLAGS) $(COPT_FLAGS) $(WARN_FLAGS) -Ikernel/include -I. # -g -DIPSET_DEBUG + SH_CFLAGS:=$(CFLAGS) -fPIC +-LDFLAGS:=$(ABI_FLAGS) + SETTYPES:=ipmap portmap macipmap + SETTYPES+=iptree iptreemap + SETTYPES+=iphash nethash ipporthash ipportiphash ipportnethash diff --git a/recipes/ipset/ipset.inc b/recipes/ipset/ipset.inc new file mode 100644 index 0000000000..512221d6be --- /dev/null +++ b/recipes/ipset/ipset.inc @@ -0,0 +1,31 @@ +DESCRIPTION = "IP set framework" +SECTION = "kernel/modules" +LICENSE = "GPLv2" +DEPENDS += "virtual/libc" + +inherit module + +PR="r0" + +SRC_URI = " \ + http://ipset.netfilter.org/ipset-${PV}.tar.bz2 \ + file://Makefile.patch \ + " + +PACKAGES += "${PN}-modules" + +FILES_${PN} = "${sbindir} ${libdir}" +FILES_${PN}-doc = "${mandir}" +FILES_${PN}-modules = "${base_libdir}/modules/${KERNEL_VERSION}/extra/ip_set*${KERNEL_OBJECT_SUFFIX} \ + ${base_libdir}/modules/${KERNEL_VERSION}/extra/ipt*${KERNEL_OBJECT_SUFFIX}" + +EXTRA_OEMAKE = "KERNEL_DIR=${KERNEL_SOURCE} MANDIR=${mandir}" + +do_compile () { + oe_runmake binaries + module_do_compile MAKE_TARGETS=modules +} + +do_install_append () { + oe_runmake binaries_install PREFIX=${prefix} DESTDIR=${D} +} diff --git a/recipes/ipset/ipset_4.2.bb b/recipes/ipset/ipset_4.2.bb new file mode 100644 index 0000000000..56efc549ae --- /dev/null +++ b/recipes/ipset/ipset_4.2.bb @@ -0,0 +1,6 @@ +PR = "${INC_PR}.0" +require ipset.inc + +SRC_URI[md5sum] = "9060d549a18c1c0794fa47a71343d627" +SRC_URI[sha256sum] = "5f1b9e5245b7998106660a5b29d9580156feda1c669e7214793a90e02e4a1203" + diff --git a/recipes/iptables/iptables.inc b/recipes/iptables/iptables.inc index a86ae858c4..db2b6f016e 100644 --- a/recipes/iptables/iptables.inc +++ b/recipes/iptables/iptables.inc @@ -6,7 +6,7 @@ LICENSE = "GPL" SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2;name=iptables-${PV}" S = "${WORKDIR}/iptables-${PV}" -INC_PR = "r6" +INC_PR = "r7" PARALLEL_MAKE = "" diff --git a/recipes/irk/irk-belkin_0.11.bb b/recipes/irk/irk-belkin_0.11.bb index e9c3dc1034..3de38f3ccf 100644 --- a/recipes/irk/irk-belkin_0.11.bb +++ b/recipes/irk/irk-belkin_0.11.bb @@ -1,9 +1,9 @@ require irk.inc DESCRIPTION += "(version with Belkin support)" -RCONFLICTS = "irk-targus" -RREPLACES = "irk-targus" -PR = "r3" +RCONFLICTS_${PN} = "irk-targus" +RREPLACES_${PN} = "irk-targus" +PR = "r4" SRC_URI = "http://www.openzaurus.org/download/3.5.4/sources/irk-current.tgz \ file://install-default-conf.patch" diff --git a/recipes/irk/irk-targus_0.11.0.bb b/recipes/irk/irk-targus_0.11.0.bb index 30f53c8c03..252b2c9a33 100644 --- a/recipes/irk/irk-targus_0.11.0.bb +++ b/recipes/irk/irk-targus_0.11.0.bb @@ -1,11 +1,11 @@ require irk.inc -PR = "r2" +PR = "r3" DESCRIPTION += "(version with Targus support)" HOMEPAGE = "http://angela1.data-uncertain.co.uk/~zaurus/irk.php" -RCONFLICTS = "irk-belkin" -RREPLACES = "irk-belkin" +RCONFLICTS_${PN} = "irk-belkin" +RREPLACES_${PN} = "irk-belkin" SRC_URI = "http://www.openzaurus.org/download/3.5.4/sources/irk-${PV}.tgz \ file://install-default-conf.patch" diff --git a/recipes/iscsi-target/iscsi-target_0.4.17.bb b/recipes/iscsi-target/iscsi-target_0.4.17.bb index d237b5124b..8b8ae208d9 100644 --- a/recipes/iscsi-target/iscsi-target_0.4.17.bb +++ b/recipes/iscsi-target/iscsi-target_0.4.17.bb @@ -1,7 +1,7 @@ DESCRIPTION = "iSCSI Enterprise Target is for building an iSCSI storage system on Linux" HOMEPAGE = "http://iscsitarget.sourceforge.net/" LICENSE = "GPL" -PR = "r2" +PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/iscsitarget/iscsitarget-${PV}.tar.gz \ file://libs.patch \ diff --git a/recipes/iscsi-target/iscsi-target_1.4.20.1.bb b/recipes/iscsi-target/iscsi-target_1.4.20.1.bb index 0f98de7ea1..bcf86f99f0 100644 --- a/recipes/iscsi-target/iscsi-target_1.4.20.1.bb +++ b/recipes/iscsi-target/iscsi-target_1.4.20.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "iSCSI Enterprise Target is for building an iSCSI storage system on Linux" HOMEPAGE = "http://iscsitarget.sourceforge.net/" LICENSE = "GPL" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/iscsitarget/iscsitarget-${PV}.tar.gz \ file://ietd.conf \ diff --git a/recipes/iscsi-target/iscsi-target_svn.bb b/recipes/iscsi-target/iscsi-target_svn.bb index c5e51a6c61..43c1c909ff 100644 --- a/recipes/iscsi-target/iscsi-target_svn.bb +++ b/recipes/iscsi-target/iscsi-target_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "iSCSI Enterprise Target is for building an iSCSI storage system on Linux" HOMEPAGE = "http://iscsitarget.sourceforge.net/" LICENSE = "GPL" -PR = "r13" +PR = "r14" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/ivman/ivman_0.6.14.bb b/recipes/ivman/ivman_0.6.14.bb index cc87eee600..5baa7b52e7 100644 --- a/recipes/ivman/ivman_0.6.14.bb +++ b/recipes/ivman/ivman_0.6.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Daemon to mount/unmount devices, based on info from HAL" HOMEPAGE = "http://ivman.sf.net" LICENSE = "GPLv2" -PR = "r1" +PR = "r2" DEPENDS = "hal libxml2" RDEPENDS_${PN} = "hal pmount-hal" diff --git a/recipes/jaaa/clxclient_3.6.1.bb b/recipes/jaaa/clxclient_3.6.1.bb index 42000aeac1..678ea4549e 100644 --- a/recipes/jaaa/clxclient_3.6.1.bb +++ b/recipes/jaaa/clxclient_3.6.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "clxclient library from http://www.kokkinizita.net/linuxaudio/" SECTION = "libs/multimedia" PRIORITY = "optional" LICENSE = "LGPL" -PR = "r0" +PR = "r1" DEPENDS = "libx11 clthreads freetype libxft" RDEPENDS_${PN} = "libx11-locale" diff --git a/recipes/jards/jards_1.0.bb b/recipes/jards/jards_1.0.bb index 436cec372b..e9e9eff4e5 100644 --- a/recipes/jards/jards_1.0.bb +++ b/recipes/jards/jards_1.0.bb @@ -5,7 +5,7 @@ SECTION = "opie/applications" PRIORITY = "optional" LICENSE = "GPL" RDEPENDS_${PN} = "virtual-japanese-font qte-mt libpng (>= 1) kpengine" -PR = "r8" +PR = "r9" # stuff that still needs fixing #) is the RDEPENDS_${PN} line correct and sufficient? diff --git a/recipes/jikes/jikes_1.22.bb b/recipes/jikes/jikes_1.22.bb index 2028d7e762..db61c8e2c2 100644 --- a/recipes/jikes/jikes_1.22.bb +++ b/recipes/jikes/jikes_1.22.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://jikes.sourceforge.net/" PRIORITY = "optional" SECTION = "devel" LICENSE = "IBM" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/jikes/jikes-${PV}.tar.bz2" diff --git a/recipes/keylaunch/keylaunch_2.0.10.bb b/recipes/keylaunch/keylaunch_2.0.10.bb index 01df39c9ce..ca8be52ebb 100644 --- a/recipes/keylaunch/keylaunch_2.0.10.bb +++ b/recipes/keylaunch/keylaunch_2.0.10.bb @@ -11,7 +11,7 @@ DESCRIPTION = "A small utility for binding commands to a hot key.\ computers. You can connect each key to a program of your choice; if the\ program is already running, keylaunch can bring its window to the front\ rather than just running another copy." -PR = "r14" +PR = "r15" SRC_URI += " file://makefile-fix.patch file://unbreak-keyevents.patch" diff --git a/recipes/knights/knights_1.14.bb b/recipes/knights/knights_1.14.bb index 119e80c3de..f1589f8cd8 100644 --- a/recipes/knights/knights_1.14.bb +++ b/recipes/knights/knights_1.14.bb @@ -5,7 +5,7 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "phalanx" RDEPENDS_${PN} = "phalanx" -PR = "r2" +PR = "r3" SRC_URI = "http://www.openzaurus.org/mirror/knights.tar.gz \ file://libqpe-opie.patch \ diff --git a/recipes/kxml2/kxml2_2.3.0.bb b/recipes/kxml2/kxml2_2.3.0.bb index 6d43597dcb..f35ced78ec 100644 --- a/recipes/kxml2/kxml2_2.3.0.bb +++ b/recipes/kxml2/kxml2_2.3.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://kxml.sourceforge.net" PRIORITY = "optional" SECTION = "libs" LICENSE = "BSD CPL LGPL" -PR = "r1" +PR = "r2" inherit java-library diff --git a/recipes/libelf/libelf_0.8.13.bb b/recipes/libelf/libelf_0.8.13.bb index 8d3a57149a..27fee38b45 100644 --- a/recipes/libelf/libelf_0.8.13.bb +++ b/recipes/libelf/libelf_0.8.13.bb @@ -2,7 +2,7 @@ DESCRIPTION = "libelf is an ELF object file access library. \ The elf library provides routines to access, and manipulate, Elf object files." LICENSE = "LGPL" SECTION = "libs" -PR = "r0" +PR = "r1" SRC_URI = "http://www.mr511.de/software/libelf-${PV}.tar.gz;name=archive \ " @@ -22,12 +22,13 @@ do_install () { oe_runmake 'prefix=${D}${prefix}' 'exec_prefix=${D}${exec_prefix}' \ 'libdir=${D}${libdir}' 'includedir=${D}${includedir}' \ install + install -d ${STAGING_INCDIR}/libelf for i in libelf.h nlist.h gelf.h sys_elf.h; do install -m 0644 lib/$i ${STAGING_INCDIR}/libelf/ done make includedir=${STAGING_INCDIR} install-compat } - +BBCLASSEXTEND = "native" # both SRC_URI items are the same file SRC_URI[archive.md5sum] = "4136d7b4c04df68b686570afa26988ac" SRC_URI[archive.sha256sum] = "591a9b4ec81c1f2042a97aa60564e0cb79d041c52faa7416acb38bc95bd2c76d" diff --git a/recipes/libgpepimc/libgpepimc-hildon_0.5.bb b/recipes/libgpepimc/libgpepimc-hildon_0.5.bb index 24c659e4b6..12155b9f0c 100644 --- a/recipes/libgpepimc/libgpepimc-hildon_0.5.bb +++ b/recipes/libgpepimc/libgpepimc-hildon_0.5.bb @@ -1,11 +1,11 @@ LICENSE = "LGPL" -PR = "r0" +PR = "r1" DESCRIPTION = "Common code for GPE PIMs (hildon UI version)" SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "libgpewidget-hildon gtk+ sqlite hildon-lgpl" PROVIDES = "libgepepimc" -RPROVIDES = "libgepepimc" +RPROVIDES_${PN} = "libgepepimc" SRC_URI = "${GPE_MIRROR}/libgpepimc-${PV}.tar.bz2" diff --git a/recipes/libgpepimc/libgpepimc.inc b/recipes/libgpepimc/libgpepimc.inc index 3f5a60b7f8..bec560b46d 100644 --- a/recipes/libgpepimc/libgpepimc.inc +++ b/recipes/libgpepimc/libgpepimc.inc @@ -1,11 +1,11 @@ LICENSE = "LGPL" -PR = "r1" +PR = "r2" DESCRIPTION = "Common code for GPE PIMs" SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "libgpewidget gtk+ sqlite" PROVIDES = "libgepepimc" -RPROVIDES = "libgepepimc" +RPROVIDES_${PN} = "libgepepimc" SRC_URI = "${GPE_MIRROR}/libgpepimc-${PV}.tar.bz2" diff --git a/recipes/libgpepimc/libgpepimc_svn.bb b/recipes/libgpepimc/libgpepimc_svn.bb index b195837ed3..cd169b465c 100644 --- a/recipes/libgpepimc/libgpepimc_svn.bb +++ b/recipes/libgpepimc/libgpepimc_svn.bb @@ -4,9 +4,9 @@ PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "libgpewidget gtk+ sqlite" PROVIDES = "libgepepimc" -RPROVIDES = "libgepepimc" +RPROVIDES_${PN} = "libgepepimc" PV = "0.8+svn${SRCDATE}" -PR = "r0" +PR = "r1" inherit pkgconfig autotools diff --git a/recipes/libgpewidget/libgpewidget-hildon_0.102.bb b/recipes/libgpewidget/libgpewidget-hildon_0.102.bb index fad3c5ec9c..0cb9dbb1a6 100644 --- a/recipes/libgpewidget/libgpewidget-hildon_0.102.bb +++ b/recipes/libgpewidget/libgpewidget-hildon_0.102.bb @@ -1,5 +1,5 @@ LICENSE = "LGPL" -PR = "r0" +PR = "r1" DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications." SECTION = "gpe/libs" PRIORITY = "optional" @@ -21,7 +21,7 @@ do_stage () { } RDEPENDS_${PN} = "sdk-default-icons" -RPROVIDES = "libgpewidget" +RPROVIDES_${PN} = "libgpewidget" SRC_URI[md5sum] = "9eb90850adf65ec0d0ff26833f7cb8c6" SRC_URI[sha256sum] = "ac25c961899ac71b0df93b517ac12b7b3c3083397abe9053a77f1e763e573822" diff --git a/recipes/libgpewidget/libgpewidget_0.115.bb b/recipes/libgpewidget/libgpewidget_0.115.bb index 877aa41297..0bca2ad5bf 100644 --- a/recipes/libgpewidget/libgpewidget_0.115.bb +++ b/recipes/libgpewidget/libgpewidget_0.115.bb @@ -2,7 +2,7 @@ DESCRIPTION = "libgpewidget contains a collection of widgets and other common co LICENSE = "LGPL" SECTION = "gpe/libs" DEPENDS = "gtk+ cairo libxinerama libxrender gtk-doc" -PR = "r2" +PR = "r3" GPE_TARBALL_SUFFIX = "bz2" diff --git a/recipes/links/links-x11_2.0+2.1pre30.bb b/recipes/links/links-x11_2.0+2.1pre30.bb index 02eae7729d..d83b10103e 100644 --- a/recipes/links/links-x11_2.0+2.1pre30.bb +++ b/recipes/links/links-x11_2.0+2.1pre30.bb @@ -1,8 +1,8 @@ require links.inc DEPENDS += "virtual/libx11" -RCONFLICTS = "links" -PR = "r1" +RCONFLICTS_${PN} = "links" +PR = "r2" SRC_URI += " file://links2.desktop \ http://www.xora.org.uk/oe/links2.png;name=icon" diff --git a/recipes/links/links_2.0+2.1pre30.bb b/recipes/links/links_2.0+2.1pre30.bb index 9b231112c8..470eac6139 100644 --- a/recipes/links/links_2.0+2.1pre30.bb +++ b/recipes/links/links_2.0+2.1pre30.bb @@ -1,8 +1,8 @@ require links.inc DEPENDS += "gpm" -RCONFLICTS = "links-x11" -PR = "r1" +RCONFLICTS_${PN} = "links-x11" +PR = "r2" EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \ --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \ diff --git a/recipes/linux-hotplug/linux-hotplug_20040920.bb b/recipes/linux-hotplug/linux-hotplug_20040920.bb index 15338e6fa8..653989268a 100644 --- a/recipes/linux-hotplug/linux-hotplug_20040920.bb +++ b/recipes/linux-hotplug/linux-hotplug_20040920.bb @@ -7,8 +7,8 @@ RPROVIDES_${PN} = "hotplug" RCONFLICTS_${PN} = "hotplug" RREPLACES_${PN} = "hotplug" SECTION = "base" -RSUGGESTS = "pciutils usbutils" -PR = "r9" +RSUGGESTS_${PN} = "pciutils usbutils" +PR = "r11" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/hotplug-2004_09_20.tar.gz \ file://dash.patch \ diff --git a/recipes/linux/linux-2.6.34/lite5200/defconfig b/recipes/linux/linux-2.6.34/lite5200/defconfig new file mode 100644 index 0000000000..3df4e10b0b --- /dev/null +++ b/recipes/linux/linux-2.6.34/lite5200/defconfig @@ -0,0 +1,1906 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.34 +# Fri Jun 11 17:04:14 2010 +# +# CONFIG_PPC64 is not set + +# +# Processor support +# +CONFIG_PPC_BOOK3S_32=y +# CONFIG_PPC_85xx is not set +# CONFIG_PPC_8xx is not set +# CONFIG_40x is not set +# CONFIG_44x is not set +# CONFIG_E200 is not set +CONFIG_PPC_BOOK3S=y +CONFIG_6xx=y +CONFIG_PPC_FPU=y +# CONFIG_ALTIVEC is not set +CONFIG_PPC_STD_MMU=y +CONFIG_PPC_STD_MMU_32=y +# CONFIG_PPC_MM_SLICES is not set +CONFIG_PPC_HAVE_PMU_SUPPORT=y +# CONFIG_SMP is not set +CONFIG_PPC32=y +CONFIG_WORD_SIZE=32 +# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set +CONFIG_MMU=y +CONFIG_GENERIC_CMOS_UPDATE=y +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_TIME_VSYSCALL=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set +# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set +CONFIG_IRQ_PER_CPU=y +CONFIG_NR_IRQS=512 +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_ARCH_HAS_ILOG2_U32=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_FIND_NEXT_BIT=y +CONFIG_GENERIC_GPIO=y +# CONFIG_ARCH_NO_VIRT_TO_BUS is not set +CONFIG_PPC=y +CONFIG_EARLY_PRINTK=y +CONFIG_GENERIC_NVRAM=y +CONFIG_SCHED_OMIT_FRAME_POINTER=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_PPC_OF=y +CONFIG_OF=y +# CONFIG_PPC_UDBG_16550 is not set +# CONFIG_GENERIC_TBSYNC is not set +CONFIG_AUDIT_ARCH=y +CONFIG_GENERIC_BUG=y +CONFIG_DTC=y +CONFIG_DEFAULT_UIMAGE=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +# CONFIG_PPC_DCR_NATIVE is not set +# CONFIG_PPC_DCR_MMIO is not set +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_CONSTRUCTORS=y + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_AUDIT is not set + +# +# RCU Subsystem +# +CONFIG_TREE_RCU=y +# CONFIG_TREE_PREEMPT_RCU is not set +# CONFIG_TINY_RCU is not set +# CONFIG_RCU_TRACE is not set +CONFIG_RCU_FANOUT=32 +# CONFIG_RCU_FANOUT_EXACT is not set +# CONFIG_TREE_RCU_TRACE is not set +# CONFIG_IKCONFIG is not set +CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_CGROUPS is not set +CONFIG_SYSFS_DEPRECATED=y +CONFIG_SYSFS_DEPRECATED_V2=y +# CONFIG_RELAY is not set +# CONFIG_NAMESPACES is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +# CONFIG_RD_BZIP2 is not set +# CONFIG_RD_LZMA is not set +# CONFIG_RD_LZO is not set +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +CONFIG_EMBEDDED=y +# CONFIG_SYSCTL_SYSCALL is not set +# CONFIG_KALLSYMS 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 is not set +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_HAVE_PERF_EVENTS=y + +# +# Kernel Performance Events And Counters +# +# CONFIG_PERF_EVENTS is not set +# CONFIG_PERF_COUNTERS is not set +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_PCI_QUIRKS=y +CONFIG_SLUB_DEBUG=y +CONFIG_COMPAT_BRK=y +# CONFIG_SLAB is not set +CONFIG_SLUB=y +# CONFIG_SLOB is not set +# CONFIG_PROFILING is not set +CONFIG_HAVE_OPROFILE=y +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_HAVE_IOREMAP_PROT=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_HAVE_CLK=y +CONFIG_HAVE_DMA_API_DEBUG=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +# CONFIG_SLOW_WORK is not set +# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_BLOCK=y +CONFIG_LBDAF=y +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_BLK_DEV_INTEGRITY is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" +# CONFIG_INLINE_SPIN_TRYLOCK is not set +# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK is not set +# CONFIG_INLINE_SPIN_LOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK_IRQ is not set +# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set +CONFIG_INLINE_SPIN_UNLOCK=y +# CONFIG_INLINE_SPIN_UNLOCK_BH is not set +CONFIG_INLINE_SPIN_UNLOCK_IRQ=y +# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_READ_TRYLOCK is not set +# CONFIG_INLINE_READ_LOCK is not set +# CONFIG_INLINE_READ_LOCK_BH is not set +# CONFIG_INLINE_READ_LOCK_IRQ is not set +# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set +CONFIG_INLINE_READ_UNLOCK=y +# CONFIG_INLINE_READ_UNLOCK_BH is not set +CONFIG_INLINE_READ_UNLOCK_IRQ=y +# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_WRITE_TRYLOCK is not set +# CONFIG_INLINE_WRITE_LOCK is not set +# CONFIG_INLINE_WRITE_LOCK_BH is not set +# CONFIG_INLINE_WRITE_LOCK_IRQ is not set +# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set +CONFIG_INLINE_WRITE_UNLOCK=y +# CONFIG_INLINE_WRITE_UNLOCK_BH is not set +CONFIG_INLINE_WRITE_UNLOCK_IRQ=y +# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set +# CONFIG_MUTEX_SPIN_ON_OWNER is not set +CONFIG_FREEZER=y + +# +# Platform support +# +# CONFIG_PPC_CHRP is not set +# CONFIG_MPC5121_ADS is not set +# CONFIG_MPC5121_GENERIC is not set +CONFIG_PPC_MPC52xx=y +# CONFIG_PPC_MPC5200_SIMPLE is not set +# CONFIG_PPC_EFIKA is not set +CONFIG_PPC_LITE5200=y +# CONFIG_PPC_MEDIA5200 is not set +# CONFIG_PPC_MPC5200_BUGFIX is not set +CONFIG_PPC_MPC5200_GPIO=y +CONFIG_PPC_MPC5200_LPBFIFO=y +# CONFIG_PPC_PMAC is not set +# CONFIG_PPC_CELL is not set +# CONFIG_PPC_CELL_NATIVE is not set +# CONFIG_PPC_82xx is not set +# CONFIG_PQ2ADS is not set +# CONFIG_PPC_83xx is not set +# CONFIG_PPC_86xx is not set +# CONFIG_EMBEDDED6xx is not set +# CONFIG_AMIGAONE is not set +CONFIG_PPC_OF_BOOT_TRAMPOLINE=y +# CONFIG_IPIC is not set +# CONFIG_MPIC is not set +# CONFIG_MPIC_WEIRD is not set +# CONFIG_PPC_I8259 is not set +# CONFIG_PPC_RTAS is not set +# CONFIG_MMIO_NVRAM is not set +# CONFIG_PPC_MPC106 is not set +# CONFIG_PPC_970_NAP is not set +# CONFIG_PPC_INDIRECT_IO is not set +# CONFIG_GENERIC_IOMAP is not set +# CONFIG_CPU_FREQ is not set +# CONFIG_TAU is not set +# CONFIG_FSL_ULI1575 is not set +CONFIG_PPC_BESTCOMM=y +CONFIG_PPC_BESTCOMM_ATA=y +CONFIG_PPC_BESTCOMM_FEC=y +CONFIG_PPC_BESTCOMM_GEN_BD=y +CONFIG_SIMPLE_GPIO=y + +# +# Kernel options +# +# CONFIG_HIGHMEM is not set +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +# CONFIG_HZ_100 is not set +CONFIG_HZ_250=y +# CONFIG_HZ_300 is not set +# CONFIG_HZ_1000 is not set +CONFIG_HZ=250 +CONFIG_SCHED_HRTICK=y +CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT is not set +CONFIG_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +# CONFIG_HAVE_AOUT is not set +# CONFIG_BINFMT_MISC is not set +# CONFIG_IOMMU_HELPER is not set +# CONFIG_SWIOTLB is not set +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y +CONFIG_ARCH_HAS_WALK_MEMORY=y +CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y +# CONFIG_KEXEC is not set +# CONFIG_CRASH_DUMP is not set +CONFIG_SPARSE_IRQ=y +CONFIG_MAX_ACTIVE_REGIONS=32 +CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_ARCH_POPULATES_NODE_MAP=y +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_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_MIGRATION=y +# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +# CONFIG_KSM is not set +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_PPC_4K_PAGES=y +# CONFIG_PPC_16K_PAGES is not set +# CONFIG_PPC_64K_PAGES is not set +# CONFIG_PPC_256K_PAGES is not set +CONFIG_FORCE_MAX_ZONEORDER=11 +CONFIG_PROC_DEVICETREE=y +# CONFIG_CMDLINE_BOOL is not set +CONFIG_EXTRA_TARGETS="" +CONFIG_PM=y +# CONFIG_PM_DEBUG is not set +CONFIG_PM_SLEEP=y +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +# CONFIG_HIBERNATION is not set +# CONFIG_PM_RUNTIME is not set +CONFIG_PM_OPS=y +CONFIG_SECCOMP=y +CONFIG_ISA_DMA_API=y + +# +# Bus options +# +CONFIG_ZONE_DMA=y +# CONFIG_NEED_DMA_MAP_STATE is not set +CONFIG_GENERIC_ISA_DMA=y +# CONFIG_PPC_INDIRECT_PCI is not set +CONFIG_PPC_PCI_CHOICE=y +CONFIG_PCI=y +CONFIG_PCI_DOMAINS=y +CONFIG_PCI_SYSCALL=y +# CONFIG_PCIEPORTBUS is not set +CONFIG_ARCH_SUPPORTS_MSI=y +# CONFIG_PCI_MSI is not set +# CONFIG_PCI_STUB is not set +# CONFIG_PCI_IOV is not set +# CONFIG_PCCARD is not set +# CONFIG_HOTPLUG_PCI is not set +# CONFIG_HAS_RAPIDIO is not set + +# +# Advanced setup +# +# CONFIG_ADVANCED_OPTIONS is not set + +# +# Default settings for advanced configuration options are used +# +CONFIG_LOWMEM_SIZE=0x30000000 +CONFIG_PAGE_OFFSET=0xc0000000 +CONFIG_KERNEL_START=0xc0000000 +CONFIG_PHYSICAL_START=0x00000000 +CONFIG_TASK_SIZE=0xc0000000 +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_XFRM=y +CONFIG_XFRM_USER=m +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS is not set +# 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=y +CONFIG_IP_PNP_BOOTP=y +# 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=y +# 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=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y +# CONFIG_INET_LRO is not set +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +# CONFIG_IPV6 is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETFILTER is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_RDS is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_NET_DSA 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 +# CONFIG_PHONET is not set +# CONFIG_IEEE802154 is not set +# CONFIG_NET_SCHED is not set +# CONFIG_DCB is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +CONFIG_CAN=y +CONFIG_CAN_RAW=m +CONFIG_CAN_BCM=m + +# +# CAN Device Drivers +# +# CONFIG_CAN_VCAN is not set +CONFIG_CAN_DEV=y +# CONFIG_CAN_CALC_BITTIMING is not set +# CONFIG_CAN_MCP251X is not set +CONFIG_CAN_MSCAN=y +CONFIG_CAN_MPC5XXX=y +# CONFIG_CAN_SJA1000 is not set + +# +# CAN USB interfaces +# +# CONFIG_CAN_EMS_USB is not set +# CONFIG_CAN_DEBUG_DEVICES is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set +CONFIG_WIRELESS=y +# CONFIG_CFG80211 is not set +# CONFIG_LIB80211 is not set + +# +# CFG80211 needs to be enabled for MAC80211 +# +# CONFIG_WIMAX is not set +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +# CONFIG_DEVTMPFS is not set +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +# CONFIG_FW_LOADER is not set +# CONFIG_SYS_HYPERVISOR is not set +# CONFIG_CONNECTOR is not set +CONFIG_MTD=m +CONFIG_MTD_DEBUG=y +CONFIG_MTD_DEBUG_VERBOSE=3 +# CONFIG_MTD_TESTS is not set +CONFIG_MTD_CONCAT=m +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_OF_PARTS=m +# CONFIG_MTD_AR7_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=m +CONFIG_MTD_BLKDEVS=m +CONFIG_MTD_BLOCK=m +# 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 +# CONFIG_MTD_OOPS is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=m +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_GEN_PROBE=m +# CONFIG_MTD_CFI_ADV_OPTIONS 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_CFI_INTELEXT is not set +CONFIG_MTD_CFI_AMDSTD=m +# CONFIG_MTD_CFI_STAA is not set +CONFIG_MTD_CFI_UTIL=m +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +CONFIG_MTD_PHYSMAP=m +# CONFIG_MTD_PHYSMAP_COMPAT is not set +CONFIG_MTD_PHYSMAP_OF=m +# CONFIG_MTD_INTEL_VR_NOR is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_PMC551 is not set +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_M25P80 is not set +# CONFIG_MTD_SST25L is not set +# 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 +# CONFIG_MTD_NAND is not set +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR flash memory drivers +# +# CONFIG_MTD_LPDDR is not set + +# +# UBI - Unsorted block images +# +# CONFIG_MTD_UBI is not set +CONFIG_OF_FLATTREE=y +CONFIG_OF_DYNAMIC=y +CONFIG_OF_DEVICE=y +CONFIG_OF_GPIO=y +CONFIG_OF_I2C=y +CONFIG_OF_SPI=y +CONFIG_OF_MDIO=y +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_FD is not set +# CONFIG_BLK_CPQ_DA is not set +# CONFIG_BLK_CPQ_CISS_DA is not set +# CONFIG_BLK_DEV_DAC960 is not set +# CONFIG_BLK_DEV_UMEM is not set +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set + +# +# DRBD disabled because PROC_FS, INET or CONNECTOR not selected +# +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_SX8 is not set +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=32768 +# CONFIG_BLK_DEV_XIP is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +# CONFIG_BLK_DEV_HD is not set +CONFIG_MISC_DEVICES=y +# CONFIG_AD525X_DPOT is not set +# CONFIG_PHANTOM is not set +# CONFIG_SGI_IOC4 is not set +# CONFIG_TIFM_CORE is not set +# CONFIG_ICS932S401 is not set +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_HP_ILO is not set +# CONFIG_ISL29003 is not set +# CONFIG_SENSORS_TSL2550 is not set +# CONFIG_DS1682 is not set +# CONFIG_TI_DAC7512 is not set +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +CONFIG_EEPROM_AT24=y +# CONFIG_EEPROM_AT25 is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EEPROM_MAX6875 is not set +# CONFIG_EEPROM_93CX6 is not set +# CONFIG_CB710_CORE is not set +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +CONFIG_SCSI_MOD=y +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=y +CONFIG_SCSI_DMA=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set +# CONFIG_SCSI_PROC_FS is not set + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +# CONFIG_BLK_DEV_SR is not set +# CONFIG_CHR_DEV_SG is not set +# CONFIG_CHR_DEV_SCH is not set +# CONFIG_SCSI_MULTI_LUN is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_WAIT_SCAN=m + +# +# SCSI Transports +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set +# CONFIG_SCSI_SRP_ATTRS is not set +CONFIG_SCSI_LOWLEVEL=y +# CONFIG_ISCSI_TCP is not set +# CONFIG_SCSI_CXGB3_ISCSI is not set +# CONFIG_SCSI_BNX2_ISCSI is not set +# CONFIG_BE2ISCSI is not set +# CONFIG_BLK_DEV_3W_XXXX_RAID is not set +# CONFIG_SCSI_HPSA is not set +# CONFIG_SCSI_3W_9XXX is not set +# CONFIG_SCSI_3W_SAS is not set +# CONFIG_SCSI_ACARD is not set +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC7XXX_OLD is not set +# CONFIG_SCSI_AIC79XX is not set +# CONFIG_SCSI_AIC94XX is not set +# CONFIG_SCSI_MVSAS is not set +# CONFIG_SCSI_DPT_I2O is not set +# CONFIG_SCSI_ADVANSYS is not set +# CONFIG_SCSI_ARCMSR is not set +# CONFIG_MEGARAID_NEWGEN is not set +# CONFIG_MEGARAID_LEGACY is not set +# CONFIG_MEGARAID_SAS is not set +# CONFIG_SCSI_MPT2SAS is not set +# CONFIG_SCSI_HPTIOP is not set +# CONFIG_SCSI_BUSLOGIC is not set +# CONFIG_LIBFC is not set +# CONFIG_LIBFCOE is not set +# CONFIG_FCOE is not set +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_EATA is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +# CONFIG_SCSI_GDTH is not set +# CONFIG_SCSI_IPS is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_STEX is not set +# CONFIG_SCSI_SYM53C8XX_2 is not set +# CONFIG_SCSI_IPR is not set +# CONFIG_SCSI_QLOGIC_1280 is not set +# CONFIG_SCSI_QLA_FC is not set +# CONFIG_SCSI_QLA_ISCSI is not set +# CONFIG_SCSI_LPFC is not set +# CONFIG_SCSI_DC395x is not set +# CONFIG_SCSI_DC390T is not set +# CONFIG_SCSI_NSP32 is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_PMCRAID is not set +# CONFIG_SCSI_PM8001 is not set +# CONFIG_SCSI_SRP is not set +# CONFIG_SCSI_BFA_FC is not set +# CONFIG_SCSI_DH is not set +# CONFIG_SCSI_OSD_INITIATOR is not set +CONFIG_ATA=y +# CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_VERBOSE_ERROR=y +CONFIG_SATA_PMP=y +# CONFIG_SATA_AHCI is not set +# CONFIG_SATA_SIL24 is not set +CONFIG_ATA_SFF=y +# CONFIG_SATA_SVW is not set +# CONFIG_ATA_PIIX is not set +# CONFIG_SATA_MV is not set +# CONFIG_SATA_NV is not set +# CONFIG_PDC_ADMA is not set +# CONFIG_SATA_QSTOR is not set +# CONFIG_SATA_PROMISE is not set +# CONFIG_SATA_SX4 is not set +# CONFIG_SATA_SIL is not set +# CONFIG_SATA_SIS is not set +# CONFIG_SATA_ULI is not set +# CONFIG_SATA_VIA is not set +# CONFIG_SATA_VITESSE is not set +# CONFIG_SATA_INIC162X is not set +# CONFIG_PATA_ALI is not set +# CONFIG_PATA_AMD is not set +# CONFIG_PATA_ARTOP is not set +# CONFIG_PATA_ATP867X is not set +# CONFIG_PATA_ATIIXP is not set +# CONFIG_PATA_CMD640_PCI is not set +# CONFIG_PATA_CMD64X is not set +# CONFIG_PATA_CS5520 is not set +# CONFIG_PATA_CS5530 is not set +# CONFIG_PATA_CYPRESS is not set +# CONFIG_PATA_EFAR is not set +# CONFIG_ATA_GENERIC is not set +# CONFIG_PATA_HPT366 is not set +# CONFIG_PATA_HPT37X is not set +# CONFIG_PATA_HPT3X2N is not set +# CONFIG_PATA_HPT3X3 is not set +# CONFIG_PATA_IT821X is not set +# CONFIG_PATA_IT8213 is not set +# CONFIG_PATA_JMICRON is not set +# CONFIG_PATA_LEGACY is not set +# CONFIG_PATA_TRIFLEX is not set +# CONFIG_PATA_MARVELL is not set +CONFIG_PATA_MPC52xx=y +# CONFIG_PATA_MPIIX is not set +# CONFIG_PATA_OLDPIIX is not set +# CONFIG_PATA_NETCELL is not set +# CONFIG_PATA_NINJA32 is not set +# CONFIG_PATA_NS87410 is not set +# CONFIG_PATA_NS87415 is not set +# CONFIG_PATA_OPTI is not set +# CONFIG_PATA_OPTIDMA is not set +# CONFIG_PATA_PDC2027X is not set +# CONFIG_PATA_PDC_OLD is not set +# CONFIG_PATA_RADISYS is not set +# CONFIG_PATA_RDC is not set +# CONFIG_PATA_RZ1000 is not set +# CONFIG_PATA_SC1200 is not set +# CONFIG_PATA_SERVERWORKS is not set +# CONFIG_PATA_SIL680 is not set +# CONFIG_PATA_SIS is not set +# CONFIG_PATA_TOSHIBA is not set +# CONFIG_PATA_VIA is not set +# CONFIG_PATA_WINBOND is not set +# CONFIG_PATA_PLATFORM is not set +# CONFIG_PATA_SCH is not set +# CONFIG_MD is not set +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# You can enable one or both FireWire driver stacks. +# + +# +# The newer stack is recommended. +# +# CONFIG_FIREWIRE is not set +# CONFIG_IEEE1394 is not set +# CONFIG_I2O is not set +# CONFIG_MACINTOSH_DRIVERS is not set +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set +# CONFIG_VETH is not set +# CONFIG_ARCNET is not set +CONFIG_PHYLIB=y + +# +# MII PHY device drivers +# +# CONFIG_MARVELL_PHY is not set +# CONFIG_DAVICOM_PHY is not set +# CONFIG_QSEMI_PHY is not set +CONFIG_LXT_PHY=y +# CONFIG_CICADA_PHY is not set +# CONFIG_VITESSE_PHY is not set +# CONFIG_SMSC_PHY is not set +# CONFIG_BROADCOM_PHY is not set +# CONFIG_ICPLUS_PHY is not set +# CONFIG_REALTEK_PHY is not set +# CONFIG_NATIONAL_PHY is not set +# CONFIG_STE10XP is not set +# CONFIG_LSI_ET1011C_PHY is not set +# CONFIG_MICREL_PHY is not set +# CONFIG_FIXED_PHY is not set +# CONFIG_MDIO_BITBANG is not set +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +# CONFIG_HAPPYMEAL is not set +# CONFIG_SUNGEM is not set +# CONFIG_CASSINI is not set +# CONFIG_NET_VENDOR_3COM is not set +# CONFIG_ENC28J60 is not set +# CONFIG_ETHOC is not set +# CONFIG_DNET is not set +# CONFIG_NET_TULIP is not set +# CONFIG_HP100 is not set +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set +# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set +# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set +# CONFIG_NET_PCI is not set +# CONFIG_B44 is not set +# CONFIG_KS8842 is not set +# CONFIG_KS8851 is not set +# CONFIG_KS8851_MLL is not set +CONFIG_FEC_MPC52xx=y +CONFIG_FEC_MPC52xx_MDIO=y +# CONFIG_ATL2 is not set +# CONFIG_XILINX_EMACLITE is not set +CONFIG_NETDEV_1000=y +# CONFIG_ACENIC is not set +# CONFIG_DL2K is not set +# CONFIG_E1000 is not set +# CONFIG_E1000E is not set +# CONFIG_IP1000 is not set +# CONFIG_IGB is not set +# CONFIG_IGBVF is not set +# CONFIG_NS83820 is not set +# CONFIG_HAMACHI is not set +# CONFIG_YELLOWFIN is not set +# CONFIG_R8169 is not set +# CONFIG_SIS190 is not set +# CONFIG_SKGE is not set +# CONFIG_SKY2 is not set +# CONFIG_VIA_VELOCITY is not set +# CONFIG_TIGON3 is not set +# CONFIG_BNX2 is not set +# CONFIG_CNIC is not set +# CONFIG_MV643XX_ETH is not set +# CONFIG_QLA3XXX is not set +# CONFIG_ATL1 is not set +# CONFIG_ATL1E is not set +# CONFIG_ATL1C is not set +# CONFIG_JME is not set +CONFIG_NETDEV_10000=y +# CONFIG_CHELSIO_T1 is not set +CONFIG_CHELSIO_T3_DEPENDS=y +# CONFIG_CHELSIO_T3 is not set +CONFIG_CHELSIO_T4_DEPENDS=y +# CONFIG_CHELSIO_T4 is not set +# CONFIG_ENIC is not set +# CONFIG_IXGBE is not set +# CONFIG_IXGB is not set +# CONFIG_S2IO is not set +# CONFIG_VXGE is not set +# CONFIG_MYRI10GE is not set +# CONFIG_NETXEN_NIC is not set +# CONFIG_NIU is not set +# CONFIG_MLX4_EN is not set +# CONFIG_MLX4_CORE is not set +# CONFIG_TEHUTI is not set +# CONFIG_BNX2X is not set +# CONFIG_QLCNIC is not set +# CONFIG_QLGE is not set +# CONFIG_SFC is not set +# CONFIG_BE2NET is not set +# CONFIG_TR is not set +CONFIG_WLAN=y +# CONFIG_AIRO is not set +# CONFIG_ATMEL is not set +# CONFIG_PRISM54 is not set +# CONFIG_USB_ZD1201 is not set +# CONFIG_HOSTAP is not set + +# +# Enable WiMAX (Networking options) to see the WiMAX drivers +# + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +CONFIG_USB_USBNET=y +CONFIG_USB_NET_AX8817X=y +CONFIG_USB_NET_CDCETHER=y +# CONFIG_USB_NET_CDC_EEM is not set +# CONFIG_USB_NET_DM9601 is not set +# CONFIG_USB_NET_SMSC75XX is not set +# CONFIG_USB_NET_SMSC95XX is not set +# CONFIG_USB_NET_GL620A is not set +CONFIG_USB_NET_NET1080=y +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_MCS7830 is not set +# CONFIG_USB_NET_RNDIS_HOST is not set +CONFIG_USB_NET_CDC_SUBSET=y +# CONFIG_USB_ALI_M5632 is not set +# CONFIG_USB_AN2720 is not set +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +# CONFIG_USB_EPSON2888 is not set +# CONFIG_USB_KC2190 is not set +CONFIG_USB_NET_ZAURUS=y +# CONFIG_USB_NET_INT51X1 is not set +# CONFIG_USB_IPHETH is not set +# CONFIG_USB_SIERRA_NET is not set +# CONFIG_WAN is not set +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +# CONFIG_PPP is not set +# CONFIG_SLIP is not set +# CONFIG_NET_FC is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set +# CONFIG_VMXNET3 is not set +# CONFIG_ISDN is not set +# CONFIG_PHONE is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_POLLDEV is not set +# CONFIG_INPUT_SPARSEKMAP is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ADP5588 is not set +# CONFIG_KEYBOARD_ATKBD is not set +# CONFIG_QT2160 is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_GPIO is not set +# CONFIG_KEYBOARD_MATRIX is not set +# CONFIG_KEYBOARD_MAX7359 is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_OPENCORES is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +CONFIG_INPUT_MOUSE=y +# CONFIG_MOUSE_PS2 is not set +# CONFIG_MOUSE_SERIAL is not set +# CONFIG_MOUSE_APPLETOUCH is not set +# CONFIG_MOUSE_BCM5974 is not set +# CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_MOUSE_GPIO is not set +# CONFIG_MOUSE_SYNAPTICS_I2C is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +CONFIG_VT_HW_CONSOLE_BINDING=y +CONFIG_DEVKMEM=y +# CONFIG_SERIAL_NONSTANDARD is not set +# CONFIG_NOZOMI is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +# CONFIG_SERIAL_MAX3100 is not set +# CONFIG_SERIAL_UARTLITE is not set +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_MPC52xx=y +CONFIG_SERIAL_MPC52xx_CONSOLE=y +CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 +# CONFIG_SERIAL_JSM is not set +# CONFIG_SERIAL_TIMBERDALE is not set +# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set +CONFIG_UNIX98_PTYS=y +# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 +# CONFIG_HVC_UDBG is not set +# CONFIG_IPMI_HANDLER is not set +# CONFIG_HW_RANDOM is not set +# CONFIG_NVRAM is not set +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_TCG_TPM is not set +CONFIG_DEVPORT=y +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_ALGOBIT=m + +# +# I2C Hardware Bus support +# + +# +# PC SMBus host controller drivers +# +# CONFIG_I2C_ALI1535 is not set +# CONFIG_I2C_ALI1563 is not set +# CONFIG_I2C_ALI15X3 is not set +# CONFIG_I2C_AMD756 is not set +# CONFIG_I2C_AMD8111 is not set +# CONFIG_I2C_I801 is not set +# CONFIG_I2C_ISCH is not set +# CONFIG_I2C_PIIX4 is not set +# CONFIG_I2C_NFORCE2 is not set +# CONFIG_I2C_SIS5595 is not set +# CONFIG_I2C_SIS630 is not set +# CONFIG_I2C_SIS96X is not set +# CONFIG_I2C_VIA is not set +# CONFIG_I2C_VIAPRO is not set + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +# CONFIG_I2C_DESIGNWARE is not set +# CONFIG_I2C_GPIO is not set +CONFIG_I2C_MPC=y +# CONFIG_I2C_OCORES is not set +# CONFIG_I2C_SIMTEC is not set +# CONFIG_I2C_XILINX is not set + +# +# External I2C/SMBus adapter drivers +# +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_TAOS_EVM is not set +# CONFIG_I2C_TINY_USB is not set + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_PCA_PLATFORM is not set +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +CONFIG_SPI=y +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_BITBANG is not set +# CONFIG_SPI_GPIO is not set +CONFIG_SPI_MPC52xx=y +# CONFIG_SPI_MPC52xx_PSC is not set +# CONFIG_SPI_XILINX is not set +# CONFIG_SPI_DESIGNWARE is not set + +# +# SPI Protocol Masters +# +# CONFIG_SPI_SPIDEV is not set +# CONFIG_SPI_TLE62X0 is not set + +# +# PPS support +# +# CONFIG_PPS is not set +CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_GPIOLIB=y +# CONFIG_GPIO_SYSFS is not set + +# +# Memory mapped GPIO expanders: +# +# CONFIG_GPIO_IT8761E is not set +# CONFIG_GPIO_XILINX is not set +# CONFIG_GPIO_SCH is not set + +# +# I2C GPIO expanders: +# +# CONFIG_GPIO_MAX7300 is not set +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCA953X is not set +# CONFIG_GPIO_PCF857X is not set +# CONFIG_GPIO_ADP5588 is not set + +# +# PCI GPIO expanders: +# +# CONFIG_GPIO_CS5535 is not set +# CONFIG_GPIO_BT8XX is not set +# CONFIG_GPIO_LANGWELL is not set + +# +# SPI GPIO expanders: +# +# CONFIG_GPIO_MAX7301 is not set +# CONFIG_GPIO_MCP23S08 is not set +# CONFIG_GPIO_MC33880 is not set + +# +# AC97 GPIO expanders: +# +# CONFIG_W1 is not set +# CONFIG_POWER_SUPPLY is not set +# CONFIG_HWMON is not set +# CONFIG_THERMAL is not set +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +# CONFIG_SOFT_WATCHDOG is not set +# CONFIG_ALIM7101_WDT is not set +CONFIG_MPC5200_WDT=y + +# +# PCI-based Watchdog Cards +# +# CONFIG_PCIPCWATCHDOG is not set +# CONFIG_WDTPCI is not set + +# +# USB-based Watchdog Cards +# +# CONFIG_USBPCWATCHDOG is not set +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +# CONFIG_SSB is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_CORE is not set +# CONFIG_MFD_88PM860X is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_HTC_I2CPLD is not set +# CONFIG_TPS65010 is not set +# CONFIG_TWL4030_CORE is not set +# CONFIG_MFD_TMIO is not set +# CONFIG_PMIC_DA903X is not set +# CONFIG_PMIC_ADP5520 is not set +# CONFIG_MFD_MAX8925 is not set +# CONFIG_MFD_WM8400 is not set +# CONFIG_MFD_WM831X is not set +# CONFIG_MFD_WM8350_I2C is not set +# CONFIG_MFD_WM8994 is not set +# CONFIG_MFD_PCF50633 is not set +# CONFIG_MFD_MC13783 is not set +# CONFIG_AB3100_CORE is not set +# CONFIG_EZX_PCAP is not set +# CONFIG_AB4500_CORE is not set +# CONFIG_MFD_TIMBERDALE is not set +# CONFIG_LPC_SCH is not set +# CONFIG_REGULATOR is not set +# CONFIG_MEDIA_SUPPORT is not set + +# +# Graphics support +# +# CONFIG_AGP is not set +# CONFIG_VGA_ARB is not set +CONFIG_DRM=m +# CONFIG_DRM_TDFX is not set +# CONFIG_DRM_R128 is not set +# CONFIG_DRM_RADEON is not set +# CONFIG_DRM_MGA is not set +# CONFIG_DRM_VIA is not set +# CONFIG_DRM_SAVAGE is not set +# CONFIG_VGASTATE is not set +CONFIG_VIDEO_OUTPUT_CONTROL=m +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB_DDC is not set +# CONFIG_FB_BOOT_VESA_SUPPORT is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +CONFIG_FB_FOREIGN_ENDIAN=y +# CONFIG_FB_BOTH_ENDIAN is not set +# CONFIG_FB_BIG_ENDIAN is not set +CONFIG_FB_LITTLE_ENDIAN=y +# CONFIG_FB_SYS_FOPS is not set +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_OF is not set +# CONFIG_FB_CT65550 is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +# CONFIG_FB_VGA16 is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set +# CONFIG_FB_MATROX is not set +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set +# CONFIG_FB_S3 is not set +# CONFIG_FB_SAVAGE is not set +# CONFIG_FB_SIS is not set +# CONFIG_FB_VIA is not set +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set +# CONFIG_FB_VOODOO1 is not set +# CONFIG_FB_VT8623 is not set +# CONFIG_FB_TRIDENT is not set +# CONFIG_FB_ARK is not set +# CONFIG_FB_PM3 is not set +# CONFIG_FB_CARMINE is not set +# CONFIG_FB_IBM_GXT4500 is not set +# CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_METRONOME is not set +CONFIG_FB_MB862XX=y +CONFIG_FB_MB862XX_PCI_GDC=y +# CONFIG_FB_BROADSHEET is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set + +# +# Display device support +# +# CONFIG_DISPLAY_SUPPORT is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +CONFIG_LOGO=y +CONFIG_LOGO_LINUX_MONO=y +CONFIG_LOGO_LINUX_VGA16=y +CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_SOUND is not set +CONFIG_HID_SUPPORT=y +CONFIG_HID=y +# CONFIG_HIDRAW is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=y +# CONFIG_HID_PID is not set +# CONFIG_USB_HIDDEV is not set + +# +# Special HID drivers +# +# CONFIG_HID_3M_PCT is not set +# CONFIG_HID_A4TECH is not set +# CONFIG_HID_APPLE is not set +# CONFIG_HID_BELKIN is not set +# CONFIG_HID_CHERRY is not set +# CONFIG_HID_CHICONY is not set +# CONFIG_HID_CYPRESS is not set +# CONFIG_HID_DRAGONRISE is not set +# CONFIG_HID_EZKEY is not set +# CONFIG_HID_KYE is not set +# CONFIG_HID_GYRATION is not set +# CONFIG_HID_TWINHAN is not set +# CONFIG_HID_KENSINGTON is not set +# CONFIG_HID_LOGITECH is not set +# CONFIG_HID_MICROSOFT is not set +# CONFIG_HID_MOSART is not set +# CONFIG_HID_MONTEREY is not set +# CONFIG_HID_NTRIG is not set +# CONFIG_HID_ORTEK is not set +# CONFIG_HID_PANTHERLORD is not set +# CONFIG_HID_PETALYNX is not set +# CONFIG_HID_QUANTA is not set +# CONFIG_HID_SAMSUNG is not set +# CONFIG_HID_SONY is not set +# CONFIG_HID_STANTUM is not set +# CONFIG_HID_SUNPLUS is not set +# CONFIG_HID_GREENASIA is not set +# CONFIG_HID_SMARTJOYPLUS is not set +# CONFIG_HID_TOPSEED is not set +# CONFIG_HID_THRUSTMASTER is not set +# CONFIG_HID_ZEROPLUS is not set +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y + +# +# Miscellaneous USB options +# +# CONFIG_USB_DEVICEFS is not set +# CONFIG_USB_DEVICE_CLASS is not set +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set +CONFIG_USB_MON=m +# CONFIG_USB_WUSB is not set +# CONFIG_USB_WUSB_CBAF is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_C67X00_HCD is not set +# CONFIG_USB_XHCI_HCD is not set +# CONFIG_USB_EHCI_HCD is not set +# CONFIG_USB_OXU210HP_HCD is not set +# CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_ISP1760_HCD is not set +# CONFIG_USB_ISP1362_HCD is not set +CONFIG_USB_OHCI_HCD=y +# CONFIG_USB_OHCI_HCD_PPC_SOC is not set +CONFIG_USB_OHCI_HCD_PPC_OF_BE=y +# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set +CONFIG_USB_OHCI_HCD_PPC_OF=y +CONFIG_USB_OHCI_HCD_PCI=y +CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y +CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +# CONFIG_USB_UHCI_HCD is not set +# CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set +# CONFIG_USB_WHCI_HCD is not set +# CONFIG_USB_HWA_HCD is not set + +# +# USB Device Class drivers +# +# CONFIG_USB_ACM is not set +# CONFIG_USB_PRINTER is not set +# CONFIG_USB_WDM is not set +# CONFIG_USB_TMC is not set + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +CONFIG_USB_STORAGE=y +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_STORAGE_ONETOUCH is not set +# CONFIG_USB_STORAGE_KARMA is not set +# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set + +# +# USB port drivers +# +# CONFIG_USB_SERIAL is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_SEVSEG is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set +# CONFIG_USB_TEST is not set +# CONFIG_USB_ISIGHTFW is not set +# CONFIG_USB_GADGET is not set + +# +# OTG and related infrastructure +# +# CONFIG_USB_GPIO_VBUS is not set +# CONFIG_NOP_USB_XCEIV is not set +# CONFIG_UWB is not set +# CONFIG_MMC is not set +# CONFIG_MEMSTICK is not set +# CONFIG_NEW_LEDS is not set +# CONFIG_ACCESSIBILITY is not set +# CONFIG_INFINIBAND is not set +# CONFIG_EDAC is not set +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# +# CONFIG_RTC_DRV_DS1307 is not set +# CONFIG_RTC_DRV_DS1374 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_MAX6900 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_PCF8583 is not set +# CONFIG_RTC_DRV_M41T80 is not set +# CONFIG_RTC_DRV_BQ32K is not set +# CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_FM3130 is not set +# CONFIG_RTC_DRV_RX8581 is not set +# CONFIG_RTC_DRV_RX8025 is not set + +# +# SPI RTC drivers +# +# CONFIG_RTC_DRV_M41T94 is not set +# CONFIG_RTC_DRV_DS1305 is not set +# CONFIG_RTC_DRV_DS1390 is not set +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_R9701 is not set +# CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_DS3234 is not set +# CONFIG_RTC_DRV_PCF2123 is not set + +# +# Platform RTC drivers +# +# CONFIG_RTC_DRV_CMOS is not set +# CONFIG_RTC_DRV_DS1286 is not set +# CONFIG_RTC_DRV_DS1511 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T35 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_MSM6242 is not set +# CONFIG_RTC_DRV_BQ4802 is not set +# CONFIG_RTC_DRV_RP5C01 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# on-CPU RTC drivers +# +# CONFIG_RTC_DRV_GENERIC is not set +# CONFIG_DMADEVICES is not set +# CONFIG_AUXDISPLAY is not set +# CONFIG_UIO is not set + +# +# TI VLYNQ +# +# CONFIG_STAGING is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set +# CONFIG_EXT4_FS is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_BTRFS_FS is not set +# CONFIG_NILFS2_FS is not set +CONFIG_FILE_LOCKING=y +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_QUOTA is not set +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set + +# +# Caches +# +# CONFIG_FSCACHE is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +# CONFIG_MSDOS_FS is not set +# CONFIG_VFAT_FS is not set +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_KCORE=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLB_PAGE is not set +# CONFIG_CONFIGFS_FS is not set +CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# 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_LOGFS is not set +# CONFIG_CRAMFS is not set +# CONFIG_SQUASHFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_OMFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_ROMFS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +CONFIG_NFS_V4=y +# CONFIG_NFS_V4_1 is not set +CONFIG_ROOT_NFS=y +# CONFIG_NFSD is not set +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +CONFIG_RPCSEC_GSS_KRB5=y +# CONFIG_RPCSEC_GSS_SPKM3 is not set +# CONFIG_SMB_FS is not set +# CONFIG_CEPH_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +# CONFIG_NLS_CODEPAGE_437 is not set +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +# CONFIG_NLS_ISO8859_1 is not set +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +# CONFIG_NLS_UTF8 is not set +# CONFIG_DLM is not set +# CONFIG_BINARY_PRINTF is not set + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_GENERIC_FIND_LAST_BIT=y +# CONFIG_CRC_CCITT is not set +# CONFIG_CRC16 is not set +# CONFIG_CRC_T10DIF is not set +# CONFIG_CRC_ITU_T is not set +CONFIG_CRC32=y +# CONFIG_CRC7 is not set +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_DECOMPRESS_GZIP=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_HAVE_LMB=y +CONFIG_NLATTR=y +CONFIG_GENERIC_ATOMIC64=y + +# +# Kernel hacking +# +CONFIG_PRINTK_TIME=y +CONFIG_ENABLE_WARN_DEPRECATED=y +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_FRAME_WARN=1024 +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_STRIP_ASM_SYMS is not set +# CONFIG_UNUSED_SYMBOLS is not set +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_KERNEL is not set +# CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_SLUB_STATS is not set +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_MEMORY_INIT is not set +# CONFIG_RCU_CPU_STALL_DETECTOR is not set +# CONFIG_LKDTM is not set +# CONFIG_LATENCYTOP is not set +# CONFIG_SYSCTL_SYSCALL_CHECK is not set +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_TRACING_SUPPORT=y +CONFIG_FTRACE=y +# CONFIG_FUNCTION_TRACER is not set +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_SCHED_TRACER is not set +# CONFIG_ENABLE_DEFAULT_TRACERS is not set +# CONFIG_BOOT_TRACER is not set +CONFIG_BRANCH_PROFILE_NONE=y +# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set +# CONFIG_PROFILE_ALL_BRANCHES is not set +# CONFIG_STACK_TRACER is not set +# CONFIG_KMEMTRACE is not set +# CONFIG_WORKQUEUE_TRACER is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_DYNAMIC_DEBUG is not set +# CONFIG_DMA_API_DEBUG is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_PPC_DISABLE_WERROR is not set +CONFIG_PPC_WERROR=y +CONFIG_PRINT_STACK_DEPTH=64 +CONFIG_PPC_EMULATED_STATS=y +# CONFIG_IRQSTACKS is not set +CONFIG_VIRQ_DEBUG=y +# CONFIG_BOOTX_TEXT is not set +CONFIG_PPC_EARLY_DEBUG=y +# CONFIG_PPC_EARLY_DEBUG_LPAR is not set +# CONFIG_PPC_EARLY_DEBUG_G5 is not set +# CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL is not set +# CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set +# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set +# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set +# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set +# CONFIG_PPC_EARLY_DEBUG_BEAT is not set +# CONFIG_PPC_EARLY_DEBUG_44x is not set +# CONFIG_PPC_EARLY_DEBUG_40x is not set +# CONFIG_PPC_EARLY_DEBUG_CPM is not set +# CONFIG_PPC_EARLY_DEBUG_USBGECKO is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set +# CONFIG_SECURITYFS is not set +# CONFIG_DEFAULT_SECURITY_SELINUX is not set +# CONFIG_DEFAULT_SECURITY_SMACK is not set +# CONFIG_DEFAULT_SECURITY_TOMOYO is not set +CONFIG_DEFAULT_SECURITY_DAC=y +CONFIG_DEFAULT_SECURITY="" +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_PCOMP=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +# CONFIG_CRYPTO_GF128MUL is not set +# CONFIG_CRYPTO_NULL is not set +CONFIG_CRYPTO_WORKQUEUE=y +# CONFIG_CRYPTO_CRYPTD is not set +# CONFIG_CRYPTO_AUTHENC is not set +# CONFIG_CRYPTO_TEST is not set + +# +# Authenticated Encryption with Associated Data +# +# CONFIG_CRYPTO_CCM is not set +# CONFIG_CRYPTO_GCM is not set +# CONFIG_CRYPTO_SEQIV is not set + +# +# Block modes +# +CONFIG_CRYPTO_CBC=y +# CONFIG_CRYPTO_CTR is not set +# CONFIG_CRYPTO_CTS is not set +# CONFIG_CRYPTO_ECB is not set +# CONFIG_CRYPTO_LRW is not set +# CONFIG_CRYPTO_PCBC is not set +# CONFIG_CRYPTO_XTS is not set + +# +# Hash modes +# +# CONFIG_CRYPTO_HMAC is not set +# CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_VMAC is not set + +# +# Digest +# +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_GHASH is not set +# CONFIG_CRYPTO_MD4 is not set +CONFIG_CRYPTO_MD5=y +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_RMD128 is not set +# CONFIG_CRYPTO_RMD160 is not set +# CONFIG_CRYPTO_RMD256 is not set +# CONFIG_CRYPTO_RMD320 is not set +# CONFIG_CRYPTO_SHA1 is not set +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_WP512 is not set + +# +# Ciphers +# +# CONFIG_CRYPTO_AES is not set +# CONFIG_CRYPTO_ANUBIS is not set +# CONFIG_CRYPTO_ARC4 is not set +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +CONFIG_CRYPTO_DES=y +# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_SALSA20 is not set +# CONFIG_CRYPTO_SEED is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_TEA is not set +# CONFIG_CRYPTO_TWOFISH is not set + +# +# Compression +# +# CONFIG_CRYPTO_DEFLATE is not set +# CONFIG_CRYPTO_ZLIB is not set +# CONFIG_CRYPTO_LZO is not set + +# +# Random Number Generation +# +# CONFIG_CRYPTO_ANSI_CPRNG is not set +CONFIG_CRYPTO_HW=y +# CONFIG_CRYPTO_DEV_HIFN_795X is not set +CONFIG_PPC_CLOCK=y +CONFIG_PPC_LIB_RHEAP=y +# CONFIG_VIRTUALIZATION is not set diff --git a/recipes/linux/linux-leviathan_git.bb b/recipes/linux/linux-leviathan_git.bb index 7ee49a6b56..bc8a477410 100644 --- a/recipes/linux/linux-leviathan_git.bb +++ b/recipes/linux/linux-leviathan_git.bb @@ -2,7 +2,7 @@ require linux.inc DEPENDS += "android-image-utils-native" PV = "2.6.32+${PR}+gitr${SRCREV}" -PR = "r17" +PR = "r18" COMPATIBLE_MACHINE = "htcdream" CMDLINE = "console=tty1 root=/dev/mmcblk0p1 rootdelay=8 fbcon=rotate:1 panic=30 mem=110M" @@ -18,8 +18,9 @@ S = "${WORKDIR}/git" do_deploy_append() { touch -f empty + gzip empty mkbootimg --kernel ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin \ - --ramdisk empty \ + --ramdisk empty.gz \ --cmdline "${CMDLINE}" \ --output ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.fastboot } diff --git a/recipes/linux/linux-mtx-1_2.4.27.bb b/recipes/linux/linux-mtx-1_2.4.27.bb index d43fa74ffc..a20099f6ba 100644 --- a/recipes/linux/linux-mtx-1_2.4.27.bb +++ b/recipes/linux/linux-mtx-1_2.4.27.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Linux kernel for MTX-1 (MeshCube)" HOMEPAGE = "http://meshcube.org/meshwiki/" LICENSE = "GPLv2" KV = "${PV}" -PR = "r11" +PR = "r12" inherit module-base kernel PROVIDES = "virtual/kernel" diff --git a/recipes/linux/linux-mtx-2_2.4.27.bb b/recipes/linux/linux-mtx-2_2.4.27.bb index e919577db6..fb4c1041ae 100644 --- a/recipes/linux/linux-mtx-2_2.4.27.bb +++ b/recipes/linux/linux-mtx-2_2.4.27.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Linux kernel for MTX-2 (Surfbox2)" HOMEPAGE = "http://meshcube.org/meshwiki/" LICENSE = "GPLv2" KV = "${PV}" -PR = "r11" +PR = "r12" inherit module-base kernel PROVIDES = "virtual/kernel" diff --git a/recipes/linux/linux-mtx-3_2.6.15.4.bb b/recipes/linux/linux-mtx-3_2.6.15.4.bb index 1f831f4565..25ed27ed33 100644 --- a/recipes/linux/linux-mtx-3_2.6.15.4.bb +++ b/recipes/linux/linux-mtx-3_2.6.15.4.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Linux kernel for MTX-3 (Surfbox3)" HOMEPAGE = "http://meshcube.org/meshwiki/" LICENSE = "GPLv2" KV = "${PV}" -PR = "r11" +PR = "r12" inherit kernel # therefore diff --git a/recipes/linux/linux-mtx-3_2.6.15.bb b/recipes/linux/linux-mtx-3_2.6.15.bb index af2934d6ef..8bb3a821e2 100644 --- a/recipes/linux/linux-mtx-3_2.6.15.bb +++ b/recipes/linux/linux-mtx-3_2.6.15.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Linux kernel for MTX-3 (Surfbox3)" HOMEPAGE = "http://meshcube.org/meshwiki/" LICENSE = "GPLv2" KV = "${PV}" -PR = "r11" +PR = "r12" inherit module-base kernel PROVIDES = "virtual/kernel" diff --git a/recipes/linux/linux-zigbee_git.bb b/recipes/linux/linux-zigbee_git.bb index eea5e46c9f..ff4e1b7ff7 100644 --- a/recipes/linux/linux-zigbee_git.bb +++ b/recipes/linux/linux-zigbee_git.bb @@ -2,10 +2,10 @@ require linux.inc COMPATIBLE_MACHINE = "imote2" -KERNEL_RELEASE = "2.6.33" +KERNEL_RELEASE = "2.6.34" KERNEL_VERSION = "${KERNEL_RELEASE}" -SRCREV = "4dcdcbf32df853694d31b09ea6cb744463eb27ab" +SRCREV = "3a70ef2d40d829a2ca8321475977f0f019997ab1" PV = "2.6.33+${KERNEL_RELEASE}+${PR}+gitr${SRCREV}" PR = "r0" diff --git a/recipes/linux/linux.inc b/recipes/linux/linux.inc index 0b188d44d1..982a5326fc 100644 --- a/recipes/linux/linux.inc +++ b/recipes/linux/linux.inc @@ -32,6 +32,7 @@ KERNEL_DEVICETREE_boc01 = "${WORKDIR}/boc01.dts" KERNEL_DEVICETREE_calamari = "arch/${ARCH}/boot/dts/mpc8536ds.dts" KERNEL_DEVICETREE_canyonlands = "arch/${ARCH}/boot/dts/canyonlands.dts" KERNEL_DEVICETREE_kilauea = "arch/${ARCH}/boot/dts/kilauea.dts" +KERNEL_DEVICETREE_lite5200 = "arch/${ARCH}/boot/dts/lite5200.dts" KERNEL_DEVICETREE_lsppchd = "arch/${ARCH}/boot/dts/kuroboxHD.dts" KERNEL_DEVICETREE_lsppchg = "arch/${ARCH}/boot/dts/kuroboxHG.dts" KERNEL_DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts" diff --git a/recipes/linux/linux_2.6.34.bb b/recipes/linux/linux_2.6.34.bb index 6d4cc3ec3d..63abbfa636 100644 --- a/recipes/linux/linux_2.6.34.bb +++ b/recipes/linux/linux_2.6.34.bb @@ -9,6 +9,7 @@ DEFAULT_PREFERENCE_qemuppc = "1" DEFAULT_PREFERENCE_qemush4 = "1" DEFAULT_PREFERENCE_qemumips = "1" DEFAULT_PREFERENCE_qemux86 = "1" +DEFAULT_PREFERENCE_lite5200 = "1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/${P}.tar.bz2;name=kernel \ file://ARM-Add-support-for-LZMA-compressed-kernel-images.patch;status=pending \ diff --git a/recipes/lirc/lirc_0.8.0.bb b/recipes/lirc/lirc_0.8.0.bb index 2d91582b15..65b819c0cd 100644 --- a/recipes/lirc/lirc_0.8.0.bb +++ b/recipes/lirc/lirc_0.8.0.bb @@ -15,7 +15,7 @@ RDEPENDS_lirc-x = "lirc" RDEPENDS_lirc-exec = "lirc" RDEPENDS_lirc-nslu2example = "lirc lirc-exec" RRECOMMENDS_lirc = "lirc-exec" -PR = "r4" +PR = "r5" SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz \ file://lircd.init file://lircmd.init file://lircexec.init" diff --git a/recipes/lirc/lirc_0.8.1+cvs20070307.bb b/recipes/lirc/lirc_0.8.1+cvs20070307.bb index 1ab8878251..e2047864a9 100644 --- a/recipes/lirc/lirc_0.8.1+cvs20070307.bb +++ b/recipes/lirc/lirc_0.8.1+cvs20070307.bb @@ -15,7 +15,7 @@ RDEPENDS_lirc-x = "lirc" RDEPENDS_lirc-exec = "lirc" RDEPENDS_lirc-nslu2example = "lirc lirc-exec" RRECOMMENDS_lirc = "lirc-exec" -PR = "r2" +PR = "r3" # enable cvs version since until compilation issues for other packages have been fixed (cf. bug 2284 et al). #DEFAULT_PREFERENCE = "-1" diff --git a/recipes/lirc/lirc_0.8.4a.bb b/recipes/lirc/lirc_0.8.4a.bb index d7f99470cc..15c2a5342e 100644 --- a/recipes/lirc/lirc_0.8.4a.bb +++ b/recipes/lirc/lirc_0.8.4a.bb @@ -15,7 +15,7 @@ RDEPENDS_lirc-x = "lirc" RDEPENDS_lirc-exec = "lirc" RDEPENDS_lirc-nslu2example = "lirc lirc-exec" RRECOMMENDS_lirc = "lirc-exec" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz \ file://lircd.init file://lircmd.init file://lircexec.init" diff --git a/recipes/lirc/lirc_0.8.5.bb b/recipes/lirc/lirc_0.8.5.bb index f0a254e1ce..d37ca3f8ad 100644 --- a/recipes/lirc/lirc_0.8.5.bb +++ b/recipes/lirc/lirc_0.8.5.bb @@ -15,7 +15,7 @@ RDEPENDS_lirc-x = "lirc" RDEPENDS_lirc-exec = "lirc" RDEPENDS_lirc-nslu2example = "lirc lirc-exec" RRECOMMENDS_lirc = "lirc-exec" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz \ file://lircd.init file://lircmd.init file://lircexec.init" diff --git a/recipes/litephone/litephone.inc b/recipes/litephone/litephone.inc index 06739ca5a2..a0d78e2101 100644 --- a/recipes/litephone/litephone.inc +++ b/recipes/litephone/litephone.inc @@ -5,7 +5,7 @@ SECTION = "x11/applications" PRIORITY = "optional" LICENSE = "GPL QPL" RRECOMMENDS_${PN} = "fsodeviced fsogsmd fsousaged frameworkd" -INC_PR = "r0" +INC_PR = "r1" inherit qt4x11 diff --git a/recipes/llvm/llvm.inc b/recipes/llvm/llvm.inc index 3c22318e33..3e11318743 100644 --- a/recipes/llvm/llvm.inc +++ b/recipes/llvm/llvm.inc @@ -13,7 +13,7 @@ # fixed (report bug). # # However the *recipe* for your program/library *must* declare -# export WANT_LLVM_RELEASE = "<valid version number> +# export WANT_LLVM_RELEASE = "<valid version number>" # The version number is picked up by a generic wrapper script which just calls # the variant of the specified version. diff --git a/recipes/llvm/llvm2.7/link.patch b/recipes/llvm/llvm2.7/link.patch new file mode 100644 index 0000000000..059bd92295 --- /dev/null +++ b/recipes/llvm/llvm2.7/link.patch @@ -0,0 +1,12 @@ +Index: llvm-2.7/tools/llvm-shlib/Makefile +=================================================================== +--- llvm-2.7/tools/llvm-shlib/Makefile (revision 103711) ++++ llvm-2.7/tools/llvm-shlib/Makefile (working copy) +@@ -56,5 +56,5 @@ + LLVMLibsOptions := -Wl,--whole-archive $(LLVMLibsOptions) + -Wl,--no-whole-archive + # Don't allow unresolved symbols. +- LLVMLibsOptions += -Wl,--no-undefined ++ LLVMLibsOptions += -lgcc -Wl,--no-undefined + endif + diff --git a/recipes/llvm/llvm2.7_2.7.bb b/recipes/llvm/llvm2.7_2.7.bb index b72581c7e3..623f6fa4b8 100644 --- a/recipes/llvm/llvm2.7_2.7.bb +++ b/recipes/llvm/llvm2.7_2.7.bb @@ -1,17 +1,19 @@ require llvm.inc -PR = "r0" +PR = "r1" DEPENDS = "llvm-common llvm2.7-native" SRC_URI = "\ http://llvm.org/releases/${PV}/llvm-${PV}.tgz \ file://BX_to_BLX.patch \ + file://link.patch \ " EXTRA_OECMAKE += "\ -DLLVM_TARGET_ARCH:STRING=${LLVM_ARCH} \ -DLLVM_ENABLE_ASSERTIONS:BOOL=ON \ + -DBUILD_SHARED_LIBS:BOOL=ON \ -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ " diff --git a/recipes/lmbench/lmbench_2.0.4.bb b/recipes/lmbench/lmbench_2.0.4.bb index 274764ba26..ba96820463 100644 --- a/recipes/lmbench/lmbench_2.0.4.bb +++ b/recipes/lmbench/lmbench_2.0.4.bb @@ -2,7 +2,7 @@ SECTION = "console/utils" DESCRIPTION = "Tools for performance analysis." LICENSE = "GPL" RDEPENDS_${PN} = "debianutils" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \ file://debian.patch \ diff --git a/recipes/lmbench/lmbench_2.5.bb b/recipes/lmbench/lmbench_2.5.bb index 653219891d..cac96b474e 100644 --- a/recipes/lmbench/lmbench_2.5.bb +++ b/recipes/lmbench/lmbench_2.5.bb @@ -2,7 +2,7 @@ SECTION = "console/utils" DESCRIPTION = "Tools for performance analysis." LICENSE = "GPL" RDEPENDS_${PN} = "debianutils" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \ file://build.patch \ diff --git a/recipes/logic-analyzer/logic-analyzer_0.8.bb b/recipes/logic-analyzer/logic-analyzer_0.8.bb index dedc6f28ed..4e52242cdc 100644 --- a/recipes/logic-analyzer/logic-analyzer_0.8.bb +++ b/recipes/logic-analyzer/logic-analyzer_0.8.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A Java-based logical analyzer for home use." LICENSE = "GPL" HOMEPAGE = "http://sump.org/projects/analyzer/" -PR = "r2" +PR = "r3" inherit java diff --git a/recipes/logrotate/logrotate_3.7.1.bb b/recipes/logrotate/logrotate_3.7.1.bb index 6e129efc11..850d76aad6 100644 --- a/recipes/logrotate/logrotate_3.7.1.bb +++ b/recipes/logrotate/logrotate_3.7.1.bb @@ -1,11 +1,11 @@ DESCRIPTION = "Rotates, compresses, removes and mails system log files" HOMEPAGE = "http://packages.debian.org/unstable/admin/logrotate" -RCONFLICTS = "logrotate-script" +RCONFLICTS_${PN} = "logrotate-script" DEPENDS = "popt" RDEPENDS_${PN} = "cron" SECTION = "admin" LICENSE = "GPL" -PR = "r2" +PR = "r3" SRC_URI = "http://ftp.debian.org/debian/pool/main/l/logrotate/logrotate_${PV}.orig.tar.gz \ file://logrotate-3.7.1.patch \ diff --git a/recipes/lyx/lyx_1.6.1.bb b/recipes/lyx/lyx_1.6.1.bb index eb7200ab37..2835095874 100644 --- a/recipes/lyx/lyx_1.6.1.bb +++ b/recipes/lyx/lyx_1.6.1.bb @@ -3,9 +3,9 @@ SECTION = "x11/office" LICENSE = "GPL" HOMEPAGE = "http://www.lyx.org" DEPENDS = "qt4-x11-free" -RSUGGESTS = "tetex" +RSUGGESTS_${PN} = "tetex" RDEPENDS_${PN} = "python-shell python-textutils" -PR = "r0" +PR = "r1" SRC_URI = "\ ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/lyx-${PV}.tar.bz2 \ diff --git a/recipes/lyx/lyx_1.6.4.1.bb b/recipes/lyx/lyx_1.6.4.1.bb index 8163c99f3c..6fd4e4e5fb 100644 --- a/recipes/lyx/lyx_1.6.4.1.bb +++ b/recipes/lyx/lyx_1.6.4.1.bb @@ -3,7 +3,7 @@ SECTION = "x11/office" LICENSE = "GPL" HOMEPAGE = "http://www.lyx.org" DEPENDS = "qt4-x11-free" -RSUGGESTS = "tetex" +RSUGGESTS_${PN} = "tetex" RDEPENDS_${PN} = "python-shell python-textutils" SRC_URI = "\ diff --git a/recipes/madwifi/madwifi-ng_r.inc b/recipes/madwifi/madwifi-ng_r.inc index 6897516f14..e0e4c84dd4 100644 --- a/recipes/madwifi/madwifi-ng_r.inc +++ b/recipes/madwifi/madwifi-ng_r.inc @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" RDEPENDS_${PN} = "kernel (${KERNEL_VERSION})" DEPENDS = "virtual/kernel" -PR ="r6" +PR = "r7" WACKELF_SRC_URI = "" WACKELF_SRC_URI_ixp4xx = " file://20-xscale-VFP-wackelf.patch" diff --git a/recipes/maemo-mapper/maemo-mapper-nohildon_svn.bb b/recipes/maemo-mapper/maemo-mapper-nohildon_svn.bb index a54f3202de..36e664ac78 100644 --- a/recipes/maemo-mapper/maemo-mapper-nohildon_svn.bb +++ b/recipes/maemo-mapper/maemo-mapper-nohildon_svn.bb @@ -4,7 +4,7 @@ DEPENDS = "sqlite3 gtk+ gnome-vfs dbus bluez-libs" RDEPENDS_${PN} = "bluez-utils" SRCDATE = "20061114" PV = "1.2.4+svn${SRCDATE}" -PR = "r1" +PR = "r2" # Only works with SRCDATE_maemo-mapper-nohildon = "20061114" SRC_URI = "svn://garage.maemo.org/svn/maemo-mapper;proto=https;module=trunk \ diff --git a/recipes/maemo-mapper/maemo-mapper_svn.bb b/recipes/maemo-mapper/maemo-mapper_svn.bb index 9ee18a1663..713a54a5ed 100644 --- a/recipes/maemo-mapper/maemo-mapper_svn.bb +++ b/recipes/maemo-mapper/maemo-mapper_svn.bb @@ -5,7 +5,7 @@ RDEPENDS_${PN} = "bluez-utils" RRECOMMENDS_${PN} = "gpsd flite" SRCREV = "118" PV = "2.0.3+svnr${SRCPV}" -PR = "r2" +PR = "r3" SRC_URI = "svn://garage.maemo.org/svn/maemo-mapper;proto=https;module=trunk \ file://mapper-hildon1.diff;maxrev=108" diff --git a/recipes/maemo/osso-application-installer_1.0.03-1.bb b/recipes/maemo/osso-application-installer_1.0.03-1.bb index 17cb3a2ac9..3d24f21905 100644 --- a/recipes/maemo/osso-application-installer_1.0.03-1.bb +++ b/recipes/maemo/osso-application-installer_1.0.03-1.bb @@ -1,4 +1,4 @@ -PR = "r0" +PR = "r1" LICENSE = "GPL" DEPENDS = "hildon-lgpl hildon-base-lib libosso hildon-libs hildon-control-panel shared-mime-info" diff --git a/recipes/maemo/osso-core-config_200515.1.bb b/recipes/maemo/osso-core-config_200515.1.bb index 9329438c20..527888342e 100644 --- a/recipes/maemo/osso-core-config_200515.1.bb +++ b/recipes/maemo/osso-core-config_200515.1.bb @@ -1,5 +1,5 @@ LICENSE = "unknown" -PR = "r6" +PR = "r7" DEPENDS = "base-passwd osso-af-startup" RDEPENDS_${PN} = "base-passwd osso-af-startup" diff --git a/recipes/maemo/sdk-default-theme-config_1.0-1.bb b/recipes/maemo/sdk-default-theme-config_1.0-1.bb index 567727da91..2418995b2a 100644 --- a/recipes/maemo/sdk-default-theme-config_1.0-1.bb +++ b/recipes/maemo/sdk-default-theme-config_1.0-1.bb @@ -1,4 +1,4 @@ -PR = "r0" +PR = "r1" LICENSE = "GPL" DEPENDS = "sdk-default-theme" diff --git a/recipes/mailx/mailx_8.1.2-0.20050715cvs.bb b/recipes/mailx/mailx_8.1.2-0.20050715cvs.bb index 4f5d75f8ed..df2367d9d0 100644 --- a/recipes/mailx/mailx_8.1.2-0.20050715cvs.bb +++ b/recipes/mailx/mailx_8.1.2-0.20050715cvs.bb @@ -3,7 +3,7 @@ DEPENDS = "liblockfile" RRECOMMENDS_${PN} = "ssmtp" DESCRIPTION = "mailx is the traditional command-line-mode \ mail user agent." -PR = "r0" +PR = "r1" LICENSE = "GPL" SRC_URI = "${DEBIAN_MIRROR}/main/m/mailx/mailx_${PV}.orig.tar.gz;name=archive \ ${DEBIAN_MIRROR}/main/m/mailx/mailx_${PV}-1.diff.gz;name=patch \ diff --git a/recipes/mamona/bash-noemu_3.2.bb b/recipes/mamona/bash-noemu_3.2.bb index 4b517ec95d..4269818bc1 100644 --- a/recipes/mamona/bash-noemu_3.2.bb +++ b/recipes/mamona/bash-noemu_3.2.bb @@ -1,8 +1,8 @@ require ../bash/bash.inc -PR = "r1" +PR = "r2" -RCONFLICTS = "bash" -RREPLACES = "bash" +RCONFLICTS_${PN} = "bash" +RREPLACES_${PN} = "bash" SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \ file://001-005.patch \ diff --git a/recipes/mamona/binutils-noemu_2.17.50.0.5.bb b/recipes/mamona/binutils-noemu_2.17.50.0.5.bb index 2ba6b44304..f2362ff943 100644 --- a/recipes/mamona/binutils-noemu_2.17.50.0.5.bb +++ b/recipes/mamona/binutils-noemu_2.17.50.0.5.bb @@ -1,9 +1,9 @@ require ../binutils/binutils.inc -PR = "r1" +PR = "r2" -RCONFLICTS = "binutils" -RREPLACES = "binutils" +RCONFLICTS_${PN} = "binutils" +RREPLACES_${PN} = "binutils" SRC_URI = \ "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \ diff --git a/recipes/mamona/binutils-noemu_2.18.bb b/recipes/mamona/binutils-noemu_2.18.bb index 71ee3842b3..42233bcf99 100644 --- a/recipes/mamona/binutils-noemu_2.18.bb +++ b/recipes/mamona/binutils-noemu_2.18.bb @@ -1,9 +1,9 @@ -PR = "r0" +PR = "r1" require ../binutils/binutils.inc -RCONFLICTS = "binutils" -RREPLACES = "binutils" +RCONFLICTS_${PN} = "binutils" +RREPLACES_${PN} = "binutils" RCONFLICTS_binutils-noemu-symlinks = "binutils-symlinks" RREPLACES_binutils-noemu-symlinks = "binutils-symlinks" diff --git a/recipes/mamona/gcc-noemu_4.1.1.bb b/recipes/mamona/gcc-noemu_4.1.1.bb index bd00ee1fa7..cc366d6aae 100644 --- a/recipes/mamona/gcc-noemu_4.1.1.bb +++ b/recipes/mamona/gcc-noemu_4.1.1.bb @@ -1,11 +1,11 @@ -PR = "r14" +PR = "r15" DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" LICENSE = "GPL" -RCONFLICTS = "gcc" -RREPLACES = "gcc" +RCONFLICTS_${PN} = "gcc" +RREPLACES_${PN} = "gcc" inherit autotools gettext diff --git a/recipes/mamona/gcc-noemu_4.1.2.bb b/recipes/mamona/gcc-noemu_4.1.2.bb index 05cdeb003b..78c7d799a3 100644 --- a/recipes/mamona/gcc-noemu_4.1.2.bb +++ b/recipes/mamona/gcc-noemu_4.1.2.bb @@ -4,10 +4,10 @@ SECTION = "devel" LICENSE = "GPL" # NOTE: split PR. If the main .bb changes something that affects its *build* # remember to increment the -cross .bb PR too. -PR = "r0" +PR = "r1" -RCONFLICTS = "gcc" -RREPLACES = "gcc" +RCONFLICTS_${PN} = "gcc" +RREPLACES_${PN} = "gcc" RCONFLICTS_g++-noemu = "g++" RREPLACES_g++-noemu = "g++" RCONFLICTS_cpp-noemu = "cpp" diff --git a/recipes/mamona/mamona-sound-n770_0.1.0.bb b/recipes/mamona/mamona-sound-n770_0.1.0.bb index 5cafb80aa3..c5fcbf87b9 100644 --- a/recipes/mamona/mamona-sound-n770_0.1.0.bb +++ b/recipes/mamona/mamona-sound-n770_0.1.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://dev.openbossa.org/trac/mamona/" #SECTION = "console/utils" LICENSE = "GPL" RDEPENDS_${PN} = "dspgw-utils udev alsa-lib alsa-utils-alsactl" -PR = "r1" +PR = "r2" PACKAGES = "${PN}" diff --git a/recipes/mamona/mamona-sound-n800_0.1.0.bb b/recipes/mamona/mamona-sound-n800_0.1.0.bb index 6d7e2e1ef0..d726c36b48 100644 --- a/recipes/mamona/mamona-sound-n800_0.1.0.bb +++ b/recipes/mamona/mamona-sound-n800_0.1.0.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Mamona's sound configuration for Nokia N800" HOMEPAGE = "http://dev.openbossa.org/trac/mamona/" LICENSE = "GPL" RDEPENDS_${PN} = "dspgw-utils udev alsa-lib alsa-utils-alsactl" -PR = "r1" +PR = "r2" PACKAGES = "${PN}" diff --git a/recipes/mamona/udev-usbserial_0.1.bb b/recipes/mamona/udev-usbserial_0.1.bb index 2a6e9d504e..c452cf95b2 100644 --- a/recipes/mamona/udev-usbserial_0.1.bb +++ b/recipes/mamona/udev-usbserial_0.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Udev rules file to spawn getty in ttyUSB" SECTION = "utils" LICENSE = "GPL" RDEPENDS_${PN} = "udev" -PR = "r1" +PR = "r2" PACKAGES = "${PN}" diff --git a/recipes/mamona/usbnet_0.1.0.bb b/recipes/mamona/usbnet_0.1.0.bb index 8ac122c3ea..65156a3e3b 100644 --- a/recipes/mamona/usbnet_0.1.0.bb +++ b/recipes/mamona/usbnet_0.1.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://dev.openbossa.org/trac/mamona/" SECTION = "utils" LICENSE = "GPL" RDEPENDS_${PN} = "module-init-tools busybox" -PR = "r1" +PR = "r2" PACKAGES = "${PN}" diff --git a/recipes/man-pages/man-pages_3.21.bb b/recipes/man-pages/man-pages_3.21.bb index 0605adb2a2..cca790b184 100644 --- a/recipes/man-pages/man-pages_3.21.bb +++ b/recipes/man-pages/man-pages_3.21.bb @@ -2,7 +2,7 @@ SECTION = "base" DESCRIPTION = "base set of man pages" LICENSE = "GPL" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/docs/man-pages/Archive/man-pages-${PV}.tar.bz2" -PR = "r1" +PR = "r2" RRECOMMENDS_${PN} = "man" PACKAGE_ARCH = "all" diff --git a/recipes/matchbox-common/matchbox-common_0.9.1.bb b/recipes/matchbox-common/matchbox-common_0.9.1.bb index fc8b1980e8..1565258b7a 100644 --- a/recipes/matchbox-common/matchbox-common_0.9.1.bb +++ b/recipes/matchbox-common/matchbox-common_0.9.1.bb @@ -3,7 +3,7 @@ SECTION = "x11/wm" LICENSE = "GPL" DEPENDS = "libmatchbox" RDEPENDS_${PN} += "matchbox-panel" -PR = "r6" +PR = "r7" SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \ file://no-utilities-category.patch \ diff --git a/recipes/matchbox-common/matchbox_0.9.1.bb b/recipes/matchbox-common/matchbox_0.9.1.bb index a1b0f35b0e..03bdaa4e99 100644 --- a/recipes/matchbox-common/matchbox_0.9.1.bb +++ b/recipes/matchbox-common/matchbox_0.9.1.bb @@ -2,6 +2,6 @@ DESCRIPTION = "Metapackage for Matchbox suite" LICENSE = "GPL" RDEPENDS_${PN} = "matchbox-common matchbox-wm matchbox-panel matchbox-desktop" SECTION = "x11/wm" -PR = "r1" +PR = "r2" ALLOW_EMPTY = "1" diff --git a/recipes/matchbox-desktop/matchbox-desktop_0.9.1.bb b/recipes/matchbox-desktop/matchbox-desktop_0.9.1.bb index a0ee9fba78..2e813a5942 100644 --- a/recipes/matchbox-desktop/matchbox-desktop_0.9.1.bb +++ b/recipes/matchbox-desktop/matchbox-desktop_0.9.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox Window Manager Desktop" LICENSE = "GPL" DEPENDS = "libmatchbox startup-notification" SECTION = "x11/wm" -PR = "r4" +PR = "r5" SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-desktop/0.9/matchbox-desktop-${PV}.tar.bz2 \ file://pkgconfig_fix.patch \ diff --git a/recipes/matchbox-keyboard/matchbox-keyboard_svn.bb b/recipes/matchbox-keyboard/matchbox-keyboard_svn.bb index d3ea264e18..28e3ac7e3b 100644 --- a/recipes/matchbox-keyboard/matchbox-keyboard_svn.bb +++ b/recipes/matchbox-keyboard/matchbox-keyboard_svn.bb @@ -1,12 +1,12 @@ DESCRIPTION = "Matchbox virtual keyboard for X11" LICENSE = "GPL" DEPENDS = "libfakekey expat libxft" -RCONFLICTS = matchbox-keyboard-inputmethod +RCONFLICTS_${PN} = matchbox-keyboard-inputmethod RPROVIDES_${PN} = matchbox-keyboard-inputmethod SECTION = "x11" SRCREV = "1910" PV = "0.0+svnr${SRCPV}" -PR ="r7" +PR = "r8" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ file://smallscreen-fontsize.patch \ diff --git a/recipes/matchbox-sato/matchbox-sato_0.1.bb b/recipes/matchbox-sato/matchbox-sato_0.1.bb index 9d3fef6c8b..bc120423ea 100644 --- a/recipes/matchbox-sato/matchbox-sato_0.1.bb +++ b/recipes/matchbox-sato/matchbox-sato_0.1.bb @@ -2,8 +2,8 @@ DESCRIPTION = "Custom MB session files for poky" LICENSE = "GPL" SECTION = "x11" RDEPENDS_${PN} = "gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato" -RCONFLICTS = "matchbox-common" -PR = "r17" +RCONFLICTS_${PN} = "matchbox-common" +PR = "r18" SRC_URI = "file://etc file://matchbox-session" S = ${WORKDIR} diff --git a/recipes/matchbox-session/matchbox-session.bb b/recipes/matchbox-session/matchbox-session.bb index 9976251961..f872a21f53 100644 --- a/recipes/matchbox-session/matchbox-session.bb +++ b/recipes/matchbox-session/matchbox-session.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Matchbox session support" RDEPENDS_${PN} = "matchbox-common" # they do the same in other way -RCONFLICTS = "gpe-session-scripts" +RCONFLICTS_${PN} = "gpe-session-scripts" do_install() { install -d ${D}${sysconfdir}/X11/Xsession.d/ diff --git a/recipes/matchbox-wm/matchbox-wm_0.9.5.bb b/recipes/matchbox-wm/matchbox-wm_0.9.5.bb index 9cfbc28be5..0a3f72e5de 100644 --- a/recipes/matchbox-wm/matchbox-wm_0.9.5.bb +++ b/recipes/matchbox-wm/matchbox-wm_0.9.5.bb @@ -2,7 +2,7 @@ require matchbox-wm.inc DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf " RDEPENDS_${PN} = "" -PR ="r2" +PR = "r3" SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-${PV}.tar.gz \ file://kbdconfig" diff --git a/recipes/matchbox-wm/matchbox-wm_1.0.bb b/recipes/matchbox-wm/matchbox-wm_1.0.bb index c9807ab5be..4491567c1d 100644 --- a/recipes/matchbox-wm/matchbox-wm_1.0.bb +++ b/recipes/matchbox-wm/matchbox-wm_1.0.bb @@ -3,7 +3,7 @@ require matchbox-wm.inc DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf " RDEPENDS_${PN} = "" -PR ="r3" +PR = "r4" SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.0/matchbox-window-manager-${PV}.tar.gz \ diff --git a/recipes/matchbox-wm/matchbox-wm_1.1.bb b/recipes/matchbox-wm/matchbox-wm_1.1.bb index 25768cf68c..63bd3c1ed2 100644 --- a/recipes/matchbox-wm/matchbox-wm_1.1.bb +++ b/recipes/matchbox-wm/matchbox-wm_1.1.bb @@ -3,7 +3,7 @@ require matchbox-wm.inc DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf " RDEPENDS_${PN} = "" -PR ="r2" +PR = "r3" SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.1/matchbox-window-manager-${PV}.tar.gz \ file://kbdconfig" diff --git a/recipes/matchbox-wm/matchbox-wm_1.2.bb b/recipes/matchbox-wm/matchbox-wm_1.2.bb index cd28cb51fa..ce4e6b34ea 100644 --- a/recipes/matchbox-wm/matchbox-wm_1.2.bb +++ b/recipes/matchbox-wm/matchbox-wm_1.2.bb @@ -3,7 +3,7 @@ require matchbox-wm.inc DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf gconf-native " RDEPENDS_${PN} = "" -PR ="r5" +PR = "r6" SRC_URI = "http://matchbox-project.org/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \ file://configure_fix.patch \ diff --git a/recipes/matchbox-wm/matchbox-wm_svn.bb b/recipes/matchbox-wm/matchbox-wm_svn.bb index 97bf8d9d22..3dfdc1f6f5 100644 --- a/recipes/matchbox-wm/matchbox-wm_svn.bb +++ b/recipes/matchbox-wm/matchbox-wm_svn.bb @@ -3,7 +3,7 @@ require matchbox-wm.inc DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf " RDEPENDS_${PN} = "" PV = "1.1+svn${SRCDATE}" -PR = "r4" +PR = "r5" DEFAULT_PREFERENCE = "-1" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-window-manager;proto=http \ diff --git a/recipes/matchbox2/matchbox-desktop-2_svn.bb b/recipes/matchbox2/matchbox-desktop-2_svn.bb index ccea183dbb..12ff8ac8d9 100644 --- a/recipes/matchbox2/matchbox-desktop-2_svn.bb +++ b/recipes/matchbox2/matchbox-desktop-2_svn.bb @@ -5,7 +5,7 @@ DEPENDS = "gtk+ startup-notification" RDEPENDS_${PN} = "matchbox-common" SRCREV = "2096" PV = "2.0+svnr${SRCPV}" -PR = "r1" +PR = "r2" inherit autotools_stage pkgconfig diff --git a/recipes/matchbox2/matchbox2_2.0.bb b/recipes/matchbox2/matchbox2_2.0.bb index 477b744d3f..2488e1b08f 100644 --- a/recipes/matchbox2/matchbox2_2.0.bb +++ b/recipes/matchbox2/matchbox2_2.0.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" DEPENDS = "matchbox-wm-2 matchbox-panel-2 matchbox-desktop-2" RDEPENDS_${PN} = "matchbox-wm-2 matchbox-panel-2 matchbox-desktop-2" SECTION = "x11/wm" -PR = "r1" +PR = "r2" SRC_URI = "file://matchbox-session-2.in \ file://defaults.in \ diff --git a/recipes/mb-desktop-xine/mb-desktop-xine_0.4.bb b/recipes/mb-desktop-xine/mb-desktop-xine_0.4.bb index 39953f69ec..bdc63b9f4f 100644 --- a/recipes/mb-desktop-xine/mb-desktop-xine_0.4.bb +++ b/recipes/mb-desktop-xine/mb-desktop-xine_0.4.bb @@ -25,7 +25,7 @@ RDEPENDS_${PN} = "libxine-plugin-vo-out-xshm \ libxine-plugin-dmx-avi \ libxine-plugin-ao-out-oss \ matchbox-desktop " -PR = "r1" +PR = "r2" SRC_URI="http://projects.o-hand.com/matchbox/sources/mb-desktop-xine/0.4/mb-desktop-xine-${PV}.tar.bz2" diff --git a/recipes/mdk/mdk2_v33.bb b/recipes/mdk/mdk2_v33.bb index 587a83cfb9..475d1dc36d 100644 --- a/recipes/mdk/mdk2_v33.bb +++ b/recipes/mdk/mdk2_v33.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://homepages.tu-darmstadt.de/~p_larbig/wlan/" LICENSE = "GPLv2" DEPENDS = "" RDEPENDS_${PN} = "" -PR ="r1" +PR = "r2" SRC_URI = "http://homepages.tu-darmstadt.de/~p_larbig/wlan/mdk2-${PV}.tar.bz2 \ file://mdk2-ppcfix.patch" diff --git a/recipes/mesa/mesa-dri_6.5.2.bb b/recipes/mesa/mesa-dri_6.5.2.bb index 0eae6783b9..d8f9506e11 100644 --- a/recipes/mesa/mesa-dri_6.5.2.bb +++ b/recipes/mesa/mesa-dri_6.5.2.bb @@ -6,7 +6,7 @@ FILESPATHPKG =. "mesa-${PV}:" PACKAGES_DYNAMIC = "mesa-dri-driver-*" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" DEPENDS += "libdrm" # DRI is useless without the kernel drivers diff --git a/recipes/mesa/mesa-dri_7.0.3.bb b/recipes/mesa/mesa-dri_7.0.3.bb index 26e0743c8a..dcf6fd3af8 100644 --- a/recipes/mesa/mesa-dri_7.0.3.bb +++ b/recipes/mesa/mesa-dri_7.0.3.bb @@ -7,7 +7,7 @@ FILESPATHPKG =. "mesa-${PV}:" PACKAGES_DYNAMIC = "mesa-dri-driver-*" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" DEPENDS += "libdrm" # DRI is useless without the kernel drivers diff --git a/recipes/meta/canadian-sdk.bb b/recipes/meta/canadian-sdk.bb index 216044156d..7a10304146 100644 --- a/recipes/meta/canadian-sdk.bb +++ b/recipes/meta/canadian-sdk.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Meta package for building a installable toolchain" LICENSE = "MIT" DEPENDS = "opkg-native ipkg-utils-native fakeroot-native sed-native zip-native" -PR = "r4" +PR = "r5" # NOTE: We need to save and restore PACKAGE_ARCHS, because sdk.bbclass # will change HOST_ARCH, which can result in SITEINFO_ENDIANESS (which diff --git a/recipes/meta/external-toolchain-generic.bb b/recipes/meta/external-toolchain-generic.bb index c840301aac..53a5f90f1e 100644 --- a/recipes/meta/external-toolchain-generic.bb +++ b/recipes/meta/external-toolchain-generic.bb @@ -15,9 +15,9 @@ PROVIDES = "\ virtual/libiconv \ " -RPROVIDES = "glibc glibc-utils libsegfault glibc-thread-db libgcc-dev libgcc libstdc++-dev libstdc++ ldd" +RPROVIDES_${PN} = "glibc glibc-utils libsegfault glibc-thread-db libgcc-dev libgcc libstdc++-dev libstdc++ ldd" PACKAGES_DYNAMIC = "glibc-gconv-*" -PR = "r2" +PR = "r3" inherit sdk diff --git a/recipes/meta/external-toolchain.bb b/recipes/meta/external-toolchain.bb index 352126396f..77b479cffe 100644 --- a/recipes/meta/external-toolchain.bb +++ b/recipes/meta/external-toolchain.bb @@ -14,9 +14,9 @@ PROVIDES = "\ virtual/libiconv \ " -RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libgcc libstdc++-dev libstdc++" +RPROVIDES_${PN} = "glibc-utils libsegfault glibc-thread-db libgcc-dev libgcc libstdc++-dev libstdc++" PACKAGES_DYNAMIC = "glibc-gconv-*" -PR = "r2" +PR = "r3" inherit sdk diff --git a/recipes/meta/meta-e-x11-core.bb b/recipes/meta/meta-e-x11-core.bb index 3f223992d9..3f0ac54f79 100644 --- a/recipes/meta/meta-e-x11-core.bb +++ b/recipes/meta/meta-e-x11-core.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Meta-package for Enlightenment/X11" SECTION = "x11/base" ALLOW_EMPTY = "1" -PR = "r1" +PR = "r2" PACKAGE_ARCH = "all" LICENSE = "MIT" diff --git a/recipes/meta/meta-e-x11.bb b/recipes/meta/meta-e-x11.bb index 25d42e4aaf..1bfe5c169b 100644 --- a/recipes/meta/meta-e-x11.bb +++ b/recipes/meta/meta-e-x11.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Meta-package for Enlightenment/X11" SECTION = "x11/base" ALLOW_EMPTY = "1" -PR = "r1" +PR = "r2" PACKAGE_ARCH = "all" LICENSE = "MIT" diff --git a/recipes/meta/meta-gpe-extras.bb b/recipes/meta/meta-gpe-extras.bb index 7d7739a5b1..06b4b953c6 100644 --- a/recipes/meta/meta-gpe-extras.bb +++ b/recipes/meta/meta-gpe-extras.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Meta-package of extra applications for the GPE Palmtop Environment" LICENSE = "MIT" -PR ="r3" +PR = "r4" RDEPENDS_${PN} = "\ task-gpe-apps \ diff --git a/recipes/meta/meta-gpe.bb b/recipes/meta/meta-gpe.bb index 40de91dc58..d2a7ef29a2 100644 --- a/recipes/meta/meta-gpe.bb +++ b/recipes/meta/meta-gpe.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Meta-package for GPE Palmtop Environment" LICENSE = "MIT" -PR = "r43" +PR = "r44" RDEPENDS_${PN} = "\ task-gpe-base \ diff --git a/recipes/meta/meta-maemo.bb b/recipes/meta/meta-maemo.bb index d18497a097..ac0dabe056 100644 --- a/recipes/meta/meta-maemo.bb +++ b/recipes/meta/meta-maemo.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Meta-package for maemo environment" LICENSE = "MIT" -PR = "r0" +PR = "r1" RDEPENDS_${PN} = "\ maemo-task-base \ diff --git a/recipes/meta/meta-mamona-light.bb b/recipes/meta/meta-mamona-light.bb index b03923cc0c..a688799187 100644 --- a/recipes/meta/meta-mamona-light.bb +++ b/recipes/meta/meta-mamona-light.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Meta package for Mamona" LICENSE = "MIT" -PR = "r1" +PR = "r2" inherit meta EXCLUDE_FROM_WORLD = "1" diff --git a/recipes/meta/meta-mamona.bb b/recipes/meta/meta-mamona.bb index 44d50594a8..6a30901fbb 100644 --- a/recipes/meta/meta-mamona.bb +++ b/recipes/meta/meta-mamona.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Meta package for Mamona" LICENSE = "MIT" -PR = "r2" +PR = "r3" inherit meta EXCLUDE_FROM_WORLD = "1" diff --git a/recipes/meta/meta-nas-server.bb b/recipes/meta/meta-nas-server.bb index 114c15b070..e05dbf882f 100644 --- a/recipes/meta/meta-nas-server.bb +++ b/recipes/meta/meta-nas-server.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Meta-package for a network attached storage server" LICENSE = "MIT" -PR = "r0" +PR = "r1" RDEPENDS_${PN} = "\ task-nas-server-everything \ diff --git a/recipes/meta/meta-opie-all.bb b/recipes/meta/meta-opie-all.bb index 0f80754262..e6a0da73f4 100644 --- a/recipes/meta/meta-opie-all.bb +++ b/recipes/meta/meta-opie-all.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Meta-package for QPE stuff" SECTION = "opie/base" LICENSE = "MIT" -PR = "r3" +PR = "r4" RDEPENDS_${PN} = " \ task-qpe-applets \ diff --git a/recipes/meta/meta-opie.bb b/recipes/meta/meta-opie.bb index 55576d265f..0a8ed86a9f 100644 --- a/recipes/meta/meta-opie.bb +++ b/recipes/meta/meta-opie.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Meta-package for Opie" SECTION = "opie/base" -PR = "r34" +PR = "r35" LICENSE = "MIT" RDEPENDS_${PN} = "task-opie-applets task-opie-apps task-opie-base \ diff --git a/recipes/meta/meta-sdl.bb b/recipes/meta/meta-sdl.bb index bf5307fceb..1424bdd002 100644 --- a/recipes/meta/meta-sdl.bb +++ b/recipes/meta/meta-sdl.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Meta-package for SDL" LICENSE = "MIT" -PR = "r2" +PR = "r3" RDEPENDS_${PN} = "task-sdl-libs task-sdl-games task-sdl-emulators" diff --git a/recipes/meta/slugos-native.bb b/recipes/meta/slugos-native.bb index 5247a166f7..4dd1937ad9 100644 --- a/recipes/meta/slugos-native.bb +++ b/recipes/meta/slugos-native.bb @@ -5,7 +5,7 @@ # DESCRIPTION = "Packages that are required for the SlugOS native build environment" LICENSE = "MIT" -PR = "r7" +PR = "r8" INHIBIT_DEFAULT_DEPS = "1" EXCLUDE_FROM_WORLD = "1" diff --git a/recipes/meta/xbase-clients.bb b/recipes/meta/xbase-clients.bb index 35ca4e6f44..e26899b404 100644 --- a/recipes/meta/xbase-clients.bb +++ b/recipes/meta/xbase-clients.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Basic X clients (meta package)" LICENSE = "MIT" -PR = "r1" +PR = "r2" ALLOW_EMPTY = "1" PACKAGES = "${PN}" diff --git a/recipes/midpath/midpath-backend-qt3x11_0.2+0.3rc2.bb b/recipes/midpath/midpath-backend-qt3x11_0.2+0.3rc2.bb index eba507c5e5..9ea4236610 100644 --- a/recipes/midpath/midpath-backend-qt3x11_0.2+0.3rc2.bb +++ b/recipes/midpath/midpath-backend-qt3x11_0.2+0.3rc2.bb @@ -1,13 +1,13 @@ require midpath-common.inc -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz" S = "${WORKDIR}/midpath-0.3rc2" DEPENDS = "classpath qte-mt" -RCONFLICTS = "midpath-backend-qte" +RCONFLICTS_${PN} = "midpath-backend-qte" inherit qt3x11 diff --git a/recipes/midpath/midpath-backend-qte_0.2+0.3rc2.bb b/recipes/midpath/midpath-backend-qte_0.2+0.3rc2.bb index 3d4051b42d..1ee2971871 100644 --- a/recipes/midpath/midpath-backend-qte_0.2+0.3rc2.bb +++ b/recipes/midpath/midpath-backend-qte_0.2+0.3rc2.bb @@ -1,13 +1,13 @@ require midpath-common.inc -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz" S = "${WORKDIR}/midpath-0.3rc2" DEPENDS = "classpath qte-mt" -RCONFLICTS = "midpath-backend-qt3" +RCONFLICTS_${PN} = "midpath-backend-qt3" inherit qt3e diff --git a/recipes/midpath/midpath-cldc_0.2+0.3rc2.bb b/recipes/midpath/midpath-cldc_0.2+0.3rc2.bb index f9db194b87..a2307aea57 100644 --- a/recipes/midpath/midpath-cldc_0.2+0.3rc2.bb +++ b/recipes/midpath/midpath-cldc_0.2+0.3rc2.bb @@ -1,13 +1,13 @@ require midpath-common.inc -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz" S = "${WORKDIR}/midpath-0.3rc2" DESCRIPTION = "Implementation of the CLDC profile for use in the MIDPath library" -RPROVIDES = "midpath-cldc java-cldc1.1" +RPROVIDES_${PN} = "midpath-cldc java-cldc1.1" JAR = "midpath-cldc1.1.jar" diff --git a/recipes/midpath/midpath-core_0.2+0.3rc2.bb b/recipes/midpath/midpath-core_0.2+0.3rc2.bb index 9f28b47ce1..1c87d42271 100644 --- a/recipes/midpath/midpath-core_0.2+0.3rc2.bb +++ b/recipes/midpath/midpath-core_0.2+0.3rc2.bb @@ -1,6 +1,6 @@ DESCRIPTION = "MIDPath is a Java library which provides a MIDP2 implementation" -PR = "r2" +PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz" diff --git a/recipes/midpath/midpath-demos_0.2+0.3rc2.bb b/recipes/midpath/midpath-demos_0.2+0.3rc2.bb index 0a6443a06c..9e5bde3b62 100644 --- a/recipes/midpath/midpath-demos_0.2+0.3rc2.bb +++ b/recipes/midpath/midpath-demos_0.2+0.3rc2.bb @@ -1,6 +1,6 @@ require midpath-common.inc -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz" diff --git a/recipes/midpath/midpath-maemo_0.2+0.3rc2.bb b/recipes/midpath/midpath-maemo_0.2+0.3rc2.bb index 424ff24abd..679245488a 100644 --- a/recipes/midpath/midpath-maemo_0.2+0.3rc2.bb +++ b/recipes/midpath/midpath-maemo_0.2+0.3rc2.bb @@ -1,7 +1,5 @@ require midpath.inc -PR = "r0" - # The patch fixes the system_properties file only deployed in this recipe. SRC_URI = "\ ${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz \ @@ -9,7 +7,7 @@ SRC_URI = "\ S = "${WORKDIR}/midpath-0.3rc2" -PR = "r0" +PR = "r1" SRC_URI += "file://configuration_maemo.cfg" diff --git a/recipes/midpath/midpath-openmoko_0.2+0.3rc2.bb b/recipes/midpath/midpath-openmoko_0.2+0.3rc2.bb index 3e524d8dd8..1befaaa2d0 100644 --- a/recipes/midpath/midpath-openmoko_0.2+0.3rc2.bb +++ b/recipes/midpath/midpath-openmoko_0.2+0.3rc2.bb @@ -1,7 +1,5 @@ require midpath.inc -PR = "r0" - # The patch fixes the system_properties file only deployed in this recipe. SRC_URI = "\ ${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz \ @@ -9,7 +7,7 @@ SRC_URI = "\ S = "${WORKDIR}/midpath-0.3rc2" -PR = "r0" +PR = "r1" SRC_URI += "file://configuration_openmoko.cfg" diff --git a/recipes/midpath/midpath.inc b/recipes/midpath/midpath.inc index 50fd8ef095..7859113d87 100644 --- a/recipes/midpath/midpath.inc +++ b/recipes/midpath/midpath.inc @@ -8,7 +8,7 @@ require midpath-common.inc RDEPENDS_${PN} = "midpath-core midpath-core-bluetooth midpath-core-ogg ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'midpath-core-mp3', d)}" PROVIDES = "midpath" -RPROVIDES = "midpath" +RPROVIDES_${PN} = "midpath" CONFIGURATION = "${@bb.fatal('Variable CONFIGURATION is not set in your midpath.inc-based recipe.')}" diff --git a/recipes/mime-support/mime-support_3.28.bb b/recipes/mime-support/mime-support_3.28.bb index a9de27dbb6..330285d4b5 100644 --- a/recipes/mime-support/mime-support_3.28.bb +++ b/recipes/mime-support/mime-support_3.28.bb @@ -5,7 +5,7 @@ LICENSE = "PD" DEPENDS = "file" RRECOMMENDS_${PN} = "file" -PR = "r3" +PR = "r4" SRC_URI = "${DEBIAN_MIRROR}/main/m/mime-support/mime-support_${PV}-1.tar.gz" S = "${WORKDIR}/${PN}" diff --git a/recipes/miniclipboard/miniclipboard_0.3.bb b/recipes/miniclipboard/miniclipboard_0.3.bb index be92a73868..1f2a9c3427 100644 --- a/recipes/miniclipboard/miniclipboard_0.3.bb +++ b/recipes/miniclipboard/miniclipboard_0.3.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" DESCRIPTION = "Clipboard management application" DEPENDS = "virtual/libx11 libxpm" RDEPENDS_${PN} = "gdk-pixbuf-loader-xpm" -PR = "r2" +PR = "r3" SRC_URI += "file://miniclipboard.desktop \ file://makefile.patch;striplevel=0" diff --git a/recipes/misc-binary-only/acx-firmware_1.0.bb b/recipes/misc-binary-only/acx-firmware_1.0.bb index 4706c5b479..0a2cb7eff7 100644 --- a/recipes/misc-binary-only/acx-firmware_1.0.bb +++ b/recipes/misc-binary-only/acx-firmware_1.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ACX (iPAQ HX4700/HTC Universal) wireless firmware." SECTION = "base" LICENSE = "Unknown" -PR = "r2" +PR = "r3" RRECOMMENDS_${PN} = "kernel-module-firmware-class" SRC_URI = "http://sdgsystems.com/pub/ipaq/hx4700/src/RADIO0d.BIN;name=radio0d \ diff --git a/recipes/misc-binary-only/prism-firmware.bb b/recipes/misc-binary-only/prism-firmware.bb index fac20bc08f..5fb772b7a9 100644 --- a/recipes/misc-binary-only/prism-firmware.bb +++ b/recipes/misc-binary-only/prism-firmware.bb @@ -2,10 +2,10 @@ DESCRIPTION = "Firmware for the Prism 2.x/3 cards" SECTION = "base" LICENSE = "closed" RDEPENDS_${PN} = "hostap-utils" -RREPLACES = "prism3-firmware prism3-support" -RCONFLICTS = "prism3-firmware prism3-support" +RREPLACES_${PN} = "prism3-firmware prism3-support" +RCONFLICTS_${PN} = "prism3-firmware prism3-support" PACKAGE_ARCH = "all" -PR = "r3" +PR = "r4" SRC_URI = "http://www.red-bean.com/~proski/firmware/primary.tar.bz2;name=primary \ http://www.red-bean.com/~proski/firmware/1.7.4.tar.bz2;name=174 \ diff --git a/recipes/moblin/bickley_git.bb b/recipes/moblin/bickley_git.bb index 99518cef68..731339a087 100644 --- a/recipes/moblin/bickley_git.bb +++ b/recipes/moblin/bickley_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A meta data manager API and framework (including Media)" SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git" PV = "0.0" PR_append = "+git${SRCREV}" -PR = "r3" +PR = "r4" DEPENDS = "redland gtk+ dbus-glib clutter-gst-0.9 libexif taglib gupnp gupnp-av samba" RDEPENDS_${PN} = "xdg-user-dirs" diff --git a/recipes/mokoko/mokoko_svn.bb b/recipes/mokoko/mokoko_svn.bb index 2ddca6077a..82576e79f6 100644 --- a/recipes/mokoko/mokoko_svn.bb +++ b/recipes/mokoko/mokoko_svn.bb @@ -7,7 +7,7 @@ RDEPENDS_${PN} = "gstreamer" SRCREV = "127" PV = "0.1+svnr${SRCPV}" -PR = "r2" +PR = "r3" SRC_URI = "svn://om-mediaplayer.googlecode.com/svn/;module=trunk;proto=http" diff --git a/recipes/mono-xsp/mono-xsp_1.2.5.bb b/recipes/mono-xsp/mono-xsp_1.2.5.bb index 204d0542f5..f8054c8bc9 100644 --- a/recipes/mono-xsp/mono-xsp_1.2.5.bb +++ b/recipes/mono-xsp/mono-xsp_1.2.5.bb @@ -8,7 +8,7 @@ SECTION = "devel/mono" # -PR = "r4" +PR = "r5" DEPENDS = "mono" RDEPENDS_${PN} = "mono" diff --git a/recipes/monotone/monotone-6_0.33.bb b/recipes/monotone/monotone-6_0.33.bb index 8bc24f24d3..60e437d327 100644 --- a/recipes/monotone/monotone-6_0.33.bb +++ b/recipes/monotone/monotone-6_0.33.bb @@ -6,7 +6,7 @@ LICENSE = "MIT" DEPENDS = "boost" PROVIDES = "monotone" -RPROVIDES = "monotone" +RPROVIDES_${PN} = "monotone" S = "${WORKDIR}/monotone-${PV}" # no cross compile support - it tries to run the test program even with @@ -25,7 +25,7 @@ inherit autotools #FIXME: remove the following ARM_INSTRUCTION_SET = "arm" -PR = "r1" +PR = "r2" SRC_URI = "http://monotone.ca/downloads/${PV}/monotone-${PV}.tar.gz \ file://txt2c-cross-post-0.22.patch \ diff --git a/recipes/monotone/monotone-6_0.34.bb b/recipes/monotone/monotone-6_0.34.bb index 9a6695237f..805af5d3b7 100644 --- a/recipes/monotone/monotone-6_0.34.bb +++ b/recipes/monotone/monotone-6_0.34.bb @@ -6,7 +6,7 @@ LICENSE = "MIT" DEPENDS = "boost" PROVIDES = "monotone" -RPROVIDES = "monotone" +RPROVIDES_${PN} = "monotone" S = "${WORKDIR}/monotone-${PV}" # no cross compile support - it tries to run the test program even with @@ -25,7 +25,7 @@ inherit autotools #FIXME: remove the following ARM_INSTRUCTION_SET = "arm" -PR = "r0" +PR = "r1" SRC_URI = "http://monotone.ca/downloads/${PV}/monotone-${PV}.tar.gz \ file://txt2c-cross-post-0.22.patch \ diff --git a/recipes/monotone/monotone-6_0.37.bb b/recipes/monotone/monotone-6_0.37.bb index 716a26b5bc..d4c40c247a 100644 --- a/recipes/monotone/monotone-6_0.37.bb +++ b/recipes/monotone/monotone-6_0.37.bb @@ -6,7 +6,7 @@ LICENSE = "MIT" DEPENDS = "boost" PROVIDES = "monotone" -RPROVIDES = "monotone" +RPROVIDES_${PN} = "monotone" S = "${WORKDIR}/monotone-${PV}" # no cross compile support - it tries to run the test program even with @@ -25,7 +25,7 @@ inherit autotools #FIXME: remove the following ARM_INSTRUCTION_SET = "arm" -PR = "r0" +PR = "r1" SRC_URI = "http://monotone.ca/downloads/${PV}/monotone-${PV}.tar.gz \ file://txt2c-cross-post-0.22.patch \ diff --git a/recipes/motion/motion_3.2.11.bb b/recipes/motion/motion_3.2.11.bb index d43ed27939..dd20a12191 100644 --- a/recipes/motion/motion_3.2.11.bb +++ b/recipes/motion/motion_3.2.11.bb @@ -5,9 +5,9 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "jpeg ffmpeg mysql postgresql" -RSUGGESTS = "mysql-client postgresql-client" +RSUGGESTS_${PN} = "mysql-client postgresql-client" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz \ file://ffmpeg-0.4.9.15594svn-20081010.diff " diff --git a/recipes/mozilla/firefox-addon.inc b/recipes/mozilla/firefox-addon.inc index 427dce5da5..a11001856c 100644 --- a/recipes/mozilla/firefox-addon.inc +++ b/recipes/mozilla/firefox-addon.inc @@ -11,7 +11,7 @@ do_configure() { unzip -o -q -d xpi *.xpi } -INC_PR = "r1" +INC_PR = "r2" do_install() { cd ${S}/xpi diff --git a/recipes/mozilla/firefox-l10n.inc b/recipes/mozilla/firefox-l10n.inc index 640981e402..4ab8873488 100644 --- a/recipes/mozilla/firefox-l10n.inc +++ b/recipes/mozilla/firefox-l10n.inc @@ -22,7 +22,7 @@ do_configure() { unzip -o -q -d ${LANGUAGE} ${LANGUAGE}.xpi } -INC_PR = "r1" +INC_PR = "r2" do_install() { cd ${S}/${LANGUAGE} diff --git a/recipes/mozilla/thunderbird_1.0.7.bb b/recipes/mozilla/thunderbird_1.0.7.bb index 7665012e0f..8bf438d960 100644 --- a/recipes/mozilla/thunderbird_1.0.7.bb +++ b/recipes/mozilla/thunderbird_1.0.7.bb @@ -1,7 +1,7 @@ SECTION = "x11/utils" DEPENDS += "gnupg" RRECOMMENDS_${PN} += "gnupg" -PR = "r1" +PR = "r2" EMVER="0.92.0" IPCVER="1.1.3" diff --git a/recipes/mplayer/mplayer_0.0+1.0rc1.bb b/recipes/mplayer/mplayer_0.0+1.0rc1.bb index 28967ccb7d..5f023942a8 100644 --- a/recipes/mplayer/mplayer_0.0+1.0rc1.bb +++ b/recipes/mplayer/mplayer_0.0+1.0rc1.bb @@ -41,7 +41,7 @@ ARM_INSTRUCTION_SET = "ARM" RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" -PR = "r18" +PR = "r19" PARALLEL_MAKE = "" diff --git a/recipes/mplayer/mplayer_0.0+1.0rc2.bb b/recipes/mplayer/mplayer_0.0+1.0rc2.bb index 5adf23827d..78512f54c3 100644 --- a/recipes/mplayer/mplayer_0.0+1.0rc2.bb +++ b/recipes/mplayer/mplayer_0.0+1.0rc2.bb @@ -46,7 +46,7 @@ ARM_INSTRUCTION_SET = "ARM" RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" -PR = "r14" +PR = "r15" PARALLEL_MAKE = "" diff --git a/recipes/mplayer/mplayer_git.bb b/recipes/mplayer/mplayer_git.bb index 49124e27d1..e57ef843b6 100644 --- a/recipes/mplayer/mplayer_git.bb +++ b/recipes/mplayer/mplayer_git.bb @@ -35,7 +35,7 @@ RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" PV = "0.0+1.0rc4+gitr${SRCPV}" -PR = "r0" +PR = "r1" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_shr = "2" diff --git a/recipes/mplayer/mplayer_svn.bb b/recipes/mplayer/mplayer_svn.bb index c197d67468..af20c91ce0 100644 --- a/recipes/mplayer/mplayer_svn.bb +++ b/recipes/mplayer/mplayer_svn.bb @@ -40,7 +40,7 @@ RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" PV = "0.0+1.0rc3+svnr${SRCPV}" -PR = "r20" +PR = "r21" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_angstrom = "1" DEFAULT_PREFERENCE_shr = "1" diff --git a/recipes/mrtg/mrtg.inc b/recipes/mrtg/mrtg.inc index 9ac137dff1..23ca6ef3e8 100644 --- a/recipes/mrtg/mrtg.inc +++ b/recipes/mrtg/mrtg.inc @@ -19,7 +19,7 @@ RDEPENDS_${PN} = " \ " LICENSE = "GPL" -PR = "r0" +PR = "r1" SRC_URI = "http://oss.oetiker.ch/mrtg/pub/mrtg-${PV}.tar.gz;name=mrtg-${PV}" diff --git a/recipes/mtkbabel/mtkbabel_0.8.bb b/recipes/mtkbabel/mtkbabel_0.8.bb index c474e09571..f9029c560c 100644 --- a/recipes/mtkbabel/mtkbabel_0.8.bb +++ b/recipes/mtkbabel/mtkbabel_0.8.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Control program for GPS units using the MediaTek (MTK) chipset" HOMEPAGE = "http://www.rigacci.org/wiki/doku.php/doc/appunti/hardware/gps_logger_i_blue_747" LICENSE = "GPL" PACKAGE_ARCH = "all" -PR = "r1" +PR = "r2" RDEPENDS_${PN} = "libdevice-serialport-perl libtimedate-perl perl-module-file-basename perl-module-getopt-std" diff --git a/recipes/multitap-pad/multitap-pad_svn.bb b/recipes/multitap-pad/multitap-pad_svn.bb index efa7f04c05..8c7ec5aeaa 100644 --- a/recipes/multitap-pad/multitap-pad_svn.bb +++ b/recipes/multitap-pad/multitap-pad_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Multi-tap input method for GTK" LICENSE = "GPL" DEPENDS = "libfakekey gtk+ matchbox-panel-2" -RCONFLICTS = matchbox-keyboard-inputmethod +RCONFLICTS_${PN} = matchbox-keyboard-inputmethod SECTION = "x11" SRCREV = "373" PV = "0.0+svnr${SRCPV}" diff --git a/recipes/musicpd/mpd-alsa_0.11.5.bb b/recipes/musicpd/mpd-alsa_0.11.5.bb index 10430c62b1..b045050431 100644 --- a/recipes/musicpd/mpd-alsa_0.11.5.bb +++ b/recipes/musicpd/mpd-alsa_0.11.5.bb @@ -5,7 +5,7 @@ LICENSE = "GPLv2" DEPENDS = "libvorbis libogg libao-alsa zlib libmikmod flac audiofile virtual/libiconv \ ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag', d)}" RDEPENDS_${PN} = "libao-alsa" -PR = "r5" +PR = "r6" SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.gz \ file://mpd/save-volume-state.patch file://mpd/mpd.init" diff --git a/recipes/musicpd/mpd-alsa_0.14.2.bb b/recipes/musicpd/mpd-alsa_0.14.2.bb index a179adb4a2..b8088ea952 100644 --- a/recipes/musicpd/mpd-alsa_0.14.2.bb +++ b/recipes/musicpd/mpd-alsa_0.14.2.bb @@ -10,7 +10,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.bz2 \ file://mpd/mpd.conf \ file://mpd/mpd.init" -PR = "r4" +PR = "r5" S = "${WORKDIR}/mpd-${PV}" inherit autotools update-rc.d diff --git a/recipes/nautilus/nautilus_2.24.2.bb b/recipes/nautilus/nautilus_2.24.2.bb index d5eab0153d..5bc36e0c79 100644 --- a/recipes/nautilus/nautilus_2.24.2.bb +++ b/recipes/nautilus/nautilus_2.24.2.bb @@ -9,7 +9,7 @@ export SYSROOT = "${STAGING_DIR_HOST}" LICENSE="GPL" -PR = "r1" +PR = "r2" DEPENDS += " gvfs tracker librsvg libexif eel esound gnome-desktop orbit2-native" RDEPENDS_${PN} = "gvfs" diff --git a/recipes/navit/navit-icons_svn.bb b/recipes/navit/navit-icons_svn.bb index 80b77c221b..ddfbd2fe2d 100644 --- a/recipes/navit/navit-icons_svn.bb +++ b/recipes/navit/navit-icons_svn.bb @@ -8,7 +8,7 @@ RRECOMMENDS_${PN} = "gpsd espeak flite" PACKAGE_ARCH = "all" PV = "0.1.0+svnr${SRCPV}" -PR = "r1" +PR = "r2" EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned --enable-svg2png-scaling-flag=32 --disable-speech-speech-dispatcher" diff --git a/recipes/navit/navit.inc b/recipes/navit/navit.inc index 32f6233d3d..49e8ee65dc 100644 --- a/recipes/navit/navit.inc +++ b/recipes/navit/navit.inc @@ -5,7 +5,7 @@ DEPENDS = "glib-2.0 gtk+" RRECOMMENDS_${PN} = "gpsd speechd flite" PE = "1" -INC_PR = "r5" +INC_PR = "r6" inherit autotools diff --git a/recipes/navit/navit_svn.bb b/recipes/navit/navit_svn.bb index e74189bbfc..2b75c4eebb 100644 --- a/recipes/navit/navit_svn.bb +++ b/recipes/navit/navit_svn.bb @@ -1,26 +1,27 @@ require navit.inc -PV = "0.1.0+svnr${SRCPV}" -PR = "${INC_PR}.5" +SRCREV = "3349" +PV = "0.1.99+svnr${SRCPV}" +PR = "${INC_PR}.8" S = "${WORKDIR}/navit" # override navit.inc RRECOMMENDS, we only suggest a text2speech app -RRECOMMENDS_${PN} = "gpsd" -RSUGGESTS_${PN} = "flite espeak" +RRECOMMENDS_${PN} = "gpsd ${PN}-dbus ${PN}-speech-cmdline ${PN}-gui-internal ${PN}-graphics-gtk" +RSUGGESTS_${PN} = "flite espeak ${PN}-speech-dbus ${PN}-gui-gtk ${PN}-gui-qml ${PN}-graphics-sdl ${PN}-maptool" DEPENDS_shr += " gd librsvg-native" -RDEPENDS_${PN} = " navit-icons" +RDEPENDS_${PN} = " navit-icons ${PN}-config " +DEPENDS_append_shr = " gypsy" +RDEPENDS_append_shr = " fsoraw" + EXTRA_OECONF += " --enable-svg2png-scaling-flag=32 --disable-speech-speech-dispatcher --enable-cache-size=20971520" -SRCREV = "3279" SRC_URI = "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk;module=navit;proto=https" EXTRA_AUTORECONF = " -I m4" -FILES_${PN} += " ${datadir}/dbus-1/services/ " - -CONFFILES_${PN} += "${datadir}/navit/navit.default.xml \ +CONFFILES_${PN}-config += "${datadir}/navit/navit.default.xml \ ${datadir}/navit/navit.xml \ ${datadir}/navit/maps.xml \ ${datadir}/navit/osd.xml \ @@ -35,14 +36,24 @@ SRC_URI += "file://navit.xml \ file://plugins.xml \ " +PACKAGES =+ "${PN}-maptool ${PN}-config ${PN}-dbus ${PN}-speech-cmdline ${PN}-speech-dbus ${PN}-gui-gtk ${PN}-gui-internal ${PN}-gui-qml ${PN}-graphics-sdl ${PN}-graphics-gtk" + +FILES_${PN}-maptool = " ${bindir}/maptool " +FILES_${PN}-config = " ${datadir}/navit/*.xml " +FILES_${PN}-dbus = " ${datadir}/dbus-1/services/ ${libdir}/${PN}/binding/libbinding_dbus.so " +FILES_${PN}-speech-cmdline = " ${libdir}/${PN}/speech/libspeech_cmdline.so " +FILES_${PN}-speech-dbus = " ${libdir}/${PN}/speech/libspeech_dbus.so " +FILES_${PN}-gui-gtk = " ${libdir}/${PN}/gui/libgui_gtk.so " +FILES_${PN}-gui-qml = " ${libdir}/${PN}/gui/libgui_qml.so ${datadir}/navit/skins/ " +FILES_${PN}-gui-internal = " ${libdir}/${PN}/gui/libgui_internal.so " +FILES_${PN}-graphics-sdl = " ${libdir}/${PN}/graphics/libgraphics_sdl.so " +FILES_${PN}-graphics-gtk = " ${libdir}/${PN}/graphics/libgraphics_gtk_drawing_area.so " + #Second launcher for shr SRC_URI_append_shr = "file://navitD.desktop \ file://navitD.png \ " -DEPENDS_append_shr = " gypsy" -RDEPENDS_append_shr = " fsoraw" - do_configure_prepend() { #Remove xpm building, replaced by icons in own package sed -i 's/\(.*SUBDIRS.*\) xpm\( \|$\)\(.*\)/\1\2\3/g' ${S}/navit/Makefile.am diff --git a/recipes/ncurses/ncurses-native_5.4.bb b/recipes/ncurses/ncurses-native_5.4.bb deleted file mode 100644 index 749e1c487a..0000000000 --- a/recipes/ncurses/ncurses-native_5.4.bb +++ /dev/null @@ -1,7 +0,0 @@ -require ncurses_${PV}.bb -inherit native -EXTRA_OEMAKE = '"BUILD_CCFLAGS=${BUILD_CCFLAGS}"' -DEPENDS = "" - -SRC_URI[md5sum] = "069c8880072060373290a4fefff43520" -SRC_URI[sha256sum] = "5abce063cf431790f4e6a801a96c7eea0b33a41ecd0970f6312f52575c083b36" diff --git a/recipes/ncurses/ncurses-sdk_5.4.bb b/recipes/ncurses/ncurses-sdk_5.4.bb deleted file mode 100644 index fb69c1ec7d..0000000000 --- a/recipes/ncurses/ncurses-sdk_5.4.bb +++ /dev/null @@ -1,3 +0,0 @@ -require ncurses_${PV}.bb -inherit sdk -EXTRA_OEMAKE = '"BUILD_CCFLAGS=${BUILD_CCFLAGS}"' diff --git a/recipes/ncurses/ncurses.inc b/recipes/ncurses/ncurses.inc index 337d670cc5..48412c1998 100644 --- a/recipes/ncurses/ncurses.inc +++ b/recipes/ncurses/ncurses.inc @@ -3,13 +3,12 @@ HOMEPAGE = "http://www.gnu.org/software/ncurses/ncurses.html" LICENSE = "MIT" SECTION = "libs" DEPENDS = "ncurses-native" +INC_PR = "r20" inherit autotools PARALLEL_MAKE="" -FILESPATH = "${FILE_DIRNAME}/local:${FILE_DIRNAME}/ncurses-${PV}-${PR}:${FILE_DIRNAME}/ncurses-${PV}:${FILE_DIRNAME}/ncurses:${FILE_DIRNAME}" - EXTRA_OECONF = "\ --enable-static \ --with-shared \ @@ -112,8 +111,7 @@ FILES_${PN}-tools = "\ FILES_${PN}-terminfo = "\ ${datadir}/terminfo \ " -RSUGGESTS_${PN} = "ncurses-terminfo" +RSUGGESTS_${PN} = "${PN}-terminfo" RPROVIDES_${PN} = "libncurses5" RCONFLICTS_${PN} = "libncurses5" RREPLACES_${PN} = "libncurses5" - diff --git a/recipes/ncurses/ncurses_5.4.bb b/recipes/ncurses/ncurses_5.4.bb index 8c0f62c48a..d358e162ec 100644 --- a/recipes/ncurses/ncurses_5.4.bb +++ b/recipes/ncurses/ncurses_5.4.bb @@ -1,5 +1,3 @@ -PR = "r20" - SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \ file://makefile_tweak.patch \ file://use_ldflags.patch \ @@ -7,8 +5,14 @@ SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \ S = "${WORKDIR}/ncurses-${PV}" require ncurses.inc +PR = "${INC_PR}.0" LEAD_SONAME = "libncurses.so.5" SRC_URI[md5sum] = "069c8880072060373290a4fefff43520" SRC_URI[sha256sum] = "5abce063cf431790f4e6a801a96c7eea0b33a41ecd0970f6312f52575c083b36" + +BBCLASSEXTEND = "native sdk" +DEPENDS_virtclass-native = "" +EXTRA_OEMAKE_virtclass-native = '"BUILD_CCFLAGS=${BUILD_CCFLAGS}"' +EXTRA_OEMAKE_virtclass-sdk = '"BUILD_CCFLAGS=${BUILD_CCFLAGS}"' diff --git a/recipes/netbase/netbase/htcdream/interfaces b/recipes/netbase/netbase/htcdream/interfaces new file mode 100644 index 0000000000..a75f25957e --- /dev/null +++ b/recipes/netbase/netbase/htcdream/interfaces @@ -0,0 +1,17 @@ +# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) + +# The loopback interface +auto lo +iface lo inet loopback + +# Ethernet/RNDIS gadget (g_ether) +# ... or on host side, usbnet and random hwaddr +auto usb0 +iface usb0 inet static + address 192.168.0.202 + netmask 255.255.255.0 + network 192.168.0.0 + up route add default gw 192.168.0.200 metric 8 + up echo nameserver 208.67.222.222 > /etc/resolv.conf + up echo nameserver 208.67.220.220 >> /etc/resolv.conf + down route del default gw 192.168.0.200 metric 8 diff --git a/recipes/netbase/netbase_4.21.bb b/recipes/netbase/netbase_4.21.bb index 4e1d39f1cc..baec44bafc 100644 --- a/recipes/netbase/netbase_4.21.bb +++ b/recipes/netbase/netbase_4.21.bb @@ -2,7 +2,7 @@ DESCRIPTION = "This package provides the necessary \ infrastructure for basic TCP/IP based networking." SECTION = "base" LICENSE = "GPLv2" -PR = "r41" +PR = "r42" inherit update-rc.d diff --git a/recipes/netkit-tftp/netkit-tftpd_0.17.bb b/recipes/netkit-tftp/netkit-tftpd_0.17.bb index cba5357fe2..44f29a1b6b 100644 --- a/recipes/netkit-tftp/netkit-tftpd_0.17.bb +++ b/recipes/netkit-tftp/netkit-tftpd_0.17.bb @@ -12,7 +12,7 @@ SRC_URI = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-tftp-${PV}. S = "${WORKDIR}/netkit-tftp-${PV}" -PR = "r7" +PR = "r8" EXTRA_OEMAKE = "" do_compile () { diff --git a/recipes/netpbm/netpbm_10.28.bb b/recipes/netpbm/netpbm_10.28.bb index d33c6b705b..dc4b34d213 100644 --- a/recipes/netpbm/netpbm_10.28.bb +++ b/recipes/netpbm/netpbm_10.28.bb @@ -25,7 +25,7 @@ RDEPENDS_${PN} = "perl\ RDEPENDS_${PN} += "perl-module-exporter-heavy" RDEPENDS_${PN} += "perl-module-file-spec-unix" -PR = "r7" +PR = "r8" SRC_URI = "${SOURCEFORGE_MIRROR}/netpbm/netpbm-${PV}.tgz \ file://ppmtojpeg.patch;striplevel=42 \ diff --git a/recipes/networkmanager/cnetworkmanager_git.bb b/recipes/networkmanager/cnetworkmanager_git.bb index 1bb5be7517..d8ec179dc2 100644 --- a/recipes/networkmanager/cnetworkmanager_git.bb +++ b/recipes/networkmanager/cnetworkmanager_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://vidner.net/martin/software/cnetworkmanager/" LICENSE = "GPL" SECTION = "console/network" RDEPENDS_${PN} = "python-core python-crypt python-dbus python-math python-pygobject python-re python-textutils python-uuid python-xml" -PR = "r1" +PR = "r2" PV = "0.8+git" SRC_URI = "git://repo.or.cz/r/cnetworkmanager.git;protocol=http;tag=801f95b5fd856cd8ec25dc56839f47c1a12e6041" diff --git a/recipes/networkmanager/netm-cli_0.2.bb b/recipes/networkmanager/netm-cli_0.2.bb index 5892184e2a..484c8e33f6 100644 --- a/recipes/networkmanager/netm-cli_0.2.bb +++ b/recipes/networkmanager/netm-cli_0.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://dev.openbossa.org/mamona/gitweb?p=users/salveti/netm-cli.git; LICENSE = "GPLv2" SECTION = "console/network" RDEPENDS_${PN} = "python-dbus python-pygobject python-textutils networkmanager (>=0.6) networkmanager (<0.7)" -PR = "r3" +PR = "r4" inherit setuptools diff --git a/recipes/networkmanager/network-manager-applet_0.7.1.bb b/recipes/networkmanager/network-manager-applet_0.7.1.bb index f5d241a137..8c2440ca83 100644 --- a/recipes/networkmanager/network-manager-applet_0.7.1.bb +++ b/recipes/networkmanager/network-manager-applet_0.7.1.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" DEPENDS = "policykit-gnome libnotify networkmanager dbus-glib libglade gconf gnome-keyring" RDEPENDS_${PN} = "networkmanager" -PR = "r2" +PR = "r3" inherit gnome diff --git a/recipes/networkmanager/network-manager-applet_0.8.bb b/recipes/networkmanager/network-manager-applet_0.8.bb index 27d98283d4..31e3639d50 100644 --- a/recipes/networkmanager/network-manager-applet_0.8.bb +++ b/recipes/networkmanager/network-manager-applet_0.8.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" DEPENDS = "gnome-bluetooth policykit-gnome libnotify networkmanager dbus-glib libglade gconf gnome-keyring" RDEPENDS_${PN} = "networkmanager" -PR = "r2" +PR = "r3" inherit gnome diff --git a/recipes/networkmanager/networkmanager-openvpn_0.7.1.bb b/recipes/networkmanager/networkmanager-openvpn_0.7.1.bb index cb5402b540..1fd2fbac4f 100644 --- a/recipes/networkmanager/networkmanager-openvpn_0.7.1.bb +++ b/recipes/networkmanager/networkmanager-openvpn_0.7.1.bb @@ -14,7 +14,7 @@ EXTRA_OECONF = " \ inherit autotools pkgconfig -PR = "r1" +PR = "r2" SRC_URI += "http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.7/NetworkManager-openvpn-${PV}.tar.bz2 \ " diff --git a/recipes/networkmanager/networkmanager-openvpn_0.8.bb b/recipes/networkmanager/networkmanager-openvpn_0.8.bb index 0750bac20a..884fd33088 100644 --- a/recipes/networkmanager/networkmanager-openvpn_0.8.bb +++ b/recipes/networkmanager/networkmanager-openvpn_0.8.bb @@ -14,7 +14,7 @@ EXTRA_OECONF = " \ inherit autotools pkgconfig -PR = "r1" +PR = "r2" SRC_URI += "${GNOME_MIRROR}/NetworkManager-openvpn/${PV}/NetworkManager-openvpn-${PV}.tar.bz2 \ " diff --git a/recipes/networkmanager/networkmanager_0.6.4.bb b/recipes/networkmanager/networkmanager_0.6.4.bb index ee65477587..4936becd64 100644 --- a/recipes/networkmanager/networkmanager_0.6.4.bb +++ b/recipes/networkmanager/networkmanager_0.6.4.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" DEPENDS = "libnl dbus dbus-glib libhal-nm libgpewidget gnome-keyring gconf wireless-tools libglade" RDEPENDS_${PN} = "wpa-supplicant iproute2 dhcdbd gnome-keyring hicolor-icon-theme" -PR = "r6" +PR = "r7" SRC_URI="http://www.handhelds.org/~mmp/files/NetworkManager-${PV}-gpe.tar.gz \ file://dbus-api-fix.patch \ diff --git a/recipes/nfs-utils/nfs-utils_1.0.6.bb b/recipes/nfs-utils/nfs-utils_1.0.6.bb index 3a07856e31..1e860d513f 100644 --- a/recipes/nfs-utils/nfs-utils_1.0.6.bb +++ b/recipes/nfs-utils/nfs-utils_1.0.6.bb @@ -2,7 +2,7 @@ DESCRIPTION = "userspace utilities for kernel nfs" PRIORITY = "optional" SECTION = "console/network" LICENSE = "GPL" -PR = "r13" +PR = "r14" SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \ file://acinclude-lossage.patch \ diff --git a/recipes/nfs-utils/nfs-utils_1.1.2.bb b/recipes/nfs-utils/nfs-utils_1.1.2.bb index 5d3352e218..f7da598910 100644 --- a/recipes/nfs-utils/nfs-utils_1.1.2.bb +++ b/recipes/nfs-utils/nfs-utils_1.1.2.bb @@ -3,7 +3,7 @@ PRIORITY = "optional" SECTION = "console/network" LICENSE = "GPL" -PR = "r8" +PR = "r9" DEPENDS = "util-linux-ng tcp-wrappers libevent" diff --git a/recipes/nonworking/e2fsprogs/e2fsprogs.inc b/recipes/nonworking/e2fsprogs/e2fsprogs.inc index f9dae6ecf0..37d3b6d2de 100644 --- a/recipes/nonworking/e2fsprogs/e2fsprogs.inc +++ b/recipes/nonworking/e2fsprogs/e2fsprogs.inc @@ -9,7 +9,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz" S = "${WORKDIR}/e2fsprogs-${PV}" -INC_PR = "r23" +INC_PR = "r24" inherit autotools diff --git a/recipes/nonworking/e2fsprogs/e2fsprogs_1.41.2.bb b/recipes/nonworking/e2fsprogs/e2fsprogs_1.41.2.bb index 13b015489b..3cb5f9c38f 100644 --- a/recipes/nonworking/e2fsprogs/e2fsprogs_1.41.2.bb +++ b/recipes/nonworking/e2fsprogs/e2fsprogs_1.41.2.bb @@ -1,6 +1,6 @@ require e2fsprogs.inc -PR = "r0" +PR = "r1" DEFAULT_PREFERENCE = "-1" SRC_URI += "file://no-hardlinks.patch" diff --git a/recipes/nonworking/gpe-contacts/gpe-contacts-hildon_0.40.bb b/recipes/nonworking/gpe-contacts/gpe-contacts-hildon_0.40.bb index e65c15c034..91a634d160 100644 --- a/recipes/nonworking/gpe-contacts/gpe-contacts-hildon_0.40.bb +++ b/recipes/nonworking/gpe-contacts/gpe-contacts-hildon_0.40.bb @@ -1,6 +1,6 @@ require gpe-contacts.inc -PR ="r2" +PR = "r3" SRC_URI = "${GPE_MIRROR}/gpe-contacts-${PV}.tar.bz2" DEPENDS += "gtk+-2.6.4-1.osso7 libgpepimc-hildon libosso hildon-lgpl" diff --git a/recipes/nonworking/gpe-contacts/gpe-contacts-hildon_0.42.bb b/recipes/nonworking/gpe-contacts/gpe-contacts-hildon_0.42.bb index e8ccced4e3..7b0e97ee77 100644 --- a/recipes/nonworking/gpe-contacts/gpe-contacts-hildon_0.42.bb +++ b/recipes/nonworking/gpe-contacts/gpe-contacts-hildon_0.42.bb @@ -1,6 +1,6 @@ require gpe-contacts.inc -PR ="r2" +PR = "r3" SRC_URI = "${GPE_MIRROR}/gpe-contacts-${PV}.tar.bz2" DEPENDS += "gtk+-2.6.4-1.osso7 libgpepimc-hildon libosso hildon-lgpl" diff --git a/recipes/nonworking/gpe-contacts/gpe-contacts.inc b/recipes/nonworking/gpe-contacts/gpe-contacts.inc index b98d6b36d9..7a7fdbecfd 100644 --- a/recipes/nonworking/gpe-contacts/gpe-contacts.inc +++ b/recipes/nonworking/gpe-contacts/gpe-contacts.inc @@ -1,7 +1,7 @@ LICENSE = "GPL" inherit gpe autotools pkgconfig -PR = "r0" +PR = "r1" DEPENDS = "libgpewidget libdisplaymigration libgpevtype dbus" SECTION = "gpe" diff --git a/recipes/nonworking/gtk+/gtk+-directfb_2.10.14.bb b/recipes/nonworking/gtk+/gtk+-directfb_2.10.14.bb index 2b7ea24095..2b69eac46a 100644 --- a/recipes/nonworking/gtk+/gtk+-directfb_2.10.14.bb +++ b/recipes/nonworking/gtk+/gtk+-directfb_2.10.14.bb @@ -1,14 +1,14 @@ require gtk-2.10.inc -PR = "r2" +PR = "r3" # disable per default - untested and not all patches included. DEFAULT_PREFERENCE = "-1" S = "${WORKDIR}/gtk+-${PV}" -RCONFLICTS = "gtk+" -RPROVIDES ="gtk+-directfb" +RCONFLICTS_${PN} = "gtk+" +RPROVIDES_${PN} ="gtk+-directfb" DEPENDS = "glib-2.0 pango-directfb atk jpeg libpng gtk-doc libgcrypt cairo-directfb cups" LDFLAGS_append += " -ldirectfb" CFLAGS_append += " -I${STAGING_INCDIR}/directfb" diff --git a/recipes/nonworking/icecast/icecast_2.2.0.bb b/recipes/nonworking/icecast/icecast_2.2.0.bb index 59f607c310..44eea399e3 100644 --- a/recipes/nonworking/icecast/icecast_2.2.0.bb +++ b/recipes/nonworking/icecast/icecast_2.2.0.bb @@ -1,4 +1,4 @@ -PR = "r4" +PR = "r5" LICENSE = "GPLv2" DEPENDS = "libvorbis libogg libxslt" diff --git a/recipes/nonworking/linux/linux-mtx-1_2.4.24.bb b/recipes/nonworking/linux/linux-mtx-1_2.4.24.bb index 728ea1b135..3e28dad6ee 100644 --- a/recipes/nonworking/linux/linux-mtx-1_2.4.24.bb +++ b/recipes/nonworking/linux/linux-mtx-1_2.4.24.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Linux kernel for MTX-1 (MeshCube)" LICENSE = "GPL" KV = "${PV}" RDEPENDS_${PN} = "mtd-utils" -PR ="r2" +PR = "r3" SRC_URI = "cvs://cvs:cvs@ftp.linux-mips.org/home/cvs;module=linux;tag=linux_2_4_24_pre2 \ file://01-mtd-2004-01-27.diff \ diff --git a/recipes/nonworking/meta/meta-gpephone.bb b/recipes/nonworking/meta/meta-gpephone.bb index 0a80341546..31c9b83995 100644 --- a/recipes/nonworking/meta/meta-gpephone.bb +++ b/recipes/nonworking/meta/meta-gpephone.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Meta-package for GPE Palmtop Environment Phone packages" LICENSE = "MIT" -PR = "r1" +PR = "r2" RDEPENDS_${PN} = "\ gpephone-task-base \ diff --git a/recipes/nonworking/meta/meta-sectest-gpe.bb b/recipes/nonworking/meta/meta-sectest-gpe.bb index 288f0fb923..260648dac9 100644 --- a/recipes/nonworking/meta/meta-sectest-gpe.bb +++ b/recipes/nonworking/meta/meta-sectest-gpe.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Meta-package for GPE Security Testing Image" LICENSE = "MIT" -PR = "r6" +PR = "r7" RDEPENDS_${PN} = "\ gpe-task-base \ diff --git a/recipes/nonworking/python/python-sword_1.5.10.bb b/recipes/nonworking/python/python-sword_1.5.10.bb index bb419934ec..c6acd5c726 100644 --- a/recipes/nonworking/python/python-sword_1.5.10.bb +++ b/recipes/nonworking/python/python-sword_1.5.10.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" RDEPENDS_${PN} = "python-core sword" DEPENDS = "sword-${PV} swig-native" SRCNAME = "sword" -PR = "r0" +PR = "r1" SRC_URI = "http://crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-${PV}.tar.gz" diff --git a/recipes/notifier/notifier_0.2.bb b/recipes/notifier/notifier_0.2.bb index 6dac95a608..87e4c63eb1 100644 --- a/recipes/notifier/notifier_0.2.bb +++ b/recipes/notifier/notifier_0.2.bb @@ -4,7 +4,7 @@ AUTHOR = "Pietro Montorfano" LICENSE = "GPLv3" RDEPENDS_${PN} = "python-elementary python python-edbus" SECTION = "x11/application" -PR = "r2" +PR = "r3" SRC_URI = "http://monto.homelinux.org/notifier;name=archive \ http://monto.homelinux.org/89notifier;name=init" diff --git a/recipes/ntfs-3g/ntfs-3g_1.0.bb b/recipes/ntfs-3g/ntfs-3g_1.0.bb index 02dea3c97f..c9b03b1af2 100644 --- a/recipes/ntfs-3g/ntfs-3g_1.0.bb +++ b/recipes/ntfs-3g/ntfs-3g_1.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.ntfs-3g.org/" LICENSE = "GPLv2" DEPENDS = "fuse" RDEPENDS_${PN} = "fuse" -PR = "r0" +PR = "r1" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/ntp/ntp.inc b/recipes/ntp/ntp.inc index 68b98db80f..5a90e740c0 100644 --- a/recipes/ntp/ntp.inc +++ b/recipes/ntp/ntp.inc @@ -6,7 +6,7 @@ HOMEPAGE = "http://ntp.isc.org/bin/view/Main/WebHome" SECTION = "console/network" PRIORITY = "optional" LICENSE = "ntp" -RSUGGESTS = "iana-etc" +RSUGGESTS_${PN} = "iana-etc" SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${P}.tar.gz \ file://ipv6only-workaround.patch \ diff --git a/recipes/ntpclient/ntpclient_2003_194.bb b/recipes/ntpclient/ntpclient_2003_194.bb index 8b224daf85..a00326c82d 100644 --- a/recipes/ntpclient/ntpclient_2003_194.bb +++ b/recipes/ntpclient/ntpclient_2003_194.bb @@ -4,7 +4,7 @@ AUTHOR = "Larry Doolittle <larry@doolittle.boa.org>" RDEPENDS_${PN} = "busybox" SECTION = "admin" LICENSE = "GPLv2" -PR = "r1" +PR = "r2" # The ntpclient package uses version numbers that include an underscore :( PV = "2003_194" # ntpclient unpacks into a directory that doesn't include version info :( diff --git a/recipes/ntpclient/ntpclient_2007_365.bb b/recipes/ntpclient/ntpclient_2007_365.bb index f3c85df1f1..40a4e1b933 100644 --- a/recipes/ntpclient/ntpclient_2007_365.bb +++ b/recipes/ntpclient/ntpclient_2007_365.bb @@ -4,7 +4,7 @@ AUTHOR = "Larry Doolittle <larry@doolittle.boa.org>" RDEPENDS_${PN} = "busybox" SECTION = "admin" LICENSE = "GPLv2" -PR = "r2" +PR = "r3" # The ntpclient package uses version numbers that include an underscore :( PV = "2007_365" # ntpclient unpacks into a directory that doesn't include version info :( diff --git a/recipes/numptyphysics/numptyphysics_svn.bb b/recipes/numptyphysics/numptyphysics_svn.bb index 2f6aa2d6e0..744cd96784 100644 --- a/recipes/numptyphysics/numptyphysics_svn.bb +++ b/recipes/numptyphysics/numptyphysics_svn.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://numptyphysics.garage.maemo.org/" SECTION = "x11/games" SRCREV = "109" PV = "0.2+svnr${SRCPV}" -PR = "r2" +PR = "r3" inherit autotools diff --git a/recipes/nunome/nunome_1.0.2.bb b/recipes/nunome/nunome_1.0.2.bb index 1d980281de..2429a2b3c0 100644 --- a/recipes/nunome/nunome_1.0.2.bb +++ b/recipes/nunome/nunome_1.0.2.bb @@ -4,7 +4,7 @@ SECTION = "opie/inputmethods" PRIORITY = "optional" LICENSE = "GPL" RDEPENDS_${PN} = "virtual-japanese-font" -PR = "r4" +PR = "r5" SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei/nunome-${PV}.tar.bz2 \ file://timer.patch \ diff --git a/recipes/nxcl/libnxcl_0.9.bb b/recipes/nxcl/libnxcl_0.9.bb index 6900248207..252368582f 100644 --- a/recipes/nxcl/libnxcl_0.9.bb +++ b/recipes/nxcl/libnxcl_0.9.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Backend library for the free nx-clients" HOMEPAGE = "http://freenx.berlios.de/" SECTION = "libs" LICENSE = "GPL" -PR = "r2" +PR = "r3" RDEPENDS_${PN} = "nxproxy nxssh" diff --git a/recipes/nylon/nylon-scripts_cvs.bb b/recipes/nylon/nylon-scripts_cvs.bb index e22be32a54..69968f4603 100644 --- a/recipes/nylon/nylon-scripts_cvs.bb +++ b/recipes/nylon/nylon-scripts_cvs.bb @@ -7,7 +7,7 @@ LICENSE = "GPLv2" #SRCDATE = "20060923" SRCDATE = "20051022" PV = "1.0.0+cvs${SRCDATE}" -PR = "r2" +PR = "r3" RDEPENDS_${PN} = "bash" SRC_URI = "http://download.berlin.freifunk.net/meshcube.org/nylon/stable/sources/${PN}_gruen.4g__${SRCDATE}.tar.gz \ diff --git a/recipes/nylon/nylon-statistics.bb b/recipes/nylon/nylon-statistics.bb index 03cfe0c2d6..3cdf3f5535 100644 --- a/recipes/nylon/nylon-statistics.bb +++ b/recipes/nylon/nylon-statistics.bb @@ -6,7 +6,7 @@ LICENSE = "GPLv2" #SRCDATE = "20050909" SRCDATE = "20051022" PV = "1.0.0+cvs${SRCDATE}" -PR = "r1" +PR = "r2" SRC_URI = "http://download.berlin.freifunk.net/meshcube.org/nylon/stable/sources/${PN}_gruen.4g__${SRCDATE}.tar.gz" S = "${WORKDIR}/${PN}" diff --git a/recipes/obsolete/ffalarms/ffalarms_0.2.2.bb b/recipes/obsolete/ffalarms/ffalarms_0.2.2.bb index 70a35a1fa2..d259a26a56 100644 --- a/recipes/obsolete/ffalarms/ffalarms_0.2.2.bb +++ b/recipes/obsolete/ffalarms/ffalarms_0.2.2.bb @@ -20,7 +20,7 @@ RDEPENDS_${PN} += "python-re python-datetime python-edje python-ecore \ atd-over-fso alsa-utils-amixer alsa-utils-alsactl \ ttf-dejavu-sans" -RSUGGESTS += "mplayer alsa-utils-aplay openmoko-alsa-scenarios" +RSUGGESTS_${PN} += "mplayer alsa-utils-aplay openmoko-alsa-scenarios" SRC_URI[archive.md5sum] = "6f03b9663245b93e8370e43cc556dba1" SRC_URI[archive.sha256sum] = "df0561124faa5c2e64038f5efcf39432c4795829115b86819083ae66b001899a" diff --git a/recipes/obsolete/maemo/osso-gnome-vfs2_2.8.4.4-1.bb b/recipes/obsolete/maemo/osso-gnome-vfs2_2.8.4.4-1.bb index c0ae618fa5..a5e31d05b2 100644 --- a/recipes/obsolete/maemo/osso-gnome-vfs2_2.8.4.4-1.bb +++ b/recipes/obsolete/maemo/osso-gnome-vfs2_2.8.4.4-1.bb @@ -1,9 +1,9 @@ DESCRIPTION = "The Gnome Virtual File System - OSSO Version" LICENSE = "GPL" SECTION = "x11/gnome" -PR = "r4" +PR = "r5" PROVIDES = "virtual/gnome-vfs" -RPROVIDES = "gnome-vfs" +RPROVIDES_${PN} = "gnome-vfs" inherit gnome pkgconfig diff --git a/recipes/obsolete/openmoko-3rdparty/babiloo-efl_2.0.9-3.bb b/recipes/obsolete/openmoko-3rdparty/babiloo-efl_2.0.9-3.bb index e9b0a56752..0603b015ac 100644 --- a/recipes/obsolete/openmoko-3rdparty/babiloo-efl_2.0.9-3.bb +++ b/recipes/obsolete/openmoko-3rdparty/babiloo-efl_2.0.9-3.bb @@ -9,7 +9,7 @@ RDEPENDS_${PN} = "python-elementary python-compression python-misc python-netcli PACKAGE_ARCH = "all" PV = "2.0.9-3" -PR = "r0" +PR = "r1" SRC_URI = "http://bazaar.launchpad.net/%7Evaudano/babiloo/efl/download/head%3A/babiloo_2.0.93.tar.g-20091127144609-qfgdm9zxdc47ap4y-1/babiloo_2.0.9-3.tar.gz;name=tarball" SRC_URI[tarball.md5sum] = "3f254dbbe7dd7a4c9527e1e17686101b" diff --git a/recipes/obsolete/openmoko-3rdparty/babiloo-efl_2.0.9-4.bb b/recipes/obsolete/openmoko-3rdparty/babiloo-efl_2.0.9-4.bb index 32ca643833..c668542b8b 100644 --- a/recipes/obsolete/openmoko-3rdparty/babiloo-efl_2.0.9-4.bb +++ b/recipes/obsolete/openmoko-3rdparty/babiloo-efl_2.0.9-4.bb @@ -9,7 +9,7 @@ RDEPENDS_${PN} = "python-elementary python-compression python-misc python-netcli PACKAGE_ARCH = "all" PV = "2.0.9-4" -PR = "r1" +PR = "r2" SRC_URI = "http://bazaar.launchpad.net/%7Evaudano/babiloo/efl/download/head%3A/babiloo_2.0.94.tar.g-20091201105555-efky7gi6fkm39xw8-2/babiloo_2.0.9-4.tar.gz;name=tarball" SRC_URI[tarball.md5sum] = "f5f25daff7accb8d409fa9f94c49fc17" diff --git a/recipes/obsolete/python/python-efl.inc b/recipes/obsolete/python/python-efl.inc index d8559eab5b..745ba57cc6 100644 --- a/recipes/obsolete/python/python-efl.inc +++ b/recipes/obsolete/python/python-efl.inc @@ -8,7 +8,7 @@ HOMEPAGE = "http://www.enlightenment.org" DEPENDS = "python-cython-native python-pyrex-native python-numeric eina" RDEPENDS_${PN} += "python-lang" PV = "0.3.1+svnr${SRCPV}" -PR = "ml0" +PR = "ml1" inherit setuptools diff --git a/recipes/obsolete/python/python-etk_svn.bb b/recipes/obsolete/python/python-etk_svn.bb index 54f9c6e3cd..a914e78dac 100644 --- a/recipes/obsolete/python/python-etk_svn.bb +++ b/recipes/obsolete/python/python-etk_svn.bb @@ -2,7 +2,7 @@ require python-efl.inc DEPENDS += "etk python-evas python-ecore" RDEPENDS_${PN} += "python-evas python-ecore python-edje python-numeric python-math etk-themes" PV = "0.1.1+svnr${SRCPV}" -PR = "ml1" +PR = "ml2" SRCREV = "${EFL_SRCREV}" diff --git a/recipes/obsolete/shr/etk-theme-neo_git.bb b/recipes/obsolete/shr/etk-theme-neo_git.bb index 42fcf701b9..b216c0d744 100644 --- a/recipes/obsolete/shr/etk-theme-neo_git.bb +++ b/recipes/obsolete/shr/etk-theme-neo_git.bb @@ -1,12 +1,12 @@ DESCRIPTION = "nEo etk theme - a very fast, high contrast etk theme" HOMEPAGE = "http://jmccloud.jm.funpic.de" AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com" -RSUGGESTS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo gpe-theme-neo icon-theme-neo" +RSUGGESTS_${PN} = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo gpe-theme-neo icon-theme-neo" LICENSE = "unknown" SRCREV = "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" PV = "0.2-${EFL_SRCREV}+gitr${SRCPV}" -PR = "r4" +PR = "r5" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/obsolete/shr/libframeworkd-phonegui-efl-theme-neo_git.bb b/recipes/obsolete/shr/libframeworkd-phonegui-efl-theme-neo_git.bb index 637aa36d26..f716a1705d 100644 --- a/recipes/obsolete/shr/libframeworkd-phonegui-efl-theme-neo_git.bb +++ b/recipes/obsolete/shr/libframeworkd-phonegui-efl-theme-neo_git.bb @@ -2,12 +2,12 @@ DESCRIPTION = "nEo libframeworkd-phonegui-efl - a very fast, high contrast etk t HOMEPAGE = "http://jmccloud.jm.funpic.de" AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com" RDEPENDS_${PN} = "libframeworkd-phonegui-efl" -RSUGGESTS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo etk-theme-neo gpe-theme-neo icon-theme-neo" +RSUGGESTS_${PN} = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo etk-theme-neo gpe-theme-neo icon-theme-neo" LICENSE = "unknown" SRCREV = "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" PV = "0.2-${EFL_SRCREV}+gitr${SRCPV}" -PR = "r3" +PR = "r4" require libframeworkd-phonegui-efl-theme.inc diff --git a/recipes/obsolete/tasks/task-bootstrap-unionroot.bb b/recipes/obsolete/tasks/task-bootstrap-unionroot.bb index c7809790fc..64bdcc3d7e 100644 --- a/recipes/obsolete/tasks/task-bootstrap-unionroot.bb +++ b/recipes/obsolete/tasks/task-bootstrap-unionroot.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Core packages required for a basic installation with unionroot" PROVIDES = "task-bootstrap" -RPROVIDES = "task-bootstrap" -PR = "r2" +RPROVIDES_${PN} = "task-bootstrap" +PR = "r3" DEFAULT_PREFERENCE = "-1" # The BOOTSTRAP_EXTRA_ variables are often manipulated by the diff --git a/recipes/obsolete/tasks/task-bootstrap.bb b/recipes/obsolete/tasks/task-bootstrap.bb index af2a37df98..bf8e762e40 100644 --- a/recipes/obsolete/tasks/task-bootstrap.bb +++ b/recipes/obsolete/tasks/task-bootstrap.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Core packages required for a basic installation" -PR = "r25" +PR = "r26" # The BOOTSTRAP_EXTRA_ variables are often manipulated by the # MACHINE .conf files, so adjust PACKAGE_ARCH accordingly. diff --git a/recipes/obsolete/xorg-xserver/xserver-xorg_1.6.1.bb b/recipes/obsolete/xorg-xserver/xserver-xorg_1.6.1.bb index 4d0c0a2a43..630ec576d6 100644 --- a/recipes/obsolete/xorg-xserver/xserver-xorg_1.6.1.bb +++ b/recipes/obsolete/xorg-xserver/xserver-xorg_1.6.1.bb @@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server" DEPENDS += "pixman libpciaccess openssl xineramaproto libxinerama" RDEPENDS_${PN} += "hal" PE = "2" -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" SRC_URI += "file://sysroot_fix.patch \ file://dolt-fix.patch" diff --git a/recipes/obsolete/zd1211/zd1211_r77.bb b/recipes/obsolete/zd1211/zd1211_r77.bb index 54c938ef34..1e2a818f7d 100644 --- a/recipes/obsolete/zd1211/zd1211_r77.bb +++ b/recipes/obsolete/zd1211/zd1211_r77.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Driver for zd1211 family of wireless USB Dongles" PRIORITY = "optional" SECTION = "kernel/modules" LICENSE = "GPL" -PR = "r3" +PR = "r4" RDEPENDS_${PN} = "wireless-tools" SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ diff --git a/recipes/obsolete/zd1211/zd1211_r83.bb b/recipes/obsolete/zd1211/zd1211_r83.bb index 8237682a38..fcb8343236 100644 --- a/recipes/obsolete/zd1211/zd1211_r83.bb +++ b/recipes/obsolete/zd1211/zd1211_r83.bb @@ -4,7 +4,7 @@ SECTION = "kernel/modules" PRIORITY = "optional" LICENSE = "GPL" RDEPENDS_${PN} = "wireless-tools" -PR = "r1" +PR = "r2" SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ file://makefile.patch" diff --git a/recipes/omview/omview_svn.bb b/recipes/omview/omview_svn.bb index 7e65d2b77b..2d1b258fc9 100644 --- a/recipes/omview/omview_svn.bb +++ b/recipes/omview/omview_svn.bb @@ -5,7 +5,7 @@ DEPENDS += " evas ewl epsilon" RDEPENDS_${PN} += " epsilon-thumbd" SRCREV = "34" PV = "0.0.1+svnr${SRCPV}" -PR = "r2" +PR = "r3" inherit autotools diff --git a/recipes/openais/openais_1.1.2.bb b/recipes/openais/openais_1.1.3.bb index 118264c9e5..84d220301d 100644 --- a/recipes/openais/openais_1.1.2.bb +++ b/recipes/openais/openais_1.1.3.bb @@ -3,11 +3,11 @@ LICENSE = "BSD" DEPENDS = "cluster-glue corosync" SRC_URI = " \ - ftp://ftp@openais.org/downloads/openais-${PV}/openais-${PV}.tar.gz;name=tar \ + ftp://ftp@openais.org/downloads/openais-${PV}/openais-${PV}.tar.gz \ file://fix-lcrso-linkage.patch \ " -SRC_URI[tar.md5sum] = "f94ccb867358ac54ab24bc54def27335" -SRC_URI[tar.sha256sum] = "7ba87dc480a9dd224fe3a3732c966d6fdf6ec5f192bb184d586afa3703f808f2" +SRC_URI[md5sum] = "13d8d590f806fb396d750b086c6c0b78" +SRC_URI[sha256sum] = "eeef58dd2df3eb16ba68b3fbdc6f0d4dfb537443f1c091ec6f0431594f2f00b6" inherit autotools_stage diff --git a/recipes/openbmap/openbmap-logger_0.2.0.bb b/recipes/openbmap/openbmap-logger_0.2.0.bb index ee61fb7c78..aebb743ba5 100644 --- a/recipes/openbmap/openbmap-logger_0.2.0.bb +++ b/recipes/openbmap/openbmap-logger_0.2.0.bb @@ -2,7 +2,7 @@ DESCRIPTION = "openBmap logger and uploader of GPS/GSM data" SECTION = "x11/utils" DEPENDS = "python python-dbus python-pygobject python-pygtk libglade" RDEPENDS_${PN} = "python-subprocess python-netclient python-math python-core python-io" -PR = "r1" +PR = "r2" inherit python-dir diff --git a/recipes/openbmap/openbmap-logger_0.4.0.bb b/recipes/openbmap/openbmap-logger_0.4.0.bb index f364ccb2f9..43de626b05 100644 --- a/recipes/openbmap/openbmap-logger_0.4.0.bb +++ b/recipes/openbmap/openbmap-logger_0.4.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "openBmap logger and uploader of GPS/GSM data" SECTION = "x11/utils" -PR = "r1" +PR = "r2" SRC_URI = "\ ${SOURCEFORGE_MIRROR}/myposition/openbmap-logger-${PV}.tar.gz \ diff --git a/recipes/openbsc/openbsc.inc b/recipes/openbsc/openbsc.inc index d4549ee897..73d6e3e93a 100644 --- a/recipes/openbsc/openbsc.inc +++ b/recipes/openbsc/openbsc.inc @@ -4,6 +4,6 @@ HOMEPAGE = "http://openbsc.gnumonks.org" RDEPENDS_${PN} = "libdbd-sqlite3" -INC_PR="r0" +INC_PR="r1" inherit autotools diff --git a/recipes/opencv/opencv_1.0.0.bb b/recipes/opencv/opencv_1.0.0.bb index 60e0d5b2c8..46ab29ec32 100644 --- a/recipes/opencv/opencv_1.0.0.bb +++ b/recipes/opencv/opencv_1.0.0.bb @@ -4,7 +4,7 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "GPLv2" -PR = "r2" +PR = "r3" DEPENDS = "libtool swig swig-native python jpeg zlib libpng tiff glib-2.0" #RDEPENDS_${PN} = "python jpeg zlib libpng tiff glib-2.0" diff --git a/recipes/openmoko-3rdparty/babiloo-efl_2.0.9-10.bb b/recipes/openmoko-3rdparty/babiloo-efl_2.0.9-10.bb index 1cbe45a9c7..92d97874b0 100644 --- a/recipes/openmoko-3rdparty/babiloo-efl_2.0.9-10.bb +++ b/recipes/openmoko-3rdparty/babiloo-efl_2.0.9-10.bb @@ -9,7 +9,7 @@ RDEPENDS_${PN} = "python-elementary python-compression python-misc python-netcli PACKAGE_ARCH = "all" PV = "2.0.9-10" -PR = "r1" +PR = "r2" SRC_URI = "http://www.vaudano.eu/projects/babiloo/babiloo_2.0.9-10.tar.gz;name=tarball" SRC_URI[tarball.md5sum] = "2a66cc5863aca83c4b3120b8ca974676" diff --git a/recipes/openmoko-3rdparty/calc_0.0.4.bb b/recipes/openmoko-3rdparty/calc_0.0.4.bb index b39d6d7888..a7bb158d5a 100644 --- a/recipes/openmoko-3rdparty/calc_0.0.4.bb +++ b/recipes/openmoko-3rdparty/calc_0.0.4.bb @@ -4,7 +4,7 @@ AUTHOR = "Sebastian Spaeth <Sebastian@SSpaeth.de>" LICENSE = "MIT" RDEPENDS_${PN} = "python-elementary python python-edbus" SECTION = "x11/application" -PR = "r0" +PR = "r1" SRC_URI = "git://github.com/spaetz/calc.git;protocol=http;branch=master;tag=${PV}" diff --git a/recipes/openmoko-3rdparty/calc_git.bb b/recipes/openmoko-3rdparty/calc_git.bb index 4976cdba4c..53356b22a0 100644 --- a/recipes/openmoko-3rdparty/calc_git.bb +++ b/recipes/openmoko-3rdparty/calc_git.bb @@ -7,7 +7,7 @@ RDEPENDS_${PN} = "python-elementary python python-edbus" SECTION = "x11/application" SRCREV = "cff7c833d4fce0d39de0812bfc9ed9e0eb8fac09" PV = "0.0.1+gitr${SRCPV}" -PR = "r1" +PR = "r2" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/openmoko-3rdparty/emtooth_svn.bb b/recipes/openmoko-3rdparty/emtooth_svn.bb index c0decb24a8..cd670ed133 100644 --- a/recipes/openmoko-3rdparty/emtooth_svn.bb +++ b/recipes/openmoko-3rdparty/emtooth_svn.bb @@ -8,7 +8,7 @@ RDEPENDS_${PN} = "bluez4 obexd" SRCREV = "77" PV = "0.1+svnr${SRCPV}" -PR = "r2" +PR = "r3" SRC_URI = "svn://emtooth.googlecode.com/svn/trunk;module=app;proto=http" diff --git a/recipes/openmoko-3rdparty/iliwi_git.bb b/recipes/openmoko-3rdparty/iliwi_git.bb index 6d75282e5e..119d71049a 100644 --- a/recipes/openmoko-3rdparty/iliwi_git.bb +++ b/recipes/openmoko-3rdparty/iliwi_git.bb @@ -8,7 +8,7 @@ RDEPENDS_${PN} = "wireless-tools wpa-supplicant" SRCREV = "5be2b301033418fb9a33759047274b676034f096" PV = "0.0.1+gitr${SRCPV}" -PR = "r2" +PR = "r3" SRC_URI = "git://github.com/Ebbe/Iliwi.git;protocol=http;branch=master" S = "${WORKDIR}/git" diff --git a/recipes/openmoko-3rdparty/neomis_svn.bb b/recipes/openmoko-3rdparty/neomis_svn.bb index 5a315f199b..03ca20ddec 100644 --- a/recipes/openmoko-3rdparty/neomis_svn.bb +++ b/recipes/openmoko-3rdparty/neomis_svn.bb @@ -8,7 +8,7 @@ DEPENDS = "python-native" SRCREV = "6" PV = "1.1.0+svnr${SRCPV}" -PR = "r1" +PR = "r2" S = "${WORKDIR}/trunk" diff --git a/recipes/openmoko-3rdparty/om-neon_svn.bb b/recipes/openmoko-3rdparty/om-neon_svn.bb index 11318a663e..938d68f163 100644 --- a/recipes/openmoko-3rdparty/om-neon_svn.bb +++ b/recipes/openmoko-3rdparty/om-neon_svn.bb @@ -8,7 +8,7 @@ DEPENDS = "edje-native python-native" SRCREV = "68" PV = "1.0.0+svnr${SRCPV}" -PR = "r2" +PR = "r3" S = "${WORKDIR}/trunk" diff --git a/recipes/openmoko-3rdparty/openmoko-gps_0.0.1+svnr9.bb b/recipes/openmoko-3rdparty/openmoko-gps_0.0.1+svnr9.bb index e4f311c127..bb906f5173 100644 --- a/recipes/openmoko-3rdparty/openmoko-gps_0.0.1+svnr9.bb +++ b/recipes/openmoko-3rdparty/openmoko-gps_0.0.1+svnr9.bb @@ -14,7 +14,7 @@ LICENSE = "GPL" RDEPENDS_${PN} = "python-pygtk" -PR = "r0" +PR = "r1" ###################################################################################### diff --git a/recipes/openmoko-3rdparty/podboy_svn.bb b/recipes/openmoko-3rdparty/podboy_svn.bb index d633232ba9..8228fa406d 100644 --- a/recipes/openmoko-3rdparty/podboy_svn.bb +++ b/recipes/openmoko-3rdparty/podboy_svn.bb @@ -7,7 +7,7 @@ PRIORITY = "optional" SRCREV = "174" PV = "1.6.1+svnr${SRCPV}" -PR = "r1" +PR = "r2" PACKAGE_ARCH = "all" diff --git a/recipes/openmoko-3rdparty/rtmom_0.1.3.bb b/recipes/openmoko-3rdparty/rtmom_0.1.3.bb index f5c8f5dace..6689686c4e 100644 --- a/recipes/openmoko-3rdparty/rtmom_0.1.3.bb +++ b/recipes/openmoko-3rdparty/rtmom_0.1.3.bb @@ -10,7 +10,7 @@ RSUGGESTS_${PN} = "python-simplejson" PACKAGE_ARCH = "all" -PR = "r0" +PR = "r1" SRC_URI = "http://cloud.github.com/downloads/kichkasch/rtmom/rtmom-src-${PV}.tar.gz" diff --git a/recipes/openmoko-3rdparty/settingsgui_0.7+0.8-beta.bb b/recipes/openmoko-3rdparty/settingsgui_0.7+0.8-beta.bb index 932f0a627b..f40c576dba 100644 --- a/recipes/openmoko-3rdparty/settingsgui_0.7+0.8-beta.bb +++ b/recipes/openmoko-3rdparty/settingsgui_0.7+0.8-beta.bb @@ -3,7 +3,7 @@ AUTHOR = "Kristian M." SECTION = "openmoko/applications" RDEPENDS_${PN} = "python-pygtk python-subprocess python-threading" LICENSE = "GPL" -PR = "r0" +PR = "r1" SRC_URI = "http://mput.de/~kristian/.openmoko/settingsgui-0.8-beta.tar.bz2" S = "${WORKDIR}/settingsgui-0.8-beta" diff --git a/recipes/openmoko-3rdparty/ventura_svn.bb b/recipes/openmoko-3rdparty/ventura_svn.bb index 65309d124d..4a2b852a7b 100644 --- a/recipes/openmoko-3rdparty/ventura_svn.bb +++ b/recipes/openmoko-3rdparty/ventura_svn.bb @@ -6,7 +6,7 @@ LICENSE = "GPLv2" DEPENDS = "elementary webkit-efl sqlite3" RRECOMMENDS_${PN} = "ca-certificates" PV = "0.2+svnr${SRCPV}" -PR = "r2" +PR = "r3" SRC_URI = "svn://elm-browser.googlecode.com/svn;module=trunk;proto=http" diff --git a/recipes/openmoko-base/openmoko-session_svn.bb b/recipes/openmoko-base/openmoko-session_svn.bb index cdb02df61e..19f1ce4715 100644 --- a/recipes/openmoko-base/openmoko-session_svn.bb +++ b/recipes/openmoko-base/openmoko-session_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox session files for Openmoko" SECTION = "openmoko/base" RDEPENDS_${PN} = "matchbox-panel-2 matchbox-wm openmoko-today gconf" PV = "0.1+svnr${SRCPV}" -PR = "r0" +PR = "r1" inherit openmoko-base diff --git a/recipes/openmoko-base/openmoko-sound-system_0.1.0.bb b/recipes/openmoko-base/openmoko-sound-system_0.1.0.bb index 1ecf8b9ad0..2ada84fa9c 100644 --- a/recipes/openmoko-base/openmoko-sound-system_0.1.0.bb +++ b/recipes/openmoko-base/openmoko-sound-system_0.1.0.bb @@ -10,7 +10,7 @@ RDEPENDS_${PN} = "\ pulseaudio-module-native-protocol-unix \ pulseaudio-module-cli-protocol-unix \ " -PR = "r6" +PR = "r7" inherit openmoko-base update-rc.d diff --git a/recipes/openmoko-panel-plugins/openmoko-panel-memory_svn.bb b/recipes/openmoko-panel-plugins/openmoko-panel-memory_svn.bb index 76e6bf0ec5..767546f2d6 100644 --- a/recipes/openmoko-panel-plugins/openmoko-panel-memory_svn.bb +++ b/recipes/openmoko-panel-plugins/openmoko-panel-memory_svn.bb @@ -3,6 +3,6 @@ DEPENDS = "libnotify" RDEPENDS_${PN} = "openmoko-dialer2" SRCREV = "3903" PV = "0.0.0+svnr${SRCPV}" -PR = "r0" +PR = "r1" inherit openmoko-panel-plugin diff --git a/recipes/openmoko-projects/assassin-thumbnail_svn.bb b/recipes/openmoko-projects/assassin-thumbnail_svn.bb index 8e524c8b3b..437981ca07 100644 --- a/recipes/openmoko-projects/assassin-thumbnail_svn.bb +++ b/recipes/openmoko-projects/assassin-thumbnail_svn.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" RDEPENDS_${PN} = "assassin" SRCREV = "4690" PV = "0.1+svnr${SRCPV}" -PR = "r1" +PR = "r2" SRC_URI = "svn://svn.openmoko.org/trunk/src/target/thumbnails/;module=result;proto=https" diff --git a/recipes/openmoko-projects/assassin_svn.bb b/recipes/openmoko-projects/assassin_svn.bb index 8433c08762..48cf1b10c3 100644 --- a/recipes/openmoko-projects/assassin_svn.bb +++ b/recipes/openmoko-projects/assassin_svn.bb @@ -5,7 +5,7 @@ DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit etk edbus eet" RDEPENDS_${PN} = "etk-theme-ninja" SRCREV = "268" PV = "0.2+svnr${SRCPV}" -PR = "r6.04" +PR = "r7" SRC_URI = "svn://om-assassin.googlecode.com/svn/;module=trunk;proto=http" diff --git a/recipes/openmoko-projects/enlazar_svn.bb b/recipes/openmoko-projects/enlazar_svn.bb index eba09a672c..6713bf3c12 100644 --- a/recipes/openmoko-projects/enlazar_svn.bb +++ b/recipes/openmoko-projects/enlazar_svn.bb @@ -5,7 +5,7 @@ DEPENDS = "evas edje ecore edbus" RDEPENDS_${PN} = "networkmanager" SRCREV = "37" PV = "0.1+svnr${SRCPV}" -PR = "r4" +PR = "r5" PE = "2" SRC_URI = "svn://svn.projects.openmoko.org/svnroot/enlazar;module=trunk;proto=http" diff --git a/recipes/openmoko-projects/illume-theme-asu_svn.bb b/recipes/openmoko-projects/illume-theme-asu_svn.bb index 1798b80221..c434551cef 100644 --- a/recipes/openmoko-projects/illume-theme-asu_svn.bb +++ b/recipes/openmoko-projects/illume-theme-asu_svn.bb @@ -3,10 +3,10 @@ HOMEPAGE = "http://illume.projects.openmoko.org/" LICENSE = "MIT/BSD" DEPENDS = "edje-native eet-native" RPROVIDES_${PN} = "illume-theme" -RCONFLICTS = "illume-config" +RCONFLICTS_${PN} = "illume-config" SRCREV = "4881" PV = "0.0+svnr${SRCPV}" -PR = "r9" +PR = "r11" SRC_URI = "svn://svn.openmoko.org/trunk/src/target/themes/;module=illume-theme-asu;proto=http" diff --git a/recipes/openmoko-projects/om-settings_svn.bb b/recipes/openmoko-projects/om-settings_svn.bb index a46771d4b3..bf2b5410e8 100644 --- a/recipes/openmoko-projects/om-settings_svn.bb +++ b/recipes/openmoko-projects/om-settings_svn.bb @@ -3,7 +3,7 @@ DEPENDS = "python-etk python-edbus" RDEPENDS_${PN} = "python-etk python-re python-codecs python-edbus python-pyxdg" SRCREV = "74" PV = "0.0.1+svnr${SRCPV}" -PR = "r3" +PR = "r4" PE = "1" S = "${WORKDIR}/trunk" diff --git a/recipes/openmoko-projects/paroli_git.bb b/recipes/openmoko-projects/paroli_git.bb index 2df2c1e1b7..eb6e8d80ab 100644 --- a/recipes/openmoko-projects/paroli_git.bb +++ b/recipes/openmoko-projects/paroli_git.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" SRCREV = "bb9fb1969acdfbaa48b55902675a6d8949014c6d" PV = "0.2.1+gitr${SRCPV}" PE = "1" -PR = "r1" +PR = "r2" SRC_URI = "git://git.paroli-project.org/paroli.git;protocol=http;branch=shr" S = "${WORKDIR}/git" diff --git a/recipes/openmoko-projects/pyefl-sudoku_svn.bb b/recipes/openmoko-projects/pyefl-sudoku_svn.bb index 973dd77d4b..0177e72ccb 100644 --- a/recipes/openmoko-projects/pyefl-sudoku_svn.bb +++ b/recipes/openmoko-projects/pyefl-sudoku_svn.bb @@ -6,7 +6,7 @@ DEPENDS = "python-evas python-edje python-ecore" RDEPENDS_${PN} = "python-evas python-edje python-ecore" SRCREV = "49" PV = "0.0.2+svnr${SRCPV}" -PR = "r3" +PR = "r4" SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=pyefl-sudoku;proto=http" diff --git a/recipes/openmoko-system/ompower_svn.bb b/recipes/openmoko-system/ompower_svn.bb index a399d1af54..3f1e026aee 100644 --- a/recipes/openmoko-system/ompower_svn.bb +++ b/recipes/openmoko-system/ompower_svn.bb @@ -3,7 +3,7 @@ LICENSE = "MIT BSD" DEPENDS = "ecore edbus" SRCREV = "4727" PV = "0.0.0+svnr${SRCPV}" -PR = "r4" +PR = "r5" RDEPENDS_${PN} = "initscripts" SRCNAME = "ompower" diff --git a/recipes/openmoko2/neod_svn.bb b/recipes/openmoko2/neod_svn.bb index 84f50f5209..d3e4cd922b 100644 --- a/recipes/openmoko2/neod_svn.bb +++ b/recipes/openmoko2/neod_svn.bb @@ -6,7 +6,7 @@ DEPENDS = "gtk+ pulseaudio apmd" RDEPENDS_${PN} = "gpe-scap xrandr alsa-utils-amixer ${DISTRO_APM} dbus" SRCREV = "4617" PV = "0.1.0+svnr${SRCPV}" -PR = "r7" +PR = "r8" inherit openmoko2 gconf diff --git a/recipes/openmoko2/openmoko-appearance_svn.bb b/recipes/openmoko2/openmoko-appearance_svn.bb index f7044ede60..33d946f0fb 100644 --- a/recipes/openmoko2/openmoko-appearance_svn.bb +++ b/recipes/openmoko2/openmoko-appearance_svn.bb @@ -4,6 +4,6 @@ DEPENDS = "libmokoui2 gconf gtk+" RDEPENDS_${PN} = "libedata-cal openmoko-today2-folders" SRCREV = "3262" PV = "0.1.0+svnr${SRCPV}" -PR = "r0" +PR = "r1" inherit openmoko2 gtk-icon-cache diff --git a/recipes/openmoko2/openmoko-contacts2_svn.bb b/recipes/openmoko2/openmoko-contacts2_svn.bb index bcb0e8bc44..31f202719e 100644 --- a/recipes/openmoko2/openmoko-contacts2_svn.bb +++ b/recipes/openmoko2/openmoko-contacts2_svn.bb @@ -4,7 +4,7 @@ DEPENDS = "libmokoui2 libmokojournal2 dbus-glib" RDEPENDS_${PN} = "libedata-book" SRCREV = "419" PV = "0.1.0+svnr${SRCPV}" -PR = "r6" +PR = "r7" inherit openmoko2 diff --git a/recipes/openmoko2/openmoko-dates2_svn.bb b/recipes/openmoko2/openmoko-dates2_svn.bb index 5f6f85801e..783f5a04de 100644 --- a/recipes/openmoko2/openmoko-dates2_svn.bb +++ b/recipes/openmoko2/openmoko-dates2_svn.bb @@ -4,7 +4,7 @@ DEPENDS = "libmokoui2 libmokojournal2 gtk+ libglade eds-dbus libjana" RDEPENDS_${PN} = "libedata-cal" SRCREV = "703" PV = "0.1.0+svnr${SRCPV}" -PR = "r3" +PR = "r4" inherit openmoko2 pkgconfig diff --git a/recipes/openmoko2/openmoko-mediaplayer2_svn.bb b/recipes/openmoko2/openmoko-mediaplayer2_svn.bb index bf038e98fb..897483a55e 100644 --- a/recipes/openmoko2/openmoko-mediaplayer2_svn.bb +++ b/recipes/openmoko2/openmoko-mediaplayer2_svn.bb @@ -4,7 +4,7 @@ DEPENDS = "libmokoui2 expat gstreamer libspiff curl" RDEPENDS_${PN} = "gst-meta-audio gconf gst-plugin-alsa" SRCREV = "4750" PV = "0.1.0+svnr${SRCPV}" -PR = "r6" +PR = "r7" inherit openmoko2 diff --git a/recipes/openmoko2/openmoko-sound-system2_0.1.0.bb b/recipes/openmoko2/openmoko-sound-system2_0.1.0.bb index aa93cce79d..c947e32efe 100644 --- a/recipes/openmoko2/openmoko-sound-system2_0.1.0.bb +++ b/recipes/openmoko2/openmoko-sound-system2_0.1.0.bb @@ -11,9 +11,9 @@ RDEPENDS_${PN} = "\ pulseaudio-module-cli-protocol-unix \ gst-plugin-pulse \ " -RREPLACES = "openmoko-sound-system" -RPROVIDES = "openmoko-sound-system" -PR = "r5.01" +RREPLACES_${PN} = "openmoko-sound-system" +RPROVIDES_${PN} = "openmoko-sound-system" +PR = "r6" inherit openmoko-base update-rc.d diff --git a/recipes/openmoko2/openmoko-sound-theme-standard2_svn.bb b/recipes/openmoko2/openmoko-sound-theme-standard2_svn.bb index 01385f56fe..a7687d8486 100644 --- a/recipes/openmoko2/openmoko-sound-theme-standard2_svn.bb +++ b/recipes/openmoko2/openmoko-sound-theme-standard2_svn.bb @@ -1,10 +1,10 @@ DESCRIPTION = "Standard sound theme for the Openmoko framework" SECTION = "openmoko/base" -RREPLACES = "openmoko-sound-theme-standard" -RPROVIDES = "openmoko-sound-theme-standard" +RREPLACES_${PN} = "openmoko-sound-theme-standard" +RPROVIDES_${PN} = "openmoko-sound-theme-standard" SRCREV = "4271" PV = "0.1+svnr${SRCPV}" -PR = "r3" +PR = "r4" inherit openmoko2 autotools diff --git a/recipes/openmoko2/openmoko-tasks2_svn.bb b/recipes/openmoko2/openmoko-tasks2_svn.bb index 5ba07db68a..0ef6fd7dce 100644 --- a/recipes/openmoko2/openmoko-tasks2_svn.bb +++ b/recipes/openmoko2/openmoko-tasks2_svn.bb @@ -4,7 +4,7 @@ DEPENDS = "dbus-glib eds-dbus libmokoui2" RDEPENDS_${PN} = "libedata-cal" SRCREV = "404" PV = "0.1.0+svnr${SRCPV}" -PR = "r1" +PR = "r2" inherit openmoko2 diff --git a/recipes/openmoko2/openmoko-theme-standard2-qvga_svn.bb b/recipes/openmoko2/openmoko-theme-standard2-qvga_svn.bb index a85ad61a3f..a4e13b4166 100644 --- a/recipes/openmoko2/openmoko-theme-standard2-qvga_svn.bb +++ b/recipes/openmoko2/openmoko-theme-standard2-qvga_svn.bb @@ -1,10 +1,10 @@ DESCRIPTION = "Standard Gtk+ theme for the Openmoko framework, QVGA edition" SECTION = "openmoko/base" -RCONFLICTS = "openmoko-theme-standard" -RPROVIDES = "openmoko-theme-standard-2" +RCONFLICTS_${PN} = "openmoko-theme-standard" +RPROVIDES_${PN} = "openmoko-theme-standard-2" SRCREV = "3425" PV = "0.1.1+svnr${SRCPV}" -PR = "r1" +PR = "r2" inherit openmoko2 diff --git a/recipes/openmoko2/openmoko-theme-standard2_svn.bb b/recipes/openmoko2/openmoko-theme-standard2_svn.bb index cc73cc5934..cff0bbc419 100644 --- a/recipes/openmoko2/openmoko-theme-standard2_svn.bb +++ b/recipes/openmoko2/openmoko-theme-standard2_svn.bb @@ -1,9 +1,9 @@ DESCRIPTION = "Standard Gtk+ theme for the Openmoko framework" SECTION = "openmoko/base" -RCONFLICTS = "openmoko-theme-standard" +RCONFLICTS_${PN} = "openmoko-theme-standard" SRCREV = "4338" PV = "0.1.1+svnr${SRCPV}" -PR = "r5" +PR = "r6" inherit openmoko2 diff --git a/recipes/openmoko2/openmoko-today2_svn.bb b/recipes/openmoko2/openmoko-today2_svn.bb index 2af2128fa1..6feee46bbb 100644 --- a/recipes/openmoko2/openmoko-today2_svn.bb +++ b/recipes/openmoko2/openmoko-today2_svn.bb @@ -4,6 +4,6 @@ DEPENDS = "libmokoui2 libmokojournal2 libjana startup-notification dbus-glib lib RDEPENDS_${PN} = "libedata-cal openmoko-today2-folders" SRCREV = "4168" PV = "0.1.0+svnr${SRCPV}" -PR = "r2" +PR = "r3" inherit openmoko2 gtk-icon-cache diff --git a/recipes/openmoko2/settingsgui_0.8.bb b/recipes/openmoko2/settingsgui_0.8.bb index b010f333f6..2e4fceab00 100644 --- a/recipes/openmoko2/settingsgui_0.8.bb +++ b/recipes/openmoko2/settingsgui_0.8.bb @@ -3,7 +3,7 @@ AUTHOR = "Kristian M." SECTION = "openmoko/applications" RDEPENDS_${PN} = "python-pygtk python-subprocess python-threading" LICENSE = "GPL" -PR = "r0" +PR = "r1" SRC_URI = "http://mput.de/~kristian/.openmoko/settingsgui-0.8.tar.bz2" diff --git a/recipes/openprotium-init/openprotium-init_0.10.bb b/recipes/openprotium-init/openprotium-init_0.10.bb index 6776d19757..89c73d5ad4 100644 --- a/recipes/openprotium-init/openprotium-init_0.10.bb +++ b/recipes/openprotium-init/openprotium-init_0.10.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS_${PN} = "busybox devio" -PR = "r71" +PR = "r72" SRC_URI = "file://boot/flash \ file://boot/disk \ diff --git a/recipes/openswan/openswan_2.2.0.bb b/recipes/openswan/openswan_2.2.0.bb index d481ab1c3e..4d30f3e146 100644 --- a/recipes/openswan/openswan_2.2.0.bb +++ b/recipes/openswan/openswan_2.2.0.bb @@ -6,7 +6,7 @@ LICENSE = "GPLv2" DEPENDS = "gmp flex-native" RRECOMMENDS_${PN} = "kernel-module-ipsec" RDEPENDS_append_nylon = "perl" -PR = "r6" +PR = "r7" SRC_URI = "http://www.openswan.org/download/old/openswan-${PV}.tar.gz \ file://openswan-2.2.0-gentoo.patch \ diff --git a/recipes/openswan/openswan_2.4.7.bb b/recipes/openswan/openswan_2.4.7.bb index 862b18c6a7..d9d994c908 100644 --- a/recipes/openswan/openswan_2.4.7.bb +++ b/recipes/openswan/openswan_2.4.7.bb @@ -6,7 +6,7 @@ LICENSE = "GPLv2" DEPENDS = "gmp flex-native" RRECOMMENDS_${PN} = "kernel-module-ipsec" RDEPENDS_append_nylon = "perl" -PR = "r1" +PR = "r2" SRC_URI = "http://www.openswan.org/download/openswan-${PV}.tar.gz \ file://openswan-2.4.7-gentoo.patch \ diff --git a/recipes/opensync/libsyncml_0.5.4.bb b/recipes/opensync/libsyncml_0.5.4.bb index edcdcf1605..ae1ba4fd6b 100644 --- a/recipes/opensync/libsyncml_0.5.4.bb +++ b/recipes/opensync/libsyncml_0.5.4.bb @@ -7,7 +7,7 @@ LICENSE = "LGPL" DEPENDS = "libxml2 glib-2.0" RRECOMMENDS_${PN} = "wbxml2 openobex libsoup" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/libsyncml/libsyncml-${PV}.tar.gz \ " diff --git a/recipes/opie-citytime/opie-citytime.inc b/recipes/opie-citytime/opie-citytime.inc index 6dbf8a45f5..c3bbd4c711 100644 --- a/recipes/opie-citytime/opie-citytime.inc +++ b/recipes/opie-citytime/opie-citytime.inc @@ -3,7 +3,7 @@ SECTION = "opie/applications" PRIORITY = "optional" LICENSE = "GPL" RRECOMMENDS_${PN} = "tzdata" -PR = "r1" +PR = "r2" APPNAME = "citytime" diff --git a/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb b/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb index 8dc186e8e2..12843c386e 100644 --- a/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb +++ b/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb @@ -3,10 +3,10 @@ SECTION = "opie/multimedia" PRIORITY = "optional" LICENSE = "GPL" APPNAME = "opieplayer2" -RPROVIDES = "opie-mediaplayer2-skin" +RPROVIDES_${PN} = "opie-mediaplayer2-skin" OPIE_CVS_PV ?= "1.2.2+cvs${SRCDATE}" PV = "${OPIE_CVS_PV}" -PR = "r1" +PR = "r2" SRC_URI = "${HANDHELDS_CVS};module=opie/pics" diff --git a/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.3.bb b/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.3.bb index e0b8efe4dc..1847b3bda9 100644 --- a/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.3.bb +++ b/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.3.bb @@ -3,7 +3,7 @@ SECTION = "opie/multimedia" PRIORITY = "optional" LICENSE = "GPL" APPNAME = "opieplayer2" -RPROVIDES = "opie-mediaplayer2-skin" +RPROVIDES_${PN} = "opie-mediaplayer2-skin" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.4.bb b/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.4.bb index e0b8efe4dc..1847b3bda9 100644 --- a/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.4.bb +++ b/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.4.bb @@ -3,7 +3,7 @@ SECTION = "opie/multimedia" PRIORITY = "optional" LICENSE = "GPL" APPNAME = "opieplayer2" -RPROVIDES = "opie-mediaplayer2-skin" +RPROVIDES_${PN} = "opie-mediaplayer2-skin" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb b/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb index cfbba1cc32..a5b6860cc2 100644 --- a/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb +++ b/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb @@ -3,10 +3,10 @@ SECTION = "opie/multimedia" PRIORITY = "optional" LICENSE = "GPL" APPNAME = "opieplayer2" -RPROVIDES = "opie-mediaplayer2-skin" +RPROVIDES_${PN} = "opie-mediaplayer2-skin" OPIE_CVS_PV ?= "1.2.2+cvs${SRCDATE}" PV = "${OPIE_CVS_PV}" -PR = "r1" +PR = "r2" SRC_URI = "${HANDHELDS_CVS};module=opie/pics" diff --git a/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.3.bb b/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.3.bb index a40604c041..aac3ccc125 100644 --- a/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.3.bb +++ b/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.3.bb @@ -3,7 +3,7 @@ SECTION = "opie/multimedia" PRIORITY = "optional" LICENSE = "GPL" APPNAME = "opieplayer2" -RPROVIDES = "opie-mediaplayer2-skin" +RPROVIDES_${PN} = "opie-mediaplayer2-skin" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.4.bb b/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.4.bb index a40604c041..aac3ccc125 100644 --- a/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.4.bb +++ b/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.4.bb @@ -3,7 +3,7 @@ SECTION = "opie/multimedia" PRIORITY = "optional" LICENSE = "GPL" APPNAME = "opieplayer2" -RPROVIDES = "opie-mediaplayer2-skin" +RPROVIDES_${PN} = "opie-mediaplayer2-skin" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb b/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb index ff96d83312..ceaf4c3a39 100644 --- a/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb +++ b/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb @@ -3,10 +3,10 @@ SECTION = "opie/multimedia" PRIORITY = "optional" LICENSE = "GPL" APPNAME = "opieplayer2" -RPROVIDES = "opie-mediaplayer2-skin" +RPROVIDES_${PN} = "opie-mediaplayer2-skin" OPIE_CVS_PV ?= "1.2.2+cvs${SRCDATE}" PV = "${OPIE_CVS_PV}" -PR = "r1" +PR = "r2" SRC_URI = "${HANDHELDS_CVS};module=opie/pics" diff --git a/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.3.bb b/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.3.bb index 7a6715e5cf..52a59cd6a0 100644 --- a/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.3.bb +++ b/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.3.bb @@ -3,7 +3,7 @@ SECTION = "opie/multimedia" PRIORITY = "optional" LICENSE = "GPL" APPNAME = "opieplayer2" -RPROVIDES = "opie-mediaplayer2-skin" +RPROVIDES_${PN} = "opie-mediaplayer2-skin" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.4.bb b/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.4.bb index 7a6715e5cf..52a59cd6a0 100644 --- a/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.4.bb +++ b/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.4.bb @@ -3,7 +3,7 @@ SECTION = "opie/multimedia" PRIORITY = "optional" LICENSE = "GPL" APPNAME = "opieplayer2" -RPROVIDES = "opie-mediaplayer2-skin" +RPROVIDES_${PN} = "opie-mediaplayer2-skin" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb b/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb index e77e00ec64..8eb138bc7c 100644 --- a/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb +++ b/recipes/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb @@ -3,10 +3,10 @@ SECTION = "opie/multimedia" PRIORITY = "optional" LICENSE = "GPL" APPNAME = "opieplayer2" -RPROVIDES = "opie-mediaplayer2-skin" +RPROVIDES_${PN} = "opie-mediaplayer2-skin" OPIE_CVS_PV ?= "1.2.2+cvs${SRCDATE}" PV = "${OPIE_CVS_PV}" -PR = "r1" +PR = "r2" SRC_URI = "${HANDHELDS_CVS};module=opie/pics" diff --git a/recipes/opie-sh-snes/opie-sh-snes_0.2.bb b/recipes/opie-sh-snes/opie-sh-snes_0.2.bb index b4af7580d2..5e709e4198 100644 --- a/recipes/opie-sh-snes/opie-sh-snes_0.2.bb +++ b/recipes/opie-sh-snes/opie-sh-snes_0.2.bb @@ -6,7 +6,7 @@ LICENSE = "GPL" RDEPENDS_${PN} = "opie-sh" -PR = "r2" +PR = "r3" FILES_${PN} = "/opt/QtPalmtop" diff --git a/recipes/opie-taskbar/opie-taskbar-images.inc b/recipes/opie-taskbar/opie-taskbar-images.inc index b35dd8d593..9f73d31778 100644 --- a/recipes/opie-taskbar/opie-taskbar-images.inc +++ b/recipes/opie-taskbar/opie-taskbar-images.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Opie Launcher and Taskbar" SECTION = "opie/base" PRIORITY = "optional" LICENSE = "GPL" -RPROVIDES = "${PN}" +RPROVIDES_${PN} = "${PN}" APPNAME = "qpe" S = "${WORKDIR}/pics" diff --git a/recipes/opkg-utils/opkg-utils-native_svn.bb b/recipes/opkg-utils/opkg-utils-native_svn.bb deleted file mode 100644 index b670378bea..0000000000 --- a/recipes/opkg-utils/opkg-utils-native_svn.bb +++ /dev/null @@ -1,11 +0,0 @@ -require opkg-utils_svn.bb -SRCREV = "4595" - -RDEPENDS_${PN} = "" - -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/recipes/opkg-utils/opkg-utils_svn.bb b/recipes/opkg-utils/opkg-utils_svn.bb index bb404a6b4f..7a54d8c435 100644 --- a/recipes/opkg-utils/opkg-utils_svn.bb +++ b/recipes/opkg-utils/opkg-utils_svn.bb @@ -3,17 +3,18 @@ SECTION = "base" PRIORITY = "optional" LICENSE = "GPL" RDEPENDS_${PN} = "python" -SRCREV = "4578" -PR = "r2" +RDEPENDS_virtclass_native = "" +SRCREV = "4595" +PV = "0.0+svnr${SRCPV}" +PR = "r4" + +BBCLASSEXTEND = "native" SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http" +TARGET_CC_ARCH += "${LDFLAGS}" S = "${WORKDIR}/opkg-utils" inherit autotools S = "${WORKDIR}/opkg-utils" - -do_stage () { - autotools_stage_all -} diff --git a/recipes/opkg/opkg-ipkg-compat.bb b/recipes/opkg/opkg-ipkg-compat.bb index 5a35f6daaa..837b02c11b 100644 --- a/recipes/opkg/opkg-ipkg-compat.bb +++ b/recipes/opkg/opkg-ipkg-compat.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Files to make opkg and ipkg coexist" RDEPENDS_${PN} = "opkg ipkg ipkg-collateral" -PR = "r0" +PR = "r1" PACKAGE_ARCH = "all" do_compile() { diff --git a/recipes/oprofile/oprofile.inc b/recipes/oprofile/oprofile.inc index 9fe49c947b..5d891fa559 100644 --- a/recipes/oprofile/oprofile.inc +++ b/recipes/oprofile/oprofile.inc @@ -5,7 +5,7 @@ LICENSE = "GPL" DEPENDS = "popt binutils" RDEPENDS_${PN} += "binutils-symlinks" RRECOMMENDS_${PN} += "kernel-vmlinux" -INC_PR = "r11" +INC_PR = "r12" S = "${WORKDIR}/oprofile-${PV}" SRC_URI = "\ diff --git a/recipes/oprofile/oprofile_cvs.bb b/recipes/oprofile/oprofile_cvs.bb index f9f645f50b..23561b785b 100644 --- a/recipes/oprofile/oprofile_cvs.bb +++ b/recipes/oprofile/oprofile_cvs.bb @@ -2,7 +2,7 @@ require oprofile.inc SRCDATE = "20080210" PV = "0.9.4+cvs${SRCDATE}" -PR = "r3" +PR = "r4" RDEPENDS_${PN} += "binutils-symlinks" diff --git a/recipes/orinoco/orinoco-conf_1.0.bb b/recipes/orinoco/orinoco-conf_1.0.bb index a37b25e29e..cb0629275e 100644 --- a/recipes/orinoco/orinoco-conf_1.0.bb +++ b/recipes/orinoco/orinoco-conf_1.0.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" RDEPENDS_${PN} = "update-modules" PACKAGE_ARCH = "all" -PR = "r3" +PR = "r4" SRC_URI = "file://spectrum.conf \ file://hermes.conf \ diff --git a/recipes/orinoco/orinoco-modules_0.15rc1.bb b/recipes/orinoco/orinoco-modules_0.15rc1.bb index 881725f83d..f6f5737b04 100644 --- a/recipes/orinoco/orinoco-modules_0.15rc1.bb +++ b/recipes/orinoco/orinoco-modules_0.15rc1.bb @@ -3,7 +3,7 @@ require orinoco-modules.inc DEPENDS = "orinoco-conf spectrum-fw" RDEPENDS_${PN} += "orinoco-conf" RDEPENDS_orinoco-modules-cs += "orinoco-modules spectrum-fw" -PR = "r8" +PR = "r9" SRC_URI = "${SOURCEFORGE_MIRROR}/orinoco/orinoco-${PV}.tar.gz \ file://makefile_fix.patch \ diff --git a/recipes/orinoco/orinoco-modules_0.15rc2.bb b/recipes/orinoco/orinoco-modules_0.15rc2.bb index d1ae67e109..70b0546f6f 100644 --- a/recipes/orinoco/orinoco-modules_0.15rc2.bb +++ b/recipes/orinoco/orinoco-modules_0.15rc2.bb @@ -3,7 +3,7 @@ require orinoco-modules.inc DEPENDS = "orinoco-conf spectrum-fw" RDEPENDS_${PN} += "orinoco-conf" RDEPENDS_orinoco-modules-cs += "orinoco-modules spectrum-fw" -PR = "r10" +PR = "r11" SRC_URI += "\ file://makefile_fix.patch \ diff --git a/recipes/orinoco/orinoco-modules_cvs.bb b/recipes/orinoco/orinoco-modules_cvs.bb index 6467c4d6c2..bec5e5d7dd 100644 --- a/recipes/orinoco/orinoco-modules_cvs.bb +++ b/recipes/orinoco/orinoco-modules_cvs.bb @@ -3,7 +3,7 @@ require orinoco-modules.inc DEPENDS = "orinoco-conf spectrum-fw" RDEPENDS_${PN} += "orinoco-conf" RDEPENDS_orinoco-modules-cs = "orinoco-modules spectrum-fw" -PR = "r3" +PR = "r4" PARALLEL_MAKE = "" EXTRA_OEMAKE = 'KERNEL_SRC="${KERNEL_STAGING_DIR}"' diff --git a/recipes/p910nd/p910nd_0.92.bb b/recipes/p910nd/p910nd_0.92.bb index e9e3a9b2c8..4d90df1b73 100644 --- a/recipes/p910nd/p910nd_0.92.bb +++ b/recipes/p910nd/p910nd_0.92.bb @@ -3,7 +3,7 @@ SECTION = "console/utils" HOMEPAGE = "http://p910nd.sourceforge.net/" LICENSE = "GPLv2" SECTION = "console/utils" -PR = "r0" +PR = "r1" RRECOMMENDS_${PN} = "avahi" inherit update-rc.d diff --git a/recipes/pam/libpam-base-files.bb b/recipes/pam/libpam-base-files.bb index 7ceb46d104..ddcfe4c749 100644 --- a/recipes/pam/libpam-base-files.bb +++ b/recipes/pam/libpam-base-files.bb @@ -7,7 +7,7 @@ DEPENDS = "" RDEPENDS_${PN} = "libpam" RRECOMMENDS_${PN} = "libpam-meta" -PR = "r5" +PR = "r6" SRC_URI = " \ file://pam.d/* \ diff --git a/recipes/pcmanfm/pcmanfm_0.5.bb b/recipes/pcmanfm/pcmanfm_0.5.bb index 736b063a3f..2f9f7b0b0c 100644 --- a/recipes/pcmanfm/pcmanfm_0.5.bb +++ b/recipes/pcmanfm/pcmanfm_0.5.bb @@ -4,7 +4,7 @@ SECTION = "x11" PRIORITY = "optional" DEPENDS = "gtk+ hal gamin startup-notification" RRECOMMENDS_${PN} = "pmount-hal" -PR = "r3" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.gz \ file://desired_mount_point.patch \ diff --git a/recipes/pcmcia-cs/pcmcia-cs_3.2.8.bb b/recipes/pcmcia-cs/pcmcia-cs_3.2.8.bb index 7ad34c421c..d94cba9bb1 100644 --- a/recipes/pcmcia-cs/pcmcia-cs_3.2.8.bb +++ b/recipes/pcmcia-cs/pcmcia-cs_3.2.8.bb @@ -7,7 +7,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "virtual/kernel" RDEPENDS_${PN} = "hostap-conf orinoco-conf" -PR = "r28" +PR = "r29" SRC_URI = "${SOURCEFORGE_MIRROR}/pcmcia-cs/pcmcia-cs-${PV}.tar.gz \ file://busybox.patch \ diff --git a/recipes/perl/libalgorithm-diff-perl_1.1902.bb b/recipes/perl/libalgorithm-diff-perl_1.1902.bb index d932760373..24b4284468 100644 --- a/recipes/perl/libalgorithm-diff-perl_1.1902.bb +++ b/recipes/perl/libalgorithm-diff-perl_1.1902.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" RDEPENDS_${PN} += "perl-module-exporter perl-module-strict perl-module-vars \ perl-module-strict perl-module-vars" -PR = "r4" +PR = "r5" SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TY/TYEMQ/Algorithm-Diff-${PV}.tar.gz" diff --git a/recipes/perl/libarchive-tar-perl_1.30.bb b/recipes/perl/libarchive-tar-perl_1.30.bb index 33acdfe966..d01c958bac 100644 --- a/recipes/perl/libarchive-tar-perl_1.30.bb +++ b/recipes/perl/libarchive-tar-perl_1.30.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" DEPENDS += "libio-zlib-perl-native" RDEPENDS_${PN} += "libio-zlib-perl" -PR = "r5" +PR = "r6" SRC_URI = "http://search.cpan.org/CPAN/authors/id/K/KA/KANE/Archive-Tar-${PV}.tar.gz" diff --git a/recipes/perl/libarchive-zip-perl_1.30.bb b/recipes/perl/libarchive-zip-perl_1.30.bb index 12b644c98e..b81f8eda7a 100644 --- a/recipes/perl/libarchive-zip-perl_1.30.bb +++ b/recipes/perl/libarchive-zip-perl_1.30.bb @@ -4,7 +4,7 @@ LICENSE = "Artistic|GPL" DEPENDS += "libio-zlib-perl-native" RDEPENDS_${PN} += "libio-zlib-perl" -PR= "r0" +PR = "r1" SRC_URI = "http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Archive-Zip-${PV}.tar.gz" diff --git a/recipes/perl/libcache-cache-perl_1.06.bb b/recipes/perl/libcache-cache-perl_1.06.bb index cee4455c17..b9c5a05500 100644 --- a/recipes/perl/libcache-cache-perl_1.06.bb +++ b/recipes/perl/libcache-cache-perl_1.06.bb @@ -4,7 +4,7 @@ LICENSE = "Artistic|GPL" DEPENDS = "libdigest-sha1-perl-native liberror-perl-native \ libipc-sharelite-perl-native" RDEPENDS_${PN} = "libdigest-sha1-perl liberror-perl libipc-sharelite-perl" -PR = "r0" +PR = "r1" SRC_URI = "http://search.cpan.org/CPAN/authors/id/J/JS/JSWARTZ/Cache-Cache-${PV}.tar.gz" diff --git a/recipes/perl/libclass-container-perl_0.12.bb b/recipes/perl/libclass-container-perl_0.12.bb index beffb373ca..987ac76e63 100644 --- a/recipes/perl/libclass-container-perl_0.12.bb +++ b/recipes/perl/libclass-container-perl_0.12.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" DEPENDS = "libparams-validate-perl-native" RDEPENDS_${PN} = "libparams-validate-perl" -PR = "r7" +PR = "r8" SRC_URI = "http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/Class-Container-${PV}.tar.gz" diff --git a/recipes/perl/libcompress-zlib-perl_2.015.bb b/recipes/perl/libcompress-zlib-perl_2.015.bb index 9e7fa1d868..fc16f2ecb2 100644 --- a/recipes/perl/libcompress-zlib-perl_2.015.bb +++ b/recipes/perl/libcompress-zlib-perl_2.015.bb @@ -1,7 +1,8 @@ DESCRIPTION = "Compress::Zlib - Interface to zlib compression library" SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r11" +PR = "r12" +RDEPENDS_${PN} += "libio-compress-base-perl libcompress-raw-zlib-perl libio-compress-zlib-perl" SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/Compress-Zlib-${PV}.tar.gz" diff --git a/recipes/perl/libdata-optlist-perl_0.101.bb b/recipes/perl/libdata-optlist-perl_0.101.bb index 44ccf43add..fdce451c8b 100644 --- a/recipes/perl/libdata-optlist-perl_0.101.bb +++ b/recipes/perl/libdata-optlist-perl_0.101.bb @@ -4,7 +4,7 @@ LICENSE = "Artistic|GPL" DEPENDS += "libsub-install-perl-native libparams-util-perl-native" RDEPENDS_${PN} += "perl-module-list-util libparams-util-perl perl-module-strict \ libsub-install-perl perl-module-warnings " -PR = "r4" +PR = "r5" SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Data-OptList-${PV}.tar.gz" diff --git a/recipes/perl/libdate-manip-perl_5.54.bb b/recipes/perl/libdate-manip-perl_5.54.bb index 381e7f0ed2..f1568b7072 100644 --- a/recipes/perl/libdate-manip-perl_5.54.bb +++ b/recipes/perl/libdate-manip-perl_5.54.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Date and time manipulation routines." SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r1" +PR = "r2" RDEPENDS_${PN} = "perl-module-test-more \ perl-module-io-file \ diff --git a/recipes/perl/libdbi-perl_1.607.bb b/recipes/perl/libdbi-perl_1.607.bb index 2d52376cf1..4d6d79ee30 100644 --- a/recipes/perl/libdbi-perl_1.607.bb +++ b/recipes/perl/libdbi-perl_1.607.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Various MIME modules." SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r1" +PR = "r2" RDEPENDS_${PN} = "perl-module-scalar-util \ perl-module-file-spec \ diff --git a/recipes/perl/libdevice-serialport-perl_1.04.bb b/recipes/perl/libdevice-serialport-perl_1.04.bb index 583a818ae1..e789d56320 100644 --- a/recipes/perl/libdevice-serialport-perl_1.04.bb +++ b/recipes/perl/libdevice-serialport-perl_1.04.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" RDEPENDS_${PN} += "perl-module-carp perl-module-posix perl-module-io-handle \ perl-module-strict perl-module-warnings perl-module-vars \ perl-module-xsloader" -PR= "r1" +PR = "r2" SRC_URI = "http://www.cpan.org/modules/by-module/Device/Device-SerialPort-${PV}.tar.gz" diff --git a/recipes/perl/libemail-date-format-perl_1.002.bb b/recipes/perl/libemail-date-format-perl_1.002.bb index 0885a065df..95747ff32c 100644 --- a/recipes/perl/libemail-date-format-perl_1.002.bb +++ b/recipes/perl/libemail-date-format-perl_1.002.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Various MIME modules." SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r1" +PR = "r2" RDEPENDS_${PN} = "perl-module-test-more \ perl-module-time-local" diff --git a/recipes/perl/libexception-class-perl_1.23.bb b/recipes/perl/libexception-class-perl_1.23.bb index e242f0d238..3216018206 100644 --- a/recipes/perl/libexception-class-perl_1.23.bb +++ b/recipes/perl/libexception-class-perl_1.23.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" DEPENDS = "libclass-data-inheritable-perl-native libdevel-stacktrace-perl-native" RDEPENDS_${PN} = "libclass-data-inheritable-perl libdevel-stacktrace-perl" -PR = "r8" +PR = "r9" SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Exception-Class-${PV}.tar.gz" diff --git a/recipes/perl/libhtml-parser-perl_3.60.bb b/recipes/perl/libhtml-parser-perl_3.60.bb index 522e4c0d78..d0da602bb1 100644 --- a/recipes/perl/libhtml-parser-perl_3.60.bb +++ b/recipes/perl/libhtml-parser-perl_3.60.bb @@ -1,7 +1,7 @@ DESCRIPTION = "HTML Parser bits." SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r1" +PR = "r2" RDEPENDS_${PN} = "perl-module-test-more \ perl-module-xsloader \ diff --git a/recipes/perl/libhtml-parser-perl_3.64.bb b/recipes/perl/libhtml-parser-perl_3.64.bb index fdc59e0c7f..040f443294 100644 --- a/recipes/perl/libhtml-parser-perl_3.64.bb +++ b/recipes/perl/libhtml-parser-perl_3.64.bb @@ -1,7 +1,7 @@ DESCRIPTION = "HTML Parser bits." SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r1" +PR = "r2" RDEPENDS_${PN} = "perl-module-test-more \ perl-module-xsloader \ diff --git a/recipes/perl/libhtml-treebuilder-perl_3.23.bb b/recipes/perl/libhtml-treebuilder-perl_3.23.bb index 7063918060..2575c17a9d 100644 --- a/recipes/perl/libhtml-treebuilder-perl_3.23.bb +++ b/recipes/perl/libhtml-treebuilder-perl_3.23.bb @@ -1,7 +1,7 @@ DESCRIPTION = "HTML::TreeBUilder - Class is for HTML syntax trees that get built out of HTML source" SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r3" +PR = "r4" RDEPENDS_${PN} = "perl-module-extutils-makemaker" diff --git a/recipes/perl/libintl-perl_1.11.bb b/recipes/perl/libintl-perl_1.11.bb index 4272022c04..1d3e07c596 100644 --- a/recipes/perl/libintl-perl_1.11.bb +++ b/recipes/perl/libintl-perl_1.11.bb @@ -1,7 +1,7 @@ DESCRIPTION = "libintl-perl is an internationalization library for Perl" SECTION = "libs" LICENSE = "Artistic|GPL" -PR= "r2" +PR = "r3" SRC_URI = "http://www.cpan.org/authors/id/G/GU/GUIDO/libintl-perl-${PV}.tar.gz" diff --git a/recipes/perl/libintl-perl_1.16.bb b/recipes/perl/libintl-perl_1.16.bb index c7a82117ff..31f0d1bfa2 100644 --- a/recipes/perl/libintl-perl_1.16.bb +++ b/recipes/perl/libintl-perl_1.16.bb @@ -4,7 +4,7 @@ LICENSE = "Artistic|GPL" RDEPENDS_${PN} = "perl-module-vars perl-module-locale perl-module-io-handle \ perl-module-symbol perl-module-selectsaver perl-module-io \ perl-module-integer perl-module-exporter-heavy" -PR = "r4" +PR = "r5" SRC_URI = "http://www.cpan.org/authors/id/G/GU/GUIDO/libintl-perl-${PV}.tar.gz" diff --git a/recipes/perl/libintl-perl_1.20.bb b/recipes/perl/libintl-perl_1.20.bb index 4c41c33494..b7e0e1f45e 100644 --- a/recipes/perl/libintl-perl_1.20.bb +++ b/recipes/perl/libintl-perl_1.20.bb @@ -4,7 +4,7 @@ LICENSE = "Artistic|GPL" RDEPENDS_${PN} = "perl-module-vars perl-module-locale perl-module-io-handle \ perl-module-symbol perl-module-selectsaver perl-module-io \ perl-module-integer perl-module-exporter-heavy" -PR = "r0" +PR = "r1" SRC_URI = "http://www.cpan.org/authors/id/G/GU/GUIDO/libintl-perl-${PV}.tar.gz" diff --git a/recipes/perl/libio-compress-base-perl_2.015.bb b/recipes/perl/libio-compress-base-perl_2.015.bb index 2f24a5de9c..bba25a4e51 100644 --- a/recipes/perl/libio-compress-base-perl_2.015.bb +++ b/recipes/perl/libio-compress-base-perl_2.015.bb @@ -12,7 +12,5 @@ EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR} inherit cpan -FILES_${PN} = "${datadir}/perl5" - SRC_URI[md5sum] = "009813067e40c73c28c23fde8d9abfd5" SRC_URI[sha256sum] = "0dbfafc713c8fa6bb798cf806e18af1c9e55ab6bd117cdb12d1a565014a7d282" diff --git a/recipes/perl/libio-compress-zlib-perl_2.015.bb b/recipes/perl/libio-compress-zlib-perl_2.015.bb index f0cebcb4ae..06aa655c30 100644 --- a/recipes/perl/libio-compress-zlib-perl_2.015.bb +++ b/recipes/perl/libio-compress-zlib-perl_2.015.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Compress::Zlib - Interface to zlib compression library" SECTION = "libs" LICENSE = "Artistic|GPL" DEPENDS += "expat expat-native" -PR = "r0" +PR = "r1" SRC_URI = "http://www.cpan.org/modules/by-module/IO/IO-Compress-Zlib-${PV}.tar.gz" @@ -12,7 +12,5 @@ EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR} inherit cpan -FILES_${PN} = "${datadir}/perl5" - SRC_URI[md5sum] = "22f3b677a6f1782713c8451966598d3f" SRC_URI[sha256sum] = "9d25ffdfacb3d43cbae618c68b62264aab2f56a9cf65ad2f974af9dcbae97669" diff --git a/recipes/perl/libio-zlib-perl_1.04.bb b/recipes/perl/libio-zlib-perl_1.04.bb index 32b44ae867..c8a923d5ff 100644 --- a/recipes/perl/libio-zlib-perl_1.04.bb +++ b/recipes/perl/libio-zlib-perl_1.04.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" DEPENDS = "libcompress-zlib-perl-native" RDEPENDS_${PN} += "libcompress-zlib-perl" -PR = "r5" +PR = "r6" SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TO/TOMHUGHES/IO-Zlib-${PV}.tar.gz" diff --git a/recipes/perl/libio-zlib-perl_1.10.bb b/recipes/perl/libio-zlib-perl_1.10.bb index 30c0228a48..b535c0dcf7 100644 --- a/recipes/perl/libio-zlib-perl_1.10.bb +++ b/recipes/perl/libio-zlib-perl_1.10.bb @@ -2,8 +2,8 @@ DESCRIPTION = "IO::Zlib - IO:: style interface to Compress::Zlib" SECTION = "libs" LICENSE = "Artistic|GPL" DEPENDS = "libcompress-zlib-perl-native" -RDEPENDS_${PN} += "libcompress-zlib-perl" -PR = "r0" +RDEPENDS_${PN} += "libcompress-zlib-perl perl-module-tie-handle" +PR = "r2" SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TO/TOMHUGHES/IO-Zlib-${PV}.tar.gz;name=io-zlib-${PV}" SRC_URI[io-zlib-1.10.md5sum] = "078a9387009b928068f70759e61bd08f" diff --git a/recipes/perl/libmail-spf-perl_2.007.bb b/recipes/perl/libmail-spf-perl_2.007.bb index ae9a83cf5f..72009e6c49 100644 --- a/recipes/perl/libmail-spf-perl_2.007.bb +++ b/recipes/perl/libmail-spf-perl_2.007.bb @@ -17,10 +17,13 @@ RDEPENDS_${PN} += " \ perl-module-module-build \ perl-module-test-more \ perl-module-version \ + perl-module-exporter-heavy \ + perl-module-utf8 \ + perl-module-utf8-heavy \ " BBCLASSEXTEND = "native" -PR = "r0" +PR = "r2" SRC_URI = " \ http://search.cpan.org/CPAN/authors/id/J/JM/JMEHNLE/mail-spf/Mail-SPF-v${PV}.tar.gz;name=mail-spf-perl-${PV} \ @@ -33,4 +36,8 @@ S = "${WORKDIR}/Mail-SPF-v${PV}" inherit cpan_build +do_install_append() { + sed -ri "s,${D},," ${D}/${bindir}/spfquery +} + PACKAGE_ARCH = "all" diff --git a/recipes/perl/libmath-bigint-gmp-perl_1.18.bb b/recipes/perl/libmath-bigint-gmp-perl_1.18.bb index 70147033cf..8051d4075c 100644 --- a/recipes/perl/libmath-bigint-gmp-perl_1.18.bb +++ b/recipes/perl/libmath-bigint-gmp-perl_1.18.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" DEPENDS += "gmp-native" RDEPENDS_${PN} += "gmp" -PR = "r6" +PR = "r7" SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TE/TELS/math/Math-BigInt-GMP-${PV}.tar.gz" diff --git a/recipes/perl/libmime-lite-perl_3.024.bb b/recipes/perl/libmime-lite-perl_3.024.bb index fae42e34c0..4c8835ad7f 100644 --- a/recipes/perl/libmime-lite-perl_3.024.bb +++ b/recipes/perl/libmime-lite-perl_3.024.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Simple standalone module for generating MIME messages." SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r1" +PR = "r2" RDEPENDS_${PN} = "perl-module-file-spec \ libemail-date-format-perl \ diff --git a/recipes/perl/libmodule-build-perl_0.2805.bb b/recipes/perl/libmodule-build-perl_0.2805.bb index 095d4853c9..0a081d9698 100644 --- a/recipes/perl/libmodule-build-perl_0.2805.bb +++ b/recipes/perl/libmodule-build-perl_0.2805.bb @@ -8,7 +8,7 @@ DEPENDS = "libyaml-perl-native libversion-perl-native \ libarchive-tar-perl-native" RDEPENDS_${PN} = "libyaml-perl libversion-perl libextutils-cbuilder-perl \ libextutils-parsexs-perl libarchive-tar-perl" -PR = "r5" +PR = "r6" S = "${WORKDIR}/Module-Build-${PV}" diff --git a/recipes/perl/libmodule-load-perl_0.16.bb b/recipes/perl/libmodule-load-perl_0.16.bb index 5063990425..ee8e1ed00f 100644 --- a/recipes/perl/libmodule-load-perl_0.16.bb +++ b/recipes/perl/libmodule-load-perl_0.16.bb @@ -1,7 +1,7 @@ DESCRIPTION = "A module loading thingy for perl." SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r1" +PR = "r2" RDEPENDS_${PN} = "perl-module-test-more" diff --git a/recipes/perl/libnet-dbus-perl_0.33.5.bb b/recipes/perl/libnet-dbus-perl_0.33.5.bb index 5e18628408..5c4fc3c05c 100644 --- a/recipes/perl/libnet-dbus-perl_0.33.5.bb +++ b/recipes/perl/libnet-dbus-perl_0.33.5.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Net::DBus - Perl extension for the DBus message system" SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r0" +PR = "r1" RDEPENDS_${PN} = "perl-module-vars perl-module-locale perl-module-io-handle \ perl-module-symbol perl-module-selectsaver perl-module-io \ diff --git a/recipes/perl/libnet-dbus-perl_0.33.6.bb b/recipes/perl/libnet-dbus-perl_0.33.6.bb index 15a0633335..3ca98296ee 100644 --- a/recipes/perl/libnet-dbus-perl_0.33.6.bb +++ b/recipes/perl/libnet-dbus-perl_0.33.6.bb @@ -6,7 +6,7 @@ RDEPENDS_${PN} = "perl-module-vars perl-module-locale perl-module-io-handle \ perl-module-symbol perl-module-selectsaver perl-module-io \ perl-module-integer perl-module-exporter-heavy" -PR = "r2" +PR = "r3" SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DA/DANBERR/Net-DBus-${PV}.tar.gz" diff --git a/recipes/perl/libnet-ip-perl_1.25.bb b/recipes/perl/libnet-ip-perl_1.25.bb index ec880453aa..00fd6b3fcd 100644 --- a/recipes/perl/libnet-ip-perl_1.25.bb +++ b/recipes/perl/libnet-ip-perl_1.25.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" DEPENDS += "libio-zlib-perl-native" RDEPENDS_${PN} += "libio-zlib-perl perl-module-math-bigint" -PR = "r6" +PR = "r7" SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MA/MANU/Net-IP-${PV}.tar.gz" diff --git a/recipes/perl/libparams-util-perl_0.20.bb b/recipes/perl/libparams-util-perl_0.20.bb index 7ad689b6c2..59a6af01c1 100644 --- a/recipes/perl/libparams-util-perl_0.20.bb +++ b/recipes/perl/libparams-util-perl_0.20.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" RDEPENDS_${PN} += "perl-module-exporter perl-module-overload \ perl-module-scalar-util perl-module-strict perl-module-vars" -PR = "r4" +PR = "r5" SRC_URI = "http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Params-Util-${PV}.tar.gz" diff --git a/recipes/perl/libsub-exporter-perl_0.970.bb b/recipes/perl/libsub-exporter-perl_0.970.bb index 4b299e3511..7c0ff937fd 100644 --- a/recipes/perl/libsub-exporter-perl_0.970.bb +++ b/recipes/perl/libsub-exporter-perl_0.970.bb @@ -5,7 +5,7 @@ DEPENDS += "libdata-optlist-perl-native libsub-install-perl-native \ libparams-util-perl-native" RDEPENDS_${PN} += "perl-module-carp libdata-optlist-perl libparams-util-perl \ perl-module-strict libsub-install-perl perl-module-warnings" -PR = "r4" +PR = "r5" SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Sub-Exporter-${PV}.tar.gz" diff --git a/recipes/perl/libsub-install-perl_0.922.bb b/recipes/perl/libsub-install-perl_0.922.bb index 5af0cc59fa..1e715b5805 100644 --- a/recipes/perl/libsub-install-perl_0.922.bb +++ b/recipes/perl/libsub-install-perl_0.922.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" RDEPENDS_${PN} += "perl-module-carp perl-module-scalar-util perl-module-strict \ perl-module-warnings" -PR = "r4" +PR = "r5" SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Sub-Install-${PV}.tar.gz" diff --git a/recipes/perl/libsub-uplevel-perl_0.13.bb b/recipes/perl/libsub-uplevel-perl_0.13.bb index c8227e5ef2..6a58bbc131 100644 --- a/recipes/perl/libsub-uplevel-perl_0.13.bb +++ b/recipes/perl/libsub-uplevel-perl_0.13.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Sub::Uplevel - apparently run a function in a higher stack frame" SECTION = "libs" LICENSE = "Artistic|GPL" RDEPENDS_${PN} += "perl-module-exporter perl-module-strict perl-module-vars" -PR = "r4" +PR = "r5" SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-${PV}.tar.gz" diff --git a/recipes/perl/libtest-builder-tester-perl_1.01.bb b/recipes/perl/libtest-builder-tester-perl_1.01.bb index 78373caf50..0af775880b 100644 --- a/recipes/perl/libtest-builder-tester-perl_1.01.bb +++ b/recipes/perl/libtest-builder-tester-perl_1.01.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" RDEPENDS_${PN} += "perl-module-strict perl-module-carp perl-module-exporter \ perl-module-symbol perl-module-vars" -PR = "r3" +PR = "r4" SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MA/MARKF/Test-Builder-Tester-${PV}.tar.gz" diff --git a/recipes/perl/libtest-differences-perl_0.47.bb b/recipes/perl/libtest-differences-perl_0.47.bb index ea95fa7135..b8922232b4 100644 --- a/recipes/perl/libtest-differences-perl_0.47.bb +++ b/recipes/perl/libtest-differences-perl_0.47.bb @@ -4,7 +4,7 @@ LICENSE = "Artistic|GPL" DEPENDS += "libtext-diff-perl-native" RDEPENDS_${PN} += "perl-module-carp perl-module-constant perl-module-exporter \ perl-module-strict libtext-diff-perl" -PR = "r3" +PR = "r4" SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RB/RBS/Test-Differences-${PV}.tar.gz" diff --git a/recipes/perl/libtest-exception-perl_0.22.bb b/recipes/perl/libtest-exception-perl_0.22.bb index 11213f04a8..737dd79168 100644 --- a/recipes/perl/libtest-exception-perl_0.22.bb +++ b/recipes/perl/libtest-exception-perl_0.22.bb @@ -5,7 +5,7 @@ DEPENDS += "libsub-uplevel-perl-native" RDEPENDS_${PN} += "perl-module-base perl-module-carp perl-module-strict \ libsub-uplevel-perl perl-module-test-builder \ perl-module-warnings" -PR = "r3" +PR = "r4" SRC_URI = "http://search.cpan.org/CPAN/authors/id/A/AD/ADIE/Test-Exception-${PV}.tar.gz" diff --git a/recipes/perl/libtest-mockmodule-perl_0.05.bb b/recipes/perl/libtest-mockmodule-perl_0.05.bb index f49eef2a59..0173514f1f 100644 --- a/recipes/perl/libtest-mockmodule-perl_0.05.bb +++ b/recipes/perl/libtest-mockmodule-perl_0.05.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" RDEPENDS_${PN} += "perl-module-carp perl-module-scalar-util perl-module-strict \ perl-module-vars " -PR = "r3" +PR = "r4" SRC_URI = "http://search.cpan.org/CPAN/authors/id/S/SI/SIMONFLK/Test-MockModule-${PV}.tar.gz" diff --git a/recipes/perl/libtest-output-perl_0.10.bb b/recipes/perl/libtest-output-perl_0.10.bb index ce1eb9a2af..0c223b4add 100644 --- a/recipes/perl/libtest-output-perl_0.10.bb +++ b/recipes/perl/libtest-output-perl_0.10.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" DEPENDS += "libsub-exporter-perl-native" RDEPENDS_${PN} += "libsub-exporter-perl" -PR = "r3" +PR = "r4" SRC_URI = "http://search.cpan.org/CPAN/authors/id/S/SS/SSORICHE/Test-Output-${PV}.tar.gz" diff --git a/recipes/perl/libtext-diff-perl_0.35.bb b/recipes/perl/libtext-diff-perl_0.35.bb index c48b1eb2d3..d67cd2210d 100644 --- a/recipes/perl/libtext-diff-perl_0.35.bb +++ b/recipes/perl/libtext-diff-perl_0.35.bb @@ -5,7 +5,7 @@ DEPENDS += "libalgorithm-diff-perl-native" RDEPENDS_${PN} += "libalgorithm-diff-perl perl-module-carp perl-module-constant \ perl-module-exporter perl-module-strict perl-module-carp \ perl-module-strict " -PR = "r4" +PR = "r5" SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RB/RBS/Text-Diff-${PV}.tar.gz" diff --git a/recipes/perl/libtimedate-perl_1.20.bb b/recipes/perl/libtimedate-perl_1.20.bb index fcd9b4f422..9c44dc62a5 100644 --- a/recipes/perl/libtimedate-perl_1.20.bb +++ b/recipes/perl/libtimedate-perl_1.20.bb @@ -2,7 +2,7 @@ DESCRIPTION = "TimeDate - parser for absolute times" SECTION = "libs" # You can redistribute it and/or modify it under the same terms as Perl itself. LICENSE = "Artistic|GPL" -PR = "r0" +PR = "r1" RDEPENDS_${PN} += "perl-module-carp perl-module-exporter perl-module-strict perl-module-time-local" PACKAGE_ARCH = "all" diff --git a/recipes/perl/libtree-simple-perl_1.18.bb b/recipes/perl/libtree-simple-perl_1.18.bb new file mode 100644 index 0000000000..ce2a3f7034 --- /dev/null +++ b/recipes/perl/libtree-simple-perl_1.18.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "A simple tree object" +SECTION = "libs" +LICENSE = "Artistic|GPL" +RDEPENDS += "perl-module-test-more perl-module-scalar-util" +PR = "r0" + +PACKAGE_ARCH = "all" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/S/ST/STEVAN/Tree-Simple-1.18.tar.gz" +SRC_URI[md5sum] = "70462938108a8b8658b1b1d2f12dbeab" +SRC_URI[sha256sum] = "cfbcdf0e02fb94134e1308ef5c3feb4ca4d4ff4cc4199b14fa9be7821183622d" + +S = "${WORKDIR}/Tree-Simple-${PV}" + +inherit cpan diff --git a/recipes/perl/liburi-perl_1.52.bb b/recipes/perl/liburi-perl_1.52.bb index e32495a8ee..d9cf315f4e 100644 --- a/recipes/perl/liburi-perl_1.52.bb +++ b/recipes/perl/liburi-perl_1.52.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Manipulates and accesses URI strings" SECTION = "libs" LICENSE = "Artistic|GPL" #RDEPENDS_${PN} += " libmime-base64-perl libnet-perl" -PR = "r2" +PR = "r3" SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/URI-${PV}.tar.gz" diff --git a/recipes/perl/libxml-dom-perl_1.44.bb b/recipes/perl/libxml-dom-perl_1.44.bb index 66e158ddc0..098e304b2f 100644 --- a/recipes/perl/libxml-dom-perl_1.44.bb +++ b/recipes/perl/libxml-dom-perl_1.44.bb @@ -1,7 +1,7 @@ DESCRIPTION = "XML::DOM - A perl module for building DOM Level 1 compliant document structures" SECTION = "libs" LICENSE = "unknown" -PR= "r2" +PR = "r3" DEPENDS += "libxml-parser-perl-native libxml-regexp-perl-native \ libhtml-parser-perl-native libhtml-tagset-perl-native \ diff --git a/recipes/perl/libxml-simple-perl_2.18.bb b/recipes/perl/libxml-simple-perl_2.18.bb index 669a2e0b2d..0c9668d3e3 100644 --- a/recipes/perl/libxml-simple-perl_2.18.bb +++ b/recipes/perl/libxml-simple-perl_2.18.bb @@ -2,7 +2,8 @@ DESCRIPTION = "XML::Simple - Easy API to maintain XML (esp config files)" SECTION = "libs" LICENSE = "Artistic" DEPENDS += "libxml-parser-perl" -PR = "r1" +RDEPENDS_${PN} += "libxml-parser-perl" +PR = "r2" SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Simple-${PV}.tar.gz" diff --git a/recipes/perl/libyaml-perl_0.62.bb b/recipes/perl/libyaml-perl_0.62.bb index c98c797154..e52fb6b0b9 100644 --- a/recipes/perl/libyaml-perl_0.62.bb +++ b/recipes/perl/libyaml-perl_0.62.bb @@ -4,7 +4,7 @@ LICENSE = "Artistic|GPL" DEPENDS = "libdigest-sha1-perl-native liberror-perl-native \ libipc-sharelite-perl-native" RDEPENDS_${PN} = "libdigest-sha1-perl liberror-perl libipc-sharelite-perl" -PR = "r5" +PR = "r6" SRC_URI = "http://search.cpan.org/CPAN/authors/id/I/IN/INGY/YAML-${PV}.tar.gz" diff --git a/recipes/perl/perl-rdepends_5.10.1.inc b/recipes/perl/perl-rdepends_5.10.1.inc index a85c20e2dd..d948417e58 100644 --- a/recipes/perl/perl-rdepends_5.10.1.inc +++ b/recipes/perl/perl-rdepends_5.10.1.inc @@ -19,6 +19,9 @@ RDEPENDS_perl-module-file-spec += "perl-module-file-spec-unix " RDEPENDS_perl-module-english += "perl-module-tie-hash-namedcapture " RDEPENDS_perl-module-english += "perl-module-errno " +RDEPENDS_perl-module-errno += "perl-module-list-util " +RDEPENDS_perl-module-config-heavy += "perl-module-config-git " + # Auto-generated dependencies RDEPENDS_perl-module-app-prove += "perl-module-app-prove-state " RDEPENDS_perl-module-app-prove += "perl-module-carp " diff --git a/recipes/perl/perl_5.10.1.bb b/recipes/perl/perl_5.10.1.bb index 75ae81d75b..c0f6378567 100644 --- a/recipes/perl/perl_5.10.1.bb +++ b/recipes/perl/perl_5.10.1.bb @@ -5,7 +5,7 @@ LICENSE = "Artistic|GPL" PRIORITY = "optional" # We need gnugrep (for -I) DEPENDS = "virtual/db perl-native grep-native" -PR = "r4" +PR = "r6" # Not tested enough DEFAULT_PREFERENCE = "-1" @@ -168,7 +168,7 @@ do_stage() { PACKAGES = "perl-dbg perl perl-misc perl-lib perl-dev perl-pod perl-doc" FILES_${PN} = "${bindir}/perl ${bindir}/perl${PV}" -FILES_${PN}-lib = "${libdir}/libperl.so* ${libdir}/perl/${PVM} ${datadir}/perl/${PVM}" +FILES_${PN}-lib = "${libdir}/libperl.so* ${libdir}/perl/${PVM} ${datadir}/perl/${PVM} ${datadir}/perl/${PV}/unicore/lib" FILES_${PN}-dev = "${libdir}/perl/${PV}/CORE" FILES_${PN}-pod = "${datadir}/perl/${PV}/pod \ ${datadir}/perl/${PV}/*.pod \ diff --git a/recipes/php/php-native.inc b/recipes/php/php-native.inc index 1698a80379..31560a5ce5 100644 --- a/recipes/php/php-native.inc +++ b/recipes/php/php-native.inc @@ -11,5 +11,3 @@ EXTRA_OECONF = "--with-cgi --enable-sockets --enable-pcntl \ --without-libpng --without-libjpeg \ --with-libxml-dir=${STAGING_BINDIR_NATIVE} \ " - -FILESPATH = "${FILE_DIRNAME}/php-${PV}:${FILE_DIRNAME}/php:${FILE_DIRNAME}/files" diff --git a/recipes/plone/plone_3.1.7.bb b/recipes/plone/plone_3.1.7.bb index 222b9a0c72..fcf11dda35 100644 --- a/recipes/plone/plone_3.1.7.bb +++ b/recipes/plone/plone_3.1.7.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Plone, a user friendly and powerful Content Management System bas SECTION = "network/cms" PRIORITY = "optional" LICENSE = "GPL" -PR = "ml0" +PR = "ml1" SRC_URI = "http://launchpadlibrarian.net/19393495/Plone-${PV}.tar.gz" S = "${WORKDIR}/Plone-${PV}" diff --git a/recipes/poboxserver/qpobox_0.5.4.bb b/recipes/poboxserver/qpobox_0.5.4.bb index ee0b211db3..76f5d631f7 100644 --- a/recipes/poboxserver/qpobox_0.5.4.bb +++ b/recipes/poboxserver/qpobox_0.5.4.bb @@ -3,7 +3,7 @@ SECTION = "opie/inputmethods" RDEPENDS_${PN} = "poboxserver virtual-japanese-font" LICENSE = "GPL" HOMEPAGE = "http://takahr.dhis.portside.net/cgi-bin/rwiki.cgi?cmd=view;name=QPOBox" -PR = "r2" +PR = "r3" SRC_URI = "http://www.vanille.de/mirror/qpobox-${PV}.tar.gz \ file://qpobox-0.5.4-opie.patch \ diff --git a/recipes/podget/podget_0.5.8.bb b/recipes/podget/podget_0.5.8.bb index 82e12e1d7c..50e740afe9 100644 --- a/recipes/podget/podget_0.5.8.bb +++ b/recipes/podget/podget_0.5.8.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS += "virtual/libiconv" RDEPENDS_${PN} = "bash sed wget" -PR = "r2" +PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/podget/podget_${PV}.tar.gz \ file://busybox_df.patch" diff --git a/recipes/poptop/poptop_1.3.0.bb b/recipes/poptop/poptop_1.3.0.bb index 5d430a0d46..58f845990a 100644 --- a/recipes/poptop/poptop_1.3.0.bb +++ b/recipes/poptop/poptop_1.3.0.bb @@ -11,7 +11,7 @@ PRIORITY = "optional" DEPENDS = "ppp" RDEPENDS_${PN} = "ppp" -PR = "r0" +PR = "r1" inherit autotools diff --git a/recipes/povray/povray_3.6.1.bb b/recipes/povray/povray_3.6.1.bb index f5aea2bccd..ab3bd6fd9a 100644 --- a/recipes/povray/povray_3.6.1.bb +++ b/recipes/povray/povray_3.6.1.bb @@ -6,7 +6,7 @@ LICENSE = "povray" DEPENDS = "virtual/libx11 zlib jpeg libpng tiff" RDEPENDS_${PN} = "" -PR = "r2" +PR = "r3" #We apply a patch that subverts the checks for jpeg, zlib, png and tiff because we know OE has the required versions, but it is still a hack. SRC_URI = "http://www.povray.org/redirect/www.povray.org/ftp/pub/povray/Official/Unix/${P}.tar.bz2 \ diff --git a/recipes/ppp-dialin/ppp-dialin_0.1.bb b/recipes/ppp-dialin/ppp-dialin_0.1.bb index 0ed55d2800..376d21de3e 100644 --- a/recipes/ppp-dialin/ppp-dialin_0.1.bb +++ b/recipes/ppp-dialin/ppp-dialin_0.1.bb @@ -2,7 +2,7 @@ SECTION = "console/network" DESCRIPTION = "Enables PPP dial-in through a serial connection" DEPENDS = "ppp" RDEPENDS_${PN} = "ppp" -PR = "r6" +PR = "r7" LICENSE = "MIT" SRC_URI = "file://host-peer \ diff --git a/recipes/ppp-dsl/ppp-dsl_0.1.bb b/recipes/ppp-dsl/ppp-dsl_0.1.bb index a43781b784..92e18b5334 100644 --- a/recipes/ppp-dsl/ppp-dsl_0.1.bb +++ b/recipes/ppp-dsl/ppp-dsl_0.1.bb @@ -4,7 +4,7 @@ LICENSE = "PD" DEPENDS = "ppp rp-pppoe" RDEPENDS_${PN} = "ppp rp-pppoe" RRECOMMENDS_${PN} = "kernel-module-ppp-async kernel-module-ppp-generic kernel-module-slhc" -PR = "r5" +PR = "r6" SRC_URI = "file://dsl-provider \ file://ppp_on_boot.dsl" diff --git a/recipes/ppp/ppp-gprs_1.0.bb b/recipes/ppp/ppp-gprs_1.0.bb index e016324b29..423f0d2406 100644 --- a/recipes/ppp/ppp-gprs_1.0.bb +++ b/recipes/ppp/ppp-gprs_1.0.bb @@ -2,7 +2,7 @@ SECTION = "console/network" DESCRIPTION = "PPP scripts for easy GPRS connection" LICENSE = "GPL" RDEPENDS_${PN} = "ppp" -PR = "r1" +PR = "r2" SRC_URI = "file://peers/* file://chats/*" diff --git a/recipes/pptp-linux/pptp-linux_1.7.1.bb b/recipes/pptp-linux/pptp-linux_1.7.1.bb index 332f06d92d..f73ba55571 100644 --- a/recipes/pptp-linux/pptp-linux_1.7.1.bb +++ b/recipes/pptp-linux/pptp-linux_1.7.1.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://pptpclient.sourceforge.net" SECTION = "network" LICENSE = "GPL" RDEPENDS_${PN} = "ppp" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/sourceforge/pptpclient/pptp-${PV}.tar.gz \ file://options.pptp" diff --git a/recipes/prboom/prboom_2.4.7.bb b/recipes/prboom/prboom_2.4.7.bb index e94f84249a..312ebcfed8 100644 --- a/recipes/prboom/prboom_2.4.7.bb +++ b/recipes/prboom/prboom_2.4.7.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" DEPENDS = "virtual/libsdl libsdl-mixer libsdl-net" LICENSE = "GPL" -PR = "r1" +PR = "r2" RRECOMMENDS_${PN} = "freedoom" SRC_URI = "${SOURCEFORGE_MIRROR}/prboom/prboom-${PV}.tar.gz \ diff --git a/recipes/prboom/prboom_2.5.0.bb b/recipes/prboom/prboom_2.5.0.bb index 4fd0d2ae2d..92a276dcad 100644 --- a/recipes/prboom/prboom_2.5.0.bb +++ b/recipes/prboom/prboom_2.5.0.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" DEPENDS = "virtual/libsdl libsdl-mixer libsdl-net" LICENSE = "GPL" -PR = "r1" +PR = "r2" RRECOMMENDS_${PN} = "freedoom" SRC_URI = "${SOURCEFORGE_MIRROR}/prboom/prboom-${PV}.tar.gz \ diff --git a/recipes/prism54/prism54-module_1.2.bb b/recipes/prism54/prism54-module_1.2.bb index 8bd3308a17..9d987cb011 100644 --- a/recipes/prism54/prism54-module_1.2.bb +++ b/recipes/prism54/prism54-module_1.2.bb @@ -6,7 +6,7 @@ LICENSE = "GPL" RDEPENDS_${PN} = "kernel (${KERNEL_VERSION}) prism54-firmware (1.0.3.0) hotplug" RRECOMMENDS_${PN} = "kernel-module-firmware-class" DEPENDS = "virtual/kernel prism54-firmware" -PR = "r1" +PR = "r2" SRC_URI = "http://prism54.org/pub/linux/testing/tars/2004-06/prism54-1.2.tar.bz2" diff --git a/recipes/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb b/recipes/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb index 00493d8480..de51ba0978 100644 --- a/recipes/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb +++ b/recipes/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb @@ -1,5 +1,5 @@ SECTION = "x11/network" -PR = "r4" +PR = "r5" PACKAGES = "${PN}-dbg prismstumbler prismstumbler-frontend prismstumbler-doc" DESCRIPTION = "Prismstumbler wireless LAN scanner" diff --git a/recipes/prismstumbler/prismstumbler_0.7.3.bb b/recipes/prismstumbler/prismstumbler_0.7.3.bb index 7cb74114da..19534d834a 100644 --- a/recipes/prismstumbler/prismstumbler_0.7.3.bb +++ b/recipes/prismstumbler/prismstumbler_0.7.3.bb @@ -1,5 +1,5 @@ SECTION = "x11/network" -PR = "r5" +PR = "r6" PACKAGES = "${PN}-dbg prismstumbler prismstumbler-frontend prismstumbler-doc" DESCRIPTION = "Prismstumbler wireless LAN scanner" diff --git a/recipes/procps/procps.inc b/recipes/procps/procps.inc index 863debf599..d158f9b8ec 100644 --- a/recipes/procps/procps.inc +++ b/recipes/procps/procps.inc @@ -8,7 +8,7 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "ncurses" -INC_PR = "r9" +INC_PR = "r10" SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz;name=tarball \ file://sysctl.conf \ @@ -22,11 +22,6 @@ INITSCRIPT_PARAMS = "start 30 S ." FILES_${PN} += "${base_libdir}/libproc-*.so" -FILES = "${bindir}/top.${PN} ${base_bindir}/ps.${PN} ${bindir}/uptime.${PN} ${base_bindir}/kill.${PN} \ - ${bindir}/free.${PN} ${bindir}/w ${bindir}/watch ${bindir}/pgrep ${bindir}/pmap ${bindir}/pwdx \ - ${bindir}/snice ${bindir}/vmstat ${bindir}/slabtop ${bindir}/pkill ${bindir}/skill ${bindir}/tload \ - ${base_sbindir}/sysctl.${PN}" - CONFFILES_${PN} = "${sysconfdir}/sysctl.conf" EXTRA_OEMAKE = "CFLAGS=-I${STAGING_INCDIR} \ @@ -48,6 +43,7 @@ do_install_append () { mv ${D}${bindir}/free ${D}${bindir}/free.${PN} mv ${D}${base_sbindir}/sysctl ${D}${base_sbindir}/sysctl.${PN} mv ${D}${bindir}/pkill ${D}${bindir}/pkill.${PN} + mv ${D}${bindir}/pgrep ${D}${bindir}/pgrep.${PN} } pkg_postinst() { @@ -58,6 +54,7 @@ pkg_postinst() { update-alternatives --install ${bindir}/free free free.${PN} 90 update-alternatives --install ${base_sbindir}/sysctl sysctl sysctl.${PN} 90 update-alternatives --install ${bindir}/pkill pkill pkill.${PN} 90 + update-alternatives --install ${bindir}/pgrep pgrep pgrep.${PN} 90 } pkg_postrm() { @@ -68,4 +65,5 @@ pkg_postrm() { update-alternatives --remove free free.${PN} update-alternatives --remove sysctl sysctl.${PN} update-alternatives --remove pkill pkill.${PN} + update-alternatives --remove pgrep pgrep.${PN} } diff --git a/recipes/psplash/psplash-zap_1.0.bb b/recipes/psplash/psplash-zap_1.0.bb index 16e6feba45..988192fe9a 100644 --- a/recipes/psplash/psplash-zap_1.0.bb +++ b/recipes/psplash/psplash-zap_1.0.bb @@ -1,9 +1,9 @@ SRC_URI = "file://zzapsplash-init" -PR = "r3" +PR = "r7" do_install_prepend() { - install -d "${D}${sysconfdir}/init.d/" - install -m 0755 "${WORKDIR}/zzapsplash-init" "${D}${sysconfdir}/init.d/zzapsplash" + install -d "${D}${sysconfdir}/init.d/" + install -m 0755 "${WORKDIR}/zzapsplash-init" "${D}${sysconfdir}/init.d/zzapsplash" } inherit update-rc.d diff --git a/recipes/psplash/psplash.inc b/recipes/psplash/psplash.inc index 71fd7bd43f..3799c38b3d 100644 --- a/recipes/psplash/psplash.inc +++ b/recipes/psplash/psplash.inc @@ -9,7 +9,7 @@ RCONFLICTS_${PN} = "exquisite" SRCREV = "422" PV = "0.0+svnr${SRCPV}" -PR = "r29" +PR = "r30" # You can create your own pslash-poky-img.h by doing # ./make-image-header.sh <file>.png POKY diff --git a/recipes/pulseaudio/pulseaudio-alsa-wrapper.bb b/recipes/pulseaudio/pulseaudio-alsa-wrapper.bb index a428ded030..571dd46bbf 100644 --- a/recipes/pulseaudio/pulseaudio-alsa-wrapper.bb +++ b/recipes/pulseaudio/pulseaudio-alsa-wrapper.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Meta package to make alsa transparently use pulseaudio" LICENSE = "GPLv2" -PR = "r1" +PR = "r2" SRC_URI = "file://asound.conf.pulseaudio" diff --git a/recipes/pulseaudio/pulseaudio-esd-wrapper.bb b/recipes/pulseaudio/pulseaudio-esd-wrapper.bb index 1eef52b13b..0297de2ee6 100644 --- a/recipes/pulseaudio/pulseaudio-esd-wrapper.bb +++ b/recipes/pulseaudio/pulseaudio-esd-wrapper.bb @@ -1,10 +1,10 @@ DESCRIPTION = "Drop-in Esound replacement" LICENSE = "GPLv2" -PR = "r1" +PR = "r2" -RCONFLICTS = "esd" -RREPLACES = "esd" +RCONFLICTS_${PN} = "esd" +RREPLACES_${PN} = "esd" RDEPENDS_${PN} = " \ pulseaudio-server \ diff --git a/recipes/pulseaudio/pulseaudio-meta_0.9.10.bb b/recipes/pulseaudio/pulseaudio-meta_0.9.10.bb index 0b0610572a..d97d46d63b 100644 --- a/recipes/pulseaudio/pulseaudio-meta_0.9.10.bb +++ b/recipes/pulseaudio/pulseaudio-meta_0.9.10.bb @@ -18,7 +18,7 @@ RDEPENDS_${PN} = "\ libasound-module-ctl-pulse \ libasound-module-pcm-pulse \ " -PR = "r3" +PR = "r4" inherit update-rc.d diff --git a/recipes/pyphonelog/pyphonelog_git.bb b/recipes/pyphonelog/pyphonelog_git.bb index 30a4bc91cd..8ba1df3cb2 100644 --- a/recipes/pyphonelog/pyphonelog_git.bb +++ b/recipes/pyphonelog/pyphonelog_git.bb @@ -10,7 +10,7 @@ inherit distutils S = "${WORKDIR}/git" SRCREV = "d22159060470d2f429d4e8b9ba1dc3096aa5d099" PV = "0.17.0+gitr${SRCPV}" -PR = "r0" +PR = "r1" SRC_URI = "git://shr.bearstech.com/repo/pyphonelog.git;protocol=http" FILES_${PN} += "${datadir}/applications/phonelog.desktop \ ${datadir}/phonelog/ \ diff --git a/recipes/python/pydes_1.3.1.bb b/recipes/python/pydes_1.3.1.bb index 7a12a35eaf..f2c6fbb3bb 100644 --- a/recipes/python/pydes_1.3.1.bb +++ b/recipes/python/pydes_1.3.1.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" RDEPENDS_${PN} = "python" -PR = "r1" +PR = "r2" ARCH_pydes = "all" SRC_URI = "http://twhiteman.netfirms.com/pyDES/pyDes-1.3.1.tar.gz" diff --git a/recipes/python/python-blipapi_0.02.04.bb b/recipes/python/python-blipapi_0.02.04.bb index 6324ad3945..be80a30079 100644 --- a/recipes/python/python-blipapi_0.02.04.bb +++ b/recipes/python/python-blipapi_0.02.04.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://blipapi.googlecode.com/" DEPENDS = "python-setuptools" LICENSE = "GPL" RDEPENDS_${PN} += "python-json" -PR = "r0" +PR = "r1" inherit setuptools SRC_URI = "http://blipapi.googlecode.com/files/BlipApiPY-0.02.04.tar.bz2" diff --git a/recipes/python/python-cheetah_2.0.1.bb b/recipes/python/python-cheetah_2.0.1.bb index def89ebeb6..c91002e3af 100644 --- a/recipes/python/python-cheetah_2.0.1.bb +++ b/recipes/python/python-cheetah_2.0.1.bb @@ -3,7 +3,7 @@ SECTION = "devel/python" PRIORITY = "optional" LICENSE = "MIT" SRCNAME = "Cheetah" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/cheetahtemplate/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/recipes/python/python-efl.inc b/recipes/python/python-efl.inc index d8559eab5b..745ba57cc6 100644 --- a/recipes/python/python-efl.inc +++ b/recipes/python/python-efl.inc @@ -8,7 +8,7 @@ HOMEPAGE = "http://www.enlightenment.org" DEPENDS = "python-cython-native python-pyrex-native python-numeric eina" RDEPENDS_${PN} += "python-lang" PV = "0.3.1+svnr${SRCPV}" -PR = "ml0" +PR = "ml1" inherit setuptools diff --git a/recipes/python/python-elementary_svn.bb b/recipes/python/python-elementary_svn.bb index 72948c07ae..81944b171f 100644 --- a/recipes/python/python-elementary_svn.bb +++ b/recipes/python/python-elementary_svn.bb @@ -3,7 +3,7 @@ SRCREV = "${EFL_SRCREV}" DEPENDS += "elementary" RDEPENDS_${PN} += "python-evas python-ecore python-edje" PV = "0.1+svnr${SRCPV}" -PR = "ml0" +PR = "ml1" do_stage() { distutils_stage_all diff --git a/recipes/python/python-fam_1.1.1.bb b/recipes/python/python-fam_1.1.1.bb index b8ceadaedd..eb013851d4 100644 --- a/recipes/python/python-fam_1.1.1.bb +++ b/recipes/python/python-fam_1.1.1.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "fam" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz" diff --git a/recipes/python/python-gdata_1.2.4.bb b/recipes/python/python-gdata_1.2.4.bb index 6e74f60e5b..464023149f 100644 --- a/recipes/python/python-gdata_1.2.4.bb +++ b/recipes/python/python-gdata_1.2.4.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Google Data APIs Python Client Library" SECTION = "devel/python" LICENSE = "Apache" HOMEPAGE = "http://code.google.com/p/gdata-python-client/" -PR = "r0" +PR = "r1" inherit distutils diff --git a/recipes/python/python-imaging_1.1.6.bb b/recipes/python/python-imaging_1.1.6.bb index 3cf8760ed1..ffb5300b84 100644 --- a/recipes/python/python-imaging_1.1.6.bb +++ b/recipes/python/python-imaging_1.1.6.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" DEPENDS = "freetype jpeg tiff" RDEPENDS_${PN} = "python-lang python-stringold" SRCNAME = "Imaging" -PR = "ml1" +PR = "ml2" SRC_URI = "http://effbot.org/downloads/Imaging-${PV}.tar.gz \ file://path.patch" diff --git a/recipes/python/python-iniparse-native_0.2.3.bb b/recipes/python/python-iniparse-native_0.2.3.bb index 8c17505de9..be3b57e7aa 100644 --- a/recipes/python/python-iniparse-native_0.2.3.bb +++ b/recipes/python/python-iniparse-native_0.2.3.bb @@ -2,7 +2,7 @@ require python-iniparse_${PV}.bb inherit native DEPENDS = "python-native" RDEPENDS_${PN} = "" -PR = "r1" +PR = "r2" do_stage() { distutils_stage_all diff --git a/recipes/python/python-libgmail_0.1.11.bb b/recipes/python/python-libgmail_0.1.11.bb index 644f3b819a..6a650e49d6 100644 --- a/recipes/python/python-libgmail_0.1.11.bb +++ b/recipes/python/python-libgmail_0.1.11.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://libgmail.sourceforge.net/" PRIORITY = "optional" LICENSE = "GPL" SRCNAME = "libgmail" -PR = "ml0" +PR = "ml1" SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/recipes/python/python-netfilter_0.5.5.bb b/recipes/python/python-netfilter_0.5.5.bb index 4537d78067..affde9ace5 100644 --- a/recipes/python/python-netfilter_0.5.5.bb +++ b/recipes/python/python-netfilter_0.5.5.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" RDEPENDS_${PN} = "iptables iptables-utils python-logging python-shell python-subprocess" SRCNAME = "python-netfilter" -PR = "ml0" +PR = "ml1" SRC_URI = "http://opensource.bolloretelecom.eu/files/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/recipes/python/python-pexpect_2.3.bb b/recipes/python/python-pexpect_2.3.bb index a661c21079..ef2f538ddd 100644 --- a/recipes/python/python-pexpect_2.3.bb +++ b/recipes/python/python-pexpect_2.3.bb @@ -3,7 +3,7 @@ SECTION = "devel/python" PRIORITY = "optional" LICENSE = "PSF" SRCNAME = "pexpect" -PR = "ml0" +PR = "ml1" SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/recipes/python/python-phoneutils_git.bb b/recipes/python/python-phoneutils_git.bb index 492f80348c..870404617d 100644 --- a/recipes/python/python-phoneutils_git.bb +++ b/recipes/python/python-phoneutils_git.bb @@ -5,7 +5,7 @@ RDEPENDS_${PN} = "libphone-utils" SRCREV = "8a7c719e0c3f1f8c10f77f17422da02d7177f0dd" PV = "0.0.2+gitr${SRCPV}" -PR = "r2" +PR = "r3" SRC_URI = "git://git.shr-project.org/repo/libphone-utils.git;protocol=http;branch=master" S = "${WORKDIR}/git/src/python" diff --git a/recipes/python/python-pycap_0.1.6.bb b/recipes/python/python-pycap_0.1.6.bb index 61d4b53dda..32fa1cb37e 100644 --- a/recipes/python/python-pycap_0.1.6.bb +++ b/recipes/python/python-pycap_0.1.6.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" RDEPENDS_${PN} = "python-core" DEPENDS = "libpcap libnet" SRCNAME = "pycap" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/recipes/python/python-pycurl_7.18.2.bb b/recipes/python/python-pycurl_7.18.2.bb index 401a46cc51..2e6416c79e 100644 --- a/recipes/python/python-pycurl_7.18.2.bb +++ b/recipes/python/python-pycurl_7.18.2.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "curl-${PV}" SRCNAME = "pycurl" -PR = "ml2" +PR = "ml3" SRC_URI = "\ http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz \ diff --git a/recipes/python/python-pycurl_7.19.0.bb b/recipes/python/python-pycurl_7.19.0.bb index 716098550d..643b54516f 100644 --- a/recipes/python/python-pycurl_7.19.0.bb +++ b/recipes/python/python-pycurl_7.19.0.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "curl" SRCNAME = "pycurl" -PR = "ml2" +PR = "ml3" SRC_URI = "\ http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz;name=archive \ diff --git a/recipes/python/python-pyfits_1.3.bb b/recipes/python/python-pyfits_1.3.bb index bf5f0777d8..52509e1ac9 100644 --- a/recipes/python/python-pyfits_1.3.bb +++ b/recipes/python/python-pyfits_1.3.bb @@ -4,7 +4,7 @@ AUTHOR = "Space Telescope Science Institute" RDEPENDS_${PN} = "python-numpy" SECTION = "devel/python" LICENSE = "AURA" -PR = "ml0" +PR = "ml1" SRC_URI = "http://www.stsci.edu/resources/software_hardware/pyfits/pyfits-${PV}.tar.gz" S = "${WORKDIR}/pyfits-${PV}" diff --git a/recipes/python/python-pyftpdlib_0.5.1.bb b/recipes/python/python-pyftpdlib_0.5.1.bb index 1cee0752fd..1983791607 100644 --- a/recipes/python/python-pyftpdlib_0.5.1.bb +++ b/recipes/python/python-pyftpdlib_0.5.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "FTP Server Library" SECTION = "devel/python" PRIORITY = "optional" LICENSE = "MIT" -PR = "ml0" +PR = "ml1" inherit distutils diff --git a/recipes/python/python-pygame_1.9.1.bb b/recipes/python/python-pygame_1.9.1.bb index dba915f2cf..90e397e6da 100644 --- a/recipes/python/python-pygame_1.9.1.bb +++ b/recipes/python/python-pygame_1.9.1.bb @@ -6,7 +6,7 @@ DEPENDS = "libsdl-x11 libsdl-image libsdl-mixer libsdl-net libsdl-ttf python-num DEPENDS += "${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'smpeg', d)}" RDEPENDS_${PN} = "python-numeric" SRCNAME = "pygame" -PR = "ml4" +PR = "ml5" SRC_URI = "http://www.pygame.org/ftp/${SRCNAME}-${PV}release.tar.gz;name=archive" SRC_URI[archive.md5sum] = "1c4cdc708d17c8250a2d78ef997222fc" diff --git a/recipes/python/python-pygoogle_0.6.bb b/recipes/python/python-pygoogle_0.6.bb index 29e6d6314b..5ecdb75bf7 100644 --- a/recipes/python/python-pygoogle_0.6.bb +++ b/recipes/python/python-pygoogle_0.6.bb @@ -7,7 +7,7 @@ PRIORITY = "optional" LICENSE = "PSF" RDEPENDS_${PN} = "python-soappy" SRCNAME = "pygoogle" -PR = "ml1" +PR = "ml2" SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/recipes/python/python-pygtk-1.2_0.6.12.bb b/recipes/python/python-pygtk-1.2_0.6.12.bb index c8410bf5a7..cd8b0b3ff8 100644 --- a/recipes/python/python-pygtk-1.2_0.6.12.bb +++ b/recipes/python/python-pygtk-1.2_0.6.12.bb @@ -5,7 +5,7 @@ LICENSE = "LGPL" DEPENDS = "gtk+-1.2" RDEPENDS_${PN} = "python-shell python-re" SRCNAME = "pygtk" -PR = "r3" +PR = "r4" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/python/v1.2/${SRCNAME}-${PV}.tar.gz \ file://remove-imlib-et-al.patch \ diff --git a/recipes/python/python-pygtk_2.10.4.bb b/recipes/python/python-pygtk_2.10.4.bb index cab2d7b7e9..5826a56b36 100644 --- a/recipes/python/python-pygtk_2.10.4.bb +++ b/recipes/python/python-pygtk_2.10.4.bb @@ -6,7 +6,7 @@ RDEPENDS_${PN} = "python-shell python-pycairo python-pygobject" PROVIDES = "python-pygtk2" SRCNAME = "pygtk" LICENSE = "LGPL" -PR = "ml12" +PR = "ml13" MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/${MAJ_VER}/${SRCNAME}-${PV}.tar.bz2 \ diff --git a/recipes/python/python-pygtk_2.16.0.bb b/recipes/python/python-pygtk_2.16.0.bb index 40a8be2040..1b0a12b636 100644 --- a/recipes/python/python-pygtk_2.16.0.bb +++ b/recipes/python/python-pygtk_2.16.0.bb @@ -6,7 +6,7 @@ RDEPENDS_${PN} = "python-shell python-pycairo python-pygobject" PROVIDES = "python-pygtk2" SRCNAME = "pygtk" LICENSE = "LGPL" -PR = "r1" +PR = "r2" MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/${MAJ_VER}/${SRCNAME}-${PV}.tar.bz2;name=pygtk \ diff --git a/recipes/python/python-pygtk_2.6.3.bb b/recipes/python/python-pygtk_2.6.3.bb index 73565f51cc..e535f1b449 100644 --- a/recipes/python/python-pygtk_2.6.3.bb +++ b/recipes/python/python-pygtk_2.6.3.bb @@ -4,7 +4,7 @@ DEPENDS = "gtk+-2.6.10 libglade" RDEPENDS_${PN} = "python-shell" SRCNAME = "pygtk" LICENSE = "LGPL" -PR = "ml1" +PR = "ml2" MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/${MAJ_VER}/${SRCNAME}-${PV}.tar.bz2 \ diff --git a/recipes/python/python-pygtk_2.8.6.bb b/recipes/python/python-pygtk_2.8.6.bb index c595ef448f..86cdd7b592 100644 --- a/recipes/python/python-pygtk_2.8.6.bb +++ b/recipes/python/python-pygtk_2.8.6.bb @@ -6,7 +6,7 @@ DEPENDS = "gtk+-2.8.16 libglade" RDEPENDS_${PN} = "python-shell" SRCNAME = "pygtk" LICENSE = "LGPL" -PR = "r2" +PR = "r3" MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/${MAJ_VER}/${SRCNAME}-${PV}.tar.bz2 \ diff --git a/recipes/python/python-pylint_0.15.2.bb b/recipes/python/python-pylint_0.15.2.bb index 9a8c7367c9..dbcd24b423 100644 --- a/recipes/python/python-pylint_0.15.2.bb +++ b/recipes/python/python-pylint_0.15.2.bb @@ -8,7 +8,7 @@ PRIORITY = "optional" LICENSE = "GPL" RDEPENDS_${PN} = "python-logilab-common" SRCNAME = "pylint" -PR = "ml0" +PR = "ml1" SRC_URI = "ftp://ftp.logilab.org/pub/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/recipes/python/python-pymp3_0.3.4.bb b/recipes/python/python-pymp3_0.3.4.bb index 978e2e28be..0d5940db30 100644 --- a/recipes/python/python-pymp3_0.3.4.bb +++ b/recipes/python/python-pymp3_0.3.4.bb @@ -3,7 +3,7 @@ SECTION = "console/multimedia" PRIORITY = "optional" RDEPENDS_${PN} = "python-core python-curses python-pyid3lib python-mad python-ao" LICENSE = "GPL" -PR = "r3" +PR = "r4" SRC_URI = "http://www.vanille.de/mirror/PyMP3-0.3.4.tar.gz" S = "${WORKDIR}/PyMP3-0.3.4" diff --git a/recipes/python/python-pyopenssl_0.8.bb b/recipes/python/python-pyopenssl_0.8.bb index 3ec4e4d70d..74e2ae9ae8 100644 --- a/recipes/python/python-pyopenssl_0.8.bb +++ b/recipes/python/python-pyopenssl_0.8.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "LGPL" SRCNAME = "pyOpenSSL" DEPENDS = "openssl" -PR = "ml0" +PR = "ml1" SRC_URI = "${SOURCEFORGE_MIRROR}/pyopenssl/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/recipes/python/python-pyqt_4.4.3.bb b/recipes/python/python-pyqt_4.4.3.bb index 7c75dad4ee..24dfc10356 100644 --- a/recipes/python/python-pyqt_4.4.3.bb +++ b/recipes/python/python-pyqt_4.4.3.bb @@ -7,7 +7,7 @@ LICENSE = "GPL" DEPENDS = "sip-native python-sip" RDEPENDS_${PN} = "python-core" SRCNAME = "pyqt" -PR = "ml5" +PR = "ml6" PYQT_OE_VERSION = "Qt_4_4_1" diff --git a/recipes/python/python-pyrad_1.1.bb b/recipes/python/python-pyrad_1.1.bb index 52025ba802..064f4981e2 100644 --- a/recipes/python/python-pyrad_1.1.bb +++ b/recipes/python/python-pyrad_1.1.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "BSD" RDEPENDS_${PN} = "python-crypt" SRCNAME = "pyrad" -PR = "r1" +PR = "r2" SRC_URI = "http://pypi.python.org/packages/source/p/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/recipes/python/python-pyraf_1.7.bb b/recipes/python/python-pyraf_1.7.bb index ce0aa8cc24..ddbe4a135d 100644 --- a/recipes/python/python-pyraf_1.7.bb +++ b/recipes/python/python-pyraf_1.7.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.stsci.edu/resources/software_hardware/pyraf" AUTHOR = "Space Telescope Science Institute" SECTION = "devel/python" LICENSE = "AURA" -PR = "ml0" +PR = "ml1" SRC_URI = "ftp://ra.stsci.edu/pub/pyraf/release/pyraf-${PV}.tar.gz" S = "${WORKDIR}/pyraf-${PV}" diff --git a/recipes/python/python-pyro_3.8.1.bb b/recipes/python/python-pyro_3.8.1.bb index 89d47075a7..809d417600 100644 --- a/recipes/python/python-pyro_3.8.1.bb +++ b/recipes/python/python-pyro_3.8.1.bb @@ -6,7 +6,7 @@ HOMEPAGE = "http://pyro.sourceforge.net" SECTION = "devel/python" PRIORITY = "optional" LICENSE = "MIT" -PR = "ml0" +PR = "ml1" SRC_URI = "\ ${SOURCEFORGE_MIRROR}/pyro/Pyro-${PV}.tar.gz \ diff --git a/recipes/python/python-pyserial_2.4.bb b/recipes/python/python-pyserial_2.4.bb index 1e16a2b5cf..4e1b30f16f 100644 --- a/recipes/python/python-pyserial_2.4.bb +++ b/recipes/python/python-pyserial_2.4.bb @@ -3,7 +3,7 @@ SECTION = "devel/python" PRIORITY = "optional" LICENSE = "PSF" SRCNAME = "pyserial" -PR = "ml1" +PR = "ml2" SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/recipes/python/python-pysqlite2_2.4.0.bb b/recipes/python/python-pysqlite2_2.4.0.bb index 37bb1fbdf1..8e9e94e262 100644 --- a/recipes/python/python-pysqlite2_2.4.0.bb +++ b/recipes/python/python-pysqlite2_2.4.0.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "BSD" DEPENDS = "sqlite3" SRCNAME = "pysqlite" -PR = "ml2" +PR = "ml3" SRC_URI = "http://initd.org/pub/software/pysqlite/releases/2.4/${PV}/${SRCNAME}-${PV}.tar.gz \ file://fix-setup.patch" diff --git a/recipes/python/python-pyxml_0.8.4.bb b/recipes/python/python-pyxml_0.8.4.bb index ba776d35dd..97440f2fec 100644 --- a/recipes/python/python-pyxml_0.8.4.bb +++ b/recipes/python/python-pyxml_0.8.4.bb @@ -3,7 +3,7 @@ SECTION = "devel/python" PRIORITY = "optional" LICENSE = "PSF" SRCNAME = "pyxml" -PR = "ml1" +PR = "ml2" SRC_URI = "${SOURCEFORGE_MIRROR}/pyxml/PyXML-${PV}.tar.gz" S = "${WORKDIR}/PyXML-${PV}" diff --git a/recipes/python/python-scapy_2.0.0.9.bb b/recipes/python/python-scapy_2.0.0.9.bb index 67df8b1f14..12cbf1b252 100644 --- a/recipes/python/python-scapy_2.0.0.9.bb +++ b/recipes/python/python-scapy_2.0.0.9.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://www.secdev.org/projects/scapy/" LICENSE = "GPL" PRIORITY = "optional" SRCNAME = "scapy" -PR = "ml1" +PR = "ml2" SRC_URI = "http://www.secdev.org/projects/scapy/files/scapy-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/recipes/python/python-setuptools_0.6c9.bb b/recipes/python/python-setuptools_0.6c9.bb index 506a9368b9..d2682bbed6 100644 --- a/recipes/python/python-setuptools_0.6c9.bb +++ b/recipes/python/python-setuptools_0.6c9.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" PRIORITY = "optional" LICENSE = "MIT" SRCNAME = "setuptools" -PR = "ml0" +PR = "ml1" SRC_URI = "\ http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz\ diff --git a/recipes/python/python-simplejson_2.0.7.bb b/recipes/python/python-simplejson_2.0.7.bb index f10ed7e95b..d258f6a200 100644 --- a/recipes/python/python-simplejson_2.0.7.bb +++ b/recipes/python/python-simplejson_2.0.7.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" PRIORITY = "optional" LICENSE = "MIT" SRCNAME = "simplejson" -PR = "ml0" +PR = "ml1" SRC_URI = "http://cheeseshop.python.org/packages/source/s/simplejson/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/recipes/python/python-soappy_0.11.6.bb b/recipes/python/python-soappy_0.11.6.bb index 25ef6a7af7..3e48734cc7 100644 --- a/recipes/python/python-soappy_0.11.6.bb +++ b/recipes/python/python-soappy_0.11.6.bb @@ -5,7 +5,7 @@ PRIORITY = "optional" LICENSE = "BSD" RDEPENDS_${PN} = "python-xml python-fpconst" SRCNAME = "SOAPpy" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/pywebsvcs/${SRCNAME}-${PV}.tar.gz \ file://fix-future.patch \ diff --git a/recipes/python/python-sqlobject_0.10.4.bb b/recipes/python/python-sqlobject_0.10.4.bb index 45de2b5370..276c965fc8 100644 --- a/recipes/python/python-sqlobject_0.10.4.bb +++ b/recipes/python/python-sqlobject_0.10.4.bb @@ -6,7 +6,7 @@ HOMEPAGE = "http://www.sqlobject.org/" PRIORITY = "optional" LICENSE = "LGPL" SRCNAME = "SQLObject" -PR = "ml0" +PR = "ml1" SRC_URI = "http://cheeseshop.python.org/packages/source/S/SQLObject/SQLObject-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/recipes/python/python-traits_3.0.3.bb b/recipes/python/python-traits_3.0.3.bb index 187f0da660..5f776a4560 100644 --- a/recipes/python/python-traits_3.0.3.bb +++ b/recipes/python/python-traits_3.0.3.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Explicitly typed attributes for Python" SECTION = "devel/python" PRIORITY = "optional" LICENSE = "BSD" -PR = "ml0" +PR = "ml1" inherit setuptools diff --git a/recipes/python/python-twisted_2.5.0.bb b/recipes/python/python-twisted_2.5.0.bb index 63f0a437e1..11a479020d 100644 --- a/recipes/python/python-twisted_2.5.0.bb +++ b/recipes/python/python-twisted_2.5.0.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.twistedmatrix.com" SECTION = "console/network" PRIORITY = "optional" LICENSE = "LGPL" -PR = "r9" +PR = "r11" SRC_URI = "http://tmrc.mit.edu/mirror/twisted/Twisted/2.5/Twisted-${PV}.tar.bz2 \ file://remove-zope-check.patch" diff --git a/recipes/python/python-twisted_8.2.0.bb b/recipes/python/python-twisted_8.2.0.bb index 0925d1c016..7ecbf6c1a1 100644 --- a/recipes/python/python-twisted_8.2.0.bb +++ b/recipes/python/python-twisted_8.2.0.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.twistedmatrix.com" SECTION = "console/network" PRIORITY = "optional" LICENSE = "LGPL" -PR = "r1" +PR = "r2" SRC_URI = "http://tmrc.mit.edu/mirror/twisted/Twisted/8.2/Twisted-${PV}.tar.bz2 " S = "${WORKDIR}/Twisted-${PV}" diff --git a/recipes/python/python-urlgrabber-native_3.1.0.bb b/recipes/python/python-urlgrabber-native_3.1.0.bb index d7468df113..41ba9885d6 100644 --- a/recipes/python/python-urlgrabber-native_3.1.0.bb +++ b/recipes/python/python-urlgrabber-native_3.1.0.bb @@ -2,7 +2,7 @@ require python-urlgrabber_${PV}.bb inherit native DEPENDS = "python-native" RDEPENDS_${PN} = "" -PR = "r1" +PR = "r2" do_stage() { distutils_stage_all diff --git a/recipes/python/python-vobject_0.8.1c.bb b/recipes/python/python-vobject_0.8.1c.bb index afb41caf81..a8426ececf 100644 --- a/recipes/python/python-vobject_0.8.1c.bb +++ b/recipes/python/python-vobject_0.8.1c.bb @@ -5,7 +5,7 @@ LICENSE = "Apache License V2.0" HOMEPAGE = "http://vobject.skyhouseconsulting.com/" SRCNAME = "vobject" RDEPENDS_${PN} = "python python-dateutil" -PR = "r1" +PR = "r2" SRC_URI = "http://vobject.skyhouseconsulting.com/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/recipes/python/python-webpy_0.31.bb b/recipes/python/python-webpy_0.31.bb index ce87b0d9ff..75cfc5e002 100644 --- a/recipes/python/python-webpy_0.31.bb +++ b/recipes/python/python-webpy_0.31.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A Lightweight Web Application Framework" SECTION = "devel/python" PRIORITY = "optional" LICENSE = "PSF" -PR = "ml0" +PR = "ml1" SRC_URI = "http://webpy.org/static/web.py-${PV}.tar.gz" S = "${WORKDIR}/webpy" diff --git a/recipes/python/yum-metadata-parser-native_1.1.2.bb b/recipes/python/yum-metadata-parser-native_1.1.2.bb index 5d913450d3..ab4e577483 100644 --- a/recipes/python/yum-metadata-parser-native_1.1.2.bb +++ b/recipes/python/yum-metadata-parser-native_1.1.2.bb @@ -2,7 +2,7 @@ require yum-metadata-parser_${PV}.bb inherit native DEPENDS = "python-native sqlite3-native glib-2.0-native libxml2-native" RDEPENDS_${PN} = "" -PR = "r1" +PR = "r2" do_stage() { distutils_stage_all diff --git a/recipes/qpe-gaim/qpe-gaim_20041030.bb b/recipes/qpe-gaim/qpe-gaim_20041030.bb index 3a6f5fe6ea..e856b37f9e 100644 --- a/recipes/qpe-gaim/qpe-gaim_20041030.bb +++ b/recipes/qpe-gaim/qpe-gaim_20041030.bb @@ -8,7 +8,7 @@ APPNAME = "gaim" APPTYPE = "binary" LICENSE = "GPL" APPDESKTOP = "${S}" -PR = "r2" +PR = "r3" SRC_URI = "http://www.vanille.de/mirror/qpe-gaim_20041030.tar.bz2 \ file://qpe-gaim.patch \ diff --git a/recipes/qpe-gaim/qpe-libgaim_1.5.0.bb b/recipes/qpe-gaim/qpe-libgaim_1.5.0.bb index 6556c86c25..d005371d8b 100644 --- a/recipes/qpe-gaim/qpe-libgaim_1.5.0.bb +++ b/recipes/qpe-gaim/qpe-libgaim_1.5.0.bb @@ -4,7 +4,7 @@ DEPENDS = "glib-2.0 gnutls" RDEPENDS_${PN} = "libgaim-plugins" LICENSE = "GPL" HOMEPAGE = "http://gaim.sourceforge.net/" -PR = "r3" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/gaim/gaim-${PV}.tar.bz2 \ file://dont-look-for-gtk.patch \ diff --git a/recipes/qpe-nmap/qpe-nmap_0.02.bb b/recipes/qpe-nmap/qpe-nmap_0.02.bb index 9afb4789f3..6f51f15fbd 100644 --- a/recipes/qpe-nmap/qpe-nmap_0.02.bb +++ b/recipes/qpe-nmap/qpe-nmap_0.02.bb @@ -3,7 +3,7 @@ SECTION = "opie/applications" PRIORITY = "optional" LICENSE = "GPL" RDEPENDS_${PN} = "nmap" -PR = "r0" +PR = "r1" SRC_URI = "http://www.bluelightning.org/qpe-nmap/files/qpe-nmap-${PV}.tar.bz2" diff --git a/recipes/qpealarmclock/qpealarmclockapplet_1.0.9.bb b/recipes/qpealarmclock/qpealarmclockapplet_1.0.9.bb index fd8b456719..c553e85406 100644 --- a/recipes/qpealarmclock/qpealarmclockapplet_1.0.9.bb +++ b/recipes/qpealarmclock/qpealarmclockapplet_1.0.9.bb @@ -5,10 +5,10 @@ LICENSE = "GPL" AUTHOR = "Anton Maslovsky" HOMEPAGE = "http://my-zaurus.narod.ru/" RDEPENDS_${PN} = "qpealarmclock" -RCONFLICTS = "opie-clockapplet" -RREPLACES = "opie-clockapplet" +RCONFLICTS_${PN} = "opie-clockapplet" +RREPLACES_${PN} = "opie-clockapplet" -PR = "r1" +PR = "r2" APPNAME = "qpealarmclockapplet" APPTYPE = "binary" diff --git a/recipes/qpf-fonts/qpf-unifont_1.0.bb b/recipes/qpf-fonts/qpf-unifont_1.0.bb index 16710e4547..2635e1723f 100644 --- a/recipes/qpf-fonts/qpf-unifont_1.0.bb +++ b/recipes/qpf-fonts/qpf-unifont_1.0.bb @@ -2,8 +2,8 @@ require qpf.inc DESCRIPTION = "Unicode fonts - QPF Edition" LICENSE = "GPL QPL" -RPROVIDES = "virtual-japanese-font" -PR = "r2" +RPROVIDES_${PN} = "virtual-japanese-font" +PR = "r3" SRC_URI = "http://www.openzaurus.org/mirror/qpf-unifont.tar.bz2" S = "${WORKDIR}" diff --git a/recipes/qpf-fonts/qpf-unismall_1.0.0.bb b/recipes/qpf-fonts/qpf-unismall_1.0.0.bb index ce03c03d83..0a65c12ae4 100644 --- a/recipes/qpf-fonts/qpf-unismall_1.0.0.bb +++ b/recipes/qpf-fonts/qpf-unismall_1.0.0.bb @@ -3,8 +3,8 @@ require qpf.inc DESCRIPTION = "Lightweight Japanese font in 10 point suitable for 320x240 display" HOMEPAGE = "http://sourceforge.jp/projects/zaurus-ja/" LICENSE = "GPL" -RPROVIDES = "virtual-japanese-font" -PR = "r4" +RPROVIDES_${PN} = "virtual-japanese-font" +PR = "r5" SRC_URI = "http://osdn.dl.sourceforge.jp/zaurus-ja/773/unismall-${PV}.tar.gz" diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1.inc b/recipes/qt4/qt-4.6.2+4.7.0-beta1.inc index 9de3a5dbc1..35eb4b330a 100644 --- a/recipes/qt4/qt-4.6.2+4.7.0-beta1.inc +++ b/recipes/qt4/qt-4.6.2+4.7.0-beta1.inc @@ -15,6 +15,7 @@ SRC_URI = "\ file://0005-Disable-examples-help.patch \ file://0007-Disable-demos-qtdemos.patch \ file://0008-Disable-examples-declarative.patch \ + file://demos.browser.add.mediaservices.lib.patch \ file://g++.conf \ file://linux.conf \ " diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/demos.browser.add.mediaservices.lib.patch b/recipes/qt4/qt-4.6.2+4.7.0-beta1/demos.browser.add.mediaservices.lib.patch new file mode 100644 index 0000000000..27c42dfcec --- /dev/null +++ b/recipes/qt4/qt-4.6.2+4.7.0-beta1/demos.browser.add.mediaservices.lib.patch @@ -0,0 +1,12 @@ +Index: qt-everywhere-opensource-src-4.7.0-beta1/demos/browser/browser.pro +=================================================================== +--- qt-everywhere-opensource-src-4.7.0-beta1.orig/demos/browser/browser.pro ++++ qt-everywhere-opensource-src-4.7.0-beta1/demos/browser/browser.pro +@@ -1,6 +1,6 @@ + TEMPLATE = app + TARGET = browser +-QT += webkit network ++QT += webkit network mediaservices + + CONFIG += qt warn_on + contains(QT_BUILD_PARTS, tools):!embedded: CONFIG += uitools diff --git a/recipes/qt4/qt-4.6.2.inc b/recipes/qt4/qt-4.6.2.inc index 4a9f077aea..c4c86d23ac 100644 --- a/recipes/qt4/qt-4.6.2.inc +++ b/recipes/qt4/qt-4.6.2.inc @@ -59,7 +59,9 @@ do_install_append() { done #Append an E to the qtdemo file - mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX} + if [ -n "${QT_LIBINFIX}" ] ; then + mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX} + fi } LICENSE = "LGPLv2.1 GPLv3" diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc index 4266c2fca4..10090144a8 100644 --- a/recipes/qt4/qt4.inc +++ b/recipes/qt4/qt4.inc @@ -23,7 +23,7 @@ EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake2 -after \ export QT_CONF_PATH="${WORKDIR}/qt.conf" # Library packages -QT_LIB_NAMES = "Qt3Support QtAssistantClient QtCLucene QtCore QtDBus QtDesigner QtDesignerComponents QtGui QtHelp QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg QtTest QtUiTools QtWebKit QtXml phonon QtMultimedia QtOpenVG" +QT_LIB_NAMES = "Qt3Support QtAssistantClient QtCLucene QtCore QtDBus QtDesigner QtDesignerComponents QtGui QtHelp QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg QtTest QtUiTools QtWebKit QtXml phonon QtMultimedia QtOpenVG QtMediaServices" QT_EXTRA_LIBS = "pvrQWSWSEGL" diff --git a/recipes/qwo/qwo_0.4.bb b/recipes/qwo/qwo_0.4.bb index 7059d67f41..a3199ccbea 100644 --- a/recipes/qwo/qwo_0.4.bb +++ b/recipes/qwo/qwo_0.4.bb @@ -7,7 +7,7 @@ LICENSE = "GPLv2" DEPENDS = "libxtst libxext virtual/imlib2 libconfig" RDEPENDS_${PN} += "imlib2-loaders" PV = "0.4" -PR = "r0" +PR = "r1" SRC_URI = "http://download.savannah.nongnu.org/releases/qwo/qwo-${PV}.tar.gz \ file://check_lib.patch \ diff --git a/recipes/qwo/qwo_0.5.bb b/recipes/qwo/qwo_0.5.bb index fd73848601..ca946055de 100644 --- a/recipes/qwo/qwo_0.5.bb +++ b/recipes/qwo/qwo_0.5.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" LICENSE = "GPLv2" DEPENDS = "libxtst libxext virtual/imlib2 libconfig" RDEPENDS_${PN} += "imlib2-loaders" -PR = "r1" +PR = "r2" SRC_URI = "http://download.savannah.nongnu.org/releases/qwo/qwo-${PV}.tar.gz \ file://qwo.automake-1.11.patch" diff --git a/recipes/rcs/rcs_5.7.bb b/recipes/rcs/rcs_5.7.bb index 631a2a620e..4a4478c88f 100644 --- a/recipes/rcs/rcs_5.7.bb +++ b/recipes/rcs/rcs_5.7.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The Revision Control System (RCS) manages multiple revisions of f HOMEPAGE = "http://www.cs.purdue.edu/homes/trinkle/RCS/" SECTION = "console/network" LICENSE = "RCS" -PR = "r0" +PR = "r1" SRC_URI = "\ http://www.cs.purdue.edu/homes/trinkle/RCS/rcs-${PV}.tar.Z \ diff --git a/recipes/roadster/roadster_cvs.bb b/recipes/roadster/roadster_cvs.bb index 0e1173a03a..17f0fe3458 100644 --- a/recipes/roadster/roadster_cvs.bb +++ b/recipes/roadster/roadster_cvs.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://linuxadvocate.org/projects/roadster/" SECTION = "x11/navigation" SRCDATE = "20060814" PV = "0.0+cvs${SRCDATE}" -PR = "r1" +PR = "r2" DEPENDS = "tcp-wrappers mysql gpsd gtk+ cairo libxml2 libgnomeui libglade" RDEPENDS_${PN} = "gpsd gtk+ cairo libxml2" diff --git a/recipes/robostix-module/robostix-module.bb b/recipes/robostix-module/robostix-module.bb index 7f13ed1826..da044c3430 100644 --- a/recipes/robostix-module/robostix-module.bb +++ b/recipes/robostix-module/robostix-module.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" RDEPENDS_${PN} = "kernel (${KERNEL_VERSION})" DEPENDS = "virtual/kernel" -PR = "r1" +PR = "r2" INITSCRIPT_NAME = "robostix" INITSCRIPT_PARAMS = "defaults 10" diff --git a/recipes/robostix/robostix.bb b/recipes/robostix/robostix.bb index 403324f417..1fcc3b6cd8 100644 --- a/recipes/robostix/robostix.bb +++ b/recipes/robostix/robostix.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" RDEPENDS_${PN} = "kernel (${KERNEL_VERSION})" DEPENDS = "virtual/kernel" -PR = "r0" +PR = "r1" SRC_URI = "svn://svn.gumstix.com/gumstix-buildroot/branches/projects;module=robostix;rev=1588;proto=http \ file://makefile-rules.patch \ diff --git a/recipes/rox/rox-filer_2.5.bb b/recipes/rox/rox-filer_2.5.bb index 196eb4f624..644365af56 100644 --- a/recipes/rox/rox-filer_2.5.bb +++ b/recipes/rox/rox-filer_2.5.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" SECTION = "x11/applications" DEPENDS = "gtk+ shared-mime-info" RDEPENDS_${PN} = "shared-mime-info" -PR = "r3" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/rox/${P}.tar.bz2 \ file://no-strip-objcopy.patch;striplevel=3" diff --git a/recipes/rp-pppoe/rp-pppoe-3.8/use-ldflags.patch b/recipes/rp-pppoe/rp-pppoe-3.8/use-ldflags.patch new file mode 100644 index 0000000000..120963133c --- /dev/null +++ b/recipes/rp-pppoe/rp-pppoe-3.8/use-ldflags.patch @@ -0,0 +1,23 @@ +--- a/src/Makefile.in 2006-04-02 18:29:42.000000000 +0400 ++++ b/src/Makefile.in 2010-04-16 17:51:31.000000000 +0400 +@@ -67,16 +67,16 @@ all: $(TARGETS) + @echo "Type 'make install' as root to install the software." + + pppoe-sniff: pppoe-sniff.o if.o common.o debug.o +- @CC@ -o pppoe-sniff pppoe-sniff.o if.o common.o debug.o ++ @CC@ -o pppoe-sniff pppoe-sniff.o if.o common.o debug.o $(LDFLAGS) + + pppoe-server: pppoe-server.o if.o debug.o common.o md5.o libevent/libevent.a @PPPOE_SERVER_DEPS@ +- @CC@ -o pppoe-server @RDYNAMIC@ pppoe-server.o if.o debug.o common.o md5.o $(PPPOE_SERVER_LIBS) -Llibevent -levent ++ @CC@ -o pppoe-server @RDYNAMIC@ pppoe-server.o if.o debug.o common.o md5.o $(PPPOE_SERVER_LIBS) -Llibevent -levent $(LDFLAGS) + + pppoe: pppoe.o if.o debug.o common.o ppp.o discovery.o +- @CC@ -o pppoe pppoe.o if.o debug.o common.o ppp.o discovery.o ++ @CC@ -o pppoe pppoe.o if.o debug.o common.o ppp.o discovery.o $(LDFLAGS) + + pppoe-relay: relay.o if.o debug.o common.o +- @CC@ -o pppoe-relay relay.o if.o debug.o common.o ++ @CC@ -o pppoe-relay relay.o if.o debug.o common.o $(LDFLAGS) + + pppoe.o: pppoe.c pppoe.h + @CC@ $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o pppoe.o pppoe.c diff --git a/recipes/rp-pppoe/rp-pppoe_3.8.bb b/recipes/rp-pppoe/rp-pppoe_3.8.bb index 9a41236211..aef080b90f 100644 --- a/recipes/rp-pppoe/rp-pppoe_3.8.bb +++ b/recipes/rp-pppoe/rp-pppoe_3.8.bb @@ -5,7 +5,7 @@ LICENSE = "GPLv2" RDEPENDS_${PN} = "ppp" RDEPENDS_${PN}-server = "${PN}" RRECOMMENDS_${PN} = "ppp-oe" -PR = "r6" +PR = "r7" SRC_URI = "http://www.roaringpenguin.com/files/download/${P}.tar.gz \ file://top-autoconf.patch \ @@ -13,6 +13,7 @@ SRC_URI = "http://www.roaringpenguin.com/files/download/${P}.tar.gz \ file://pppoe-src-restrictions.patch \ file://update-config.patch \ file://dont-swallow-errors.patch \ + file://use-ldflags.patch \ file://pppoe-server.default \ file://pppoe-server.init" diff --git a/recipes/sablevm/sablevm_1.1.9.bb b/recipes/sablevm/sablevm_1.1.9.bb index 54114819fe..246000093a 100644 --- a/recipes/sablevm/sablevm_1.1.9.bb +++ b/recipes/sablevm/sablevm_1.1.9.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://sablevm.org" LICENSE = "LGPL" PRIORITY = "optional" SECTION = "interpreters" -PR = "r1" +PR = "r2" DEPENDS = "libffi libtool popt \ sablevm-classpath" diff --git a/recipes/samba/samba-essential_3.0.20.bb b/recipes/samba/samba-essential_3.0.20.bb index f3c2584d63..b7750804f7 100644 --- a/recipes/samba/samba-essential_3.0.20.bb +++ b/recipes/samba/samba-essential_3.0.20.bb @@ -1,7 +1,7 @@ require samba-essential.inc inherit update-rc.d -PR = "r7" +PR = "r8" SRC_URI = "file://config-lfs.patch \ file://init-essential \ @@ -10,7 +10,7 @@ SRC_URI = "file://config-lfs.patch \ file://smb-essential-inactive.conf \ file://Managing-Samba.txt" -RCONFLICTS = "samba" +RCONFLICTS_${PN} = "samba" INITSCRIPT_NAME = "samba" # No dependencies, goes in at level 20 (NOTE: take care with the diff --git a/recipes/sarg/sarg_2.2.7.1.bb b/recipes/sarg/sarg_2.2.7.1.bb index 38283d87f9..8180c312dc 100644 --- a/recipes/sarg/sarg_2.2.7.1.bb +++ b/recipes/sarg/sarg_2.2.7.1.bb @@ -1,10 +1,10 @@ DESCRIPTION = "Squid Analysis Report Generator" SECTION = "utils" DEPENDS = "gd" -RSUGGESTS = "squid" +RSUGGESTS_${PN} = "squid" LICENSE = "GPL" HOMEPAGE = "http://sarg.sourceforge.net/sarg.php" -PR = "r0" +PR = "r1" SRC_URI = " \ ${SOURCEFORGE_MIRROR}/sarg/sarg-${PV}.tar.gz;name=tar \ diff --git a/recipes/scratchbox/sbrsh_7.1.bb b/recipes/scratchbox/sbrsh_7.1.bb index eee3237524..5a11ca86e9 100644 --- a/recipes/scratchbox/sbrsh_7.1.bb +++ b/recipes/scratchbox/sbrsh_7.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Daemon to allow scratchbox to use your device as a CPU tranparenc HOMEPAGE = "http://scratchbox.org" LICENSE = "GPLv2" DEPENDS = "fakeroot" -PR = "r1" +PR = "r2" RRECOMMENDS_${PN} = "kernel-module-nfs" SRC_URI = "http://scratchbox.org/download/files/sbox-releases/1.0/src/${P}.tar.gz" diff --git a/recipes/scummvm/scummvm-1.1.1/no-strip.patch b/recipes/scummvm/scummvm-1.1.1/no-strip.patch new file mode 100644 index 0000000000..02bc71ec51 --- /dev/null +++ b/recipes/scummvm/scummvm-1.1.1/no-strip.patch @@ -0,0 +1,22 @@ +Index: scummvm-1.1.1/ports.mk +=================================================================== +--- scummvm-1.1.1.orig/ports.mk ++++ scummvm-1.1.1/ports.mk +@@ -10,7 +10,7 @@ + # + install: all + $(INSTALL) -d "$(DESTDIR)$(BINDIR)" +- $(INSTALL) -c -s -m 755 "./$(EXECUTABLE)" "$(DESTDIR)$(BINDIR)/$(EXECUTABLE)" ++ $(INSTALL) -c -m 755 "./$(EXECUTABLE)" "$(DESTDIR)$(BINDIR)/$(EXECUTABLE)" + $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man6/" + $(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.6" "$(DESTDIR)$(MANDIR)/man6/scummvm.6" + $(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/pixmaps/" +@@ -21,7 +21,7 @@ install: all + $(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) "$(DESTDIR)$(DATADIR)/scummvm/" + ifdef DYNAMIC_MODULES + $(INSTALL) -d "$(DESTDIR)$(LIBDIR)/scummvm/" +- $(INSTALL) -c -s -m 644 $(PLUGINS) "$(DESTDIR)$(LIBDIR)/scummvm/" ++ $(INSTALL) -c -m 644 $(PLUGINS) "$(DESTDIR)$(LIBDIR)/scummvm/" + endif + + uninstall: diff --git a/recipes/scummvm/scummvm-qpe_0.6.1b.bb b/recipes/scummvm/scummvm-qpe_0.6.1b.bb index 2c90efe1d5..1ff2b0b7e3 100644 --- a/recipes/scummvm/scummvm-qpe_0.6.1b.bb +++ b/recipes/scummvm/scummvm-qpe_0.6.1b.bb @@ -4,5 +4,7 @@ DEPENDS = "libsdl-qpe tremor libogg zlib ${@base_conditional('ENTERPRISE_DISTRO' S = "${WORKDIR}/scummvm-${PV}/" +PR = "${INC_PR}.0" + SRC_URI[md5sum] = "143dd7cfe0995922c49e1f8a6cdf2055" SRC_URI[sha256sum] = "29007f54d9e5a37a3da9f51670de7828dde9a3559beddbdd5c2f59796fb220f6" diff --git a/recipes/scummvm/scummvm.inc b/recipes/scummvm/scummvm.inc index 6be99ca26e..9f7a4f2d21 100644 --- a/recipes/scummvm/scummvm.inc +++ b/recipes/scummvm/scummvm.inc @@ -3,7 +3,8 @@ HOMEPAGE = "http://www.scummvm.org" SECTION = "games" PRIORITY = "optional" LICENSE = "GPL" -PR = "r6" + +INC_PR = "r7" SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2" diff --git a/recipes/scummvm/scummvm_0.12.0.bb b/recipes/scummvm/scummvm_0.12.0.bb index 38944b2b3d..cc94a5d0ca 100644 --- a/recipes/scummvm/scummvm_0.12.0.bb +++ b/recipes/scummvm/scummvm_0.12.0.bb @@ -11,6 +11,7 @@ SRC_URI += " file://scummvm.desktop \ SRC_URI_append_openmoko = " file://openmoko-scummvm " SRC_URI_append_shr = " file://openmoko-scummvm " +PR = "${INC_PR}.0" SRC_URI_OVERRIDES_PACKAGE_ARCH = "1" diff --git a/recipes/scummvm/scummvm_0.6.1b.bb b/recipes/scummvm/scummvm_0.6.1b.bb index 3c76fea7c4..adc6b20855 100644 --- a/recipes/scummvm/scummvm_0.6.1b.bb +++ b/recipes/scummvm/scummvm_0.6.1b.bb @@ -7,6 +7,7 @@ SRC_URI += " file://mouse.patch \ file://tail-obselete-fix.patch \ file://tremor.patch" +PR = "${INC_PR}.0" SRC_URI[md5sum] = "143dd7cfe0995922c49e1f8a6cdf2055" SRC_URI[sha256sum] = "29007f54d9e5a37a3da9f51670de7828dde9a3559beddbdd5c2f59796fb220f6" diff --git a/recipes/scummvm/scummvm_0.9.0.bb b/recipes/scummvm/scummvm_0.9.0.bb index 600e723908..474bc5e236 100644 --- a/recipes/scummvm/scummvm_0.9.0.bb +++ b/recipes/scummvm/scummvm_0.9.0.bb @@ -7,6 +7,7 @@ EXTRA_OECONF += "--enable-lure \ --enable-agi \ --enable-cine \ " +PR = "${INC_PR}.0" SRC_URI[md5sum] = "5eede9c97d1883f80770a3e211419783" SRC_URI[sha256sum] = "5824f67aa37b00fc8b92ac4fcc413a9a7d868174dcd6df580c4d706807e4545e" diff --git a/recipes/scummvm/scummvm_0.9.1.bb b/recipes/scummvm/scummvm_0.9.1.bb index 4901de234b..7865220758 100644 --- a/recipes/scummvm/scummvm_0.9.1.bb +++ b/recipes/scummvm/scummvm_0.9.1.bb @@ -8,6 +8,8 @@ SRC_URI += "file://makefile-nostrip.patch \ SRC_URI_append_openmoko = " file://openmoko-scummvm \ file://scummvm.desktop" +PR = "${INC_PR}.0" + SRC_URI_OVERRIDES_PACKAGE_ARCH = "1" EXTRA_OECONF += "--enable-lure \ diff --git a/recipes/scummvm/scummvm_1.0.0.bb b/recipes/scummvm/scummvm_1.0.0.bb index 1c4a251678..6ab59be008 100644 --- a/recipes/scummvm/scummvm_1.0.0.bb +++ b/recipes/scummvm/scummvm_1.0.0.bb @@ -8,6 +8,7 @@ DEPENDS = "virtual/libsdl libvorbis libogg zlib \ SRC_URI += " file://scummvm.desktop \ file://no-strip.patch \ " +PR = "${INC_PR}.0" SRC_URI_append_openmoko = " file://openmoko-scummvm " SRC_URI_append_shr = " file://openmoko-scummvm " diff --git a/recipes/scummvm/scummvm_1.1.1.bb b/recipes/scummvm/scummvm_1.1.1.bb new file mode 100644 index 0000000000..4ee3031e68 --- /dev/null +++ b/recipes/scummvm/scummvm_1.1.1.bb @@ -0,0 +1,41 @@ +require scummvm.inc + +DEPENDS = "virtual/libsdl libvorbis libogg zlib \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad mpeg2dec', d)}" + +SRC_URI += " file://scummvm.desktop \ + file://no-strip.patch;patch=1 \ + " +PR = "${INC_PR}.0" + +SRC_URI_append_openmoko = " file://openmoko-scummvm " +SRC_URI_append_shr = " file://openmoko-scummvm " + +SRC_URI_OVERRIDES_PACKAGE_ARCH = "1" + +# Make this a plugin enabled build. Bigger binary, less memory usage. Makes more games run on lower end platforms. +# These plugins are not normal Linux shared libs so will fall foul of the sanity checker. +INSANE_SKIP_${PN} = True +EXTRA_OECONF += " --enable-plugins --default-dynamic " + +# Workaround, because some env variables aren't recognised correctly +do_configure_append() { + sed -i "s/AS := as/AS := ${AS}/" ${S}/config.mk + sed -i "s/AR := ar cru/AR := ${AR} cru/" ${S}/config.mk + sed -i "s/STRIP := strip/STRIP := ${STRIP}/" ${S}/config.mk + sed -i "s/RANLIB := ranlib/RANLIB := ${RANLIB}/" ${S}/config.mk +} + +do_install_append() { + if [ -f ${WORKDIR}/openmoko-scummvm ]; then + install -d ${D}${bindir} + install -m 0755 ${WORKDIR}/openmoko-scummvm ${D}${bindir}/openmoko-scummvm + fi + if [ -f ${WORKDIR}/scummvm.desktop ]; then + install -d ${D}${datadir}/applications + install -m 0644 ${WORKDIR}/scummvm.desktop ${D}${datadir}/applications + fi +} + +SRC_URI[md5sum] = "ed9098a78022d07fa1482f14325e3ab8" +SRC_URI[sha256sum] = "9cc865c5690bfc1df4970d35984455031467381180a71d84b08dcc9f51e39d4a" diff --git a/recipes/settings-daemon/settings-daemon_svn.bb b/recipes/settings-daemon/settings-daemon_svn.bb index aa244d0f2e..9447d130c4 100644 --- a/recipes/settings-daemon/settings-daemon_svn.bb +++ b/recipes/settings-daemon/settings-daemon_svn.bb @@ -6,7 +6,7 @@ SECTION = "x11" SRCREV = "2006" PV = "0.0+svnr${SRCPV}" -PR = "r2" +PR = "r3" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ file://70settings-daemon" diff --git a/recipes/shadow/files/shadow-4.1.3-dots-in-usernames.patch b/recipes/shadow/files/shadow-4.1.3-dots-in-usernames.patch new file mode 100644 index 0000000000..0e70611d30 --- /dev/null +++ b/recipes/shadow/files/shadow-4.1.3-dots-in-usernames.patch @@ -0,0 +1,12 @@ +Index: shadow-4.1.4.2/libmisc/chkname.c +=================================================================== +--- shadow-4.1.4.2.orig/libmisc/chkname.c 2009-04-28 12:14:04.000000000 -0700 ++++ shadow-4.1.4.2/libmisc/chkname.c 2010-06-03 17:43:20.638973857 -0700 +@@ -61,6 +61,7 @@ static bool is_valid_name (const char *n + ( ('0' <= *name) && ('9' >= *name) ) || + ('_' == *name) || + ('-' == *name) || ++ ('.' == *name) || + ( ('$' == *name) && ('\0' == *(name + 1)) ) + )) { + return false; diff --git a/recipes/shadow/files/shadow-4.1.4.2-env-reset-keep-locale.patch b/recipes/shadow/files/shadow-4.1.4.2-env-reset-keep-locale.patch new file mode 100644 index 0000000000..0ce89bf7fc --- /dev/null +++ b/recipes/shadow/files/shadow-4.1.4.2-env-reset-keep-locale.patch @@ -0,0 +1,16 @@ +http://bugs.gentoo.org/283725 +https://alioth.debian.org/tracker/index.php?func=detail&aid=311740&group_id=30580&atid=411480 + +Index: shadow-4.1.4.2/libmisc/env.c +=================================================================== +--- shadow-4.1.4.2.orig/libmisc/env.c 2009-04-27 13:07:56.000000000 -0700 ++++ shadow-4.1.4.2/libmisc/env.c 2010-06-03 17:44:51.456408474 -0700 +@@ -251,7 +251,7 @@ void sanitize_env (void) + if (strncmp (*cur, *bad, strlen (*bad)) != 0) { + continue; + } +- if (strchr (*cur, '/') != NULL) { ++ if (strchr (*cur, '/') == NULL) { + continue; /* OK */ + } + for (move = cur; NULL != *move; move++) { diff --git a/recipes/shadow/files/shadow-4.1.4.2-groupmod-pam-check.patch b/recipes/shadow/files/shadow-4.1.4.2-groupmod-pam-check.patch new file mode 100644 index 0000000000..39d3f029f1 --- /dev/null +++ b/recipes/shadow/files/shadow-4.1.4.2-groupmod-pam-check.patch @@ -0,0 +1,21 @@ +http://bugs.gentoo.org/300790 +http://lists.alioth.debian.org/pipermail/pkg-shadow-devel/2009-November/007850.html + +2009-11-05 Nicolas François <nicolas.francois@centraliens.net> + + * NEWS, src/groupmod.c: Fixed groupmod when configured with + --enable-account-tools-setuid. + +Index: shadow-4.1.4.2/src/groupmod.c +=================================================================== +--- shadow-4.1.4.2.orig/src/groupmod.c 2009-06-05 15:16:58.000000000 -0700 ++++ shadow-4.1.4.2/src/groupmod.c 2010-06-03 17:45:43.828952613 -0700 +@@ -720,7 +720,7 @@ int main (int argc, char **argv) + { + struct passwd *pampw; + pampw = getpwuid (getuid ()); /* local, no need for xgetpwuid */ +- if (NULL == pamh) { ++ if (NULL == pampw) { + fprintf (stderr, + _("%s: Cannot determine your user name.\n"), + Prog); diff --git a/recipes/shadow/files/shadow-4.1.4.2-su_no_sanitize_env.patch b/recipes/shadow/files/shadow-4.1.4.2-su_no_sanitize_env.patch new file mode 100644 index 0000000000..eaf5aab4a7 --- /dev/null +++ b/recipes/shadow/files/shadow-4.1.4.2-su_no_sanitize_env.patch @@ -0,0 +1,16 @@ +http://bugs.gentoo.org/show_bug.cgi?id=301957 +https://alioth.debian.org/scm/browser.php?group_id=30580 + +Index: shadow-4.1.4.2/src/su.c +=================================================================== +--- shadow-4.1.4.2.orig/src/su.c 2009-07-23 13:38:56.000000000 -0700 ++++ shadow-4.1.4.2/src/su.c 2010-06-03 17:46:47.718944010 -0700 +@@ -378,7 +378,7 @@ int main (int argc, char **argv) + #endif + #endif /* !USE_PAM */ + +- sanitize_env (); ++ /* sanitize_env (); */ + + (void) setlocale (LC_ALL, ""); + (void) bindtextdomain (PACKAGE, LOCALEDIR); diff --git a/recipes/shadow/shadow_4.1.4.2.bb b/recipes/shadow/shadow_4.1.4.2.bb index ebf54a7b3c..ff089520ba 100644 --- a/recipes/shadow/shadow_4.1.4.2.bb +++ b/recipes/shadow/shadow_4.1.4.2.bb @@ -1,9 +1,13 @@ require shadow.inc SRC_URI += "file://shadow.automake-1.11.patch \ + file://shadow-4.1.3-dots-in-usernames.patch \ + file://shadow-4.1.4.2-env-reset-keep-locale.patch \ + file://shadow-4.1.4.2-groupmod-pam-check.patch \ + file://shadow-4.1.4.2-su_no_sanitize_env.patch \ " -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" EXTRA_OECONF_libc-uclibc += " --with-nscd=no " diff --git a/recipes/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb b/recipes/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb index d63b515fb1..e0848c68d9 100644 --- a/recipes/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb +++ b/recipes/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb @@ -3,7 +3,7 @@ SECTION = "kernel/modules" PRIORITY = "optional" LICENSE = "CLOSED" RDEPENDS_${PN} = "kernel (${KERNEL_VERSION})" -PR = "r4" +PR = "r5" SRC_URI = "http://openzaurus.sf.net/mirror/camera-modules-2.4.18-rmk7-pxa3-embedix.tar.bz2 \ file://CE-AG06.dat \ diff --git a/recipes/sharp-binary-only/sharp-compat-libs_0.5.bb b/recipes/sharp-binary-only/sharp-compat-libs_0.5.bb index d0541369b0..21234e6467 100644 --- a/recipes/sharp-binary-only/sharp-compat-libs_0.5.bb +++ b/recipes/sharp-binary-only/sharp-compat-libs_0.5.bb @@ -5,10 +5,10 @@ SECTION = "opie/settings" PRIORITY = "optional" DEPENDS = "opie-sh" RDEPENDS_${PN} = "opie-sh" -RPROVIDES = "oz-compat" -RCONFLICTS = "oz-compat" +RPROVIDES_${PN} = "oz-compat" +RCONFLICTS_${PN} = "oz-compat" LICENSE = "GPL" -PR = "r2" +PR = "r3" EXCLUDE_FROM_SHLIBS = "1" COMPATIBLE_HOST = "arm.*-linux" diff --git a/recipes/sharp-binary-only/sharp-sdmmc-support.bb b/recipes/sharp-binary-only/sharp-sdmmc-support.bb index 7cbfc9d11b..57bc4f6916 100644 --- a/recipes/sharp-binary-only/sharp-sdmmc-support.bb +++ b/recipes/sharp-binary-only/sharp-sdmmc-support.bb @@ -3,7 +3,7 @@ SECTION = "kernel/modules" PRIORITY = "optional" LICENSE = "CLOSED" RDEPENDS_${PN} = "kernel (${PV})" -PR = "r23" +PR = "r24" PACKAGE_ARCH = "${MACHINE}" COMPATIBLE_MACHINE = '(collie|poodle|tosa)' diff --git a/recipes/sharprom-toolchain/sharprom-toolchain-native_1.0.bb b/recipes/sharprom-toolchain/sharprom-toolchain-native_1.0.bb index c391c36791..02d0dc9c35 100644 --- a/recipes/sharprom-toolchain/sharprom-toolchain-native_1.0.bb +++ b/recipes/sharprom-toolchain/sharprom-toolchain-native_1.0.bb @@ -15,9 +15,9 @@ PROVIDES_sharprom-compatible = "\ virtual/arm-linux-libc-for-gcc \ virtual/arm-linux-gcc-intermediate \ virtual/arm-linux-gcc-initial " -PR = "r3" +PR = "r4" -RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++" +RPROVIDES_${PN} = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++" PACKAGES_DYNAMIC = "glibc-gconv-*" # This needs to be extracted to /usr/local/arm : diff --git a/recipes/shorewall/shorewall_2.0.9.bb b/recipes/shorewall/shorewall_2.0.9.bb index 5af69fcb09..75ad46e6ff 100644 --- a/recipes/shorewall/shorewall_2.0.9.bb +++ b/recipes/shorewall/shorewall_2.0.9.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.shorewall.net/" LICENSE = "GPL" SECTION = "network" PRIORITY = "optional" -PR = "r3" +PR = "r4" RDEPENDS_${PN} = "iptables" RRECOMMENDS_${PN} = "kernel-module-ip-tables kernel-module-ip-conntrack kernel-module-ipt-conntrack kernel-module-ipt-multiport kernel-module-ipt-log kernel-module-ipt-mac kernel-module-ipt-mark kernel-module-ipt-masquerade kernel-module-ipt-pkttype kernel-module-ipt-reject kernel-module-ipt-state kernel-module-ipt-tos kernel-module-iptable-filter kernel-module-iptable-mangle kernel-module-iptable-nat" diff --git a/recipes/shr/e-wm-config-illume2-shr_git.bb b/recipes/shr/e-wm-config-illume2-shr_git.bb index dacc034968..0c34b89a25 100644 --- a/recipes/shr/e-wm-config-illume2-shr_git.bb +++ b/recipes/shr/e-wm-config-illume2-shr_git.bb @@ -5,7 +5,7 @@ LICENSE = "MIT BSD" RDEPENDS_${PN} = "shr-e-gadgets" SRCREV = "1247d22a007435a58f0967189fc92db2931b31cb" PV = "1.2+gitr${SRCPV}" -PR = "r1" +PR = "r2" inherit e diff --git a/recipes/shr/e-wm-theme-illume-gry_git.bb b/recipes/shr/e-wm-theme-illume-gry_git.bb index 1ed1579a94..3cce286f83 100644 --- a/recipes/shr/e-wm-theme-illume-gry_git.bb +++ b/recipes/shr/e-wm-theme-illume-gry_git.bb @@ -8,7 +8,7 @@ LICENCE = "unknown" SRCREV = "a0a974b1e1150aefdf29e8f0ac471a2a60e62532" PV = "0.3-${EFL_SRCREV}+gitr${SRCPV}" -PR = "r1" +PR = "r2" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/e-wm-theme-illume-neo_git.bb b/recipes/shr/e-wm-theme-illume-neo_git.bb index 89b6818501..c9604b3630 100644 --- a/recipes/shr/e-wm-theme-illume-neo_git.bb +++ b/recipes/shr/e-wm-theme-illume-neo_git.bb @@ -4,12 +4,12 @@ HOMEPAGE = "http://jmccloud.jm.funpic.de" AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com" DEPENDS = "edje-native" RDEPENDS_${PN} = "e-wm" -RSUGGESTS = "elementary-theme-neo gtk-theme-neo gpe-theme-neo icon-theme-neo" +RSUGGESTS_${PN} = "elementary-theme-neo gtk-theme-neo gpe-theme-neo icon-theme-neo" LICENCE = "unknown" SRCREV = "820f4d41531ad6f790615b6a7312a60e30e99fdc" PV = "0.1-${EFL_SRCREV}+gitr${SRCPV}" -PR = "r3" +PR = "r4" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/elementary-theme-gry_git.bb b/recipes/shr/elementary-theme-gry_git.bb index 162416e909..ff9d0f5b95 100644 --- a/recipes/shr/elementary-theme-gry_git.bb +++ b/recipes/shr/elementary-theme-gry_git.bb @@ -8,7 +8,7 @@ LICENSE = "unknown" SRCREV = "722b0dcc2b1bf79515eaaddd9ebc7819c7f923d0" PV = "0.8-${EFL_SRCREV}+gitr${SRCPV}" -PR = "r1" +PR = "r2" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master \ " diff --git a/recipes/shr/elementary-theme-neo_git.bb b/recipes/shr/elementary-theme-neo_git.bb index a7080d4d79..5703d40764 100644 --- a/recipes/shr/elementary-theme-neo_git.bb +++ b/recipes/shr/elementary-theme-neo_git.bb @@ -3,12 +3,12 @@ SECTION = "e/utils" HOMEPAGE = "http://jmccloud.jm.funpic.de" AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com" DEPENDS = "edje-native" -RSUGGESTS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo gpe-theme-neo icon-theme-neo" +RSUGGESTS_${PN} = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo gpe-theme-neo icon-theme-neo" LICENSE = "unknown" SRCREV = "fb377425e69ce1fc13f5094801b96836203e8154" PV = "0.5-${EFL_SRCREV}+gitr${SRCPV}" -PR = "r1" +PR = "r2" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master \ " diff --git a/recipes/shr/elementary-theme-o2_git.bb b/recipes/shr/elementary-theme-o2_git.bb index 54a7f81538..93b730a664 100644 --- a/recipes/shr/elementary-theme-o2_git.bb +++ b/recipes/shr/elementary-theme-o2_git.bb @@ -3,12 +3,12 @@ SECTION = "e/utils" HOMEPAGE = "http://jmccloud.jm.funpic.de" AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com" DEPENDS = "edje-native" -RSUGGESTS = "phoneui-shr-theme-o2" +RSUGGESTS_${PN} = "phoneui-shr-theme-o2" LICENSE = "unknown" SRCREV = "b5eb3134850c277ad8ae1a960b03ff4a509278a8" PV = "0.1-${EFL_SRCREV}+gitr${SRCPV}" -PR = "r0" +PR = "r1" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master \ " diff --git a/recipes/shr/gtk-theme-neo_git.bb b/recipes/shr/gtk-theme-neo_git.bb index 7f35ecdaa1..1b5d4a9890 100644 --- a/recipes/shr/gtk-theme-neo_git.bb +++ b/recipes/shr/gtk-theme-neo_git.bb @@ -2,12 +2,12 @@ DESCRIPTION = "nEo GTK theme - a very fast, high contrast GTK theme" HOMEPAGE = "http://jmccloud.jm.funpic.de" AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com" RDEPENDS_${PN} += "icon-theme-neo" -RSUGGESTS = "elementary-theme-neo e-wm-theme-illume-neo gpe-theme-neo icon-theme-neo" +RSUGGESTS_${PN} = "elementary-theme-neo e-wm-theme-illume-neo gpe-theme-neo icon-theme-neo" LICENSE = "unknown" SRCREV = "f847105c5ef5d488a4bce0c0a85d572c3509d56f" PV = "0.2-${EFL_SRCREV}+gitr${SRCPV}" -PR = "r5" +PR = "r6" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/icon-theme-neo_git.bb b/recipes/shr/icon-theme-neo_git.bb index 73c5286706..2d529ba6fd 100644 --- a/recipes/shr/icon-theme-neo_git.bb +++ b/recipes/shr/icon-theme-neo_git.bb @@ -3,12 +3,12 @@ SECTION = "e/utils" HOMEPAGE = "http://jmccloud.jm.funpic.de" AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com" RDEPENDS_${PN} = "e-wm" -RSUGGESTS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo gpe-theme-neo" +RSUGGESTS_${PN} = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo gpe-theme-neo" LICENSE = "unknown" SRCREV = "f847105c5ef5d488a4bce0c0a85d572c3509d56f" PV = "0.2-${EFL_SRCREV}+gitr${SRCPV}" -PR = "r3" +PR = "r4" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/phoneui-shr-theme-neo_git.bb b/recipes/shr/phoneui-shr-theme-neo_git.bb index 9652546b4f..97986272d6 100644 --- a/recipes/shr/phoneui-shr-theme-neo_git.bb +++ b/recipes/shr/phoneui-shr-theme-neo_git.bb @@ -5,10 +5,10 @@ SECTION = "e/utils" LICENSE = "unknown" DEPENDS = "edje-native" RDEPENDS_${PN} = "libphone-ui-shr" -RSUGGESTS = "e-wm-theme-illume-neo gtk-theme-neo icon-theme-neo elementary-theme-neo" +RSUGGESTS_${PN} = "e-wm-theme-illume-neo gtk-theme-neo icon-theme-neo elementary-theme-neo" SRCREV = "20e5e82819a7612aa31c753a6898ccc9e940c7c6" PV = "0.1+gitr${SRCPV}" -PR = "r0" +PR = "r1" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/phoneui-shr-theme-o2_git.bb b/recipes/shr/phoneui-shr-theme-o2_git.bb index 1fe0e70ca8..3768815d2e 100644 --- a/recipes/shr/phoneui-shr-theme-o2_git.bb +++ b/recipes/shr/phoneui-shr-theme-o2_git.bb @@ -5,10 +5,10 @@ SECTION = "e/utils" LICENSE = "unknown" DEPENDS = "edje-native" RDEPENDS_${PN} = "libphone-ui-shr" -RSUGGESTS = "elementary-theme-o2" +RSUGGESTS_${PN} = "elementary-theme-o2" SRCREV = "20e5e82819a7612aa31c753a6898ccc9e940c7c6" PV = "0.1+gitr${SRCPV}" -PR = "r0" +PR = "r1" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/shr-e-gadgets_git.bb b/recipes/shr/shr-e-gadgets_git.bb index aba6ebe7c1..f64af49aca 100644 --- a/recipes/shr/shr-e-gadgets_git.bb +++ b/recipes/shr/shr-e-gadgets_git.bb @@ -5,9 +5,9 @@ DEPENDS = "e-wm" RDEPENDS_${PN} = "e-wm" SECTION = "x11/application" -SRCREV = "6480322a8a419e8cbe4af5e627661ff03f56ed18" +SRCREV = "4f94c139bd50935dbfb6524e8525d0c35200380b" PV = "0.0.0+gitr${SRCPV}" -PR = "r1" +PR = "r2" inherit autotools diff --git a/recipes/shr/shr-installer_git.bb b/recipes/shr/shr-installer_git.bb index 5e250569a6..31511bab79 100644 --- a/recipes/shr/shr-installer_git.bb +++ b/recipes/shr/shr-installer_git.bb @@ -7,7 +7,7 @@ SECTION = "x11/application" SRCREV = "8608816ea1a1ac14b6e9faaa3685dd2b6450e889" PV = "0.0.2+gitr${SRCPV}" -PR = "r0" +PR = "r1" inherit setuptools diff --git a/recipes/shr/shr-settings_git.bb b/recipes/shr/shr-settings_git.bb index adfab7fa8a..8393e278ab 100644 --- a/recipes/shr/shr-settings_git.bb +++ b/recipes/shr/shr-settings_git.bb @@ -7,7 +7,7 @@ SECTION = "x11/application" SRCREV = "b6de5ae2e6b73821614f9cea4a1334a3415d60c4" PE = "1" PV = "0.1.1+gitr${SRCPV}" -PR = "r11" +PR = "r12" inherit setuptools diff --git a/recipes/shr/shr-splash_git.bb b/recipes/shr/shr-splash_git.bb index 7902dc80e6..42a13ab2b9 100644 --- a/recipes/shr/shr-splash_git.bb +++ b/recipes/shr/shr-splash_git.bb @@ -3,7 +3,7 @@ SECTION = "x11/data" LICENSE = "MIT BSD" SRCREV = "0375bf2b66a053dd490774004c56b5d949f02ac8" PV = "1.2+gitr${SRCPV}" -PR = "r5" +PR = "r6" DEPENDS = "virtual/shr-splash-theme" RRECOMMENDS_${PN} = "virtual/shr-splash-theme" diff --git a/recipes/shr/shr-theme-gry.bb b/recipes/shr/shr-theme-gry.bb index 9f6362a0a8..9cb5e35c39 100644 --- a/recipes/shr/shr-theme-gry.bb +++ b/recipes/shr/shr-theme-gry.bb @@ -2,6 +2,6 @@ DESCRIPTION = "gry* - a fast, shiny theme" SECTION = "x11/data" RDEPENDS_${PN} += "e-wm-theme-illume-gry elementary-theme-gry" PV = "0.1" -PR = "r1" +PR = "r2" ALLOW_EMPTY = "1" diff --git a/recipes/shr/shr-theme-neo.bb b/recipes/shr/shr-theme-neo.bb index 693958266c..44f7f07675 100644 --- a/recipes/shr/shr-theme-neo.bb +++ b/recipes/shr/shr-theme-neo.bb @@ -6,6 +6,6 @@ RDEPENDS_${PN} = "phoneui-shr-theme-neo elementary-theme-neo e-wm-theme-illume-n LICENSE = "unknown" PV = "0.2" -PR = "r3" +PR = "r4" ALLOW_EMPTY = "1" diff --git a/recipes/shr/shr-theme-niebiee.bb b/recipes/shr/shr-theme-niebiee.bb index 50e6e9e796..49bf11118d 100644 --- a/recipes/shr/shr-theme-niebiee.bb +++ b/recipes/shr/shr-theme-niebiee.bb @@ -2,6 +2,6 @@ DESCRIPTION = "Niebiee - extremely blue theme for SHR (metapackage)" SECTION = "x11/data" RDEPENDS_${PN} += "e-wm-theme-illume-niebiee elementary-theme-niebiee shr-splash-theme-niebiee" PV = "0.1" -PR = "r1" +PR = "r2" ALLOW_EMPTY = "1" diff --git a/recipes/shr/shr-theme-sixteen.bb b/recipes/shr/shr-theme-sixteen.bb index a2c04fb09c..bf1580a55c 100644 --- a/recipes/shr/shr-theme-sixteen.bb +++ b/recipes/shr/shr-theme-sixteen.bb @@ -2,6 +2,6 @@ DESCRIPTION = "Sixteen SHR theme" SECTION = "x11/data" RDEPENDS_${PN} += "e-wm-theme-illume-sixteen elementary-theme-sixteen" PV = "0.1" -PR = "r1" +PR = "r2" ALLOW_EMPTY = "1" diff --git a/recipes/shr/shr-today_git.bb b/recipes/shr/shr-today_git.bb index 88e406df8d..81711d57eb 100644 --- a/recipes/shr/shr-today_git.bb +++ b/recipes/shr/shr-today_git.bb @@ -7,7 +7,7 @@ SECTION = "x11/applications" SRCREV = "7b69649a9df0e85f0c0f7985fd1d93543c3b11e2" PV = "0.0.1+gitr${SRCPV}" -PR = "r2" +PR = "r3" inherit distutils diff --git a/recipes/shr/shr-wizard_git.bb b/recipes/shr/shr-wizard_git.bb index 3517a1fb93..e417376158 100644 --- a/recipes/shr/shr-wizard_git.bb +++ b/recipes/shr/shr-wizard_git.bb @@ -6,7 +6,7 @@ RDEPENDS_${PN} = "python-elementary shr-settings python-phoneutils e-wm python-d SECTION = "x11/application" SRCREV = "24450cba257e7057045ad576530f158a03bd0f8b" PV = "0.0.0+gitr${SRCPV}" -PR = "r2" +PR = "r3" inherit autotools diff --git a/recipes/slugimage/slugimage.bb b/recipes/slugimage/slugimage.bb index cb4c030069..32c18c2025 100644 --- a/recipes/slugimage/slugimage.bb +++ b/recipes/slugimage/slugimage.bb @@ -3,7 +3,7 @@ SECTION = "console/utils" LICENSE = "BSD" DESCRIPTION = "Slugimage is a small app to disassemble and reassemble \ flash images for the Linksys NSLU2 device. It also has jffs2 support" -PR = "r12" +PR = "r13" RDEPENDS_${PN} = "perl" diff --git a/recipes/slugos-init/slugos-init_0.10.bb b/recipes/slugos-init/slugos-init_0.10.bb index 650f12c668..eefe42ac2b 100644 --- a/recipes/slugos-init/slugos-init_0.10.bb +++ b/recipes/slugos-init/slugos-init_0.10.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS_${PN} = "busybox devio" -PR = "r90" +PR = "r91" SRC_URI = "file://boot/flash \ file://boot/disk \ diff --git a/recipes/slugos-init/slugos-init_4.8.bb b/recipes/slugos-init/slugos-init_4.8.bb index cdec9e3d44..8df0f68d8b 100644 --- a/recipes/slugos-init/slugos-init_4.8.bb +++ b/recipes/slugos-init/slugos-init_4.8.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS_${PN} = "busybox devio" -PR = "r5" +PR = "r6" SRC_URI = "file://boot/flash \ file://boot/disk \ diff --git a/recipes/slugos-init/slugos-init_5.0.bb b/recipes/slugos-init/slugos-init_5.0.bb index 04fc0a1140..1a45ee1d99 100644 --- a/recipes/slugos-init/slugos-init_5.0.bb +++ b/recipes/slugos-init/slugos-init_5.0.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS_${PN} = "busybox devio" -PR = "r11" +PR = "r12" SRC_URI = "file://boot/flash \ file://boot/disk \ diff --git a/recipes/snes232/snes232_cvs.bb b/recipes/snes232/snes232_cvs.bb index 2f24f35ed8..b03c076e80 100644 --- a/recipes/snes232/snes232_cvs.bb +++ b/recipes/snes232/snes232_cvs.bb @@ -1,5 +1,5 @@ SECTION = "unknown" -PR = "r4" +PR = "r5" LICENSE = "GPL" PACKAGE_STRIP = "no" diff --git a/recipes/snort/snort_2.8.5.3.bb b/recipes/snort/snort_2.8.5.3.bb index fe5bf33c8c..b0b2f045c4 100644 --- a/recipes/snort/snort_2.8.5.3.bb +++ b/recipes/snort/snort_2.8.5.3.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" DEPENDS = "libpcap libnet libpcre" RDEPENDS_${PN} = "libpcap libnet libpcre barnyard" -PR = "r1" +PR = "r2" SRC_URI = " http://dl.snort.org/snort-current/${P}.tar.gz;name=tarball \ file://snort.fix.configure.in.HACK;apply=yes \ diff --git a/recipes/socketcan/canutils.inc b/recipes/socketcan/canutils.inc index 596785f540..a4edeea09f 100644 --- a/recipes/socketcan/canutils.inc +++ b/recipes/socketcan/canutils.inc @@ -5,8 +5,8 @@ SECTION = "console/network" PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "libsocketcan" -RCONFLICTS = "socketcan-utils-test" -INC_PR = "r0" +RCONFLICTS_${PN} = "socketcan-utils-test" +INC_PR = "r1" SRC_URI = "git://git.pengutronix.de/git/tools/canutils.git;protocol=git;tag=${TAG} \ " diff --git a/recipes/socketcan/socketcan-utils-test_svn.bb b/recipes/socketcan/socketcan-utils-test_svn.bb index 2239a02880..b7788b6fbe 100644 --- a/recipes/socketcan/socketcan-utils-test_svn.bb +++ b/recipes/socketcan/socketcan-utils-test_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Socketcan user space utilities and test apps" HOMEPAGE = "http://developer.berlios.de/projects/socketcan/" SECTION = "console/utils" LICENSE = "GPL" -RCONFLICTS = "canutils" +RCONFLICTS_${PN} = "canutils" SRCREV = "917" PV = "0.0+svnr${SRCPV}" diff --git a/recipes/spamassassin/files/spamassassin.init b/recipes/spamassassin/files/spamassassin.init index 9104f2ced4..b0dff57667 100644 --- a/recipes/spamassassin/files/spamassassin.init +++ b/recipes/spamassassin/files/spamassassin.init @@ -30,8 +30,6 @@ ENABLED=0 OPTIONS="" NICE= -. /lib/lsb/init-functions - test -f /etc/default/spamassassin && . /etc/default/spamassassin DOPTIONS="-d --pidfile=$PIDFILE" diff --git a/recipes/spamassassin/spamassassin_3.3.1.bb b/recipes/spamassassin/spamassassin_3.3.1.bb index 8fb99afb45..45e59ee2cb 100644 --- a/recipes/spamassassin/spamassassin_3.3.1.bb +++ b/recipes/spamassassin/spamassassin_3.3.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The Powerful #1 Open-Source Spam Filter" HOMEPAGE = "http://spamassassin.apache.org/" SECTION = "network" LICENSE = "GPL" -PR = "r0" +PR = "r4" inherit cpan @@ -19,9 +19,9 @@ DEPENDS += " \ libip-country-perl-native \ libmail-dkim-perl-native \ libmail-spf-perl-native \ - libnetaddr-ip-perl-native \ libnet-dns-perl-native \ libnet-ident-perl-native \ + libnetaddr-ip-perl-native \ libwww-perl-native \ openssl \ zlib \ @@ -39,9 +39,9 @@ RDEPENDS_${PN} += " \ libip-country-perl \ libmail-dkim-perl \ libmail-spf-perl \ - libnetaddr-ip-perl \ libnet-dns-perl \ libnet-ident-perl \ + libnetaddr-ip-perl \ liburi-perl \ libwww-perl \ perl-module-base \ @@ -63,6 +63,7 @@ RDEPENDS_${PN} += " \ perl-module-file-spec \ perl-module-file-spec-unix \ perl-module-io-file \ + perl-module-io-pipe \ perl-module-io-select \ perl-module-io-socket \ perl-module-io-socket-inet \ @@ -70,6 +71,8 @@ RDEPENDS_${PN} += " \ perl-module-pod-text \ perl-module-pod-usage \ perl-module-posix \ + perl-module-posix-sigaction \ + perl-module-re \ perl-module-socket \ perl-module-strict \ perl-module-sys-hostname \ @@ -83,6 +86,7 @@ RDEPENDS_${PN} += " \ # Most of the patches are from Debian SRC_URI = " \ ${APACHE_MIRROR}/spamassassin/source/Mail-SpamAssassin-${PV}.tar.bz2;name=spamassassin-${PV} \ + ${APACHE_MIRROR}/spamassassin/source/Mail-SpamAssassin-rules-${PV}.r923114.tgz;name=sa-rules-${PV} \ file://spamassassin.default \ file://spamassassin.init \ file://10_change_config_paths;apply=yes \ @@ -96,6 +100,8 @@ SRC_URI = " \ " SRC_URI[spamassassin-3.3.1.md5sum] = "bb977900c3b2627db13e9f44f9b5bfc8" SRC_URI[spamassassin-3.3.1.sha256sum] = "4c348cd951fc2c5688e9713fcbc6ba453df51d32a1ab332a63800d20ff18bdb4" +SRC_URI[sa-rules-3.3.1.md5sum] = "3e6ae5a39b9dd2de7ec05a2b315c396b" +SRC_URI[sa-rules-3.3.1.sha256sum] = "332ce81896ab289090dc040793a8264b5943a411f030238c6461f0ba56a8183e" S = "${WORKDIR}/Mail-SpamAssassin-${PV}" @@ -129,4 +135,12 @@ do_install_append() { ${D}/${bindir}/sa-compile \ ${D}/${bindir}/spamassassin \ ${D}/${sbindir}/spamd + cp ${WORKDIR}/*.cf ${D}${datadir}/spamassassin/ + cp ${WORKDIR}/*.txt ${D}${datadir}/spamassassin/ + cp ${WORKDIR}/languages ${D}${datadir}/spamassassin/ + cp ${WORKDIR}/user_prefs.template ${D}${datadir}/spamassassin/ } + +PACKAGES =+ "${PN}-rules" +FILES_${PN}-rules = "${datadir}/spamassassin/*.cf" +RSUGGESTS_${PN}-rules = "${PN}"
\ No newline at end of file diff --git a/recipes/squidguard/squidguard_1.4.bb b/recipes/squidguard/squidguard_1.4.bb index f08fb62e8a..0a506a35b1 100644 --- a/recipes/squidguard/squidguard_1.4.bb +++ b/recipes/squidguard/squidguard_1.4.bb @@ -4,7 +4,7 @@ SECTION = "network" DEPENDS = "virtual/db openldap mysql5 zlib" RDEPENDS_${PN} += "squid" LICENSE = "GPL" -PR = "r1" +PR = "r2" SRC_URI = " \ http://www.squidguard.org/Downloads/squidGuard-${PV}.tar.gz;name=tar \ diff --git a/recipes/starling/starling_0.9.bb b/recipes/starling/starling_0.9.bb index 5a8b279334..859bf6bd20 100644 --- a/recipes/starling/starling_0.9.bb +++ b/recipes/starling/starling_0.9.bb @@ -3,7 +3,7 @@ SECTION = "gpe/multimedia" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "gtk+ gstreamer gst-plugins-good gst-plugins-bad ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugins-ugly', d)} esound sqlite libsoup libhandoff" -PR = "r1" +PR = "r2" inherit gpe autotools diff --git a/recipes/subversion/subversion_1.4.3.bb b/recipes/subversion/subversion_1.4.3.bb index fc2a9fb422..72c75f53b7 100644 --- a/recipes/subversion/subversion_1.4.3.bb +++ b/recipes/subversion/subversion_1.4.3.bb @@ -5,7 +5,7 @@ RDEPENDS_${PN} = "neon" LICENSE = "Apache BSD" HOMEPAGE = "http://subversion.tigris.org" -PR = "r1" +PR = "r2" SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ file://disable-revision-install.patch \ diff --git a/recipes/subversion/subversion_1.6.5.bb b/recipes/subversion/subversion_1.6.5.bb index b20354ce9a..fab2622405 100644 --- a/recipes/subversion/subversion_1.6.5.bb +++ b/recipes/subversion/subversion_1.6.5.bb @@ -5,7 +5,7 @@ RDEPENDS_${PN} = "neon" LICENSE = "Apache BSD" HOMEPAGE = "http://subversion.tigris.org/" -PR = "r0" +PR = "r1" SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ file://disable-revision-install.patch" diff --git a/recipes/sudo/sudo-enable-wheel-group.bb b/recipes/sudo/sudo-enable-wheel-group.bb index 7e79be4930..ec1de9e7f2 100644 --- a/recipes/sudo/sudo-enable-wheel-group.bb +++ b/recipes/sudo/sudo-enable-wheel-group.bb @@ -1,4 +1,4 @@ -PR = "r0" +PR = "r1" RDEPENDS_${PN} = "sudo" diff --git a/recipes/sudo/sudo_1.7.2p4.bb b/recipes/sudo/sudo_1.7.2p4.bb index e2d7739f4a..c2818cf088 100644 --- a/recipes/sudo/sudo_1.7.2p4.bb +++ b/recipes/sudo/sudo_1.7.2p4.bb @@ -1,4 +1,4 @@ -PR = "r3" +PR = "r4" DEPENDS = "libpam" RDEPENDS_${PN} = "libpam libpam-meta" diff --git a/recipes/sugar/etoys_3.0.2076.bb b/recipes/sugar/etoys_3.0.2076.bb index 07817ba22e..70db0c38a8 100644 --- a/recipes/sugar/etoys_3.0.2076.bb +++ b/recipes/sugar/etoys_3.0.2076.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Sugar etoys" LICENSE = "GPLv2" -PR = "r1" +PR = "r2" DEPENDS = "sugar" RDEPENDS_${PN} = "sugar shared-mime-info" diff --git a/recipes/sugar/etoys_4.0.2212.bb b/recipes/sugar/etoys_4.0.2212.bb index 0c6debe147..649be2ead2 100644 --- a/recipes/sugar/etoys_4.0.2212.bb +++ b/recipes/sugar/etoys_4.0.2212.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Sugar etoys" LICENSE = "GPLv2" -PR = "r0" +PR = "r1" DEPENDS = "sugar" RDEPENDS_${PN} = "sugar shared-mime-info" diff --git a/recipes/sugar/sugar-artwork_0.84.1.bb b/recipes/sugar/sugar-artwork_0.84.1.bb index 5f02cacda6..41935d6404 100644 --- a/recipes/sugar/sugar-artwork_0.84.1.bb +++ b/recipes/sugar/sugar-artwork_0.84.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Sugar artwork" LICENSE = "GPLv2" -PR = "r0" +PR = "r1" DEPENDS = "sugar icon-slicer-native" RDEPENDS_${PN} = "ttf-dejavu-sans ttf-dejavu-sans-mono ttf-dejavu-sans-condensed \ diff --git a/recipes/sugar/sugar-base_0.82.2.bb b/recipes/sugar/sugar-base_0.82.2.bb index 34c09b2512..f2c7bd7f5c 100644 --- a/recipes/sugar/sugar-base_0.82.2.bb +++ b/recipes/sugar/sugar-base_0.82.2.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Sugar base system" LICENSE = "LGPLv2" -PR = "r11" +PR = "r12" DEPENDS = "python-pygtk sugar-toolkit" RDEPENDS_${PN} = "librsvg-gtk \ diff --git a/recipes/sugar/sugar-base_0.83.2.bb b/recipes/sugar/sugar-base_0.83.2.bb index cde687f0c0..31f93f2277 100644 --- a/recipes/sugar/sugar-base_0.83.2.bb +++ b/recipes/sugar/sugar-base_0.83.2.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Sugar base system" LICENSE = "LGPLv2" -PR = "r1" +PR = "r2" DEPENDS = "python-pygtk sugar-toolkit" RDEPENDS_${PN} = "librsvg-gtk \ diff --git a/recipes/sugar/sugar-datastore_0.82.0.bb b/recipes/sugar/sugar-datastore_0.82.0.bb index 8905956c75..887eb75d07 100644 --- a/recipes/sugar/sugar-datastore_0.82.0.bb +++ b/recipes/sugar/sugar-datastore_0.82.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Sugar datastore" LICENSE = "GPLv2" -PR = "r0" +PR = "r1" DEPENDS = "sugar-toolkit python-xappy " RDEPENDS_${PN} = "sugar-toolkit sugar-base python-xappy" diff --git a/recipes/sugar/sugar-datastore_0.84.0.bb b/recipes/sugar/sugar-datastore_0.84.0.bb index 8a48498ebf..e02ab0a297 100644 --- a/recipes/sugar/sugar-datastore_0.84.0.bb +++ b/recipes/sugar/sugar-datastore_0.84.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Sugar datastore" LICENSE = "GPLv2" -PR = "r0" +PR = "r1" DEPENDS = "sugar-toolkit python-xappy " RDEPENDS_${PN} = "sugar-toolkit sugar-base python-xappy python-cjson xapian-bindings-python" diff --git a/recipes/sugar/sugar_0.82.9.bb b/recipes/sugar/sugar_0.82.9.bb index 9ebbd90ba0..693fd396d7 100644 --- a/recipes/sugar/sugar_0.82.9.bb +++ b/recipes/sugar/sugar_0.82.9.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Sugar base system" LICENSE = "GPLv2" -PR = "r4" +PR = "r5" DEPENDS = "sugar-toolkit libxml2 gtk+" RDEPENDS_${PN} = "sugar-toolkit sugar-base sugar-datastore gnome-python-desktop" diff --git a/recipes/suspend-desktop/suspend-desktop_1.0.bb b/recipes/suspend-desktop/suspend-desktop_1.0.bb index e927e87ae4..cb084f344a 100644 --- a/recipes/suspend-desktop/suspend-desktop_1.0.bb +++ b/recipes/suspend-desktop/suspend-desktop_1.0.bb @@ -3,7 +3,7 @@ PRIORITY = "optional" DESCRIPTION = "Suspend feature for the application launcher menu." LICENSE = "GPL" -PR = "r2" +PR = "r3" DISTRO_APM ?= "apm" RDEPENDS_${PN} = "gpe-conf" diff --git a/recipes/swfdec/swfdec-mozilla_0.7.2.bb b/recipes/swfdec/swfdec-mozilla_0.7.2.bb index e422d0d41d..86a812ad63 100644 --- a/recipes/swfdec/swfdec-mozilla_0.7.2.bb +++ b/recipes/swfdec/swfdec-mozilla_0.7.2.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Swfdec plugin for browsers using NPAPI. Swfdec is a decoder/renderer for Macromedia Flash animations." LICENSE = "LGPL" -PR = "r2" +PR = "r3" DEPENDS = "gst-ffmpeg swfdec gstreamer libsoup-2.4 pango cairo liboil zlib gtk+ alsa-lib \ ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}" diff --git a/recipes/swfdec/swfdec-mozilla_0.7.4.bb b/recipes/swfdec/swfdec-mozilla_0.7.4.bb index c2d912024d..2184ba21a9 100644 --- a/recipes/swfdec/swfdec-mozilla_0.7.4.bb +++ b/recipes/swfdec/swfdec-mozilla_0.7.4.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Swfdec plugin for browsers using NPAPI. Swfdec is a decoder/renderer for Macromedia Flash animations." LICENSE = "LGPL" -PR = "r1" +PR = "r2" DEPENDS = "gst-ffmpeg swfdec gstreamer libsoup-2.4 pango cairo liboil zlib gtk+ alsa-lib \ ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}" diff --git a/recipes/swfdec/swfdec-mozilla_0.9.2.bb b/recipes/swfdec/swfdec-mozilla_0.9.2.bb index 0a7f2417da..2009347b92 100644 --- a/recipes/swfdec/swfdec-mozilla_0.9.2.bb +++ b/recipes/swfdec/swfdec-mozilla_0.9.2.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Swfdec plugin for browsers using NPAPI. Swfdec is a decoder/renderer for Macromedia Flash animations." LICENSE = "LGPL" -PR = "r1" +PR = "r2" DEPENDS = "swfdec glib-2.0" RDEPENDS_${PN} = "gst-ffmpeg" diff --git a/recipes/swt/swt3.4-gtk_3.4.2.bb b/recipes/swt/swt3.4-gtk_3.4.2.bb index 179f78a450..5264906e63 100644 --- a/recipes/swt/swt3.4-gtk_3.4.2.bb +++ b/recipes/swt/swt3.4-gtk_3.4.2.bb @@ -1,6 +1,6 @@ require swt-gtk.inc -PR = "r2" +PR = "r3" SRC_URI = "http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.4.2-200902111700/swt-3.4.2-gtk-linux-x86.zip \ file://Makefile" @@ -10,7 +10,7 @@ SWT_API_VERSION = "3.4" PROVIDES = "swt3.4-gtk" -RCONFLICTS = "libswt3.5-gtk-java" +RCONFLICTS_${PN} = "libswt3.5-gtk-java" SRC_URI[md5sum] = "2b97f05f86bd7138491d9a8c5934e840" SRC_URI[sha256sum] = "30c8c545faabae331420a6c37194470a4f74f508eab4e0463c65953d09cde6eb" diff --git a/recipes/swt/swt3.5-gtk_3.5.1.bb b/recipes/swt/swt3.5-gtk_3.5.1.bb index 6ef9dda1fa..027efd220a 100644 --- a/recipes/swt/swt3.5-gtk_3.5.1.bb +++ b/recipes/swt/swt3.5-gtk_3.5.1.bb @@ -1,6 +1,6 @@ require swt-gtk.inc -PR = "r0" +PR = "r1" SRC_URI = "http://mirror.switch.ch/eclipse/eclipse/downloads/drops/R-3.5.1-200909170800/swt-3.5.1-gtk-linux-x86.zip;name=swt \ file://Makefile" @@ -13,4 +13,4 @@ SWT_API_VERSION = "3.5" PROVIDES = "swt3.5-gtk" -RCONFLICTS = "libswt3.4-gtk-java" +RCONFLICTS_${PN} = "libswt3.4-gtk-java" diff --git a/recipes/sysconf/sysconf_0.1.bb b/recipes/sysconf/sysconf_0.1.bb index 5625ad4f15..ff6f025818 100644 --- a/recipes/sysconf/sysconf_0.1.bb +++ b/recipes/sysconf/sysconf_0.1.bb @@ -3,7 +3,7 @@ SECTION = "base" PRIORITY = "optional" LICENSE = "GPL" RDEPENDS_${PN} = "devio cpio findutils diffutils" -PR = "r10" +PR = "r11" # Currently, the scripts only support ixp4xx machines. # Feel free to add to the scripts ... diff --git a/recipes/tapioca/tapiocaui_0.3.9.1.bb b/recipes/tapioca/tapiocaui_0.3.9.1.bb index 3a576c150d..1c93434b59 100644 --- a/recipes/tapioca/tapiocaui_0.3.9.1.bb +++ b/recipes/tapioca/tapiocaui_0.3.9.1.bb @@ -2,7 +2,7 @@ HOMEPAGE = "http://tapioca-voip.sourceforge.net/wiki/index.php/Tapioca" LICENSE = "LGPL" DEPENDS = "gtk+ glib-2.0 dbus gconf tapioca-xmpp tapioca farsight gst-plugins-farsight" RDEPENDS_${PN} = "tapioca-xmpp" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/tapioca-voip/${P}.tar.gz" diff --git a/recipes/tasks/task-devimage.bb b/recipes/tasks/task-devimage.bb index 1eff219563..0c8fdea32c 100644 --- a/recipes/tasks/task-devimage.bb +++ b/recipes/tasks/task-devimage.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Image for development testing" -PR = "r5" +PR = "r6" LICENSE = "MIT" inherit task diff --git a/recipes/tasks/task-efl.bb b/recipes/tasks/task-efl.bb index 21763108d2..30befa47f1 100644 --- a/recipes/tasks/task-efl.bb +++ b/recipes/tasks/task-efl.bb @@ -14,6 +14,6 @@ RDEPENDS_${PN} = "\ ewl \ epdf \ " -PR = "r1" +PR = "r2" ALLOW_EMPTY = "1" diff --git a/recipes/tasks/task-mamona-base.bb b/recipes/tasks/task-mamona-base.bb index 1c3f2264a1..f50c897e3c 100644 --- a/recipes/tasks/task-mamona-base.bb +++ b/recipes/tasks/task-mamona-base.bb @@ -1,6 +1,6 @@ DESCRIPTION = "task mamona base" LICENSE = "MIT" -PR = "r3" +PR = "r4" ALLOW_EMPTY = "1" PACKAGES = "${PN}" diff --git a/recipes/tasks/task-mamona-devel.bb b/recipes/tasks/task-mamona-devel.bb index 012ea3f5da..879c00c7af 100644 --- a/recipes/tasks/task-mamona-devel.bb +++ b/recipes/tasks/task-mamona-devel.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Necessary packages for development at runtime environment" LICENSE = "MIT" -PR = "r3" +PR = "r4" ALLOW_EMPTY = "1" PACKAGES = "${PN}" diff --git a/recipes/tasks/task-mamona-python.bb b/recipes/tasks/task-mamona-python.bb index d8b06706e4..4503627d28 100644 --- a/recipes/tasks/task-mamona-python.bb +++ b/recipes/tasks/task-mamona-python.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Task mamona: Python Applicattions" LICENSE = "MIT" -PR = "r0" +PR = "r1" PACKAGES = "${PN}" diff --git a/recipes/tasks/task-mamona-sdk-noemu.bb b/recipes/tasks/task-mamona-sdk-noemu.bb index 31e7215ae5..e360c510e4 100644 --- a/recipes/tasks/task-mamona-sdk-noemu.bb +++ b/recipes/tasks/task-mamona-sdk-noemu.bb @@ -1,9 +1,9 @@ -PR = "r2" +PR = "r3" require mamona-sdk.inc -RCONFLICTS = "task-mamona-sdk" -RREPLACES = "task-mamona-sdk" +RCONFLICTS_${PN} = "task-mamona-sdk" +RREPLACES_${PN} = "task-mamona-sdk" RDEPENDS_${PN} += "\ bash-noemu \ diff --git a/recipes/tasks/task-mamona-sdk.bb b/recipes/tasks/task-mamona-sdk.bb index d2b1fcac75..f1c83b93c7 100644 --- a/recipes/tasks/task-mamona-sdk.bb +++ b/recipes/tasks/task-mamona-sdk.bb @@ -1,9 +1,9 @@ -PR = "r4" +PR = "r5" include mamona-sdk.inc -RCONFLICTS = "task-mamona-sdk-noemu" -RREPLACES = "task-mamona-sdk-noemu" +RCONFLICTS_${PN} = "task-mamona-sdk-noemu" +RREPLACES_${PN} = "task-mamona-sdk-noemu" RDEPENDS_${PN} += "\ bash \ diff --git a/recipes/tasks/task-mamona-systemtap.bb b/recipes/tasks/task-mamona-systemtap.bb index d57716194c..84182d6573 100644 --- a/recipes/tasks/task-mamona-systemtap.bb +++ b/recipes/tasks/task-mamona-systemtap.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Task Mamona: Necessary packages for running a systemtap enabled system" -PR = "r1" +PR = "r2" ALLOW_EMPTY = "1" PACKAGES = "${PN}" diff --git a/recipes/tasks/task-mamona-wm.bb b/recipes/tasks/task-mamona-wm.bb index cfa0ecee46..49d3a6a8ab 100644 --- a/recipes/tasks/task-mamona-wm.bb +++ b/recipes/tasks/task-mamona-wm.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Task mamona: Window Manager" LICENSE = "MIT" -PR = "r2" +PR = "r3" ALLOW_EMPTY = "1" PACKAGES = "${PN}" diff --git a/recipes/tasks/task-mamona.bb b/recipes/tasks/task-mamona.bb index 9448eb096a..e77704c7a0 100644 --- a/recipes/tasks/task-mamona.bb +++ b/recipes/tasks/task-mamona.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Task mamona: Build and Install Mamona Platform" LICENSE = "MIT" -PR = "r5" +PR = "r6" ALLOW_EMPTY = "1" PACKAGES = "${PN}" diff --git a/recipes/tasks/task-openprotium.bb b/recipes/tasks/task-openprotium.bb index 68e093e823..2cfe30dda1 100644 --- a/recipes/tasks/task-openprotium.bb +++ b/recipes/tasks/task-openprotium.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Basic image for openprotium" HOMEPAGE = "http://www.openprotium.org" ALLOW_EMPTY = "1" -PR = "r2" +PR = "r3" inherit task diff --git a/recipes/tasks/task-python-efl-examples.bb b/recipes/tasks/task-python-efl-examples.bb index 3bd4b58a58..ad6c90ec4a 100644 --- a/recipes/tasks/task-python-efl-examples.bb +++ b/recipes/tasks/task-python-efl-examples.bb @@ -8,6 +8,6 @@ RDEPENDS_${PN} = "\ python-edje-examples \ python-math python-textutils \ " -PR = "ml4.1" +PR = "ml5" ALLOW_EMPTY = "1" diff --git a/recipes/tasks/task-python-efl.bb b/recipes/tasks/task-python-efl.bb index fc22f108b5..c52cc9cd7a 100644 --- a/recipes/tasks/task-python-efl.bb +++ b/recipes/tasks/task-python-efl.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Python Bindings to the Enlightenment Foundation Libraries" LICENSE = "MIT" SECTION = "devel/python" -PR = "ml4.1" +PR = "ml5" ALLOW_EMPTY = "1" diff --git a/recipes/tasks/task-python-everything.bb b/recipes/tasks/task-python-everything.bb index b6b327fa52..3d2e17968a 100644 --- a/recipes/tasks/task-python-everything.bb +++ b/recipes/tasks/task-python-everything.bb @@ -2,7 +2,7 @@ DESCRIPTION= "Everything Python" HOMEPAGE = "http://www.vanille.de/projects/python.spy" LICENSE = "MIT" PV = "2.6" -PR = "ml44" +PR = "ml45" RDEPENDS_${PN} = "\ python-ao \ diff --git a/recipes/tasks/task-python-sharprom_20060425.bb b/recipes/tasks/task-python-sharprom_20060425.bb index 4aac5e9e04..16038adaa9 100644 --- a/recipes/tasks/task-python-sharprom_20060425.bb +++ b/recipes/tasks/task-python-sharprom_20060425.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Everything Python for SharpROM" HOMEPAGE = "http://www.vanille.de/projects/python.spy" LICENSE = "MIT" -PR = "ml6" +PR = "ml7" NONWORKING = "\ python-codes \ diff --git a/recipes/tasks/task-sdk-base.bb b/recipes/tasks/task-sdk-base.bb index 5143470bd5..da984c07ad 100644 --- a/recipes/tasks/task-sdk-base.bb +++ b/recipes/tasks/task-sdk-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Basic SDK development packages" -PR = "r2" +PR = "r3" LICENSE = "MIT" ALLOW_EMPTY = "1" diff --git a/recipes/tasks/task-sdk-gpephone.bb b/recipes/tasks/task-sdk-gpephone.bb index 2641adb6fe..df5bca7d68 100644 --- a/recipes/tasks/task-sdk-gpephone.bb +++ b/recipes/tasks/task-sdk-gpephone.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SDK task for GPE Phone Edition" -PR = "r0" +PR = "r1" LICENSE = "MIT" ALLOW_EMPTY = "1" diff --git a/recipes/tasks/task-sdk-sbox-gpe.bb b/recipes/tasks/task-sdk-sbox-gpe.bb index 51ab447050..8daca11a46 100644 --- a/recipes/tasks/task-sdk-sbox-gpe.bb +++ b/recipes/tasks/task-sdk-sbox-gpe.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SDK task for Scratchbox rootstraps incuding GPE/GTK bits" -PR = "r0" +PR = "r1" LICENSE = "MIT" ALLOW_EMPTY = "1" diff --git a/recipes/tasks/task-sdk-sbox.bb b/recipes/tasks/task-sdk-sbox.bb index 3226e374ea..bf7540268f 100644 --- a/recipes/tasks/task-sdk-sbox.bb +++ b/recipes/tasks/task-sdk-sbox.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SDK task for Scratchbox rootstraps" -PR = "r7" +PR = "r8" LICENSE = "MIT" ALLOW_EMPTY = "1" diff --git a/recipes/tasks/task-self-hosting.bb b/recipes/tasks/task-self-hosting.bb index 5ee20d5ea1..96f204f140 100644 --- a/recipes/tasks/task-self-hosting.bb +++ b/recipes/tasks/task-self-hosting.bb @@ -2,7 +2,7 @@ DESCRIPTION = "All tools needed for OpenEmbedded build" SECTION = "devel" LICENSE = "MIT" RDEPENDS_${PN} = "task-native-sdk python-modules bash texinfo cvs subversion git" -PR = "r1" +PR = "r2" # # quilt-native REQ bash and perl/perl-modules diff --git a/recipes/tasks/task-slugos.bb b/recipes/tasks/task-slugos.bb index 69bf6caf11..c0077793b3 100644 --- a/recipes/tasks/task-slugos.bb +++ b/recipes/tasks/task-slugos.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Task packages for the SlugOS distribution" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r25" +PR = "r27" PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_MACHINE = "(nslu2|ixp4xx|sheevaplug)" ALLOW_EMPTY = "1" @@ -74,12 +74,16 @@ kernel-module-ohci-hcd \ kernel-module-uhci-hcd \ " +## Commented out MJW - due to space considerations; +## add this back in as soon as cleanup tasks manage +## to recover sufficient flash space. # Add packages and modules required for RAID-1 support -SLUGOS_STANDARD_RRECOMMENDS += "\ -mdadm \ -kernel-module-md-mod \ -kernel-module-raid1 \ -" +#SLUGOS_STANDARD_RRECOMMENDS += "\ +#mdadm \ +#kernel-module-md-mod \ +#kernel-module-raid1 \ +#" +## End - MJW # Add the machine-specific RRECOMMENDS_${PN} stuff -- kernel modules required for # network support. @@ -139,7 +143,8 @@ RDEPENDS_${PN} += "\ DISTRO_EXTRA_RRECOMMENDS ?= "" RRECOMMENDS_${PN} += "\ - openssh \ + openssh-keygen \ + openssh-sshd \ ${SLUGOS_STANDARD_RRECOMMENDS} \ ${SLUGOS_MACHINE_RRECOMMENDS} \ ${DISTRO_EXTRA_RRECOMMENDS}" diff --git a/recipes/telepathy/empathy_0.1.bb b/recipes/telepathy/empathy_0.1.bb index 299485e668..882d2814da 100644 --- a/recipes/telepathy/empathy_0.1.bb +++ b/recipes/telepathy/empathy_0.1.bb @@ -5,7 +5,7 @@ DEPENDS = "telepathy-mission-control libtelepathy gtk+ gconf libglade" RDEPENDS_${PN} = "telepathy-mission-control" RRECOMMENDS_${PN} = "telepathy-gabble" -PR ="r1" +PR = "r2" SRC_URI = "http://projects.collabora.co.uk/~xclaesse/empathy-0.1.tar.gz \ file://no-gnome.diff" diff --git a/recipes/telepathy/empathy_0.14.bb b/recipes/telepathy/empathy_0.14.bb index 374d22d328..0b646a50e0 100644 --- a/recipes/telepathy/empathy_0.14.bb +++ b/recipes/telepathy/empathy_0.14.bb @@ -5,7 +5,7 @@ DEPENDS = "telepathy-mission-control libtelepathy gtk+ gconf libglade gnome-vfs" RDEPENDS_${PN} = "telepathy-mission-control" RRECOMMENDS_${PN} = "telepathy-gabble" -PR ="r0" +PR = "r1" inherit gnome diff --git a/recipes/telepathy/empathy_0.4.bb b/recipes/telepathy/empathy_0.4.bb index ff69498fdf..0644424441 100644 --- a/recipes/telepathy/empathy_0.4.bb +++ b/recipes/telepathy/empathy_0.4.bb @@ -5,7 +5,7 @@ DEPENDS = "libgnomeui telepathy-mission-control libtelepathy gtk+ gconf libglade RDEPENDS_${PN} = "telepathy-mission-control" RRECOMMENDS_${PN} = "telepathy-gabble" -PR ="r0" +PR = "r1" inherit gnome diff --git a/recipes/telepathy/empathy_0.5.bb b/recipes/telepathy/empathy_0.5.bb index 078eb08f87..29e50f01d8 100644 --- a/recipes/telepathy/empathy_0.5.bb +++ b/recipes/telepathy/empathy_0.5.bb @@ -5,7 +5,7 @@ DEPENDS = "telepathy-mission-control libtelepathy gtk+ gconf libglade gnome-vfs" RDEPENDS_${PN} = "telepathy-mission-control" RRECOMMENDS_${PN} = "telepathy-gabble" -PR ="r1" +PR = "r2" inherit gnome diff --git a/recipes/telepathy/empathy_2.23.90.bb b/recipes/telepathy/empathy_2.23.90.bb index 95ba85a5d2..78cdac712e 100644 --- a/recipes/telepathy/empathy_2.23.90.bb +++ b/recipes/telepathy/empathy_2.23.90.bb @@ -8,7 +8,7 @@ RRECOMMENDS_${PN} = "telepathy-gabble" inherit gnome PARALLEL_MAKE = "" -PR = "r1" +PR = "r2" PACKAGES =+ "empathy-scrollkeeper-junk" FILES_empathy-scrollkeeper-junk = "/var/lib/scrollkeeper" diff --git a/recipes/temper/temper_0.0.1.bb b/recipes/temper/temper_0.0.1.bb index 6821982901..170a5b7283 100644 --- a/recipes/temper/temper_0.0.1.bb +++ b/recipes/temper/temper_0.0.1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "A fan control script for the Thecus n1200 or n2100" SECTION = "console/network" -PR = "r1" +PR = "r2" LICENSE = "GPL" COMPATIBLE_MACHINE = "(n1200|n2100)" RDEPENDS_${PN} = "hddtemp" diff --git a/recipes/tgt/tgt_1.0.5.bb b/recipes/tgt/tgt_1.0.5.bb index 7baee86fa5..5c120f60e6 100644 --- a/recipes/tgt/tgt_1.0.5.bb +++ b/recipes/tgt/tgt_1.0.5.bb @@ -4,10 +4,17 @@ LICENSE = "GPLv2" DEPENDS = "openssl" RDEPENDS_${PN} = "iscsi-target" +<<<<<<< HEAD:recipes/tgt/tgt_1.0.5.bb PR = "r0" SRC_URI = "http://stgt.berlios.de/releases/tgt-${PV}.tar.gz" SRC_URI[md5sum] = "200fb1b4e8d42b072de2bac238c7d779" SRC_URI[sha256sum] = "b8cc9fdbacdcd9717b6c4bc15f7999a5bd4a20a334a09b47a3ae5ea21383eb1a" +======= +PR = "r1" +SRC_URI = "http://stgt.berlios.de/releases/tgt-${PV}.tar.gz;name=tgttargz" +SRC_URI[tgttargz.md5sum] = "5a7c6b2c585c5f969c64e2c19f49f439" +SRC_URI[tgttargz.sha256sum] = "018f772370fe3dae815e09416e5dae5ae464335a1efe6343cf80612a29fe54e4" +>>>>>>> 2bca6bd1a15123af28ff5ef8fd6ebb417a3a4dee:recipes/tgt/tgt_1.0.3.bb EXTRA_OEMAKE += "ISCSI=1" diff --git a/recipes/ti/gstreamer-ti.inc b/recipes/ti/gstreamer-ti.inc new file mode 100644 index 0000000000..d21794228e --- /dev/null +++ b/recipes/ti/gstreamer-ti.inc @@ -0,0 +1,131 @@ +DESCRIPTION = "GSTREAMER Plugin (gstreamer-ti) for TI ARM/DSP processors" +HOMEPAGE = "https://gforge.ti.com/gf/project/gstreamer_ti/" +SECTION = "multimedia" +LICENSE = "LGPL" + +# TODO :: Replace omapl137 with official support in GST (currently linking to omapl138) +# TODO :: Codec Server Environment Variables shouldn't be required +# TODO :: Add (and check) rc scripts for all targets (just copied for now) (365,6467,omapl137) +# TODO :: Check if CPPFLAGS_append is still required +# TODO :: Remove ENCODE/DECODE combo exports - these are not used anymore (check?) + +inherit autotools +inherit update-rc.d +require ti-paths.inc +require ti-staging.inc + +# Rebuild on kernel change since it links statically to ti-dmai, ti-codec-engine, etc +PR = "r59+${MACHINE_KERNEL_PR}" + +DEPENDS = "ti-dmai gstreamer gst-plugins-base" + +# gstreamer_ti picks up some config variables from the environment +# - variables are used in the gstreamer makefile +# - PLATFORM, XDC_PLATFORM, XDC_TARGET, MVTOOL_DIR +# - others used by config.bld (which it gets from the dmai config.bld) +# - CROSS_COMPILE, PLATFORM_XDC + +PLATFORM_dm6446 = "dm6446" +PLATFORM_dm6467 = "dm6467" +PLATFORM_dm6467t = "dm6467t" +PLATFORM_omap3 = "omap3530" +PLATFORM_dm355 = "dm355" +PLATFORM_dm365 = "dm365" +PLATFORM_omapl137 = "omapl137" +PLATFORM_omapl138 = "omapl138" +PLATFORM ?= "<UNDEFINED_PLATFORM>" +GST_TI_PLATFORM = ${PLATFORM} + +XDC_PLATFORM_dm6446 = "ti.platforms.evmDM6446" +XDC_PLATFORM_dm6467 = "ti.platforms.evmDM6467" +XDC_PLATFORM_omap3 = "ti.platforms.evm3530" +XDC_PLATFORM_dm355 = "ti.platforms.evmDM355" +XDC_PLATFORM_dm365 = "ti.platforms.evmDM365" +XDC_PLATFORM_omapl137 = "ti.platforms.evmOMAPL137" +XDC_PLATFORM_omapl138 = "ti.platforms.evmOMAPL138" +XDC_PLATFORM ?= "<UNDEFINED_XDC_PLATFORM>" + +export PLATFORM +export GST_TI_PLATFORM +export XDC_PLATFORM +export XDC_TARGET = "gnu.targets.arm.GCArmv5T" +export PLATFORM_XDC = ${XDC_PLATFORM} +export MVTOOL_DIR = "${TOOLCHAIN_PATH}" +export CROSS_COMPILE = "${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}" +export LINK_XDC_ROOT = "${LINK_INSTALL_DIR}" + +# export codec combo (or server) locations +# Why do we need to do this?? - These will get picked up from CODEC_INSTALL_DIR? +# Sould only need this if we change from default server + +export CODEC_SERVER = "${installdir}/ti-codecs-server/cs.x64P" +CPPFLAGS_append = " -DPlatform_${PLATFORM}" + +# Makefile also expects to be able to find the kernel headers from the envirionment +export LINUXKERNEL_INSTALL_DIR = "${STAGING_KERNEL_DIR}" + +do_configure_prepend() { + # PSP kernel is based on older DSS. we need to replace linux/omapfb.h with mach/omapfb.h + if ! [ -e ${STAGING_KERNEL_DIR}/include/linux/omapfb.h ] ; then + sed -i -e s:linux/omapfb:mach/omapfb:g ${S}/src/omapfb.h || true + fi +} + +do_install_prepend () { + + install -d ${D}/${installdir}/gst/${PLATFORM} + + # copy gstreamer demo scripts + cp -r ${WORKDIR}/gstreamer_ti/gstreamer_demo/shared ${D}/${installdir}/gst + + # If we have loadmodule.sh in WORKDIR then give preference to this over + # the default gst-ti loadmdules.sh + if [ -f ${WORKDIR}/loadmodules.sh ]; then + cp ${WORKDIR}/loadmodules.sh ${D}/${installdir}/gst/${PLATFORM} + else + cp -r ${WORKDIR}/gstreamer_ti/gstreamer_demo/${PLATFORM} ${D}/${installdir}/gst + fi + + # replace insmod with modprobe + sed -i 's/insmod/modprobe/g' ${D}/${installdir}/gst/${PLATFORM}/loadmodules.sh + sed -i 's/.ko//g' ${D}/${installdir}/gst/${PLATFORM}/loadmodules.sh + + if [ "${PLATFORM}" = "omap3530" ]; then + echo "modprobe sdmak" >> ${D}/${installdir}/gst/${PLATFORM}/loadmodules.sh + fi + + # FIXME: add depmod -a after #!/bin/sh + sed -i '/#!\/bin\/sh/a\depmod -a' ${D}/${installdir}/gst/${PLATFORM}/loadmodules.sh + + # delete .svn files + find ${D}/${installdir}/gst -name .svn -type d | xargs rm -rf + chmod 0755 ${D}/${installdir}/gst -R + + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/gstreamer-ti-rc.sh ${D}${sysconfdir}/init.d/gstti-init + install -d ${D}${sysconfdir}/profile.d/ + install -m 0755 ${WORKDIR}/gst-ti.sh ${D}${sysconfdir}/profile.d/ +} + +RRECOMMENDS_${PN}_append_dm6446 += "ti-codecs-dm6446-server ti-cmem-module ti-dsplink-module" +RRECOMMENDS_${PN}_append_dm6467 += "ti-codecs-dm6467 ti-cmem-module ti-dsplink-module" +RRECOMMENDS_${PN}_append_omap3 += "ti-codecs-omap3530-server ti-cmem-module ti-dsplink-module ti-lpm-module ti-sdma-module" +RRECOMMENDS_${PN}_append_dm355 += "ti-codecs-dm355 ti-cmem-module ti-dm355mm-module" +RRECOMMENDS_${PN}_append_dm365 += "ti-codecs-dm365 ti-cmem-module ti-dm365mm-module ti-edma-module ti-irq-module" +RRECOMMENDS_${PN}_append_omapl137 += "ti-codecs-omapl137-server ti-cmem-module ti-dsplink-module" +RRECOMMENDS_${PN}_append_omapl138 += "ti-codecs-omapl138-server ti-cmem-module ti-dsplink-module" + +FILES_${PN} += "${libdir}/gstreamer-0.10/*.so ${sysconfdir} ${installdir}" +FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.a ${libdir}/gstreamer-0.10/*.la" +FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug" + +pkg_postinst_${PN} () { + if [ -d ${installdir}/ti-codecs-server/ ]; then + ln -sf ${installdir}/ti-codecs-server/* ${installdir}/gst/${PLATFORM}/ + fi +} + + +INITSCRIPT_NAME = "gstti-init" +INITSCRIPT_PARAMS = "start 30 5 2 . stop 40 0 1 6 ." + diff --git a/recipes/ti/gstreamer-ti/0001-gstreamer-ti-tracker-1055.patch b/recipes/ti/gstreamer-ti/0001-gstreamer-ti-tracker-1055.patch new file mode 100644 index 0000000000..99a94a5561 --- /dev/null +++ b/recipes/ti/gstreamer-ti/0001-gstreamer-ti-tracker-1055.patch @@ -0,0 +1,994 @@ +From 455900e8cbb7a88d3ec05cba5393f4ca0bf22adc Mon Sep 17 00:00:00 2001 +From: Brijesh Singh <bksingh@ti.com> +Date: Sun, 9 May 2010 05:21:19 -0500 +Subject: [PATCH] gstreamer ti tracker 1055 + +--- + Makefile.external | 49 +++++++--- + src/Makefile.am | 4 +- + src/gstticodecplugin_dm355.cfg | 143 ++++++++++++----------------- + src/gstticodecplugin_dm365.cfg | 185 ++++++++++++++++++-------------------- + src/gstticodecplugin_dm6467t.cfg | 34 +++++++ + src/gstticodecs_dm355.c | 11 +-- + src/gstticodecs_dm365.c | 23 ++++-- + src/gstticodecs_dm6467.c | 2 +- + src/gstticodecs_dm6467t.c | 69 ++++++++++++++ + src/gsttidmaivideosink.c | 25 ++++- + src/gsttividdec2.c | 73 ++++++++------- + src/gsttividenc1.c | 10 ++- + src/gsttividresize.c | 4 + + 13 files changed, 380 insertions(+), 252 deletions(-) + create mode 100644 src/gstticodecplugin_dm6467t.cfg + create mode 100644 src/gstticodecs_dm6467t.c + +diff --git a/Makefile.external b/Makefile.external +index ca14b49..1f67783 100644 +--- a/Makefile.external ++++ b/Makefile.external +@@ -3,8 +3,7 @@ + # + # The only customization required below is defining the DVSDK_PATH + # and, if your DVSDK doesn't include DMAI, the set DMAI_INSTALL_DIR variable +-# appropriately. If your DVSDK does include DMAI, then delete the line +-# setting the DMAI_INSTALL_DIR variable below. ++# appropriately. + # + # Copyright (C) 2009 Ridgerun + # +@@ -17,15 +16,16 @@ DMAI_INSTALL_DIR=undefined + ifeq ($(DVSDK_PATH),undefined) + $(error You need to define the environment variable DVSDK_PATH) + endif ++include $(DVSDK_PATH)/Rules.make ++ + ifeq ($(DMAI_INSTALL_DIR),undefined) + $(error You need to define the environment variable DMAI_INSTALL_DIR) + endif + + default: +- @echo "Please specify the target: dm6446, omap3530, dm355, dm6467, dm365" ++ @echo "Please specify the target: dm6446, omap3530, dm355, dm6467, dm6467t, dm365" + +-include $(DVSDK_PATH)/Rules.make +-export PLATFORM=$(MAKECMDGOALS) ++export GST_TI_PLATFORM=$(MAKECMDGOALS) + export BIOS_INSTALL_DIR + export CE_INSTALL_DIR + export CMEM_INSTALL_DIR +@@ -33,6 +33,7 @@ export CODEC_INSTALL_DIR + export DMAI_INSTALL_DIR + export FC_INSTALL_DIR + export LINK_INSTALL_DIR ++export LINK_XDC_ROOT = $(LINK_INSTALL_DIR)/packages + export LINUXKERNEL_INSTALL_DIR + export LPM_INSTALL_DIR + export MVTOOL_DIR +@@ -41,34 +42,49 @@ export XDAIS_INSTALL_DIR + export XDC_INSTALL_DIR + export EDMA3_LLD_INSTALL_DIR + +-ifeq ($(PLATFORM), dm355) +- export XDC_TARGET = gnu.targets.MVArm9 +- export XDC_PLATFORM = ti.platforms.evmDM355 ++ifeq ($(GST_TI_PLATFORM), dm355) ++ export XDC_TARGET = gnu.targets.arm.GCArmv5T ++ export XDC_PLATFORM = ti.platforms.evmDM355 ++ export MVTOOL_PREFIX = $(CSTOOL_PREFIX) ++ export MVTOOL_DIR = $(CSTOOL_DIR) ++ export PLATFORM_XDC = ${XDC_PLATFORM} + endif + +-ifeq ($(PLATFORM), dm6446) ++ifeq ($(GST_TI_PLATFORM), dm6446) + export XDC_TARGET = gnu.targets.MVArm9 + export XDC_PLATFORM = ti.platforms.evmDM6446 + endif + +-ifeq ($(PLATFORM), dm6467) ++ifeq ($(GST_TI_PLATFORM), dm6467) + export XDC_TARGET = gnu.targets.MVArm9 + export XDC_PLATFORM = ti.platforms.evmDM6467 + endif + +-ifeq ($(PLATFORM), dm365) +- export XDC_TARGET = gnu.targets.MVArm9 +- export XDC_PLATFORM = ti.platforms.evmDM365 ++ifeq ($(GST_TI_PLATFORM), dm6467t) ++ export XDC_TARGET = gnu.targets.arm.GCArmv5T ++ export XDC_PLATFORM = ti.platforms.evmDM6467 ++ export LINK_XDC_ROOT = $(LINK_INSTALL_DIR) ++ export MVTOOL_PREFIX = $(CSTOOL_PREFIX) ++ export MVTOOL_DIR = $(CSTOOL_DIR) ++ export PLATFORM_XDC = ${XDC_PLATFORM} + endif + +-ifeq ($(PLATFORM), omap3530) ++ifeq ($(GST_TI_PLATFORM), dm365) ++ export XDC_TARGET = gnu.targets.arm.GCArmv5T ++ export XDC_PLATFORM = ti.platforms.evmDM365 ++ export MVTOOL_PREFIX = $(CSTOOL_PREFIX) ++ export MVTOOL_DIR = $(CSTOOL_DIR) ++ export PLATFORM_XDC = ${XDC_PLATFORM} ++endif ++ ++ifeq ($(GST_TI_PLATFORM), omap3530) + export XDC_TARGET = gnu.targets.arm.GCArmv5T + export XDC_PLATFORM = ti.platforms.evm3530 + export MVTOOL_PREFIX = $(CSTOOL_PREFIX) + export MVTOOL_DIR = $(CSTOOL_DIR) + endif + +-CPPFLAGS=-DPlatform_$(PLATFORM) ++CPPFLAGS=-DPlatform_$(GST_TI_PLATFORM) + HOST=arm-none-linux-gnueabi + + configure: +@@ -86,6 +102,9 @@ dm6446: Makefile + dm6467: Makefile + $(MAKE) -f Makefile + ++dm6467t: Makefile ++ $(MAKE) -f Makefile ++ + dm355: Makefile + $(MAKE) -f Makefile + +diff --git a/src/Makefile.am b/src/Makefile.am +index 231beb0..95973a8 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1,6 +1,6 @@ + # plugindir is set in configure + +-XDC_CONFIG_BASENAME = gstticodecplugin_$(PLATFORM) ++XDC_CONFIG_BASENAME = gstticodecplugin_$(GST_TI_PLATFORM) + plugin_LTLIBRARIES = libgstticodecplugin.la + + # sources used to compile this plug-in +@@ -21,7 +21,7 @@ BUILT_SOURCES = $(XDC_CONFIG_BASENAME)/compiler.opt $(XDC_CONFIG_BASENAME)/linke + XDC_PATH = .;$(XDC_INSTALL_DIR)/packages;$(LINK_XDC_ROOT);$(FC_INSTALL_DIR)/packages;$(CE_INSTALL_DIR)/packages;$(XDAIS_INSTALL_DIR)/packages;$(CODEC_INSTALL_DIR)/packages;$(CMEM_INSTALL_DIR)/packages;$(DMAI_INSTALL_DIR)/packages;$(LPM_INSTALL_DIR)/packages;$(XDC_USER_PATH);$(EDMA3_LLD_INSTALL_DIR)/packages; + + gstticodecs_platform.c : +- ln -s $(srcdir)/gstticodecs_$(PLATFORM).c gstticodecs_platform.c ++ ln -s $(srcdir)/gstticodecs_$(GST_TI_PLATFORM).c gstticodecs_platform.c + + %/compiler.opt %/linker.cmd : %.cfg + XDCPATH="$(XDC_PATH)" $(CONFIGURO) -c $(MVTOOL_DIR) -o $(XDC_CONFIG_BASENAME) -t $(XDC_TARGET) -p $(XDC_PLATFORM) -b $(DMAI_INSTALL_DIR)/packages/config.bld $< +diff --git a/src/gstticodecplugin_dm355.cfg b/src/gstticodecplugin_dm355.cfg +index 7ceae4f..bf533f0 100644 +--- a/src/gstticodecplugin_dm355.cfg ++++ b/src/gstticodecplugin_dm355.cfg +@@ -1,84 +1,59 @@ +-/* +- * Copyright (C) $year Texas Instruments Incorporated - http://www.ti.com/ +- * +- * This program is free software; you can redistribute it and/or modify +- * it under the terms of the GNU Lesser General Public License as +- * published by the Free Software Foundation version 2.1 of the License. +- * +- * This program is distributed #as is# WITHOUT ANY WARRANTY of any kind, +- * whether express or implied; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * Lesser General Public License for more details. +- * +- */ +- +-prog.build.platform = "ti.platforms.evmDM355"; +- +-/* Load support for the Codec Engine OSAL */ +-var osalGlobal = xdc.useModule('ti.sdo.ce.osal.Global'); +- +-/* Configure CE to use it's DSP Link Linux version */ +-osalGlobal.runtimeEnv = osalGlobal.LINUX; +- +-/* +- * ======== Engine Configuration ======== +- */ +-var viddec = xdc.module('ti.sdo.ce.video2.IVIDDEC2'); +-var imgenc = xdc.module('ti.sdo.ce.image1.IIMGENC1'); +-var MPEG4DEC = xdc.useModule('ti.sdo.codecs.mpeg4dec.dm355.ce.MPEG4DEC'); +-var MPEG4ENC = xdc.useModule('ti.sdo.codecs.mpeg4enc.dm355.ce.MPEG4ENC'); +-var JPEGENC = xdc.useModule('ti.sdo.codecs.jpegenc.dm355.ce.JPEGENC'); +-var JPEGDEC = xdc.useModule('ti.sdo.codecs.jpegdec.dm355.ce.JPEGDEC'); +- +-var Engine = xdc.useModule('ti.sdo.ce.Engine'); +-var decodeEngine = Engine.create("decode", [ +- {name: "mpeg4dec", mod: MPEG4DEC, local: true, groupId: 1}, +- {name: "jpegdec", mod: JPEGDEC, local: true, groupId: 1}, +-]); +- +-var encodeEngine = Engine.create("encode", [ +- {name: "mpeg4enc", mod: MPEG4ENC, local: true, groupId: 1}, +- {name: "jpegenc", mod: JPEGENC, local: true, groupId: 1}, +-]); +- +-/* Load support for the 'Davinci Multimedia Application Interface' modules */ +-var DMAI = xdc.loadPackage('ti.sdo.dmai'); +- +-/* +- * ======== DMAN3 Configuration ======== +- */ +- +-var DMAN3 = xdc.useModule('ti.sdo.fc.dman3.DMAN3'); +- +-/* give DMAN3 all TCCs except those hard-coded by The JPEG & MPEG Enc & Decs */ +- +-/* +- * For the 32-63 range, configure tccAllocationMaskH to exclude used channels +- * JPEG Dec: {33-47, 52-57} +- * JPEG Enc: {34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49} +- * MPEG Dec: {32-63} +- * MPEG Enc: {12, 13, 34, 35, 40,41,42,43,44,45,46,47,48,49,50,52,53, +- * 54,55,56,57,63} +- */ +-DMAN3.tccAllocationMaskH = 0x0; /* everthing 32-63 hardcoded and unavailable */ +- +-/* Give DMAN3 all lower TCCs except what's taken by Linux kernel and a Codec: +- * Based on the info from montavista: {2, 3, 8, 9, 26, 27, 30, 31} +- * and MPEG Enc taking up: {12, 13} +- */ +-DMAN3.tccAllocationMaskL = 0x33ffccf3; +- +-/* Following assignments will give DMAN3 control of PaRAMs above 78: */ +-DMAN3.paRamBaseIndex = 64; +-DMAN3.numPaRamEntries = 48; +-DMAN3.nullPaRamIndex = 127; +- +-/* Configure Scratch Group's DMAN3 resources */ +-DMAN3.numTccGroup[1] = 0; +-DMAN3.numPaRamGroup[1] = 32; +- +-DMAN3.qdmaChannels = [0, 1, 2, 3, 4, 5, 6, 7]; +-DMAN3.maxQdmaChannels = 8; +-DMAN3.numQdmaChannels = 8; +-DMAN3.maxTCs = 2; +- ++/* ===========================================================================
++ * Copyright (c) Texas Instruments Incorporated 2009
++ *
++ * Use of this software is controlled by the terms and conditions found in
++ * the license agreement under which this software has been supplied or
++ * provided.
++ * ===========================================================================
++ */
++
++/* Load support for the Codec Engine OSAL */
++var osalGlobal = xdc.useModule('ti.sdo.ce.osal.Global');
++
++/* Configure CE to use it's DSP Link Linux version */
++osalGlobal.runtimeEnv = osalGlobal.LINUX;
++
++/* Configure RMAN */
++var RMAN = xdc.useModule('ti.sdo.fc.rman.RMAN');
++RMAN.useDSKT2 = false;
++RMAN.persistentAllocFxn = "__ALG_allocMemory";
++RMAN.persistentFreeFxn = "__ALG_freeMemory";
++RMAN.semCreateFxn = "Sem_create";
++RMAN.semDeleteFxn = "Sem_delete";
++RMAN.semPendFxn = "Sem_pend";
++RMAN.semPostFxn = "Sem_post";
++RMAN.tableSize = 10;
++
++var EDMA3 = xdc.useModule('ti.sdo.fc.edma3.Settings');
++var EDMA3CHAN = xdc.useModule('ti.sdo.fc.ires.edma3chan.EDMA3CHAN');
++var EDMA = xdc.useModule('ti.sdo.linuxutils.edma.EDMA');
++var VICPLU = xdc.useModule('ti.sdo.linuxutils.vicp.VICP');
++var VICP = xdc.useModule('ti.sdo.fc.ires.vicp.VICP2');
++var VICPSYNC = xdc.useModule('ti.sdo.fc.vicpsync.VICPSYNC');
++var ADDRSPACE = xdc.useModule('ti.sdo.fc.ires.addrspace.ADDRSPACE');
++var CMEM = xdc.useModule('ti.sdo.linuxutils.cmem.CMEM');
++
++/*
++ * ======== Engine Configuration ========
++ */
++var viddec = xdc.module('ti.sdo.ce.video2.IVIDDEC2');
++var auddec = xdc.module('ti.sdo.ce.audio.IAUDDEC');
++var videnc = xdc.module('ti.sdo.ce.video1.IVIDENC1');
++var audenc = xdc.module('ti.sdo.ce.audio.IAUDENC');
++
++var MPEG4DEC = xdc.useModule('ti.sdo.codecs.mpeg4dec.ce.MPEG4DEC');
++var JPEGDEC = xdc.useModule('ti.sdo.codecs.jpegdec.ce.JPEGDEC');
++var MPEG4ENC = xdc.useModule('ti.sdo.codecs.mpeg4enc.ce.MPEG4ENC');
++var JPEGENC = xdc.useModule('ti.sdo.codecs.jpegenc.ce.JPEGENC');
++
++var Engine = xdc.useModule('ti.sdo.ce.Engine');
++var myEngine = Engine.create("codecServer", [
++ {name: "mpeg4dec", mod: MPEG4DEC, local: true, groupId: 1},
++ {name: "jpegdec", mod: JPEGDEC, local: true, groupId: 1},
++ {name: "mpeg4enc", mod: MPEG4ENC, local: true, groupId: 1},
++ {name: "jpegenc", mod: JPEGENC, local: true, groupId: 1}
++]);
++
++/* Load support for the 'Davinci Multimedia Application Interface' modules */
++var DMAI = xdc.loadPackage('ti.sdo.dmai');
++
+diff --git a/src/gstticodecplugin_dm365.cfg b/src/gstticodecplugin_dm365.cfg +index 6442dce..0e94a35 100644 +--- a/src/gstticodecplugin_dm365.cfg ++++ b/src/gstticodecplugin_dm365.cfg +@@ -1,99 +1,86 @@ +-/* +- * Copyright (C) $year Texas Instruments Incorporated - http://www.ti.com/ +- * +- * This program is free software; you can redistribute it and/or modify +- * it under the terms of the GNU Lesser General Public License as +- * published by the Free Software Foundation version 2.1 of the License. +- * +- * This program is distributed #as is# WITHOUT ANY WARRANTY of any kind, +- * whether express or implied; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * Lesser General Public License for more details. +- * +- */ +- +-prog.build.platform = "ti.platforms.evmDM365"; +- +-/* Load support for the Codec Engine OSAL */ +-var osalGlobal = xdc.useModule('ti.sdo.ce.osal.Global'); +- +-/* Configure CE to use it's DSP Link Linux version */ +-osalGlobal.runtimeEnv = osalGlobal.LINUX; +- +-/* +- * ======== Engine Configuration ======== +- */ +-var videnc = xdc.module('ti.sdo.ce.video1.IVIDENC1'); +-var viddec = xdc.module('ti.sdo.ce.video2.IVIDDEC2'); +- +-var MPEG4ENC = xdc.useModule('ti.sdo.codecs.mpeg4enc.ce.MPEG4ENC'); +-var H264ENC = xdc.useModule('ti.sdo.codecs.h264enc.ce.H264ENC'); +-var MPEG4DEC = xdc.useModule('ti.sdo.codecs.mpeg4dec.ce.MPEG4DEC'); +-var H264DEC = xdc.useModule('ti.sdo.codecs.h264dec.ce.H264DEC'); +-var JPEGENC = xdc.useModule('ti.sdo.codecs.jpegenc.ce.JPEGENC'); +-var JPEGDEC = xdc.useModule('ti.sdo.codecs.jpegdec.ce.JPEGDEC'); +- +-var Engine = xdc.useModule('ti.sdo.ce.Engine'); +-var encodeEngine = Engine.create("encode", [ +- {name: "mpeg4enc", mod: MPEG4ENC, local: true, groupId: 1}, +- {name: "h264enc", mod: H264ENC, local: true, groupId: 1}, +- {name: "jpegenc", mod: JPEGENC, local: true, groupId: 1}, +-]); +-var decodeEngine = Engine.create("decode", [ +- {name: "mpeg4dec", mod: MPEG4DEC, local: true, groupId: 1}, +- {name: "h264dec", mod: H264DEC, local: true, groupId: 1}, +- {name: "jpegdec", mod: JPEGDEC, local: true, groupId: 1}, +-]); +- +-/* Load support for the 'Davinci Multimedia Application Interface' modules */ +-var DMAI = xdc.loadPackage('ti.sdo.dmai'); +- +-/* Load support for SimpleWidget */ +-/*var SW = xdc.loadPackage('ti.sdo.simplewidget');*/ +- +- +-/* Configure RMAN */ +-var RMAN = xdc.useModule('ti.sdo.fc.rman.RMAN'); +-RMAN.useDSKT2 = false; +-RMAN.persistentAllocFxn = "__ALG_allocMemory"; +-RMAN.persistentFreeFxn = "__ALG_freeMemory"; +-RMAN.semCreateFxn = "Sem_create"; +-RMAN.semDeleteFxn = "Sem_delete"; +-RMAN.semPendFxn = "Sem_pend"; +-RMAN.semPostFxn = "Sem_post"; +-RMAN.tableSize = 10; +- +-/* Configure VICPSYNC */ +-var VICPSYNC = xdc.useModule('ti.sdo.fc.vicpsync.VICPSYNC'); +- +-/* Configure HDVICPSYNC */ +-var HDVICPSYNC = xdc.useModule('ti.sdo.fc.hdvicpsync.HDVICPSYNC'); +- +-/* Configure MEMUTILS */ +-var MEMUTILS = xdc.useModule('ti.sdo.fc.memutils.MEMUTILS'); +- +-var EDMA3 = xdc.useModule('ti.sdo.fc.edma3.Settings'); +- +-var HDVICP = xdc.useModule('ti.sdo.fc.ires.hdvicp.HDVICP'); +- +-var VICP = xdc.useModule('ti.sdo.fc.ires.vicp.VICP2'); +- +-var ADDRSPACE = xdc.useModule('ti.sdo.fc.ires.addrspace.ADDRSPACE'); +- +-var EDMA3CHAN = xdc.useModule('ti.sdo.fc.ires.edma3chan.EDMA3CHAN'); +- +-var LSP = xdc.useModule('ti.sdo.linuxutils.edma.EDMA'); +- +-var CMEM = xdc.useModule('ti.sdo.linuxutils.cmem.CMEM'); +- +- +-/* Uncomment these lines if you wish to debug FC and enable FC trace */ +- +-/* +-xdc.loadPackage('ti.sdo.fc.ires.vicp').profile = "debug_trace"; +-xdc.loadPackage('ti.sdo.fc.ires.edma3chan').profile = "debug_trace"; +-xdc.loadPackage('ti.sdo.fc.rman').profile = "debug_trace"; +-xdc.loadPackage('ti.sdo.fc.edma3').profile = "debug_trace"; +-EDMA3CHAN.trace = true; +-EDMA3CHAN.debug = true; +-*/ ++/* ============================================================================
++ * Copyright (c) Texas Instruments Incorporated 2009
++ *
++ * Use of this software is controlled by the terms and conditions found in the
++ * license agreement under which this software has been supplied or provided.
++ * ============================================================================
++ */
++
++/* Load support for the Codec Engine OSAL */
++var osalGlobal = xdc.useModule('ti.sdo.ce.osal.Global');
++
++/* Configure CE to use it's DSP Link Linux version */
++osalGlobal.runtimeEnv = osalGlobal.LINUX;
++
++/*
++ * ======== Engine Configuration ========
++ */
++var viddec = xdc.module('ti.sdo.ce.video2.IVIDDEC2');
++var auddec = xdc.module('ti.sdo.ce.audio.IAUDDEC');
++
++var MPEG4DEC = xdc.useModule('ti.sdo.codecs.mpeg4dec_hdvicp.ce.MPEG4DEC_HDVICP');
++var MPEG2DEC = xdc.useModule('ti.sdo.codecs.mpeg2dec.ce.MPEG2DEC');
++var H264DEC = xdc.useModule('ti.sdo.codecs.h264dec.ce.H264DEC');
++var MPEG4ENC = xdc.useModule('ti.sdo.codecs.mpeg4enc_hdvicp.ce.MPEG4ENC_HDVICP');
++var MPEG2ENC = xdc.useModule('ti.sdo.codecs.mpeg2enc.ce.MPEG2ENC');
++var H264ENC = xdc.useModule('ti.sdo.codecs.h264enc.ce.H264ENC');
++
++var Engine = xdc.useModule('ti.sdo.ce.Engine');
++var myEngine = Engine.create("codecServer", [
++ {name: "mpeg4dec", mod: MPEG4DEC, local: true, groupId: 1},
++ {name: "mpeg2dec", mod: MPEG2DEC, local: true, groupId: 1},
++ {name: "h264dec", mod: H264DEC, local: true, groupId: 1},
++ {name: "mpeg4enc", mod: MPEG4ENC, local: true, groupId: 1},
++ {name: "mpeg2enc", mod: MPEG2ENC, local: true, groupId: 1},
++ {name: "h264enc", mod: H264ENC, local: true, groupId: 1},
++]);
++
++
++
++/* Load support for the 'Davinci Multimedia Application Interface' modules */
++var DMAI = xdc.loadPackage('ti.sdo.dmai');
++
++/* Configure RMAN */
++var RMAN = xdc.useModule('ti.sdo.fc.rman.RMAN');
++RMAN.useDSKT2 = false;
++RMAN.persistentAllocFxn = "__ALG_allocMemory";
++RMAN.persistentFreeFxn = "__ALG_freeMemory";
++RMAN.semCreateFxn = "Sem_create";
++RMAN.semDeleteFxn = "Sem_delete";
++RMAN.semPendFxn = "Sem_pend";
++RMAN.semPostFxn = "Sem_post";
++RMAN.tableSize = 10;
++
++/* Configure VICPSYNC */
++var VICPSYNC = xdc.useModule('ti.sdo.fc.vicpsync.VICPSYNC');
++
++/* Configure HDVICPSYNC */
++var HDVICPSYNC = xdc.useModule('ti.sdo.fc.hdvicpsync.HDVICPSYNC');
++
++/* Configure MEMUTILS */
++var MEMUTILS = xdc.useModule('ti.sdo.fc.memutils.MEMUTILS');
++
++var EDMA3 = xdc.useModule('ti.sdo.fc.edma3.Settings');
++
++var HDVICP = xdc.useModule('ti.sdo.fc.ires.hdvicp.HDVICP');
++
++var VICP = xdc.useModule('ti.sdo.fc.ires.vicp.VICP2');
++
++var EDMA3CHAN = xdc.useModule('ti.sdo.fc.ires.edma3chan.EDMA3CHAN');
++
++var EDMA = xdc.useModule('ti.sdo.linuxutils.edma.EDMA');
++
++var ADDRSPACE = xdc.useModule('ti.sdo.fc.ires.addrspace.ADDRSPACE');
++
++var CMEM = xdc.useModule('ti.sdo.linuxutils.cmem.CMEM');
++
++/* Uncomment these lines if you wish to debug FC and enable FC trace */
++/*
++/*
++xdc.loadPackage('ti.sdo.fc.ires.vicp').profile = "debug_trace";
++xdc.loadPackage('ti.sdo.fc.ires.edma3chan').profile = "debug_trace";
++xdc.loadPackage('ti.sdo.fc.rman').profile = "debug_trace";
++xdc.loadPackage('ti.sdo.fc.edma3').profile = "debug_trace";
++EDMA3CHAN.trace = true;
++EDMA3CHAN.debug = true;
++*/
+diff --git a/src/gstticodecplugin_dm6467t.cfg b/src/gstticodecplugin_dm6467t.cfg +new file mode 100644 +index 0000000..686cfeb +--- /dev/null ++++ b/src/gstticodecplugin_dm6467t.cfg +@@ -0,0 +1,34 @@ ++/* ============================================================================ ++ * Copyright (c) Texas Instruments Incorporated 2009 ++ * ++ * Use of this software is controlled by the terms and conditions found in the ++ * license agreement under which this software has been supplied or provided. ++ * ============================================================================ ++ */ ++ ++/* Load support for the Codec Engine OSAL */ ++var osalGlobal = xdc.useModule('ti.sdo.ce.osal.Global'); ++var os = xdc.useModule('ti.sdo.ce.osal.linux.Settings'); ++osalGlobal.os = os; ++ ++/* Configure CE to use it's DSP Link Linux version */ ++var ipc = xdc.useModule('ti.sdo.ce.ipc.Settings'); ++ipc.commType = ipc.COMM_DSPLINK; ++ ++/* ++ * ======== Engine Configuration ======== ++ */ ++var Engine = xdc.useModule('ti.sdo.ce.Engine'); ++var demoEngine = Engine.createFromServer( ++ "codecServer", ++ "./bin/cs.x64P", ++ "ti.sdo.server.cs" ++ ); ++ ++var combopath = "" + java.lang.System.getenv("CODEC_SERVER"); ++if (combopath != "" && combopath != "null") { ++ demoEngine.server = java.lang.System.getenv("CODEC_SERVER"); ++} ++ ++/* Load support for the 'Davinci Multimedia Application Interface' modules */ ++var DMAI = xdc.loadPackage('ti.sdo.dmai'); +diff --git a/src/gstticodecs_dm355.c b/src/gstticodecs_dm355.c +index a372b06..9d4325b 100644 +--- a/src/gstticodecs_dm355.c ++++ b/src/gstticodecs_dm355.c +@@ -22,8 +22,7 @@ + #include "gstticodecs.h" + + /* Declaration of the production engine and decoders shipped with the DVSDK */ +-static Char decodeEngine[] = "decode"; +-static Char encodeEngine[] = "encode"; ++static Char codecServer[] = "codecServer"; + + /* NULL terminated list of speech decoders in the engine to use in the demo */ + GstTICodec gst_ticodec_codecs[] = { +@@ -32,25 +31,25 @@ GstTICodec gst_ticodec_codecs[] = { + { + "MPEG4 Video Decoder", /* String name of codec used by plugin */ + "mpeg4dec", /* String name of codec used by CE */ +- decodeEngine /* Engine that contains this codec */ ++ codecServer /* Engine that contains this codec */ + }, + + { + "MPEG4 Video Encoder", /* String name of codec used by plugin */ + "mpeg4enc", /* String name of codec used by CE */ +- encodeEngine /* Engine that contains this codec */ ++ codecServer /* Engine that contains this codec */ + }, + + /* Imaging Codecs */ + { + "JPEG Image Encoder", + "jpegenc", +- encodeEngine ++ codecServer + }, + { + "JPEG Image Decoder", + "jpegdec", +- decodeEngine ++ codecServer + }, + + { NULL } +diff --git a/src/gstticodecs_dm365.c b/src/gstticodecs_dm365.c +index 9572403..cf81e6f 100644 +--- a/src/gstticodecs_dm365.c ++++ b/src/gstticodecs_dm365.c +@@ -22,8 +22,7 @@ + #include "gstticodecs.h" + + /* Declaration of the production engine and decoders shipped with the DVSDK */ +-static Char decodeEngine[] = "decode"; +-static Char encodeEngine[] = "encode"; ++static Char codecServer[] = "codecServer"; + + /* NULL terminated list of speech decoders in the engine to use in the demo */ + GstTICodec gst_ticodec_codecs[] = { +@@ -32,25 +31,37 @@ GstTICodec gst_ticodec_codecs[] = { + { + "MPEG4 Video Decoder", /* String name of codec used by plugin */ + "mpeg4dec", /* String name of codec used by CE */ +- decodeEngine /* Engine that contains this codec */ ++ codecServer /* Engine that contains this codec */ ++ }, ++ ++ { ++ "MPEG2 Video Decoder", /* String name of codec used by plugin */ ++ "mpeg2dec", /* String name of codec used by CE */ ++ codecServer /* Engine that contains this codec */ + }, + + { + "MPEG4 Video Encoder", /* String name of codec used by plugin */ + "mpeg4enc", /* String name of codec used by CE */ +- encodeEngine /* Engine that contains this codec */ ++ codecServer /* Engine that contains this codec */ ++ }, ++ ++ { ++ "MPEG2 Video Encoder", /* String name of codec used by plugin */ ++ "mpeg2enc", /* String name of codec used by CE */ ++ codecServer /* Engine that contains this codec */ + }, + + { + "H.264 Video Decoder", /* String name of codec used by plugin */ + "h264dec", /* String name of codec used by CE */ +- decodeEngine /* Engine that contains this codec */ ++ codecServer /* Engine that contains this codec */ + }, + + { + "H.264 Video Encoder", /* String name of codec used by plugin */ + "h264enc", /* String name of codec used by CE */ +- encodeEngine /* Engine that contains this codec */ ++ codecServer /* Engine that contains this codec */ + }, + + { NULL } +diff --git a/src/gstticodecs_dm6467.c b/src/gstticodecs_dm6467.c +index b9b0499..cbb6520 100644 +--- a/src/gstticodecs_dm6467.c ++++ b/src/gstticodecs_dm6467.c +@@ -1,5 +1,5 @@ + /* +- * gstticodecs_dm6446.c ++ * gstticodecs_dm6467.c + * + * This file provides information for available codecs on the DM6446 platform. + * +diff --git a/src/gstticodecs_dm6467t.c b/src/gstticodecs_dm6467t.c +new file mode 100644 +index 0000000..fe597d5 +--- /dev/null ++++ b/src/gstticodecs_dm6467t.c +@@ -0,0 +1,69 @@ ++/* ++ * gstticodecs_dm6467t.c ++ * ++ * This file provides information for available codecs on the DM6446 platform. ++ * ++ * Original Author: ++ * Don Darling, Texas Instruments, Inc. ++ * ++ * Copyright (C) $year Texas Instruments Incorporated - http://www.ti.com/ ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU Lesser General Public License as ++ * published by the Free Software Foundation version 2.1 of the License. ++ * ++ * This program is distributed #as is# WITHOUT ANY WARRANTY of any kind, ++ * whether express or implied; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ */ ++ ++#include "gstticodecs.h" ++ ++/* Declaration of the production engine and decoders shipped with the DVSDK */ ++static Char codecServer[] = "codecServer"; ++ ++/* NULL terminated list of speech decoders in the engine to use in the demo */ ++GstTICodec gst_ticodec_codecs[] = { ++ ++ /* Speech Codecs */ ++ { ++ "G.711 Speech Decoder", /* String name of codec used by plugin */ ++ "g711dec", /* String name of codec used by CE */ ++ codecServer /* Engine that contains this codec */ ++ }, { ++ "G.711 Speech Encoder", /* String name of codec used by plugin */ ++ "g711enc", /* String name of codec used by CE */ ++ codecServer /* Engine that contains this codec */ ++ }, ++ ++ /* Audio Codecs */ ++ { ++ "AAC Audio Decoder", /* String name of codec used by plugin */ ++ "aachedec", /* String name of codec used by CE */ ++ codecServer /* Engine that contains this codec */ ++ }, ++ ++ /* Video Codecs */ ++ { ++ "H.264 Video Decoder", /* String name of codec used by plugin */ ++ "h264dec", /* String name of codec used by CE */ ++ codecServer /* Engine that contains this codec */ ++ }, { ++ "H.264 BP/HP Decoder", /* Name of codec used by plugin */ ++ "h2641080p60vdec", /* String name of codec used by CE */ ++ codecServer /* Engine that contains this codec */ ++ }, { ++ "H.264 Video Encoder", /* String name of codec used by plugin */ ++ "h264enc", /* String name of codec used by CE */ ++ codecServer /* Engine that contains this codec */ ++ }, { ++ "MPEG2 Video Decoder", /* String name of codec used by plugin */ ++ "mpeg2dec", /* String name of codec used by CE */ ++ codecServer /* Engine that contains this codec */ ++ }, ++ ++ { NULL } ++}; ++ +diff --git a/src/gsttidmaivideosink.c b/src/gsttidmaivideosink.c +index 5f6a5b3..81bdac7 100644 +--- a/src/gsttidmaivideosink.c ++++ b/src/gsttidmaivideosink.c +@@ -32,11 +32,12 @@ + /* Define sink (input) pad capabilities. + * + * UYVY - YUV 422 interleaved corresponding to V4L2_PIX_FMT_UYVY in v4l2 +- * Y8C8 - YUV 422 semi planar. The dm6467 VDCE outputs this format after a ++ * NV16 - YUV 422 semi planar. The dm6467 VDCE outputs this format after a + * color conversion.The format consists of two planes: one with the + * Y component and one with the CbCr components interleaved (hence semi) * + * See the LSP VDCE documentation for a thorough description of this + * format. ++ * Y8C8 - Same as NV16. Y8C8 was used in MVL-based LSPs. + * NV12 - YUV 420 semi planar corresponding to V4L2_PIX_FMT_NV12 in v4l2. + * The format consists of two planes: one with the + * Y component and one with the CbCr components interleaved with +@@ -62,6 +63,11 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ( + "width=(int)[ 1, MAX ], " + "height=(int)[ 1, MAX ];" + "video/x-raw-yuv, " ++ "format=(fourcc)NV16, " ++ "framerate=(fraction)[ 0, MAX ], " ++ "width=(int)[ 1, MAX ], " ++ "height=(int)[ 1, MAX ];" ++ "video/x-raw-yuv, " + "format=(fourcc)NV12, " + "framerate=(fraction)[ 0, MAX ], " + "width=(int)[ 1, MAX ], " +@@ -219,7 +225,7 @@ static void gst_tidmaivideosink_class_init(GstTIDmaiVideoSinkClass * klass) + "Video Standard used\n" + "\tAUTO (if supported), CIF, SIF_NTSC, SIF_PAL, VGA, D1_NTSC\n" + "\tD1_PAL, 480P, 576P, 720P_60, 720P_50, 1080I_30, 1080I_25\n" +- "\t1080P_30, 1080P_25, 1080P_24\n", ++ "\t1080P_30, 1080P_60, 1080P_25, 1080P_24\n", + NULL, G_PARAM_READWRITE)); + + g_object_class_install_property(gobject_class, PROP_VIDEOOUTPUT, +@@ -661,6 +667,9 @@ static int gst_tidmaivideosink_videostd_get_attrs(VideoStd_Type videoStd, + break; + case VideoStd_480P: + case VideoStd_720P_60: ++ #if defined(Platform_dm6467t) ++ case VideoStd_1080P_60: ++ #endif + vattrs->framerate = 60; + break; + +@@ -715,6 +724,9 @@ static int gst_tidmaivideosink_videostd_get_refresh_latency( + + case VideoStd_480P: + case VideoStd_720P_60: ++ #if defined(Platform_dm6467t) ++ case VideoStd_1080P_60: ++ #endif + return 16667; + + #if defined(Platform_omap3530) +@@ -949,6 +961,10 @@ static int gst_tidmaivideosink_convert_attrs(int attr, + return VideoStd_1080P_25; + else if (!strcmp(sink->videoStd, "1080P_24")) + return VideoStd_1080P_24; ++ #if defined(Platform_dm6467t) ++ else if (!strcmp(sink->videoStd, "1080P_60")) ++ return VideoStd_1080P_60; ++ #endif + #if defined(Platform_omap3530) + else if (!strcmp(sink->videoStd, "VGA")) + return VideoStd_VGA; +@@ -958,7 +974,7 @@ static int gst_tidmaivideosink_convert_attrs(int attr, + "Please choose from:\n" + "\tAUTO (if supported), CIF, SIF_NTSC, SIF_PAL, VGA, D1_NTSC\n" + "\tD1_PAL, 480P, 576P, 720P_60, 720P_50, 1080I_30, 1080I_25\n" +- "\t1080P_30, 1080P_25, 1080P_24\n", sink->videoStd); ++ "\t1080P_30, 1080P_60, 1080P_25, 1080P_24\n", sink->videoStd); + return -1; + } + break; +@@ -1307,14 +1323,13 @@ static gboolean gst_tidmaivideosink_process_caps(GstBaseSink * bsink, + case GST_MAKE_FOURCC('U', 'Y', 'V', 'Y'): + inBufColorSpace = ColorSpace_UYVY; + break; ++ case GST_MAKE_FOURCC('N', 'V', '1', '6'): + case GST_MAKE_FOURCC('Y', '8', 'C', '8'): + inBufColorSpace = ColorSpace_YUV422PSEMI; + break; +- #if defined(Platform_dm365) + case GST_MAKE_FOURCC('N', 'V', '1', '2'): + inBufColorSpace = ColorSpace_YUV420PSEMI; + break; +- #endif + default: + GST_ERROR("unsupported fourcc\n"); + return FALSE; +diff --git a/src/gsttividdec2.c b/src/gsttividdec2.c +index 0804065..79b28a5 100644 +--- a/src/gsttividdec2.c ++++ b/src/gsttividdec2.c +@@ -674,16 +674,8 @@ static gboolean gst_tividdec2_set_source_caps( + given buffer */ + BufferGfx_getDimensions(hBuf, &dim); + +-#if !defined(Platform_dm365) +- caps = +- gst_caps_new_simple("video/x-raw-yuv", +- "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC('U','Y','V','Y'), +- "framerate", GST_TYPE_FRACTION, viddec2->framerateNum, +- viddec2->framerateDen, +- "width", G_TYPE_INT, dim.width, +- "height", G_TYPE_INT, dim.height, +- NULL); +-#else ++#if defined(Platform_dm365) || defined(Platform_dm6467) || \ ++ defined(Platform_dm6467t) + caps = + gst_caps_new_simple("video/x-raw-yuv", + "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC('N','V','1','2'), +@@ -692,6 +684,15 @@ static gboolean gst_tividdec2_set_source_caps( + "width", G_TYPE_INT, dim.width, + "height", G_TYPE_INT, dim.height, + NULL); ++#else ++ caps = ++ gst_caps_new_simple("video/x-raw-yuv", ++ "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC('U','Y','V','Y'), ++ "framerate", GST_TYPE_FRACTION, viddec2->framerateNum, ++ viddec2->framerateDen, ++ "width", G_TYPE_INT, dim.width, ++ "height", G_TYPE_INT, dim.height, ++ NULL); + #endif + + /* Set the source pad caps */ +@@ -1227,29 +1228,35 @@ static gboolean gst_tividdec2_codec_start (GstTIViddec2 *viddec2) + + /* Set up codec parameters depending on device */ + switch(device) { +- case Cpu_Device_DM6467: +- params.forceChromaFormat = XDM_YUV_420P; +- params.maxWidth = VideoStd_1080I_WIDTH; +- params.maxHeight = VideoStd_1080I_HEIGHT + 8; +- colorSpace = ColorSpace_YUV420PSEMI; +- defaultNumBufs = 5; +- break; +-#if defined(Platform_dm365) +- case Cpu_Device_DM365: +- params.forceChromaFormat = XDM_YUV_420SP; +- params.maxWidth = VideoStd_720P_WIDTH; +- params.maxHeight = VideoStd_720P_HEIGHT; +- colorSpace = ColorSpace_YUV420PSEMI; +- defaultNumBufs = 5; +- break; +-#endif +- default: +- params.forceChromaFormat = XDM_YUV_422ILE; +- params.maxWidth = VideoStd_D1_WIDTH; +- params.maxHeight = VideoStd_D1_PAL_HEIGHT; +- colorSpace = ColorSpace_UYVY; +- defaultNumBufs = 3; +- break; ++ case Cpu_Device_DM6467: ++ #if defined(Platform_dm6467t) ++ params.forceChromaFormat = XDM_YUV_420SP; ++ params.maxFrameRate = 60000; ++ params.maxBitRate = 30000000; ++ #else ++ params.forceChromaFormat = XDM_YUV_420P; ++ #endif ++ params.maxWidth = VideoStd_1080I_WIDTH; ++ params.maxHeight = VideoStd_1080I_HEIGHT + 8; ++ colorSpace = ColorSpace_YUV420PSEMI; ++ defaultNumBufs = 5; ++ break; ++ #if defined(Platform_dm365) ++ case Cpu_Device_DM365: ++ params.forceChromaFormat = XDM_YUV_420SP; ++ params.maxWidth = VideoStd_720P_WIDTH; ++ params.maxHeight = VideoStd_720P_HEIGHT; ++ colorSpace = ColorSpace_YUV420PSEMI; ++ defaultNumBufs = 4; ++ break; ++ #endif ++ default: ++ params.forceChromaFormat = XDM_YUV_422ILE; ++ params.maxWidth = VideoStd_D1_WIDTH; ++ params.maxHeight = VideoStd_D1_PAL_HEIGHT; ++ colorSpace = ColorSpace_UYVY; ++ defaultNumBufs = 3; ++ break; + } + + GST_LOG("opening video decoder \"%s\"\n", viddec2->codecName); +diff --git a/src/gsttividenc1.c b/src/gsttividenc1.c +index f9c6f1a..2e1fb31 100644 +--- a/src/gsttividenc1.c ++++ b/src/gsttividenc1.c +@@ -133,6 +133,11 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE( + "framerate=(fraction)[ 0, MAX ], " + "width=(int)[ 1, MAX ], " + "height=(int)[ 1, MAX ];" ++ "video/x-raw-yuv, " /* NV16 - YUV422 semi planar */ ++ "format=(fourcc)NV16, " ++ "framerate=(fraction)[ 0, MAX ], " ++ "width=(int)[ 1, MAX ], " ++ "height=(int)[ 1, MAX ];" + "video/x-raw-yuv, " /* NV12 - YUV420 semi planar */ + "format=(fourcc)NV12, " + "framerate=(fraction)[ 0, MAX ], " +@@ -290,7 +295,7 @@ static void gst_tividenc1_class_init(GstTIVidenc1Class *klass) + + g_object_class_install_property(gobject_class, PROP_IN_COLORSPACE, + g_param_spec_string("iColorSpace", "Input colorspace", +- "Input color space (UYVY, Y8C8 or NV12)", ++ "Input color space (UYVY, Y8C8, NV16 or NV12)", + "unspecified", G_PARAM_READWRITE)); + + g_object_class_install_property(gobject_class, PROP_BITRATE, +@@ -456,6 +461,8 @@ static ColorSpace_Type gst_tividenc1_find_colorSpace (const gchar *colorSpace) + { + if (!strcmp(colorSpace, "UYVY")) + return ColorSpace_UYVY; ++ else if (!strcmp(colorSpace, "NV16")) ++ return ColorSpace_YUV422PSEMI; + else if (!strcmp(colorSpace, "Y8C8")) + return ColorSpace_YUV422PSEMI; + else if (!strcmp(colorSpace, "NV12")) +@@ -665,6 +672,7 @@ static gboolean gst_tividenc1_set_sink_caps(GstPad *pad, GstCaps *caps) + videnc1->colorSpace = ColorSpace_UYVY; + break; + ++ case GST_MAKE_FOURCC('N', 'V', '1', '6'): + case GST_MAKE_FOURCC('Y', '8', 'C', '8'): + videnc1->colorSpace = ColorSpace_YUV422PSEMI; + break; +diff --git a/src/gsttividresize.c b/src/gsttividresize.c +index 5757705..c200787 100644 +--- a/src/gsttividresize.c ++++ b/src/gsttividresize.c +@@ -90,6 +90,7 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE( + GST_PAD_ALWAYS, + GST_STATIC_CAPS + ( GST_VIDEO_CAPS_YUV("UYVY")";" ++ GST_VIDEO_CAPS_YUV("NV16")";" + GST_VIDEO_CAPS_YUV("Y8C8")";" + GST_VIDEO_CAPS_YUV("NV12") + ) +@@ -101,6 +102,7 @@ static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE( + GST_PAD_ALWAYS, + GST_STATIC_CAPS + ( GST_VIDEO_CAPS_YUV("UYVY")";" ++ GST_VIDEO_CAPS_YUV("NV16")";" + GST_VIDEO_CAPS_YUV("Y8C8")";" + GST_VIDEO_CAPS_YUV("NV12") + ) +@@ -583,6 +585,7 @@ static GstCaps * gst_tividresize_transform_caps (GstBaseTransform *trans, + int i; + static const guint32 supported_fmt[] = { + GST_MAKE_FOURCC('U','Y','V','Y'), ++ GST_MAKE_FOURCC('N','V','1','6'), + GST_MAKE_FOURCC('Y','8','C','8'), + GST_MAKE_FOURCC('N','V','1','2'), + }; +@@ -649,6 +652,7 @@ ColorSpace_Type gst_tividresize_get_colorSpace (guint32 fourcc) + switch (fourcc) { + case GST_MAKE_FOURCC('U', 'Y', 'V', 'Y'): + return ColorSpace_UYVY; ++ case GST_MAKE_FOURCC('N', 'V', '1', '6'): + case GST_MAKE_FOURCC('Y', '8', 'C', '8'): + return ColorSpace_YUV422PSEMI; + case GST_MAKE_FOURCC('N', 'V', '1', '2'): +-- +1.5.4.3 + diff --git a/recipes/ti/gstreamer-ti/gstreamer-ti-omapl138.patch b/recipes/ti/gstreamer-ti/0002-add-omapl138-support.patch index ca6bf65829..7ddbe648c3 100644 --- a/recipes/ti/gstreamer-ti/gstreamer-ti-omapl138.patch +++ b/recipes/ti/gstreamer-ti/0002-add-omapl138-support.patch @@ -1,7 +1,22 @@ -Index: ticodecplugin/src/gstticodecplugin_omapl138.cfg -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ticodecplugin/src/gstticodecplugin_omapl138.cfg 2010-01-08 09:27:23.529399692 -0600 +From f19ff5f127764d42d497d47bcefeeca1e0af5f28 Mon Sep 17 00:00:00 2001 +From: Brijesh Singh <bksingh@ti.com> +Date: Sun, 9 May 2010 05:23:59 -0500 +Subject: [PATCH] add omapl138 support + +--- + src/gstticodecplugin_omapl138.cfg | 41 +++++++++++++++++++ + src/gstticodecs_omapl138.c | 81 +++++++++++++++++++++++++++++++++++++ + src/gsttidmaivideosink.c | 73 ++++++++++++++++++++++++++------- + src/gsttividenc1.c | 3 + + 4 files changed, 183 insertions(+), 15 deletions(-) + create mode 100644 src/gstticodecplugin_omapl138.cfg + create mode 100644 src/gstticodecs_omapl138.c + +diff --git a/src/gstticodecplugin_omapl138.cfg b/src/gstticodecplugin_omapl138.cfg +new file mode 100644 +index 0000000..af1ad41 +--- /dev/null ++++ b/src/gstticodecplugin_omapl138.cfg @@ -0,0 +1,41 @@ +/* + * Copyright (C) $year Texas Instruments Incorporated - http://www.ti.com/ @@ -44,10 +59,11 @@ Index: ticodecplugin/src/gstticodecplugin_omapl138.cfg + +/* Load support for the DMAI module */ +var DMAI = xdc.loadPackage('ti.sdo.dmai'); -Index: ticodecplugin/src/gstticodecs_omapl138.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ticodecplugin/src/gstticodecs_omapl138.c 2010-01-08 09:27:23.529399692 -0600 +diff --git a/src/gstticodecs_omapl138.c b/src/gstticodecs_omapl138.c +new file mode 100644 +index 0000000..edab54f +--- /dev/null ++++ b/src/gstticodecs_omapl138.c @@ -0,0 +1,81 @@ +/* + * gstticodecs_omapl138.c @@ -130,23 +146,11 @@ Index: ticodecplugin/src/gstticodecs_omapl138.c + vim:set shiftwidth=4: /* Use 4 spaces for >> operations */ + vim:set expandtab: /* Expand tabs into white spaces */ +#endif -Index: ticodecplugin/src/gsttividenc1.c -=================================================================== ---- ticodecplugin.orig/src/gsttividenc1.c 2010-01-07 15:15:37.000000000 -0600 -+++ ticodecplugin/src/gsttividenc1.c 2010-01-08 09:27:23.529399692 -0600 -@@ -1455,6 +1455,7 @@ - #if defined(Platform_omap3530) - case Cpu_Device_OMAP3530: - #endif -+ case Cpu_Device_OMAPL138: - case Cpu_Device_DM6446: - params.inputChromaFormat = XDM_YUV_422ILE; - break; -Index: ticodecplugin/src/gsttidmaivideosink.c -=================================================================== ---- ticodecplugin.orig/src/gsttidmaivideosink.c 2010-01-08 14:17:38.533747453 -0600 -+++ ticodecplugin/src/gsttidmaivideosink.c 2010-01-08 15:55:46.881680839 -0600 -@@ -51,6 +51,19 @@ +diff --git a/src/gsttidmaivideosink.c b/src/gsttidmaivideosink.c +index 81bdac7..65e0406 100644 +--- a/src/gsttidmaivideosink.c ++++ b/src/gsttidmaivideosink.c +@@ -52,6 +52,19 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ( GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS @@ -166,7 +170,7 @@ Index: ticodecplugin/src/gsttidmaivideosink.c ("video/x-raw-yuv, " "format=(fourcc)UYVY, " "framerate=(fraction)[ 0, MAX ], " -@@ -67,6 +80,7 @@ +@@ -73,6 +86,7 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ( "width=(int)[ 1, MAX ], " "height=(int)[ 1, MAX ]" ) @@ -174,7 +178,7 @@ Index: ticodecplugin/src/gsttidmaivideosink.c ); GST_DEBUG_CATEGORY_STATIC (gst_tidmaivideosink_debug); -@@ -664,6 +678,11 @@ +@@ -673,6 +687,12 @@ static int gst_tidmaivideosink_videostd_get_attrs(VideoStd_Type videoStd, vattrs->framerate = 60; break; @@ -183,10 +187,11 @@ Index: ticodecplugin/src/gsttidmaivideosink.c + vattrs->framerate = 30; + break; + #endif ++ #if defined(Platform_omap3530) case VideoStd_VGA: vattrs->framerate = 60; -@@ -1035,6 +1054,12 @@ +@@ -1051,6 +1071,12 @@ static gboolean gst_tidmaivideosink_set_display_attrs(GstTIDmaiVideoSink *sink, sink->dAttrs.colorSpace = colorSpace; break; #endif @@ -199,7 +204,7 @@ Index: ticodecplugin/src/gsttidmaivideosink.c default: sink->dAttrs = Display_Attrs_DM6446_DM355_VID_DEFAULT; break; -@@ -1291,8 +1316,10 @@ +@@ -1307,8 +1333,10 @@ static gboolean gst_tidmaivideosink_process_caps(GstBaseSink * bsink, ColorSpace_Type inBufColorSpace; gint framerateDen; gint framerateNum; @@ -210,7 +215,7 @@ Index: ticodecplugin/src/gsttidmaivideosink.c /* The width and height of the input buffer are collected here so that it * can be checked against the width and height of the display buffer. -@@ -1300,24 +1327,38 @@ +@@ -1316,23 +1344,38 @@ static gboolean gst_tidmaivideosink_process_caps(GstBaseSink * bsink, gst_structure_get_int(structure, "width", &width); gst_structure_get_int(structure, "height", &height); @@ -223,14 +228,13 @@ Index: ticodecplugin/src/gsttidmaivideosink.c - case GST_MAKE_FOURCC('U', 'Y', 'V', 'Y'): - inBufColorSpace = ColorSpace_UYVY; - break; +- case GST_MAKE_FOURCC('N', 'V', '1', '6'): - case GST_MAKE_FOURCC('Y', '8', 'C', '8'): - inBufColorSpace = ColorSpace_YUV422PSEMI; - break; -- #if defined(Platform_dm365) - case GST_MAKE_FOURCC('N', 'V', '1', '2'): - inBufColorSpace = ColorSpace_YUV420PSEMI; - break; -- #endif - default: - GST_ERROR("unsupported fourcc\n"); + gst_structure_get_int(structure,"red_mask",&rm); @@ -243,6 +247,7 @@ Index: ticodecplugin/src/gsttidmaivideosink.c return FALSE; + } + } else { ++ + /* Map input buffer fourcc to dmai color space */ + gst_structure_get_fourcc(structure, "format", &fourcc); + @@ -250,14 +255,13 @@ Index: ticodecplugin/src/gsttidmaivideosink.c + case GST_MAKE_FOURCC('U', 'Y', 'V', 'Y'): + inBufColorSpace = ColorSpace_UYVY; + break; ++ case GST_MAKE_FOURCC('N', 'V', '1', '6'): + case GST_MAKE_FOURCC('Y', '8', 'C', '8'): + inBufColorSpace = ColorSpace_YUV422PSEMI; + break; -+ #if defined(Platform_dm365) + case GST_MAKE_FOURCC('N', 'V', '1', '2'): + inBufColorSpace = ColorSpace_YUV420PSEMI; + break; -+ #endif + default: + GST_ERROR("unsupported fourcc\n"); + return FALSE; @@ -265,3 +269,20 @@ Index: ticodecplugin/src/gsttidmaivideosink.c } /* Read the frame rate */ +diff --git a/src/gsttividenc1.c b/src/gsttividenc1.c +index 2e1fb31..60bf9e4 100644 +--- a/src/gsttividenc1.c ++++ b/src/gsttividenc1.c +@@ -1488,6 +1488,9 @@ static gboolean gst_tividenc1_codec_start (GstTIVidenc1 *videnc1) + #if defined(Platform_omap3530) + case Cpu_Device_OMAP3530: + #endif ++ #if defined(Platform_omapl138) ++ case Cpu_Device_OMAPL138: ++ #endif + case Cpu_Device_DM6446: + params.inputChromaFormat = XDM_YUV_422ILE; + break; +-- +1.5.4.3 + diff --git a/recipes/ti/gstreamer-ti/gstreamer-ti-omapl137.patch b/recipes/ti/gstreamer-ti/0003-add-omapl137-support.patch index a2fe2c0559..d1183e051c 100644 --- a/recipes/ti/gstreamer-ti/gstreamer-ti-omapl137.patch +++ b/recipes/ti/gstreamer-ti/0003-add-omapl137-support.patch @@ -1,7 +1,22 @@ -Index: ticodecplugin/src/gstticodecplugin_omapl137.cfg -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ticodecplugin/src/gstticodecplugin_omapl137.cfg 2010-01-08 09:27:23.529399692 -0600 +From 00f97a599ad3a87fc5cd46e0cf67b0039527a87b Mon Sep 17 00:00:00 2001 +From: Brijesh Singh <bksingh@ti.com> +Date: Sun, 9 May 2010 05:25:30 -0500 +Subject: [PATCH] add omapl137 support + +--- + src/gstticodecplugin_omapl137.cfg | 41 +++++++++++++++++++ + src/gstticodecs_omapl137.c | 81 +++++++++++++++++++++++++++++++++++++ + src/gsttidmaivideosink.c | 10 ++++- + src/gsttividenc1.c | 3 + + 4 files changed, 133 insertions(+), 2 deletions(-) + create mode 100644 src/gstticodecplugin_omapl137.cfg + create mode 100644 src/gstticodecs_omapl137.c + +diff --git a/src/gstticodecplugin_omapl137.cfg b/src/gstticodecplugin_omapl137.cfg +new file mode 100644 +index 0000000..af1ad41 +--- /dev/null ++++ b/src/gstticodecplugin_omapl137.cfg @@ -0,0 +1,41 @@ +/* + * Copyright (C) $year Texas Instruments Incorporated - http://www.ti.com/ @@ -44,10 +59,11 @@ Index: ticodecplugin/src/gstticodecplugin_omapl137.cfg + +/* Load support for the DMAI module */ +var DMAI = xdc.loadPackage('ti.sdo.dmai'); -Index: ticodecplugin/src/gstticodecs_omapl137.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ticodecplugin/src/gstticodecs_omapl137.c 2010-01-08 09:27:23.529399692 -0600 +diff --git a/src/gstticodecs_omapl137.c b/src/gstticodecs_omapl137.c +new file mode 100644 +index 0000000..05b0e9f +--- /dev/null ++++ b/src/gstticodecs_omapl137.c @@ -0,0 +1,81 @@ +/* + * gstticodecs_omapl137.c @@ -130,63 +146,29 @@ Index: ticodecplugin/src/gstticodecs_omapl137.c + vim:set shiftwidth=4: /* Use 4 spaces for >> operations */ + vim:set expandtab: /* Expand tabs into white spaces */ +#endif -Index: ticodecplugin/src/gsttividenc1.c -=================================================================== ---- ticodecplugin.orig/src/gsttividenc1.c 2010-01-07 15:15:37.000000000 -0600 -+++ ticodecplugin/src/gsttividenc1.c 2010-01-08 09:27:23.529399692 -0600 -@@ -1455,6 +1455,7 @@ - #if defined(Platform_omap3530) - case Cpu_Device_OMAP3530: - #endif -+ case Cpu_Device_OMAPL137: - case Cpu_Device_DM6446: - params.inputChromaFormat = XDM_YUV_422ILE; - break; -Index: ticodecplugin/src/gsttidmaivideosink.c -=================================================================== ---- ticodecplugin.orig/src/gsttidmaivideosink.c 2010-01-08 14:17:38.533747453 -0600 -+++ ticodecplugin/src/gsttidmaivideosink.c 2010-01-08 15:55:46.881680839 -0600 -@@ -51,6 +51,19 @@ +diff --git a/src/gsttidmaivideosink.c b/src/gsttidmaivideosink.c +index 65e0406..1c365e4 100644 +--- a/src/gsttidmaivideosink.c ++++ b/src/gsttidmaivideosink.c +@@ -52,7 +52,7 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ( GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS -+#if defined(Platform_omapl137) -+ ("video/x-raw-rgb, " -+ "bpp=(int)16, " -+ "depth=(int)16, " -+ "endianness=(int)1234, " -+ "red_mask=(int)63488, " -+ "green_mask=(int)2016, " -+ "blue_mask=(int)31, " -+ "framerate=(fraction)[ 0, MAX ], " -+ "width=(int)[ 1, MAX ], " -+ "height=(int)[1, MAX ] " -+ ) -+#else - ("video/x-raw-yuv, " - "format=(fourcc)UYVY, " - "framerate=(fraction)[ 0, MAX ], " -@@ -67,6 +80,7 @@ - "width=(int)[ 1, MAX ], " - "height=(int)[ 1, MAX ]" - ) -+#endif - ); - - GST_DEBUG_CATEGORY_STATIC (gst_tidmaivideosink_debug); -@@ -664,6 +678,11 @@ +-#if defined(Platform_omapl138) ++#if defined(Platform_omapl138) || defined(Platform_omapl137) + ("video/x-raw-rgb, " + "bpp=(int)16, " + "depth=(int)16, " +@@ -687,7 +687,7 @@ static int gst_tidmaivideosink_videostd_get_attrs(VideoStd_Type videoStd, vattrs->framerate = 60; break; -+ #if defined(Platform_omapl137) -+ case VideoStd_QVGA: -+ vattrs->framerate = 30; -+ break; -+ #endif - #if defined(Platform_omap3530) - case VideoStd_VGA: - vattrs->framerate = 60; -@@ -1035,6 +1054,12 @@ +- #if defined(Platform_omapl138) ++ #if defined(Platform_omapl138) || defined(Platform_omapl137) + case VideoStd_QVGA: + vattrs->framerate = 30; + break; +@@ -1077,6 +1077,12 @@ static gboolean gst_tidmaivideosink_set_display_attrs(GstTIDmaiVideoSink *sink, sink->dAttrs.colorSpace = colorSpace; break; #endif @@ -199,69 +181,20 @@ Index: ticodecplugin/src/gsttidmaivideosink.c default: sink->dAttrs = Display_Attrs_DM6446_DM355_VID_DEFAULT; break; -@@ -1291,8 +1316,10 @@ - ColorSpace_Type inBufColorSpace; - gint framerateDen; - gint framerateNum; -+ const gchar *mime; - - structure = gst_caps_get_structure(caps, 0); -+ mime = gst_structure_get_name(structure); - - /* The width and height of the input buffer are collected here so that it - * can be checked against the width and height of the display buffer. -@@ -1300,24 +1327,38 @@ - gst_structure_get_int(structure, "width", &width); - gst_structure_get_int(structure, "height", &height); - -- /* Map input buffer fourcc to dmai color space */ -- gst_structure_get_fourcc(structure, "format", &fourcc); -+ if (!strcmp(mime, "video/x-raw-rgb")) { -+ gint rm,gm,bm; - -- switch (fourcc) { -- case GST_MAKE_FOURCC('U', 'Y', 'V', 'Y'): -- inBufColorSpace = ColorSpace_UYVY; -- break; -- case GST_MAKE_FOURCC('Y', '8', 'C', '8'): -- inBufColorSpace = ColorSpace_YUV422PSEMI; -- break; -- #if defined(Platform_dm365) -- case GST_MAKE_FOURCC('N', 'V', '1', '2'): -- inBufColorSpace = ColorSpace_YUV420PSEMI; -- break; -- #endif -- default: -- GST_ERROR("unsupported fourcc\n"); -+ gst_structure_get_int(structure,"red_mask",&rm); -+ gst_structure_get_int(structure,"green_mask",&gm); -+ gst_structure_get_int(structure,"blue_mask",&bm); -+ if ((rm == 63488) && (gm == 2016) && (bm == 31)){ -+ inBufColorSpace = ColorSpace_RGB565; -+ } else { -+ GST_ERROR("unsupported color space\n"); - return FALSE; -+ } -+ } else { -+ /* Map input buffer fourcc to dmai color space */ -+ gst_structure_get_fourcc(structure, "format", &fourcc); -+ -+ switch (fourcc) { -+ case GST_MAKE_FOURCC('U', 'Y', 'V', 'Y'): -+ inBufColorSpace = ColorSpace_UYVY; -+ break; -+ case GST_MAKE_FOURCC('Y', '8', 'C', '8'): -+ inBufColorSpace = ColorSpace_YUV422PSEMI; -+ break; -+ #if defined(Platform_dm365) -+ case GST_MAKE_FOURCC('N', 'V', '1', '2'): -+ inBufColorSpace = ColorSpace_YUV420PSEMI; -+ break; -+ #endif -+ default: -+ GST_ERROR("unsupported fourcc\n"); -+ return FALSE; -+ } - } - - /* Read the frame rate */ +diff --git a/src/gsttividenc1.c b/src/gsttividenc1.c +index 60bf9e4..74a738f 100644 +--- a/src/gsttividenc1.c ++++ b/src/gsttividenc1.c +@@ -1491,6 +1491,9 @@ static gboolean gst_tividenc1_codec_start (GstTIVidenc1 *videnc1) + #if defined(Platform_omapl138) + case Cpu_Device_OMAPL138: + #endif ++ #if defined(Platform_omapl137) ++ case Cpu_Device_OMAPL137: ++ #endif + case Cpu_Device_DM6446: + params.inputChromaFormat = XDM_YUV_422ILE; + break; +-- +1.5.4.3 + diff --git a/recipes/ti/gstreamer-ti/gstreamer-ti-dm6467-usesinglecsserver.patch b/recipes/ti/gstreamer-ti/0004-gstreamer-ti-dm6467-usesinglecsserver.patch index 3fb34cf744..eac35766f1 100644 --- a/recipes/ti/gstreamer-ti/gstreamer-ti-dm6467-usesinglecsserver.patch +++ b/recipes/ti/gstreamer-ti/0004-gstreamer-ti-dm6467-usesinglecsserver.patch @@ -1,7 +1,17 @@ -diff -uNr ticodecplugin/src/gstticodecplugin_dm6467.cfg ticodecplugin/src/gstticodecplugin_dm6467.cfg ---- ticodecplugin/src/gstticodecplugin_dm6467.cfg 2010-03-01 10:31:05.000000000 +0000 -+++ ticodecplugin/src/gstticodecplugin_dm6467.cfg 2010-03-01 11:12:14.000000000 +0000 -@@ -29,25 +29,15 @@ +From 35f013c24fb78d6ae7257abb4b4ed5f356cac36b Mon Sep 17 00:00:00 2001 +From: Brijesh Singh <bksingh@ti.com> +Date: Sun, 9 May 2010 05:27:41 -0500 +Subject: [PATCH] gstreamer ti dm6467 usesinglecsserver + +--- + src/gstticodecplugin_dm6467.cfg | 24 +++++++----------------- + 1 files changed, 7 insertions(+), 17 deletions(-) + +diff --git a/src/gstticodecplugin_dm6467.cfg b/src/gstticodecplugin_dm6467.cfg +index a141f03..9e64775 100644 +--- a/src/gstticodecplugin_dm6467.cfg ++++ b/src/gstticodecplugin_dm6467.cfg +@@ -29,25 +29,15 @@ TraceUtil.attrs = TraceUtil.SOCRATES_TRACING; * ======== Engine Configuration ======== */ var Engine = xdc.useModule('ti.sdo.ce.Engine'); @@ -34,3 +44,6 @@ diff -uNr ticodecplugin/src/gstticodecplugin_dm6467.cfg ticodecplugin/src/gsttic } /* Load support for the 'Davinci Multimedia Application Interface' modules */ +-- +1.5.4.3 + diff --git a/recipes/ti/gstreamer-ti/0005-remove-mp3-mime-type.patch b/recipes/ti/gstreamer-ti/0005-remove-mp3-mime-type.patch new file mode 100644 index 0000000000..90cdc6e442 --- /dev/null +++ b/recipes/ti/gstreamer-ti/0005-remove-mp3-mime-type.patch @@ -0,0 +1,42 @@ +From 193b6fe6bca945b3c69d600ebcddd7639aff8f25 Mon Sep 17 00:00:00 2001 +From: Brijesh Singh <bksingh@ti.com> +Date: Sun, 9 May 2010 05:29:17 -0500 +Subject: [PATCH] remove mp3 mime type + +This patch removes mp3 decoder cap from auddec elements. mp3 decoder is not +part of tspa combo. If you are adding mp3 decoder support in your combo then +do not apply this patch. +--- + src/gsttiauddec.c | 2 +- + src/gsttiauddec1.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/gsttiauddec.c b/src/gsttiauddec.c +index 2df2464..337cb0f 100644 +--- a/src/gsttiauddec.c ++++ b/src/gsttiauddec.c +@@ -85,7 +85,7 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE( + GST_PAD_ALWAYS, + GST_STATIC_CAPS + ("audio/mpeg, " +- "mpegversion = (int) { 1, 4 }") ++ "mpegversion = (int) { 4 }") + ); + + /* Constants */ +diff --git a/src/gsttiauddec1.c b/src/gsttiauddec1.c +index 6e56f4b..bf121e3 100644 +--- a/src/gsttiauddec1.c ++++ b/src/gsttiauddec1.c +@@ -85,7 +85,7 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE( + GST_PAD_ALWAYS, + GST_STATIC_CAPS + ("audio/mpeg, " +- "mpegversion = (int) { 1, 4 }") ++ "mpegversion = (int) { 4 }") + ); + + /* Define source (output) pad capabilities. Currently, RAW is supported. */ +-- +1.5.4.3 + diff --git a/recipes/ti/gstreamer-ti/gstreamer-ti-tracker-462.patch b/recipes/ti/gstreamer-ti/0006-gstreamer-ti-tracker-462.patch index c115161dcc..3fd1ac272a 100644 --- a/recipes/ti/gstreamer-ti/gstreamer-ti-tracker-462.patch +++ b/recipes/ti/gstreamer-ti/0006-gstreamer-ti-tracker-462.patch @@ -1,7 +1,18 @@ -diff -uNr ticodecplugin/src/gsttividdec.c ticodecplugin.new/src/gsttividdec.c ---- ticodecplugin/src/gsttividdec.c 2009-09-05 00:04:51.000000000 -0500 -+++ ticodecplugin.new/src/gsttividdec.c 2009-09-05 03:54:42.000000000 -0500 -@@ -82,7 +82,7 @@ +From e227c83e6b857c7b87758741e0ab7a8b8c424a50 Mon Sep 17 00:00:00 2001 +From: Brijesh Singh <bksingh@ti.com> +Date: Sun, 9 May 2010 05:34:03 -0500 +Subject: [PATCH] gstreamer ti tracker 462 + +--- + src/gsttividdec.c | 10 ++++++++-- + src/gsttividdec2.c | 10 ++++++++-- + 2 files changed, 16 insertions(+), 4 deletions(-) + +diff --git a/src/gsttividdec.c b/src/gsttividdec.c +index e3714d6..51da81d 100644 +--- a/src/gsttividdec.c ++++ b/src/gsttividdec.c +@@ -83,7 +83,7 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE( GST_PAD_ALWAYS, GST_STATIC_CAPS ("video/mpeg, " @@ -10,7 +21,7 @@ diff -uNr ticodecplugin/src/gsttividdec.c ticodecplugin.new/src/gsttividdec.c "systemstream=(boolean)false, " "framerate=(fraction)[ 0, MAX ], " "width=(int)[ 1, MAX ], " -@@ -90,7 +90,8 @@ +@@ -91,7 +91,8 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE( "video/x-h264, " /* H264 */ "framerate=(fraction)[ 0, MAX ], " "width=(int)[ 1, MAX ], " @@ -20,7 +31,7 @@ diff -uNr ticodecplugin/src/gsttividdec.c ticodecplugin.new/src/gsttividdec.c ) ); -@@ -614,6 +615,11 @@ +@@ -606,6 +607,11 @@ static gboolean gst_tividdec_set_sink_caps(GstPad *pad, GstCaps *caps) codec = gst_ticodec_get_codec("H.264 Video Decoder"); } @@ -31,11 +42,12 @@ diff -uNr ticodecplugin/src/gsttividdec.c ticodecplugin.new/src/gsttividdec.c + /* Mime type not supported */ else { - GST_ERROR("stream type not supported"); -diff -uNr ticodecplugin/src/gsttividdec2.c ticodecplugin.new/src/gsttividdec2.c ---- ticodecplugin/src/gsttividdec2.c 2009-09-05 00:04:51.000000000 -0500 -+++ ticodecplugin.new/src/gsttividdec2.c 2009-09-05 03:54:42.000000000 -0500 -@@ -83,7 +83,7 @@ + GST_ELEMENT_ERROR(viddec, STREAM, NOT_IMPLEMENTED, +diff --git a/src/gsttividdec2.c b/src/gsttividdec2.c +index 79b28a5..6bf421b 100644 +--- a/src/gsttividdec2.c ++++ b/src/gsttividdec2.c +@@ -84,7 +84,7 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE( GST_PAD_ALWAYS, GST_STATIC_CAPS ("video/mpeg, " @@ -44,7 +56,7 @@ diff -uNr ticodecplugin/src/gsttividdec2.c ticodecplugin.new/src/gsttividdec2.c "systemstream=(boolean)false, " "framerate=(fraction)[ 0, MAX ], " "width=(int)[ 1, MAX ], " -@@ -91,7 +91,8 @@ +@@ -92,7 +92,8 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE( "video/x-h264, " /* H264 */ "framerate=(fraction)[ 0, MAX ], " "width=(int)[ 1, MAX ], " @@ -54,7 +66,7 @@ diff -uNr ticodecplugin/src/gsttividdec2.c ticodecplugin.new/src/gsttividdec2.c ) ); -@@ -625,6 +626,11 @@ +@@ -616,6 +617,11 @@ static gboolean gst_tividdec2_set_sink_caps(GstPad *pad, GstCaps *caps) codec = gst_ticodec_get_codec("H.264 Video Decoder"); } @@ -65,4 +77,7 @@ diff -uNr ticodecplugin/src/gsttividdec2.c ticodecplugin.new/src/gsttividdec2.c + /* Mime type not supported */ else { - GST_ERROR("stream type not supported"); + GST_ELEMENT_ERROR(viddec2, STREAM, NOT_IMPLEMENTED, +-- +1.5.4.3 + diff --git a/recipes/ti/gstreamer-ti/gstreamer-ti-add-omapfb.patch b/recipes/ti/gstreamer-ti/0007-add-omapdmaifbsink.patch index 1389d25e25..be6f899f0c 100644 --- a/recipes/ti/gstreamer-ti/gstreamer-ti-add-omapfb.patch +++ b/recipes/ti/gstreamer-ti/0007-add-omapdmaifbsink.patch @@ -1,7 +1,25 @@ -diff -uNr ticodecplugin/configure.ac ticodecplugin.new/configure.ac ---- ticodecplugin/configure.ac 2009-09-05 00:04:51.000000000 -0500 -+++ ticodecplugin.new/configure.ac 2009-10-28 06:35:20.000000000 -0500 -@@ -25,6 +25,7 @@ +From 6bd18e8107d55a5900bb9b9efa40c9f099d16942 Mon Sep 17 00:00:00 2001 +From: Brijesh Singh <bksingh@ti.com> +Date: Sun, 9 May 2010 08:46:18 -0500 +Subject: [PATCH] add omapdmaifbsink + +--- + configure.ac | 1 + + src/Makefile.am | 8 +- + src/gstticodecplugin.c | 8 + + src/omapfb.c | 1005 ++++++++++++++++++++++++++++++++++++++++++++++++ + src/omapfb.h | 142 +++++++ + src/yuv.S | 117 ++++++ + 6 files changed, 1277 insertions(+), 4 deletions(-) + create mode 100644 src/omapfb.c + create mode 100644 src/omapfb.h + create mode 100644 src/yuv.S + +diff --git a/configure.ac b/configure.ac +index 32f8304..c8f102c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -25,6 +25,7 @@ dnl make aclocal work in maintainer mode AC_SUBST(ACLOCAL_AMFLAGS, "-I m4") AM_CONFIG_HEADER(config.h) @@ -9,9 +27,35 @@ diff -uNr ticodecplugin/configure.ac ticodecplugin.new/configure.ac dnl check for tools AC_PROG_CC -diff -uNr ticodecplugin/src/gstticodecplugin.c ticodecplugin.new/src/gstticodecplugin.c ---- ticodecplugin/src/gstticodecplugin.c 2009-10-28 06:27:14.000000000 -0500 -+++ ticodecplugin.new/src/gstticodecplugin.c 2009-10-28 06:36:28.000000000 -0500 +diff --git a/src/Makefile.am b/src/Makefile.am +index 95973a8..acbad81 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -4,16 +4,16 @@ XDC_CONFIG_BASENAME = gstticodecplugin_$(GST_TI_PLATFORM) + plugin_LTLIBRARIES = libgstticodecplugin.la + + # sources used to compile this plug-in +-libgstticodecplugin_la_SOURCES = gstticodecplugin.c gsttiauddec.c gsttiauddec1.c gsttividdec.c gsttividdec2.c gsttiimgenc1.c gsttiimgenc.c gsttiimgdec1.c gsttiimgdec.c gsttidmaibuffertransport.c gstticircbuffer.c gsttidmaivideosink.c gstticodecs.c gstticodecs_platform.c gsttiquicktime_aac.c gsttiquicktime_h264.c gsttividenc.c gsttividenc1.c gsttiaudenc1.c gstticommonutils.c gsttividresize.c gsttidmaiperf.c gsttiquicktime_mpeg4.c ++libgstticodecplugin_la_SOURCES = gstticodecplugin.c gsttiauddec.c gsttiauddec1.c gsttividdec.c gsttividdec2.c gsttiimgenc1.c gsttiimgenc.c gsttiimgdec1.c gsttiimgdec.c gsttidmaibuffertransport.c gstticircbuffer.c gsttidmaivideosink.c gstticodecs.c gstticodecs_platform.c gsttiquicktime_aac.c gsttiquicktime_h264.c gsttividenc.c gsttividenc1.c gsttiaudenc1.c gstticommonutils.c gsttividresize.c gsttidmaiperf.c gsttiquicktime_mpeg4.c omapfb.c yuv.S + + # flags used to compile this plugin + # add other _CFLAGS and _LIBS as needed +-libgstticodecplugin_la_CFLAGS = $(GST_CFLAGS) $(shell cat $(XDC_CONFIG_BASENAME)/compiler.opt) +-libgstticodecplugin_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-0.10 -lgstaudio-0.10 -lm ++libgstticodecplugin_la_CFLAGS = $(GST_CFLAGS) $(shell cat $(XDC_CONFIG_BASENAME)/compiler.opt) -I$(LINUXKERNEL_INSTALL_DIR)/include ++libgstticodecplugin_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-0.10 -lgstaudio-0.10 -lm -lX11 + libgstticodecplugin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -Wl,$(XDC_CONFIG_BASENAME)/linker.cmd + + # headers we need but don't want installed +-noinst_HEADERS = gsttiauddec.h gsttiauddec1.h gsttividdec.h gsttividdec2.h gsttiimgenc1.h gsttiimgenc.h gsttiimgdec1.h gsttiimgdec.h gsttidmaibuffertransport.h gstticircbuffer.h gsttidmaivideosink.h gsttithreadprops.h gstticodecs.h gsttiquicktime_aac.h gsttiquicktime_h264.h gsttividenc.h gsttividenc1.h gsttiaudenc1.h gstticommonutils.h gsttividresize.h gsttiquicktime_mpeg4.h ++noinst_HEADERS = gsttiauddec.h gsttiauddec1.h gsttividdec.h gsttividdec2.h gsttiimgenc1.h gsttiimgenc.h gsttiimgdec1.h gsttiimgdec.h gsttidmaibuffertransport.h gstticircbuffer.h gsttidmaivideosink.h gsttithreadprops.h gstticodecs.h gsttiquicktime_aac.h gsttiquicktime_h264.h gsttividenc.h gsttividenc1.h gsttiaudenc1.h gstticommonutils.h gsttividresize.h gsttiquicktime_mpeg4.h omapfb.h + + # XDC Configuration + CONFIGURO = $(XDC_INSTALL_DIR)/xs xdc.tools.configuro +diff --git a/src/gstticodecplugin.c b/src/gstticodecplugin.c +index e98832d..8f8e938 100644 +--- a/src/gstticodecplugin.c ++++ b/src/gstticodecplugin.c @@ -47,6 +47,7 @@ #include "gsttiaudenc1.h" #include "gsttividresize.h" @@ -20,7 +64,7 @@ diff -uNr ticodecplugin/src/gstticodecplugin.c ticodecplugin.new/src/gstticodecp /* entry point to initialize the plug-in * initialize the plug-in itself -@@ -161,6 +162,13 @@ +@@ -161,6 +162,13 @@ TICodecPlugin_init (GstPlugin * TICodecPlugin) GST_TYPE_DMAIPERF)) return FALSE; @@ -34,9 +78,11 @@ diff -uNr ticodecplugin/src/gstticodecplugin.c ticodecplugin.new/src/gstticodecp return TRUE; } -diff -uNr ticodecplugin/src/omapfb.c ticodecplugin.new/src/omapfb.c ---- ticodecplugin/src/omapfb.c 1969-12-31 18:00:00.000000000 -0600 -+++ ticodecplugin.new/src/omapfb.c 2009-10-28 06:35:20.000000000 -0500 +diff --git a/src/omapfb.c b/src/omapfb.c +new file mode 100644 +index 0000000..0fb4eef +--- /dev/null ++++ b/src/omapfb.c @@ -0,0 +1,1005 @@ +/* + * Copyright (C) 2008 Felipe Contreras <felipe.contreras@gmail.com> @@ -1043,9 +1089,11 @@ diff -uNr ticodecplugin/src/omapfb.c ticodecplugin.new/src/omapfb.c + + return type; +} -diff -uNr ticodecplugin/src/omapfb.h ticodecplugin.new/src/omapfb.h ---- ticodecplugin/src/omapfb.h 1969-12-31 18:00:00.000000000 -0600 -+++ ticodecplugin.new/src/omapfb.h 2009-10-28 06:35:20.000000000 -0500 +diff --git a/src/omapfb.h b/src/omapfb.h +new file mode 100644 +index 0000000..6103b49 +--- /dev/null ++++ b/src/omapfb.h @@ -0,0 +1,142 @@ +/* + * Copyright (C) 2008 Felipe Contreras <felipe.contreras@gmail.com> @@ -1189,9 +1237,11 @@ diff -uNr ticodecplugin/src/omapfb.h ticodecplugin.new/src/omapfb.h +G_END_DECLS + +#endif /* GST_OMAPFB_H */ -diff -uNr ticodecplugin/src/yuv.S ticodecplugin.new/src/yuv.S ---- ticodecplugin/src/yuv.S 1969-12-31 18:00:00.000000000 -0600 -+++ ticodecplugin.new/src/yuv.S 2009-10-28 06:35:20.000000000 -0500 +diff --git a/src/yuv.S b/src/yuv.S +new file mode 100644 +index 0000000..52113fa +--- /dev/null ++++ b/src/yuv.S @@ -0,0 +1,117 @@ +/* + Copyright (C) 2008 Mans Rullgard @@ -1310,26 +1360,6 @@ diff -uNr ticodecplugin/src/yuv.S ticodecplugin.new/src/yuv.S + pop {r4-r11,pc} + .endfunc + ---- /tmp/Makefile.am 2010-01-13 09:13:19.000000000 +0100 -+++ ticodecplugin/src/Makefile.am 2010-01-13 09:14:38.000000000 +0100 -@@ -4,16 +4,16 @@ - plugin_LTLIBRARIES = libgstticodecplugin.la - - # sources used to compile this plug-in --libgstticodecplugin_la_SOURCES = gstticodecplugin.c gsttiauddec.c gsttiauddec1.c gsttividdec.c gsttividdec2.c gsttiimgenc1.c gsttiimgenc.c gsttiimgdec1.c gsttiimgdec.c gsttidmaibuffertransport.c gstticircbuffer.c gsttidmaivideosink.c gstticodecs.c gstticodecs_platform.c gsttiquicktime_aac.c gsttiquicktime_h264.c gsttividenc.c gsttividenc1.c gsttiaudenc1.c gstticommonutils.c gsttividresize.c gsttidmaiperf.c gsttiquicktime_mpeg4.c -+libgstticodecplugin_la_SOURCES = gstticodecplugin.c gsttiauddec.c gsttiauddec1.c gsttividdec.c gsttividdec2.c gsttiimgenc1.c gsttiimgenc.c gsttiimgdec1.c gsttiimgdec.c gsttidmaibuffertransport.c gstticircbuffer.c gsttidmaivideosink.c gstticodecs.c gstticodecs_platform.c gsttiquicktime_aac.c gsttiquicktime_h264.c gsttividenc.c gsttividenc1.c gsttiaudenc1.c gstticommonutils.c gsttividresize.c gsttidmaiperf.c gsttiquicktime_mpeg4.c omapfb.c yuv.S - - # flags used to compile this plugin - # add other _CFLAGS and _LIBS as needed --libgstticodecplugin_la_CFLAGS = $(GST_CFLAGS) $(shell cat $(XDC_CONFIG_BASENAME)/compiler.opt) --libgstticodecplugin_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-0.10 -lgstaudio-0.10 -lm -+libgstticodecplugin_la_CFLAGS = $(GST_CFLAGS) $(shell cat $(XDC_CONFIG_BASENAME)/compiler.opt) -I$(LINUXKERNEL_INSTALL_DIR)/include -+libgstticodecplugin_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-0.10 -lgstaudio-0.10 -lm -lX11 - libgstticodecplugin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -Wl,$(XDC_CONFIG_BASENAME)/linker.cmd - - # headers we need but don't want installed --noinst_HEADERS = gsttiauddec.h gsttiauddec1.h gsttividdec.h gsttividdec2.h gsttiimgenc1.h gsttiimgenc.h gsttiimgdec1.h gsttiimgdec.h gsttidmaibuffertransport.h gstticircbuffer.h gsttidmaivideosink.h gsttithreadprops.h gstticodecs.h gsttiquicktime_aac.h gsttiquicktime_h264.h gsttividenc.h gsttividenc1.h gsttiaudenc1.h gstticommonutils.h gsttividresize.h gsttiquicktime_mpeg4.h -+noinst_HEADERS = gsttiauddec.h gsttiauddec1.h gsttividdec.h gsttividdec2.h gsttiimgenc1.h gsttiimgenc.h gsttiimgdec1.h gsttiimgdec.h gsttidmaibuffertransport.h gstticircbuffer.h gsttidmaivideosink.h gsttithreadprops.h gstticodecs.h gsttiquicktime_aac.h gsttiquicktime_h264.h gsttividenc.h gsttividenc1.h gsttiaudenc1.h gstticommonutils.h gsttividresize.h gsttiquicktime_mpeg4.h omapfb.h - - # XDC Configuration - CONFIGURO = $(XDC_INSTALL_DIR)/xs xdc.tools.configuro +-- +1.5.4.3 + diff --git a/recipes/ti/gstreamer-ti/dm355-evm/gst-ti.sh b/recipes/ti/gstreamer-ti/dm355-evm/gst-ti.sh new file mode 100644 index 0000000000..5467a67be0 --- /dev/null +++ b/recipes/ti/gstreamer-ti/dm355-evm/gst-ti.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +# Disable XDM 0.9 elements +export GST_TI_TIViddec_DISABLE=1 +export GST_TI_TIAuddec_DISABLE=1 +export GST_TI_TIVidenc_DISABLE=1 +export GST_TI_TIImgdec_DISABLE=1 +export GST_TI_TIImgenc_DISABLE=1 + +# Disable XDM 1.x audio decoder +export GST_TI_TIAuddec1_DISABLE=1 + diff --git a/recipes/ti/gstreamer-ti/dm365-evm/gst-ti.sh b/recipes/ti/gstreamer-ti/dm365-evm/gst-ti.sh new file mode 100644 index 0000000000..5467a67be0 --- /dev/null +++ b/recipes/ti/gstreamer-ti/dm365-evm/gst-ti.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +# Disable XDM 0.9 elements +export GST_TI_TIViddec_DISABLE=1 +export GST_TI_TIAuddec_DISABLE=1 +export GST_TI_TIVidenc_DISABLE=1 +export GST_TI_TIImgdec_DISABLE=1 +export GST_TI_TIImgenc_DISABLE=1 + +# Disable XDM 1.x audio decoder +export GST_TI_TIAuddec1_DISABLE=1 + diff --git a/recipes/ti/gstreamer-ti/dm365-evm/loadmodules.sh b/recipes/ti/gstreamer-ti/dm365-evm/loadmodules.sh new file mode 100644 index 0000000000..28358afb32 --- /dev/null +++ b/recipes/ti/gstreamer-ti/dm365-evm/loadmodules.sh @@ -0,0 +1,27 @@ +#!/bin/sh +rmmod cmemk 2>/dev/null +rmmod irqk 2>/dev/null +rmmod edmak 2>/dev/null +rmmod dm365mmap 2>/dev/null + +# Pools configuration +insmod cmemk.ko phys_start=0x84d00000 phys_end=0x88000000 pools=1x16539648,1x4841472,4x1843200,14x1646592,1x282624,1x176128,1x147456,1x69632,1x61440,1x32768,2x20480,1x12288,1x8192,72x4096 + +# Decode + Display +#insmod cmemk.ko phys_start=0x83c00000 phys_end=0x88000000 pools=1x16539648,1x4841472,14x1646592,1x282624,1x176128,1x147456,1x69632,1x61440,1x32768,2x20480,1x12288,1x8192,64x4096 + +# Capture + Encode +#insmod cmemk.ko phys_start=0x83c00000 phys_end=0x88000000 pools=1x3112960,1x2764800,3x1536000,1x65536,1x61440,1x49152,1x20480,1x16384,2x8192,87x4096 + +# Resizer +#insmod cmemk.ko phys_start=0x83c00000 phys_end=0x88000000 pools=3x1843200 + +# Non-accel display +#insmod cmemk.ko phys_start=0x83c00000 phys_end=0x88000000 pools=1x1843200 + +insmod irqk.ko +insmod edmak.ko +insmod dm365mmap.ko + +rm -f /dev/dm365mmap +mknod /dev/dm365mmap c `awk "\\$2==\"dm365mmap\" {print \\$1}" /proc/devices` 0 diff --git a/recipes/ti/gstreamer-ti/gst-ti.sh b/recipes/ti/gstreamer-ti/gst-ti.sh new file mode 100644 index 0000000000..9fd904ddc3 --- /dev/null +++ b/recipes/ti/gstreamer-ti/gst-ti.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +# Disable XDM 0.9 elements +export GST_TI_TIViddec_DISABLE=1 +export GST_TI_TIAuddec_DISABLE=1 +export GST_TI_TIVidenc_DISABLE=1 +export GST_TI_TIImgdec_DISABLE=1 +export GST_TI_TIImgenc_DISABLE=1 + diff --git a/recipes/ti/gstreamer-ti/gstreamer-ti-dm355-rc.sh b/recipes/ti/gstreamer-ti/gstreamer-ti-dm355-rc.sh deleted file mode 100644 index d95658e44b..0000000000 --- a/recipes/ti/gstreamer-ti/gstreamer-ti-dm355-rc.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -# -# configure kernel modules for TI DSP based gstreamer plugin -# - -# Disable XDM 0.9 elements -export GST_TI_TIViddec_DISABLE=1 -export GST_TI_TIAuddec_DISABLE=1 -export GST_TI_TIVidenc_DISABLE=1 -export GST_TI_TIImgdec_DISABLE=1 -export GST_TI_TIImgenc_DISABLE=1 - -load_module() { - # CMEM Allocation - # 1x3628800 Circular buffer - # 4x829440 Video buffers (max D1 PAL) - # 1x829440 Underlying software components (codecs, etc.) - # 1x518400 Underlying software components (codecs, etc.) - # 1x4948 Underlying software components (codecs, etc.) - # 1x1505280 Underlying software components (codecs, etc.) - # 1x5760 Underlying software components (codecs, etc.) - # 1x8192 Underlying software components (codecs, etc.) - # 1x1 Dummy buffer used during final flush - modprobe cmemk phys_start=0x87400000 phys_end=0x88000000 \ - pools=1x3628800,5x829440,1x518400,1x4948,1x1505280,1x5760,1x8192,1x1 - - modprobe dm350mmap - rm -f /dev/dm350mmap - mknod /dev/dm350mmap c `awk "\\$2==\"dm350mmap\" {print \\$1}" /proc/devices` 0 - -} - -unload_module() { - rmmod cmemk - rmmod dm350mmap -} - -case "$1" in - start) - echo -n "Loading kernel modules for gstreamer-ti... " - load_module - echo " done" - ;; - stop) - echo -n "Unloading kernel module ..." - unload_module - echo " done" - ;; - restart) - echo -n "Unloading kernel module ..." - unload_module - echo " done" - echo -n "Loading kernel modules for gstreamer-ti... " - load_module - echo " done" - ;; - *) - echo "$0 <start/stop/restart>" - ;; -esac - diff --git a/recipes/ti/gstreamer-ti/gstreamer-ti-dm365-rc.sh b/recipes/ti/gstreamer-ti/gstreamer-ti-dm365-rc.sh deleted file mode 100644 index f1aa8ee6da..0000000000 --- a/recipes/ti/gstreamer-ti/gstreamer-ti-dm365-rc.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -# -# configure kernel modules for TI DSP based gstreamer plugin -# - -# Disable XDM 0.9 elements -export GST_TI_TIViddec_DISABLE=1 -export GST_TI_TIAuddec_DISABLE=1 -export GST_TI_TIVidenc_DISABLE=1 -export GST_TI_TIImgdec_DISABLE=1 -export GST_TI_TIImgenc_DISABLE=1 - -load_module() { - # insert cmem - modprobe cmemk phys_start=0x85400000 phys_end=0x88000000 \ - pools=1x6651904,1x3670016,18x1548288,1x282624,1x159744,1x49152,1x32768,1x28672,1x16384,3x12288,2x8192,36x4096 - - modprobe irqk - modprobe edmak - modprobe dm365mmap - rm -f /dev/dm365mmap - mknod /dev/dm365mmap c `awk "\\$2==\"dm365mmap\" {print \\$1}" /proc/devices` 0 -} - -unload_module() { - rmmod cmemk 2>/dev/null - rmmod irqk 2>/dev/null - rmmod edmak 2>/dev/null - rmmod dm365mmap 2>/dev/null -} - -case "$1" in - start) - echo -n "Loading kernel modules for gstreamer-ti... " - load_module - echo " done" - ;; - stop) - echo -n "Unloading kernel module ..." - unload_module - echo " done" - ;; - restart) - echo -n "Unloading kernel module ..." - unload_module - echo " done" - echo -n "Loading kernel modules for gstreamer-ti... " - load_module - echo " done" - ;; - *) - echo "$0 <start/stop/restart>" - ;; -esac diff --git a/recipes/ti/gstreamer-ti/gstreamer-ti-dm6446-rc.sh b/recipes/ti/gstreamer-ti/gstreamer-ti-dm6446-rc.sh deleted file mode 100644 index 69468977bd..0000000000 --- a/recipes/ti/gstreamer-ti/gstreamer-ti-dm6446-rc.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/sh -# -# configure kernel modules for TI DSP based gstreamer plugin -# - -# Disable XDM 0.9 elements -export GST_TI_TIViddec_DISABLE=1 -export GST_TI_TIAuddec_DISABLE=1 -export GST_TI_TIVidenc_DISABLE=1 -export GST_TI_TIImgdec_DISABLE=1 -export GST_TI_TIImgenc_DISABLE=1 - -load_module() { - # insert cmemk, tell it to occupy physical 118MB-128MB. - # - # CMEM Allocation - # 1x5250000 Circular buffer - # 2x829440 Video buffers (max D1 PAL) - # 3x1036800 Video buffers (larger size needed for MPEG4 encoder) - # 1x8192 Underlying software components (codecs, etc.) - # 1x1 Dummy buffer used during final flush - modprobe cmemk phys_start=0x87600000 phys_end=0x88000000 \ - pools=1x5250000,2x829440,3x1036800,1x8192,1x1 - - # Notes on using the "playbin" element: - # ------------------------------------- - # Playbin requires one 6 video buffers, and we have only allocated five. - # If you replace the "2x829440,3x1036800" with "6x829440" it should work, but - # you will not be able to use the MPEG4 encoder. - # - #insmod cmemk.ko phys_start=0x87600000 phys_end=0x88000000 \ - # pools=1x5250000,6x829440,1x8192,1x1 - - # insert dsplinkk - modprobe dsplinkk - - # make /dev/dsplink - rm -f /dev/dsplink - mknod /dev/dsplink c `awk "\\$2==\"dsplink\" {print \\$1}" /proc/devices` 0 -} - -unload_module() { - rmmod cmemk - rmmod dsplinkk - rm -f /dev/dsplink -} - -case "$1" in - start) - echo -n "Loading kernel modules for gstreamer-ti... " - load_module - echo " done" - ;; - stop) - echo -n "Unloading kernel module ..." - unload_module - echo " done" - ;; - restart) - echo -n "Unloading kernel module ..." - unload_module - echo " done" - echo -n "Loading kernel modules for gstreamer-ti... " - load_module - echo " done" - ;; - *) - echo "$0 <start/stop/restart>" - ;; -esac - diff --git a/recipes/ti/gstreamer-ti/gstreamer-ti-dm6467-rc.sh b/recipes/ti/gstreamer-ti/gstreamer-ti-dm6467-rc.sh deleted file mode 100644 index 69468977bd..0000000000 --- a/recipes/ti/gstreamer-ti/gstreamer-ti-dm6467-rc.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/sh -# -# configure kernel modules for TI DSP based gstreamer plugin -# - -# Disable XDM 0.9 elements -export GST_TI_TIViddec_DISABLE=1 -export GST_TI_TIAuddec_DISABLE=1 -export GST_TI_TIVidenc_DISABLE=1 -export GST_TI_TIImgdec_DISABLE=1 -export GST_TI_TIImgenc_DISABLE=1 - -load_module() { - # insert cmemk, tell it to occupy physical 118MB-128MB. - # - # CMEM Allocation - # 1x5250000 Circular buffer - # 2x829440 Video buffers (max D1 PAL) - # 3x1036800 Video buffers (larger size needed for MPEG4 encoder) - # 1x8192 Underlying software components (codecs, etc.) - # 1x1 Dummy buffer used during final flush - modprobe cmemk phys_start=0x87600000 phys_end=0x88000000 \ - pools=1x5250000,2x829440,3x1036800,1x8192,1x1 - - # Notes on using the "playbin" element: - # ------------------------------------- - # Playbin requires one 6 video buffers, and we have only allocated five. - # If you replace the "2x829440,3x1036800" with "6x829440" it should work, but - # you will not be able to use the MPEG4 encoder. - # - #insmod cmemk.ko phys_start=0x87600000 phys_end=0x88000000 \ - # pools=1x5250000,6x829440,1x8192,1x1 - - # insert dsplinkk - modprobe dsplinkk - - # make /dev/dsplink - rm -f /dev/dsplink - mknod /dev/dsplink c `awk "\\$2==\"dsplink\" {print \\$1}" /proc/devices` 0 -} - -unload_module() { - rmmod cmemk - rmmod dsplinkk - rm -f /dev/dsplink -} - -case "$1" in - start) - echo -n "Loading kernel modules for gstreamer-ti... " - load_module - echo " done" - ;; - stop) - echo -n "Unloading kernel module ..." - unload_module - echo " done" - ;; - restart) - echo -n "Unloading kernel module ..." - unload_module - echo " done" - echo -n "Loading kernel modules for gstreamer-ti... " - load_module - echo " done" - ;; - *) - echo "$0 <start/stop/restart>" - ;; -esac - diff --git a/recipes/ti/gstreamer-ti/gstreamer-ti-omap3530-rc.sh b/recipes/ti/gstreamer-ti/gstreamer-ti-omap3530-rc.sh deleted file mode 100644 index b61b40c176..0000000000 --- a/recipes/ti/gstreamer-ti/gstreamer-ti-omap3530-rc.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/sh -# -# configure kernel modules for TI DSP based gstreamer plugin -# -# Default Memory Map -# -# Start Addr Size Description -# ------------------------------------------- -# 0x80000000 99 MB Linux -# 0x86300000 16 MB CMEM -# 0x87300000 13 MB CODEC SERVER -# - -# Disable XDM 0.9 elements -export GST_TI_TIViddec_DISABLE=1 -export GST_TI_TIAuddec_DISABLE=1 -export GST_TI_TIVidenc_DISABLE=1 -export GST_TI_TIImgdec_DISABLE=1 -export GST_TI_TIImgenc_DISABLE=1 - -load_module() { - # - # CMEM Allocation - # 1x5250000 Circular buffer - # 6x829440,1x691200 Video buffers (max D1 PAL) - # 1x345600 Underlying software components (codecs, etc.) - # 1x1 Dummy buffer used during final flush - modprobe cmemk allowOverlap=1 phys_start=0x86300000 phys_end=0x87300000 \ - pools=1x5250000,6x829440,1x345600,1x691200,1x1 - - # insert DSP/BIOS Link driver - modprobe dsplinkk - - # insert Local Power Manager driver - modprobe lpm_omap3530 - - # insert SDMA driver - modprobe sdmak -} - -unload_module() { - rmmod cmemk - rmmod lpm_omap3530 - rmmod dsplinkk - rmmod sdmak -} - -case "$1" in - start) - echo -n "Loading kernel modules for gstreamer-ti... " - load_module - echo " done" - ;; - stop) - echo -n "Unloading kernel module ..." - unload_module - echo " done" - ;; - restart) - echo -n "Unloading kernel module ..." - unload_module - echo " done" - echo -n "Loading kernel modules for gstreamer-ti... " - load_module - echo " done" - ;; - *) - echo "$0 <start/stop/restart>" - ;; -esac - diff --git a/recipes/ti/gstreamer-ti/gstreamer-ti-omapl138-rc.sh b/recipes/ti/gstreamer-ti/gstreamer-ti-omapl138-rc.sh deleted file mode 100644 index 353758b3a7..0000000000 --- a/recipes/ti/gstreamer-ti/gstreamer-ti-omapl138-rc.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -# -# configure kernel modules for TI DSP based gstreamer plugin -# - -# Disable XDM 0.9 elements -export GST_TI_TIViddec_DISABLE=1 -export GST_TI_TIAuddec_DISABLE=1 -export GST_TI_TIVidenc_DISABLE=1 -export GST_TI_TIImgdec_DISABLE=1 -export GST_TI_TIImgenc_DISABLE=1 - -load_module() { - # insert cmemk, tell it to occupy physical 34MB-64MB. - # - modprobe cmemk phys_start=0xC2200000 phys_end=0xC3200000 \ - pools=1x5250000,3x1048576,3x829440,1x256000,4x131072 - - modprobe dsplinkk - - rm -f /dev/dsplink - mknod /dev/dsplink c `awk "\\$2==\"dsplink\" {print \\$1}" /proc/devices` 0 -} - -unload_module() { - rmmod cmemk - rmmod dsplinkk - rm -f /dev/dsplink -} - -case "$1" in - start) - echo -n "Loading kernel modules for gstreamer-ti... " - load_module - echo " done" - ;; - stop) - echo -n "Unloading kernel module ..." - unload_module - echo " done" - ;; - restart) - echo -n "Unloading kernel module ..." - unload_module - echo " done" - echo -n "Loading kernel modules for gstreamer-ti... " - load_module - echo " done" - ;; - *) - echo "$0 <start/stop/restart>" - ;; -esac - diff --git a/recipes/ti/gstreamer-ti/gstreamer-ti-rc.sh b/recipes/ti/gstreamer-ti/gstreamer-ti-rc.sh new file mode 100644 index 0000000000..da844f4f62 --- /dev/null +++ b/recipes/ti/gstreamer-ti/gstreamer-ti-rc.sh @@ -0,0 +1,29 @@ +#!/bin/sh +# +# configure kernel modules to run gst-ti plugins elements +# + +load_module() { + echo + echo -n "Running /usr/share/ti/gst/<platform>/loadmodule.sh" + echo " (skipped)" + # /usr/share/ti/gst/<platform>/loadmodule.sh +} + +case "$1" in + start) + echo -n "Loading kernel modules for gstreamer-ti... " + load_module + echo " done" + ;; + stop) + echo "Nothing to do" + ;; + restart) + echo "Nothing to do" + ;; + *) + echo "$0 <start/stop/restart>" + ;; +esac + diff --git a/recipes/ti/gstreamer-ti/gstreamer-ti-remove-mp3-decode-support-from-auddec1.patch b/recipes/ti/gstreamer-ti/gstreamer-ti-remove-mp3-decode-support-from-auddec1.patch deleted file mode 100644 index 0fb7861a1c..0000000000 --- a/recipes/ti/gstreamer-ti/gstreamer-ti-remove-mp3-decode-support-from-auddec1.patch +++ /dev/null @@ -1,26 +0,0 @@ -This patch removes mp3 decoder cap from auddec elements. mp3 decoder is not part of tspa combo. If you are adding mp3 decoder support in your combo then do not apply this patch. - -diff -uNr ticodecplugin/src/gsttiauddec1.c ticodecplugin.new/src/gsttiauddec1.c ---- ticodecplugin/src/gsttiauddec1.c 2009-09-05 00:04:51.000000000 -0500 -+++ ticodecplugin.new/src/gsttiauddec1.c 2009-09-15 03:28:28.000000000 -0500 -@@ -85,7 +85,7 @@ - GST_PAD_ALWAYS, - GST_STATIC_CAPS - ("audio/mpeg, " -- "mpegversion = (int) { 1, 4 }") -+ "mpegversion = (int) { 4 }") - ); - - /* Define source (output) pad capabilities. Currently, RAW is supported. */ -diff -uNr ticodecplugin/src/gsttiauddec.c ticodecplugin.new/src/gsttiauddec.c ---- ticodecplugin/src/gsttiauddec.c 2009-09-05 00:04:51.000000000 -0500 -+++ ticodecplugin.new/src/gsttiauddec.c 2009-09-16 07:51:24.000000000 -0500 -@@ -85,7 +85,7 @@ - GST_PAD_ALWAYS, - GST_STATIC_CAPS - ("audio/mpeg, " -- "mpegversion = (int) { 1, 4 }") -+ "mpegversion = (int) { 4 }") - ); - - /* Constants */ diff --git a/recipes/ti/gstreamer-ti/gstreamer-ti-tracker-824.patch b/recipes/ti/gstreamer-ti/gstreamer-ti-tracker-824.patch deleted file mode 100644 index 634fa4aaf6..0000000000 --- a/recipes/ti/gstreamer-ti/gstreamer-ti-tracker-824.patch +++ /dev/null @@ -1,147 +0,0 @@ ---- ticodecplugin/ChangeLog -+++ ticodecplugin.new/ChangeLog -@@ -1,3 +1,7 @@ -+2009-08-14 Don Darling, Texas Instruments, Inc. -+ * src/{gstticodecplugin_omap3530.cfg,gstticodecs_omap3530.c}: -+ Update OMAP3530 Support to use DVSDK 3.00.00.40. -+ - 2009-07-28 Brijesh Singh, Texas Instruments, Inc. - * src/{gstticircbuffer.c}: - Fix potential memory leak in circular buffer when accel framecopy flag is ---- ticodecplugin/src/gstticodecplugin_omap3530.cfg -+++ ticodecplugin.new/src/gstticodecplugin_omap3530.cfg -@@ -12,8 +12,6 @@ - * - */ - --prog.build.platform = "ti.platforms.evm3530"; -- - /* Load the Codec Engine 'Operating System Abstraction Layer' */ - var osalGlobal = xdc.useModule('ti.sdo.ce.osal.Global'); - -@@ -27,31 +25,20 @@ ipc.commType = ipc.COMM_DSPLINK; - /* - * ======== Engine Configuration ======== - */ --var Engine = xdc.useModule('ti.sdo.ce.Engine'); --var encEngine = Engine.createFromServer( -- "encode", -- "./encodeCombo.x64P", -- "ti.sdo.servers.encode" -- ); --var decEngine = Engine.createFromServer( -- "decode", -- "./decodeCombo.x64P", -- "ti.sdo.servers.decode" -+var Engine = xdc.useModule('ti.sdo.ce.Engine'); -+var demoEngine = Engine.createFromServer( -+ "codecServer", -+ "./bin/cs.x64P", -+ "ti.sdo.server.cs" - ); - --var encpath = "" + java.lang.System.getenv("ENCODE_COMBO"); --if (encpath != "" && encpath != "null") { -- encEngine.server = java.lang.System.getenv("ENCODE_COMBO"); --} -- --var decpath = "" + java.lang.System.getenv("DECODE_COMBO"); --if (decpath != "" && decpath != "null") { -- decEngine.server = java.lang.System.getenv("DECODE_COMBO"); -+var combopath = "" + java.lang.System.getenv("CODEC_SERVER"); -+if (combopath != "" && combopath != "null") { -+ demoEngine.server = java.lang.System.getenv("CODEC_SERVER"); - } - - /* Load support for the DMAI module */ - var DMAI = xdc.loadPackage('ti.sdo.dmai'); - --/* Load support for user space DMA */ --var SCPY = xdc.useModule("ti.sdo.fc.scpy.SCPY"); --var SDMA = xdc.useModule("ti.sdo.linuxutils.sdma.SDMA"); -+var SCPY = xdc.useModule('ti.sdo.fc.scpy.SCPY'); -+var SDMA = xdc.useModule('ti.sdo.linuxutils.sdma.SDMA'); ---- ticodecplugin/src/gstticodecs_omap3530.c -+++ ticodecplugin.new/src/gstticodecs_omap3530.c -@@ -22,8 +22,7 @@ - #include "gstticodecs.h" - - /* Declaration of the production engine and decoders shipped with the DVSDK */ --static Char decodeEngine[] = "decode"; --static Char encodeEngine[] = "encode"; -+static Char codecServer[] = "codecServer"; - - /* NULL terminated list of speech decoders in the engine to use in the demo */ - GstTICodec gst_ticodec_codecs[] = { -@@ -32,59 +31,55 @@ GstTICodec gst_ticodec_codecs[] = { - { - "AAC Audio Decoder", /* String name of codec used by plugin */ - "aachedec", /* String name of codec used by CE */ -- decodeEngine /* Engine that contains this codec */ -+ codecServer /* Engine that contains this codec */ - }, { - "MPEG1L2 Audio Decoder", /* String name of codec used by plugin */ - "mp3dec", /* String name of codec used by CE */ -- decodeEngine /* Engine that contains this codec */ -+ codecServer /* Engine that contains this codec */ - }, { - "MPEG1L3 Audio Decoder", /* String name of codec used by plugin */ - "mp3dec", /* String name of codec used by CE */ -- decodeEngine /* Engine that contains this codec */ -- }, { -- "WMA Audio Decoder", /* String name of codec used by plugin */ -- "wmadec", /* String name of codec used by CE */ -- decodeEngine /* Engine that contains this codec */ -+ codecServer /* Engine that contains this codec */ - }, -- -+ - /* Video Decoders */ - { - "H.264 Video Decoder", /* String name of codec used by plugin */ - "h264dec", /* String name of codec used by CE */ -- decodeEngine /* Engine that contains this codec */ -+ codecServer /* Engine that contains this codec */ - }, { - "MPEG4 Video Decoder", /* String name of codec used by plugin */ - "mpeg4dec", /* String name of codec used by CE */ -- decodeEngine /* Engine that contains this codec */ -+ codecServer /* Engine that contains this codec */ - }, { - "MPEG2 Video Decoder", /* String name of codec used by plugin */ - "mpeg2dec", /* String name of codec used by CE */ -- decodeEngine /* Engine that contains this codec */ -+ codecServer /* Engine that contains this codec */ - }, - - /* Image Decoders */ - { - "JPEG Image Decoder", /* String name of codec used by plugin */ - "jpegdec", /* String name of codec used by CE */ -- decodeEngine /* Engine that contains this codec */ -+ codecServer /* Engine that contains this codec */ - }, - - /* Video Encoders */ - { - "H.264 Video Encoder", /* String name of codec used by plugin */ - "h264enc", /* String name of codec used by CE */ -- encodeEngine /* Engine that contains this codec */ -+ codecServer /* Engine that contains this codec */ - }, { - "MPEG4 Video Encoder", /* String name of codec used by plugin */ - "mpeg4enc", /* String name of codec used by CE */ -- encodeEngine /* Engine that contains this codec */ -+ codecServer /* Engine that contains this codec */ - }, - - /* Image Encoders */ - { - "JPEG Image Encoder", /* String name of codec used by plugin */ - "jpegenc", /* String name of codec used by CE */ -- encodeEngine /* Engine that contains this codec */ -+ codecServer /* Engine that contains this codec */ - }, - - { NULL } - diff --git a/recipes/ti/gstreamer-ti/gstreamer-ti-omapl137-rc.sh b/recipes/ti/gstreamer-ti/omap3/gstreamer-ti-rc.sh index 353758b3a7..cd9358f50c 100644 --- a/recipes/ti/gstreamer-ti/gstreamer-ti-omapl137-rc.sh +++ b/recipes/ti/gstreamer-ti/omap3/gstreamer-ti-rc.sh @@ -1,31 +1,19 @@ #!/bin/sh # -# configure kernel modules for TI DSP based gstreamer plugin +# configure kernel modules to run gst-ti plugins elements # -# Disable XDM 0.9 elements -export GST_TI_TIViddec_DISABLE=1 -export GST_TI_TIAuddec_DISABLE=1 -export GST_TI_TIVidenc_DISABLE=1 -export GST_TI_TIImgdec_DISABLE=1 -export GST_TI_TIImgenc_DISABLE=1 - load_module() { - # insert cmemk, tell it to occupy physical 34MB-64MB. - # - modprobe cmemk phys_start=0xC2200000 phys_end=0xC3200000 \ - pools=1x5250000,3x1048576,3x829440,1x256000,4x131072 - - modprobe dsplinkk - - rm -f /dev/dsplink - mknod /dev/dsplink c `awk "\\$2==\"dsplink\" {print \\$1}" /proc/devices` 0 + echo + echo -n "Running /usr/share/ti/gst/omap3530/loadmodules.sh" + sh /usr/share/ti/gst/omap3530/loadmodules.sh } unload_module() { rmmod cmemk + rmmod lpm_omap3530 rmmod dsplinkk - rm -f /dev/dsplink + rmmod sdmak } case "$1" in diff --git a/recipes/ti/gstreamer-ti/omap3/loadmodules.sh b/recipes/ti/gstreamer-ti/omap3/loadmodules.sh new file mode 100644 index 0000000000..e4d592fff7 --- /dev/null +++ b/recipes/ti/gstreamer-ti/omap3/loadmodules.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +# +# CMEM Allocation +# 1x5250000 Circular buffer +# 6x829440,1x691200 Video buffers (max D1 PAL) +# 1x345600 Underlying software components (codecs, etc.) +# 1x1 Dummy buffer used during final flush +modprobe cmemk allowOverlap=1 phys_start=0x86300000 phys_end=0x87300000 \ + pools=1x5250000,6x829440,1x345600,1x691200,1x1 + +# insert DSP/BIOS Link driver +modprobe dsplinkk + +# insert Local Power Manager driver +modprobe lpm_omap3530 + +# insert SDMA driver +modprobe sdmak + diff --git a/recipes/ti/gstreamer-ti/omap3evm/gstreamer-ti-rc.sh b/recipes/ti/gstreamer-ti/omap3evm/gstreamer-ti-rc.sh new file mode 100644 index 0000000000..da844f4f62 --- /dev/null +++ b/recipes/ti/gstreamer-ti/omap3evm/gstreamer-ti-rc.sh @@ -0,0 +1,29 @@ +#!/bin/sh +# +# configure kernel modules to run gst-ti plugins elements +# + +load_module() { + echo + echo -n "Running /usr/share/ti/gst/<platform>/loadmodule.sh" + echo " (skipped)" + # /usr/share/ti/gst/<platform>/loadmodule.sh +} + +case "$1" in + start) + echo -n "Loading kernel modules for gstreamer-ti... " + load_module + echo " done" + ;; + stop) + echo "Nothing to do" + ;; + restart) + echo "Nothing to do" + ;; + *) + echo "$0 <start/stop/restart>" + ;; +esac + diff --git a/recipes/ti/gstreamer-ti/omapl137/loadmodules.sh b/recipes/ti/gstreamer-ti/omapl137/loadmodules.sh new file mode 100644 index 0000000000..d031188109 --- /dev/null +++ b/recipes/ti/gstreamer-ti/omapl137/loadmodules.sh @@ -0,0 +1,12 @@ +#!/bin/sh +# +# configure kernel modules for TI DSP based gstreamer plugin +# + +# insert cmemk, tell it to occupy physical 34MB-64MB. +# +modprobe cmemk phys_start=0xC2200000 phys_end=0xC3200000 \ + pools=1x5250000,3x1048576,3x829440,1x256000,4x131072 + +modprobe dsplinkk + diff --git a/recipes/ti/gstreamer-ti/omapl138/loadmodules.sh b/recipes/ti/gstreamer-ti/omapl138/loadmodules.sh new file mode 100644 index 0000000000..64d3c933c4 --- /dev/null +++ b/recipes/ti/gstreamer-ti/omapl138/loadmodules.sh @@ -0,0 +1,13 @@ +#!/bin/sh +# +# configure kernel modules for TI DSP based gstreamer plugin +# + +modprobe cmemk phys_start=0xC2200000 phys_end=0xC3200000 \ + pools=1x5250000,3x1048576,3x829440,1x256000,4x131072 + +modprobe dsplinkk + +rm -f /dev/dsplink +mknod /dev/dsplink c `awk "\\$2==\"dsplink\" {print \\$1}" /proc/devices` 0 + diff --git a/recipes/ti/gstreamer-ti_svn.bb b/recipes/ti/gstreamer-ti_svn.bb index df0705c2ba..8cb1527b9c 100644 --- a/recipes/ti/gstreamer-ti_svn.bb +++ b/recipes/ti/gstreamer-ti_svn.bb @@ -1,164 +1,32 @@ -DESCRIPTION = "GSTREAMER Plugin (gstreamer-ti) for TI ARM/DSP processors" -HOMEPAGE = "https://gforge.ti.com/gf/project/gstreamer_ti/" -SECTION = "multimedia" - -# TODO :: Replace omapl137 with official support in GST (currently linking to omapl138) -# TODO :: Codec Server Environment Variables shouldn't be required -# TODO :: Add (and check) rc scripts for all targets (just copied for now) (365,6467,omapl137) -# TODO :: Check if CPPFLAGS_append is still required -# TODO :: Remove ENCODE/DECODE combo exports - these are not used anymore (check?) - -inherit autotools -inherit update-rc.d - -require ti-paths.inc -require ti-staging.inc - -PROVIDES += "gstreamer-ti-demo-script" +require gstreamer-ti.inc PV = "svnr${SRCREV}" -# Rebuild on kernel change since it links statically to ti-dmai, ti-codec-engine, etc -PR = "r50+${MACHINE_KERNEL_PR}" - S = "${WORKDIR}/gstreamer_ti/ti_build/ticodecplugin" -GST_TI_RC_SCRIPT_dm6446 = "gstreamer-ti-dm6446-rc.sh" -GST_TI_RC_SCRIPT_dm6467 = "gstreamer-ti-dm6467-rc.sh" -GST_TI_RC_SCRIPT_omap3 = "gstreamer-ti-omap3530-rc.sh" -GST_TI_RC_SCRIPT_dm355 = "gstreamer-ti-dm355-rc.sh" -GST_TI_RC_SCRIPT_dm365 = "gstreamer-ti-dm365-rc.sh" -GST_TI_RC_SCRIPT_omapl137 = "gstreamer-ti-omapl137-rc.sh" -GST_TI_RC_SCRIPT_omapl138 = "gstreamer-ti-omapl138-rc.sh" - -SRCREV = "573" +SRCREV = "612" SRC_URI = "svn://gforge.ti.com/svn/gstreamer_ti/trunk;module=gstreamer_ti;proto=https;user=anonymous;pswd='' \ - file://gstreamer-ti-tracker-462.patch \ - file://gstreamer-ti-remove-mp3-decode-support-from-auddec1.patch \ - file://mpeg2-caps.patch;striplevel=4\ - file://${GST_TI_RC_SCRIPT} \ -" - -SRC_URI_append_omap3 = " \ - file://gstreamer-ti-add-omapfb.patch \ + file://0001-gstreamer-ti-tracker-1055.patch \ + file://0002-add-omapl138-support.patch \ + file://0003-add-omapl137-support.patch \ + file://0004-gstreamer-ti-dm6467-usesinglecsserver.patch \ + file://0005-remove-mp3-mime-type.patch \ + file://0006-gstreamer-ti-tracker-462.patch \ + file://mpeg2-caps.patch;striplevel=4 \ + file://gstreamer-ti-rc.sh \ + file://gst-ti.sh \ " -SRC_URI_append_omapl137 = " \ - file://gstreamer-ti-omapl137.patch \ -" - -SRC_URI_append_omapl138 = " \ - file://gstreamer-ti-omapl138.patch \ -" - -SRC_URI_append_dm6467 = " \ - file://gstreamer-ti-dm6467-usesinglecsserver.patch \ -" - -DEPENDS = "ti-dmai gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly" - -# gstreamer_ti picks up some config variables from the environment -# - variables are used in the gstreamer makefile -# - PLATFORM, XDC_PLATFORM, XDC_TARGET, MVTOOL_DIR -# - others used by config.bld (which it gets from the dmai config.bld) -# - CROSS_COMPILE, PLATFORM_XDC - -PLATFORM_dm6446 = "dm6446" -PLATFORM_dm6467 = "dm6467" -PLATFORM_omap3 = "omap3530" -PLATFORM_dm355 = "dm355" -PLATFORM_dm365 = "dm365" -PLATFORM_omapl137 = "omapl137" -PLATFORM_omapl138 = "omapl138" -PLATFORM ?= "<UNDEFINED_PLATFORM>" - -XDC_PLATFORM_dm6446 = "ti.platforms.evmDM6446" -XDC_PLATFORM_dm6467 = "ti.platforms.evmDM6467" -XDC_PLATFORM_omap3 = "ti.platforms.evm3530" -XDC_PLATFORM_dm355 = "ti.platforms.evmDM355" -XDC_PLATFORM_dm365 = "ti.platforms.evmDM365" -XDC_PLATFORM_omapl137 = "ti.platforms.evmOMAPL137" -XDC_PLATFORM_omapl138 = "ti.platforms.evmOMAPL138" -XDC_PLATFORM ?= "<UNDEFINED_XDC_PLATFORM>" - -export PLATFORM -export XDC_PLATFORM -export XDC_TARGET = "gnu.targets.arm.GCArmv5T" -export PLATFORM_XDC = ${XDC_PLATFORM} -export MVTOOL_DIR = "${TOOLCHAIN_PATH}" -export CROSS_COMPILE = "${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}" - -# Makefile also expects to be able to find the kernel headers from the envirionment -export LINUXKERNEL_INSTALL_DIR = ${STAGING_KERNEL_DIR} - -# export codec combo (or server) locations -# Why do we need to do this?? - These will get picked up from CODEC_INSTALL_DIR? -# Sould only need this if we change from default server - -export HMJCP_COMBO = "${installdir}/ti-codecs-server/hmjcp.accel" -export CODEC_SERVER = "${installdir}/ti-codecs-server/cs.x64P" - -# TODO :: These 2 can be removed now since dm6467 uses single CS server (like omap/omapl) -export ENCODE_COMBO = "${installdir}/ti-codecs-server/encodeCombo.x64P" -export DECODE_COMBO = "${installdir}/ti-codecs-server/decodeCombo.x64P" - -CPPFLAGS_append = " -DPlatform_${PLATFORM}" - -do_configure_prepend() { - sed -i -e 's:(LINK_INSTALL_DIR)/packages:(LINK_INSTALL_DIR):g' ${S}/src/Makefile.am - - # TODO :: Is this still true? - # PSP kernel is based on older DSS. we need to replace linux/omapfb.h with mach/omapfb.h - if ! [ -e ${STAGING_KERNEL_DIR}/include/linux/omapfb.h ] ; then - sed -i -e s:linux/omapfb:mach/omapfb:g ${S}/src/omapfb.h || true - fi -} - -do_install_prepend () { - - # install gstreamer demo scripts - install -d ${D}/${installdir}/gst - cp -r ${WORKDIR}/gstreamer_ti/gstreamer_demo/shared ${D}/${installdir}/gst - - if [ -d ${WORKDIR}/gstreamer_ti/gstreamer_demo/${PLATFORM} ] ; then - cp -r ${WORKDIR}/gstreamer_ti/gstreamer_demo/${PLATFORM} ${D}/${installdir}/gst - - # default loadmodules script is hard-coded for insmod, change to modprobe - sed -i 's/insmod/modprobe/g' ${D}/${installdir}/gst/${PLATFORM}/loadmodules.sh - sed -i 's/.ko//g' ${D}/${installdir}/gst/${PLATFORM}/loadmodules.sh - - if [ "${PLATFORM}" = "omap3530" ]; then - echo "modprobe sdmak" >> ${D}/${installdir}/gst/${PLATFORM}/loadmodules.sh - fi - fi - - chmod 0755 ${D}/${installdir}/gst -R - install -d ${D}${sysconfdir}/init.d/ - install -m 0755 ${WORKDIR}/${GST_TI_RC_SCRIPT} ${D}${sysconfdir}/init.d/gstti-init -} - -RRECOMMENDS_${PN}_append_dm6446 += "ti-codecs-dm6446-server ti-cmem-module ti-dsplink-module" -RRECOMMENDS_${PN}_append_dm6467 += "ti-codecs-dm6467 ti-cmem-module ti-dsplink-module" -RRECOMMENDS_${PN}_append_omap3 += "ti-codecs-omap3530-server ti-cmem-module ti-dsplink-module ti-lpm-module ti-sdma-module" -RRECOMMENDS_${PN}_append_dm355 += "ti-codecs-dm355 ti-cmem-module ti-dm355mm-module" -RRECOMMENDS_${PN}_append_dm365 += "ti-codecs-dm365 ti-cmem-module ti-dm365mm-module ti-edma-module ti-irq-module" -RRECOMMENDS_${PN}_append_omapl137 += "ti-codecs-omapl137-server ti-cmem-module ti-dsplink-module" -RRECOMMENDS_${PN}_append_omapl138 += "ti-codecs-omapl138-server ti-cmem-module ti-dsplink-module" - -FILES_${PN} += "${libdir}/gstreamer-0.10/*.so ${sysconfdir}" -FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.a ${libdir}/gstreamer-0.10/*.la" -FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug" - -PACKAGES += "gstreamer-ti-demo-script" -RDEPENDS_gstreamer-ti-demo-script = "${PN}" - -FILES_gstreamer-ti-demo-script = "${installdir}/gst/*" +# use local loadmodules.sh for these platform +# TODO: must be removed onces these loadmodules goes in gstreamer.ti.com +SRC_URI_append_dm365 = " file://loadmodules.sh" +SRC_URI_append_omapl137 = " file://loadmodules.sh" +SRC_URI_append_omapl138 = " file://loadmodules.sh " -pkg_postinst_gstreamer-ti-demo-script () { - ln -sf ${installdir}/ti-codecs-server/* ${installdir}/gst/${PLATFORM}/ -} +SRC_URI_append_omap3 = " file://loadmodules.sh " +# apply omapdmaifbsink patch on omap3 platform +# NOTE: this patch need's X11 header/libs +SRC_URI_append_omap3 = " file://0007-add-omapdmaifbsink.patch;patch=1" -INITSCRIPT_NAME = "gstti-init" -INITSCRIPT_PARAMS = "start 30 5 2 . stop 40 0 1 6 ." diff --git a/recipes/ti/ti-codecs-dm355_3.10.00.00.bb b/recipes/ti/ti-codecs-dm355_3.10.00.00.bb new file mode 100644 index 0000000000..10f297d04b --- /dev/null +++ b/recipes/ti/ti-codecs-dm355_3.10.00.00.bb @@ -0,0 +1,47 @@ +DESCRIPTION = "TI Codecs for DM355" +HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent" +SECTION = "multimedia" +LICENSE = "TI" + +# TODO :: Move to common .inc + +# Not available publically, so disable for now: +DEFAULT_PREFERNCE = "-1" + +PV = "3_10_00_00" + +SRC_URI[dm355codecsbin.md5sum] = "4754892642d44aea67f43dee446ea1f7" +SRC_URI[dm355codecsbin.sha256sum] = "bad458c49543f585d7f55c3bcd63816613fa730522534b9959c49cdd7fb76492" + +PR = "r1" + +require ti-paths.inc +require ti-staging.inc + +PROVIDES += "ti-codecs-dm355-server" + +S = "${WORKDIR}/dm355_codecs_0${PV}" + +SRC_URI = "ftp://gtftp01.gt.design.ti.com/arago/dm355_codecs_0${PV}.tar.gz;name=dm355codecsbin \ + file://mapdmaq \ +" + +do_compile() { + echo "Do Nothing" +} + +do_install() { + + install -d ${D}/${installdir}/ti-codecs-server + cd ${S} + + install -m 0755 ${WORKDIR}/mapdmaq ${D}/${installdir}/ti-codecs-server + + install -d ${D}${CODEC_INSTALL_DIR_RECIPE} + cp -pPrf ${S}/* ${D}${CODEC_INSTALL_DIR_RECIPE} +} + +PACKAGES += "ti-codecs-dm355-server" +FILES_ti-codecs-dm355-server = "${installdir}/ti-codecs-server/*" + +INSANE_SKIP_ti-codecs-dm355-server = True diff --git a/recipes/ti/ti-codecs-dm365_3.10.00.05.bb b/recipes/ti/ti-codecs-dm365_3.10.00.05.bb new file mode 100644 index 0000000000..0542d66360 --- /dev/null +++ b/recipes/ti/ti-codecs-dm365_3.10.00.05.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "DM365 Codecs" +SECTION = "multimedia" +LICENSE = "TI" + +PV = "03_10_00_05" + +SRC_URI = "http://gt_tspa_dev.gt.design.ti.com/dev/DVSDK/310_DVSDK/3_10_00/dm365_codecs_${PV}.tar.gz;name=dm365codecs \ + file://mapdmaq" + +SRC_URI[dm365codecs.md5sum] = "c336e76101340b7a4f19214401824efe" +SRC_URI[dm365codecs.sha256sum] = "3ad43dcaf1b965c99a286f30cea928cf887308f7433ec0e6fd814954d91d0512" + +S = "${WORKDIR}/dm365_codecs_${PV}" + +PROVIDES += "ti-codecs-dm365-server" + +require ti-paths.inc +require ti-staging.inc + +do_compile() { + echo "Do nothing" +} + +do_install () { + install -d ${D}/${installdir}/ti-codecs-server + cd ${S} + + install -m 0755 ${WORKDIR}/mapdmaq ${D}/${installdir}/ti-codecs-server + + install -d ${D}${CODEC_INSTALL_DIR_RECIPE} + cp -pPrf ${S}/* ${D}${CODEC_INSTALL_DIR_RECIPE} +} + +PACKAGES += "ti-codecs-dm365-server" +FILES_ti-codecs-dm365-server = "${installdir}/ti-codecs-server/*" + +INSANE_SKIP_ti-codecs-dm365-server = True diff --git a/recipes/ti/ti-codecs-omap3530_1.00.01.bb b/recipes/ti/ti-codecs-omap3530_1.00.01.bb index 10aa733367..d6d871b833 100644 --- a/recipes/ti/ti-codecs-omap3530_1.00.01.bb +++ b/recipes/ti/ti-codecs-omap3530_1.00.01.bb @@ -1,6 +1,7 @@ DESCRIPTION = "TI Codecs (and Server Combo) for OMAP3530" HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent" SECTION = "multimedia" +LICENSE = "TI" # TODO :: Move to common .inc (omap3 and omapl ready) @@ -10,7 +11,7 @@ SRC_URI[omap3codecsbin.md5sum] = "4db567252e6c43119e1c0aafe401a679" SRC_URI[omap3codecsbin.sha256sum] = "e042e1aad42a6728adf5c955dc38e4f8331fc0eacd833f1cd75d9cbb4faff0b5" PE = "1" -PR = "r8" +PR = "r9" require ti-paths.inc require ti-staging.inc diff --git a/recipes/ti/ti-dmai.inc b/recipes/ti/ti-dmai.inc new file mode 100644 index 0000000000..2e04076478 --- /dev/null +++ b/recipes/ti/ti-dmai.inc @@ -0,0 +1,146 @@ +DESCRIPTION = "Davinci Multimedia Application Interface (DMAI) for TI ARM/DSP processors" +HOMEPAGE = "https://gforge.ti.com/gf/project/dmai/" +SECTION = "multimedia" +LICENSE = "BSD" + +# TODO :: + +require ti-paths.inc +require ti-staging.inc + +PROVIDES += "ti-dmai-apps ti-dmai-tests" + +PE = "1" + +SRCREV ?= "<UNDEFINED_SRCREV>" +DMAIBRANCH ?= "<UNDEFINED_DMAIBRANCH>" + +S = "${WORKDIR}/${DMAIBRANCH}/davinci_multimedia_application_interface" + +SRC_URI = "svn://gforge.ti.com/svn/dmai/;module=${DMAIBRANCH};proto=https;user=anonymous;pswd='' \ + file://loadmodules-ti-dmai-dm6446_al.sh \ + file://loadmodules-ti-dmai-dm6467_al.sh \ + file://loadmodules-ti-dmai-o3530_al.sh \ + file://loadmodules-ti-dmai-dm355_al.sh \ + file://loadmodules-ti-dmai-dm365_al.sh \ + file://loadmodules-ti-dmai-ol137_al.sh \ + file://loadmodules-ti-dmai-ol138_al.sh \ + " + +SRC_URI_append_omapl137 = " file://dmai-r423-add-omapl137-support.patch " + +DEPENDS = "virtual/kernel alsa-lib ti-framework-components ti-codec-engine ti-xdctools" + +DEPENDS_append_dm6446 = " ti-codecs-dm6446 ti-dspbios ti-cgt6x ti-linuxutils" +DEPENDS_append_dm6467 = " ti-codecs-dm6467 ti-dspbios ti-cgt6x ti-linuxutils" +DEPENDS_append_omap3 = " ti-codecs-omap3530 ti-dspbios ti-cgt6x ti-linuxutils" +DEPENDS_append_dm355 = " ti-codecs-dm355" +DEPENDS_append_dm365 = " ti-codecs-dm365" +DEPENDS_append_omapl137 = " ti-codecs-omapl137 ti-dspbios ti-cgt6x ti-linuxutils" +DEPENDS_append_omapl138 = " ti-codecs-omapl138 ti-dspbios ti-cgt6x ti-linuxutils" + +# Define DMAI build time variables +DMAIPLATFORM_dm6446 = "dm6446_al" +DMAIPLATFORM_dm6467 = "dm6467_al" +DMAIPLATFORM_omap3 = "o3530_al" +DMAIPLATFORM_dm355 = "dm355_al" +DMAIPLATFORM_dm365 = "dm365_al" +DMAIPLATFORM_omapl137 = "ol137_al" +DMAIPLATFORM_omapl138 = "ol138_al" +DMAIPLATFORM ?= "<UNDEFINED_DMAIPLATFORM>" + +# Need to set this for other platforms as well +#GPPOS_dm355 = "LINUX_GCC" +#GPPOS_dm365 = "LINUX_GCC" +#GPPOS ?= "<UNDEFINEDGPPOS>" + +# This is needed for dm355/dm365 targets in order to find ti.sdo.codecs.g711 +# TODO :: review - should we just pass this in do_compile? +USER_XDC_PATH = "${CE_INSTALL_DIR}/examples" + +PARALLEL_MAKE = "" + +do_prepsources() { + # TODO :: Why do we do this? + unset DMAI_INSTALL_DIR + cd ${S} + make XDC_INSTALL_DIR="${XDC_INSTALL_DIR}" PLATFORM="${DMAIPLATFORM}" clean +} + +addtask prepsources after do_configure before do_compile + +do_compile () { + + # TODO :: Why do we do this? + unset DMAI_INSTALL_DIR + cd ${S} + + for dir in ${S}/dmai ${S}/tests ; do + cd $dir + # TODO: Figure out how to pass the alsa require location, currently + # LINUXLIBS_INSTALL_DIR is hard-coded for armv5te + make \ + CE_INSTALL_DIR="${CE_INSTALL_DIR}" \ + CODEC_INSTALL_DIR="${CODEC_INSTALL_DIR}" \ + FC_INSTALL_DIR="${FC_INSTALL_DIR}" \ + LINUXKERNEL_INSTALL_DIR="${STAGING_KERNEL_DIR}" \ + XDC_INSTALL_DIR="${XDC_INSTALL_DIR}" \ + CODEGEN_INSTALL_DIR="${CODEGEN_INSTALL_DIR}" \ + BIOS_INSTALL_DIR="${BIOS_INSTALL_DIR}"\ + LINUXLIBS_INSTALL_DIR="${STAGING_DIR_TARGET}/usr" \ + USER_XDC_PATH="${USER_XDC_PATH}" \ + CROSS_COMPILE="${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}" \ + VERBOSE="true" \ + XDAIS_INSTALL_DIR="${XDAIS_INSTALL_DIR}" \ + LINK_INSTALL_DIR="${LINK_INSTALL_DIR}" \ + CMEM_INSTALL_DIR="${CMEM_INSTALL_DIR}" \ + LPM_INSTALL_DIR="${LPM_INSTALL_DIR}" \ + MVTOOL_PREFIX="${TARGET_PREFIX}" \ + PLATFORM="${DMAIPLATFORM}" + done +} + +do_install () { + + # TODO :: Why do we do this? + unset DMAI_INSTALL_DIR + + install -d ${D}/${installdir}/ti-dmai-apps + cd ${S}/dmai + make PLATFORM="${DMAIPLATFORM}" EXEC_DIR=${D}/${installdir}/ti-dmai-apps install + install -m 0755 ${WORKDIR}/loadmodules-ti-dmai-${DMAIPLATFORM}.sh ${D}/${installdir}/ti-dmai-apps/loadmodules.sh + + install -d ${D}/${installdir}/ti-dmai-tests + cd ${S}/tests + make PLATFORM="${DMAIPLATFORM}" EXEC_DIR=${D}/${installdir}/ti-dmai-tests install + install -m 0755 ${WORKDIR}/loadmodules-ti-dmai-${DMAIPLATFORM}.sh ${D}/${installdir}/ti-dmai-tests/loadmodules.sh + + install -d ${D}${DMAI_INSTALL_DIR_RECIPE} + cp -pPrf ${S}/dmai/* ${D}${DMAI_INSTALL_DIR_RECIPE} +} + +PACKAGES += "ti-dmai-apps" +FILES_ti-dmai-apps = "${installdir}/ti-dmai-apps/*" +INSANE_SKIP_ti-dmai-apps = True + +RDEPENDS_ti-dmai-apps_dm6446 += "ti-codecs-dm6446-server ti-cmem-module ti-dsplink-module" +RDEPENDS_ti-dmai-apps_dm6467 += "ti-codecs-dm6467 ti-cmem-module ti-dsplink-module" +RDEPENDS_ti-dmai-apps_omap3 += "ti-codecs-omap3530-server ti-cmem-module ti-dsplink-module ti-lpm-module ti-sdma-module" +RDEPENDS_ti-dmai-apps_dm355 += "ti-codecs-dm355 ti-cmem-module ti-dm355mm-module" +RDEPENDS_ti-dmai-apps_dm365 += "ti-codecs-dm365 ti-cmem-module ti-dm365mm-module ti-edma-module ti-irq-module" +RDEPENDS_ti-dmai-apps_omapl137 += "ti-codecs-omapl137-server ti-cmem-module ti-dsplink-module" +RDEPENDS_ti-dmai-apps_omapl138 += "ti-codecs-omapl138-server ti-cmem-module ti-dsplink-module" + +pkg_postinst_ti-dmai-apps () { + if [ -f ${installdir}/ti-codecs-server/*.${DSPSUFFIX} ]; then + ln -sf ${installdir}/ti-codecs-server/*.${DSPSUFFIX} ${installdir}/ti-dmai-apps/ + fi +} + +PACKAGES += "ti-dmai-tests" +FILES_ti-dmai-tests = "${installdir}/ti-dmai-tests/*" +INSANE_SKIP_ti-dmai-tests = True + +# To make dependency more simpler we just depend on ti-dmai-apps +RDEPENDS_ti-dmai-tests += "ti-dmai-apps" + diff --git a/recipes/ti/ti-dmai/0001-Correct-DMAI-s-Resize-module-for-DM365.patch b/recipes/ti/ti-dmai/0001-Correct-DMAI-s-Resize-module-for-DM365.patch new file mode 100644 index 0000000000..21e71dec15 --- /dev/null +++ b/recipes/ti/ti-dmai/0001-Correct-DMAI-s-Resize-module-for-DM365.patch @@ -0,0 +1,34 @@ +From 9d9326c26ea990fa49842e0c57d520a5acb4d887 Mon Sep 17 00:00:00 2001 +From: Don Darling <ddarling@ti.com> +Date: Fri, 16 Apr 2010 17:40:40 -0500 +Subject: [PATCH] Correct DMAI's Resize module for DM365. + +The PSP requires virtual addresses to be given for the resize buffers. This +differs from previous releases, which required physical addresses. This +change updates the Resize module to use virtual addresses. +--- + .../packages/ti/sdo/dmai/linux/dm365/Resize.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/dmai/packages/ti/sdo/dmai/linux/dm365/Resize.c b/dmai/packages/ti/sdo/dmai/linux/dm365/Resize.c +index c1716c4..3e71e46 100644 +--- a/dmai/packages/ti/sdo/dmai/linux/dm365/Resize.c ++++ b/dmai/packages/ti/sdo/dmai/linux/dm365/Resize.c +@@ -313,12 +313,12 @@ Int Resize_execute(Resize_Handle hResize, + + rsz.in_buff.index = -1; + rsz.in_buff.buf_type = IMP_BUF_IN; +- rsz.in_buff.offset = Buffer_getPhysicalPtr(hSrcBuf) + srcOffset; ++ rsz.in_buff.offset = ((Int32)Buffer_getUserPtr(hSrcBuf)) + srcOffset; + rsz.in_buff.size = Buffer_getSize(hSrcBuf); + + rsz.out_buff1.index = -1; + rsz.out_buff1.buf_type = IMP_BUF_OUT1; +- rsz.out_buff1.offset = Buffer_getPhysicalPtr(hDstBuf) + dstOffset; ++ rsz.out_buff1.offset = ((Int32)Buffer_getUserPtr(hDstBuf)) + dstOffset; + rsz.out_buff1.size = Buffer_getSize(hDstBuf); + + /* +-- +1.6.3.3 + diff --git a/recipes/ti/ti-dmai/arago-tdox b/recipes/ti/ti-dmai/arago-tdox new file mode 100644 index 0000000000..81538cf316 --- /dev/null +++ b/recipes/ti/ti-dmai/arago-tdox @@ -0,0 +1,210 @@ +#!/bin/bash +# +# +# This script sets a series of environment variable that are referenced +# in a doxygen configuration file. The values passed in here are simply +# plugged into the file locations and doxygen proceeds normaly. +# +# template location is ${VENDORS}/opensource/doxygen/templates/<version> +# +# + +# Revision history +#! 02 Jul 2009 cring: Added cmd line args for doxygendir (-x) and template (-t) +#! 13 Jul 2006 ada: New template smaller pdf generation +#! 16 May 2006 ada: Added -p file to pdf for space in project names +#! 08 May 2006 ada: Added pdf generation to tdox (Solaris/Linux only). +#! 23 Jan 2006 ada: Overide file to change default doxyfile behaivior +#! 19 Jan 2006 ada: 1093, ENUM_VALUES_PER_LINE set to 1, ref doxyfile via vers +#! 05 Oct 2005 ada: 933, doxyfile in tools, removed win and unix vendors path +#! 24 Aug 2005 ada: Added 897 changes, optional css c or jave optimization +#! 18 Aug 2005 ada: inital version from AR 887 + +# Set these defaults here as the usage statement uses them +TDOX_TEMPLATEDIR=${TOOLS}/default/doxygen_templates +DOXYGEN_EXECUTABLE=doxygen + +function usage +{ + OPTIONS="`basename $0` code_location out_doc_location [-x doxygen_exe ] [-t tdox_templatedir] [-n project_name] [-v version] [-f FILE_PATTERNS ] [-s strip_dir] [-c css location] [-e exclude dirs] [-b enabled sections] [-m generate chm] [-p pdf_file] [-o override doxyfile] [-j]" + echo "`basename $1` $OPTIONS" + echo "Where: " + echo "\tcode_location: Top of tree(s) to search for code (required as 1st param)" + echo "\tout_doc_location: Output location for generated files (required as 2nd param)" + echo "\t[-n project_name]: title of generated documentation (defaults to Project)" + echo "\t[-x doxygen_exe]: location of doxygen executable (defaults to $DOXYGEN_EXECUTABLE)" + echo "\t[-t tdox_templatedir]: location of tdox templates (defaults to $TDOX_TEMPLATEDIR)" + echo "\t[-v version]: version number or string (defaults to 1.0)" + echo "\t[-f FILE_PATTERNS]: Optional list of files to document (defaults to all)" + echo "\t[-s strip_dirs]: Remove directory prefix from generated files (defaults to not remove)" + echo "\t[-c path_to_css]: Path to a user suplied CSS style sheet" + echo "\t[-e exclude dirs]: List of directories to exclude" + echo "\t[-b enabled sections]: List of sections to enable" + echo "\t[-m generate chm]: chm file name (required)" + echo "\t[-p generate pdf <file>]: create <file>.pdf in html/pdf (Linux only)" + echo "\t[-o override doxyfile]: file (advanced) Overide any doxyfile default" + echo "\t[-j]: Optimize for Java (Generate class files) defaults to C" + echo "\t[-r]: Call rshd to windows for chm generation (defaults to wine)" + echo + exit +} + +function optimizeForJava +{ + DOX_OPTIMIZE_OUTPUT_JAVA="YES" + DOX_OPTIMIZE_OUTPUT_FOR_C="NO" +} + +if [ "$#" -lt 2 ]; then + echo "Invalid number of parameters" + usage $0 +fi + +# get the required parameters then shift for the getopts parameters +export DOX_INPUT="$1" +shift +export DOX_OUTPUT_DIRECTORY="$1" +shift + +#set the global defaults +DOX_QUIET="YES" +DOX_OPTIMIZE_OUTPUT_JAVA="NO" +DOX_OPTIMIZE_OUTPUT_FOR_C="YES" +DOX_CHM_FILE= +DOX_GENERATE_HTMLHELP="NO" +OVERRIDE_FILE="" +PDF="" + +# Process the rest of the arguments as getopts +# parameters +while getopts b:c:e:f:m:n:o:p:s:t:v:x:dhjr arg +do + case $arg in + b) DOX_ENABLED_SECTIONS=${OPTARG};; + c) DOX_HTML_STYLESHEET=${OPTARG};; + d) DEBUG=1;; + e) DOX_EXCLUDE=${OPTARG};; + f) DOX_FILE_PATTERNS=${OPTARG};; + h) usage;exit 0;; + j) optimizeForJava;; + r) USERSHD=1;; + m) DOX_CHM_FILE=${OPTARG};DOX_GENERATE_HTMLHELP="YES";; + n) DOX_PROJECT_NAME=${OPTARG};; + s) DOX_STRIP_FROM_PATH=${OPTARG};; + t) TDOX_TEMPLATEDIR=${OPTARG};; + v) DOX_PROJECT_NUMBER=${OPTARG};; + x) DOXYGEN_EXECUTABLE=${OPTARG};; + o) OVERRIDE_FILE=${OPTARG};; + p) PDF=${OPTARG};; + \?) usage + exit 2;; + esac +done + +if [ "$DEBUG" = "1" ]; then + DOX_QUIET="NO" + set -x +fi + +if [ "$DOX_PROJECT_NAME" = "" ]; then + DOX_PROJECT_NAME="Project" +fi + +if [ "$DOX_PROJECT_NUMBER" = "" ]; then + DOX_PROJECT_NUMBER="1.0" +fi + +if [ "$DOX_FILE_PATTERNS" = "" ]; then + DOX_FILE_PATTERNS="*.c \ + *.cc \ + *.cxx \ + *.cpp \ + *.c++ \ + *.d \ + *.java \ + *.ii \ + *.ixx \ + *.ipp \ + *.i++ \ + *.inl \ + *.h \ + *.hh \ + *.hxx \ + *.hpp \ + *.h++ \ + *.idl \ + *.odl \ + *.cs \ + *.php \ + *.php3 \ + *.inc \ + *.m \ + *.mm \ + *.dox" +fi + +export DOX_INPUT +export DOX_OUTPUT_DIRECTORY +export DOX_PROJECT_NAME +export DOX_PROJECT_NUMBER +export DOX_FILE_PATTERNS +export DOX_STRIP_FROM_PATH +export DOX_QUIET +export DOX_HTML_STYLESHEET +export DOX_OPTIMIZE_OUTPUT_FOR_C +export DOX_OPTIMIZE_OUTPUT_JAVA +export DOX_EXCLUDE +export DOX_ENABLED_SECTIONS +export DOX_CHM_FILE +export DOX_GENERATE_HTMLHELP +export TDOX_TEMPLATEDIR + + +# Make sure the dir exists +mkdir -p $DOX_OUTPUT_DIRECTORY + +# Create temp file copy of doxyfile and append overrides to the end of the file +cp ${TDOX_TEMPLATEDIR}/doxyfile /tmp/doxyfile$$ + +chmod +w /tmp/doxyfile$$ +if [ "$OVERRIDE_FILE" != "" ]; then + cat $OVERRIDE_FILE >> /tmp/doxyfile$$ +fi + +# Run doxygen and clean up temp file +${DOXYGEN_EXECUTABLE} /tmp/doxyfile$$ +rm -f /tmp/doxyfile$$ + +# Copy the TI banner gifs to the html directory. +cp -p ${TDOX_TEMPLATEDIR}/*gif $DOX_OUTPUT_DIRECTORY/html + +# Generate PDF files +if [ "$PDF" != "" ]; then + if [ "$BUILD_HOST_OS" = "Linux" ]; then + rm -rf $DOX_OUTPUT_DIRECTORY/html/pdf + mkdir -p $DOX_OUTPUT_DIRECTORY/html/pdf + cwd=`pwd` + cd $DOX_OUTPUT_DIRECTORY/latex + latex refman.tex + makeindex refman.idx + latex refman.tex + latex_count=5 + while egrep -s 'Rerun (LaTeX|to get cross-references right)' refman.log && [ $$latex_count -gt 0 ] + do + latex refman.tex + latex_count=`expr $$latex_count - 1` + done + dvips -o refman.ps refman.dvi + ps2pdf refman.ps refman.pdf + cd $cwd + mv $DOX_OUTPUT_DIRECTORY/latex/refman.pdf $DOX_OUTPUT_DIRECTORY/html/pdf/${PDF}.pdf + else + echo "Sorry... pdf generation supported under Linux only" + fi +fi + +# Generate Windows compressed help +if [ "$DOX_GENERATE_HTMLHELP" = "YES" ]; then + + echo "chm generation is not supported" +fi diff --git a/recipes/ti/ti-dmai/doxygen_templates.tar.gz b/recipes/ti/ti-dmai/doxygen_templates.tar.gz Binary files differnew file mode 100644 index 0000000000..6d613bf50f --- /dev/null +++ b/recipes/ti/ti-dmai/doxygen_templates.tar.gz diff --git a/recipes/ti/ti-dmai/loadmodules-ti-dmai-dm365_al.sh b/recipes/ti/ti-dmai/loadmodules-ti-dmai-dm365_al.sh index f5a7f6a5c6..36dc78eca7 100644 --- a/recipes/ti/ti-dmai/loadmodules-ti-dmai-dm365_al.sh +++ b/recipes/ti/ti-dmai/loadmodules-ti-dmai-dm365_al.sh @@ -1,14 +1,25 @@ #!/bin/sh + +# This loadmodules script is provided to support 1920x1080 resolution file based encode/decode DMAI unit test applications + +# Sample bootargs is given below +# mem=60M console=ttyS0,115200n8 root=/dev/nfs rw nfsroot=<nfsroot> ip=dhcp video=davincifb:vid0=OFF:vid1=OFF:osd0=720x576x16,2025K dm365_imp.oper_mode=0 + +depmod -a rmmod cmemk 2>/dev/null rmmod irqk 2>/dev/null rmmod edmak 2>/dev/null rmmod dm365mmap 2>/dev/null # Pools configuration -modprobe cmemk phys_start=0x85000000 phys_end=0x88000000 pools=6x4096,2x8192,1x11908,2x13184,1x2697152,6x4096,1x30720,3x81920,1x3185664,64x56,1x320,1x640,1x81920,1x6650880,2x608,1x296,1x28,2x24,23x1548288,1x154288 allowOverlap=1 phys_start_1=0x00001000 phys_end_1=0x00008000 pools_1=1x28672 +modprobe cmemk phys_start=0x83C00000 phys_end=0x88000000 pools=1x384,2x5984,2x3133440,1x16384,1x48952,1x20480,1x60288,1x74,1x28,1x2048,1x6785280,1x146,1x896,1x65536,1x98,1x296,29x56,2x24,1x624,4x62,1x1456,1x18321120,1x65792,5x3523584,1x4194304,1x8355840 + +#VC1 decode pool configuration +# insmod cmemk.ko phys_start=0x83C00000 phys_end=0x88000000 pools=1x384,1x112665,3x7680,1x319264,2x1024,5x7208960,1x80,1x116,1x29184,1x2688,1x30720,1x551680,2x128,1x74,1x28,1x10240,1x47232,1x448,2x1152,1x8192,2x272896,18x56,2x24,1x86,4x62,2x7808,1x2097152 modprobe irqk modprobe edmak modprobe dm365mmap + rm -f /dev/dm365mmap mknod /dev/dm365mmap c `awk "\\$2==\"dm365mmap\" {print \\$1}" /proc/devices` 0 diff --git a/recipes/ti/ti-dmai_2.10.00.09.bb b/recipes/ti/ti-dmai_2.10.00.09.bb new file mode 100644 index 0000000000..a531a55bf9 --- /dev/null +++ b/recipes/ti/ti-dmai_2.10.00.09.bb @@ -0,0 +1,21 @@ +require ti-dmai.inc + +PV = "2_10_00_09" +PR = "r3" + +COMPATIBLE_MACHINE = "(dm365-evm|dm355-evm|dm6467-evm)" + +SRC_URI_append = "file://doxygen_templates.tar.gz \ + file://arago-tdox" + +SRCREV = "443" +DMAIBRANCH = "branches/GITPSP_INT_101009" + +do_install_prepend () { + find ${S} -name .svn -type d | xargs rm -rf + cp -pPrf ${WORKDIR}/doxygen_templates ${S} + cp -pPrf ${WORKDIR}/arago-tdox ${S}/tdox + chmod a+x ${S}/release.sh + chmod a+x ${S}/tdox + ${S}/release.sh ${PV} +} diff --git a/recipes/ti/ti-dmai_2.10.00.10.bb b/recipes/ti/ti-dmai_2.10.00.10.bb new file mode 100644 index 0000000000..66cc424d7c --- /dev/null +++ b/recipes/ti/ti-dmai_2.10.00.10.bb @@ -0,0 +1,22 @@ +require ti-dmai.inc + +PV = "2_10_00_10" +PR = "r2" + +COMPATIBLE_MACHINE = "(dm365-evm|dm355-evm|dm6467-evm)" + +SRC_URI_append = "file://0001-Correct-DMAI-s-Resize-module-for-DM365.patch;patch=3 \ + file://doxygen_templates.tar.gz \ + file://arago-tdox" + +SRCREV = "452" +DMAIBRANCH = "branches/GITPSP_INT_101009" + +do_install_prepend () { + find ${S} -name .svn -type d | xargs rm -rf + cp -pPrf ${WORKDIR}/doxygen_templates ${S} + cp -pPrf ${WORKDIR}/arago-tdox ${S}/tdox + chmod a+x ${S}/release.sh + chmod a+x ${S}/tdox + ${S}/release.sh ${PV} +} diff --git a/recipes/ti/ti-dmai_svn.bb b/recipes/ti/ti-dmai_svn.bb index 91c1b4b268..f970161d69 100644 --- a/recipes/ti/ti-dmai_svn.bb +++ b/recipes/ti/ti-dmai_svn.bb @@ -1,23 +1,12 @@ -DESCRIPTION = "Davinci Multimedia Application Interface (DMAI) for TI ARM/DSP processors" -HOMEPAGE = "https://gforge.ti.com/gf/project/dmai/" -SECTION = "multimedia" -LICENSE = "BSD" +require ti-dmai.inc -# TODO :: +DEFAULT_PREFERENCE = "-1" -require ti-paths.inc -require ti-staging.inc - -PROVIDES += "ti-dmai-apps ti-dmai-tests" - -PE = "1" -PV = "1.0+svnr${SRCPV}" +PV = "2_10_00_01+svnr${SRCPV}" # This package has high dependence on kernel, use kernel PR as base and append a local version PR = "${MACHINE_KERNEL_PR}" -PR_append = "j" - -S = "${WORKDIR}/${DMAIBRANCH}/davinci_multimedia_application_interface" +PR_append = "l" DMAIBRANCH_dm6446 = "trunk" DMAIBRANCH_dm6467 = "branches/GITPSP_INT_101009" @@ -36,154 +25,3 @@ SRCREV_dm365 = "441" SRCREV_omapl137 = "423" SRCREV_omapl138 = "423" SRCREV ?= "<UNDEFINED_SRCREV>" - -SRC_URI = "svn://gforge.ti.com/svn/dmai/;module=${DMAIBRANCH};proto=https;user=anonymous;pswd='' \ - file://loadmodules-ti-dmai-dm6446_al.sh \ - file://loadmodules-ti-dmai-dm6467_al.sh \ - file://loadmodules-ti-dmai-o3530_al.sh \ - file://loadmodules-ti-dmai-dm355_al.sh \ - file://loadmodules-ti-dmai-dm365_al.sh \ - file://loadmodules-ti-dmai-ol137_al.sh \ - file://loadmodules-ti-dmai-ol138_al.sh \ - " - -SRC_URI_append_omapl137 = " file://dmai-r423-add-omapl137-support.patch " - -DEPENDS = "virtual/kernel alsa-lib ti-framework-components ti-codec-engine ti-xdctools" - -DEPENDS_append_dm6446 = " ti-codecs-dm6446 ti-dspbios ti-cgt6x ti-linuxutils" -DEPENDS_append_dm6467 = " ti-codecs-dm6467 ti-dspbios ti-cgt6x ti-linuxutils" -DEPENDS_append_omap3 = " ti-codecs-omap3530 ti-dspbios ti-cgt6x ti-linuxutils" -DEPENDS_append_dm355 = " ti-codecs-dm355" -DEPENDS_append_dm365 = " ti-codecs-dm365" -DEPENDS_append_omapl137 = " ti-codecs-omapl137 ti-dspbios ti-cgt6x ti-linuxutils" -DEPENDS_append_omapl138 = " ti-codecs-omapl138 ti-dspbios ti-cgt6x ti-linuxutils" - -# Define DMAI build time variables -DMAIPLATFORM_dm6446 = "dm6446_al" -DMAIPLATFORM_dm6467 = "dm6467_al" -DMAIPLATFORM_omap3 = "o3530_al" -DMAIPLATFORM_dm355 = "dm355_al" -DMAIPLATFORM_dm365 = "dm365_al" -DMAIPLATFORM_omapl137 = "ol137_al" -DMAIPLATFORM_omapl138 = "ol138_al" -DMAIPLATFORM ?= "<UNDEFINED_DMAIPLATFORM>" - -# Need to set this for other platforms as well -#GPPOS_dm355 = "LINUX_GCC" -#GPPOS_dm365 = "LINUX_GCC" -#GPPOS ?= "<UNDEFINEDGPPOS>" - -# This is needed for dm355/dm365 targets in order to find ti.sdo.codecs.g711 -# TODO :: review - should we just pass this in do_compile? -USER_XDC_PATH = "${CE_INSTALL_DIR}/examples" - -PARALLEL_MAKE = "" - -do_configure () { - - sed -i -e 's:(LINK_INSTALL_DIR)/packages:(LINK_INSTALL_DIR):g' ${S}/dmai/packages/ti/sdo/dmai/apps/Makefile.app - sed -i -e 's:(LINK_INSTALL_DIR)/packages:(LINK_INSTALL_DIR):g' ${S}/dmai/packages/ti/sdo/dmai/Makefile - - # TODO :: Is this still true? - # PSP kernel is based on older DSS. we need to replace linux/omapfb.h with mach/omapfb.h - if ! [ -e ${STAGING_KERNEL_DIR}/include/linux/omapfb.h ] ; then - sed -i -e s:linux/omapfb:mach/omapfb:g ${S}/dmai/packages/ti/sdo/dmai/linux/Display_fbdev.c - sed -i -e s:linux/omapfb:mach/omapfb:g ${S}/dmai/packages/ti/sdo/dmai/linux/priv/_Display.h - fi -} - -do_prepsources() { - - # TODO :: Why do we do this? - unset DMAI_INSTALL_DIR - cd ${S} - make XDC_INSTALL_DIR="${XDC_INSTALL_DIR}" PLATFORM="${DMAIPLATFORM}" clean -} - -addtask prepsources after do_configure before do_compile - -do_compile () { - - # TODO :: Why do we do this? - unset DMAI_INSTALL_DIR - cd ${S} - - for dir in ${S}/dmai ${S}/tests ; do - cd $dir - # TODO: Figure out how to pass the alsa require location, currently - # LINUXLIBS_INSTALL_DIR is hard-coded for armv5te - make \ - CE_INSTALL_DIR="${CE_INSTALL_DIR}" \ - CODEC_INSTALL_DIR="${CODEC_INSTALL_DIR}" \ - FC_INSTALL_DIR="${FC_INSTALL_DIR}" \ - LINUXKERNEL_INSTALL_DIR="${STAGING_KERNEL_DIR}" \ - XDC_INSTALL_DIR="${XDC_INSTALL_DIR}" \ - CODEGEN_INSTALL_DIR="${CODEGEN_INSTALL_DIR}" \ - BIOS_INSTALL_DIR="${BIOS_INSTALL_DIR}"\ - LINUXLIBS_INSTALL_DIR="${STAGING_DIR_TARGET}/usr" \ - USER_XDC_PATH="${USER_XDC_PATH}" \ - CROSS_COMPILE="${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}" \ - VERBOSE="true" \ - XDAIS_INSTALL_DIR="${XDAIS_INSTALL_DIR}" \ - LINK_INSTALL_DIR="${LINK_INSTALL_DIR}" \ - CMEM_INSTALL_DIR="${CMEM_INSTALL_DIR}" \ - LPM_INSTALL_DIR="${LPM_INSTALL_DIR}" \ - MVTOOL_PREFIX="${TARGET_PREFIX}" \ - PLATFORM="${DMAIPLATFORM}" - done -} - -do_install () { - - # TODO :: Why do we do this? - unset DMAI_INSTALL_DIR - - install -d ${D}/${installdir}/ti-dmai-apps - cd ${S}/dmai - make PLATFORM="${DMAIPLATFORM}" EXEC_DIR=${D}/${installdir}/ti-dmai-apps install - install -m 0755 ${WORKDIR}/loadmodules-ti-dmai-${DMAIPLATFORM}.sh ${D}/${installdir}/ti-dmai-apps/loadmodules.sh - - install -d ${D}/${installdir}/ti-dmai-tests - cd ${S}/tests - make PLATFORM="${DMAIPLATFORM}" EXEC_DIR=${D}/${installdir}/ti-dmai-tests install - install -m 0755 ${WORKDIR}/loadmodules-ti-dmai-${DMAIPLATFORM}.sh ${D}/${installdir}/ti-dmai-tests/loadmodules.sh - - install -d ${D}${DMAI_INSTALL_DIR_RECIPE} - cp -pPrf ${S}/dmai/* ${D}${DMAI_INSTALL_DIR_RECIPE} -} - -PACKAGES += "ti-dmai-apps" -FILES_ti-dmai-apps = "${installdir}/ti-dmai-apps/*" -INSANE_SKIP_ti-dmai-apps = True - -RDEPENDS_ti-dmai-apps_dm6446 += "ti-codecs-dm6446-server ti-cmem-module ti-dsplink-module" -RDEPENDS_ti-dmai-apps_dm6467 += "ti-codecs-dm6467 ti-cmem-module ti-dsplink-module" -RDEPENDS_ti-dmai-apps_omap3 += "ti-codecs-omap3530-server ti-cmem-module ti-dsplink-module ti-lpm-module ti-sdma-module" -RDEPENDS_ti-dmai-apps_dm355 += "ti-codecs-dm355 ti-cmem-module ti-dm355mm-module" -RDEPENDS_ti-dmai-apps_dm365 += "ti-codecs-dm365 ti-cmem-module ti-dm365mm-module ti-edma-module ti-irq-module" -RDEPENDS_ti-dmai-apps_omapl137 += "ti-codecs-omapl137-server ti-cmem-module ti-dsplink-module" -RDEPENDS_ti-dmai-apps_omapl138 += "ti-codecs-omapl138-server ti-cmem-module ti-dsplink-module" - -pkg_postinst_ti-dmai-apps () { - ln -sf ${installdir}/ti-codecs-server/*.${DSPSUFFIX} ${installdir}/ti-dmai-apps/ -} - -PACKAGES += "ti-dmai-tests" -FILES_ti-dmai-tests = "${installdir}/ti-dmai-tests/*" -INSANE_SKIP_ti-dmai-tests = True - -# TODO :: Thes could be inherited from ti-dmai-apps -RDEPENDS_ti-dmai-tests_dm6446 += "ti-codecs-dm6446-server ti-cmem-module ti-dsplink-module" -RDEPENDS_ti-dmai-tests_dm6467 += "ti-codecs-dm6467 ti-cmem-module ti-dsplink-module" -RDEPENDS_ti-dmai-tests_omap3 += "ti-codecs-omap3530-server ti-cmem-module ti-dsplink-module ti-lpm-module ti-sdma-module" -RDEPENDS_ti-dmai-tests_dm355 += "ti-codecs-dm355 ti-cmem-module ti-dm355mm-module" -RDEPENDS_ti-dmai-tests_dm365 += "ti-codecs-dm365 ti-cmem-module ti-dm365mm-module ti-edma-module ti-irq-module" -RDEPENDS_ti-dmai-tests_omapl137 += "ti-codecs-omapl137-server ti-cmem-module ti-dsplink-module" -RDEPENDS_ti-dmai-tests_omapl138 += "ti-codecs-omapl138-server ti-cmem-module ti-dsplink-module" - -pkg_postinst_ti-dmai-tests () { - ln -sf ${installdir}/ti-codecs-server/*.${DSPSUFFIX} ${installdir}/ti-dmai-tests/ -} - - diff --git a/recipes/ti/ti-dsplink.inc b/recipes/ti/ti-dsplink.inc index aec2742f87..119211e906 100644 --- a/recipes/ti/ti-dsplink.inc +++ b/recipes/ti/ti-dsplink.inc @@ -172,16 +172,19 @@ PACKAGES += "ti-dsplink-module" FILES_ti-dsplink-module = "/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp/dsplinkk.ko" RDEPENDS_ti-dsplink-module += "update-modules" -pkg_postinst_ti-dsplink-module_append () { - if [ -n "$D" ]; then - exit 1 - fi - depmod -a - update-modules || true +pkg_postinst_ti-dsplink-module () { +#!/bin/sh +if [ -n "$D" ]; then + exit 1 +fi + +depmod -a +update-modules || true } -pkg_postrm_ti-dsplink-module_append () { - update-modules || true +pkg_postrm_ti-dsplink-module () { +#!/bin/sh +update-modules || true } PACKAGES += "ti-dsplink-examples" diff --git a/recipes/ti/ti-dvsdk-demos.inc b/recipes/ti/ti-dvsdk-demos.inc index af1ecd8b97..0cb894e703 100644 --- a/recipes/ti/ti-dvsdk-demos.inc +++ b/recipes/ti/ti-dvsdk-demos.inc @@ -2,16 +2,17 @@ DESCRIPTION = "DVSDK Demo applications for TI ARM/DSP processors" SECTION = "multimedia" LICENSE = "TI" -INC_PR = "r1" - +INC_PR = "r5" + DEPENDS += "ti-dmai" DEPENDS += "alsa-lib libpng freetype jpeg" -SRC_URI = "${BASE_SRC_URI}/dvsdk_demos_${PV}.tar.gz;name=dvsdkdemostarball" +SRC_URI = "http://gt_tspa_dev.gt.design.ti.com/dev/DVSDK/310_DVSDK/3_10_00/dvsdk_demos_${PV}.tar.gz;name=dvsdkdemostarball" S = "${WORKDIR}/dvsdk_demos_${PV}" require ti-paths.inc +require ti-staging.inc DEMOSPLATFORM_dm355 = "dm355" DEMOSPLATFORM_dm365 = "dm365" @@ -49,6 +50,9 @@ do_compile () { } do_install () { + install -d ${D}${DVSDK_DEMOS_INSTALL_DIR_RECIPE} + cp -pPrf ${S}/* ${D}${DVSDK_DEMOS_INSTALL_DIR_RECIPE} + cd ${S} make -e EXEC_DIR=${D}/${installdir}/dvsdk-demos \ PLATFORM=${DEMOSPLATFORM} \ @@ -57,8 +61,8 @@ do_install () { PACKAGE_ARCH = "${MACHINE_ARCH}" -RDEPENDS_ti-dvsdk-demos_dm355 += "ti-dm355mm-module ti-cmem-module alsa-lib libpng freetype jpeg" -RDEPENDS_ti-dvsdk-demos_dm365 += "ti-dm365mm-module ti-cmem-module alsa-lib libpng freetype jpeg" +RDEPENDS_ti-dvsdk-demos_dm355 += "ti-dm355mm-module ti-cmem-module alsa-lib libpng freetype jpeg libpng12" +RDEPENDS_ti-dvsdk-demos_dm365 += "ti-dm365mm-module ti-cmem-module alsa-lib libpng freetype jpeg ti-codecs-dm365 ti-edma-module ti-irq-module libpng12" FILES_${PN} = "${installdir}/dvsdk-demos/*" diff --git a/recipes/ti/ti-dvsdk-demos/changed_insmod_to_modprobe_in_loadmodules.patch b/recipes/ti/ti-dvsdk-demos/changed_insmod_to_modprobe_in_loadmodules.patch new file mode 100644 index 0000000000..f0348a56f9 --- /dev/null +++ b/recipes/ti/ti-dvsdk-demos/changed_insmod_to_modprobe_in_loadmodules.patch @@ -0,0 +1,99 @@ +diff -uNr dvsdk_demos_3_10_00_13_orig/dm355/loadmodules.sh dvsdk_demos_3_10_00_13/dm355/loadmodules.sh +--- dvsdk_demos_3_10_00_13_orig/dm355/loadmodules.sh 2010-04-13 18:30:14.000000000 -0500 ++++ dvsdk_demos_3_10_00_13/dm355/loadmodules.sh 2010-04-13 18:50:42.000000000 -0500 +@@ -8,13 +8,18 @@ + rmmod edmak 2>/dev/null + rmmod dm350mmap 2>/dev/null + +-insmod cmemk.ko phys_start=0x86000000 phys_end=0x88000000 pools=10x829440,1x1529856,1x276,1x4320,1x560,2x344,1x144,1x81920,2x512,1x14000,1x12960,1x11360,1x4,2x296,1x8192,59x56,4x24,1x1505280,9x1658880,1x2258880 ++depmod -a cmemk ++depmod -a irqk ++depmod -a dm350mmap ++depmod -a edmak ++ ++modprobe cmemk phys_start=0x86000000 phys_end=0x88000000 pools=10x829440,1x1529856,1x276,1x4320,1x560,2x344,1x144,1x81920,2x512,1x14000,1x12960,1x11360,1x4,2x296,1x8192,59x56,4x24,1x1505280,9x1658880,1x2258880 + + ./mapdmaq + +-insmod irqk.ko +-insmod edmak.ko +-insmod dm350mmap.ko ++modprobe irqk ++modprobe edmak ++modprobe dm350mmap + + rm -f /dev/dm350mmap + mknod /dev/dm350mmap c `awk "\\$2==\"dm350mmap\" {print \\$1}" /proc/devices` 0 +diff -uNr dvsdk_demos_3_10_00_13_orig/dm365/loadmodules_hd.sh dvsdk_demos_3_10_00_13/dm365/loadmodules_hd.sh +--- dvsdk_demos_3_10_00_13_orig/dm365/loadmodules_hd.sh 2010-04-13 18:30:15.000000000 -0500 ++++ dvsdk_demos_3_10_00_13/dm365/loadmodules_hd.sh 2010-04-13 18:27:14.000000000 -0500 +@@ -10,15 +10,20 @@ + rmmod edmak 2>/dev/null + rmmod dm365mmap 2>/dev/null + ++depmod -a cmemk ++depmod -a irqk ++depmod -a dm365mmap ++depmod -a edmak ++ + # Pools configuration +-insmod cmemk.ko phys_start=0x83C00000 phys_end=0x88000000 pools=1x384,2x5984,2x3133440,1x16384,1x48952,1x20480,1x60288,1x74,1x28,1x2048,1x6785280,1x146,1x896,1x65536,1x98,1x296,29x56,2x24,1x624,4x62,1x1456,1x18321120,1x65792,5x3523584,1x4194304,1x8355840 ++modprobe cmemk phys_start=0x83C00000 phys_end=0x88000000 pools=1x384,2x5984,2x3133440,1x16384,1x48952,1x20480,1x60288,1x74,1x28,1x2048,1x6785280,1x146,1x896,1x65536,1x98,1x296,29x56,2x24,1x624,4x62,1x1456,1x18321120,1x65792,5x3523584,1x4194304,1x8355840 + + #VC1 decode pool configuration +-# insmod cmemk.ko phys_start=0x83C00000 phys_end=0x88000000 pools=1x384,1x112665,3x7680,1x319264,2x1024,5x7208960,1x80,1x116,1x29184,1x2688,1x30720,1x551680,2x128,1x74,1x28,1x10240,1x47232,1x448,2x1152,1x8192,2x272896,18x56,2x24,1x86,4x62,2x7808,1x2097152 ++# modprobe cmemk phys_start=0x83C00000 phys_end=0x88000000 pools=1x384,1x112665,3x7680,1x319264,2x1024,5x7208960,1x80,1x116,1x29184,1x2688,1x30720,1x551680,2x128,1x74,1x28,1x10240,1x47232,1x448,2x1152,1x8192,2x272896,18x56,2x24,1x86,4x62,2x7808,1x2097152 + +-insmod irqk.ko +-insmod edmak.ko +-insmod dm365mmap.ko ++modprobe irqk ++modprobe edmak ++modprobe dm365mmap + + rm -f /dev/dm365mmap + mknod /dev/dm365mmap c `awk "\\$2==\"dm365mmap\" {print \\$1}" /proc/devices` 0 +diff -uNr dvsdk_demos_3_10_00_13_orig/dm365/loadmodules.sh dvsdk_demos_3_10_00_13/dm365/loadmodules.sh +--- dvsdk_demos_3_10_00_13_orig/dm365/loadmodules.sh 2010-04-13 18:30:14.000000000 -0500 ++++ dvsdk_demos_3_10_00_13/dm365/loadmodules.sh 2010-04-13 18:27:18.000000000 -0500 +@@ -8,12 +8,17 @@ + rmmod edmak 2>/dev/null + rmmod dm365mmap 2>/dev/null + ++depmod -a cmemk ++depmod -a irqk ++depmod -a dm365mmap ++depmod -a edmak ++ + # Pools configuration +-insmod cmemk.ko phys_start=0x83C00000 phys_end=0x88000000 pools=2x384,1x16384,1x2688,1x20480,3x74,1x60288,2x28,1x147048,1x10240,1x896,1x65536,1x663552,1x9175376,4x24,1x282624,2x5984,1x58144,1x1024,1x48952,1x464,2x16768,1x1251264,1x30720,1x65792,8x774144,1x173712,1x146,1x98,2x296,50x56,2x86,1x624,1x3328,1x518912,4x62,1x242,4x663552,1x1637824,14x1645056,1x16538976,4x1382400 ++modprobe cmemk phys_start=0x83C00000 phys_end=0x88000000 pools=2x384,1x16384,1x2688,1x20480,3x74,1x60288,2x28,1x147048,1x10240,1x896,1x65536,1x663552,1x9175376,4x24,1x282624,2x5984,1x58144,1x1024,1x48952,1x464,2x16768,1x1251264,1x30720,1x65792,8x774144,1x173712,1x146,1x98,2x296,50x56,2x86,1x624,1x3328,1x518912,4x62,1x242,4x663552,1x1637824,14x1645056,1x16538976,4x1382400 + +-insmod irqk.ko +-insmod edmak.ko +-insmod dm365mmap.ko ++modprobe irqk ++modprobe edmak ++modprobe dm365mmap + + rm -f /dev/dm365mmap + mknod /dev/dm365mmap c `awk "\\$2==\"dm365mmap\" {print \\$1}" /proc/devices` 0 +diff -uNr dvsdk_demos_3_10_00_13_orig/dm6467/loadmodules.sh dvsdk_demos_3_10_00_13/dm6467/loadmodules.sh +--- dvsdk_demos_3_10_00_13_orig/dm6467/loadmodules.sh 2010-04-13 18:30:14.000000000 -0500 ++++ dvsdk_demos_3_10_00_13/dm6467/loadmodules.sh 2010-04-13 18:52:08.000000000 -0500 +@@ -6,10 +6,13 @@ + rmmod cmemk.ko 2>/dev/null + rmmod dsplinkk.ko 2>/dev/null + +-insmod cmemk.ko phys_start=0x84C00000 phys_end=0x8ba00000 pools=2x921600,1x460800,1x1048576,1x345600,2x86400,11x564528,5x677376,14x5396480,3x4147200,4x1451520,4x1843200 ++depmod -a cmemk ++depmod -a dsplinkk ++ ++modprobe cmemk phys_start=0x84C00000 phys_end=0x8ba00000 pools=2x921600,1x460800,1x1048576,1x345600,2x86400,11x564528,5x677376,14x5396480,3x4147200,4x1451520,4x1843200 + + # insert dsplinkk, tell it that DSP's DDR is at physical 250MB-254MB +-insmod dsplinkk.ko ++modprobe dsplinkk + + # alter dma queue mapping for better visual performance + if [ -f mapdmaq-hd ] diff --git a/recipes/ti/ti-dvsdk-demos/changed_insmod_to_modprobe_in_loadmodules_3.10.00.14.patch b/recipes/ti/ti-dvsdk-demos/changed_insmod_to_modprobe_in_loadmodules_3.10.00.14.patch new file mode 100644 index 0000000000..c8ba6a961d --- /dev/null +++ b/recipes/ti/ti-dvsdk-demos/changed_insmod_to_modprobe_in_loadmodules_3.10.00.14.patch @@ -0,0 +1,98 @@ +diff -uNr dvsdk_demos_3_10_00_14_orig/dm355/loadmodules.sh dvsdk_demos_3_10_00_14/dm355/loadmodules.sh +--- dvsdk_demos_3_10_00_14_orig/dm355/loadmodules.sh 2010-04-07 11:49:46.000000000 -0500 ++++ dvsdk_demos_3_10_00_14/dm355/loadmodules.sh 2010-04-19 16:02:06.000000000 -0500 +@@ -15,13 +15,18 @@ + rmmod edmak 2>/dev/null + rmmod dm350mmap 2>/dev/null + +-insmod cmemk.ko phys_start=0x86000000 phys_end=0x88000000 pools=10x829440,1x1529856,1x276,1x4320,1x560,2x344,1x144,1x81920,2x512,1x14000,1x12960,1x11360,1x4,2x296,1x8192,59x56,4x24,1x1505280,9x1658880,1x2258880 ++depmod -a cmemk ++depmod -a irqk ++depmod -a dm350mmap ++depmod -a edmak ++ ++modprobe cmemk phys_start=0x86000000 phys_end=0x88000000 pools=10x829440,1x1529856,1x276,1x4320,1x560,2x344,1x144,1x81920,2x512,1x14000,1x12960,1x11360,1x4,2x296,1x8192,59x56,4x24,1x1505280,9x1658880,1x2258880 + + ./mapdmaq + +-insmod irqk.ko +-insmod edmak.ko +-insmod dm350mmap.ko ++modprobe irqk ++modprobe edmak ++modprobe dm350mmap + + rm -f /dev/dm350mmap + mknod /dev/dm350mmap c `awk "\\$2==\"dm350mmap\" {print \\$1}" /proc/devices` 0 +diff -uNr dvsdk_demos_3_10_00_14_orig/dm365/loadmodules_hd.sh dvsdk_demos_3_10_00_14/dm365/loadmodules_hd.sh +--- dvsdk_demos_3_10_00_14_orig/dm365/loadmodules_hd.sh 2010-04-07 11:50:27.000000000 -0500 ++++ dvsdk_demos_3_10_00_14/dm365/loadmodules_hd.sh 2010-04-19 16:00:31.000000000 -0500 +@@ -17,15 +17,20 @@ + rmmod edmak 2>/dev/null + rmmod dm365mmap 2>/dev/null + ++depmod -a cmemk ++depmod -a irqk ++depmod -a dm365mmap ++depmod -a edmak ++ + # Pools configuration +-insmod cmemk.ko phys_start=0x83C00000 phys_end=0x88000000 pools=1x384,2x5984,2x3133440,1x16384,1x48952,1x20480,1x60288,1x74,1x28,1x2048,1x6785280,1x146,1x896,1x65536,1x98,1x296,29x56,2x24,1x624,4x62,1x1456,1x18321120,1x65792,5x3523584,1x4194304,1x8355840 ++modprobe cmemk phys_start=0x83C00000 phys_end=0x88000000 pools=1x384,2x5984,2x3133440,1x16384,1x48952,1x20480,1x60288,1x74,1x28,1x2048,1x6785280,1x146,1x896,1x65536,1x98,1x296,29x56,2x24,1x624,4x62,1x1456,1x18321120,1x65792,5x3523584,1x4194304,1x8355840 + + #VC1 decode pool configuration +-# insmod cmemk.ko phys_start=0x83C00000 phys_end=0x88000000 pools=1x384,1x112665,3x7680,1x319264,2x1024,5x7208960,1x80,1x116,1x29184,1x2688,1x30720,1x551680,2x128,1x74,1x28,1x10240,1x47232,1x448,2x1152,1x8192,2x272896,18x56,2x24,1x86,4x62,2x7808,1x2097152 ++# modprobe cmemk phys_start=0x83C00000 phys_end=0x88000000 pools=1x384,1x112665,3x7680,1x319264,2x1024,5x7208960,1x80,1x116,1x29184,1x2688,1x30720,1x551680,2x128,1x74,1x28,1x10240,1x47232,1x448,2x1152,1x8192,2x272896,18x56,2x24,1x86,4x62,2x7808,1x2097152 + +-insmod irqk.ko +-insmod edmak.ko +-insmod dm365mmap.ko ++modprobe irqk ++modprobe edmak ++modprobe dm365mmap + + rm -f /dev/dm365mmap + mknod /dev/dm365mmap c `awk "\\$2==\"dm365mmap\" {print \\$1}" /proc/devices` 0 +diff -uNr dvsdk_demos_3_10_00_14_orig/dm365/loadmodules.sh dvsdk_demos_3_10_00_14/dm365/loadmodules.sh +--- dvsdk_demos_3_10_00_14_orig/dm365/loadmodules.sh 2010-04-07 11:50:17.000000000 -0500 ++++ dvsdk_demos_3_10_00_14/dm365/loadmodules.sh 2010-04-19 15:59:00.000000000 -0500 +@@ -15,12 +15,17 @@ + rmmod edmak 2>/dev/null + rmmod dm365mmap 2>/dev/null + ++depmod -a cmemk ++depmod -a irqk ++depmod -a dm365mmap ++depmod -a edmak ++ + # Pools configuration +-insmod cmemk.ko phys_start=0x83C00000 phys_end=0x88000000 pools=2x384,1x16384,1x2688,1x20480,3x74,1x60288,2x28,1x147048,1x10240,1x896,1x65536,1x663552,1x9175376,4x24,1x282624,2x5984,1x58144,1x1024,1x48952,1x464,2x16768,1x1251264,1x30720,1x65792,8x774144,1x173712,1x146,1x98,2x296,50x56,2x86,1x624,1x3328,1x518912,4x62,1x242,4x663552,1x1637824,14x1645056,1x16538976,4x1382400 ++modprobe cmemk phys_start=0x83C00000 phys_end=0x88000000 pools=2x384,1x16384,1x2688,1x20480,3x74,1x60288,2x28,1x147048,1x10240,1x896,1x65536,1x663552,1x9175376,4x24,1x282624,2x5984,1x58144,1x1024,1x48952,1x464,2x16768,1x1251264,1x30720,1x65792,8x774144,1x173712,1x146,1x98,2x296,50x56,2x86,1x624,1x3328,1x518912,4x62,1x242,4x663552,1x1637824,14x1645056,1x16538976,4x1382400 + +-insmod irqk.ko +-insmod edmak.ko +-insmod dm365mmap.ko ++modprobe irqk ++modprobe edmak ++modprobe dm365mmap + + rm -f /dev/dm365mmap + mknod /dev/dm365mmap c `awk "\\$2==\"dm365mmap\" {print \\$1}" /proc/devices` 0 +diff -uNr dvsdk_demos_3_10_00_14_orig/dm6467/loadmodules.sh dvsdk_demos_3_10_00_14/dm6467/loadmodules.sh +--- dvsdk_demos_3_10_00_14_orig/dm6467/loadmodules.sh 2010-04-07 15:13:22.000000000 -0500 ++++ dvsdk_demos_3_10_00_14/dm6467/loadmodules.sh 2010-04-19 15:56:35.000000000 -0500 +@@ -14,9 +14,12 @@ + rmmod cmemk.ko 2>/dev/null + rmmod dsplinkk.ko 2>/dev/null + +-insmod cmemk.ko phys_start=0x84C00000 phys_end=0x8ba00000 pools=2x921600,1x460800,1x1048576,1x345600,2x86400,11x564528,5x677376,14x5396480,3x4147200,4x1451520,4x1843200 ++depmod -a cmemk ++depmod -a dsplinkk + +-insmod dsplinkk.ko ++modprobe cmemk phys_start=0x84C00000 phys_end=0x8ba00000 pools=2x921600,1x460800,1x1048576,1x345600,2x86400,11x564528,5x677376,14x5396480,3x4147200,4x1451520,4x1843200 ++ ++modprobe dsplinkk + + # alter dma queue mapping for better visual performance + if [ -f mapdmaq-hd ] diff --git a/recipes/ti/ti-dvsdk-demos/dm365-demos-with-new-data-paths.patch b/recipes/ti/ti-dvsdk-demos/dm365-demos-with-new-data-paths.patch new file mode 100644 index 0000000000..08811445bb --- /dev/null +++ b/recipes/ti/ti-dvsdk-demos/dm365-demos-with-new-data-paths.patch @@ -0,0 +1,17 @@ +diff -uNr dvsdk_demos_3_10_00_13_orig/dm365/interface/dec.c dvsdk_demos_3_10_00_13/dm365/interface/dec.c +--- dvsdk_demos_3_10_00_13_orig/dm365/interface/dec.c 2010-04-09 11:54:20.000000000 -0500 ++++ dvsdk_demos_3_10_00_13/dm365/interface/dec.c 2010-04-08 17:35:27.000000000 -0500 +@@ -49,10 +49,10 @@ +
+ #define NUM_FILE_COMBOS 4
+
+-#define DAVINCIEFFECT_MPEG4 "data/videos/davincieffect.mpeg4"
+-#define DAVINCIEFFECT_H264 "data/videos/davincieffect.264"
++#define DAVINCIEFFECT_MPEG4 "/usr/share/ti/data/videos/davincieffect.mpeg4"
++#define DAVINCIEFFECT_H264 "/usr/share/ti/data/videos/davincieffect.264"
+
+-#define DAVINCIEFFECT_G711 "data/sounds/davincieffect.g711"
++#define DAVINCIEFFECT_G711 "/usr/share/ti/data/sounds/davincieffect.g711"
+
+ #define USERMADE_H264 "demo.264"
+ #define USERMADE_MPEG4 "demo.mpeg4"
diff --git a/recipes/ti/ti-dvsdk-demos/remove-loadmodules_hd.sh-from-make-install_3.10.00.14.patch b/recipes/ti/ti-dvsdk-demos/remove-loadmodules_hd.sh-from-make-install_3.10.00.14.patch new file mode 100644 index 0000000000..adacecbfb2 --- /dev/null +++ b/recipes/ti/ti-dvsdk-demos/remove-loadmodules_hd.sh-from-make-install_3.10.00.14.patch @@ -0,0 +1,11 @@ +diff -uNr dvsdk_demos_3_10_00_14_orig/dm365/Makefile dvsdk_demos_3_10_00_14/dm365/Makefile +--- dvsdk_demos_3_10_00_14_orig/dm365/Makefile 2010-04-27 19:26:55.000000000 -0500 ++++ dvsdk_demos_3_10_00_14/dm365/Makefile 2010-04-27 19:31:31.000000000 -0500 +@@ -48,7 +48,6 @@ + @make -C ../data install + @install -d $(EXEC_DIR)/thirdpartydemos + @install loadmodules.sh $(EXEC_DIR) +- @install loadmodules_hd.sh $(EXEC_DIR) + + $(INSTALLSUBDIRS): + @echo diff --git a/recipes/ti/ti-dvsdk-demos_3.10.00.14.bb b/recipes/ti/ti-dvsdk-demos_3.10.00.14.bb new file mode 100644 index 0000000000..b9f1affdd4 --- /dev/null +++ b/recipes/ti/ti-dvsdk-demos_3.10.00.14.bb @@ -0,0 +1,11 @@ +require ti-dvsdk-demos.inc + +PV = "3_10_00_14" +PR = "${INC_PR}.1" + +SRC_URI_append_dm365 = " file://dm365-demos-with-new-data-paths.patch;patch=1 \ + file://changed_insmod_to_modprobe_in_loadmodules_3.10.00.14.patch;patch=1 \ + file://remove-loadmodules_hd.sh-from-make-install_3.10.00.14.patch;patch=1" + +SRC_URI[dvsdkdemostarball.md5sum] = "36cd08c21a95a60ca6916f029f875bea" +SRC_URI[dvsdkdemostarball.sha256sum] = "a39bbb08e85fd0131dc725cd9c01586e14b58bc361401dfd122f23c5f5d8db71" diff --git a/recipes/ti/ti-paths.inc b/recipes/ti/ti-paths.inc index d3d1b980f9..15cd51966f 100644 --- a/recipes/ti/ti-paths.inc +++ b/recipes/ti/ti-paths.inc @@ -17,6 +17,7 @@ export LPM_INSTALL_DIR_RECIPE = "${installdir}/ti-local-power-manager-tre export DMAI_INSTALL_DIR_RECIPE = "${installdir}/ti-dmai-tree" export CODEC_INSTALL_DIR_RECIPE = "${installdir}/ti-codecs-tree" export DSPLIB_INSTALL_DIR_RECIPE = "${installdir}/ti-dsplib-tree" +export DVSDK_DEMOS_INSTALL_DIR_RECIPE = "${installdir}/ti-dvsdk-demos-tree" # This is where the tools will end up in staging provided PACKAGE_ARCH = ${MACHINE_ARCH} is set export CODEGEN_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${CODEGEN_INSTALL_DIR_RECIPE}" diff --git a/recipes/tickypip/tickypip-levels_1.1.bb b/recipes/tickypip/tickypip-levels_1.1.bb index a3bc343f73..74b87a4d1d 100644 --- a/recipes/tickypip/tickypip-levels_1.1.bb +++ b/recipes/tickypip/tickypip-levels_1.1.bb @@ -6,7 +6,7 @@ SRC_DISTRIBUTE_LICENSES += "${PN}" AUTHOR = "NetWalk Group <netwalkgroup@hotmail.com>" RDEPENDS_${PN} = "tickypip" PACKAGE_ARCH = "all" -PR = "r1" +PR = "r2" SRC_URI = "http://www.openzaurus.org/download/3.5.4/sources/tickypip-levels_${PV}.tar.bz2" diff --git a/recipes/tickypip/tickypip_0.1.2.bb b/recipes/tickypip/tickypip_0.1.2.bb index fe28ffa3b4..4cc4be37bb 100644 --- a/recipes/tickypip/tickypip_0.1.2.bb +++ b/recipes/tickypip/tickypip_0.1.2.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" AUTHOR = "Christian Hammond" HOMEPAGE = "http://www.chipx86.com/projects/tickypip/" RRECOMMENDS_${PN} = "tickypip-levels" -PR = "r5" +PR = "r6" SRC_URI = "http://www.openzaurus.org/download/3.5.4/sources/tickypip-0.1.2.tar.gz \ file://path_fix.patch \ diff --git a/recipes/tinc/tinc_1.0.2.bb b/recipes/tinc/tinc_1.0.2.bb index b754d0db58..cc7d3ed207 100644 --- a/recipes/tinc/tinc_1.0.2.bb +++ b/recipes/tinc/tinc_1.0.2.bb @@ -2,7 +2,7 @@ SECTION = "console/network" DESCRIPTION ="tinc is a Virtual Private Network (VPN) daemon" HOMEPAGE = "http://www.tinc-vpn.org/" LICENSE = "GPLv2" -PR = "r1" +PR = "r2" SRC_URI="http://www.tinc-vpn.org/packages/tinc-1.0.2.tar.gz \ file://mtu-vlan.diff \ diff --git a/recipes/tsclient/tsclient_0.140.bb b/recipes/tsclient/tsclient_0.140.bb index f1231812db..09e0571b74 100644 --- a/recipes/tsclient/tsclient_0.140.bb +++ b/recipes/tsclient/tsclient_0.140.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnomepro.com/tsclient/" LICENSE = "GPL" DEPENDS = "glib-2.0 gtk+ gnome-panel rdesktop" RDEPENDS_${PN} = "rdesktop" -PR = "r1" +PR = "r2" SRC_URI = "http://www.gnomepro.com/tsclient/${P}.tar.gz" diff --git a/recipes/tslib/tslib.inc b/recipes/tslib/tslib.inc index a14a288df0..b23198c67b 100644 --- a/recipes/tslib/tslib.inc +++ b/recipes/tslib/tslib.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://tslib.berlios.de/" AUTHOR = "Russell King w/ plugins by Chris Larson et. al." SECTION = "base" LICENSE = "LGPLv2" -INC_PR = "r24" +INC_PR = "r25" SRC_URI += "\ file://ts.conf \ diff --git a/recipes/ttf-fonts/ttf-arphic-uming_20080216.bb b/recipes/ttf-fonts/ttf-arphic-uming_20080216.bb index e92b4ca618..bb259b9181 100644 --- a/recipes/ttf-fonts/ttf-arphic-uming_20080216.bb +++ b/recipes/ttf-fonts/ttf-arphic-uming_20080216.bb @@ -2,8 +2,8 @@ DESCRIPTION = "Unicode Mingti (printed) TrueType Font" HOMEPAGE = "http://www.freedesktop.org/wiki/Software/CJKUnifonts" LICENSE = "${PN}" SRC_DISTRIBUTE_LICENSES += "${PN}" -RPROVIDES = "virtual-chinese-font" -PR = "r1" +RPROVIDES_${PN} = "virtual-chinese-font" +PR = "r2" SRC_URI = \ "http://archive.ubuntu.com/ubuntu/pool/main/t/ttf-arphic-uming/ttf-arphic-uming_0.2.${PV}.1.orig.tar.gz" diff --git a/recipes/ttf-fonts/ttf-dejavu_2.23.bb b/recipes/ttf-fonts/ttf-dejavu_2.23.bb index 3b50049079..ca6edbcb3f 100644 --- a/recipes/ttf-fonts/ttf-dejavu_2.23.bb +++ b/recipes/ttf-fonts/ttf-dejavu_2.23.bb @@ -10,7 +10,7 @@ RDEPENDS_${PN}-sans-condensed = "${PN}-common" RDEPENDS_${PN}-serif = "${PN}-common" RDEPENDS_${PN}-serif-condensed = "${PN}-common" RDEPENDS_${PN}-common = "" -PR = "r2" +PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-fonts-ttf-${PV}.tar.bz2 \ file://30-dejavu-aliases.conf" diff --git a/recipes/ttf-fonts/ttf-sazanami_20040629.bb b/recipes/ttf-fonts/ttf-sazanami_20040629.bb index bff1b75387..1b9a01b2a1 100644 --- a/recipes/ttf-fonts/ttf-sazanami_20040629.bb +++ b/recipes/ttf-fonts/ttf-sazanami_20040629.bb @@ -7,8 +7,8 @@ AUTHOR = "Electronic Font Open Laboratory (/efont/)" HOMEPAGE = "http://sourceforge.jp/projects/efont/" LICENSE = "${PN}" SRC_DISTRIBUTE_LICENSES += "${PN}" -RPROVIDES = "virtual-japanese-font" -PR = "r4" +RPROVIDES_${PN} = "virtual-japanese-font" +PR = "r5" SRC_URI = "http://osdn.dl.sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2" S = "${WORKDIR}/sazanami-20040629" diff --git a/recipes/u-boot/files/bug20/bug-video-setting.patch b/recipes/u-boot/files/bug20/bug-video-setting.patch new file mode 100644 index 0000000000..caaccf5545 --- /dev/null +++ b/recipes/u-boot/files/bug20/bug-video-setting.patch @@ -0,0 +1,10 @@ +Index: git/include/configs/omap3_bug.h +=================================================================== +@@ -388,7 +388,7 @@ + #define CONFIG_EXTRA_ENV_SETTINGS \ + "console=ttyS2,115200n8\0" \ + "mmcboot=mmc init;ext2load mmc 0:1 0x80000000 /boot/uImage;run mmcargs;bootm 0x80000000\0"\ +- "mmcargs=setenv bootargs console=${console} root=/dev/mmcblk0p1 rw rootwait rootdelay=1 kgdboc=${console} usbcore.autosuspend=-1\0" \ ++ "mmcargs=setenv bootargs console=${console} root=/dev/mmcblk0p1 rw rootwait rootdelay=1 kgdboc=${console} usbcore.autosuspend=-1 vram=24M omapfb.vram=0:0M,1:24M,2:0M omapdss.def_disp=dvi omapfb.mode=dvi:1280x1024MR-32@57\0" \ + + #define CONFIG_ETHADDR aa:bb:cc:dd:ee:ff diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb index 1c36074023..4cde8e4f0a 100644 --- a/recipes/u-boot/u-boot_git.bb +++ b/recipes/u-boot/u-boot_git.bb @@ -1,5 +1,5 @@ require u-boot.inc -PR ="r53" +PR ="r54" FILESPATHPKG =. "u-boot-git:" @@ -19,6 +19,7 @@ SRC_URI_append_afeb9260 = " file://AFEB9260-network-fix.patch" SRC_URI_append_afeb9260-180 = " file://AFEB9260-network-fix.patch" SRC_URI_append_cm-t35 = "file://cm-t35/cm-t35.patch" SRC_URI_append_bug20 = "file://bug-uboot.patch" +SRC_URI_append_bug20 += "file://bug-video-setting.patch" SRC_URI_beagleboard = "git://www.denx.de/git/u-boot.git;protocol=git \ file://0001-OMAP3-enable-i2c-bus-switching-for-Beagle-and-Overo.patch \ diff --git a/recipes/uclibc/uclibc_git.bb b/recipes/uclibc/uclibc_git.bb index 99ea40e054..bbff94d881 100644 --- a/recipes/uclibc/uclibc_git.bb +++ b/recipes/uclibc/uclibc_git.bb @@ -7,14 +7,14 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.31" -SRCREV="94a99ff6131111381e7f803e10638ab547c40c2f" -PV = "${UCLIBC_BASE}+gitr${SRCREV}" +SRCREV="0ee65752ee4c023a70d134919ec7604273e46cdb" +PR_append = "+gitr${SRCPV}" DEFAULT_PREFERENCE = "-1" #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take # precedence. require uclibc.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc" #recent versions uclibc require real kernel headers diff --git a/recipes/udev/udev-static-devices.bb b/recipes/udev/udev-static-devices.bb index 952c3760f4..df148b8e56 100644 --- a/recipes/udev/udev-static-devices.bb +++ b/recipes/udev/udev-static-devices.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Provide per-machine static nodes of /dev" RDEPENDS_${PN} = "udev" -PR = "r0" +PR = "r1" SRC_URI = "file://udev_static_devices_tarball" diff --git a/recipes/unionfs/unionfs.inc b/recipes/unionfs/unionfs.inc index e336fd3e07..32c1e2f3b0 100644 --- a/recipes/unionfs/unionfs.inc +++ b/recipes/unionfs/unionfs.inc @@ -6,7 +6,7 @@ LICENSE = "GPL" SRC_URI = "ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/OLD/unionfs-1.x/unionfs-${PV}.tar.gz" S = "${WORKDIR}/unionfs-${PV}" -FILESPATH = "${FILE_DIRNAME}/unionfs-${PV}:${FILE_DIRNAME}/unionfs:${FILE_DIRNAME}/files:${FILE_DIRNAME}" +FILESPATHPKG =. "unionfs-${PV}:unionfs:" export UCFLAGS = '${CFLAGS} -DNODEBUG -DUNIONFS_VERSION=\\"${PV}\\"' CFLAGS = "${BUILD_OPTIMIZATION}" diff --git a/recipes/unionfs/unionroot-utils_0.1.1.bb b/recipes/unionfs/unionroot-utils_0.1.1.bb index f41fbe6d1f..8b17020083 100644 --- a/recipes/unionfs/unionroot-utils_0.1.1.bb +++ b/recipes/unionfs/unionroot-utils_0.1.1.bb @@ -6,7 +6,7 @@ RDEPENDS_${PN} = "ipkg-collateral unionroot busybox" SECTION = "base" PRIORITY = "optional" -PR = "2" +PR = "3" SRC_URI = "file://mount.unionroot \ file://umount.unionroot" diff --git a/recipes/update-modules/update-modules_1.0.bb b/recipes/update-modules/update-modules_1.0.bb index 3469602427..f497496766 100644 --- a/recipes/update-modules/update-modules_1.0.bb +++ b/recipes/update-modules/update-modules_1.0.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Script to manage module configuration files" LICENSE = "GPLv2" PACKAGE_ARCH = "all" RDEPENDS_${PN} = "${@base_contains("MACHINE_FEATURES", "kernel26", "module-init-tools-depmod","modutils-depmod",d)} " -PR = "r8" +PR = "r9" SRC_URI = "file://update-modules" diff --git a/recipes/upslug/upslug2.inc b/recipes/upslug/upslug2.inc index 8214a8d095..03639a916f 100644 --- a/recipes/upslug/upslug2.inc +++ b/recipes/upslug/upslug2.inc @@ -1,6 +1,6 @@ # This package builds the 'upslug2' binary upload/flash tool # for the NSLU2. It is not useful for anything else. -PR = "r1" +PR = "r2" DESCRIPTION = "NSLU2 binary upload tool (version 2)" HOMEPAGE = "http://www.nslu2-linux.org/wiki/Main/UpSlug2" SECTION = "console/network" diff --git a/recipes/usrp/usrp_0.12.bb b/recipes/usrp/usrp_0.12.bb index 6d28ca310e..1c80cfbdb6 100644 --- a/recipes/usrp/usrp_0.12.bb +++ b/recipes/usrp/usrp_0.12.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://comsec.com/wiki?UniversalSoftwareRadioPeripheral" SECTION = "devel" DEPENDS = "swig-native sdcc-native virtual/libusb0 python boost" RDEPENDS_${PN} = "python-core" -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/old/usrp-${PV}.tar.gz \ file://fix_compile_h.patch;striplevel=3 \ diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc index a5de20124b..e237f21ee9 100644 --- a/recipes/util-linux-ng/util-linux-ng.inc +++ b/recipes/util-linux-ng/util-linux-ng.inc @@ -8,7 +8,7 @@ inherit autotools gettext DEFAULT_PREFERENCE = "-1" -INC_PR = "r24" +INC_PR = "r25" # allows for a release candidate RC ?= "" diff --git a/recipes/vagalume/vagalume_0.7.1.bb b/recipes/vagalume/vagalume_0.7.1.bb index e41998b4eb..4f1e4d992c 100644 --- a/recipes/vagalume/vagalume_0.7.1.bb +++ b/recipes/vagalume/vagalume_0.7.1.bb @@ -5,7 +5,7 @@ SECTION = "x11" DEPENDS = "gtk+ gstreamer curl gst-plugins-good ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugins-ugly', d)}" RDEPENDS_${PN} = "curl gst-plugin-autodetect gst-plugin-audioconvert gst-plugin-alsa librsvg-gtk ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugin-mad', d)}" RRECOMMENDS_${PN} = "dbus-x11" -PR = "r2" +PR = "r3" SRC_URI = "http://vagalume.igalia.com/files/source/vagalume_${PV}.orig.tar.gz\ file://index.theme \ diff --git a/recipes/vagalume/vagalume_0.8.3.bb b/recipes/vagalume/vagalume_0.8.3.bb index 328fb69fbd..17d56f8166 100644 --- a/recipes/vagalume/vagalume_0.8.3.bb +++ b/recipes/vagalume/vagalume_0.8.3.bb @@ -5,7 +5,7 @@ SECTION = "x11" DEPENDS = "gtk+ gstreamer curl gst-plugins-good ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugins-ugly', d)}" RDEPENDS_${PN} = "curl gst-plugin-autodetect gst-plugin-audioconvert gst-plugin-alsa gst-plugin-gconfelements librsvg-gtk ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugin-mad', d)}" RRECOMMENDS_${PN} = "dbus-x11 hicolor-icon-theme" -PR = "r0" +PR = "r1" SRC_URI = "http://vagalume.igalia.com/files/source/vagalume_${PV}.orig.tar.gz\ file://index.theme \ diff --git a/recipes/vala-terminal/vala-terminal_git.bb b/recipes/vala-terminal/vala-terminal_git.bb index e49b9fae90..27ca0a93ab 100644 --- a/recipes/vala-terminal/vala-terminal_git.bb +++ b/recipes/vala-terminal/vala-terminal_git.bb @@ -4,7 +4,7 @@ DEPENDS = "vala-native vte" SRCREV = "0241cf2f19710b885dc060d03ec80af438e8246e" PV = "1.1.1+gitr${SRCPV}" PE = "1" -PR = "r0" +PR = "r1" inherit autotools @@ -12,5 +12,5 @@ SRC_URI = "${FREESMARTPHONE_GIT}/vala-terminal.git;protocol=git;branch=master" S = "${WORKDIR}/git" RDEPENDS_${PN} = "ttf-liberation-mono" -RREPLACES = "openmoko-terminal2" -RPROVIDES = "openmoko-terminal2" +RREPLACES_${PN} = "openmoko-terminal2" +RPROVIDES_${PN} = "openmoko-terminal2" diff --git a/recipes/vala/vala_0.8.1.1.bb b/recipes/vala/vala_0.8.1.1.bb deleted file mode 100644 index 600a533432..0000000000 --- a/recipes/vala/vala_0.8.1.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require vala.inc -PR = "${INC_PR}.0" - -SRC_URI[archive.md5sum] = "5135c4ea472269de59121b3380bcf1cd" -SRC_URI[archive.sha256sum] = "07fcd4140ef24dc9977aef89eab023e9e2814be4baee5e210dcdce64d084743e" diff --git a/recipes/vala/vala_0.9.1.1.bb b/recipes/vala/vala_0.9.1.1.bb new file mode 100644 index 0000000000..597e57ce88 --- /dev/null +++ b/recipes/vala/vala_0.9.1.1.bb @@ -0,0 +1,5 @@ +require vala.inc +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "ef5b292a880c98e3dfe00c59773db936" +SRC_URI[archive.sha256sum] = "f29d0257722983d58627f0d788cf7ed7223658cc30bfd01555fd958d59a46584" diff --git a/recipes/vim/gvim_7.2.bb b/recipes/vim/gvim_7.2.bb index 276a9f0553..842b184865 100644 --- a/recipes/vim/gvim_7.2.bb +++ b/recipes/vim/gvim_7.2.bb @@ -7,5 +7,5 @@ DEPENDS += "gtk+ xt" EXTRA_OECONF += "--enable-gtk2-test" -#might needs RREPLACES as well +#might needs RREPLACES_${PN} as well RCONFLICTS_${PN} = "vim vim-tiny" diff --git a/recipes/vlan/vlan_1.8.bb b/recipes/vlan/vlan_1.8.bb index 15ae499e0c..65f7dcee3c 100644 --- a/recipes/vlan/vlan_1.8.bb +++ b/recipes/vlan/vlan_1.8.bb @@ -1,6 +1,6 @@ DESCRIPTION = "802.1q vlan support program" RRECOMMENDS_${PN} = "kernel-module-8021q" -PR = "r2" +PR = "r3" S = "${WORKDIR}/vlan/" diff --git a/recipes/vlan/vlan_1.9.bb b/recipes/vlan/vlan_1.9.bb index 2ca38d4d0f..22fd58168d 100644 --- a/recipes/vlan/vlan_1.9.bb +++ b/recipes/vlan/vlan_1.9.bb @@ -1,6 +1,6 @@ DESCRIPTION = "802.1q vlan support program" RRECOMMENDS_${PN} = "kernel-module-8021q" -PR = "r0" +PR = "r1" S = "${WORKDIR}/vlan/" diff --git a/recipes/vnc/fbvncserver2_cvs.bb b/recipes/vnc/fbvncserver2_cvs.bb index 023d321a2c..cee7e29e56 100644 --- a/recipes/vnc/fbvncserver2_cvs.bb +++ b/recipes/vnc/fbvncserver2_cvs.bb @@ -6,9 +6,9 @@ PRIORITY = "optional" LICENSE = "GPLv2" DEPENDS = "libvncserver jpeg zlib gmp tslib" RRECOMMENDS_${PN} = "kernel-modules-uinput kernel-module-keybdev" -RCONFLICTS = "fbvncserver, fbvncserver-kmodule" +RCONFLICTS_${PN} = "fbvncserver, fbvncserver-kmodule" PV = "0.0.0+cvs${SRCDATE}" -PR = "r0" +PR = "r1" SRC_URI = "cvs://anonymous@fbvncserver.cvs.sourceforge.net/cvsroot/fbvncserver;method=pserver;module=ipkg" S = "${WORKDIR}/ipkg/src/" diff --git a/recipes/vnc/fbvncserver_0.9.4.bb b/recipes/vnc/fbvncserver_0.9.4.bb index 9b40766801..8c4810b93c 100644 --- a/recipes/vnc/fbvncserver_0.9.4.bb +++ b/recipes/vnc/fbvncserver_0.9.4.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "libvncserver jpeg zlib" RDEPENDS_${PN} = "fbvncserver-kmodule libvncserver-storepasswd libvncserver-javaapplet" -PR = "r3" +PR = "r4" SRC_URI = "http://sdgsystems.com/download/fbvncserver-${PV}.tar.gz \ file://libvncs0.6.patch \ diff --git a/recipes/vsftpd/vsftpd-charconv_2.0.5.bb b/recipes/vsftpd/vsftpd-charconv_2.0.5.bb index 6b9709e5f9..71209a2d66 100644 --- a/recipes/vsftpd/vsftpd-charconv_2.0.5.bb +++ b/recipes/vsftpd/vsftpd-charconv_2.0.5.bb @@ -3,7 +3,7 @@ SECTION = "console/network" LICENSE = "GPL" PR = "r1" -FILESPATH_append = ":${@os.path.dirname(bb.data.getVar('FILE',d,1))}/vsftpd-2.0.5" +FILESPATHPKG .= ":vsftpd-${PV}" SRC_URI = "ftp://vsftpd.beasts.org/users/cevans/vsftpd-${PV}.tar.gz \ file://vsftpd-charconv.patch \ diff --git a/recipes/wifi-radar/wifi-radar_1.9.6.bb b/recipes/wifi-radar/wifi-radar_1.9.6.bb index 1af2a6dacd..97c1fdfb90 100644 --- a/recipes/wifi-radar/wifi-radar_1.9.6.bb +++ b/recipes/wifi-radar/wifi-radar_1.9.6.bb @@ -3,7 +3,7 @@ DESCRIPTION="WiFi Radar is a Python/PyGTK2 utility for managing WiFi profiles." HOMEPAGE="http://www.bitbuilder.com/wifi_radar/" LICENSE = "GPL" -PR = "r2" +PR = "r3" PACKAGE_ARCH = "all" diff --git a/recipes/wifistix/wifistix-modules_5.0.16.p0.bb b/recipes/wifistix/wifistix-modules_5.0.16.p0.bb index f4833d6615..2d913322e6 100644 --- a/recipes/wifistix/wifistix-modules_5.0.16.p0.bb +++ b/recipes/wifistix/wifistix-modules_5.0.16.p0.bb @@ -8,7 +8,7 @@ HOMEPAGE = "http://www.gumstix.com" LICENSE = "GPL" RDEPENDS_${PN} = "kernel (${KERNEL_VERSION})" DEPENDS = "virtual/kernel" -PR = "r0" +PR = "r1" SRC_URI = "http://files.gumstix.com/cf8385-5.0.16.p0-26306.tbz \ file://wifistix.conf \ diff --git a/recipes/wpa-supplicant/wpa-gui_0.4.8.bb b/recipes/wpa-supplicant/wpa-gui_0.4.8.bb index 860c9a060b..06826be971 100644 --- a/recipes/wpa-supplicant/wpa-gui_0.4.8.bb +++ b/recipes/wpa-supplicant/wpa-gui_0.4.8.bb @@ -6,7 +6,7 @@ SECTION = "network" LICENSE = "GPL BSD" HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" RDEPENDS_${PN} = "wpa-supplicant" -PR = "r1" +PR = "r2" SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz " diff --git a/recipes/wpa-supplicant/wpa-gui_0.6.9.bb b/recipes/wpa-supplicant/wpa-gui_0.6.9.bb index c30c868cdf..84c593f02a 100644 --- a/recipes/wpa-supplicant/wpa-gui_0.6.9.bb +++ b/recipes/wpa-supplicant/wpa-gui_0.6.9.bb @@ -8,7 +8,7 @@ HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" DEPENDS = "librsvg-native imagemagick-native" RDEPENDS_${PN} = "wpa-supplicant" RRECOMMENDS_${PN} = "${LIBC}-gconv-utf-16" -PR = "r1" +PR = "r2" SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz;name=archive\ file://icons.patch \ diff --git a/recipes/wpa-supplicant/wpa-supplicant-0.6.inc b/recipes/wpa-supplicant/wpa-supplicant-0.6.inc index 371f2769b0..ea3a74402c 100644 --- a/recipes/wpa-supplicant/wpa-supplicant-0.6.inc +++ b/recipes/wpa-supplicant/wpa-supplicant-0.6.inc @@ -3,7 +3,7 @@ SECTION = "network" LICENSE = "GPL" HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" DEPENDS = "dbus gnutls ${@base_contains("COMBINED_FEATURES", "madwifi", "madwifi-ng", "",d)}" -INC_PR = "r5" +INC_PR = "r6" #we introduce MY_ARCH to get 'armv5te' as arch instead of the misleading 'arm' on armv5te builds MY_ARCH := "${PACKAGE_ARCH}" @@ -23,7 +23,7 @@ S = "${WORKDIR}/wpa_supplicant-${PV}/wpa_supplicant" PACKAGES_prepend = "wpa-supplicant-passphrase " FILES_wpa-supplicant-passphrase = "/usr/sbin/wpa_passphrase" -RREPLACES = "wpa-supplicant-cli" +RREPLACES_${PN} = "wpa-supplicant-cli" RRECOMMENDS_${PN} = "wpa-supplicant-passphrase" diff --git a/recipes/wpa-supplicant/wpa-supplicant_0.5.10.bb b/recipes/wpa-supplicant/wpa-supplicant_0.5.10.bb index 90c49093a0..af14e32e77 100644 --- a/recipes/wpa-supplicant/wpa-supplicant_0.5.10.bb +++ b/recipes/wpa-supplicant/wpa-supplicant_0.5.10.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" DEPENDS = "gnutls ${@base_contains("COMBINED_FEATURES", "madwifi", "madwifi-ng", "",d)}" -PR = "r1" +PR = "r2" #we introduce MY_ARCH to get 'armv5te' as arch instead of the misleading 'arm' on armv5te builds MY_ARCH := "${PACKAGE_ARCH}" @@ -20,7 +20,7 @@ S = "${WORKDIR}/wpa_supplicant-${PV}" PACKAGES_prepend = "wpa-supplicant-passphrase " FILES_wpa-supplicant-passphrase = "/usr/sbin/wpa_passphrase" -RREPLACES = "wpa-supplicant-cli" +RREPLACES_${PN} = "wpa-supplicant-cli" RRECOMMENDS_${PN} = "wpa-supplicant-passphrase" diff --git a/recipes/wvdial/wvdial_1.56.bb b/recipes/wvdial/wvdial_1.56.bb index 7dc5253ee0..583ae49dab 100644 --- a/recipes/wvdial/wvdial_1.56.bb +++ b/recipes/wvdial/wvdial_1.56.bb @@ -1,7 +1,7 @@ HOMEPAGE = "http://www.alumnit.ca/wiki/?WvDial" DESCRIPTION = "WvDial is a program that makes it easy to connect your Linux workstation to the Internet." -PR = "r1" +PR = "r2" LICENSE = "LGPL" SRC_URI = "http://www.alumnit.ca/download/wvdial-1.56.tar.gz \ diff --git a/recipes/wvdial/wvdial_1.60.bb b/recipes/wvdial/wvdial_1.60.bb index 1cff1e2eaa..11539da7d4 100644 --- a/recipes/wvdial/wvdial_1.60.bb +++ b/recipes/wvdial/wvdial_1.60.bb @@ -1,7 +1,7 @@ HOMEPAGE = "http://www.alumnit.ca/wiki/?WvDial" DESCRIPTION = "WvDial is a program that makes it easy to connect your Linux workstation to the Internet." -PR = "r2" +PR = "r3" LICENSE = "LGPL" SRC_URI = "http://www.alumnit.ca/download/wvdial-1.60.tar.gz" diff --git a/recipes/xaos/xaos_3.2.3.bb b/recipes/xaos/xaos_3.2.3.bb index 25b88067b6..8214b29308 100644 --- a/recipes/xaos/xaos_3.2.3.bb +++ b/recipes/xaos/xaos_3.2.3.bb @@ -4,7 +4,7 @@ SECTION = "graphics" LICENSE = "GPLv2" DEPENDS = "aalib libx11 zlib libpng" RDEPENDS_${PN} += "libxxf86dga" -PR = "r0" +PR = "r1" SRC_URI = "http://easynews.dl.sourceforge.net/sourceforge/xaos/XaoS-3.2.3.tar.gz \ file://fix-build.patch \ diff --git a/recipes/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb b/recipes/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb index 512c5fe215..357ba0fea4 100644 --- a/recipes/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb +++ b/recipes/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb @@ -1,9 +1,9 @@ LICENSE = "GPL" DESCRIPTION = "Transparent xcursor theme for handheld systems with visible watch cursor" SECTION = "x11/base" -RREPLACES = "xcursor-transparent-theme" -RPROVIDES = "xcursor-transparent-theme" -PR ="r4" +RREPLACES_${PN} = "xcursor-transparent-theme" +RPROVIDES_${PN} = "xcursor-transparent-theme" +PR = "r5" SRC_URI = "http://projects.o-hand.com/matchbox/sources/utils/xcursor-transparent-theme-${PV}.tar.gz \ file://use-relative-symlinks.patch \ diff --git a/recipes/xfce-base/libxfce4menu_4.6.1.bb b/recipes/xfce-base/libxfce4menu_4.6.1.bb index ed1674074c..2e9b701d59 100644 --- a/recipes/xfce-base/libxfce4menu_4.6.1.bb +++ b/recipes/xfce-base/libxfce4menu_4.6.1.bb @@ -4,7 +4,7 @@ DEPENDS = "gettext pkgconfig libxfce4util intltool" RDEPENDS_${PN} = "gtk+ libxfce4util" LICENSE="LGPL-2 FDL-1.1" -PR = "r2" +PR = "r3" inherit xfce46 diff --git a/recipes/xfce-base/libxfcegui4_4.6.1.bb b/recipes/xfce-base/libxfcegui4_4.6.1.bb index 069269e898..dc2229602f 100644 --- a/recipes/xfce-base/libxfcegui4_4.6.1.bb +++ b/recipes/xfce-base/libxfcegui4_4.6.1.bb @@ -5,7 +5,7 @@ DEPENDS = "gettext pkgconfig intltool virtual/libx11 libxfce4util xfconf dbh lib RDEPENDS_${PN} = "xfconf startup-notification " SECTION = "x11/libs" -PR = "r5" +PR = "r6" inherit xfce46 diff --git a/recipes/xfce-base/thunar_0.9.0.bb b/recipes/xfce-base/thunar_0.9.0.bb index a44c38c276..7d35738277 100644 --- a/recipes/xfce-base/thunar_0.9.0.bb +++ b/recipes/xfce-base/thunar_0.9.0.bb @@ -5,7 +5,7 @@ RRECOMMENDS_${PN} = "shared-mime-info" inherit xfce pkgconfig SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.2/src/Thunar-${PV}.tar.bz2" -PR = "r4" +PR = "r5" S = "${WORKDIR}/Thunar-${PV}/" diff --git a/recipes/xfce-base/thunar_1.0.1.bb b/recipes/xfce-base/thunar_1.0.1.bb index bf7865ffa4..6eda66e588 100644 --- a/recipes/xfce-base/thunar_1.0.1.bb +++ b/recipes/xfce-base/thunar_1.0.1.bb @@ -4,7 +4,7 @@ DEPENDS = "exo dbus-glib libexif xfce4-panel libice libsm gamin" RDEPENDS_${PN} = "libxfcegui4 exo dbus-glib libexif xfce4-panel libice libsm gamin" RRECOMMENDS_${PN} = "shared-mime-info" SECTION = "x11" -PR = "r2" +PR = "r3" inherit xfce46 diff --git a/recipes/xfce-base/xfce-terminal_0.2.12.bb b/recipes/xfce-base/xfce-terminal_0.2.12.bb index d2fe7be829..8202b6e4e3 100644 --- a/recipes/xfce-base/xfce-terminal_0.2.12.bb +++ b/recipes/xfce-base/xfce-terminal_0.2.12.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Terminal emulator for the Xfce desktop environment" DEPENDS = "exo vte dbus-glib gtk+" RDEPENDS_${PN} += "gnome-pty-helper" -PR = "r2" +PR = "r3" inherit xfce46 diff --git a/recipes/xfce-base/xfce-terminal_0.2.8.bb b/recipes/xfce-base/xfce-terminal_0.2.8.bb index b818f68624..05bc798d9a 100644 --- a/recipes/xfce-base/xfce-terminal_0.2.8.bb +++ b/recipes/xfce-base/xfce-terminal_0.2.8.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Terminal emulator for the Xfce desktop environment" DEPENDS = "exo vte dbus-glib gtk+" RDEPENDS_${PN} += "gnome-pty-helper" -PR = "r2" +PR = "r3" inherit xfce diff --git a/recipes/xfce-base/xfce-terminal_0.4.2.bb b/recipes/xfce-base/xfce-terminal_0.4.2.bb index 3612562712..ed6ed39d3f 100644 --- a/recipes/xfce-base/xfce-terminal_0.4.2.bb +++ b/recipes/xfce-base/xfce-terminal_0.4.2.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Terminal emulator for the Xfce desktop environment" DEPENDS = "exo vte dbus-glib gtk+" RDEPENDS_${PN} += "gnome-pty-helper" -PR = "r2" +PR = "r3" inherit xfce46 diff --git a/recipes/xfce-base/xfce4-settings_4.6.1.bb b/recipes/xfce-base/xfce4-settings_4.6.1.bb index 733457267a..19de4a102f 100644 --- a/recipes/xfce-base/xfce4-settings_4.6.1.bb +++ b/recipes/xfce-base/xfce4-settings_4.6.1.bb @@ -6,7 +6,7 @@ LICENSE = "GPL-2" DEPENDS = "virtual/libx11 virtual/xserver libxi libwnck xrandr exo libxfce4util" RDEPENDS_${PN} = "gtk+ libxfce4util libxfcegui4 xfconf exo" -PR = "r2" +PR = "r3" inherit xfce46 diff --git a/recipes/xfce-base/xfconf_4.6.1.bb b/recipes/xfce-base/xfconf_4.6.1.bb index 078203a4d9..47767192fb 100644 --- a/recipes/xfce-base/xfconf_4.6.1.bb +++ b/recipes/xfce-base/xfconf_4.6.1.bb @@ -6,7 +6,7 @@ LICENSE = "GPL-2" DEPENDS = "libxfce4util" RDEPENDS_${PN} = "libxfce4util" -PR = "r2" +PR = "r3" inherit xfce46 diff --git a/recipes/xfce-base/xfdesktop_4.6.1.bb b/recipes/xfce-base/xfdesktop_4.6.1.bb index 38d579fd67..90a45b8eda 100644 --- a/recipes/xfce-base/xfdesktop_4.6.1.bb +++ b/recipes/xfce-base/xfdesktop_4.6.1.bb @@ -3,7 +3,7 @@ SECTION = "x11/base" DEPENDS = "virtual/libx11 exo libxfcegui4 xfce4-panel thunar gtk+" RDEPENDS_${PN} = "libxfcegui4 libxml2 xfce4-panel thunar exo gtk+" -PR = "r2" +PR = "r3" inherit xfce46 diff --git a/recipes/xfce-base/xfwm4-themes_4.6.0.bb b/recipes/xfce-base/xfwm4-themes_4.6.0.bb index b37ba1b0eb..d71042b595 100644 --- a/recipes/xfce-base/xfwm4-themes_4.6.0.bb +++ b/recipes/xfce-base/xfwm4-themes_4.6.0.bb @@ -1,7 +1,7 @@ # xfwm4-themes OE build file SECTION = "x11/wm" -PR = "r3" +PR = "r4" DEPENDS = "xfwm4 libglade libxml2" RDEPENDS_${PN} = "xfwm4 libglade libxml2" diff --git a/recipes/xfce-base/xfwm4_4.6.1.bb b/recipes/xfce-base/xfwm4_4.6.1.bb index 49e5113369..54380d4a9d 100644 --- a/recipes/xfce-base/xfwm4_4.6.1.bb +++ b/recipes/xfce-base/xfwm4_4.6.1.bb @@ -2,7 +2,7 @@ DESCRIPTION="XFCE4 Window Manager" SECTION = "x11/wm" -PR = "r1" +PR = "r2" inherit xfce46 update-alternatives diff --git a/recipes/xfce-extras/gigolo_0.3.2.bb b/recipes/xfce-extras/gigolo_0.3.2.bb index 4af76727d8..a33d41b13b 100644 --- a/recipes/xfce-extras/gigolo_0.3.2.bb +++ b/recipes/xfce-extras/gigolo_0.3.2.bb @@ -4,7 +4,7 @@ RDEPENDS_${PN} = "libxfce4util libxfcegui4 gvfs fuse-utils" SECTION = "x11" LICENSE = "GPL-2" -PR = "r3" +PR = "r4" inherit xfce46 diff --git a/recipes/xfce-extras/mousepad_0.2.16.bb b/recipes/xfce-extras/mousepad_0.2.16.bb index ad23b88d80..156889628e 100644 --- a/recipes/xfce-extras/mousepad_0.2.16.bb +++ b/recipes/xfce-extras/mousepad_0.2.16.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Text editor for Xfce based on Leafpad" RDEPENDS_${PN} = "libxfce4util hal" SECTION = "x11" -PR = "r2" +PR = "r3" inherit xfce46 diff --git a/recipes/xfce-extras/orage_4.4.2.bb b/recipes/xfce-extras/orage_4.4.2.bb index 8ed06a10cc..076188d18e 100644 --- a/recipes/xfce-extras/orage_4.4.2.bb +++ b/recipes/xfce-extras/orage_4.4.2.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Calendar application for the Xfce Desktop Environment" DEPENDS = "libxfcegui4 exo libxml-parser-perl-native xfce4-panel xfce-mcs-manager" -RREPLACES = "xfcalendar" +RREPLACES_${PN} = "xfcalendar" inherit xfce diff --git a/recipes/xfce-extras/orage_4.6.1.bb b/recipes/xfce-extras/orage_4.6.1.bb index 7d4bce7335..46156084dc 100644 --- a/recipes/xfce-extras/orage_4.6.1.bb +++ b/recipes/xfce-extras/orage_4.6.1.bb @@ -1,10 +1,10 @@ DESCRIPTION = "Calendar application for the Xfce Desktop Environment" DEPENDS = "libxfcegui4 exo xfce4-panel" RDEPENDS_${PN} = "xfce4-panel" -RREPLACES = "xfcalendar" +RREPLACES_${PN} = "xfcalendar" SECTION = "x11" -PR = "r3" +PR = "r4" inherit xfce46 diff --git a/recipes/xfce-extras/ristretto_0.0.21.bb b/recipes/xfce-extras/ristretto_0.0.21.bb index ab12b7beb0..77af926c7c 100644 --- a/recipes/xfce-extras/ristretto_0.0.21.bb +++ b/recipes/xfce-extras/ristretto_0.0.21.bb @@ -3,7 +3,7 @@ DEPENDS = "thunar libxfce4util libxfcegui4 libexif dbus" RDEPENDS_${PN} = "thunar libxfce4util libxfcegui4" SECTION = "x11" -PR = "r1" +PR = "r2" inherit xfce46 diff --git a/recipes/xfce-extras/squeeze_0.2.3.bb b/recipes/xfce-extras/squeeze_0.2.3.bb index 676d465c2d..e01f9e9dc9 100644 --- a/recipes/xfce-extras/squeeze_0.2.3.bb +++ b/recipes/xfce-extras/squeeze_0.2.3.bb @@ -3,7 +3,7 @@ DEPENDS = "pkgconfig dbus gtk+ thunar" RDEPENDS_${PN} = "libxfce4util" SECTION = "x11" -PR = "r1" +PR = "r2" inherit xfce46 diff --git a/recipes/xfce-extras/xfce4-notifyd_0.1.0.bb b/recipes/xfce-extras/xfce4-notifyd_0.1.0.bb index 0a73eb09a7..caf151b529 100644 --- a/recipes/xfce-extras/xfce4-notifyd_0.1.0.bb +++ b/recipes/xfce-extras/xfce4-notifyd_0.1.0.bb @@ -3,7 +3,7 @@ DEPENDS = "pkgconfig dbus gtk+ libsexy" RDEPENDS_${PN} = "libxfce4util libxfcegui4 libnotify xfconf" SECTION = "x11" -PR = "r1" +PR = "r2" inherit xfce46 diff --git a/recipes/xfce-extras/xfce4-power-manager_0.8.4.2.bb b/recipes/xfce-extras/xfce4-power-manager_0.8.4.2.bb index 7eedc064d8..11e3db2e07 100644 --- a/recipes/xfce-extras/xfce4-power-manager_0.8.4.2.bb +++ b/recipes/xfce-extras/xfce4-power-manager_0.8.4.2.bb @@ -3,7 +3,7 @@ DEPENDS = "libxfce4util libxfcegui4 libnotify xfconf xfce4-panel" RDEPENDS_${PN} = "libxfce4util libxfcegui4 libnotify xfce4-panel" SECTION = "x11" -PR = "r1" +PR = "r2" inherit xfce46 diff --git a/recipes/xkbd/xkbd-layout-ru_0.1.1.bb b/recipes/xkbd/xkbd-layout-ru_0.1.1.bb index 329243054e..cd1b28aaf2 100644 --- a/recipes/xkbd/xkbd-layout-ru_0.1.1.bb +++ b/recipes/xkbd/xkbd-layout-ru_0.1.1.bb @@ -3,7 +3,7 @@ SECTION = "x11" PRIORITY = "optional" LICENSE = "GPL" PACKAGE_ARCH = "all" -PR = "r1" +PR = "r2" RDEPENDS_${PN} = "xkbd" #SRC_URI = "http://whitenoise.ssrlab.com/pda/xkbd/xkbd-ru-en-123_0.1.1.tar.gz" diff --git a/recipes/xkeyboard-config/xkeyboard-config_1.4.bb b/recipes/xkeyboard-config/xkeyboard-config_1.4.bb index 670916fcf6..3bca763f22 100644 --- a/recipes/xkeyboard-config/xkeyboard-config_1.4.bb +++ b/recipes/xkeyboard-config/xkeyboard-config_1.4.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 Keyboard layouts" LICENSE = "MIT" DEPENDS = "intltool xkbcomp-native" RDEPENDS_${PN} = "xkbcomp" -PR = "r4" +PR = "r5" SRC_URI = "http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-${PV}.tar.bz2 \ file://abnt2-fixes.patch" diff --git a/recipes/xmltv/xmltv_0.5.56.bb b/recipes/xmltv/xmltv_0.5.56.bb index ff27d6676c..8f4ce48816 100644 --- a/recipes/xmltv/xmltv_0.5.56.bb +++ b/recipes/xmltv/xmltv_0.5.56.bb @@ -58,7 +58,7 @@ DEPENDS = "perl \ libxml-writer-perl-native \ " -PR = "r4" +PR = "r5" # cpan does not work, it installs things in the perl work dir iso the xmltv work dir # root cause are bad definitions in perl/config.sh, but I don't know what they should be diff --git a/recipes/xorg-driver/xf86-input-tslib_0.0.5.bb b/recipes/xorg-driver/xf86-input-tslib_0.0.5.bb index 11c39c8fe2..3da11379a4 100644 --- a/recipes/xorg-driver/xf86-input-tslib_0.0.5.bb +++ b/recipes/xorg-driver/xf86-input-tslib_0.0.5.bb @@ -4,7 +4,7 @@ DESCRIPTION = "X.Org X server -- tslib input driver" RRECOMMENDS_${PN} += "hal tslib-calibrate" DEPENDS += "tslib" -PR = "r8" +PR = "r9" SRC_URI = "http://www.pengutronix.de/software/xf86-input-tslib/download/xf86-input-tslib-${PV}.tar.bz2;name=archive \ file://use-hal-for-device.diff \ diff --git a/recipes/xorg-driver/xf86-video-glamo_git.bb b/recipes/xorg-driver/xf86-video-glamo_git.bb index 60aac908e4..013a340d56 100644 --- a/recipes/xorg-driver/xf86-video-glamo_git.bb +++ b/recipes/xorg-driver/xf86-video-glamo_git.bb @@ -6,7 +6,7 @@ S = "${WORKDIR}/git" SRCREV = "2d96367657adb21b34742e76c3a92ba1a3961106" PV = "1.0.0+gitr${SRCPV}" PE = "2" -PR = "r5" +PR = "r6" RDEPENDS_${PN} = "xserver-xorg-extension-dri xserver-xorg-extension-dri2 xserver-xorg-extension-glx mesa-dri" DEPENDS += "libdrm" diff --git a/recipes/xorg-driver/xf86-video-vesa_2.2.0.bb b/recipes/xorg-driver/xf86-video-vesa_2.2.0.bb index 363f15bf80..7682a9d84e 100644 --- a/recipes/xorg-driver/xf86-video-vesa_2.2.0.bb +++ b/recipes/xorg-driver/xf86-video-vesa_2.2.0.bb @@ -7,6 +7,6 @@ SRC_URI += "file://fix-includepath.patch \ #DESCRIPTION = "" RDEPENDS_${PN} += "xserver-xorg-module-libint10 " -PR = "r2" +PR = "r3" SRC_URI[archive.md5sum] = "9a86b683f73f3806f55d05cd804a6f4a" SRC_URI[archive.sha256sum] = "8b3e077d2534722033d7b1c647aa7f31fc7fbb5014da096b7a53170005e80226" diff --git a/recipes/xorg-font/font-alias_1.0.1.bb b/recipes/xorg-font/font-alias_1.0.1.bb index 017d376b0f..687e0a4fee 100644 --- a/recipes/xorg-font/font-alias_1.0.1.bb +++ b/recipes/xorg-font/font-alias_1.0.1.bb @@ -6,7 +6,7 @@ DEPENDS = "virtual/xserver font-util" RDEPENDS_${PN} = "encodings font-util" PE = "1" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI[archive.md5sum] = "c4776b6f0f2ecdb7670b6fe64b5d2a2d" SRC_URI[archive.sha256sum] = "77db60d63224b9d856129d23c0b0d0e9154a166137daf749d39abfd56a4f89b6" diff --git a/recipes/xorg-font/font-alias_1.0.2.bb b/recipes/xorg-font/font-alias_1.0.2.bb index 902d8eedfa..1576ad761d 100644 --- a/recipes/xorg-font/font-alias_1.0.2.bb +++ b/recipes/xorg-font/font-alias_1.0.2.bb @@ -6,7 +6,7 @@ DEPENDS = "virtual/xserver font-util" RDEPENDS_${PN} = "encodings font-util" PE = "1" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI[archive.md5sum] = "9d40dba6fb8cb58dacb433fc7bcaafca" SRC_URI[archive.sha256sum] = "438bd6f3f9305edb6ea9905dc92c135d6067bbd7e01df913cb3ef27162b38270" diff --git a/recipes/xorg-font/font-util_1.0.1.bb b/recipes/xorg-font/font-util_1.0.1.bb index 61a43f75f2..47fa71abc0 100644 --- a/recipes/xorg-font/font-util_1.0.1.bb +++ b/recipes/xorg-font/font-util_1.0.1.bb @@ -8,7 +8,7 @@ DEPENDS = "encodings" RDEPENDS_${PN} = "mkfontdir mkfontscale encodings" PE = "1" -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" SRC_URI[archive.md5sum] = "b81535f78fe05732931f02841e5ca37b" SRC_URI[archive.sha256sum] = "048c23b17ea32ee3abb341f0b1105ad07517b2e78efe2e95a4a8218089600612" diff --git a/recipes/xorg-font/font-util_1.1.1.bb b/recipes/xorg-font/font-util_1.1.1.bb index f42b50541b..bb8a0f99f9 100644 --- a/recipes/xorg-font/font-util_1.1.1.bb +++ b/recipes/xorg-font/font-util_1.1.1.bb @@ -8,7 +8,7 @@ DEPENDS = "encodings util-macros" RDEPENDS_${PN} = "mkfontdir mkfontscale encodings" PE = "1" -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" do_configure_prepend() { sed -i "s#MAPFILES_PATH=\`pkg-config#MAPFILES_PATH=\`PKG_CONFIG_PATH=\"${STAGING_LIBDIR_NATIVE}/pkg-config\" pkg-config#g" fontutil.m4.in diff --git a/recipes/xorg-font/xorg-font-common.inc b/recipes/xorg-font/xorg-font-common.inc index 2637f135af..c5b0694b15 100644 --- a/recipes/xorg-font/xorg-font-common.inc +++ b/recipes/xorg-font/xorg-font-common.inc @@ -6,7 +6,7 @@ DEPENDS = " encodings font-alias font-util-native mkfontdir-native mkfontscale-n RDEPENDS_${PN} = "encodings font-util font-alias" XORG_PN = "${PN}" -INC_PR = "r1" +INC_PR = "r2" SRC_URI = "${XORG_MIRROR}/individual/font/${XORG_PN}-${PV}.tar.bz2;name=archive" S = "${WORKDIR}/${XORG_PN}-${PV}" diff --git a/recipes/xorg-lib/libx11_git.bb b/recipes/xorg-lib/libx11_git.bb index 05fc3e7795..9cd227b0bb 100644 --- a/recipes/xorg-lib/libx11_git.bb +++ b/recipes/xorg-lib/libx11_git.bb @@ -5,10 +5,10 @@ SECTION = "x11/libs" LICENSE = "XFree86" DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros" PROVIDES = "virtual/libx11" -RPROVIDES = "virtual-libx11" +RPROVIDES_${PN} = "virtual-libx11" SRCREV = "c3f3e4a9e531d010312c97e753d6e543e607094d" PV = "1.3.3+git" -PR = "r3" +PR = "r4" FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" FILES_${PN}-locale += "${datadir}/X11/locale" diff --git a/recipes/xorg-lib/libxscrnsaver_1.1.2.bb b/recipes/xorg-lib/libxscrnsaver_1.1.2.bb index 0b97380ab7..41c40339aa 100644 --- a/recipes/xorg-lib/libxscrnsaver_1.1.2.bb +++ b/recipes/xorg-lib/libxscrnsaver_1.1.2.bb @@ -4,8 +4,8 @@ DESCRIPTION = "X Screen Saver extension library" LICENSE = "GPL" DEPENDS += "libxext scrnsaverproto" PROVIDES = "libxss" -RREPLACES = "libxss" -PR = "r1" +RREPLACES_${PN} = "libxss" +PR = "r2" PE = "1" XORG_PN = "libXScrnSaver" diff --git a/recipes/xorg-lib/libxscrnsaver_1.1.3.bb b/recipes/xorg-lib/libxscrnsaver_1.1.3.bb index 442bb74334..f6f28925f7 100644 --- a/recipes/xorg-lib/libxscrnsaver_1.1.3.bb +++ b/recipes/xorg-lib/libxscrnsaver_1.1.3.bb @@ -4,8 +4,8 @@ DESCRIPTION = "X Screen Saver extension library" LICENSE = "GPL" DEPENDS += "libxext scrnsaverproto" PROVIDES = "libxss" -RREPLACES = "libxss" -PR = "r1" +RREPLACES_${PN} = "libxss" +PR = "r2" PE = "1" XORG_PN = "libXScrnSaver" diff --git a/recipes/xorg-lib/libxscrnsaver_1.2.0.bb b/recipes/xorg-lib/libxscrnsaver_1.2.0.bb index 47759c20ea..53fec81fd2 100644 --- a/recipes/xorg-lib/libxscrnsaver_1.2.0.bb +++ b/recipes/xorg-lib/libxscrnsaver_1.2.0.bb @@ -4,8 +4,8 @@ DESCRIPTION = "X Screen Saver extension library" LICENSE = "GPL" DEPENDS += "libxext scrnsaverproto" PROVIDES = "libxss" -RREPLACES = "libxss" -PR = "r1" +RREPLACES_${PN} = "libxss" +PR = "r2" PE = "1" XORG_PN = "libXScrnSaver" diff --git a/recipes/xorg-util/gccmakedep_1.0.2.bb b/recipes/xorg-util/gccmakedep_1.0.2.bb index dbfc648931..651d272944 100644 --- a/recipes/xorg-util/gccmakedep_1.0.2.bb +++ b/recipes/xorg-util/gccmakedep_1.0.2.bb @@ -3,7 +3,7 @@ require xorg-util-common.inc DESCRIPTION = "create dependencies in makefiles using 'gcc -M'" RDEPENDS_${PN} = "gcc" -PR = "r3" +PR = "r4" PE = "1" SRC_URI[archive.md5sum] = "fc49f45251c1336fe1dad5dba1c83fcd" SRC_URI[archive.sha256sum] = "fdd3963294e80b27416f902a5c029c033d321f03310d3cafa3afb62b50ddce92" diff --git a/recipes/xorg-util/imake_1.0.2.bb b/recipes/xorg-util/imake_1.0.2.bb index 1e90a9bce6..a77e70540f 100644 --- a/recipes/xorg-util/imake_1.0.2.bb +++ b/recipes/xorg-util/imake_1.0.2.bb @@ -3,7 +3,7 @@ require xorg-util-common.inc DESCRIPTION = "C preprocessor interface to the make utility" RDEPENDS_${PN} = "perl xproto" -PR = "r2" +PR = "r3" PE = "1" SRC_URI[archive.md5sum] = "b5c3a719d60a14ca2378dc1259ee60df" SRC_URI[archive.sha256sum] = "8008b4366ab96abfdac2c91808b79ec2cc5649966b41cfb07b14b6fbd798651c" diff --git a/recipes/xorg-util/imake_1.0.3.bb b/recipes/xorg-util/imake_1.0.3.bb index 10e4f732d4..509b823348 100644 --- a/recipes/xorg-util/imake_1.0.3.bb +++ b/recipes/xorg-util/imake_1.0.3.bb @@ -3,7 +3,7 @@ require xorg-util-common.inc DESCRIPTION = "C preprocessor interface to the make utility" RDEPENDS_${PN} = "perl xproto" -PR = "r2" +PR = "r3" PE = "1" SRC_URI[archive.md5sum] = "579377af36a146913b3429cad1f7e8ab" SRC_URI[archive.sha256sum] = "5d149c3cc9a0d7eca2a4bb44e5597f50f6d7ec75b61d7ca2ded842294214012d" diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb index f28c545810..6f329d17f1 100644 --- a/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb +++ b/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb @@ -4,7 +4,7 @@ DEPENDS += "hal libxkbfile libxcalibrate pixman" RDEPENDS_${PN} += "hal" PE = "1" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.2.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.2.bb index 0ac7bd34c0..4971c9fdfb 100644 --- a/recipes/xorg-xserver/xserver-kdrive_1.4.2.bb +++ b/recipes/xorg-xserver/xserver-kdrive_1.4.2.bb @@ -4,7 +4,7 @@ DEPENDS += "hal libxkbfile libxcalibrate pixman" RDEPENDS_${PN} += "hal" PE = "1" -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.99.901.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.99.901.bb index 7b4066bc08..35ff4f00da 100644 --- a/recipes/xorg-xserver/xserver-kdrive_1.4.99.901.bb +++ b/recipes/xorg-xserver/xserver-kdrive_1.4.99.901.bb @@ -6,7 +6,7 @@ RDEPENDS_${PN} += "hal" DEFAULT_PREFERENCE = "-99" PE = "1" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.bb index 0fca6c546d..8f27e80867 100644 --- a/recipes/xorg-xserver/xserver-kdrive_1.4.bb +++ b/recipes/xorg-xserver/xserver-kdrive_1.4.bb @@ -4,7 +4,7 @@ DEPENDS += "hal libxkbfile libxcalibrate pixman" RDEPENDS_${PN} += "hal" PE = "1" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ diff --git a/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb b/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb index 07e88f507c..7250a61b74 100644 --- a/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb +++ b/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb @@ -6,7 +6,7 @@ RDEPENDS_${PN} += "hal" DEFAULT_PREFERENCE = "-99" PE = "1" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ diff --git a/recipes/xorg-xserver/xserver-xorg_1.4.2.bb b/recipes/xorg-xserver/xserver-xorg_1.4.2.bb index cfdecb1c7b..0f4f8e73c4 100644 --- a/recipes/xorg-xserver/xserver-xorg_1.4.2.bb +++ b/recipes/xorg-xserver/xserver-xorg_1.4.2.bb @@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server" DEPENDS += "pixman" RDEPENDS_${PN} += "hal" PE = "1" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI += "file://drmfix.patch \ file://pkgconfig_fix.patch \ diff --git a/recipes/xorg-xserver/xserver-xorg_1.4.bb b/recipes/xorg-xserver/xserver-xorg_1.4.bb index b73df6cac5..f1532126c4 100644 --- a/recipes/xorg-xserver/xserver-xorg_1.4.bb +++ b/recipes/xorg-xserver/xserver-xorg_1.4.bb @@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server" DEPENDS += "pixman" RDEPENDS_${PN} += "hal" PE = "1" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI += "file://drmfix.patch \ file://pkgconfig_fix.patch \ diff --git a/recipes/xorg-xserver/xserver-xorg_1.5.1.bb b/recipes/xorg-xserver/xserver-xorg_1.5.1.bb index d25a39de93..b1eef4f14f 100644 --- a/recipes/xorg-xserver/xserver-xorg_1.5.1.bb +++ b/recipes/xorg-xserver/xserver-xorg_1.5.1.bb @@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server" DEPENDS += "pixman libpciaccess openssl" RDEPENDS_${PN} += "hal" PE = "1" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI += "file://drmfix.patch \ file://sysroot_fix.patch" diff --git a/recipes/xorg-xserver/xserver-xorg_1.5.3.bb b/recipes/xorg-xserver/xserver-xorg_1.5.3.bb index 4770c86de7..776b87f7c9 100644 --- a/recipes/xorg-xserver/xserver-xorg_1.5.3.bb +++ b/recipes/xorg-xserver/xserver-xorg_1.5.3.bb @@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server" DEPENDS += "pixman libpciaccess openssl" RDEPENDS_${PN} += "hal" PE = "2" -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" SRC_URI += "file://drmfix.patch \ file://sysroot_fix.patch \ diff --git a/recipes/xournal/xournal_0.4.0.1.bb b/recipes/xournal/xournal_0.4.0.1.bb index 891997e87a..b288dd3653 100644 --- a/recipes/xournal/xournal_0.4.0.1.bb +++ b/recipes/xournal/xournal_0.4.0.1.bb @@ -5,7 +5,7 @@ DEPENDS = "gtk+ libgnomecanvas libgnomeprintui" RDEPENDS_${PN} = "poppler" SECTION = "x11" LICENSE = "GPL" -PR = "r1" +PR = "r2" SRC_URI = "http://xournal.sourceforge.net/xournal-${PV}.tar.gz \ file://xournal.desktop" diff --git a/recipes/xournal/xournal_0.4.1.bb b/recipes/xournal/xournal_0.4.1.bb index a7736b40cf..c60a30f8ea 100644 --- a/recipes/xournal/xournal_0.4.1.bb +++ b/recipes/xournal/xournal_0.4.1.bb @@ -5,7 +5,7 @@ DEPENDS = "gtk+ libgnomecanvas libgnomeprintui" RDEPENDS_${PN} = "poppler" SECTION = "x11" LICENSE = "GPL" -PR = "r0" +PR = "r1" SRC_URI = "http://xournal.sourceforge.net/xournal-${PV}.tar.gz \ " diff --git a/recipes/xournal/xournal_0.4.5.bb b/recipes/xournal/xournal_0.4.5.bb index ac3936da35..94f3c7b6d7 100644 --- a/recipes/xournal/xournal_0.4.5.bb +++ b/recipes/xournal/xournal_0.4.5.bb @@ -5,7 +5,7 @@ DEPENDS = "gtk+ libgnomecanvas libgnomeprintui" RDEPENDS_${PN} = "poppler" SECTION = "x11" LICENSE = "GPL" -PR = "r0" +PR = "r1" SRC_URI = "http://xournal.sourceforge.net/xournal-${PV}.tar.gz \ " diff --git a/recipes/xqtlauncher/xqtlauncher-blackbox-config.bb b/recipes/xqtlauncher/xqtlauncher-blackbox-config.bb index 1fe2f7f8f1..37843a22bb 100644 --- a/recipes/xqtlauncher/xqtlauncher-blackbox-config.bb +++ b/recipes/xqtlauncher/xqtlauncher-blackbox-config.bb @@ -1,7 +1,7 @@ DESCRIPTION = "blackbox configuration for xqtlauncher which integrates X/Qt2 nicely into opie." HOMEPAGE = "http://angstrom-distribution.org/" LICENSE = "GPL" -PR = "r0" +PR = "r1" RDEPENDS_${PN} = "blackbox xqtlauncher" diff --git a/recipes/xqtlauncher/xqtlauncher.bb b/recipes/xqtlauncher/xqtlauncher.bb index cfeb0c69af..b4203d4261 100644 --- a/recipes/xqtlauncher/xqtlauncher.bb +++ b/recipes/xqtlauncher/xqtlauncher.bb @@ -1,7 +1,7 @@ DESCRIPTION = "xqtlauncher integrates X/Qt2 nicely into opie. You can launch applications with it from opies menue" HOMEPAGE = "http://angstrom-distribution.org/" LICENSE = "GPL" -PR = "r2" +PR = "r3" RDEPENDS_${PN} = "xqt2 xorg-minimal-fonts" diff --git a/recipes/xtables-addons/xtables-addons_1.26.bb b/recipes/xtables-addons/xtables-addons_1.26.bb new file mode 100644 index 0000000000..057e3dec56 --- /dev/null +++ b/recipes/xtables-addons/xtables-addons_1.26.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "Xtables-addons contains a set of possibly useful but not included in the mainline kernel nefilter extensions" +LICENSE = "GPLv2" +DEPENDS = "virtual/kernel iptables" +RDEPENDS_${PN} += "kernel update-modules" +PROVIDES += "ipset ipset-modules" +RPROVIDES_${PN} += "ipset ipset-modules" + +PR = "r0" + +SRC_URI = " \ + ${SOURCEFORGE_MIRROR}/project/${PN}/Xtables-addons/${PV}/${PN}-${PV}.tar.bz2 \ + " +SRC_URI[md5sum] = "6091032318ee7fb46d82dec9ae5ae422" +SRC_URI[sha256sum] = "b05adfc676d5eb5e58c4d273677725d35248c4cb30859a3a53045d03818f591e" + +inherit autotools module-base + +EXTRA_OECONF = "--with-kbuild=${STAGING_KERNEL_DIR}" + +FILES_${PN} += "${base_libdir}/modules" +FILES_${PN}-dbg += "${libexecdir}/xtables/.debug/" + +pkg_postinst_${PN} () { + if [ -n "$D" ]; then + exit 1 + fi + depmod -a + update-modules || true +} + +pkg_postrm_${PN} () { + update-modules || true +}
\ No newline at end of file diff --git a/recipes/yeaphone/yeaphone_0.1.bb b/recipes/yeaphone/yeaphone_0.1.bb index 89e0f01895..c38060990b 100644 --- a/recipes/yeaphone/yeaphone_0.1.bb +++ b/recipes/yeaphone/yeaphone_0.1.bb @@ -11,7 +11,7 @@ RRECOMMENDS_${PN} = "\ kernel-module-snd-usb-audio \ " -PR = "r3" +PR = "r4" SRC_URI = "http://download.devbase.at/voip/yeaphone-${PV}.tar.gz" diff --git a/recipes/yum/yum_3.2.18.bb b/recipes/yum/yum_3.2.18.bb index 1f19c16653..c4888c036c 100644 --- a/recipes/yum/yum_3.2.18.bb +++ b/recipes/yum/yum_3.2.18.bb @@ -1,5 +1,5 @@ HOMEPAGE = "http://linux.duke.edu/projects/yum/" -PR = "r6" +PR = "r7" SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \ file://paths.patch \ diff --git a/recipes/zaurusd/zaurusd_svn.bb b/recipes/zaurusd/zaurusd_svn.bb index e0bbe517b9..e382074391 100644 --- a/recipes/zaurusd/zaurusd_svn.bb +++ b/recipes/zaurusd/zaurusd_svn.bb @@ -5,7 +5,7 @@ DEPENDS = "tslib" RDEPENDS_${PN} = "procps" SRCDATE = "20090501" PV = "0.0+svn${SRCDATE}" -PR = "r22" +PR = "r23" SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \ file://zaurus-hinge.in \ diff --git a/recipes/zd1211/zd1211_r85.bb b/recipes/zd1211/zd1211_r85.bb index 315d9af4cf..86885a06a8 100644 --- a/recipes/zd1211/zd1211_r85.bb +++ b/recipes/zd1211/zd1211_r85.bb @@ -4,7 +4,7 @@ SECTION = "kernel/modules" PRIORITY = "optional" LICENSE = "GPL" RDEPENDS_${PN} = "wireless-tools" -PR = "r1" +PR = "r2" SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ file://makefile.patch" diff --git a/recipes/zsafe/zsafe_2.1.3.bb b/recipes/zsafe/zsafe_2.1.3.bb index fcbfe1f2e7..c25acba9b9 100644 --- a/recipes/zsafe/zsafe_2.1.3.bb +++ b/recipes/zsafe/zsafe_2.1.3.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Password manager" SECTION = "opie/applications" PRIORITY = "optional" LICENSE = "GPL" -RCONFLICTS = "opie-zsafe" +RCONFLICTS_${PN} = "opie-zsafe" APPNAME = "zsafe" APPTYPE = "binary" APPDESKTOP = "${WORKDIR}" diff --git a/recipes/zten/zten_1.6.2.bb b/recipes/zten/zten_1.6.2.bb index 6be6309cc4..2250811f4f 100644 --- a/recipes/zten/zten_1.6.2.bb +++ b/recipes/zten/zten_1.6.2.bb @@ -6,8 +6,8 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "eb kakasi" RDEPENDS_${PN} = "virtual-japanese-font" -RCONFLICTS = "ztenv" -PR = "r1" +RCONFLICTS_${PN} = "ztenv" +PR = "r2" SRC_URI = "http://www.gohome.org/cgi-bin/viewcvs.cgi/zten.tar.gz;md5sum=d24f03c8df5c98d510590bd9a63dc932 \ file://zten.patch" |