initial commit for Enea Linux 4.0-140929daisy-140929

Migrated from the internal git server on the daisy-enea-point-release branch Signed-off-by: Tudor Florea <tudor.florea@enea.com>
author: Tudor Florea <tudor.florea@enea.com> 2014-10-10 03:20:04 +0200
committer: Tudor Florea <tudor.florea@enea.com> 2014-10-10 03:20:04 +0200
commit: 1b8dfe266937a37a4c642f96ceb2347bf4c00a17 (patch)
tree: 0c6aab146bb3c82efd9c7846a9a4e70dcb0ec84f /meta-oe/recipes-extended
download: meta-openembedded-daisy-140929.tar.gz
118 files changed, 7602 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/acpica/acpica_20140325.bb b/meta-oe/recipes-extended/acpica/acpica_20140325.bb
new file mode 100644
index 0000000000..0210b044b3
--- /dev/null
+++ b/meta-oe/recipes-extended/acpica/acpica_20140325.bb
@@ -0,0 +1,34 @@
+SUMMARY = "ACPICA tools for the development and debug of ACPI tables"
+DESCRIPTION = "The ACPI Component Architecture (ACPICA) project provides an \
+OS-independent reference implementation of the Advanced Configuration and \
+Power Interface Specification (ACPI). ACPICA code contains those portions of \
+ACPI meant to be directly integrated into the host OS as a kernel-resident \
+subsystem, and a small set of tools to assist in developing and debugging \
+ACPI tables."
+HOMEPAGE = "http://www.acpica.org/"
+SECTION = "console/tools"
+LICENSE = "BSD | GPLv2"
+LIC_FILES_CHKSUM = "file://generate/unix/readme.txt;md5=204407e197c1a01154a48f6c6280c3aa"
+DEPENDS = "bison flex"
+SRC_URI = "https://acpica.org/sites/acpica/files/acpica-unix2-${PV}.tar.gz \
+    file://no-werror.patch \
+    "
+SRC_URI[md5sum] = "08efe232bca06a7c54462695bbc2f87c"
+SRC_URI[sha256sum] = "12a7a3c9f2d81e46b0c7095bb7c268ec4bf231178fcbe54ff0c30cd83d2ac38c"
+S = "${WORKDIR}/acpica-unix2-${PV}"
+EXTRA_OEMAKE = "CC=${TARGET_PREFIX}gcc 'OPT_CFLAGS=-Wall'"
+do_install() {
+    install -D -p -m0755 generate/unix/bin*/iasl ${D}${bindir}/iasl
+    install -D -p -m0755 generate/unix/bin*/acpibin ${D}${bindir}/acpibin
+    install -D -p -m0755 generate/unix/bin*/acpiexec ${D}${bindir}/acpiexec
+    install -D -p -m0755 generate/unix/bin*/acpihelp ${D}${bindir}/acpihelp
+    install -D -p -m0755 generate/unix/bin*/acpinames ${D}${bindir}/acpinames
+    install -D -p -m0755 generate/unix/bin*/acpisrc ${D}${bindir}/acpisrc
+    install -D -p -m0755 generate/unix/bin*/acpixtract ${D}${bindir}/acpixtract
+}
+COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
diff --git a/meta-oe/recipes-extended/acpica/acpitests/0001-Fixup-aapits-build.patch b/meta-oe/recipes-extended/acpica/acpitests/0001-Fixup-aapits-build.patch
new file mode 100644
index 0000000000..6565a32abd
--- /dev/null
+++ b/meta-oe/recipes-extended/acpica/acpitests/0001-Fixup-aapits-build.patch
@@ -0,0 +1,558 @@
+From d9743540b5399a14a7ca1ba708156bed956d9425 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@ahs3.net>
+Date: Fri, 17 Jan 2014 12:51:13 +0100
+Subject: [PATCH] Fixup aapits build
+From http://git.linaro.org/people/al.stone/acpica-tools.git
+Upstream-status: Unknown
+---
+ tests/aapits/Makefile      | 44 +++++++++++++++++++++++++++++++++++++++++---
+ tests/aapits/atexec.c      | 15 ++++++++++-----
+ tests/aapits/atinit.c      | 10 +++++-----
+ tests/aapits/atmain.c      |  6 +++---
+ tests/aapits/atnamespace.c | 12 ++++++++----
+ tests/aapits/atosxfctrl.c  | 21 +++++++++++++++++----
+ tests/aapits/atresource.c  | 10 +++++-----
+ tests/aapits/osunixxf.c    | 25 ++++++++++++++++++++++---
+ 8 files changed, 111 insertions(+), 32 deletions(-)
+diff --git a/tests/aapits/Makefile b/tests/aapits/Makefile
+index b774c9c..9bf12b8 100644
+--- a/tests/aapits/Makefile
+++ b/tests/aapits/Makefile
+@@ -20,37 +20,53 @@ SRCS=       atexec.c atmain.c \
+        ../../source/components/hardware/hwxface.c \
+        ../../source/common/getopt.c \
+        ../../source/components/debugger/dbcmds.c \
+       ../../source/components/debugger/dbconvert.c \
+        ../../source/components/debugger/dbdisply.c \
+        ../../source/components/debugger/dbexec.c \
+        ../../source/components/debugger/dbfileio.c \
+        ../../source/components/debugger/dbhistry.c \
+        ../../source/components/debugger/dbinput.c \
+       ../../source/components/debugger/dbmethod.c \
+       ../../source/components/debugger/dbnames.c \
+        ../../source/components/debugger/dbstats.c \
+       ../../source/components/debugger/dbtest.c \
+        ../../source/components/debugger/dbutils.c \
+        ../../source/components/debugger/dbxface.c \
+        ../../source/components/disassembler/dmbuffer.c \
+       ../../source/components/disassembler/dmdeferred.c \
+        ../../source/components/disassembler/dmnames.c \
+        ../../source/components/disassembler/dmobject.c \
+        ../../source/components/disassembler/dmopcode.c \
+        ../../source/components/disassembler/dmresrc.c \
+        ../../source/components/disassembler/dmresrcl.c \
+       ../../source/components/disassembler/dmresrcl2.c \
+        ../../source/components/disassembler/dmresrcs.c \
+        ../../source/components/disassembler/dmutils.c \
+        ../../source/components/disassembler/dmwalk.c \
+        ../../source/components/events/evevent.c \
+       ../../source/components/events/evglock.c \
+        ../../source/components/events/evgpeblk.c \
+        ../../source/components/events/evgpe.c \
+       ../../source/components/events/evgpeinit.c \
+       ../../source/components/events/evgpeutil.c \
+       ../../source/components/events/evhandler.c \
+        ../../source/components/events/evmisc.c \
+        ../../source/components/events/evregion.c \
+        ../../source/components/events/evrgnini.c \
+        ../../source/components/events/evsci.c \
+        ../../source/components/events/evxface.c \
+        ../../source/components/events/evxfevnt.c \
+       ../../source/components/events/evxfgpe.c \
+        ../../source/components/events/evxfregn.c \
+        ../../source/components/hardware/hwacpi.c \
+       ../../source/components/hardware/hwesleep.c \
+        ../../source/components/hardware/hwgpe.c \
+       ../../source/components/hardware/hwpci.c \
+        ../../source/components/hardware/hwregs.c \
+        ../../source/components/hardware/hwsleep.c \
+       ../../source/components/hardware/hwxfsleep.c \
+       ../../source/components/dispatcher/dsargs.c \
+       ../../source/components/dispatcher/dscontrol.c \
+        ../../source/components/dispatcher/dsfield.c \
+        ../../source/components/dispatcher/dsinit.c \
+        ../../source/components/dispatcher/dsmethod.c \
+@@ -60,11 +76,13 @@ SRCS=       atexec.c atmain.c \
+        ../../source/components/dispatcher/dsutils.c \
+        ../../source/components/dispatcher/dswexec.c \
+        ../../source/components/dispatcher/dswload.c \
+       ../../source/components/dispatcher/dswload2.c \
+        ../../source/components/dispatcher/dswscope.c \
+        ../../source/components/dispatcher/dswstate.c \
+        ../../source/components/executer/exconfig.c \
+        ../../source/components/executer/exconvrt.c \
+        ../../source/components/executer/excreate.c \
+       ../../source/components/executer/exdebug.c \
+        ../../source/components/executer/exdump.c \
+        ../../source/components/executer/exfield.c \
+        ../../source/components/executer/exfldio.c \
+@@ -87,7 +105,9 @@ SRCS=        atexec.c atmain.c \
+        ../../source/components/executer/exutils.c \
+        ../../source/components/parser/psargs.c \
+        ../../source/components/parser/psloop.c \
+       ../../source/components/parser/psobject.c \
+        ../../source/components/parser/psopcode.c \
+       ../../source/components/parser/psopinfo.c \
+        ../../source/components/parser/psparse.c \
+        ../../source/components/parser/psscope.c \
+        ../../source/components/parser/pstree.c \
+@@ -96,6 +116,8 @@ SRCS=        atexec.c atmain.c \
+        ../../source/components/parser/psxface.c \
+        ../../source/components/namespace/nsaccess.c \
+        ../../source/components/namespace/nsalloc.c \
+       ../../source/components/namespace/nsarguments.c \
+       ../../source/components/namespace/nsconvert.c \
+        ../../source/components/namespace/nsdump.c \
+        ../../source/components/namespace/nsdumpdv.c \
+        ../../source/components/namespace/nseval.c \
+@@ -105,6 +127,7 @@ SRCS=       atexec.c atmain.c \
+        ../../source/components/namespace/nsobject.c \
+        ../../source/components/namespace/nsparse.c \
+        ../../source/components/namespace/nspredef.c \
+       ../../source/components/namespace/nsprepkg.c \
+        ../../source/components/namespace/nsrepair.c \
+        ../../source/components/namespace/nsrepair2.c \
+        ../../source/components/namespace/nssearch.c \
+@@ -117,26 +140,35 @@ SRCS=     atexec.c atmain.c \
+        ../../source/components/resources/rscalc.c \
+        ../../source/components/resources/rscreate.c \
+        ../../source/components/resources/rsdump.c \
+       ../../source/components/resources/rsdumpinfo.c \
+       ../../source/components/resources/rsinfo.c \
+        ../../source/components/resources/rsio.c \
+        ../../source/components/resources/rsirq.c \
+        ../../source/components/resources/rslist.c \
+        ../../source/components/resources/rsmemory.c \
+        ../../source/components/resources/rsmisc.c \
+       ../../source/components/resources/rsserial.c \
+        ../../source/components/resources/rsutils.c \
+        ../../source/components/resources/rsxface.c \
+-       ../../source/components/resources/rsinfo.c \
+        ../../source/components/tables/tbfadt.c \
+        ../../source/components/tables/tbfind.c \
+        ../../source/components/tables/tbinstal.c \
+       ../../source/components/tables/tbprint.c \
+        ../../source/components/tables/tbutils.c \
+        ../../source/components/tables/tbxface.c \
+       ../../source/components/tables/tbxfload.c \
+        ../../source/components/tables/tbxfroot.c \
+       ../../source/components/utilities/utaddress.c \
+        ../../source/components/utilities/utalloc.c \
+       ../../source/components/utilities/utbuffer.c \
+        ../../source/components/utilities/utcache.c \
+        ../../source/components/utilities/utcopy.c \
+        ../../source/components/utilities/utdebug.c \
+       ../../source/components/utilities/utdecode.c \
+        ../../source/components/utilities/utdelete.c \
+       ../../source/components/utilities/uterror.c \
+        ../../source/components/utilities/uteval.c \
+       ../../source/components/utilities/utexcep.c \
+        ../../source/components/utilities/utglobal.c \
+        ../../source/components/utilities/utids.c \
+        ../../source/components/utilities/utinit.c \
+@@ -145,17 +177,23 @@ SRCS=     atexec.c atmain.c \
+        ../../source/components/utilities/utmisc.c \
+        ../../source/components/utilities/utmutex.c \
+        ../../source/components/utilities/utobject.c \
+       ../../source/components/utilities/utosi.c \
+       ../../source/components/utilities/utownerid.c \
+       ../../source/components/utilities/utpredef.c \
+        ../../source/components/utilities/utresrc.c \
+        ../../source/components/utilities/utstate.c \
+       ../../source/components/utilities/utstring.c \
+        ../../source/components/utilities/uttrack.c \
+-       ../../source/components/utilities/utxface.c
+       ../../source/components/utilities/utxface.c \
+       ../../source/components/utilities/utxferror.c \
+       ../../source/components/utilities/utxfinit.c
+ #      ../../source/components/osunixxf.c
+ 
+ 
+ CFLAGS+= -Wall -g -D_LINUX -DNDEBUG -D_CONSOLE -DACPI_EXEC_APP -D_MULTI_THREADED -Wstrict-prototypes -I../../source/include 
+ 
+ 
+-acpiexec : $(patsubst %.c,%.o, $(SRCS))
+$(PROG) : $(patsubst %.c,%.o, $(SRCS))
+        $(CC) $(LDFLAGS) $(patsubst %.c,%.o, $(SRCS)) -o $(PROG)
+ 
+ CLEANFILES= $(PROG)
+diff --git a/tests/aapits/atexec.c b/tests/aapits/atexec.c
+index 0280557..1406c0f 100644
+--- a/tests/aapits/atexec.c
+++ b/tests/aapits/atexec.c
+@@ -639,6 +639,7 @@ AtBuildLocalFADT2 (
+ }
+ 
+ 
+#if ACPI_MACHINE_WIDTH == 32
+ /*******************************************************************************
+  *
+  * FUNCTION:    AtBuildLocalRSDT
+@@ -757,6 +758,7 @@ AtBuildLocalRSDT (
+         LocalRSDT->Header.Checksum = (UINT8)~LocalRSDT->Header.Checksum;
+     }
+ }
+#endif
+ 
+ 
+ /*******************************************************************************
+@@ -1424,7 +1426,7 @@ AeRegionHandler (
+         ACPI_WARNING ((AE_INFO,
+             "Request on [%4.4s] is beyond region limit Req-%X+%X, Base=%X, Len-%X\n",
+             (RegionObject->Region.Node)->Name.Ascii, (UINT32) Address,
+-            ByteWidth, (UINT32) BufferAddress, Length));
+            ByteWidth, (UINT32) BufferAddress, (UINT32) Length));
+ 
+         return (AE_AML_REGION_LIMIT);
+     }
+@@ -1792,7 +1794,9 @@ AtCheckInteger(
+             Path, Obj.Integer.Value, Value);
+ #else
+         printf ("API Error: Value of %s is 0x%llx instead of expected 0x%llx\n",
+-            Path, Obj.Integer.Value, Value);
+            Path,
+           (long long unsigned int) Obj.Integer.Value,
+           (long long unsigned int) Value);
+ #endif
+         Status = AE_ERROR;
+     }
+@@ -1871,7 +1875,7 @@ AtCheckString(
+     {
+         TestErrors++;
+         printf ("Test Error: cannot allocate buffer of %d bytes\n",
+-            Results.Length);
+                (int) Results.Length);
+         return (AE_NO_MEMORY);
+     }
+     Results.Pointer = Object;
+@@ -1952,7 +1956,8 @@ AtCheckBuffer(
+     {
+         printf ("AtCheckBuffer: unexpected length %d of Buffer vs"
+             " calculated %d bytes\n",
+-            Results.Length, ACPI_ROUND_UP_TO_NATIVE_WORD(sizeof (ACPI_OBJECT) + Length));
+            (int)Results.Length,
+           (int)(ACPI_ROUND_UP_TO_NATIVE_WORD(sizeof (ACPI_OBJECT) + Length)));
+     }
+ 
+     /* Initialize the return buffer structure */
+@@ -1961,7 +1966,7 @@ AtCheckBuffer(
+     {
+         TestErrors++;
+         printf ("Test Error: cannot allocate buffer of %d bytes\n",
+-            Results.Length);
+            (int) Results.Length);
+         return (AE_NO_MEMORY);
+     }
+     Results.Pointer = Object;
+diff --git a/tests/aapits/atinit.c b/tests/aapits/atinit.c
+index 5bb8ee3..2444225 100644
+--- a/tests/aapits/atinit.c
+++ b/tests/aapits/atinit.c
+@@ -3024,7 +3024,7 @@ AtInitTest0041(void)
+             AapiErrors++;
+             printf ("API Error: AcpiGetSystemInfo() returned"
+                 " Length %d, expected %d\n",
+-                OutBuffer.Length, sizeof (Info));
+                (int) OutBuffer.Length, (int) sizeof (Info));
+             return (AE_ERROR);
+         }
+ 
+@@ -3046,7 +3046,7 @@ AtInitTest0041(void)
+             AapiErrors++;
+             printf ("API Error: AcpiGetSystemInfo() returned"
+                 " Length %d, expected %d\n",
+-                OutBuffer.Length, sizeof (Info));
+                (int) OutBuffer.Length, (int) sizeof (Info));
+             return (AE_ERROR);
+         }
+ 
+@@ -3066,7 +3066,7 @@ AtInitTest0041(void)
+             AapiErrors++;
+             printf ("API Error: AcpiGetSystemInfo() returned"
+                 " Length %d, expected %d\n",
+-                OutBuffer.Length, sizeof (Info));
+                (int) OutBuffer.Length, (int) sizeof (Info));
+             return (AE_ERROR);
+         }
+         else if (OutBuffer.Pointer != &Info)
+@@ -3149,7 +3149,7 @@ AtInitTest0042(void)
+             AapiErrors++;
+             printf ("API Error: AcpiGetSystemInfo() returned"
+                 " Length %d, expected %d\n",
+-                OutBuffer.Length, sizeof (Info));
+                (int) OutBuffer.Length, (int) sizeof (Info));
+             return (AE_ERROR);
+         }
+         else if (OutBuffer.Pointer != &Info)
+@@ -3214,7 +3214,7 @@ AtInitTest0043(void)
+             AapiErrors++;
+             printf ("API Error: AcpiGetSystemInfo() returned"
+                 " Length %d, expected %d\n",
+-                OutBuffer.Length, sizeof (ACPI_SYSTEM_INFO));
+                (int) OutBuffer.Length, (int) sizeof (ACPI_SYSTEM_INFO));
+             return (AE_ERROR);
+         }
+         else
+diff --git a/tests/aapits/atmain.c b/tests/aapits/atmain.c
+index c3f5de7..e83e524 100644
+--- a/tests/aapits/atmain.c
+++ b/tests/aapits/atmain.c
+@@ -315,7 +315,7 @@ ExecuteTest (
+     {
+         printf ("ACPICA API TS err: test num %ld of test case %ld"
+             " is not implemented\n",
+-            test_num, test_case);
+            (long int) test_num, (long int) test_case);
+         return (AtRetNotImpl);
+     }
+ 
+@@ -430,7 +430,7 @@ main(
+     if (test_case < 1 || test_case > AT_TEST_CASE_NUM)
+     {
+         printf ("ACPICA API TS err: test case %ld is out of range 1 - %d\n",
+-            test_case, AT_TEST_CASE_NUM);
+            (long int) test_case, (int) AT_TEST_CASE_NUM);
+         return (AtRetBadParam);
+     }
+ 
+@@ -438,7 +438,7 @@ main(
+     if (test_num < 0 || test_num > AtTestCase[test_case].TestsNum)
+     {
+         printf ("ACPICA API TS err: test num %ld is out of range 0 - %d\n",
+-            test_num, AtTestCase[test_case].TestsNum);
+            (long int) test_num, AtTestCase[test_case].TestsNum);
+         return (AtRetBadParam);
+     }
+ 
+diff --git a/tests/aapits/atnamespace.c b/tests/aapits/atnamespace.c
+index 8a4ec65..76e3edb 100644
+--- a/tests/aapits/atnamespace.c
+++ b/tests/aapits/atnamespace.c
+@@ -2535,7 +2535,8 @@ AtGetObjectInfoTypeCommon(
+ #else
+                 printf ("API Error: Address of %s (0x%llX) != (0x%llX)\n",
+                     PathNames[2 * i + 1],
+-                    Info->Address, ExpectedInfo[i].Address);
+                    (long long unsigned int) Info->Address,
+                   (long long unsigned int) ExpectedInfo[i].Address);
+ #endif
+ #else
+                 printf ("API Error: Address of %s (0x%X) != (0x%X)\n",
+@@ -2908,7 +2909,8 @@ AtGetNextObjectTypeCommon(
+         TestErrors++;
+         printf ("AtGetNextObjectTypeCommon: different numbers of entities"
+             "in TypesNames (%d) and LevelTypes0000 (%d)\n",
+-            TypesCount, sizeof (LevelTypes0000) / sizeof (ACPI_OBJECT_TYPE));
+            TypesCount,
+           (int) (sizeof (LevelTypes0000) / sizeof (ACPI_OBJECT_TYPE)));
+         return (AE_ERROR);
+     }
+ 
+@@ -4192,7 +4194,9 @@ AtCheckHandlePathMapping(
+             Pathname, Obj.Integer.Value, Value);
+ #else
+         printf ("API Error: Value of %s is 0x%llx instead of expected 0x%llx\n",
+-            Pathname, Obj.Integer.Value, Value);
+            Pathname,
+           (long long unsigned int) Obj.Integer.Value,
+           (long long unsigned int) Value);
+ #endif
+         Status = AE_ERROR;
+     }
+@@ -5199,7 +5203,7 @@ AtGetNameExceptionTest(
+             {
+                 AapiErrors++;
+                 printf ("API Error: AcpiOsAllocate(%d) returned NULL\n",
+-                    OutName.Length);
+                    (int) OutName.Length);
+                 return (AE_ERROR);
+             }
+         }
+diff --git a/tests/aapits/atosxfctrl.c b/tests/aapits/atosxfctrl.c
+index 9680c4a..31d6971 100644
+--- a/tests/aapits/atosxfctrl.c
+++ b/tests/aapits/atosxfctrl.c
+@@ -737,13 +737,15 @@ ACPI_OSXF_EMUL_REG
+ #if ACPI_MACHINE_WIDTH == 64
+ #ifdef    _MSC_VER
+         printf("OsxfCtrlFingReg: unexpected Width %d of Reg 0x%I64x\n",
+            Width, Address);
+ #else
+         printf("OsxfCtrlFingReg: unexpected Width %d of Reg 0x%llx\n",
+            Width, (long long unsigned int) Address);
+ #endif
+ #else
+         printf("OsxfCtrlFingReg: unexpected Width %d of Reg 0x%x\n",
+-#endif
+             Width, Address);
+#endif
+         return (NULL);
+     }
+ 
+@@ -764,15 +766,19 @@ ACPI_OSXF_EMUL_REG
+ #ifdef    _MSC_VER
+                 printf("OsxfCtrlFingReg: intersection Regs (0x%I64x: 0x%x)"
+                     " and (0x%I64x: 0x%x)\n",
+                    Reg->Address, Reg->Width, Address, Width);
+ #else
+                 printf("OsxfCtrlFingReg: intersection Regs (0x%llx: 0x%x)"
+                     " and (0x%llx: 0x%x)\n",
+                    (long long unsigned int) Reg->Address,
+                   Reg->Width,
+                   (long long unsigned int) Address, Width);
+ #endif
+ #else
+                 printf("OsxfCtrlFingReg: intersection Regs (0x%x: 0x%x)"
+                     " and (0x%x: 0x%x)\n",
+-#endif
+                     Reg->Address, Reg->Width, Address, Width);
+#endif
+                 return (NULL);
+             }
+         }
+@@ -786,13 +792,15 @@ ACPI_OSXF_EMUL_REG
+ #if ACPI_MACHINE_WIDTH == 64
+ #ifdef    _MSC_VER
+             printf("OsxfCtrlFingReg: no memory for Reg (0x%I64x: 0x%x)\n",
+                Reg->Address, Reg->Width);
+ #else
+             printf("OsxfCtrlFingReg: no memory for Reg (0x%llx: 0x%x)\n",
+                (long long unsigned int) Reg->Address, Reg->Width);
+ #endif
+ #else
+             printf("OsxfCtrlFingReg: no memory for Reg (0x%x: 0x%x)\n",
+-#endif
+                 Reg->Address, Reg->Width);
+#endif
+             return (NULL);
+         }
+         Reg->Type = Type;
+@@ -932,14 +940,19 @@ OsxfCtrlRegService(UINT32 ServiceFlag)
+ #if ACPI_MACHINE_WIDTH == 64
+ #ifdef    _MSC_VER
+             printf("%.2u (%s Address 0x%I64x: Width %.2u) r/w counts: %u/%u\n",
+                i, (Reg->Type == EMUL_REG_SYS)? "SYS": "IO",
+                Reg->Address, Reg->Width, Reg->ReadCount, Reg->WriteCount);
+ #else
+             printf("%.2u (%s Address 0x%llx: Width %.2u) r/w counts: %u/%u\n",
+                i, (Reg->Type == EMUL_REG_SYS)? "SYS": "IO",
+                (long long unsigned int) Reg->Address,
+               Reg->Width, Reg->ReadCount, Reg->WriteCount);
+ #endif
+ #else
+             printf("%.2u (%s Address 0x%.4x: Width %.2u) r/w counts: %u/%u\n",
+-#endif
+                 i, (Reg->Type == EMUL_REG_SYS)? "SYS": "IO",
+                 Reg->Address, Reg->Width, Reg->ReadCount, Reg->WriteCount);
+#endif
+             Reg = Reg->Next;
+             i++;
+         }
+diff --git a/tests/aapits/atresource.c b/tests/aapits/atresource.c
+index a570b73..72ade8b 100644
+--- a/tests/aapits/atresource.c
+++ b/tests/aapits/atresource.c
+@@ -174,7 +174,7 @@ AtRsrcTest0000(void)
+         AapiErrors++;
+         printf ("API Error: AcpiGetCurrentResources(%s) returned Length %d,"
+             " expected %d\n",
+-            Pathname, OutBuffer.Length, RT0000_DEV0_CRS_LEN);
+            Pathname, (int) OutBuffer.Length, RT0000_DEV0_CRS_LEN);
+         return (AE_ERROR);
+     }
+ 
+@@ -490,7 +490,7 @@ AtRsrcTest0005(void)
+         AapiErrors++;
+         printf ("API Error: AcpiGetCurrentResources(%s) returned Length %d,"
+             " expected %d\n",
+-            Pathname, OutBuffer.Length, RT0000_DEV0_CRS_LEN);
+            Pathname, (int) OutBuffer.Length, RT0000_DEV0_CRS_LEN);
+         return (AE_ERROR);
+     }
+ 
+@@ -689,7 +689,7 @@ AtRsrcTest0007(void)
+         AapiErrors++;
+         printf ("Api Error: Resource->Length (%d) != %d\n",
+             CurrentResource->Length,
+-            ACPI_ROUND_UP_TO_NATIVE_WORD (ACPI_RS_SIZE (ACPI_RESOURCE_IRQ)));
+            (int) (ACPI_ROUND_UP_TO_NATIVE_WORD (ACPI_RS_SIZE (ACPI_RESOURCE_IRQ))));
+     }
+ 
+     if (CurrentResource->Data.Irq.Triggering != 0) /* Level-Triggered */
+@@ -981,7 +981,7 @@ AtRsrcTest0012(void)
+         AapiErrors++;
+         printf ("API Error: AcpiGetPossibleResources(%s) returned Length %d,"
+             " expected %d\n",
+-            Pathname, OutBuffer.Length, RT0000_DEV0_CRS_LEN);
+            Pathname, (int) OutBuffer.Length, RT0000_DEV0_CRS_LEN);
+         return (AE_ERROR);
+     }
+ 
+@@ -1923,7 +1923,7 @@ AtRsrcTest0026(void)
+         AapiErrors++;
+         printf ("API Error: AcpiGetIrqRoutingTable(%s) returned Length %d,"
+             " expected %d\n",
+-            Pathname, OutBuffer.Length, 0xA48);
+            Pathname, (int) OutBuffer.Length, 0xA48);
+         return (AE_ERROR);
+     }
+ 
+diff --git a/tests/aapits/osunixxf.c b/tests/aapits/osunixxf.c
+index 9f908fb..1fbdb70 100644
+--- a/tests/aapits/osunixxf.c
+++ b/tests/aapits/osunixxf.c
+@@ -384,7 +384,6 @@ AcpiOsActualVprintf (
+     const char              *Fmt,
+     va_list                 Args)
+ {
+-    INT32                   Count = 0;
+     UINT8                   Flags;
+ 
+ 
+@@ -397,7 +396,7 @@ AcpiOsActualVprintf (
+         {
+             /* Output file is open, send the output there */
+ 
+-            Count = vfprintf (AcpiGbl_DebugFile, Fmt, Args);
+            vfprintf (AcpiGbl_DebugFile, Fmt, Args);
+         }
+         else
+         {
+@@ -409,7 +408,7 @@ AcpiOsActualVprintf (
+ 
+     if (Flags & ACPI_DB_CONSOLE_OUTPUT)
+     {
+-        Count = vfprintf (AcpiGbl_OutputFile, Fmt, Args);
+        vfprintf (AcpiGbl_OutputFile, Fmt, Args);
+     }
+ 
+     return;
+@@ -1166,3 +1165,23 @@ AcpiOsActualSignal (
+ 
+     return (AE_OK);
+ }
+
+/******************************************************************************
+ *
+ * FUNCTION:    AcpiOsWaitEventsComplete
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Wait for all asynchronous events to complete. This
+ *              implementation does nothing.
+ *
+ *****************************************************************************/
+
+void
+AcpiOsWaitEventsComplete (
+    void)
+{
+    return;
+}
+-- 
+1.8.4.2
diff --git a/meta-oe/recipes-extended/acpica/acpitests_20140114.bb b/meta-oe/recipes-extended/acpica/acpitests_20140114.bb
new file mode 100644
index 0000000000..d8a3b9f4c6
--- /dev/null
+++ b/meta-oe/recipes-extended/acpica/acpitests_20140114.bb
@@ -0,0 +1,34 @@
+SUMMARY = "Test suite used to validate ACPICA"
+HOMEPAGE = "http://www.acpica.org/"
+LICENSE = "Intel"
+LIC_FILES_CHKSUM = "file://tests/aapits/atexec.c;beginline=1;endline=115;md5=e92bcdfcd01d117d1bda3e814bb2030a"
+DEPENDS = "bison flex"
+SRC_URI = "https://acpica.org/sites/acpica/files/acpitests-unix-${PV}.tar.gz;name=acpitests \
+           https://acpica.org/sites/acpica/files/acpica-unix2-${PV}.tar.gz;name=acpica \
+           file://0001-Fixup-aapits-build.patch \
+    "
+SRC_URI[acpitests.md5sum] = "c72b61e092d2b25726dfff6e455116c9"
+SRC_URI[acpitests.sha256sum] = "368f69296edef5138fd33affa2d50bdcdd1dfd2f6919ba782f8ecf03971a3a2c"
+SRC_URI[acpica.md5sum] = "fcd4b7304f1bfabc7d4b9cfdecc6b0c6"
+SRC_URI[acpica.sha256sum] = "0d5bd32690ab77e21ab143ef25361c314a4ed13c33a5fb3ddd6f5559ab24ebc3"
+S = "${WORKDIR}/acpitests-unix-${PV}"
+EXTRA_OEMAKE = "CC=${TARGET_PREFIX}gcc 'OPT_CFLAGS=-Wall'"
+# The Makefiles expect a specific layout
+do_compile() {
+    cp -af ${WORKDIR}/acpica-unix2-${PV}/source ${S}
+    cd tests/aapits
+    oe_runmake
+}
+do_install() {
+    install -d ${D}${bindir}
+    install -m0755 tests/aapits/bin/aapits ${D}${bindir}
+}
+COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
diff --git a/meta-oe/recipes-extended/acpica/files/no-werror.patch b/meta-oe/recipes-extended/acpica/files/no-werror.patch
new file mode 100644
index 0000000000..5d28f474f2
--- /dev/null
+++ b/meta-oe/recipes-extended/acpica/files/no-werror.patch
@@ -0,0 +1,32 @@
+Description: remove -Werror flag
+Forwarded: not-needed
+Author: Fathi Boudra <fathi.boudra@linaro.org>
+---
+ generate/unix/iasl/Makefile |   12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+--- a/generate/unix/iasl/Makefile
+++ b/generate/unix/iasl/Makefile
+@@ -266,19 +266,19 @@ $(OBJDIR)/prparser.y.h: $(OBJDIR)/prpars
+ # by the utilities above and they are not necessarily ANSI C, etc.
+ #
+ $(OBJDIR)/aslcompilerlex.o :   $(OBJDIR)/aslcompilerlex.c
+-       $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
+       $(CC) -c $(CFLAGS) -Wall -o$@ $<
+ 
+ $(OBJDIR)/aslcompilerparse.o : $(OBJDIR)/aslcompilerparse.c
+-       $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
+       $(CC) -c $(CFLAGS) -Wall -o$@ $<
+ 
+ $(OBJDIR)/dtparserlex.o :      $(OBJDIR)/dtparserlex.c
+-       $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
+       $(CC) -c $(CFLAGS) -Wall -o$@ $<
+ 
+ $(OBJDIR)/dtparserparse.o :    $(OBJDIR)/dtparserparse.c
+-       $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
+       $(CC) -c $(CFLAGS) -Wall -o$@ $<
+ 
+ $(OBJDIR)/prparserlex.o :      $(OBJDIR)/prparserlex.c
+-       $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
+       $(CC) -c $(CFLAGS) -Wall -o$@ $<
diff --git a/meta-oe/recipes-extended/anki/anki-0.4.3.inc b/meta-oe/recipes-extended/anki/anki-0.4.3.inc
new file mode 100644
index 0000000000..072e7f1e4e
--- /dev/null
+++ b/meta-oe/recipes-extended/anki/anki-0.4.3.inc
@@ -0,0 +1,8 @@
+require anki.inc
+SRC_URI = "${SOURCEFORGE_MIRROR}/anki/anki-${PV}.tgz"
+SRC_URI[md5sum] = "90434860945de4c09d55cdb5dbe984fc"
+SRC_URI[sha256sum] = "18a93fb46363ca34963fc2588cadf7415dd799dd647efa681859eb8b1b22f104"
+export BUILD_PV := "${PV}"
+SRC_URI += "file://no-need-for-pyqt-at-buildtime.patch"
diff --git a/meta-oe/recipes-extended/anki/anki.inc b/meta-oe/recipes-extended/anki/anki.inc
new file mode 100644
index 0000000000..3092539ec4
--- /dev/null
+++ b/meta-oe/recipes-extended/anki/anki.inc
@@ -0,0 +1,9 @@
+DESCRIPTION = "Anki is a program designed to help you remember facts \
+(such as words and phrases in a foreign language) \
+as easily, quickly and efficiently as possible"
+HOMEPAGE = "http://ichi2.net/anki/"
+AUTHOR = "Damien Elmes"
+LICENSE = "GPLv3+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
+inherit setuptools
diff --git a/meta-oe/recipes-extended/anki/anki/no-need-for-pyqt-at-buildtime.patch b/meta-oe/recipes-extended/anki/anki/no-need-for-pyqt-at-buildtime.patch
new file mode 100644
index 0000000000..9eac1dc7be
--- /dev/null
+++ b/meta-oe/recipes-extended/anki/anki/no-need-for-pyqt-at-buildtime.patch
@@ -0,0 +1,28 @@
+#
+# (C) Michael 'Mickey' Lauer <mlauer@vanille-media.de>
+#
+Index: anki-0.4.3/setup.py
+===================================================================
+--- anki-0.4.3.orig/setup.py    2008-02-12 19:17:56.000000000 +0000
+++ anki-0.4.3/setup.py 2008-02-12 19:19:29.000000000 +0000
+@@ -3,10 +3,8 @@
+ from setuptools import setup, find_packages
+ import sys, os
+ 
+-import ankiqt
+-
+ setup(name='ankiqt',
+-      version=ankiqt.appVersion,
+      version=os.environ["BUILD_PV"],
+       description='An intelligent spaced-repetition memory training program',
+       long_description="",
+       # Get strings from http://www.python.org/pypi?%3Aaction=list_classifiers
+@@ -24,7 +22,7 @@
+       license='GPLv2',
+       packages=find_packages(),
+       include_package_data=True,
+-      install_requires = 'anki >= ' + ankiqt.appVersion,
+      install_requires = 'anki >= ' + os.environ["BUILD_PV"],
+       zip_safe=False,
+       package_data={'ankiqt':
+                     ['locale/*/*/*']},
diff --git a/meta-oe/recipes-extended/anki/anki_0.4.3.bb b/meta-oe/recipes-extended/anki/anki_0.4.3.bb
new file mode 100644
index 0000000000..7943ce8cd0
--- /dev/null
+++ b/meta-oe/recipes-extended/anki/anki_0.4.3.bb
@@ -0,0 +1,4 @@
+require ${PN}-${PV}.inc
+RDEPENDS_${PN} = "python-pyqt python-sip libanki"
+RRECOMMENDS_${PN} = "virtual-japanese-font"
diff --git a/meta-oe/recipes-extended/anki/libanki/no-need-for-pyqt-at-buildtime.patch b/meta-oe/recipes-extended/anki/libanki/no-need-for-pyqt-at-buildtime.patch
new file mode 100644
index 0000000000..92583e59f1
--- /dev/null
+++ b/meta-oe/recipes-extended/anki/libanki/no-need-for-pyqt-at-buildtime.patch
@@ -0,0 +1,14 @@
+--- libanki.orig/setup.py       2008-01-02 13:22:22.000000000 +0100
+++ libanki/setup.py    2012-08-02 11:39:13.604173933 +0200
+@@ -3,10 +3,8 @@
+ from setuptools import setup, find_packages
+ import sys, os
+ 
+-import anki
+-
+ setup(name='anki',
+-      version=anki.version,
+      version=os.environ["BUILD_PV"],
+       description='An intelligent spaced-repetition memory training library',
+       long_description="",
+       # Get strings from http://www.python.org/pypi?%3Aaction=list_classifiers
diff --git a/meta-oe/recipes-extended/anki/libanki_0.4.3.bb b/meta-oe/recipes-extended/anki/libanki_0.4.3.bb
new file mode 100644
index 0000000000..636932f3ad
--- /dev/null
+++ b/meta-oe/recipes-extended/anki/libanki_0.4.3.bb
@@ -0,0 +1,3 @@
+require anki-${PV}.inc
+S = "${WORKDIR}/anki-${PV}/libanki"
diff --git a/meta-oe/recipes-extended/collectd/collectd/collectd-version.patch b/meta-oe/recipes-extended/collectd/collectd/collectd-version.patch
new file mode 100644
index 0000000000..1e2b7c159c
--- /dev/null
+++ b/meta-oe/recipes-extended/collectd/collectd/collectd-version.patch
@@ -0,0 +1,31 @@
+Don't pick up version string from parent git repository
+If the collectd source is extracted from a tarball underneath a
+directory structure that includes another git repository, that
+repository will be picked up by "git describe" which is not
+desirable. Check whether collectd itself is a git repository and just
+use the default version if not.
+Upstream-Status: Pending
+Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+diff --git a/version-gen.sh b/version-gen.sh
+index e344541..d1c0929 100755
+--- a/version-gen.sh
+++ b/version-gen.sh
+@@ -2,7 +2,10 @@
+ 
+ DEFAULT_VERSION="5.2.2.git"
+ 
+-VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"
+VERSION=""
+if test -d .git ; then
+       VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"
+fi
+ 
+ if test -z "$VERSION"; then
+        VERSION="$DEFAULT_VERSION"
+-- 
+1.7.10.4
diff --git a/meta-oe/recipes-extended/collectd/collectd/collectd.init b/meta-oe/recipes-extended/collectd/collectd/collectd.init
new file mode 100644
index 0000000000..95f5f73c67
--- /dev/null
+++ b/meta-oe/recipes-extended/collectd/collectd/collectd.init
@@ -0,0 +1,212 @@
+#!/bin/sh
+#
+# collectd - start and stop the statistics collection daemon
+# http://collectd.org/
+#
+# Copyright (C) 2005-2006 Florian Forster <octo@verplant.org>
+# Copyright (C) 2006-2009 Sebastian Harl <tokkee@debian.org>
+#
+### BEGIN INIT INFO
+# Provides:          collectd
+# Required-Start:    $local_fs $remote_fs
+# Required-Stop:     $local_fs $remote_fs
+# Should-Start:      $network $named $syslog $time cpufrequtils
+# Should-Stop:       $network $named $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: manage the statistics collection daemon
+# Description:       collectd is the statistics collection daemon.
+#                    It is a small daemon which collects system information
+#                    periodically and provides mechanisms to monitor and store
+#                    the values in a variety of ways.
+### END INIT INFO
+. /etc/init.d/functions
+export PATH=/sbin:/bin:/usr/sbin:/usr/bin
+DISABLE=0
+NAME=collectd
+DAEMON=/usr/sbin/collectd
+CONFIGFILE=/etc/collectd.conf
+PIDFILE=/var/run/collectd.pid
+USE_COLLECTDMON=1
+COLLECTDMON_DAEMON=/usr/sbin/collectdmon
+COLLECTDMON_PIDFILE=/var/run/collectdmon.pid
+MAXWAIT=30
+# Gracefully exit if the package has been removed.
+test -x $DAEMON || exit 0
+if [ -r /etc/default/$NAME ]; then
+        . /etc/default/$NAME
+fi
+if test "$ENABLE_COREFILES" == 1; then
+        ulimit -c unlimited
+fi
+if test "$USE_COLLECTDMON" == 1; then
+        _PIDFILE="$COLLECTDMON_PIDFILE"
+else
+        _PIDFILE="$PIDFILE"
+fi
+# return:
+#   0 if config is fine
+#   1 if there is a syntax error
+#   2 if there is no configuration
+check_config() {
+        if test ! -e "$CONFIGFILE"; then
+                return 2
+        fi
+        if ! $DAEMON -t -C "$CONFIGFILE"; then
+                return 1
+        fi
+        return 0
+}
+# return:
+#   0 if the daemon has been started
+#   1 if the daemon was already running
+#   2 if the daemon could not be started
+#   3 if the daemon was not supposed to be started
+d_start() {
+        if test "$DISABLE" != 0; then
+                # we get here during restart
+                echo "disabled by /etc/default/$NAME"
+                return 3
+        fi
+        if test ! -e "$CONFIGFILE"; then
+                # we get here during restart
+                echo "disabled, no configuration ($CONFIGFILE) found"
+                return 3
+        fi
+        check_config
+        rc="$?"
+        if test "$rc" -ne 0; then
+                echo "not starting, configuration error"
+                return 2
+        fi
+        if test "$USE_COLLECTDMON" == 1; then
+                start-stop-daemon --start --quiet --oknodo --pidfile "$_PIDFILE" \
+                        --exec $COLLECTDMON_DAEMON -- -P "$_PIDFILE" -- -C "$CONFIGFILE" \
+                        || return 2
+        else
+                start-stop-daemon --start --quiet --oknodo --pidfile "$_PIDFILE" \
+                        --exec $DAEMON -- -C "$CONFIGFILE" -P "$_PIDFILE" \
+                        || return 2
+        fi
+        return 0
+}
+still_running_warning="
+WARNING: $NAME might still be running.
+In large setups it might take some time to write all pending data to
+the disk. You can adjust the waiting time in /etc/default/collectd."
+# return:
+#   0 if the daemon has been stopped
+#   1 if the daemon was already stopped
+#   2 if daemon could not be stopped
+d_stop() {
+        PID=$( cat "$_PIDFILE" 2> /dev/null ) || true
+        start-stop-daemon --stop --quiet --oknodo --pidfile "$_PIDFILE"
+        rc="$?"
+        if test "$rc" -eq 2; then
+                return 2
+        fi
+        sleep 1
+        if test -n "$PID" && kill -0 $PID 2> /dev/null; then
+                i=0
+                while kill -0 $PID 2> /dev/null; do
+                        i=$(( $i + 2 ))
+                        echo -n " ."
+                        if test $i -gt $MAXWAIT; then
+                                echo "$still_running_warning"
+                                return 2
+                        fi
+                        sleep 2
+                done
+                return "$rc"
+        fi
+        return "$rc"
+}
+# return:
+#   0 if the daemon is running
+#   3 if the daemon is stopped
+d_status(){
+        if test "$USE_COLLECTDMON" == 1; then
+                status $COLLECTDMON_DAEMON
+        else
+                status $DAEMON
+        fi
+}
+case "$1" in
+        start)
+                echo -n "Starting $NAME"
+                d_start
+                case "$?" in
+                        0|1) echo "." ;;
+                        *) exit 1 ;;
+                esac
+                ;;
+        stop)
+                echo -n "Stopping $NAME"
+                d_stop
+                case "$?" in
+                        0|1) echo "." ;;
+                        *) exit 1 ;;
+                esac
+                ;;
+        status)
+                d_status
+                ;;
+        restart|force-reload)
+                echo -n "Restarting $NAME"
+                check_config
+                rc="$?"
+                if test "$rc" -eq 1; then
+                        echo "not restarting, configuration error"
+                        exit 1
+                fi
+                d_stop
+                rc="$?"
+                case "$rc" in
+                        0|1)
+                                sleep 1
+                                d_start
+                                rc2="$?"
+                                case "$rc2" in
+                                        0|1) echo "." ;;
+                                        *) exit 1 ;;
+                                esac
+                                ;;
+                        *)
+                                exit 1
+                                ;;
+                esac
+                ;;
+        *)
+                echo "Usage: $0 {start|stop|restart|force-reload|status}" >&2
+                exit 3
+                ;;
+esac
+# vim: syntax=sh noexpandtab sw=4 ts=4 :
diff --git a/meta-oe/recipes-extended/collectd/collectd/no-gcrypt-badpath.patch b/meta-oe/recipes-extended/collectd/collectd/no-gcrypt-badpath.patch
new file mode 100644
index 0000000000..02b160109e
--- /dev/null
+++ b/meta-oe/recipes-extended/collectd/collectd/no-gcrypt-badpath.patch
@@ -0,0 +1,30 @@
+Disable defaulting of GCRYPT_LDFLAGS to -L/usr/lib
+Prevents "unsafe for cross compilation" warnings that cause
+do_qa_configure to fail.
+Upstream-Status: Inappropriate [configuration]
+Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+diff --git a/configure.in b/configure.in
+index 98395ed..81c3a2c 100644
+--- a/configure.in
+++ b/configure.in
+@@ -1777,11 +1777,11 @@ then
+                GCRYPT_CPPFLAGS=`"$with_libgcrypt_config" --cflags 2>/dev/null`
+        fi
+ 
+-       if test "x$GCRYPT_LDFLAGS" = "x"
+-       then
+-               gcrypt_exec_prefix=`"$with_libgcrypt_config" --exec-prefix 2>/dev/null`
+-               GCRYPT_LDFLAGS="-L$gcrypt_exec_prefix/lib"
+-       fi
+#      if test "x$GCRYPT_LDFLAGS" = "x"
+#      then
+#              gcrypt_exec_prefix=`"$with_libgcrypt_config" --exec-prefix 2>/dev/null`
+#              GCRYPT_LDFLAGS="-L$gcrypt_exec_prefix/lib"
+#      fi
+ 
+        if test "x$GCRYPT_LIBS" = "x"
+        then
diff --git a/meta-oe/recipes-extended/collectd/collectd_5.2.2.bb b/meta-oe/recipes-extended/collectd/collectd_5.2.2.bb
new file mode 100644
index 0000000000..8585ff3c70
--- /dev/null
+++ b/meta-oe/recipes-extended/collectd/collectd_5.2.2.bb
@@ -0,0 +1,61 @@
+SUMMARY = "Collects and summarises system performance statistics"
+DESCRIPTION = "collectd is a daemon which collects system performance statistics periodically and provides mechanisms to store the values in a variety of ways, for example in RRD files."
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
+DEPENDS = "rrdtool curl mysql5 libpcap libxml2 yajl libgcrypt libtool"
+SRC_URI = "http://collectd.org/files/collectd-${PV}.tar.bz2 \
+           file://no-gcrypt-badpath.patch \
+           file://collectd-version.patch \
+           file://collectd.init"
+SRC_URI[md5sum] = "29e61411e51845d5ae71ab676078867e"
+SRC_URI[sha256sum] = "7b8906d1c8866155b31820ef108be92abcee7fcd278d386bf0d449e704ba4696"
+inherit autotools pythonnative update-rc.d
+# Floatingpoint layout, architecture dependent
+# 'nothing', 'endianflip' or 'intswap'
+FPLAYOUT ?= "--with-fp-layout=nothing"
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp --with-libnetsnmp=no,net-snmp"
+PACKAGECONFIG[libmemcached] = "--with-libmemcached,--without-libmemcached,libmemcached"
+PACKAGECONFIG[iptables] = "--enable-iptables,--disable-iptables,iptables"
+PACKAGECONFIG[postgresql] = "--enable-postgresql --with-libpq=yes, \
+        --disable-postgresql --with-libpq=no,postgresql"
+PACKAGECONFIG[dbi] = "--enable-dbi,--disable-dbi,libdbi"
+PACKAGECONFIG[modbus] = "--enable-modbus,--disable-modbus,libmodbus"
+PACKAGECONFIG[libowcapi] = "--with-libowcapi,--without-libowcapi,owfs"
+PACKAGECONFIG[sensors] = "--enable-sensors --with-libsensors=yes, \
+        --disable-sensors --with-libsensors=no,lmsensors"
+EXTRA_OECONF = " \
+                ${FPLAYOUT} \
+                --disable-perl --with-libperl=no --with-perl-bindings=no \
+                --with-libgcrypt=${STAGING_BINDIR_CROSS}/libgcrypt-config \
+                --disable-notify_desktop \
+"
+do_install_append() {
+    install -d ${D}${sysconfdir}/init.d
+    install -m 0755 ${WORKDIR}/collectd.init ${D}${sysconfdir}/init.d/collectd
+    sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/collectd
+    sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/collectd
+    sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/collectd
+    sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/collectd
+    # Fix configuration file to allow collectd to start up
+    sed -i 's!^#FQDNLookup[ \t]*true!FQDNLookup   false!g' ${D}${sysconfdir}/collectd.conf
+    rmdir "${D}${localstatedir}/run"
+    rmdir --ignore-fail-on-non-empty "${D}${localstatedir}"
+}
+INITSCRIPT_NAME = "collectd"
+INITSCRIPT_PARAMS = "defaults"
+# threshold.so load.so are also provided by gegl
+# disk.so is also provided by libgphoto2-camlibs
+PRIVATE_LIBS = "threshold.so load.so disk.so"
diff --git a/meta-oe/recipes-extended/ddrescue/ddrescue_1.16.bb b/meta-oe/recipes-extended/ddrescue/ddrescue_1.16.bb
new file mode 100644
index 0000000000..50202c1cb7
--- /dev/null
+++ b/meta-oe/recipes-extended/ddrescue/ddrescue_1.16.bb
@@ -0,0 +1,18 @@
+SUMMARY = "Data recovery tool"
+DESCRIPTION = "GNU ddrescue is a data recovery tool. It copies data \
+    from one file or block device (hard disc, cdrom, etc) to another, \
+    trying hard to rescue data in case of read errors."
+HOMEPAGE = "http://www.gnu.org/software/ddrescue/ddrescue.html"
+SECTION = "console"
+LICENSE = "GPLv3+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
+                    file://main_common.cc;beginline=5;endline=16;md5=b5a59150a33658cc1ffc31b1a4ffb9f2"
+SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz"
+SRC_URI[md5sum] = "57b67407e882c6418531d48a2f20d16b"
+SRC_URI[sha256sum] = "76b3f2e5fb0306d24f2632c3e168cccb73dc0a348e3a7089cd9230748ff23de6"
+inherit autotools
+EXTRA_OECONF = "'CXX=${CXX}' 'CPPFLAGS=${CPPFLAGS}' 'CXXFLAGS=${CXXFLAGS}' 'LDFLAGS=${LDFLAGS}'"
diff --git a/meta-oe/recipes-extended/dialog/dialog-static_1.1-20120706.bb b/meta-oe/recipes-extended/dialog/dialog-static_1.1-20120706.bb
new file mode 100644
index 0000000000..595f323607
--- /dev/null
+++ b/meta-oe/recipes-extended/dialog/dialog-static_1.1-20120706.bb
@@ -0,0 +1,6 @@
+require dialog.inc
+LDFLAGS += "-static"
+SRC_URI[md5sum] = "2e538305977178eb085a9859511c299d"
+SRC_URI[sha256sum] = "305aa1000680aa87bb2148a725f9107ef4cd29dcd6185b44d079cb87cf0ce2f5"
diff --git a/meta-oe/recipes-extended/dialog/dialog.inc b/meta-oe/recipes-extended/dialog/dialog.inc
new file mode 100644
index 0000000000..c1c28fd876
--- /dev/null
+++ b/meta-oe/recipes-extended/dialog/dialog.inc
@@ -0,0 +1,25 @@
+SUMMARY = "display dialog boxes from shell scripts"
+DESCRIPTION = "Dialog lets you to present a variety of questions \
+or display messages using dialog boxes from a shell \
+script (or any scripting language)."
+HOMEPAGE = "http://invisible-island.net/dialog/"
+SECTION = "console/utils"
+DEPENDS = "ncurses"
+LICENSE = "LGPL-2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
+SRC_URI = "ftp://invisible-island.net/dialog/dialog-${PV}.tgz"
+# hardcoded here for use in dialog-static recipe
+S = "${WORKDIR}/dialog-${PV}"
+inherit autotools
+EXTRA_OECONF = "--with-ncurses \
+                --disable-rpath-hack"
+do_configure() {
+    gnu-configize --force
+    sed -i 's,${cf_ncuconfig_root}6-config,${cf_ncuconfig_root}-config,g' -i configure
+    oe_runconf
+}
diff --git a/meta-oe/recipes-extended/dialog/dialog_1.1-20120706.bb b/meta-oe/recipes-extended/dialog/dialog_1.1-20120706.bb
new file mode 100644
index 0000000000..c87fb61602
--- /dev/null
+++ b/meta-oe/recipes-extended/dialog/dialog_1.1-20120706.bb
@@ -0,0 +1,4 @@
+require dialog.inc
+SRC_URI[md5sum] = "2e538305977178eb085a9859511c299d"
+SRC_URI[sha256sum] = "305aa1000680aa87bb2148a725f9107ef4cd29dcd6185b44d079cb87cf0ce2f5"
diff --git a/meta-oe/recipes-extended/efivar/efivar_git.bb b/meta-oe/recipes-extended/efivar/efivar_git.bb
new file mode 100644
index 0000000000..18446a08a1
--- /dev/null
+++ b/meta-oe/recipes-extended/efivar/efivar_git.bb
@@ -0,0 +1,18 @@
+SUMMARY = "Tools to manipulate UEFI variables"
+DESCRIPTION = "efivar provides a simple command line interface to the UEFI variable facility"
+HOMEPAGE = "https://github.com/vathpela/efivar"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
+DEPENDS = "popt"
+SRCREV = "c9e1f24a81b5374408bca5616402276e47171cf7"
+PV = "0.7+git${SRCPV}"
+SRC_URI = "git://github.com/vathpela/efivar.git"
+S = "${WORKDIR}/git"
+do_install() {
+    oe_runmake install DESTDIR=${D}
+}
diff --git a/meta-oe/recipes-extended/flashrom/flashrom_0.9.6.1.bb b/meta-oe/recipes-extended/flashrom/flashrom_0.9.6.1.bb
new file mode 100644
index 0000000000..a1f0b303a0
--- /dev/null
+++ b/meta-oe/recipes-extended/flashrom/flashrom_0.9.6.1.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips"
+LICENSE = "GPLv2"
+HOMEPAGE = "http://flashrom.org"
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
+DEPENDS = "pciutils"
+SRC_URI = "http://download.flashrom.org/releases/flashrom-${PV}.tar.bz2"
+SRC_URI[md5sum] = "407e836c0a2b17ec76583cb6809f65e5"
+SRC_URI[sha256sum] = "6f7b588cce74c90b4fe9c9c794de105de76e0323442fb5770b1aeab81e9d560a"
+do_install() {
+    oe_runmake PREFIX=${prefix} DESTDIR=${D} install
+}
diff --git a/meta-oe/recipes-extended/fwts/fwts_git.bb b/meta-oe/recipes-extended/fwts/fwts_git.bb
new file mode 100644
index 0000000000..d704d8437e
--- /dev/null
+++ b/meta-oe/recipes-extended/fwts/fwts_git.bb
@@ -0,0 +1,22 @@
+SUMMARY = "Firmware testsuite"
+DESCRIPTION = "The tool fwts comprises of over fifty tests that are designed to exercise and test different aspects of a machine's firmware. Many of these tests need super user access to read BIOS data and ACPI tables, so the tool requires running with super user privileges (e.g. with sudo)."
+HOMEPAGE = "https://wiki.ubuntu.com/Kernel/Reference/fwts"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=16;md5=deb8af5388e838d133eaa036f4d1496f"
+PV = "14.03.01"
+SRCREV = "8ec44dc1e55ecf334f4afa8eed8795ed5776c396"
+SRC_URI = "git://kernel.ubuntu.com/hwe/fwts.git"
+S = "${WORKDIR}/git"
+DEPENDS = "libpcre json-c"
+inherit autotools-brokensep
+FILES_${PN} += "${libdir}/fwts/lib*${SOLIBS}"
+FILES_${PN}-dev += "${libdir}/fwts/lib*${SOLIBSDEV} ${libdir}/fwts/lib*.la"
+FILES_${PN}-staticdev += "${libdir}/fwts/lib*a"
+FILES_${PN}-dbg += "${libdir}/fwts/.debug"
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua-loadlibs-configure-in-fix.patch b/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua-loadlibs-configure-in-fix.patch
new file mode 100644
index 0000000000..23f2cd26a5
--- /dev/null
+++ b/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua-loadlibs-configure-in-fix.patch
@@ -0,0 +1,16 @@
+Index: gnuplot-4.6.5/configure.in
+===================================================================
+--- gnuplot-4.6.5.orig/configure.in
+++ gnuplot-4.6.5/configure.in
+@@ -690,6 +690,11 @@ if test "${with_lua}" = yes ; then
+   fi
+ 
+   if test "$with_lua" != no; then
+    dnl check for dlopen/dl to fix loadlibs link failure
+    AC_CHECK_FUNC([dlopen], [],
+      AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl"))
+    AC_SUBST(DLOPEN_LIBS)
+    LUA_LIBS="$LUA_LIBS $DLOPEN_LIBS"
+     TERMLIBS="$TERMLIBS $LUA_LIBS"
+     CPPFLAGS="$CPPFLAGS $LUA_CFLAGS"
+   else
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch b/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch
new file mode 100644
index 0000000000..8c7d1f0d35
--- /dev/null
+++ b/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch
@@ -0,0 +1,11 @@
+--- /tmp/Makefile.am    2007-08-23 13:10:15.560659023 +0200
+++ gnuplot-4.2.0/Makefile.am   2007-08-23 13:10:34.961764629 +0200
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in -*-Makefile-*-
+ AUTOMAKE_OPTIONS = foreign 1.2h
+ 
+-SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share
+SUBDIRS = config m4 term src  $(LISPDIR) man share
+ 
+ EXTRA_DIST = BUGS CodeStyle Copyright FAQ GNUmakefile INSTALL INSTALL.gnu \
+ Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST README.exp \
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot.inc b/meta-oe/recipes-extended/gnuplot/gnuplot.inc
new file mode 100644
index 0000000000..6c27e6d8ab
--- /dev/null
+++ b/meta-oe/recipes-extended/gnuplot/gnuplot.inc
@@ -0,0 +1,39 @@
+DESCRIPTION = "Gnuplot is a portable command-line driven interactive datafile \
+(text or binary) and function plotting utility."
+HOMEPAGE = "http://www.gnuplot.info/"
+SECTION = "console/scientific"
+LICENSE = "gnuplot"
+LIC_FILES_CHKSUM = "file://Copyright;md5=243a186fc2fd3b992125d60d5b1bab8f"
+DEPENDS = "virtual/libx11 gd readline"
+inherit autotools
+acpaths = ""
+PACKAGECONFIG ??= "cairo"
+PACKAGECONFIG[cairo] = "--with-cairo,--without-cairo,cairo pango"
+PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua"
+EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR}/.. \
+                --without-lisp-files \
+                --without-tutorial \
+                --disable-wxwidgets"
+do_compile_prepend() {
+    install -m 0644 ${WORKDIR}/qtplot-0.2/qtopia.trm ${S}/term/
+}
+do_install_append() {
+    install -d ${D}${datadir}/applications/
+    install -m 0644 ${WORKDIR}/gnuplot.desktop ${D}${datadir}/applications/
+    install -d ${D}${datadir}/pixmaps/
+    install -m 0644 ${WORKDIR}/gnuplot.png ${D}${datadir}/pixmaps/
+}
+PACKAGES =+ "${PN}-x11-dbg ${PN}-x11"
+DESCRIPTION_${PN}-x11 = "X11 display terminal for Gnuplot."
+SECTION_${PN}-x11 = "x11/scientific"
+FILES_${PN}-x11 = "${libexecdir} ${datadir}/applications ${datadir}/pixmaps ${libdir}/X11 "
+FILES_${PN} += "${datadir}/texmf"
+FILES_${PN}-x11-dbg += "${libexecdir}/gnuplot/*/.debug"
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.desktop b/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.desktop
new file mode 100644
index 0000000000..f67df9e193
--- /dev/null
+++ b/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Gnuplot
+Comment=Plot data and function graphs
+Exec=x-terminal-emulator -e gnuplot
+Terminal=false
+Type=Application
+Icon=gnuplot
+Categories=Science;
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.png b/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.png
new file mode 100644
index 0000000000..054cd9e7c7
--- /dev/null
+++ b/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.png
Binary files differ
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot/qtopia.trm b/meta-oe/recipes-extended/gnuplot/gnuplot/qtopia.trm
new file mode 100644
index 0000000000..b52f9bb975
--- /dev/null
+++ b/meta-oe/recipes-extended/gnuplot/gnuplot/qtopia.trm
@@ -0,0 +1,483 @@
+/*
+ * $Id: dumb.trm,v 1.16 2004/04/13 17:24:16 broeker Exp $
+ *
+ */
+/* GNUPLOT - qtopia.trm */
+/*[
+ * Copyright 1991 - 1993, 1998, 2004   Thomas Williams, Colin Kelley
+ *
+ * Permission to use, copy, and distribute this software and its
+ * documentation for any purpose with or without fee is hereby granted,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.
+ *
+ * Permission to modify the software is granted, but not the right to
+ * distribute the complete modified source code.  Modifications are to
+ * be distributed as patches to the released version.  Permission to
+ * distribute binaries produced by compiling modified sources is granted,
+ * provided you
+ *   1. distribute the corresponding source modifications from the
+ *    released version in the form of a patch file along with the binaries,
+ *   2. add special version identification to distinguish your version
+ *    in addition to the base release version number,
+ *   3. provide your name and address as the primary contact for the
+ *    support of your modified version, and
+ *   4. retain our contact information in regard to use of the base
+ *    software.
+ * Permission to distribute the released version of the source code along
+ * with corresponding source modifications in the form of a patch file is
+ * granted with same provisions 2 through 4 for binary distributions.
+ *
+ * This software is provided "as is" without express or implied warranty
+ * to the extent permitted by applicable law.
+]*/
+/*
+ * This file is included by ../term.c.
+ *
+ * This terminal driver supports:
+ *   qtopia terminals
+ *
+ * AUTHORS
+ *   Michael Neuroth, 2004-05-16
+ *           INTERNET: michael.neuroth@freenet.de
+ *
+ * send your comments or suggestions to (gnuplot-info@lists.sourceforge.net).
+ *
+ */
+#include "driver.h"
+#define NO_QTOPIA_ENHANCED_SUPPORT
+#ifdef TERM_REGISTER
+register_term(qtopia_driver)
+#endif
+#ifdef TERM_PROTO
+TERM_PUBLIC void QTOPIA_options __PROTO((void));
+TERM_PUBLIC void QTOPIA_init __PROTO((void));
+TERM_PUBLIC void QTOPIA_graphics __PROTO((void));
+TERM_PUBLIC void QTOPIA_text __PROTO((void));
+TERM_PUBLIC void QTOPIA_reset __PROTO((void));
+TERM_PUBLIC void QTOPIA_linetype __PROTO((int linetype));
+TERM_PUBLIC void QTOPIA_move __PROTO((unsigned int x, unsigned int y));
+TERM_PUBLIC void QTOPIA_point __PROTO((unsigned int x, unsigned int y,
+                                     int point));
+TERM_PUBLIC void QTOPIA_vector __PROTO((unsigned int x, unsigned int y));
+TERM_PUBLIC void QTOPIA_put_text __PROTO((unsigned int x, unsigned int y,
+                                        const char *str));
+TERM_PUBLIC void QTOPIA_arrow __PROTO((unsigned int sx, unsigned int sy,
+                                     unsigned int ex, unsigned int ey,
+                                     int head));
+#define ENHqtopia_put_text NULL
+#define QTOPIA_XMAX 4096
+#define QTOPIA_YMAX 4096
+#ifdef ZAURUS
+#define QTOPIA_VCHAR (QTOPIA_YMAX/25)
+#define QTOPIA_HCHAR (QTOPIA_XMAX/40)
+#define QTOPIA_VTIC (QTOPIA_YMAX/50)
+#define QTOPIA_HTIC (QTOPIA_XMAX/40)
+#else
+#define QTOPIA_VCHAR (QTOPIA_YMAX/25)
+#define QTOPIA_HCHAR (QTOPIA_XMAX/50)
+#define QTOPIA_VTIC (QTOPIA_YMAX/100)
+#define QTOPIA_HTIC (QTOPIA_XMAX/150)
+#endif
+#endif /* TERM_PROTO */
+#ifdef TERM_BODY
+/*#include <winsock2.h>*/
+/* needs: ws2_32.lib */
+#ifndef _MSC_VER
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#endif
+#define QTOPIA_MAX_BUFFER               512
+#define QTOPIA_MAX_DELAY_COUNT  20      /* * 100 ms = 2 s */
+#ifdef _MSC_VER
+#define QTOPIA_BAD_SOCKET               INVALID_SOCKET          /* -1 */
+#define QTOPIA_BAD_CONNECT              SOCKET_ERROR
+#else
+#define QTOPIA_BAD_SOCKET               -1
+#define QTOPIA_BAD_CONNECT              -1
+#endif
+#define QTOPIA_PORT_NO                  5050
+static int qtopia_client_socket = QTOPIA_BAD_SOCKET;
+static unsigned short qtopia_port_no = QTOPIA_PORT_NO;
+static char qtopia_host_name[QTOPIA_MAX_BUFFER+1] = { "localhost" };
+static int OpenClient __PROTO(( int test));
+static void CloseClient();
+static void MySleep( delay )
+int delay;
+{
+#ifdef _MSC_VER
+        Sleep( delay );
+#else
+        usleep( delay );
+#endif
+}
+static void InitSockets()
+{
+#ifdef _MSC_VER
+        WORD wVersionRequested;
+        WSADATA wsaData;
+        int err;
+        wVersionRequested = MAKEWORD( 2, 2 );
+        err = WSAStartup( wVersionRequested, &wsaData );
+#endif
+}
+static void ExitSockets()
+{
+#ifdef _MSC_VER
+        WSACleanup();
+#endif
+}
+static int CheckForQtplot( count )
+int count;
+{
+        /* test (via sockets) if qtplot is allready running */
+        if( !OpenClient( 1 ) )
+        {
+                /* give qtplot a litle bit time to start... */
+                if( count < QTOPIA_MAX_DELAY_COUNT )
+                {
+                        if( count == 0 )
+                        {
+#ifdef _MSC_VER
+                                system( "start qtplot" );
+#else
+                                system( "qtplot&" );
+#endif
+                        }
+                
+                        MySleep(100);
+                        return CheckForQtplot( count+1 );
+                }
+                else
+                {
+                        return 0;
+                }
+        }
+        else
+        {
+                CloseClient();
+                return 1;
+        }
+}
+static int OpenClient( test )
+int test;
+{
+    int len;
+    struct sockaddr_in address;
+    int result;
+        /*  Create a socket for the client.  */
+    qtopia_client_socket = socket(AF_INET, SOCK_STREAM, 0);
+        if( qtopia_client_socket != QTOPIA_BAD_SOCKET )
+        {
+                /*  Name the socket, as agreed with the server.  */
+                address.sin_family = AF_INET;
+                address.sin_addr.s_addr = inet_addr(/*qtopia_host_name*/"127.0.0.1");   /* localhost */
+                address.sin_port = htons(qtopia_port_no);
+                len = sizeof(address);
+                /*  Now connect our socket to the server's socket.  */
+                result = connect(qtopia_client_socket, (struct sockaddr *)&address, len);
+                
+                if( result == QTOPIA_BAD_SOCKET )
+                {
+                        /* mark this socket as bad */
+                        close( qtopia_client_socket );
+                        qtopia_client_socket = QTOPIA_BAD_SOCKET;
+                        if( !test )
+                        {
+                                fprintf( gpoutfile, "error connecting to server !\n" );
+                        }
+                        return 0;       /* something went wrong */
+                }
+        }
+        else
+        {
+                if( !test )
+                {
+                        fprintf( gpoutfile, "error creating socket !\n" );
+                }
+                return 0;       /* something went wrong */
+        }
+        return 1;       /* everything ist ok ! */
+}
+static void CloseClient()
+{
+    close( qtopia_client_socket );
+}
+static int IsClientOk()
+{
+        return qtopia_client_socket != QTOPIA_BAD_SOCKET;
+}
+static void SendDataToSocket( sLine )
+const char * sLine;
+{
+        if( IsClientOk() )
+        {
+                int send_count;
+                send_count = send( qtopia_client_socket, sLine, strlen( sLine ), 0 );
+                if( send_count <= 0 )
+                {
+                        fprintf( gpoutfile, "error writing to socket str=%s!\n", sLine );
+                }
+                /*
+                else
+                {
+                        fprintf( gpoutfile, "wrote %d bytes\n", send_count );
+                }
+                */
+        }
+        else
+        {
+                /* for testing... */
+                /*fprintf( gpoutfile, sLine );*/
+        }
+}
+/* ************************************************** */
+enum QTOPIA_id { QTOPIA_PORT, QTOPIA_HOST, QTOPIA_OTHER };
+static struct gen_table QTOPIA_opts[] =
+{
+    { "po$rt", QTOPIA_PORT },
+    { "ho$st", QTOPIA_HOST },
+    { NULL, QTOPIA_OTHER }
+};
+TERM_PUBLIC void
+QTOPIA_options()
+{
+    /* this is not for the qtopia terminal ! */
+        /*SendDataToSocket( "qtd options\n" );*/
+    int x, y;
+    struct value a;
+    while (!END_OF_COMMAND) 
+        {
+                switch(lookup_table(&QTOPIA_opts[0],c_token)) 
+                {
+                        case QTOPIA_PORT:
+                                c_token++;
+                                if (END_OF_COMMAND)
+                                        int_error(c_token, "expecting port number");
+                                qtopia_port_no = (int) real(const_express(&a));
+                                break;
+                        case QTOPIA_HOST:
+                                c_token++;
+                                if (END_OF_COMMAND)
+                                        int_error(c_token, "expecting host name");
+                                if (isstring(c_token))
+                                        quote_str( qtopia_host_name, c_token, sizeof(qtopia_host_name) );
+                                else
+                                        copy_str( qtopia_host_name, c_token, sizeof(qtopia_host_name) );
+                                c_token++;
+                                break;
+                        case QTOPIA_OTHER:
+                        default:
+                                break;
+                }
+    }
+    sprintf(term_options, "host=%s port=%d",qtopia_host_name,qtopia_port_no);
+}
+TERM_PUBLIC void
+QTOPIA_init()
+{
+        /* initialize lib (if necassary) */
+        InitSockets();
+        CheckForQtplot( 0 );
+        OpenClient( 0 ); 
+        SendDataToSocket( "qtd init\n" );
+}
+TERM_PUBLIC void
+QTOPIA_graphics()
+{
+        SendDataToSocket( "qtd graphics\n" );
+}
+TERM_PUBLIC void
+QTOPIA_text()
+{
+        SendDataToSocket( "qtd text\n" );
+}
+TERM_PUBLIC void
+QTOPIA_reset()
+{
+        SendDataToSocket( "qtd reset\n" );
+        /* give the qtplot a litle bit time to shutdown */
+        MySleep(100);
+        CloseClient();
+        ExitSockets();
+}
+TERM_PUBLIC void
+QTOPIA_linetype(linetype)
+int linetype;
+{
+        char sBuffer[QTOPIA_MAX_BUFFER];
+        sprintf( sBuffer, "qtd linetype type=%d\n",linetype );
+        SendDataToSocket( sBuffer );
+}
+TERM_PUBLIC void
+QTOPIA_move(x, y)
+unsigned int x, y;
+{
+        char sBuffer[QTOPIA_MAX_BUFFER];
+        sprintf( sBuffer, "qtd move x=%d y=%d\n",x,y );
+        SendDataToSocket( sBuffer );
+}
+TERM_PUBLIC void
+QTOPIA_point(x, y, point)
+unsigned int x, y;
+int point;
+{
+        char sBuffer[QTOPIA_MAX_BUFFER];
+        sprintf( sBuffer, "qtd point x=%d y=%d point=%d\n",x,y,point );
+        SendDataToSocket( sBuffer );
+}
+TERM_PUBLIC void
+QTOPIA_vector(_x, _y)
+unsigned int _x, _y;
+{
+        char sBuffer[QTOPIA_MAX_BUFFER];
+        sprintf( sBuffer, "qtd vector x=%d y=%d\n",_x,_y );
+        SendDataToSocket( sBuffer );
+}
+TERM_PUBLIC void
+QTOPIA_put_text(x, y, str)
+unsigned int x, y;
+const char *str;
+{
+        char sBuffer[QTOPIA_MAX_BUFFER];
+        sprintf( sBuffer, "qtd put_text x=%d y=%d str=%s\n",x,y,str );
+        SendDataToSocket( sBuffer );
+}
+/* not suported yet ! */
+TERM_PUBLIC void
+QTOPIA_arrow(sx, sy, ex, ey, head)
+    unsigned int sx, sy, ex, ey;
+    int head;           /* ignored */
+{
+        char sBuffer[QTOPIA_MAX_BUFFER];
+        sprintf( sBuffer, "qtd arrow sx=%d sy=%d ex=%d ey=%d head=%d\n",sx,sy,ex,ey,head );
+        SendDataToSocket( sBuffer );
+}
+#endif /* TERM_BODY */
+#ifdef TERM_TABLE
+TERM_TABLE_START(qtopia_driver)
+    "qtopia", "qtopia or Qt",
+    QTOPIA_XMAX, QTOPIA_YMAX, QTOPIA_VCHAR, QTOPIA_HCHAR,
+    QTOPIA_VTIC, QTOPIA_HTIC, QTOPIA_options, QTOPIA_init, QTOPIA_reset,
+    QTOPIA_text, null_scale, QTOPIA_graphics, QTOPIA_move, QTOPIA_vector,
+    QTOPIA_linetype, QTOPIA_put_text, null_text_angle,
+    null_justify_text, QTOPIA_point, /*QTOPIA_arrow*/0, set_font_null,
+    0,                          /* pointsize */
+    TERM_CAN_MULTIPLOT,
+    NULL, NULL, NULL, NULL
+#ifdef USE_MOUSE
+    , NULL, NULL, NULL, NULL, NULL
+#endif
+#ifdef PM3D
+    , NULL, NULL, NULL, NULL
+#endif
+TERM_TABLE_END(qtopia_driver)
+#undef LAST_TERM
+#define LAST_TERM qtopia_driver
+#endif /* TERM_TABLE */
+#ifdef TERM_HELP
+START_HELP(qtopia)
+"1 qtopia",
+"?commands set terminal qtopia",
+"?set terminal qtopia",
+"?set term qtopia",
+"?terminal qtopia",
+"?term qtopia",
+"?qtopia",
+" The `qtopia` terminal driver has no additional options.",
+"",
+" Syntax:",
+"       set terminal qtopia",
+""
+END_HELP(qtopia)
+#endif /* TERM_HELP */
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb b/meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb
new file mode 100644
index 0000000000..8a5bca964d
--- /dev/null
+++ b/meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb
@@ -0,0 +1,14 @@
+require gnuplot.inc
+SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${PN}-${PV}.tar.gz;name=archive \
+    http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz;name=qtplot \
+    file://subdirs.patch \
+    file://lua-loadlibs-configure-in-fix.patch \
+    file://gnuplot.desktop \
+    file://gnuplot.png \
+"
+SRC_URI[archive.md5sum] = "9a476b21f74bd99c876f1509d731a0f9"
+SRC_URI[archive.sha256sum] = "e550f030c7d04570e89c3d4e3f6e82296816508419c86ab46c4dd73156519a2d"
+SRC_URI[qtplot.md5sum] = "0a481885a496092c77eb4017540b5cf6"
+SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a267cd6478cb5147f55d7530c94f1ad5f4132"
diff --git a/meta-oe/recipes-extended/hexedit/hexedit/0001-don-t-strip-when-installing.patch b/meta-oe/recipes-extended/hexedit/hexedit/0001-don-t-strip-when-installing.patch
new file mode 100644
index 0000000000..a384b05cef
--- /dev/null
+++ b/meta-oe/recipes-extended/hexedit/hexedit/0001-don-t-strip-when-installing.patch
@@ -0,0 +1,30 @@
+From cc67246ca6839e5b3f6a286f10ed24c225b77a5e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
+Date: Thu, 4 Jul 2013 12:34:32 +0200
+Subject: [PATCH] don't strip when installing
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Signed-off-by: Eric Bénard <eric@eukrea.com>
+Upstream-Status: Inappropriate [configuration]
+---
+ Makefile.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/Makefile.in b/Makefile.in
+index 159463e..735cc72 100644
+--- a/Makefile.in
+++ b/Makefile.in
+@@ -42,6 +42,6 @@ distclean: clean
+ 
+ install: $(PRODUCT)
+        $(INSTALL) -d -m 755 $(DESTDIR)$(bindir)
+-       $(INSTALL) -s -m 755 $(PRODUCT) $(DESTDIR)$(bindir)
+       $(INSTALL) -m 755 $(PRODUCT) $(DESTDIR)$(bindir)
+        $(INSTALL) -d -m 755 $(DESTDIR)$(mandir)/man1
+        $(INSTALL) -m 644 $(PRODUCT).1 $(DESTDIR)$(mandir)/man1
+-- 
+1.7.10.4
diff --git a/meta-oe/recipes-extended/hexedit/hexedit_1.2.13.bb b/meta-oe/recipes-extended/hexedit/hexedit_1.2.13.bb
new file mode 100644
index 0000000000..d0658db58c
--- /dev/null
+++ b/meta-oe/recipes-extended/hexedit/hexedit_1.2.13.bb
@@ -0,0 +1,17 @@
+SUMMARY = "view and edit files in hexadecimal or in ASCII"
+HOMEPAGE = "http://rigaux.org/hexedit.html"
+SECTION = "console/utils"
+LICENSE = "GPLv2+"
+DEPENDS = "ncurses"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
+SRC_URI = "http://rigaux.org/${PN}-${PV}.src.tgz \
+    file://0001-don-t-strip-when-installing.patch "
+SRC_URI[md5sum] = "a5af1378d028512a9cad27a5ba3e15f9"
+SRC_URI[sha256sum] = "6a126da30a77f5c0b08038aa7a881d910e3b65d13767fb54c58c983963b88dd7"
+inherit autotools
+S = "${WORKDIR}/${PN}"
diff --git a/meta-oe/recipes-extended/hplip/hplip-3.12.6/cups-1.6.patch b/meta-oe/recipes-extended/hplip/hplip-3.12.6/cups-1.6.patch
new file mode 100644
index 0000000000..7df01aab33
--- /dev/null
+++ b/meta-oe/recipes-extended/hplip/hplip-3.12.6/cups-1.6.patch
@@ -0,0 +1,395 @@
+Imported from gentoo:
+https://bugs.gentoo.org/show_bug.cgi?id=428672
+diff -Naur hplip-3.12.6_old/prnt/cupsext/cupsext.c hplip-3.12.6/prnt/cupsext/cupsext.c
+--- hplip-3.12.6_old/prnt/cupsext/cupsext.c     2012-08-04 09:18:18.388330038 +0200
+++ hplip-3.12.6/prnt/cupsext/cupsext.c 2012-08-04 09:18:27.855181327 +0200
+@@ -87,6 +87,46 @@
+ #define PY_SSIZE_T_MIN INT_MIN
+ #endif
+ 
+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
+#define HAVE_CUPS_1_6 1
+#endif
+
+#ifndef HAVE_CUPS_1_6
+#define ippGetCount(attr)     attr->num_values
+#define ippGetGroupTag(attr)  attr->group_tag
+#define ippGetValueTag(attr)  attr->value_tag
+#define ippGetName(attr)      attr->name
+#define ippGetBoolean(attr, element) attr->values[element].boolean
+#define ippGetInteger(attr, element) attr->values[element].integer
+#define ippGetStatusCode(ipp) ipp->request.status.status_code
+#define ippGetString(attr, element, language) attr->values[element].string.text
+
+static ipp_attribute_t * ippFirstAttribute( ipp_t *ipp )
+{
+    if (!ipp)
+        return (NULL);
+    return (ipp->current = ipp->attrs);
+}
+
+static ipp_attribute_t * ippNextAttribute( ipp_t *ipp )
+{
+    if (!ipp || !ipp->current)
+        return (NULL);
+    return (ipp->current = ipp->current->next);
+}
+
+static int ippSetOperation( ipp_t *ipp, ipp_op_t op )
+{
+    ipp->request.op.operation_id = op;
+    return (1);
+}
+
+static int ippSetRequestId( ipp_t *ipp, int request_id )
+{
+    ipp->request.any.request_id = request_id;
+    return (1);
+}
+#endif
+ 
+ int g_num_options = 0;
+ cups_option_t * g_options;
+@@ -333,8 +373,8 @@
+     request = ippNew();
+     language = cupsLangDefault();
+ 
+-    request->request.op.operation_id = CUPS_GET_PRINTERS;
+-    request->request.any.request_id = 1;
+    ippSetOperation( request, CUPS_GET_PRINTERS );
+    ippSetRequestId ( request, 1);
+ 
+     ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+                   "attributes-charset", NULL, cupsLangEncoding( language ) );
+@@ -378,10 +418,10 @@
+         ipp_pstate_t state;
+         int i = 0;
+ 
+-        for ( attr = response->attrs; attr != NULL; attr = attr->next )
+        for ( attr = ippFirstAttribute( response ); attr != NULL; attr = ippNextAttribute( response ) )
+         {
+-            while ( attr != NULL && attr->group_tag != IPP_TAG_PRINTER )
+-                attr = attr->next;
+            while ( attr != NULL && ippGetGroupTag( attr ) != IPP_TAG_PRINTER )
+                attr = ippNextAttribute( response );
+ 
+             if ( attr == NULL )
+                 break;
+@@ -390,41 +430,41 @@
+             state = IPP_PRINTER_IDLE;
+             accepting = 0;
+ 
+-            while ( attr != NULL && attr->group_tag == IPP_TAG_PRINTER )
+            while ( attr != NULL && ippGetGroupTag( attr ) == IPP_TAG_PRINTER )
+             {
+-                if ( strcmp( attr->name, "printer-name" ) == 0 &&
+-                        attr->value_tag == IPP_TAG_NAME )
+-                    name = attr->values[ 0 ].string.text;
+-
+-                else if ( strcmp( attr->name, "device-uri" ) == 0 &&
+-                        attr->value_tag == IPP_TAG_URI )
+-                    device_uri = attr->values[ 0 ].string.text;
+-
+-                else if ( strcmp( attr->name, "printer-uri-supported" ) == 0 &&
+-                        attr->value_tag == IPP_TAG_URI )
+-                    printer_uri = attr->values[ 0 ].string.text;
+-
+-                else if ( strcmp( attr->name, "printer-info" ) == 0 &&
+-                        attr->value_tag == IPP_TAG_TEXT )
+-                    info = attr->values[ 0 ].string.text;
+-
+-                else if ( strcmp( attr->name, "printer-location" ) == 0 &&
+-                        attr->value_tag == IPP_TAG_TEXT )
+-                    location = attr->values[ 0 ].string.text;
+-
+-                else if ( strcmp( attr->name, "printer-make-and-model" ) == 0 &&
+-                        attr->value_tag == IPP_TAG_TEXT )
+-                    make_model = attr->values[ 0 ].string.text;
+-
+-                else if ( strcmp( attr->name, "printer-state" ) == 0 &&
+-                        attr->value_tag == IPP_TAG_ENUM )
+-                    state = ( ipp_pstate_t ) attr->values[ 0 ].integer;
+-
+-                else if (!strcmp(attr->name, "printer-is-accepting-jobs") &&
+-                        attr->value_tag == IPP_TAG_BOOLEAN)
+-                    accepting = attr->values[ 0 ].boolean;
+                if ( strcmp( ippGetName( attr ), "printer-name" ) == 0 &&
+                        ippGetValueTag( attr ) == IPP_TAG_NAME )
+                    name = ippGetString( attr, 0, NULL );
+
+                else if ( strcmp( ippGetName( attr ), "device-uri" ) == 0 &&
+                        ippGetValueTag( attr ) == IPP_TAG_URI )
+                    device_uri = ippGetString( attr, 0, NULL );
+
+                else if ( strcmp( ippGetName( attr ), "printer-uri-supported" ) == 0 &&
+                        ippGetValueTag( attr ) == IPP_TAG_URI )
+                    printer_uri = ippGetString( attr, 0, NULL );
+
+                else if ( strcmp( ippGetName( attr ), "printer-info" ) == 0 &&
+                        ippGetValueTag( attr ) == IPP_TAG_TEXT )
+                    info = ippGetString( attr, 0, NULL );
+
+                else if ( strcmp( ippGetName( attr ), "printer-location" ) == 0 &&
+                        ippGetValueTag( attr ) == IPP_TAG_TEXT )
+                    location = ippGetString( attr, 0, NULL );
+
+                else if ( strcmp( ippGetName( attr ), "printer-make-and-model" ) == 0 &&
+                        ippGetValueTag( attr ) == IPP_TAG_TEXT )
+                    make_model = ippGetString( attr, 0, NULL );
+
+                else if ( strcmp( ippGetName( attr ), "printer-state" ) == 0 &&
+                        ippGetValueTag( attr ) == IPP_TAG_ENUM )
+                    state = ( ipp_pstate_t ) ippGetInteger( attr, 0 );
+
+                else if (!strcmp(ippGetName( attr ), "printer-is-accepting-jobs") &&
+                        ippGetValueTag( attr ) == IPP_TAG_BOOLEAN)
+                    accepting = ippGetBoolean( attr, 0 );
+ 
+-                attr = attr->next;
+                attr = ippNextAttribute( response );
+             }
+ 
+             if ( device_uri == NULL )
+@@ -522,8 +562,8 @@
+     request = ippNew();
+     language = cupsLangDefault();
+ 
+-    request->request.op.operation_id = CUPS_ADD_PRINTER;
+-    request->request.any.request_id = 1;
+    ippSetOperation( request, CUPS_ADD_PRINTER );
+    ippSetRequestId ( request, 1 );
+ 
+     ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+                   "attributes-charset", NULL, cupsLangEncoding( language ) );
+@@ -568,7 +608,7 @@
+     }
+     else
+     {
+-        status = response->request.status.status_code;
+        status = ippGetStatusCode( response );
+         //ippDelete( response );
+         r = 1;
+     }
+@@ -631,8 +671,8 @@
+        */
+     request = ippNew();
+ 
+-    request->request.op.operation_id = CUPS_DELETE_PRINTER;
+-    request->request.op.request_id = 1;
+    ippSetOperation( request, CUPS_DELETE_PRINTER );
+    ippSetRequestId ( request, 1 );
+ 
+     language = cupsLangDefault();
+ 
+@@ -650,7 +690,7 @@
+      */
+     response = cupsDoRequest( http, request, "/admin/" );
+ 
+-    if ( ( response != NULL ) && ( response->request.status.status_code <= IPP_OK_CONFLICT ) )
+    if ( ( response != NULL ) && ( ippGetStatusCode( response ) <= IPP_OK_CONFLICT ) )
+     {
+         r = 1;
+     }
+@@ -721,8 +761,8 @@
+ 
+     request = ippNew();
+ 
+-    request->request.op.operation_id = CUPS_SET_DEFAULT;
+-    request->request.op.request_id = 1;
+    ippSetOperation( request, CUPS_SET_DEFAULT );
+    ippSetRequestId ( request, 1 );
+ 
+     language = cupsLangDefault();
+ 
+@@ -743,7 +783,7 @@
+ 
+     response = cupsDoRequest( http, request, "/admin/" );
+ 
+-    if ( ( response != NULL ) && ( response->request.status.status_code <= IPP_OK_CONFLICT ) )
+    if ( ( response != NULL ) && ( ippGetStatusCode( response ) <= IPP_OK_CONFLICT ) )
+     {
+         r = 1;
+     }
+@@ -797,8 +837,8 @@
+ 
+     request = ippNew();
+ 
+-    request->request.op.operation_id = op;
+-    request->request.op.request_id = 1;
+    ippSetOperation( request, op );
+    ippSetRequestId ( request, 1 );
+ 
+     language = cupsLangDefault();
+ 
+@@ -822,7 +862,7 @@
+ 
+     response = cupsDoRequest(http, request, "/admin/");
+ 
+-    if (( response != NULL ) && (response->request.status.status_code <= IPP_OK_CONFLICT))
+    if (( response != NULL ) && (ippGetStatusCode( response ) <= IPP_OK_CONFLICT))
+     {
+         r = 1;
+     }
+@@ -837,7 +877,7 @@
+     if ( response != NULL )
+         ippDelete( response );
+ 
+-    return Py_BuildValue( "i", r );;
+    return Py_BuildValue( "i", r );
+ }
+ 
+ 
+@@ -1116,8 +1156,8 @@
+ 
+     request = ippNew();
+ 
+-    request->request.op.operation_id = CUPS_GET_PPDS;
+-    request->request.op.request_id   = 1;
+    ippSetOperation( request, CUPS_GET_PPDS );
+    ippSetRequestId ( request, 1 );
+ 
+     language = cupsLangDefault();
+ 
+@@ -1143,43 +1183,43 @@
+     if ((response = cupsDoRequest(http, request, "/")) != NULL)
+     {
+ 
+-        for (attr = response->attrs; attr; attr = attr->next)
+        for (attr = ippFirstAttribute( response ); attr; attr = ippNextAttribute( response ))
+         {
+             PyObject *dict;
+             char *ppdname = NULL;
+ 
+-            while (attr && attr->group_tag != IPP_TAG_PRINTER)
+-                attr = attr->next;
+            while (attr && ippGetGroupTag( attr ) != IPP_TAG_PRINTER)
+                attr = ippNextAttribute( response );
+ 
+             if (!attr)
+                 break;
+ 
+             dict = PyDict_New ();
+ 
+-            for (; attr && attr->group_tag == IPP_TAG_PRINTER; attr = attr->next)
+            for (; attr && ippGetGroupTag( attr ) == IPP_TAG_PRINTER; attr = ippNextAttribute( response ))
+             {
+                 PyObject *val = NULL;
+ 
+-                if (!strcmp (attr->name, "ppd-name") && attr->value_tag == IPP_TAG_NAME)
+                if (!strcmp (ippGetName( attr ), "ppd-name") && ippGetValueTag( attr ) == IPP_TAG_NAME)
+                 {
+-                    ppdname = attr->values[0].string.text;
+                    ppdname = ippGetString( attr, 0, NULL );
+ 
+                     //sprintf( buf, "print '%s'", ppdname);
+                     //PyRun_SimpleString( buf );
+                 }
+ 
+-                else if (attr->value_tag == IPP_TAG_TEXT || attr->value_tag == IPP_TAG_NAME || attr->value_tag == IPP_TAG_KEYWORD)
+-                //else if ((!strcmp (attr->name, "ppd-natural-language") && attr->value_tag == IPP_TAG_LANGUAGE) ||
+-                //    (!strcmp (attr->name, "ppd-make-and-model") && attr->value_tag == IPP_TAG_TEXT) ||
+-                //    (!strcmp (attr->name, "ppd-make") && attr->value_tag == IPP_TAG_TEXT) ||
+-                //    (!strcmp (attr->name, "ppd-device-id") && attr->value_tag == IPP_TAG_TEXT))
+                else if (ippGetValueTag( attr ) == IPP_TAG_TEXT || ippGetValueTag( attr ) == IPP_TAG_NAME || ippGetValueTag( attr ) == IPP_TAG_KEYWORD)
+                //else if ((!strcmp (ippGetName( attr ), "ppd-natural-language") && ippGetValueTag( attr ) == IPP_TAG_LANGUAGE) ||
+                //    (!strcmp (ippGetName( attr ), "ppd-make-and-model") && ippGetValueTag( attr ) == IPP_TAG_TEXT) ||
+                //    (!strcmp (ippGetName( attr ), "ppd-make") && ippGetValueTag( attr ) == IPP_TAG_TEXT) ||
+                //    (!strcmp (ippGetName( attr ), "ppd-device-id") && ippGetValueTag( attr ) == IPP_TAG_TEXT))
+                 {
+-                    val = PyObj_from_UTF8(attr->values[0].string.text);
+                    val = PyObj_from_UTF8(ippGetString( attr, 0, NULL ));
+                 }
+ 
+                 if (val)
+                 {
+-                    PyDict_SetItemString (dict, attr->name, val);
+                    PyDict_SetItemString (dict, ippGetName( attr ), val);
+                     Py_DECREF (val);
+                 }
+             }
+diff -Naur hplip-3.12.6_old/scan/sane/hpaio.c hplip-3.12.6/scan/sane/hpaio.c
+--- hplip-3.12.6_old/scan/sane/hpaio.c  2012-08-04 09:18:21.458389913 +0200
+++ hplip-3.12.6/scan/sane/hpaio.c      2012-08-04 09:18:27.875181720 +0200
+@@ -47,6 +47,43 @@
+ #define DEBUG_DECLARE_ONLY
+ #include "sanei_debug.h"
+ 
+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
+#define HAVE_CUPS_1_6 1
+#endif
+
+#ifndef HAVE_CUPS_1_6
+#define ippGetGroupTag(attr)  attr->group_tag
+#define ippGetValueTag(attr)  attr->value_tag
+#define ippGetName(attr)      attr->name
+#define ippGetString(attr, element, language) attr->values[element].string.text
+
+static ipp_attribute_t * ippFirstAttribute( ipp_t *ipp )
+{
+    if (!ipp)
+        return (NULL);
+    return (ipp->current = ipp->attrs);
+}
+
+static ipp_attribute_t * ippNextAttribute( ipp_t *ipp )
+{
+    if (!ipp || !ipp->current)
+        return (NULL);
+    return (ipp->current = ipp->current->next);
+}
+
+static int ippSetOperation( ipp_t *ipp, ipp_op_t op )
+{
+    ipp->request.op.operation_id = op;
+    return (1);
+}
+
+static int ippSetRequestId( ipp_t *ipp, int request_id )
+{
+    ipp->request.any.request_id = request_id;
+    return (1);
+}
+#endif
+
+ static SANE_Device **DeviceList = NULL;
+ 
+ static int AddDeviceList(char *uri, char *model, SANE_Device ***pd)
+@@ -186,8 +223,8 @@
+    /* Assemble the IPP request */
+    request = ippNew();
+ 
+-   request->request.op.operation_id = CUPS_GET_PRINTERS;
+-   request->request.any.request_id  = 1;
+   ippSetOperation( request, CUPS_GET_PRINTERS );
+   ippSetRequestId( request, 1 );
+ 
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET, "attributes-charset", NULL, "utf-8");
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE, "attributes-natural-language", NULL, "en");
+@@ -197,20 +234,20 @@
+    if ((response = cupsDoRequest(http, request, "/")) == NULL)
+       goto bugout;
+ 
+-   for (attr = response->attrs; attr != NULL; attr = attr->next)
+   for (attr = ippFirstAttribute ( response ); attr != NULL; attr = ippNextAttribute( response ))
+    {
+       /* Skip leading attributes until we hit a printer. */
+-      while (attr != NULL && attr->group_tag != IPP_TAG_PRINTER)
+-         attr = attr->next;
+      while (attr != NULL && ippGetGroupTag( attr ) != IPP_TAG_PRINTER)
+         attr = ippNextAttribute( response );
+ 
+       if (attr == NULL)
+          break;
+ 
+-      while (attr != NULL && attr->group_tag == IPP_TAG_PRINTER)
+      while (attr != NULL && ippGetGroupTag( attr ) == IPP_TAG_PRINTER)
+       {
+-         if (strcmp(attr->name, "device-uri") == 0 && attr->value_tag == IPP_TAG_URI && AddCupsList(attr->values[0].string.text, printer) == 0)
+         if (strcmp(ippGetName( attr ), "device-uri") == 0 && ippGetValueTag( attr ) == IPP_TAG_URI && AddCupsList(ippGetString( attr, 0, NULL ), printer) == 0)
+             cnt++;
+-         attr = attr->next;
+         attr = ippNextAttribute( response );
+       }
+ 
+       if (attr == NULL)
diff --git a/meta-oe/recipes-extended/hplip/hplip-3.12.6/fix-libusb-paths.patch b/meta-oe/recipes-extended/hplip/hplip-3.12.6/fix-libusb-paths.patch
new file mode 100644
index 0000000000..b347f831cb
--- /dev/null
+++ b/meta-oe/recipes-extended/hplip/hplip-3.12.6/fix-libusb-paths.patch
@@ -0,0 +1,35 @@
+Upstream-Status: Inappropriate [configuration]
+diff -rupN hplip-3.12.6_orig/configure.in hplip-3.12.6/configure.in
+--- hplip-3.12.6_orig/configure.in      2012-06-18 20:44:24.000000000 +1000
+++ hplip-3.12.6/configure.in   2012-08-16 13:40:07.259927650 +1000
+@@ -524,6 +524,8 @@ if test "$hpijs_only_build" = "no"; then
+       AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel support], 11)])
+    else
+       AC_CHECK_LIB([usb-1.0], [libusb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb 1.0 support], 2)])
+      LIBUSBINCLUDEROOT?="/usr/include/"
+      AC_ARG_VAR(LIBUSBINCLUDEROOT, [path to libusb-1.0 folder])
+       AC_CHECK_HEADERS(libusb-1.0/libusb.h, ,[AC_MSG_ERROR([cannot find libusb-1.0-devel support], 11)])
+    fi
+ fi
+diff -rupN hplip-3.12.6_orig/Makefile.am hplip-3.12.6/Makefile.am
+--- hplip-3.12.6_orig/Makefile.am       2012-06-18 20:44:13.000000000 +1000
+++ hplip-3.12.6/Makefile.am    2012-08-16 13:41:12.307932822 +1000
+@@ -72,7 +72,7 @@ libhpmud_la_SOURCES = io/hpmud/hpmud.c i
+          io/hpmud/hpmud.h io/hpmud/hpmudi.h io/hpmud/list.h io/hpmud/mlc.h io/hpmud/pml.h io/hpmud/dot4.c \
+          io/hpmud/dot4.h io/hpmud/jd.c io/hpmud/jd.h io/hpmud/pp.c io/hpmud/pp.h io/hpmud/musb.h io/hpmud/musb_libusb01.c
+ else
+-libhpmud_la_CFLAGS = -I/usr/include/libusb-1.0 -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\"
+libhpmud_la_CFLAGS = -I/$(LIBUSBINCLUDEROOT)/libusb-1.0 -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\"
+ libhpmud_la_SOURCES = io/hpmud/hpmud.c io/hpmud/mlc.c io/hpmud/model.c io/hpmud/pml.c \
+          io/hpmud/hpmud.h io/hpmud/hpmudi.h io/hpmud/list.h io/hpmud/mlc.h io/hpmud/pml.h io/hpmud/dot4.c \
+          io/hpmud/dot4.h io/hpmud/jd.c io/hpmud/jd.h io/hpmud/pp.c io/hpmud/pp.h io/hpmud/musb.h io/hpmud/musb.c
+@@ -286,7 +286,7 @@ hpmudext_la_LIBADD = libhpmud.la
+ if LIBUSB01_BUILD
+ hpmudext_la_CFLAGS = -I$(PYTHONINCLUDEDIR)
+ else
+-hpmudext_la_CFLAGS =-I/usr/include/libusb-1.0 -I$(PYTHONINCLUDEDIR)
+hpmudext_la_CFLAGS =-I$(LIBUSBINCLUDEROOT)/libusb-1.0 -I$(PYTHONINCLUDEDIR)
+ endif
+ 
+ # ui (qt3)
diff --git a/meta-oe/recipes-extended/hplip/hplip-3.12.6/setup-add-sleep-after-cups-reset.patch b/meta-oe/recipes-extended/hplip/hplip-3.12.6/setup-add-sleep-after-cups-reset.patch
new file mode 100644
index 0000000000..0e1b6c4ed3
--- /dev/null
+++ b/meta-oe/recipes-extended/hplip/hplip-3.12.6/setup-add-sleep-after-cups-reset.patch
@@ -0,0 +1,12 @@
+Upstream-Status: Inappropriate [embedded specific]
+--- hplip-3.11.10/setup.py.orig 2011-10-02 14:06:19.000000000 +1100
+++ hplip-3.11.10/setup.py      2012-02-29 08:21:39.167999938 +1100
+@@ -573,6 +573,7 @@
+ 
+             log.debug("Restarting CUPS...")
+             status, output = utils.run(restart_cups())
+            time.sleep(3)
+             log.debug("Restart CUPS returned: exit=%d output=%s" % (status, output))
+ 
+             cups.setPasswordPrompt("You do not have permission to add a printer.")
diff --git a/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb b/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb
new file mode 100644
index 0000000000..655f907f6d
--- /dev/null
+++ b/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb
@@ -0,0 +1,71 @@
+SUMMARY = "HP Linux Imaging and Printing"
+LICENSE="GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=442bb3cbbeeb60643a87325718b8a8ee"
+PR = "r1"
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz \
+           file://setup-add-sleep-after-cups-reset.patch \
+           file://fix-libusb-paths.patch \
+           file://cups-1.6.patch \
+"
+DEPENDS += "cups python libusb"
+inherit autotools python-dir pythonnative
+export BUILD_SYS
+export HOST_SYS
+export STAGING_INCDIR
+export STAGING_LIBDIR
+EXTRA_OECONF += "\
+        LIBUSBINCLUDEROOT=${STAGING_INCDIR} \
+        --disable-network-build \
+        --disable-doc-build \
+        --disable-pp-build \
+        --disable-scan-build \
+        --disable-gui-build \
+        --disable-fax-build \
+        --disable-policykit  \
+        --disable-qt4 \
+        --disable-qt3 \
+        --disable-dbus-build \
+        --disable-foomatic-drv-install \
+        --enable-foomatic-ppd-install  \
+        --enable-foomatic-rip-hplip-install \
+"
+PACKAGES += "${PN}-ppd ${PN}-cups ${PN}-backend ${PN}-filter ${PN}-hal"
+RDEPENDS_${PN} += " \
+        python-syslog \
+        python-pprint \
+        python-compression \
+        python-shell \
+        python-xml \
+        python-unixadmin \
+        python-html \
+        python-resource \
+        python-terminal \
+        python-subprocess\
+"
+# need to snag the debug file or OE will fail on backend package
+FILES_${PN}-dbg += "\
+        ${libdir}/cups/backend/.debug \
+        ${PYTHON_SITEPACKAGES_DIR}/.debug \
+        ${libdir}/cups/filter/.debug "
+FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/*.la"
+FILES_${PN}-ppd = "${datadir}/ppd"
+FILES_${PN}-cups = "${datadir}/cups"
+FILES_${PN}-backend = "${libdir}/cups/backend"
+FILES_${PN}-filter = "${libdir}/cups/filter"
+FILES_${PN}-hal = "${datadir}/hal"
+FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/*.so"
+SRC_URI[md5sum] = "5303938e8630775ea6fb383af85775e5"
+SRC_URI[sha256sum] = "54578000792969adb583e75efeacb9c46ab69659ec7e9424de390613f3595775"
diff --git a/meta-oe/recipes-extended/iotop/iotop_0.4.4.bb b/meta-oe/recipes-extended/iotop/iotop_0.4.4.bb
new file mode 100644
index 0000000000..14d2ee5e38
--- /dev/null
+++ b/meta-oe/recipes-extended/iotop/iotop_0.4.4.bb
@@ -0,0 +1,25 @@
+SUMMARY = "Simple top-like I/O monitor"
+DESCRIPTION = "iotop does for I/O usage what top(1) does for CPU usage. \
+    It watches I/O usage information output by the Linux kernel and displays \
+    a table of current I/O usage by processes on the system."
+HOMEPAGE = "http://guichaz.free.fr/iotop/"
+PR = "r1"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4"
+SRC_URI = "http://guichaz.free.fr/iotop/files/${PN}-${PV}.tar.bz2"
+SRC_URI[md5sum] = "cdd38b276cbf238676f5d2bcf098ba9c"
+SRC_URI[sha256sum] = "46f3279fb1a7dfc129b5d00950c6e8389e4aedeb58880e848b88d686483df0b0"
+inherit distutils
+do_install_append() {
+    rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.pyo || true
+    rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py  || true
+}
+RDEPENDS_${PN} = "python-distutils python-curses python-textutils \
+                  python-codecs python-ctypes python-pprint \
+                  python-shell"
diff --git a/meta-oe/recipes-extended/jansson/jansson_2.4.bb b/meta-oe/recipes-extended/jansson/jansson_2.4.bb
new file mode 100644
index 0000000000..c235729fec
--- /dev/null
+++ b/meta-oe/recipes-extended/jansson/jansson_2.4.bb
@@ -0,0 +1,12 @@
+SUMMARY = "Jansson is a C library for encoding, decoding and manipulating JSON data"
+HOMEPAGE = "http://www.digip.org/jansson/"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=6946b728e700de875e60ebb453cc3a20"
+SRC_URI = "http://www.digip.org/jansson/releases/${BPN}-${PV}.tar.gz"
+SRC_URI[md5sum] = "c4629b89bf0432f3158c461e88fe0113"
+SRC_URI[sha256sum] = "1fcbd1ac3d8b610644acf86a5731d760bb228c9acbace20a2ad0f23baec79b41"
+inherit autotools pkgconfig
diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc/automake-111-fix.patch b/meta-oe/recipes-extended/lcdproc/lcdproc/automake-111-fix.patch
new file mode 100644
index 0000000000..061cc22f0c
--- /dev/null
+++ b/meta-oe/recipes-extended/lcdproc/lcdproc/automake-111-fix.patch
@@ -0,0 +1,21 @@
+Description: With automake 1.11.3, pkglib_PROGRAMS is not valid anymore, 
+ so work around this by using my_execbin_PROGRAMS.
+Author: Andreas Moog <amoog@ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/934265
+Upstream-Status: Backport 
+Index: lcdproc-0.5.5/server/drivers/Makefile.am
+===================================================================
+--- lcdproc-0.5.5.orig/server/drivers/Makefile.am       2012-02-26 14:04:37.000000000 +0100
+++ lcdproc-0.5.5/server/drivers/Makefile.am    2012-02-26 14:13:17.764467350 +0100
+@@ -20,7 +20,8 @@
+ 
+ ## Keep the lists sorted!
+ 
+-pkglib_PROGRAMS = @DRIVERS@
+my_execbindir = $(pkglibdir)
+my_execbin_PROGRAMS = @DRIVERS@
+ EXTRA_PROGRAMS = bayrad CFontz CFontz633 CFontzPacket curses debug CwLnx ea65 EyeboxOne g15 glcdlib glk hd44780 icp_a106 imon imonlcd IOWarrior irman joy lb216 lcdm001 lcterm lirc lis MD8800 mdm166a ms6931 mtc_s16209x MtxOrb mx5000 NoritakeVFD picolcd pyramid sed1330 sed1520 serialPOS serialVFD shuttleVFD stv5730 SureElec svga t6963 text tyan sli ula200 xosd i2500vfd irtrans
+ noinst_LIBRARIES = libLCD.a libbignum.a
+ 
diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc5.inc b/meta-oe/recipes-extended/lcdproc/lcdproc5.inc
new file mode 100644
index 0000000000..d1a45cadcc
--- /dev/null
+++ b/meta-oe/recipes-extended/lcdproc/lcdproc5.inc
@@ -0,0 +1,81 @@
+DESCRIPTION = "LCDproc is a client/server suite to drive all kinds of LCD (-like) devices. The client \
+shipped with this package can be used to acquire various kinds of system stats."
+SUMMARY = "Drivers for character-based LCD displays"
+HOMEPAGE = "http://lcdproc.org"
+SECTION = "utils"
+LICENSE = "GPLv2+"
+DEPENDS = "ncurses"
+LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760 \
+                    file://README;beginline=60;md5=637e042cdd3671ba00e78b58ede45d3b"
+SRC_URI = "${SOURCEFORGE_MIRROR}/lcdproc/${P}.tar.gz"
+inherit autotools update-rc.d
+LCD_DRIVERS ?= "all"
+LCD_DEFAULT_DRIVER ?= "curses"
+PACKAGECONFIG ??= "usb"
+PACKAGECONFIG[usb] = "--enable-libusb,--disable-libusb,virtual/libusb0"
+PACKAGECONFIG[ftdi] = "--enable-libftdi,--disable-libftdi,libftdi"
+EXTRA_OECONF = "--enable-drivers=${LCD_DRIVERS}"
+do_install () {
+    # binaries
+    install -D -m 0755 server/LCDd ${D}${sbindir}/LCDd
+    install -D -m 0755 clients/lcdproc/lcdproc ${D}${bindir}/lcdproc
+    # init scripts
+    install -d ${D}${sysconfdir}/init.d
+    # so far, not fixed :-( and now even uglier :-((
+    cat scripts/init-LCDd.debian | sed -e s'/--oknodo//' -e 's/ -s -f / -s 1 -f 1 /' -e 's/force-reload/force-restart/' -e 's/sleep 1/sleep 4/' > ${D}${sysconfdir}/init.d/lcdd
+    chmod 0755 ${D}${sysconfdir}/init.d/lcdd
+    install -m 0755 scripts/init-lcdproc.debian ${D}${sysconfdir}/init.d/lcdproc
+    sed -i s'/--oknodo//' ${D}${sysconfdir}/init.d/lcdproc
+    # configuration files
+    install -m 0644 LCDd.conf ${D}${sysconfdir}/LCDd.conf
+    sed -i 's!^DriverPath=.*!DriverPath=${libdir}/lcdproc/!' ${D}${sysconfdir}/LCDd.conf
+    sed -i 's!^Driver=.*!Driver=${LCD_DEFAULT_DRIVER}!' ${D}${sysconfdir}/LCDd.conf
+    install -m 0644 clients/lcdproc/lcdproc.conf ${D}${sysconfdir}/lcdproc.conf
+    # driver library files
+    install -d ${D}${libdir}/lcdproc
+    for i in server/drivers/*.so; do
+        install -m 0644 $i ${D}${libdir}/lcdproc/
+    done
+}
+PACKAGES =+ "lcdd"
+RRECOMMENDS_${PN} = "lcdd"
+FILES_lcdd = "${sysconfdir}/LCDd.conf \
+    ${sbindir}/LCDd \
+    ${sysconfdir}/init.d/lcdd"
+CONFFILES_lcdd = "${sysconfdir}/LCDd.conf"
+CONFFILES_${PN} = "${sysconfdir}/lcdproc.conf"
+# Driver packages
+# USB / no USB trickery
+RCONFLICTS_lcdd-driver-hd47780nousb = "lcdd-driver-hd44780"
+RCONFLICTS_lcdd-driver-hd47780 = "lcdd-driver-hd44780nousb"
+INITSCRIPT_PACKAGES = "lcdd lcdproc"
+INITSCRIPT_NAME_lcdd = "lcdd"
+INITSCRIPT_NAME_lcdproc = "lcdproc"
+INITSCRIPT_PARAMS_lcdd = "defaults 70 21"
+INITSCRIPT_PARAMS_lcdproc = "defaults 71 20"
+python populate_packages_prepend() {
+    plugindir = d.expand('${libdir}/lcdproc')
+    do_split_packages(d, plugindir, '(.*)\.so$', 'lcdd-driver-%s', 'LCDd driver for %s', prepend=True)
+}
+PACKAGES_DYNAMIC += "^lcdd-driver-.*"
diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb b/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb
new file mode 100644
index 0000000000..39e607437e
--- /dev/null
+++ b/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb
@@ -0,0 +1,24 @@
+require lcdproc5.inc
+SRC_URI += "file://automake-111-fix.patch"
+SRC_URI[md5sum] = "c92d4529d36eeec6d9d6fd0a4aa3ec82"
+SRC_URI[sha256sum] = "b136b47d7bf585a003334f432d8730a36ef5ed1cd520084b919667d825e48d42"
+PACKAGECONFIG ?= ""
+PACKAGECONFIG[g15] = ",,libg15 g15daemon libg15render,"
+LCD_DRIVERS_append = "${@base_contains('PACKAGECONFIG', 'g15', '', ',!g15', d)}"
+do_install_append () {
+    # binaries
+    install -D -m 0755 clients/lcdvc/lcdvc ${D}${sbindir}/lcdvc
+    # configuration files
+    install -D -m 0644 clients/lcdvc/lcdvc.conf ${D}${sysconfdir}/lcdvc.conf
+}
+PACKAGES =+ "lcdvc"
+CONFFILES_lcdvc = "${sysconfdir}/lcdvc.conf"
+FILES_lcdvc = "${sysconfdir}/lcdvc.conf ${sbindir}/lcdvc"
diff --git a/meta-oe/recipes-extended/libcec/libcec_git.bb b/meta-oe/recipes-extended/libcec/libcec_git.bb
new file mode 100644
index 0000000000..db032f98c9
--- /dev/null
+++ b/meta-oe/recipes-extended/libcec/libcec_git.bb
@@ -0,0 +1,23 @@
+SUMMARY = "USB CEC Adaptor communication Library"
+HOMEPAGE = "http://libcec.pulse-eight.com/"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5e8e16396992369f73f3d28875f846da"
+DEPENDS = "udev lockdev"
+PV = "1.9.0"
+SRCREV = "9884e9ffc5293de5bb9092db1ed581f213a678df"
+SRC_URI = "git://github.com/Pulse-Eight/libcec.git"
+S = "${WORKDIR}/git"
+inherit autotools pkgconfig
+# cec-client and xbmc need the .so present to work :(
+FILES_${PN} += "${libdir}/*.so"
+INSANE_SKIP_${PN} = "dev-so"
+# Adapter shows up as a CDC-ACM device
+RRECOMMENDS_${PN} = "kernel-module-cdc-acm"
diff --git a/meta-oe/recipes-extended/libconfig/libconfig_1.4.9.bb b/meta-oe/recipes-extended/libconfig/libconfig_1.4.9.bb
new file mode 100644
index 0000000000..c7d3cf767e
--- /dev/null
+++ b/meta-oe/recipes-extended/libconfig/libconfig_1.4.9.bb
@@ -0,0 +1,14 @@
+SUMMARY = "C/C++ Configuration File Library"
+DESCRIPTION = "Library for manipulating structured configuration files"
+HOMEPAGE = "http://www.hyperrealm.com/libconfig/"
+SECTION = "libs"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=fad9b3332be894bab9bc501572864b29"
+SRC_URI = "http://www.hyperrealm.com/${BPN}/${BP}.tar.gz"
+inherit autotools pkgconfig
+SRC_URI[md5sum] = "b6ee0ce2b3ef844bad7cac2803a90634"
+SRC_URI[sha256sum] = "09c8979252e60193e2969e9b0e1cd597f7820087867989b2f0939ad164473041"
diff --git a/meta-oe/recipes-extended/libdivecomputer/files/fix-ar.patch b/meta-oe/recipes-extended/libdivecomputer/files/fix-ar.patch
new file mode 100644
index 0000000000..cc3f5d4786
--- /dev/null
+++ b/meta-oe/recipes-extended/libdivecomputer/files/fix-ar.patch
@@ -0,0 +1,18 @@
+---
+ configure.ac |    1 +
+ 1 file changed, 1 insertion(+)
+--- git.orig/configure.ac
+++ git/configure.ac
+@@ -24,10 +24,11 @@ LT_INIT([win32-dll])
+ LT_PROG_RC
+ 
+ # Checks for programs.
+ AC_PROG_CC
+ AC_PROG_CC_C99
+AM_PROG_AR
+ 
+ # Enable automake silent build rules.
+ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+ 
+ # Checks for native Windows.
diff --git a/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb b/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb
new file mode 100644
index 0000000000..1154dc0c53
--- /dev/null
+++ b/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Libdivecomputer is a cross-platform and open source library for communication with dive computers from various manufacturers."
+HOMEPAGE = "http://www.divesoftware.org/libdc/"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+DEPENDS = "libusb1"
+inherit autotools pkgconfig
+PV = "0.0.0"
+PR = "r1"
+SRCREV = "b7a6be15ca58cc8f89fbc8fa1a4c840e13d51092"
+SRC_URI = "git://libdivecomputer.git.sourceforge.net/gitroot/libdivecomputer/libdivecomputer \
+file://fix-ar.patch"
+S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-extended/libimobiledevice/files/fix-parallel-make.patch b/meta-oe/recipes-extended/libimobiledevice/files/fix-parallel-make.patch
new file mode 100644
index 0000000000..f6ef6f4f8b
--- /dev/null
+++ b/meta-oe/recipes-extended/libimobiledevice/files/fix-parallel-make.patch
@@ -0,0 +1,21 @@
+From 335b25febd4c864ad0ac08479f5cd43fc21b7d73 Mon Sep 17 00:00:00 2001
+From: Nikias Bassen
+Date: Mon, 09 Jul 2012 21:17:15 +0000
+Subject: Fix building with parallel build makeopts
+---
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0bad840..155994e 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -57,6 +57,8 @@ ADD_SUBDIRECTORY( plutil )
+ ADD_SUBDIRECTORY( include )
+ ADD_SUBDIRECTORY( test )
+ 
+ADD_DEPENDENCIES( plist libcnary )
+
+ IF ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND )
+        ADD_SUBDIRECTORY( swig )
+ ENDIF ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND )
+--
+cgit v0.9.0.2
diff --git a/meta-oe/recipes-extended/libimobiledevice/libplist_1.8.bb b/meta-oe/recipes-extended/libimobiledevice/libplist_1.8.bb
new file mode 100644
index 0000000000..6e8d69f603
--- /dev/null
+++ b/meta-oe/recipes-extended/libimobiledevice/libplist_1.8.bb
@@ -0,0 +1,22 @@
+SUMMARY = "A library to handle Apple Property List format whereas it's binary or XML"
+LICENSE = "GPLv2 & LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07 \
+                    file://COPYING.LESSER;md5=6ab17b41640564434dda85c06b7124f7"
+DEPENDS = "libxml2 glib-2.0 swig python"
+inherit cmake pkgconfig
+SRC_URI = "http://www.libimobiledevice.org/downloads/libplist-${PV}.tar.bz2 \
+           file://fix-parallel-make.patch \
+"
+SRC_URI[md5sum] = "2a9e0258847d50f9760dc3ece25f4dc6"
+SRC_URI[sha256sum] = "a418da3880308199b74766deef2a760a9b169b81a868a6a9032f7614e20500ec"
+PACKAGES =+ "${PN}-utils ${PN}++"
+FILES_${PN} = "${libdir}/libplist${SOLIBS}"
+FILES_${PN}++ = "${libdir}/libplist++${SOLIBS}"
+FILES_${PN}-utils = "${bindir}/*"
diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/configure.patch b/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/configure.patch
new file mode 100644
index 0000000000..ea13e11d25
--- /dev/null
+++ b/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/configure.patch
@@ -0,0 +1,25 @@
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+--- liblockfile-1.05/./configure.in~configure
+++ liblockfile-1.05/./configure.in
+@@ -1,4 +1,5 @@
+-AC_INIT(lockfile.c)
+AC_INIT
+AC_CONFIG_SRCDIR([lockfile.c])
+ AC_CONFIG_HEADER(autoconf.h)
+ AC_REVISION($Revision: 1.0 $)dnl
+ 
+@@ -111,7 +112,8 @@
+ AC_SUBST(INSTALL_TARGETS)
+ AC_SUBST(nfslockdir)
+ 
+-AC_OUTPUT(\
+AC_CONFIG_FILES([\
+        ./Makefile \
+        ./maillock.h \
+-)
+])
+AC_OUTPUT
diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/glibc-2.4.patch b/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/glibc-2.4.patch
new file mode 100644
index 0000000000..e3c4aaae5f
--- /dev/null
+++ b/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/glibc-2.4.patch
@@ -0,0 +1,70 @@
+The local function eaccess conflicts with a glibc function of the same name.
+Rename the function so that this can be build under glibc 2.4, and older
+revisions, without any problems.
+--- liblockfile-1.06/dotlockfile.c      2006/07/10 03:17:40     1.1
+++ liblockfile-1.06/dotlockfile.c      2006/07/10 03:18:26
+@@ -42,7 +42,7 @@
+ extern int optind;
+ #endif
+ 
+-extern int eaccess(char *, gid_t, struct stat *);
+extern int xeaccess(char *, gid_t, struct stat *);
+ 
+ /*
+  *     Sleep for an amout of time while regulary checking if
+@@ -252,14 +252,14 @@
+                return L_ERROR;
+        }
+        gid = getgid();
+-       if (eaccess(dir, gid, &st) < 0) {
+       if (xeaccess(dir, gid, &st) < 0) {
+                if (errno == ENOENT) {
+ enoent:
+                        if (!quiet) fprintf(stderr,
+                                "dotlockfile: %s: no such directory\n", dir);
+                        return L_TMPLOCK;
+                }
+-               if ((r = eaccess(dir, getegid(), &st) < 0) && errno == ENOENT)
+               if ((r = xeaccess(dir, getegid(), &st) < 0) && errno == ENOENT)
+                        goto enoent;
+                if (r < 0 || !ismaillock(lockfile, pwd->pw_name)) {
+                        if (!quiet) fprintf(stderr,
+@@ -272,7 +272,7 @@
+        /*
+         *      Now we should be able to chdir() to the lock directory.
+         *      When we stat("."), it should be the same as at the
+-        *      eaccess() check or someone played symlink() games on us.
+        *      xeaccess() check or someone played symlink() games on us.
+         */
+        if (chdir(dir) < 0 || stat(".", &st2) < 0) {
+                if (!quiet) fprintf(stderr,
+--- liblockfile-1.06/lockfile.c 2006/07/10 03:17:40     1.1
+++ liblockfile-1.06/lockfile.c 2006/07/10 03:18:26
+@@ -54,7 +54,7 @@
+ #ifdef LIB
+ static
+ #endif
+-int eaccess(char *fn, gid_t gid, struct stat *st)
+int xeaccess(char *fn, gid_t gid, struct stat *st)
+ {
+        struct stat     tmp;
+        uid_t           uid = geteuid();
+@@ -96,7 +96,7 @@
+                *p = 0;
+        else
+                strcpy(dir, ".");
+-       if (eaccess(dir, egid, NULL) >= 0) {
+       if (xeaccess(dir, egid, NULL) >= 0) {
+                free(dir);
+                return 0;
+        }
+@@ -111,7 +111,7 @@
+                        return 0;
+                mailgid = st.st_gid;
+        }
+-       ret = eaccess(dir, mailgid, NULL) >= 0;
+       ret = xeaccess(dir, mailgid, NULL) >= 0;
+        free (dir);
+        return ret;
+ }
diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/install.patch b/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/install.patch
new file mode 100644
index 0000000000..a9319ff1e3
--- /dev/null
+++ b/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/install.patch
@@ -0,0 +1,48 @@
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+--- liblockfile-1.05/Makefile.in~install
+++ liblockfile-1.05/Makefile.in
+@@ -20,6 +20,7 @@
+ includedir     = @includedir@
+ 
+ MAILGROUP      = @MAILGROUP@
+INSTGRP                = $(if $(MAILGROUP),-g $(MAILGROUP))
+ 
+ all:           @TARGETS@
+ install:       @INSTALL_TARGETS@
+@@ -50,25 +51,27 @@
+                $(CC) $(CFLAGS) -c lockfile.c -o xlockfile.o
+ 
+ install_static:        static install_common
+               install -d $(ROOT)$(libdir)
+                install -m 644 liblockfile.a $(ROOT)$(libdir)
+ 
+ install_shared:        shared install_common
+               install -d $(ROOT)$(libdir)
+                install -m 755 liblockfile.so \
+                        $(ROOT)$(libdir)/liblockfile.so.$(VER)
+                ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so
+                if test "$(ROOT)" = ""; then @LDCONFIG@; fi
+ 
+ install_common:
+               install -d $(ROOT)$(includedir)
+                install -m 644 lockfile.h maillock.h $(ROOT)$(includedir)
+-               if [ "$(MAILGROUP)" != "" ]; then\
+-                 install -g $(MAILGROUP) -m 2755 dotlockfile $(ROOT)$(bindir);\
+-               else \
+-                 install -g root -m 755 dotlockfile $(ROOT)$(bindir); \
+-               fi
+               install -d $(ROOT)$(bindir)
+               install -m 755 $(INSTGRP) dotlockfile $(ROOT)$(bindir)
+               install -d $(ROOT)$(mandir)/man1 $(ROOT)$(mandir)/man3
+                install -m 644 *.1 $(ROOT)$(mandir)/man1
+                install -m 644 *.3 $(ROOT)$(mandir)/man3
+ 
+ install_nfslib:        nfslib
+               install -d $(ROOT)$(nfslockdir)
+                install -m 755 nfslock.so.$(VER) $(ROOT)$(nfslockdir)
+                if test "$(ROOT)" = ""; then @LDCONFIG@; fi
+ 
diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/ldflags.patch b/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/ldflags.patch
new file mode 100644
index 0000000000..eb1d1478b8
--- /dev/null
+++ b/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/ldflags.patch
@@ -0,0 +1,21 @@
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+--- liblockfile-1.05/Makefile.in~ldflags
+++ liblockfile-1.05/Makefile.in
+@@ -34,11 +34,11 @@
+ 
+ liblockfile.so: liblockfile.a
+                $(CC) -fPIC -shared -Wl,-soname,liblockfile.so.1 \
+-                       -o liblockfile.so lockfile.o -lc
+                       -o liblockfile.so lockfile.o $(LDFLAGS) -lc
+ 
+ nfslock.so.$(VER):     nfslock.o
+                $(CC) -fPIC -shared -Wl,-soname,nfslock.so.0 \
+-                       -o nfslock.so.$(NVER) nfslock.o
+                       -o nfslock.so.$(NVER) nfslock.o $(LDFLAGS)
+ 
+ dotlockfile:   dotlockfile.o xlockfile.o
+                $(CC) $(LDFLAGS) -o dotlockfile dotlockfile.o xlockfile.o
diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch b/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch
new file mode 100644
index 0000000000..ffd7a40fab
--- /dev/null
+++ b/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch
@@ -0,0 +1,54 @@
+Upstream-Status: Inappropriate [no upstream]
+* nfslib should use NVER instead of VER
+* install the missing soname library
+Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
+---
+ Makefile.in         |    9 ++++++---
+ 1 files changed, 5 insertions(+), 3 deletions(-)
+diff --git a/Makefile.in b/Makefile.in
+index 836ca9b..a589fb8 100644
+--- a/Makefile.in
+++ b/Makefile.in
+@@ -27,7 +27,7 @@ install:      @INSTALL_TARGETS@
+ 
+ static:                liblockfile.a dotlockfile
+ shared:                liblockfile.so dotlockfile
+-nfslib:                nfslock.so.$(VER)
+nfslib:                nfslock.so.$(NVER)
+ 
+ liblockfile.a: lockfile.o
+                $(AR) rv liblockfile.a lockfile.o
+@@ -36,7 +36,7 @@ liblockfile.so: liblockfile.a
+                $(CC) -fPIC -shared -Wl,-soname,liblockfile.so.1 \
+                        -o liblockfile.so lockfile.o $(LDFLAGS) -lc
+ 
+-nfslock.so.$(VER):     nfslock.o
+nfslock.so.$(NVER):    nfslock.o
+                $(CC) -fPIC -shared -Wl,-soname,nfslock.so.0 \
+                        -o nfslock.so.$(NVER) nfslock.o $(LDFLAGS)
+ 
+@@ -59,6 +59,7 @@ install_shared:       shared install_common
+                install -m 755 liblockfile.so \
+                        $(ROOT)$(libdir)/liblockfile.so.$(VER)
+                ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so
+               ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so.1
+                if test "$(ROOT)" = ""; then @LDCONFIG@; fi
+ 
+ install_common:
+@@ -72,7 +73,9 @@ install_common:
+ 
+ install_nfslib:        nfslib
+                install -d $(ROOT)$(nfslockdir)
+-               install -m 755 nfslock.so.$(VER) $(ROOT)$(nfslockdir)
+               install -m 755 nfslock.so.$(NVER) $(ROOT)$(nfslockdir)
+               ln -sf nfslock.so.$(NVER) $(ROOT)$(libdir)/nfslock.so
+               ln -sf nfslock.so.$(NVER) $(ROOT)$(libdir)/nfslock.so.0
+                if test "$(ROOT)" = ""; then @LDCONFIG@; fi
+ 
+ clean:
+-- 
+1.7.9.5
diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb b/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb
new file mode 100644
index 0000000000..fa68fd0612
--- /dev/null
+++ b/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb
@@ -0,0 +1,29 @@
+SUMMARY = "File locking library"
+SECTION = "libs"
+LICENSE = "LGPLv2+ & GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=ac284a60d48eaa4bc811cddc377fa341"
+SRC_URI = "${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.09.orig.tar.gz \
+    file://install.patch \
+    file://configure.patch \
+    file://ldflags.patch \
+    file://liblockfile-fix-nfslib-and-soname.patch \
+"
+SRC_URI[md5sum] = "2aa269e4405ee8235ff17d1b357c6ae8"
+SRC_URI[sha256sum] = "16979eba05396365e1d6af7100431ae9d32f9bc063930d1de66298a0695f1b7f"
+inherit autotools
+# set default mailgroup to mail
+# --with-libnfslock specify where to install nfslock.so.NVER
+EXTRA_OECONF = "--enable-shared --enable-static \
+                --with-mailgroup=mail \
+                --with-libnfslock=${libdir} \
+"
+# Makefile using ROOT not DESTDIR
+EXTRA_OEMAKE += "ROOT=${D}"
+FILES_${PN} += "${libdir}/nfslock.so.*"
+FILES_${PN}-dev += "${libdir}/nfslock.so"
diff --git a/meta-oe/recipes-extended/libmodbus/libmodbus_3.0.5.bb b/meta-oe/recipes-extended/libmodbus/libmodbus_3.0.5.bb
new file mode 100644
index 0000000000..19ca24c9bb
--- /dev/null
+++ b/meta-oe/recipes-extended/libmodbus/libmodbus_3.0.5.bb
@@ -0,0 +1,16 @@
+SUMMARY = "A Modbus library"
+DESCRIPTION = "libmodbus is a C library designed to provide a fast and robust \
+implementation of the Modbus protocol. It runs on Linux, Mac OS X, FreeBSD, \
+QNX and Windows."
+HOMEPAGE = "http://www.libmodbus.org/"
+SECTION = "libs"
+LICENSE = "LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c"
+SRC_URI = "http://libmodbus.org/site_media/build/${BP}.tar.gz"
+inherit autotools pkgconfig
+SRC_URI[md5sum] = "18860375a7aa0ca9cba7d6ece54ab666"
+SRC_URI[sha256sum] = "19aad5d55fa315602d6e836a858a3802f1608f9d824afba05fa12a58a1b1e656"
diff --git a/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb b/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb
new file mode 100644
index 0000000000..0142ce7463
--- /dev/null
+++ b/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb
@@ -0,0 +1,17 @@
+SUMMARY = "Libuio - helper library for UIO subsystem"
+SECTION = "base"
+LICENSE = "GPL-2.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
+SRC_URI = "git://git.code.sf.net/p/libuio/code"
+inherit autotools
+SRCREV = "ed4f07ea147ac403c28105ab44d01bbf524d36f9"
+S = "${WORKDIR}/git"
+PACKAGES += "${PN}-tools"
+FILES_${PN} = "${libdir}"
+FILES_${PN}-tools = "${bindir}"
diff --git a/meta-oe/recipes-extended/libungif/libungif_4.1.4.bb b/meta-oe/recipes-extended/libungif/libungif_4.1.4.bb
new file mode 100644
index 0000000000..aa05653846
--- /dev/null
+++ b/meta-oe/recipes-extended/libungif/libungif_4.1.4.bb
@@ -0,0 +1,16 @@
+SUMMARY = "shared library for GIF images"
+SECTION = "libs"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ae11c61b04b2917be39b11f78d71519a"
+SRC_URI = "${SOURCEFORGE_MIRROR}/giflib/libungif-4.x/libungif-${PV}/libungif-${PV}.tar.bz2"
+SRC_URI[md5sum] = "76865bc1bed90ecb5992a1edcc4d6c15"
+SRC_URI[sha256sum] = "708a7eac218d3fd8e8dfb13f1089d4e1e98246985180a17d6ecfca5a6bd4d332"
+inherit autotools lib_package
+PACKAGES =+ "${PN}-utils"
+FILES_${PN}-utils = "${bindir}/*"
+BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-intoverflow.patch b/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-intoverflow.patch
new file mode 100644
index 0000000000..50d915c010
--- /dev/null
+++ b/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-intoverflow.patch
@@ -0,0 +1,31 @@
+http://cvs.fedoraproject.org/viewvc/devel/libwmf/libwmf-0.2.8.4-intoverflow.patch?view=log
+CVE-2006-3376 libwmf integer overflow
+--- libwmf-0.2.8.4.orig/src/player.c    2002-12-10 19:30:26.000000000 +0000
+++ libwmf-0.2.8.4/src/player.c 2006-07-12 15:12:52.000000000 +0100
+@@ -42,6 +42,7 @@
+ #include "player/defaults.h" /* Provides: default settings               */
+ #include "player/record.h"   /* Provides: parameter mechanism            */
+ #include "player/meta.h"     /* Provides: record interpreters            */
+#include <stdint.h>
+ 
+ /**
+  * @internal
+@@ -132,8 +134,14 @@
+                }
+        }
+ 
+-/*     P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)-3) * 2 * sizeof (unsigned char));
+- */    P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)  ) * 2 * sizeof (unsigned char));
+       if (MAX_REC_SIZE(API) > UINT32_MAX / 2)
+       {
+               API->err = wmf_E_InsMem;
+               WMF_DEBUG (API,"bailing...");
+               return (API->err);
+       }
+       
+       P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)  ) * 2 * sizeof (unsigned char));
+ 
+        if (ERR (API))
+        {       WMF_DEBUG (API,"bailing...");
diff --git a/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-useafterfree.patch b/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-useafterfree.patch
new file mode 100644
index 0000000000..4d2d285641
--- /dev/null
+++ b/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-useafterfree.patch
@@ -0,0 +1,14 @@
+http://cvs.fedoraproject.org/viewvc/devel/libwmf/libwmf-0.2.8.4-useafterfree.patch?view=log
+Resolves: CVE-2009-1364
+--- libwmf-0.2.8.4/src/extra/gd/gd_clip.c.CVE-2009-1364-im-clip-list    2009-04-24 04:06:44.000000000 -0400
+++ libwmf-0.2.8.4/src/extra/gd/gd_clip.c       2009-04-24 04:08:30.000000000 -0400
+@@ -70,6 +70,7 @@ void gdClipSetAdd(gdImagePtr im,gdClipRe
+        {       more = gdRealloc (im->clip->list,(im->clip->max + 8) * sizeof (gdClipRectangle));
+                if (more == 0) return;
+                im->clip->max += 8;
+                im->clip->list = more;
+        }
+        im->clip->list[im->clip->count] = (*rect);
+        im->clip->count++;
diff --git a/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb b/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb
new file mode 100644
index 0000000000..53ef81a69a
--- /dev/null
+++ b/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb
@@ -0,0 +1,27 @@
+SUMMARY = "Library for converting WMF files"
+HOMEPAGE = "http://wvware.sourceforge.net/libwmf.html"
+SECTION = "libs"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+PR = "r3"
+DEPENDS_virtclass-native = "libpng-native jpeg-native"
+DEPENDS = "libpng jpeg expat gtk+"
+BBCLASSEXTEND = "native"
+inherit autotools
+SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/${BPN}/${PV}/${BPN}-${PV}.tar.gz;name=tarball \
+           file://libwmf-0.2.8.4-intoverflow.patch \
+           file://libwmf-0.2.8.4-useafterfree.patch"
+SRC_URI[tarball.md5sum] = "d1177739bf1ceb07f57421f0cee191e0"
+SRC_URI[tarball.sha256sum] = "5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8"
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/2.10.0/loaders/.debug"
+FILES_${PN}-dev += "${libdir}/gtk-2.0/2.10.0/loaders/*.la"
+FILES_${PN}-staticdev += "${libdir}/gtk-2.0/2.10.0/loaders/*.a"
+FILES_${PN} += "${libdir}/gtk-2.0/2.10.0/loaders/*.so"
diff --git a/meta-oe/recipes-extended/mml-widget/gtkmathview/mathview-gcc43x.diff b/meta-oe/recipes-extended/mml-widget/gtkmathview/mathview-gcc43x.diff
new file mode 100644
index 0000000000..fcc52c1f4a
--- /dev/null
+++ b/meta-oe/recipes-extended/mml-widget/gtkmathview/mathview-gcc43x.diff
@@ -0,0 +1,63 @@
+--- /tmp/mathVariantAux.cc      2008-07-13 15:56:56.000000000 +0200
+++ gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc       2008-07-13 15:57:46.893198000 +0200
+@@ -20,6 +20,8 @@
+ 
+ #include <cassert>
+ 
+#include <string.h>
+
+ #include "mathVariantAux.hh"
+ 
+ static MathVariantAttributes vattr[] = {
+--- /tmp/T1_FontDataBase.cc     2008-07-13 16:25:24.000000000 +0200
+++ gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc 2008-07-13 16:25:47.123198000 +0200
+@@ -20,6 +20,7 @@
+ #include <config.h>
+ #include <map>
+ #include <string>
+#include <string.h>
+ #include <stdlib.h>
+ #include <iostream>
+ #include <list>
+--- /tmp/SMS.cc 2008-07-13 16:27:23.000000000 +0200
+++ gtkmathview-0.8.0/mathmlsvg/SMS.cc  2008-07-13 16:27:41.543198000 +0200
+@@ -19,6 +19,7 @@
+ #include <config.h>
+ 
+ #include <sstream>
+#include <string.h>
+ #include "defs.h"
+ #include "AbstractLogger.hh"
+ #include "ValueConversion.hh"
+--- /tmp/main.cc        2008-07-13 16:29:11.000000000 +0200
+++ gtkmathview-0.8.0/mathmlsvg/main.cc 2008-07-13 16:29:28.813198000 +0200
+@@ -20,7 +20,7 @@
+ 
+ #include <cassert>
+ #include <fstream>
+-
+#include <string.h>
+ #include <popt.h>
+ 
+ // needed for old versions of GCC, must come before String.hh!
+--- /tmp/main.cc        2008-07-13 16:30:11.000000000 +0200
+++ gtkmathview-0.8.0/mathmlps/main.cc  2008-07-13 16:30:33.183198000 +0200
+@@ -20,7 +20,7 @@
+ 
+ #include <cassert>
+ #include <fstream>
+-
+#include <string.h>
+ #include <popt.h>
+ 
+ // needed for old versions of GCC, must come before String.hh!
+--- gtkmathview-0.8.0.orig/src/common/AbstractLogger.cc 2007-08-17 12:02:45.000000000 +0200
+++ gtkmathview-0.8.0/src/common/AbstractLogger.cc      2010-02-01 10:19:46.000000000 +0100
+@@ -19,6 +19,7 @@
+ #include <config.h>
+ 
+ #include <stdarg.h>
+#include <stdio.h>
+ 
+ #include "AbstractLogger.hh"
+ 
diff --git a/meta-oe/recipes-extended/mml-widget/gtkmathview/mathview-gcc47x.diff b/meta-oe/recipes-extended/mml-widget/gtkmathview/mathview-gcc47x.diff
new file mode 100644
index 0000000000..11b7260045
--- /dev/null
+++ b/meta-oe/recipes-extended/mml-widget/gtkmathview/mathview-gcc47x.diff
@@ -0,0 +1,48 @@
+../../../src/frontend/common/TemplateBuilder.hh:50:113: warning: 'linkerAssoc' was not declared in this scope, and no declarations were found by argument-dependent lookup at the point of instantiation [-fpermissive]
+../../../src/frontend/common/TemplateBuilder.hh:50:113: note: declarations in dependent base 'custom_reader_Builder' are not found by unqualified lookup
+../../../src/frontend/common/TemplateBuilder.hh:50:113: note: use 'this->linkerAssoc' instead
+../../../src/frontend/common/TemplateBuilder.hh:54:111: error: redeclaration of 'SmartPtr<BoxMLDecorElement> elem'
+../../../src/frontend/common/TemplateBuilder.hh:50:49: error: 'SmartPtr<BoxMLDecorElement> elem' previously declared here
+../../../src/frontend/common/TemplateBuilder.hh:55:2: warning: 'linkerAdd' was not declared in this scope, and no declarations were found by argument-dependent lookup at the point of instantiation [-fpermissive]
+../../../src/frontend/common/TemplateBuilder.hh:55:2: note: declarations in dependent base 'custom_reader_Builder' are not found by unqualified lookup
+../../../src/frontend/common/TemplateBuilder.hh:55:2: note: use 'this->linkerAdd' instead
+--- gtkmathview-0.8.0.orig/src/frontend/common/TemplateBuilder.hh       2007-08-17 12:02:34.000000000 +0200
+++ gtkmathview-0.8.0/src/frontend/common/TemplateBuilder.hh    2012-04-30 11:45:07.000000000 +0200
+@@ -47,12 +47,13 @@
+   SmartPtr<typename ElementBuilder::type>
+   getElement(const typename Model::Element& el) const
+   {
+-    if (SmartPtr<typename ElementBuilder::type> elem = smart_cast<typename ElementBuilder::type>(linkerAssoc(el)))
+    SmartPtr<typename ElementBuilder::type> elem = NULL;
+    if (elem = smart_cast<typename ElementBuilder::type>(this->linkerAssoc(el)))
+       return elem;
+     else
+       {
+-       SmartPtr<typename ElementBuilder::type> elem = ElementBuilder::type::create(ElementBuilder::getContext(*this));
+-       linkerAdd(el, elem);
+       elem = ElementBuilder::type::create(ElementBuilder::getContext(*this));
+       this->linkerAdd(el, elem);
+        return elem;
+       }
+   }
+--- gtkmathview-0.8.0.orig/mathmlsvg/main.cc    2012-04-30 11:35:19.000000000 +0200
+++ gtkmathview-0.8.0/mathmlsvg/main.cc 2012-04-30 11:51:19.000000000 +0200
+@@ -20,6 +20,7 @@
+ 
+ #include <cassert>
+ #include <fstream>
+#include <unistd.h>
+ #include <string.h>
+ #include <popt.h>
+ 
+--- gtkmathview-0.8.0.orig/mathmlps/main.cc     2012-04-30 11:35:19.000000000 +0200
+++ gtkmathview-0.8.0/mathmlps/main.cc  2012-04-30 11:50:57.000000000 +0200
+@@ -20,6 +20,7 @@
+ 
+ #include <cassert>
+ #include <fstream>
+#include <unistd.h>
+ #include <string.h>
+ #include <popt.h>
+ 
diff --git a/meta-oe/recipes-extended/mml-widget/gtkmathview/qualify-lookup.diff b/meta-oe/recipes-extended/mml-widget/gtkmathview/qualify-lookup.diff
new file mode 100644
index 0000000000..1d48950451
--- /dev/null
+++ b/meta-oe/recipes-extended/mml-widget/gtkmathview/qualify-lookup.diff
@@ -0,0 +1,13 @@
+Index: gtkmathview-0.8.0/src/frontend/common/TemplateElementIterator.hh
+===================================================================
+--- gtkmathview-0.8.0.orig/src/frontend/common/TemplateElementIterator.hh
+++ gtkmathview-0.8.0/src/frontend/common/TemplateElementIterator.hh
+@@ -43,7 +43,7 @@ protected:
+   findValidNodeForward(const typename Model::Node& p0) const
+   {
+     for (typename Model::Node p = p0; p; p = Model::getNextSibling(p))
+-      if (valid(p)) return Model::asElement(p);
+      if (this->valid(p)) return Model::asElement(p);
+     return typename Model::Element();
+   }
+     
diff --git a/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb b/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb
new file mode 100644
index 0000000000..95deb37259
--- /dev/null
+++ b/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb
@@ -0,0 +1,21 @@
+HOMEPAGE = "http://helm.cs.unibo.it/mml-widget/"
+DEPENDS = "t1lib gtk+ popt libxslt libxml2"
+LICENSE = "LGPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
+PR = "r3"
+SRC_URI = "http://helm.cs.unibo.it/mml-widget/sources/${P}.tar.gz \
+           file://mathview-gcc43x.diff \
+           file://mathview-gcc47x.diff \
+           file://qualify-lookup.diff \
+"
+SRC_URI[md5sum] = "b53564e553728d4b69f7d366dfeb5299"
+SRC_URI[sha256sum] = "1dc30175da6a3c560a7d62d1abe1c2f9829d988e6f1a7c5e766544575c558c43"
+inherit autotools-brokensep
+do_configure_prepend() {
+    sed -i -e s:AM_BINRELOC::g ${S}/configure.ac
+}
diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch b/meta-oe/recipes-extended/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch
new file mode 100644
index 0000000000..bc141d9d57
--- /dev/null
+++ b/meta-oe/recipes-extended/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch
@@ -0,0 +1,35 @@
+From 0a61b0b98c152f10404ccbdeeac583a486638a7a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Thu, 6 Jun 2013 18:36:01 +0200
+Subject: [PATCH] js.pc.in: do not include RequiredDefines.h for depending
+ packages
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+in our cross environment the would fail with:
+| cc1: fatal error: /usr/include/js-17.0/js/RequiredDefines.h: No such file or directory
+and currently it only defines __STDC_LIMIT_MACROS
+Upstream-Status: Inappropriate [embedded specific]
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ js.pc.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+diff --git a/js.pc.in b/js.pc.in
+index 13d761d..a95a7bd 100644
+--- a/js.pc.in
+++ b/js.pc.in
+@@ -8,4 +8,4 @@ Description: The Mozilla library for JavaScript
+ Version: @MOZILLA_VERSION@
+ Requires.private: @NSPR_PKGCONF_CHECK@
+ Libs: -L${libdir} -l@LIBRARY_NAME@
+-Cflags: -include ${includedir}/@MODULE@/js/RequiredDefines.h -I${includedir}/@MODULE@
+Cflags: -I${includedir}/@MODULE@
+-- 
+1.7.6.5
diff --git a/meta-oe/recipes-extended/mozjs/mozjs_17.0.0.bb b/meta-oe/recipes-extended/mozjs/mozjs_17.0.0.bb
new file mode 100644
index 0000000000..1af1fa6f72
--- /dev/null
+++ b/meta-oe/recipes-extended/mozjs/mozjs_17.0.0.bb
@@ -0,0 +1,36 @@
+SUMMARY = "SpiderMonkey is Mozilla's JavaScript engine written in C/C++"
+LICENSE = "MPL-2.0"
+LIC_FILES_CHKSUM = "file://../../LICENSE;md5=815ca599c9df247a0c7f619bab123dad"
+SRC_URI = " \
+    http://ftp.mozilla.org/pub/mozilla.org/js/${PN}${PV}.tar.gz \
+    file://0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch \
+"
+SRC_URI[md5sum] = "20b6f8f1140ef6e47daa3b16965c9202"
+SRC_URI[sha256sum] = "321e964fe9386785d3bf80870640f2fa1c683e32fe988eeb201b04471c172fba"
+S = "${WORKDIR}/${PN}${PV}/js/src"
+inherit autotools pkgconfig perlnative
+DEPENDS += "nspr"
+# nspr's package-config is ignored so set libs manually
+EXTRA_OECONF = " \
+    --target=${TARGET_SYS} \
+    --host=${BUILD_SYS} \
+    --build=${BUILD_SYS} \
+    --prefix=${prefix} \
+    --with-nspr-libs='-lplds4 -lplc4 -lnspr4' \
+    --enable-threadsafe \
+    --libdir=${libdir} \
+"
+# mozjs requires autoreconf 2.13
+do_configure() {
+    ${S}/configure ${EXTRA_OECONF}
+}
+PACKAGES =+ "lib${PN}"
+FILES_lib${PN} += "${libdir}/lib*.so"
+FILES_${PN}-dev += "${bindir}/js17-config"
diff --git a/meta-oe/recipes-extended/polkit/files/50-org.freedesktop.NetworkManager.rules b/meta-oe/recipes-extended/polkit/files/50-org.freedesktop.NetworkManager.rules
new file mode 100644
index 0000000000..4b50cf8814
--- /dev/null
+++ b/meta-oe/recipes-extended/polkit/files/50-org.freedesktop.NetworkManager.rules
@@ -0,0 +1,8 @@
+/* give group 'network' rights to change settings */
+/* taken from https://wiki.archlinux.org/index.php/NetworkManager#Set_up_PolicyKit_permissions */
+polkit.addRule(function(action, subject) {
+  if (action.id.indexOf("org.freedesktop.NetworkManager.") == 0 && subject.isInGroup("network")) {
+    return polkit.Result.YES;
+  }
+});
diff --git a/meta-oe/recipes-extended/polkit/files/50-org.freedesktop.timedate1.rules b/meta-oe/recipes-extended/polkit/files/50-org.freedesktop.timedate1.rules
new file mode 100644
index 0000000000..95b0e0f698
--- /dev/null
+++ b/meta-oe/recipes-extended/polkit/files/50-org.freedesktop.timedate1.rules
@@ -0,0 +1,8 @@
+/* give group 'datetime' rights to change settings */
+/* based upon http://lists.freedesktop.org/archives/systemd-devel/2013-March/009576.html */
+polkit.addRule(function(action, subject) {
+  if (action.id.indexOf("org.freedesktop.timedate1.") == 0 && subject.isInGroup("datetime")) {
+    return polkit.Result.YES;
+  }
+});
diff --git a/meta-oe/recipes-extended/polkit/polkit-gnome_0.102.bb b/meta-oe/recipes-extended/polkit/polkit-gnome_0.102.bb
new file mode 100644
index 0000000000..df5c9a38ad
--- /dev/null
+++ b/meta-oe/recipes-extended/polkit/polkit-gnome_0.102.bb
@@ -0,0 +1,26 @@
+SUMMARY = "GNOME Authentication Agent for PolicyKit"
+DESCRIPTION = "PolicyKit-gnome provides an Authentication Agent for PolicyKit that integrates well with the GNOME desktop environment"
+HOMEPAGE = "http://www.packagekit.org/"
+BUGTRACKER = "http://bugzilla.gnome.org/"
+DEPENDS = "polkit dbus-glib gconf gtk+"
+LICENSE = "LGPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=74579fab173e4c5e12aac0cd83ee98ec \
+                    file://src/main.c;beginline=1;endline=20;md5=aba145d1802f2329ba561e3e48ecb795"
+SRC_URI = "http://hal.freedesktop.org/releases/polkit-gnome-${PV}.tar.bz2 \
+"
+PR = "r2"
+EXTRA_OECONF = " --disable-scrollkeeper \
+                 --disable-man-pages \
+                 --disable-examples \
+                 --disable-introspection "
+inherit autotools gtk-doc pkgconfig
+FILES_${PN} += " ${datadir}/dbus-1 \
+                 ${datadir}/PolicyKit \
+"
+SRC_URI[md5sum] = "f6b485ffd7bd605af815fd2747180481"
+SRC_URI[sha256sum] = "81caa6972e651e90ef4ac31d7ed41bc79543d46b850dbd5b14b40f8ef7107d11"
diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb b/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb
new file mode 100644
index 0000000000..eced4b6de6
--- /dev/null
+++ b/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Create usergroup datetime. All members off this group are allowed set date/time/timezone via system dbus"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690"
+require polkit-group-rule.inc
+SRC_URI = "file://50-org.freedesktop.timedate1.rules"
+do_install() {
+        install -m 0755 ${WORKDIR}/50-org.freedesktop.timedate1.rules ${D}${sysconfdir}/polkit-1/rules.d
+}
+USERADD_PACKAGES = "${PN}"
+GROUPADD_PARAM_${PN} = "--system datetime"
diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb b/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb
new file mode 100644
index 0000000000..551ed3eb8c
--- /dev/null
+++ b/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Create usergroup network. All members off this group are allowed to modify networkmanager settings"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690"
+require polkit-group-rule.inc
+SRC_URI = "file://50-org.freedesktop.NetworkManager.rules"
+do_install() {
+        install -m 0755 ${WORKDIR}/50-org.freedesktop.NetworkManager.rules ${D}${sysconfdir}/polkit-1/rules.d
+}
+USERADD_PACKAGES = "${PN}"
+GROUPADD_PARAM_${PN} = "--system network"
diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule.inc b/meta-oe/recipes-extended/polkit/polkit-group-rule.inc
new file mode 100644
index 0000000000..8d1a89aa3e
--- /dev/null
+++ b/meta-oe/recipes-extended/polkit/polkit-group-rule.inc
@@ -0,0 +1,9 @@
+# polkit must prepare polkid group
+DEPENDS += "polkit"
+inherit allarch useradd
+do_install_prepend() {
+    install -m 700 -d ${D}${sysconfdir}/polkit-1/rules.d
+    chown polkitd:polkitd ${D}${sysconfdir}/polkit-1/rules.d
+}
diff --git a/meta-oe/recipes-extended/polkit/polkit/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch b/meta-oe/recipes-extended/polkit/polkit/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch
new file mode 100644
index 0000000000..b9334a8fdf
--- /dev/null
+++ b/meta-oe/recipes-extended/polkit/polkit/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch
@@ -0,0 +1,39 @@
+From 56cadbc45c5ef98a7b775638d2109c4a09a58c06 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Sat, 22 Feb 2014 18:09:57 +0100
+Subject: [PATCH] configure.ac: Check only for libsystemd not libsystemd-login
+* they were merged into libsystemd in systemd-209
+Upstream-Status: Pending (it would need to be conditional on systemd version for upstream to accept this)
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/configure.ac b/configure.ac
+index a7b0148..64d513d 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -196,7 +196,7 @@ AC_ARG_ENABLE([libsystemd-login],
+               [enable_libsystemd_login=auto])
+ if test "$enable_libsystemd_login" != "no"; then
+   PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN,
+-                    [libsystemd-login],
+                    [libsystemd],
+                     have_libsystemd_login=yes,
+                     have_libsystemd_login=no)
+   if test "$have_libsystemd_login" = "yes"; then
+@@ -223,7 +223,7 @@ AS_IF([test "x$cross_compiling" != "xyes" ], [
+       AS_IF([test "$enable_libsystemd_login" = "no" ], [
+         AC_MSG_WARN([ConsoleKit requested but system appears to use systemd])
+       ], [
+-        AC_MSG_ERROR([ConsoleKit autoconfigured, but systemd is in use (missing libsystemd-login pkg-config?)])
+        AC_MSG_ERROR([ConsoleKit autoconfigured, but systemd is in use (missing libsystemd pkg-config?)])
+       ])
+     ])
+   ])
+-- 
+1.8.5.3
diff --git a/meta-oe/recipes-extended/polkit/polkit/polkit-1_pam.patch b/meta-oe/recipes-extended/polkit/polkit/polkit-1_pam.patch
new file mode 100644
index 0000000000..74647efce4
--- /dev/null
+++ b/meta-oe/recipes-extended/polkit/polkit/polkit-1_pam.patch
@@ -0,0 +1,23 @@
+polkit: No system-auth in OE-Core, we can use common-* in place of it.
+Upstream-Status:Inappropriate [configuration]
+Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
+--- a/configure.ac      2011-03-04 02:26:20.000000000 +0800
+++ b/configure.ac.new  2011-07-18 10:14:12.516818852 +0800
+@@ -350,10 +350,10 @@
+     PAM_FILE_INCLUDE_PASSWORD=system
+     PAM_FILE_INCLUDE_SESSION=system
+ else
+-   PAM_FILE_INCLUDE_AUTH=system-auth
+-   PAM_FILE_INCLUDE_ACCOUNT=system-auth
+-   PAM_FILE_INCLUDE_PASSWORD=system-auth
+-   PAM_FILE_INCLUDE_SESSION=system-auth
+   PAM_FILE_INCLUDE_AUTH=common-auth
+   PAM_FILE_INCLUDE_ACCOUNT=common-account
+   PAM_FILE_INCLUDE_PASSWORD=common-password
+   PAM_FILE_INCLUDE_SESSION=common-session
+ fi
+ 
+ AC_SUBST(PAM_FILE_INCLUDE_AUTH)
diff --git a/meta-oe/recipes-extended/polkit/polkit_0.111.bb b/meta-oe/recipes-extended/polkit/polkit_0.111.bb
new file mode 100644
index 0000000000..4614387055
--- /dev/null
+++ b/meta-oe/recipes-extended/polkit/polkit_0.111.bb
@@ -0,0 +1,61 @@
+SUMMARY = "PolicyKit Authorization Framework"
+DESCRIPTION = "The polkit package is an application-level toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes."
+HOMEPAGE = "http://www.freedesktop.org/wiki/Software/polkit"
+LICENSE = "LGPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \
+                    file://src/polkit/polkit.h;beginline=1;endline=20;md5=0a8630b0133176d0504c87a0ded39db4"
+DEPENDS = "expat glib-2.0 intltool-native gobject-introspection-stub mozjs"
+inherit autotools gtk-doc pkgconfig useradd systemd
+PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
+                 ${@base_contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}"
+PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=shadow,libpam,libpam"
+PACKAGECONFIG[systemd] = "--enable-libsystemd-login=yes --with-systemdsystemunitdir=${systemd_unitdir}/system/,--enable-libsystemd-login=no --with-systemdsystemunitdir=,systemd"
+# there is no --enable/--disable option for consolekit and it's not picked by shlibs, so add it to RDEPENDS
+PACKAGECONFIG[consolekit] = ",,,consolekit"
+PAM_SRC_URI = "file://polkit-1_pam.patch"
+SRC_URI = "http://www.freedesktop.org/software/polkit/releases/polkit-${PV}.tar.gz \
+           ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
+           file://0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch \
+"
+SRC_URI[md5sum] = "81b116edf986d8e13502929a171f4e0d"
+SRC_URI[sha256sum] = "02ae544547211b687818c97bcbf19bf6b8b5be7fda93000525a8765c7bed1ea1"
+EXTRA_OECONF = "--with-os-type=moblin --disable-man-pages --disable-introspection"
+do_install_append() {
+    # see configure.log for more details
+    chown root:root ${D}${libdir}/${BPN}-1/polkit-agent-helper-1
+    chmod 4755 ${D}${libdir}/${BPN}-1/polkit-agent-helper-1
+    chown root:root ${D}${bindir}/pkexec
+    chmod 4755 ${D}${bindir}/pkexec
+    chown polkitd:polkitd ${D}${sysconfdir}/${BPN}-1/rules.d
+    chmod 700 ${D}${sysconfdir}/${BPN}-1/rules.d
+    chown polkitd:polkitd ${D}${datadir}/${BPN}-1/rules.d
+    chmod 700 ${D}${datadir}/${BPN}-1/rules.d
+}
+PACKAGES =+ "${PN}-examples"
+FILES_${PN} += " \
+    ${libdir}/${BPN}-1 \
+    ${datadir}/dbus-1 \
+    ${datadir}/${BPN}-1 \
+"
+FILES_${PN}-dbg += "${libdir}/${BPN}-1/.debug"
+FILES_${PN}-examples = "${bindir}/*example*"
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM_${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/${BPN}-1 polkitd"
+SYSTEMD_SERVICE_${PN} = "${BPN}.service"
+SYSTEMD_AUTO_ENABLE = "disable"
diff --git a/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch b/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch
new file mode 100644
index 0000000000..8135fc28e3
--- /dev/null
+++ b/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch
@@ -0,0 +1,29 @@
+From dc745a33f3875cc72d41bd34ed490b352e546352 Mon Sep 17 00:00:00 2001
+From: Venture Research <tech@ventureresearch.com>
+Date: Fri, 8 Feb 2013 17:39:52 -0600
+Subject: [PATCH] hiredis: use default CC if it is set
+Instead of trying to automagically figure out CC, which breaks with OE
+as CC has spaces in it, just skip it if one was already passed in.
+Signed-off-by: Venture Research <tech@ventureresearch.com>
+---
+ deps/hiredis/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile
+index 16b8767..0b27c82 100644
+--- a/deps/hiredis/Makefile
+++ b/deps/hiredis/Makefile
+@@ -11,7 +11,7 @@ HIREDIS_MAJOR=0
+ HIREDIS_MINOR=10
+ 
+ # Fallback to gcc when $CC is not in $PATH.
+-CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
+CC?=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
+ OPTIMIZATION?=-O3
+ WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings
+ DEBUG?= -g -ggdb
+-- 
+1.8.1.2
diff --git a/meta-oe/recipes-extended/redis/redis/init-redis-server b/meta-oe/recipes-extended/redis/redis/init-redis-server
new file mode 100755
index 0000000000..6014d70c0e
--- /dev/null
+++ b/meta-oe/recipes-extended/redis/redis/init-redis-server
@@ -0,0 +1,40 @@
+#!/bin/sh
+#
+### BEGIN INIT INFO
+# Provides:          redis-server
+# Required-Start:    $network
+# Required-Stop:     $network
+# Default-Start:     S 2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Redis, a key-value store
+# Description:       Redis is an open source, advanced key-value store.
+#                    http://redis.io
+### END INIT INFO
+test -f /usr/bin/redis-server || exit 0
+ARGS="/etc/redis/redis.conf"
+case "$1" in
+    start)
+        echo "Starting redis-server..."
+        start-stop-daemon --start --quiet --exec /usr/bin/redis-server -- $ARGS
+        ;;
+    stop)
+        echo "Stopping redis-server..."
+        start-stop-daemon --stop --quiet --exec /usr/bin/redis-server
+        ;;
+    restart)
+        echo "Stopping redis-server..."
+        start-stop-daemon --stop --quiet --exec /usr/bin/redis-server
+        echo "Starting redis-server..."
+        start-stop-daemon --start --quiet --exec /usr/bin/redis-server -- $ARGS
+        ;;
+    *)
+        echo "Usage: /etc/init.d/redis-server {start|stop|restart}"
+        exit 1
+        ;;
+esac
+exit 0
diff --git a/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch b/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch
new file mode 100644
index 0000000000..c4d1bc493b
--- /dev/null
+++ b/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch
@@ -0,0 +1,54 @@
+From 394108035d350ae662a431c80131f812b5f72dff Mon Sep 17 00:00:00 2001
+From: Venture Research <tech@ventureresearch.com>
+Date: Fri, 8 Feb 2013 20:22:19 -0600
+Subject: [PATCH] lua: update Makefile to use environment build settings
+OE-specific parameters, instead of overriding all of these simply use
+the ones that are already passed in. Also configure for only Linux...
+Signed-off-by: Venture Research <tech@ventureresearch.com>
+---
+ deps/lua/src/Makefile | 18 +++++++-----------
+ 1 file changed, 7 insertions(+), 11 deletions(-)
+diff --git a/deps/lua/src/Makefile b/deps/lua/src/Makefile
+index 77d6a48..888d0da 100644
+--- a/deps/lua/src/Makefile
+++ b/deps/lua/src/Makefile
+@@ -5,18 +5,14 @@
+ # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT =======================
+ 
+ # Your platform. See PLATS for possible values.
+-PLAT= none
+PLAT= linux
+ 
+-CC= gcc
+-CFLAGS= -O2 -Wall $(MYCFLAGS)
+-AR= ar rcu
+-RANLIB= ranlib
+-RM= rm -f
+-LIBS= -lm $(MYLIBS)
+-
+-MYCFLAGS=
+MYCFLAGS=-DLUA_USE_LINUX
+ MYLDFLAGS=
+-MYLIBS=
+MYLIBS=-Wl,-E -ldl -lreadline -lhistory -lncurses
+
+CFLAGS += $(MYCFLAGS)
+LIBS += -lm $(MYLIBS)
+ 
+ # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
+ 
+@@ -48,7 +44,7 @@ o:    $(ALL_O)
+ a:     $(ALL_A)
+ 
+ $(LUA_A): $(CORE_O) $(LIB_O)
+-       $(AR) $@ $?
+       $(AR) rcu $@ $?
+        $(RANLIB) $@
+ 
+ $(LUA_T): $(LUA_O) $(LUA_A)
+-- 
+1.8.1.2
diff --git a/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch b/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch
new file mode 100644
index 0000000000..b89c871290
--- /dev/null
+++ b/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch
@@ -0,0 +1,33 @@
+From f8861d2129b9e18bba137705bfa38c6bd9be1790 Mon Sep 17 00:00:00 2001
+From: Venture Research <tech@ventureresearch.com>
+Date: Wed, 6 Feb 2013 20:51:02 -0600
+Subject: [PATCH] hack to force use of libc malloc
+Hack to force libc usage as it seems the option to pass it in has been
+removed in favor of magic.
+Note that this of course doesn't allow tcmalloc and jemalloc, however 
+jemalloc wasn't building correctly.
+Signed-off-by: Venture Research <tech@ventureresearch.com>
+---
+ src/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/src/Makefile b/src/Makefile
+index 204a271..91b307d 100644
+--- a/src/Makefile
+++ b/src/Makefile
+@@ -13,7 +13,8 @@
+ # Just use 'make dep', but this is only needed by developers.
+ 
+ release_hdr := $(shell sh -c './mkreleasehdr.sh')
+-uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
+# use fake uname option to force use of generic libc
+uname_S := "USE_LIBC_MALLOC"
+ OPTIMIZATION?=-O2
+ DEPENDENCY_TARGETS=hiredis linenoise lua
+ 
+-- 
+1.8.1.2
diff --git a/meta-oe/recipes-extended/redis/redis/redis.conf b/meta-oe/recipes-extended/redis/redis/redis.conf
new file mode 100644
index 0000000000..923b98e5c8
--- /dev/null
+++ b/meta-oe/recipes-extended/redis/redis/redis.conf
@@ -0,0 +1,550 @@
+# Redis configuration file example
+# Note on units: when memory size is needed, it is possible to specify
+# it in the usual form of 1k 5GB 4M and so forth:
+#
+# 1k => 1000 bytes
+# 1kb => 1024 bytes
+# 1m => 1000000 bytes
+# 1mb => 1024*1024 bytes
+# 1g => 1000000000 bytes
+# 1gb => 1024*1024*1024 bytes
+#
+# units are case insensitive so 1GB 1Gb 1gB are all the same.
+# By default Redis does not run as a daemon. Use 'yes' if you need it.
+# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
+#
+# OE: run as a daemon.
+#
+daemonize yes
+# When running daemonized, Redis writes a pid file in /var/run/redis.pid by
+# default. You can specify a custom pid file location here.
+pidfile /var/run/redis.pid
+# Accept connections on the specified port, default is 6379.
+# If port 0 is specified Redis will not listen on a TCP socket.
+port 6379
+# If you want you can bind a single interface, if the bind option is not
+# specified all the interfaces will listen for incoming connections.
+#
+# bind 127.0.0.1
+# Specify the path for the unix socket that will be used to listen for
+# incoming connections. There is no default, so Redis will not listen
+# on a unix socket when not specified.
+#
+# unixsocket /tmp/redis.sock
+# unixsocketperm 755
+# Close the connection after a client is idle for N seconds (0 to disable)
+timeout 0
+# Set server verbosity to 'debug'
+# it can be one of:
+# debug (a lot of information, useful for development/testing)
+# verbose (many rarely useful info, but not a mess like the debug level)
+# notice (moderately verbose, what you want in production probably)
+# warning (only very important / critical messages are logged)
+loglevel notice
+# Specify the log file name. Also 'stdout' can be used to force
+# Redis to log on the standard output. Note that if you use standard
+# output for logging but daemonize, logs will be sent to /dev/null
+logfile /var/log/redis.log
+# To enable logging to the system logger, just set 'syslog-enabled' to yes,
+# and optionally update the other syslog parameters to suit your needs.
+# syslog-enabled no
+# Specify the syslog identity.
+# syslog-ident redis
+# Specify the syslog facility.  Must be USER or between LOCAL0-LOCAL7.
+# syslog-facility local0
+# Set the number of databases. The default database is DB 0, you can select
+# a different one on a per-connection basis using SELECT <dbid> where
+# dbid is a number between 0 and 'databases'-1
+databases 16
+################################ SNAPSHOTTING  #################################
+#
+# Save the DB on disk:
+#
+#   save <seconds> <changes>
+#
+#   Will save the DB if both the given number of seconds and the given
+#   number of write operations against the DB occurred.
+#
+#   In the example below the behaviour will be to save:
+#   after 900 sec (15 min) if at least 1 key changed
+#   after 300 sec (5 min) if at least 10 keys changed
+#   after 60 sec if at least 10000 keys changed
+#
+#   Note: you can disable saving at all commenting all the "save" lines.
+#
+#   It is also possible to remove all the previously configured save
+#   points by adding a save directive with a single empty string argument
+#   like in the following example:
+#
+#   save ""
+#save 900 1
+#save 300 10
+#save 60 10000
+# OE: tune for a small embedded system with a limited # of keys.
+save 120 1
+save 60 100
+save 30 1000
+# By default Redis will stop accepting writes if RDB snapshots are enabled
+# (at least one save point) and the latest background save failed.
+# This will make the user aware (in an hard way) that data is not persisting
+# on disk properly, otherwise chances are that no one will notice and some
+# distater will happen.
+#
+# If the background saving process will start working again Redis will
+# automatically allow writes again.
+#
+# However if you have setup your proper monitoring of the Redis server
+# and persistence, you may want to disable this feature so that Redis will
+# continue to work as usually even if there are problems with disk,
+# permissions, and so forth.
+stop-writes-on-bgsave-error yes
+# Compress string objects using LZF when dump .rdb databases?
+# For default that's set to 'yes' as it's almost always a win.
+# If you want to save some CPU in the saving child set it to 'no' but
+# the dataset will likely be bigger if you have compressible values or keys.
+rdbcompression yes
+# Since verison 5 of RDB a CRC64 checksum is placed at the end of the file.
+# This makes the format more resistant to corruption but there is a performance
+# hit to pay (around 10%) when saving and loading RDB files, so you can disable it
+# for maximum performances.
+#
+# RDB files created with checksum disabled have a checksum of zero that will
+# tell the loading code to skip the check.
+rdbchecksum yes
+# The filename where to dump the DB
+dbfilename dump.rdb
+# The working directory.
+#
+# The DB will be written inside this directory, with the filename specified
+# above using the 'dbfilename' configuration directive.
+# 
+# Also the Append Only File will be created inside this directory.
+# 
+# Note that you must specify a directory here, not a file name.
+dir /var/lib/redis/
+################################# REPLICATION #################################
+# Master-Slave replication. Use slaveof to make a Redis instance a copy of
+# another Redis server. Note that the configuration is local to the slave
+# so for example it is possible to configure the slave to save the DB with a
+# different interval, or to listen to another port, and so on.
+#
+# slaveof <masterip> <masterport>
+# If the master is password protected (using the "requirepass" configuration
+# directive below) it is possible to tell the slave to authenticate before
+# starting the replication synchronization process, otherwise the master will
+# refuse the slave request.
+#
+# masterauth <master-password>
+# When a slave lost the connection with the master, or when the replication
+# is still in progress, the slave can act in two different ways:
+#
+# 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will
+#    still reply to client requests, possibly with out of date data, or the
+#    data set may just be empty if this is the first synchronization.
+#
+# 2) if slave-serve-stale data is set to 'no' the slave will reply with
+#    an error "SYNC with master in progress" to all the kind of commands
+#    but to INFO and SLAVEOF.
+#
+slave-serve-stale-data yes
+# You can configure a slave instance to accept writes or not. Writing against
+# a slave instance may be useful to store some ephemeral data (because data
+# written on a slave will be easily deleted after resync with the master) but
+# may also cause problems if clients are writing to it because of a
+# misconfiguration.
+#
+# Since Redis 2.6 by default slaves are read-only.
+#
+# Note: read only slaves are not designed to be exposed to untrusted clients
+# on the internet. It's just a protection layer against misuse of the instance.
+# Still a read only slave exports by default all the administrative commands
+# such as CONFIG, DEBUG, and so forth. To a limited extend you can improve
+# security of read only slaves using 'rename-command' to shadow all the
+# administrative / dangerous commands.
+slave-read-only yes
+# Slaves send PINGs to server in a predefined interval. It's possible to change
+# this interval with the repl_ping_slave_period option. The default value is 10
+# seconds.
+#
+# repl-ping-slave-period 10
+# The following option sets a timeout for both Bulk transfer I/O timeout and
+# master data or ping response timeout. The default value is 60 seconds.
+#
+# It is important to make sure that this value is greater than the value
+# specified for repl-ping-slave-period otherwise a timeout will be detected
+# every time there is low traffic between the master and the slave.
+#
+# repl-timeout 60
+# The slave priority is an integer number published by Redis in the INFO output.
+# It is used by Redis Sentinel in order to select a slave to promote into a
+# master if the master is no longer working correctly.
+#
+# A slave with a low priority number is considered better for promotion, so
+# for instance if there are three slaves with priority 10, 100, 25 Sentinel will
+# pick the one wtih priority 10, that is the lowest.
+#
+# However a special priority of 0 marks the slave as not able to perform the
+# role of master, so a slave with priority of 0 will never be selected by
+# Redis Sentinel for promotion.
+#
+# By default the priority is 100.
+slave-priority 100
+################################## SECURITY ###################################
+# Require clients to issue AUTH <PASSWORD> before processing any other
+# commands.  This might be useful in environments in which you do not trust
+# others with access to the host running redis-server.
+#
+# This should stay commented out for backward compatibility and because most
+# people do not need auth (e.g. they run their own servers).
+# 
+# Warning: since Redis is pretty fast an outside user can try up to
+# 150k passwords per second against a good box. This means that you should
+# use a very strong password otherwise it will be very easy to break.
+#
+# requirepass foobared
+# Command renaming.
+#
+# It is possible to change the name of dangerous commands in a shared
+# environment. For instance the CONFIG command may be renamed into something
+# of hard to guess so that it will be still available for internal-use
+# tools but not available for general clients.
+#
+# Example:
+#
+# rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52
+#
+# It is also possible to completely kill a command renaming it into
+# an empty string:
+#
+# rename-command CONFIG ""
+################################### LIMITS ####################################
+# Set the max number of connected clients at the same time. By default
+# this limit is set to 10000 clients, however if the Redis server is not
+# able ot configure the process file limit to allow for the specified limit
+# the max number of allowed clients is set to the current file limit
+# minus 32 (as Redis reserves a few file descriptors for internal uses).
+#
+# Once the limit is reached Redis will close all the new connections sending
+# an error 'max number of clients reached'.
+#
+# maxclients 10000
+# Don't use more memory than the specified amount of bytes.
+# When the memory limit is reached Redis will try to remove keys
+# accordingly to the eviction policy selected (see maxmemmory-policy).
+#
+# If Redis can't remove keys according to the policy, or if the policy is
+# set to 'noeviction', Redis will start to reply with errors to commands
+# that would use more memory, like SET, LPUSH, and so on, and will continue
+# to reply to read-only commands like GET.
+#
+# This option is usually useful when using Redis as an LRU cache, or to set
+# an hard memory limit for an instance (using the 'noeviction' policy).
+#
+# WARNING: If you have slaves attached to an instance with maxmemory on,
+# the size of the output buffers needed to feed the slaves are subtracted
+# from the used memory count, so that network problems / resyncs will
+# not trigger a loop where keys are evicted, and in turn the output
+# buffer of slaves is full with DELs of keys evicted triggering the deletion
+# of more keys, and so forth until the database is completely emptied.
+#
+# In short... if you have slaves attached it is suggested that you set a lower
+# limit for maxmemory so that there is some free RAM on the system for slave
+# output buffers (but this is not needed if the policy is 'noeviction').
+#
+# maxmemory <bytes>
+# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
+# is reached? You can select among five behavior:
+# 
+# volatile-lru -> remove the key with an expire set using an LRU algorithm
+# allkeys-lru -> remove any key accordingly to the LRU algorithm
+# volatile-random -> remove a random key with an expire set
+# allkeys-random -> remove a random key, any key
+# volatile-ttl -> remove the key with the nearest expire time (minor TTL)
+# noeviction -> don't expire at all, just return an error on write operations
+# 
+# Note: with all the kind of policies, Redis will return an error on write
+#       operations, when there are not suitable keys for eviction.
+#
+#       At the date of writing this commands are: set setnx setex append
+#       incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd
+#       sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby
+#       zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby
+#       getset mset msetnx exec sort
+#
+# The default is:
+#
+# maxmemory-policy volatile-lru
+# LRU and minimal TTL algorithms are not precise algorithms but approximated
+# algorithms (in order to save memory), so you can select as well the sample
+# size to check. For instance for default Redis will check three keys and
+# pick the one that was used less recently, you can change the sample size
+# using the following configuration directive.
+#
+# maxmemory-samples 3
+############################## APPEND ONLY MODE ###############################
+# By default Redis asynchronously dumps the dataset on disk. This mode is
+# good enough in many applications, but an issue with the Redis process or
+# a power outage may result into a few minutes of writes lost (depending on
+# the configured save points).
+#
+# The Append Only File is an alternative persistence mode that provides
+# much better durability. For instance using the default data fsync policy
+# (see later in the config file) Redis can lose just one second of writes in a
+# dramatic event like a server power outage, or a single write if something
+# wrong with the Redis process itself happens, but the operating system is
+# still running correctly.
+#
+# AOF and RDB persistence can be enabled at the same time without problems.
+# If the AOF is enabled on startup Redis will load the AOF, that is the file
+# with the better durability guarantees.
+#
+# Please check http://redis.io/topics/persistence for more information.
+#
+# OE: changed default to enable this
+appendonly yes
+# The name of the append only file (default: "appendonly.aof")
+# appendfilename appendonly.aof
+# The fsync() call tells the Operating System to actually write data on disk
+# instead to wait for more data in the output buffer. Some OS will really flush 
+# data on disk, some other OS will just try to do it ASAP.
+#
+# Redis supports three different modes:
+#
+# no: don't fsync, just let the OS flush the data when it wants. Faster.
+# always: fsync after every write to the append only log . Slow, Safest.
+# everysec: fsync only one time every second. Compromise.
+#
+# The default is "everysec" that's usually the right compromise between
+# speed and data safety. It's up to you to understand if you can relax this to
+# "no" that will let the operating system flush the output buffer when
+# it wants, for better performances (but if you can live with the idea of
+# some data loss consider the default persistence mode that's snapshotting),
+# or on the contrary, use "always" that's very slow but a bit safer than
+# everysec.
+#
+# More details please check the following article:
+# http://antirez.com/post/redis-persistence-demystified.html
+#
+# If unsure, use "everysec".
+# appendfsync always
+appendfsync everysec
+# appendfsync no
+# When the AOF fsync policy is set to always or everysec, and a background
+# saving process (a background save or AOF log background rewriting) is
+# performing a lot of I/O against the disk, in some Linux configurations
+# Redis may block too long on the fsync() call. Note that there is no fix for
+# this currently, as even performing fsync in a different thread will block
+# our synchronous write(2) call.
+#
+# In order to mitigate this problem it's possible to use the following option
+# that will prevent fsync() from being called in the main process while a
+# BGSAVE or BGREWRITEAOF is in progress.
+#
+# This means that while another child is saving the durability of Redis is
+# the same as "appendfsync none", that in practical terms means that it is
+# possible to lost up to 30 seconds of log in the worst scenario (with the
+# default Linux settings).
+# 
+# If you have latency problems turn this to "yes". Otherwise leave it as
+# "no" that is the safest pick from the point of view of durability.
+no-appendfsync-on-rewrite no
+# Automatic rewrite of the append only file.
+# Redis is able to automatically rewrite the log file implicitly calling
+# BGREWRITEAOF when the AOF log size will growth by the specified percentage.
+# 
+# This is how it works: Redis remembers the size of the AOF file after the
+# latest rewrite (or if no rewrite happened since the restart, the size of
+# the AOF at startup is used).
+#
+# This base size is compared to the current size. If the current size is
+# bigger than the specified percentage, the rewrite is triggered. Also
+# you need to specify a minimal size for the AOF file to be rewritten, this
+# is useful to avoid rewriting the AOF file even if the percentage increase
+# is reached but it is still pretty small.
+#
+# Specify a percentage of zero in order to disable the automatic AOF
+# rewrite feature.
+auto-aof-rewrite-percentage 100
+auto-aof-rewrite-min-size 64mb
+################################ LUA SCRIPTING  ###############################
+# Max execution time of a Lua script in milliseconds.
+#
+# If the maximum execution time is reached Redis will log that a script is
+# still in execution after the maximum allowed time and will start to
+# reply to queries with an error.
+#
+# When a long running script exceed the maximum execution time only the
+# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be
+# used to stop a script that did not yet called write commands. The second
+# is the only way to shut down the server in the case a write commands was
+# already issue by the script but the user don't want to wait for the natural
+# termination of the script.
+#
+# Set it to 0 or a negative value for unlimited execution without warnings.
+lua-time-limit 5000
+################################## SLOW LOG ###################################
+# The Redis Slow Log is a system to log queries that exceeded a specified
+# execution time. The execution time does not include the I/O operations
+# like talking with the client, sending the reply and so forth,
+# but just the time needed to actually execute the command (this is the only
+# stage of command execution where the thread is blocked and can not serve
+# other requests in the meantime).
+# 
+# You can configure the slow log with two parameters: one tells Redis
+# what is the execution time, in microseconds, to exceed in order for the
+# command to get logged, and the other parameter is the length of the
+# slow log. When a new command is logged the oldest one is removed from the
+# queue of logged commands.
+# The following time is expressed in microseconds, so 1000000 is equivalent
+# to one second. Note that a negative number disables the slow log, while
+# a value of zero forces the logging of every command.
+slowlog-log-slower-than 10000
+# There is no limit to this length. Just be aware that it will consume memory.
+# You can reclaim memory used by the slow log with SLOWLOG RESET.
+slowlog-max-len 128
+############################### ADVANCED CONFIG ###############################
+# Hashes are encoded using a memory efficient data structure when they have a
+# small number of entries, and the biggest entry does not exceed a given
+# threshold. These thresholds can be configured using the following directives.
+hash-max-ziplist-entries 512
+hash-max-ziplist-value 64
+# Similarly to hashes, small lists are also encoded in a special way in order
+# to save a lot of space. The special representation is only used when
+# you are under the following limits:
+list-max-ziplist-entries 512
+list-max-ziplist-value 64
+# Sets have a special encoding in just one case: when a set is composed
+# of just strings that happens to be integers in radix 10 in the range
+# of 64 bit signed integers.
+# The following configuration setting sets the limit in the size of the
+# set in order to use this special memory saving encoding.
+set-max-intset-entries 512
+# Similarly to hashes and lists, sorted sets are also specially encoded in
+# order to save a lot of space. This encoding is only used when the length and
+# elements of a sorted set are below the following limits:
+zset-max-ziplist-entries 128
+zset-max-ziplist-value 64
+# Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in
+# order to help rehashing the main Redis hash table (the one mapping top-level
+# keys to values). The hash table implementation Redis uses (see dict.c)
+# performs a lazy rehashing: the more operation you run into an hash table
+# that is rehashing, the more rehashing "steps" are performed, so if the
+# server is idle the rehashing is never complete and some more memory is used
+# by the hash table.
+# 
+# The default is to use this millisecond 10 times every second in order to
+# active rehashing the main dictionaries, freeing memory when possible.
+#
+# If unsure:
+# use "activerehashing no" if you have hard latency requirements and it is
+# not a good thing in your environment that Redis can reply form time to time
+# to queries with 2 milliseconds delay.
+#
+# use "activerehashing yes" if you don't have such hard requirements but
+# want to free memory asap when possible.
+activerehashing yes
+# The client output buffer limits can be used to force disconnection of clients
+# that are not reading data from the server fast enough for some reason (a
+# common reason is that a Pub/Sub client can't consume messages as fast as the
+# publisher can produce them).
+#
+# The limit can be set differently for the three different classes of clients:
+#
+# normal -> normal clients
+# slave  -> slave clients and MONITOR clients
+# pubsub -> clients subcribed to at least one pubsub channel or pattern
+#
+# The syntax of every client-output-buffer-limit directive is the following:
+#
+# client-output-buffer-limit <class> <hard limit> <soft limit> <soft seconds>
+#
+# A client is immediately disconnected once the hard limit is reached, or if
+# the soft limit is reached and remains reached for the specified number of
+# seconds (continuously).
+# So for instance if the hard limit is 32 megabytes and the soft limit is
+# 16 megabytes / 10 seconds, the client will get disconnected immediately
+# if the size of the output buffers reach 32 megabytes, but will also get
+# disconnected if the client reaches 16 megabytes and continuously overcomes
+# the limit for 10 seconds.
+#
+# By default normal clients are not limited because they don't receive data
+# without asking (in a push way), but just after a request, so only
+# asynchronous clients may create a scenario where data is requested faster
+# than it can read.
+#
+# Instead there is a default limit for pubsub and slave clients, since
+# subscribers and slaves receive data in a push fashion.
+#
+# Both the hard or the soft limit can be disabled just setting it to zero.
+client-output-buffer-limit normal 0 0 0
+client-output-buffer-limit slave 256mb 64mb 60
+client-output-buffer-limit pubsub 32mb 8mb 60
+################################## INCLUDES ###################################
+# Include one or more other config files here.  This is useful if you
+# have a standard template that goes to all Redis server but also need
+# to customize a few per-server settings.  Include files can include
+# other files, so use this wisely.
+#
+# include /path/to/local.conf
+# include /path/to/other.conf
diff --git a/meta-oe/recipes-extended/redis/redis_2.6.9.bb b/meta-oe/recipes-extended/redis/redis_2.6.9.bb
new file mode 100644
index 0000000000..8f009757fd
--- /dev/null
+++ b/meta-oe/recipes-extended/redis/redis_2.6.9.bb
@@ -0,0 +1,36 @@
+SUMMARY = "Redis key-value store"
+DESCRIPTION = "Redis is an open source, advanced key-value store."
+HOMEPAGE = "http://redis.io"
+SECTION = "libs"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM="file://COPYING;md5=673e0ac66aac758f8f2140c6fc7947d2"
+SRC_URI = "http://redis.googlecode.com/files/redis-${PV}.tar.gz \
+           file://hiredis-use-default-CC-if-it-is-set.patch \
+           file://lua-update-Makefile-to-use-environment-build-setting.patch \
+           file://oe-use-libc-malloc.patch \
+           file://redis.conf \
+           file://init-redis-server \
+"
+inherit update-rc.d
+INITSCRIPT_NAME = "redis-server"
+INITSCRIPT_PARAMS = "defaults 87"
+SRC_URI[md5sum] = "5093fb7c5f763e828c857daf260665bc"
+SRC_URI[sha256sum] = "4d967eff2038aebea33875d17e85ed67179df6505df68529a622f7836d1c7489"
+do_install() {
+    export PREFIX=${D}/${prefix}
+    oe_runmake install
+    install -d ${D}/${sysconfdir}/redis
+    install -m 0755 ${WORKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf
+    install -d ${D}/${sysconfdir}/init.d 
+    install -m 0755 ${WORKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server
+    install -d ${D}/var/lib/redis/
+}
diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool/0001-rrdtool-eradicate-tcl-support.patch b/meta-oe/recipes-extended/rrdtool/rrdtool/0001-rrdtool-eradicate-tcl-support.patch
new file mode 100644
index 0000000000..1157dc7201
--- /dev/null
+++ b/meta-oe/recipes-extended/rrdtool/rrdtool/0001-rrdtool-eradicate-tcl-support.patch
@@ -0,0 +1,1733 @@
+From 2dcb4bb8aadfead3e77bdb78b96ec8022e605a0d Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Sat, 12 May 2012 20:41:35 +0200
+Subject: [PATCH] rrdtool: eradicate tcl support
+TCL breaks autoreconf
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+ Makefile.am                  |    3 -
+ bindings/Makefile.am         |    5 +-
+ bindings/tcl/Makefile.am     |   58 ----
+ bindings/tcl/Makefile.in     |  668 ------------------------------------
+ bindings/tcl/README          |   31 --
+ bindings/tcl/ifOctets.tcl.in |   45 ---
+ bindings/tcl/tclrrd.c        |  762 ------------------------------------------
+ configure.ac                 |   54 ---
+ 8 files changed, 1 insertion(+), 1625 deletions(-)
+ delete mode 100644 bindings/tcl/Makefile.am
+ delete mode 100644 bindings/tcl/Makefile.in
+ delete mode 100644 bindings/tcl/README
+ delete mode 100644 bindings/tcl/ifOctets.tcl.in
+ delete mode 100644 bindings/tcl/tclrrd.c
+diff --git a/Makefile.am b/Makefile.am
+index 2003373..969e36b 100644
+--- a/Makefile.am
+++ b/Makefile.am
+@@ -36,9 +36,6 @@ site-perl-install: all bindings/perl-piped/Makefile bindings/perl-shared/Makefil
+        cd bindings/perl-piped && $(MAKE) install
+        cd bindings/perl-shared && $(MAKE) install
+ 
+-site-tcl-install: all
+-       cd bindings/tcl && $(MAKE) tcl-install
+-
+ site-python-install: all
+        cd bindings/python && $(PYTHON) setup.py install $(if $(DESTDIR),--root=$(DESTDIR))
+ 
+diff --git a/bindings/Makefile.am b/bindings/Makefile.am
+index c4fdc10..3574a60 100644
+--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
+@@ -1,13 +1,10 @@
+ .PHONY: python ruby
+ 
+-if BUILD_TCL
+-SUB_tcl = tcl
+-endif
+ if BUILD_LUA
+ SUB_lua = lua
+ endif
+ 
+-SUBDIRS = $(SUB_tcl) $(SUB_lua)
+SUBDIRS = $(SUB_lua)
+ 
+ # the following files are not mentioned in any other Makefile
+ EXTRA_DIST = perl-piped/MANIFEST perl-piped/README perl-piped/Makefile.PL perl-piped/RRDp.pm perl-piped/t/base.t \
+diff --git a/bindings/tcl/Makefile.am b/bindings/tcl/Makefile.am
+deleted file mode 100644
+index c0e8b0f..0000000
+--- a/bindings/tcl/Makefile.am
+++ /dev/null
+@@ -1,58 +0,0 @@
+-
+-EXTRA_DIST = README tclrrd.c
+-
+-VERSION = @VERSION@
+-
+-AM_CFLAGS = @CFLAGS@
+-### no including this by default @WERROR@
+-
+-TCL_PREFIX = @TCL_PREFIX@
+-TCL_SHLIB_LD = @TCL_SHLIB_LD@
+-TCL_SHLIB_CFLAGS = @TCL_SHLIB_CFLAGS@
+-TCL_SHLIB_SUFFIX = @TCL_SHLIB_SUFFIX@
+-TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@
+-TCL_LD_SEARCH_FLAGS = @TCL_LD_SEARCH_FLAGS@
+-TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@
+-TCL_INCLUDE_SPEC = @TCL_INCLUDE_SPEC@
+-
+-CLEANFILES = tclrrd.o tclrrd.so
+-
+-SRC_DIR            = $(top_srcdir)/src
+-AM_CPPFLAGS        = $(TCL_INCLUDE_SPEC) -I$(SRC_DIR) -DUSE_TCL_STUBS
+-LIBDIRS            = -L$(top_builddir)/src/.libs -L$(top_builddir)/src -L$(libdir)
+-LIB_RUNTIME_DIR    = $(libdir)
+-
+-if BUILD_TCL_SITE
+-tclpkgdir = @TCL_PACKAGE_DIR@
+-tclpkg_DATA = pkgIndex.tcl
+-tclpkg_SCRIPTS = ifOctets.tcl
+-else
+-pkglib_DATA = pkgIndex.tcl
+-pkglib_SCRIPTS = ifOctets.tcl
+-endif
+-
+-# Automake doen't like `tclrrd$(VERSION)$(TCL_SHLIB_SUFFIX)' as
+-# library name. So we build and install this library `by hand'.
+-#
+-# We do, however, specify a lib_LIBRARIES target such that
+-# automake creates the directory (if neecessary).
+-#
+-TCL_RRD_LIB = tclrrd$(VERSION)$(TCL_SHLIB_SUFFIX)
+-
+-lib_LIBRARIES =
+-
+-all-local: $(TCL_RRD_LIB)
+-
+-$(TCL_RRD_LIB): tclrrd.o
+-       $(TCL_SHLIB_LD) $(TCL_LD_SEARCH_FLAGS) $(LIBDIRS) $< -o $@ -lrrd_th -lm $(TCL_STUB_LIB_SPEC) $(LDFLAGS) $(LIBS)
+-
+-tclrrd.o: tclrrd.c
+-       $(CC) $(AM_CFLAGS) $(CFLAGS) $(TCL_SHLIB_CFLAGS) $(AM_CPPFLAGS) -c tclrrd.c -DVERSION=\"$(VERSION)\"
+-
+-pkgIndex.tcl:
+-       echo "package ifneeded Rrd $(VERSION) \"load $(libdir)/tclrrd$(VERSION)[info sharedlibextension]\"" > $@
+-
+-install-exec-local: $(TCL_RRD_LIB)
+-       @$(NORMAL_INSTALL)
+-       $(INSTALL_PROGRAM) $(TCL_RRD_LIB) $(DESTDIR)$(libdir)/$(TCL_RRD_LIB)
+-
+diff --git a/bindings/tcl/Makefile.in b/bindings/tcl/Makefile.in
+deleted file mode 100644
+index 0a36517..0000000
+--- a/bindings/tcl/Makefile.in
+++ /dev/null
+@@ -1,668 +0,0 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
+-# @configure_input@
+-
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+-# Inc.
+-# This Makefile.in is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+-# PARTICULAR PURPOSE.
+-
+-@SET_MAKE@
+-
+-
+-
+-VPATH = @srcdir@
+-pkgdatadir = $(datadir)/@PACKAGE@
+-pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
+-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-install_sh_DATA = $(install_sh) -c -m 644
+-install_sh_PROGRAM = $(install_sh) -c
+-install_sh_SCRIPT = $(install_sh) -c
+-INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
+-NORMAL_INSTALL = :
+-PRE_INSTALL = :
+-POST_INSTALL = :
+-NORMAL_UNINSTALL = :
+-PRE_UNINSTALL = :
+-POST_UNINSTALL = :
+-build_triplet = @build@
+-host_triplet = @host@
+-target_triplet = @target@
+-subdir = bindings/tcl
+-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-       $(srcdir)/ifOctets.tcl.in
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
+-       $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
+-       $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \
+-       $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+-       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+-       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+-       $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+-       $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-       $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/rrd_config.h
+-CONFIG_CLEAN_FILES = ifOctets.tcl
+-CONFIG_CLEAN_VPATH_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+-    *) f=$$p;; \
+-  esac;
+-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+-am__install_max = 40
+-am__nobase_strip_setup = \
+-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+-am__nobase_strip = \
+-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+-am__nobase_list = $(am__nobase_strip_setup); \
+-  for p in $$list; do echo "$$p $$p"; done | \
+-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+-    if (++n[$$2] == $(am__install_max)) \
+-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+-    END { for (dir in files) print dir, files[dir] }'
+-am__base_list = \
+-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkglibdir)" \
+-       "$(DESTDIR)$(tclpkgdir)" "$(DESTDIR)$(pkglibdir)" \
+-       "$(DESTDIR)$(tclpkgdir)"
+-LIBRARIES = $(lib_LIBRARIES)
+-SCRIPTS = $(pkglib_SCRIPTS) $(tclpkg_SCRIPTS)
+-AM_V_GEN = $(am__v_GEN_$(V))
+-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+-am__v_GEN_0 = @echo "  GEN   " $@;
+-AM_V_at = $(am__v_at_$(V))
+-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+-am__v_at_0 = @
+-SOURCES =
+-DIST_SOURCES =
+-DATA = $(pkglib_DATA) $(tclpkg_DATA)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-ACLOCAL = @ACLOCAL@
+-ALL_LIBS = @ALL_LIBS@
+-AMTAR = @AMTAR@
+-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+-AR = @AR@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+-AWK = @AWK@
+-CC = @CC@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-COMP_LUA = @COMP_LUA@
+-COMP_PERL = @COMP_PERL@
+-COMP_PYTHON = @COMP_PYTHON@
+-COMP_RUBY = @COMP_RUBY@
+-CORE_LIBS = @CORE_LIBS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+-DEFS = @DEFS@
+-DEPDIR = @DEPDIR@
+-DSYMUTIL = @DSYMUTIL@
+-DUMPBIN = @DUMPBIN@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+-EGREP = @EGREP@
+-EXEEXT = @EXEEXT@
+-FGREP = @FGREP@
+-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+-GMSGFMT = @GMSGFMT@
+-GMSGFMT_015 = @GMSGFMT_015@
+-GREP = @GREP@
+-INSTALL = @INSTALL@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+-INTLLIBS = @INTLLIBS@
+-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+-LD = @LD@
+-LDFLAGS = @LDFLAGS@
+-LIBICONV = @LIBICONV@
+-LIBINTL = @LIBINTL@
+-LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
+-LIBTOOL = @LIBTOOL@
+-LIBVERS = @LIBVERS@
+-LIPO = @LIPO@
+-LN_S = @LN_S@
+-LTLIBICONV = @LTLIBICONV@
+-LTLIBINTL = @LTLIBINTL@
+-LTLIBOBJS = @LTLIBOBJS@
+-LUA = @LUA@
+-LUA_CFLAGS = @LUA_CFLAGS@
+-LUA_DEFINES = @LUA_DEFINES@
+-LUA_INSTALL_CMOD = @LUA_INSTALL_CMOD@
+-LUA_INSTALL_LMOD = @LUA_INSTALL_LMOD@
+-LUA_LFLAGS = @LUA_LFLAGS@
+-MAINT = @MAINT@
+-MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
+-MSGFMT = @MSGFMT@
+-MSGFMT_015 = @MSGFMT_015@
+-MSGMERGE = @MSGMERGE@
+-MULTITHREAD_CFLAGS = @MULTITHREAD_CFLAGS@
+-MULTITHREAD_LDFLAGS = @MULTITHREAD_LDFLAGS@
+-NM = @NM@
+-NMEDIT = @NMEDIT@
+-NROFF = @NROFF@
+-NUMVERS = @NUMVERS@
+-OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+-OTOOL = @OTOOL@
+-OTOOL64 = @OTOOL64@
+-PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+-PERL = @PERL@
+-PERLCC = @PERLCC@
+-PERLCCFLAGS = @PERLCCFLAGS@
+-PERLFLAGS = @PERLFLAGS@
+-PERLLD = @PERLLD@
+-PERLLDFLAGS = @PERLLDFLAGS@
+-PERL_CC = @PERL_CC@
+-PERL_MAKE_OPTIONS = @PERL_MAKE_OPTIONS@
+-PERL_VERSION = @PERL_VERSION@
+-PKGCONFIG = @PKGCONFIG@
+-POD2HTML = @POD2HTML@
+-POD2MAN = @POD2MAN@
+-POSUB = @POSUB@
+-PTHREAD_CC = @PTHREAD_CC@
+-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+-PTHREAD_LIBS = @PTHREAD_LIBS@
+-PYTHON = @PYTHON@
+-PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+-PYTHON_INCLUDES = @PYTHON_INCLUDES@
+-PYTHON_PLATFORM = @PYTHON_PLATFORM@
+-PYTHON_PREFIX = @PYTHON_PREFIX@
+-PYTHON_VERSION = @PYTHON_VERSION@
+-RANLIB = @RANLIB@
+-RRDDOCDIR = @RRDDOCDIR@
+-RRDGRAPH_YLEGEND_ANGLE = @RRDGRAPH_YLEGEND_ANGLE@
+-RRD_DEFAULT_FONT = @RRD_DEFAULT_FONT@
+-RRD_GETOPT_LONG = @RRD_GETOPT_LONG@
+-RUBY = @RUBY@
+-RUBY_MAKE_OPTIONS = @RUBY_MAKE_OPTIONS@
+-SED = @SED@
+-SET_MAKE = @SET_MAKE@
+-SHELL = @SHELL@
+-STRIP = @STRIP@
+-TCL_INCLUDE_SPEC = @TCL_INCLUDE_SPEC@
+-TCL_LD_SEARCH_FLAGS = @TCL_LD_SEARCH_FLAGS@
+-TCL_PACKAGE_DIR = @TCL_PACKAGE_DIR@
+-TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@
+-### no including this by default @WERROR@
+-TCL_PREFIX = @TCL_PREFIX@
+-TCL_SHLIB_CFLAGS = @TCL_SHLIB_CFLAGS@
+-TCL_SHLIB_LD = @TCL_SHLIB_LD@
+-TCL_SHLIB_SUFFIX = @TCL_SHLIB_SUFFIX@
+-TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@
+-TCL_VERSION = @TCL_VERSION@
+-TROFF = @TROFF@
+-USE_NLS = @USE_NLS@
+-VERSION = @VERSION@
+-WERROR = @WERROR@
+-XGETTEXT = @XGETTEXT@
+-XGETTEXT_015 = @XGETTEXT_015@
+-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+-acx_pthread_config = @acx_pthread_config@
+-am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+-am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-builddir = @builddir@
+-datadir = @datadir@
+-datarootdir = @datarootdir@
+-docdir = @docdir@
+-dvidir = @dvidir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-htmldir = @htmldir@
+-includedir = @includedir@
+-infodir = @infodir@
+-install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localedir = @localedir@
+-localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+-mandir = @mandir@
+-mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-pdfdir = @pdfdir@
+-pkgpyexecdir = @pkgpyexecdir@
+-pkgpythondir = @pkgpythondir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-psdir = @psdir@
+-pyexecdir = @pyexecdir@
+-pythondir = @pythondir@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+-top_build_prefix = @top_build_prefix@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+-EXTRA_DIST = README tclrrd.c
+-AM_CFLAGS = @CFLAGS@
+-CLEANFILES = tclrrd.o tclrrd.so
+-SRC_DIR = $(top_srcdir)/src
+-AM_CPPFLAGS = $(TCL_INCLUDE_SPEC) -I$(SRC_DIR) -DUSE_TCL_STUBS
+-LIBDIRS = -L$(top_builddir)/src/.libs -L$(top_builddir)/src -L$(libdir)
+-LIB_RUNTIME_DIR = $(libdir)
+-@BUILD_TCL_SITE_TRUE@tclpkgdir = @TCL_PACKAGE_DIR@
+-@BUILD_TCL_SITE_TRUE@tclpkg_DATA = pkgIndex.tcl
+-@BUILD_TCL_SITE_TRUE@tclpkg_SCRIPTS = ifOctets.tcl
+-@BUILD_TCL_SITE_FALSE@pkglib_DATA = pkgIndex.tcl
+-@BUILD_TCL_SITE_FALSE@pkglib_SCRIPTS = ifOctets.tcl
+-
+-# Automake doen't like `tclrrd$(VERSION)$(TCL_SHLIB_SUFFIX)' as
+-# library name. So we build and install this library `by hand'.
+-#
+-# We do, however, specify a lib_LIBRARIES target such that
+-# automake creates the directory (if neecessary).
+-#
+-TCL_RRD_LIB = tclrrd$(VERSION)$(TCL_SHLIB_SUFFIX)
+-lib_LIBRARIES = 
+-all: all-am
+-
+-.SUFFIXES:
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+-       @for dep in $?; do \
+-         case '$(am__configure_deps)' in \
+-           *$$dep*) \
+-             ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+-               && { if test -f $@; then exit 0; else break; fi; }; \
+-             exit 1;; \
+-         esac; \
+-       done; \
+-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bindings/tcl/Makefile'; \
+-       $(am__cd) $(top_srcdir) && \
+-         $(AUTOMAKE) --gnu bindings/tcl/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-       @case '$?' in \
+-         *config.status*) \
+-           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-         *) \
+-           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-       esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(am__aclocal_m4_deps):
+-ifOctets.tcl: $(top_builddir)/config.status $(srcdir)/ifOctets.tcl.in
+-       cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+-install-libLIBRARIES: $(lib_LIBRARIES)
+-       @$(NORMAL_INSTALL)
+-       test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+-       @list='$(lib_LIBRARIES)'; test -n "$(libdir)" || list=; \
+-       list2=; for p in $$list; do \
+-         if test -f $$p; then \
+-           list2="$$list2 $$p"; \
+-         else :; fi; \
+-       done; \
+-       test -z "$$list2" || { \
+-         echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(libdir)'"; \
+-         $(INSTALL_DATA) $$list2 "$(DESTDIR)$(libdir)" || exit $$?; }
+-       @$(POST_INSTALL)
+-       @list='$(lib_LIBRARIES)'; test -n "$(libdir)" || list=; \
+-       for p in $$list; do \
+-         if test -f $$p; then \
+-           $(am__strip_dir) \
+-           echo " ( cd '$(DESTDIR)$(libdir)' && $(RANLIB) $$f )"; \
+-           ( cd "$(DESTDIR)$(libdir)" && $(RANLIB) $$f ) || exit $$?; \
+-         else :; fi; \
+-       done
+-
+-uninstall-libLIBRARIES:
+-       @$(NORMAL_UNINSTALL)
+-       @list='$(lib_LIBRARIES)'; test -n "$(libdir)" || list=; \
+-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+-       test -n "$$files" || exit 0; \
+-       echo " ( cd '$(DESTDIR)$(libdir)' && rm -f "$$files" )"; \
+-       cd "$(DESTDIR)$(libdir)" && rm -f $$files
+-
+-clean-libLIBRARIES:
+-       -test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
+-install-pkglibSCRIPTS: $(pkglib_SCRIPTS)
+-       @$(NORMAL_INSTALL)
+-       test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
+-       @list='$(pkglib_SCRIPTS)'; test -n "$(pkglibdir)" || list=; \
+-       for p in $$list; do \
+-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-         if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+-       done | \
+-       sed -e 'p;s,.*/,,;n' \
+-           -e 'h;s|.*|.|' \
+-           -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+-       $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+-         { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+-           if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+-             if (++n[d] == $(am__install_max)) { \
+-               print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+-           else { print "f", d "/" $$4, $$1 } } \
+-         END { for (d in files) print "f", d, files[d] }' | \
+-       while read type dir files; do \
+-            if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+-            test -z "$$files" || { \
+-              echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(pkglibdir)$$dir'"; \
+-              $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(pkglibdir)$$dir" || exit $$?; \
+-            } \
+-       ; done
+-
+-uninstall-pkglibSCRIPTS:
+-       @$(NORMAL_UNINSTALL)
+-       @list='$(pkglib_SCRIPTS)'; test -n "$(pkglibdir)" || exit 0; \
+-       files=`for p in $$list; do echo "$$p"; done | \
+-              sed -e 's,.*/,,;$(transform)'`; \
+-       test -n "$$list" || exit 0; \
+-       echo " ( cd '$(DESTDIR)$(pkglibdir)' && rm -f" $$files ")"; \
+-       cd "$(DESTDIR)$(pkglibdir)" && rm -f $$files
+-install-tclpkgSCRIPTS: $(tclpkg_SCRIPTS)
+-       @$(NORMAL_INSTALL)
+-       test -z "$(tclpkgdir)" || $(MKDIR_P) "$(DESTDIR)$(tclpkgdir)"
+-       @list='$(tclpkg_SCRIPTS)'; test -n "$(tclpkgdir)" || list=; \
+-       for p in $$list; do \
+-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-         if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+-       done | \
+-       sed -e 'p;s,.*/,,;n' \
+-           -e 'h;s|.*|.|' \
+-           -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+-       $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+-         { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+-           if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+-             if (++n[d] == $(am__install_max)) { \
+-               print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+-           else { print "f", d "/" $$4, $$1 } } \
+-         END { for (d in files) print "f", d, files[d] }' | \
+-       while read type dir files; do \
+-            if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+-            test -z "$$files" || { \
+-              echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(tclpkgdir)$$dir'"; \
+-              $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(tclpkgdir)$$dir" || exit $$?; \
+-            } \
+-       ; done
+-
+-uninstall-tclpkgSCRIPTS:
+-       @$(NORMAL_UNINSTALL)
+-       @list='$(tclpkg_SCRIPTS)'; test -n "$(tclpkgdir)" || exit 0; \
+-       files=`for p in $$list; do echo "$$p"; done | \
+-              sed -e 's,.*/,,;$(transform)'`; \
+-       test -n "$$list" || exit 0; \
+-       echo " ( cd '$(DESTDIR)$(tclpkgdir)' && rm -f" $$files ")"; \
+-       cd "$(DESTDIR)$(tclpkgdir)" && rm -f $$files
+-
+-mostlyclean-libtool:
+-       -rm -f *.lo
+-
+-clean-libtool:
+-       -rm -rf .libs _libs
+-install-pkglibDATA: $(pkglib_DATA)
+-       @$(NORMAL_INSTALL)
+-       test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
+-       @list='$(pkglib_DATA)'; test -n "$(pkglibdir)" || list=; \
+-       for p in $$list; do \
+-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-         echo "$$d$$p"; \
+-       done | $(am__base_list) | \
+-       while read files; do \
+-         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkglibdir)'"; \
+-         $(INSTALL_DATA) $$files "$(DESTDIR)$(pkglibdir)" || exit $$?; \
+-       done
+-
+-uninstall-pkglibDATA:
+-       @$(NORMAL_UNINSTALL)
+-       @list='$(pkglib_DATA)'; test -n "$(pkglibdir)" || list=; \
+-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+-       test -n "$$files" || exit 0; \
+-       echo " ( cd '$(DESTDIR)$(pkglibdir)' && rm -f" $$files ")"; \
+-       cd "$(DESTDIR)$(pkglibdir)" && rm -f $$files
+-install-tclpkgDATA: $(tclpkg_DATA)
+-       @$(NORMAL_INSTALL)
+-       test -z "$(tclpkgdir)" || $(MKDIR_P) "$(DESTDIR)$(tclpkgdir)"
+-       @list='$(tclpkg_DATA)'; test -n "$(tclpkgdir)" || list=; \
+-       for p in $$list; do \
+-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-         echo "$$d$$p"; \
+-       done | $(am__base_list) | \
+-       while read files; do \
+-         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(tclpkgdir)'"; \
+-         $(INSTALL_DATA) $$files "$(DESTDIR)$(tclpkgdir)" || exit $$?; \
+-       done
+-
+-uninstall-tclpkgDATA:
+-       @$(NORMAL_UNINSTALL)
+-       @list='$(tclpkg_DATA)'; test -n "$(tclpkgdir)" || list=; \
+-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+-       test -n "$$files" || exit 0; \
+-       echo " ( cd '$(DESTDIR)$(tclpkgdir)' && rm -f" $$files ")"; \
+-       cd "$(DESTDIR)$(tclpkgdir)" && rm -f $$files
+-tags: TAGS
+-TAGS:
+-
+-ctags: CTAGS
+-CTAGS:
+-
+-
+-distdir: $(DISTFILES)
+-       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+-       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+-       list='$(DISTFILES)'; \
+-         dist_files=`for file in $$list; do echo $$file; done | \
+-         sed -e "s|^$$srcdirstrip/||;t" \
+-             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+-       case $$dist_files in \
+-         */*) $(MKDIR_P) `echo "$$dist_files" | \
+-                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+-                          sort -u` ;; \
+-       esac; \
+-       for file in $$dist_files; do \
+-         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-         if test -d $$d/$$file; then \
+-           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+-           if test -d "$(distdir)/$$file"; then \
+-             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+-           fi; \
+-           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+-             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+-             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+-           fi; \
+-           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+-         else \
+-           test -f "$(distdir)/$$file" \
+-           || cp -p $$d/$$file "$(distdir)/$$file" \
+-           || exit 1; \
+-         fi; \
+-       done
+-check-am: all-am
+-check: check-am
+-all-am: Makefile $(LIBRARIES) $(SCRIPTS) $(DATA) all-local
+-installdirs:
+-       for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(tclpkgdir)" "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(tclpkgdir)"; do \
+-         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+-       done
+-install: install-am
+-install-exec: install-exec-am
+-install-data: install-data-am
+-uninstall: uninstall-am
+-
+-install-am: all-am
+-       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+-
+-installcheck: installcheck-am
+-install-strip:
+-       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+-         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+-         `test -z '$(STRIP)' || \
+-           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+-mostlyclean-generic:
+-
+-clean-generic:
+-       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+-
+-distclean-generic:
+-       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+-       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+-
+-maintainer-clean-generic:
+-       @echo "This command is intended for maintainers to use"
+-       @echo "it deletes files that may require special tools to rebuild."
+-clean: clean-am
+-
+-clean-am: clean-generic clean-libLIBRARIES clean-libtool \
+-       mostlyclean-am
+-
+-distclean: distclean-am
+-       -rm -f Makefile
+-distclean-am: clean-am distclean-generic
+-
+-dvi: dvi-am
+-
+-dvi-am:
+-
+-html: html-am
+-
+-html-am:
+-
+-info: info-am
+-
+-info-am:
+-
+-install-data-am: install-tclpkgDATA install-tclpkgSCRIPTS
+-
+-install-dvi: install-dvi-am
+-
+-install-dvi-am:
+-
+-install-exec-am: install-exec-local install-libLIBRARIES \
+-       install-pkglibDATA install-pkglibSCRIPTS
+-
+-install-html: install-html-am
+-
+-install-html-am:
+-
+-install-info: install-info-am
+-
+-install-info-am:
+-
+-install-man:
+-
+-install-pdf: install-pdf-am
+-
+-install-pdf-am:
+-
+-install-ps: install-ps-am
+-
+-install-ps-am:
+-
+-installcheck-am:
+-
+-maintainer-clean: maintainer-clean-am
+-       -rm -f Makefile
+-maintainer-clean-am: distclean-am maintainer-clean-generic
+-
+-mostlyclean: mostlyclean-am
+-
+-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+-
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+-uninstall-am: uninstall-libLIBRARIES uninstall-pkglibDATA \
+-       uninstall-pkglibSCRIPTS uninstall-tclpkgDATA \
+-       uninstall-tclpkgSCRIPTS
+-
+-.MAKE: install-am install-strip
+-
+-.PHONY: all all-am all-local check check-am clean clean-generic \
+-       clean-libLIBRARIES clean-libtool distclean distclean-generic \
+-       distclean-libtool distdir dvi dvi-am html html-am info info-am \
+-       install install-am install-data install-data-am install-dvi \
+-       install-dvi-am install-exec install-exec-am install-exec-local \
+-       install-html install-html-am install-info install-info-am \
+-       install-libLIBRARIES install-man install-pdf install-pdf-am \
+-       install-pkglibDATA install-pkglibSCRIPTS install-ps \
+-       install-ps-am install-strip install-tclpkgDATA \
+-       install-tclpkgSCRIPTS installcheck installcheck-am installdirs \
+-       maintainer-clean maintainer-clean-generic mostlyclean \
+-       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-       uninstall uninstall-am uninstall-libLIBRARIES \
+-       uninstall-pkglibDATA uninstall-pkglibSCRIPTS \
+-       uninstall-tclpkgDATA uninstall-tclpkgSCRIPTS
+-
+-
+-all-local: $(TCL_RRD_LIB)
+-
+-$(TCL_RRD_LIB): tclrrd.o
+-       $(TCL_SHLIB_LD) $(TCL_LD_SEARCH_FLAGS) $(LIBDIRS) $< -o $@ -lrrd_th -lm $(TCL_STUB_LIB_SPEC) $(LDFLAGS) $(LIBS)
+-
+-tclrrd.o: tclrrd.c
+-       $(CC) $(AM_CFLAGS) $(CFLAGS) $(TCL_SHLIB_CFLAGS) $(AM_CPPFLAGS) -c tclrrd.c -DVERSION=\"$(VERSION)\"
+-
+-pkgIndex.tcl:
+-       echo "package ifneeded Rrd $(VERSION) \"load $(libdir)/tclrrd$(VERSION)[info sharedlibextension]\"" > $@
+-
+-install-exec-local: $(TCL_RRD_LIB)
+-       @$(NORMAL_INSTALL)
+-       $(INSTALL_PROGRAM) $(TCL_RRD_LIB) $(DESTDIR)$(libdir)/$(TCL_RRD_LIB)
+-
+-# Tell versions [3.59,3.63) of GNU make to not export all variables.
+-# Otherwise a system limit (for SysV at least) may be exceeded.
+-.NOEXPORT:
+diff --git a/bindings/tcl/README b/bindings/tcl/README
+deleted file mode 100644
+index 065a03a..0000000
+--- a/bindings/tcl/README
+++ /dev/null
+@@ -1,31 +0,0 @@
+-TCLRRD -- A TCL interpreter extension to access the RRD library,
+-         contributed to Tobias Oetiker's RRD tools.
+-
+-Copyright (c) 1999,2000 Frank Strauss, Technical University of Braunschweig.
+-
+-See the file "COPYING" for information on usage and redistribution
+-of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+-
+-TCLRRD adds a dynamically loadable package to the Tcl 8.x interpreter
+-to access all RRD functions as of RRDtool 1.0.13. All command names
+-and arguments are equal to those of RRDtool. They are assigned to the
+-namespace `Rrd', e.g.  `Rrd::create'. Return values are a bit
+-different from plain RRDtool behavior to enable more native Tcl
+-usage. Errors are mapped to the TCL_ERROR return code together with
+-the RRD error strings.
+-
+-TCLRRD makes it easy to combine RRD use with advanced SNMP functionality
+-of scotty (http://wwwsnmp.cs.utwente.nl/~schoenw/scotty/). E.g., it's easy
+-to use some scotty code to get the counters of some interfaces by their
+-interface name and then use Rrd::update to store the values. Furthermore,
+-data source types (see RRD::create documentation) and integer value ranges
+-could be easily retrieved from MIB information.
+-
+-TCLRRD has been written on a Linux system for use with Tcl 8.x. It should
+-work on many other platforms, although it has not been tested. There are
+-no fool proof installation procedures. Take a look at Makefile.am and
+-adapt it, if required.
+-
+-TCLRRD has been written for RRD 1.0.13.
+-
+-       Frank Strauss <strauss@ibr.cs.tu-bs.de>, 09-Mar-2000
+diff --git a/bindings/tcl/ifOctets.tcl.in b/bindings/tcl/ifOctets.tcl.in
+deleted file mode 100644
+index 7a36397..0000000
+--- a/bindings/tcl/ifOctets.tcl.in
+++ /dev/null
+@@ -1,45 +0,0 @@
+-#!/bin/sh
+-# the next line restarts using tclsh -*- tcl -*- \
+-exec tclsh@TCL_VERSION@ "$0" "$@"
+-
+-#package require Tnm 3.0
+-package require Rrd @VERSION@
+-
+-set rrdfile "[lindex $argv 0]-[lindex $argv 1].rrd"
+-
+-# create rrdfile if not yet existent
+-if {[file exists $rrdfile] == 0} {
+-    Rrd::create $rrdfile --step 5 \
+-           DS:inOctets:COUNTER:10:U:U DS:outOctets:COUNTER:10:U:U \
+-           RRA:AVERAGE:0.5:1:12
+-}
+-
+-# get an snmp session context
+-set session [Tnm::snmp generator -address [lindex $argv 0]]
+-
+-# walk through the ifDescr column to find the right interface
+-$session walk descr IF-MIB!ifDescr {
+-
+-    # is this the right interface?
+-    if {"[Tnm::snmp value $descr 0]" == "[lindex $argv 1]"} {
+-
+-       # get the instance part of this table row
+-       set inst [lindex [Tnm::mib split [Tnm::snmp oid $descr 0]] 1]
+-
+-       # get the two interface's octet counter values
+-       set in [lindex [lindex [$session get IF-MIB!ifInOctets.$inst] 0] 2]
+-       set out [lindex [lindex [$session get IF-MIB!ifOutOctets.$inst] 0] 2]
+-
+-       # write the values to the rrd
+-       puts "$in $out"
+-       Rrd::update $rrdfile --template inOctets:outOctets N:$in:$out
+-
+-       Rrd::graph gaga.png --title "gaga" \
+-               DEF:in=$rrdfile:inOctets:AVERAGE \
+-               DEF:out=$rrdfile:outOctets:AVERAGE \
+-               AREA:in#0000FF:inOctets \
+-               LINE2:out#00C000:outOctets
+-
+-       #puts [Rrd::fetch $rrdfile AVERAGE]
+-    }
+-}
+diff --git a/bindings/tcl/tclrrd.c b/bindings/tcl/tclrrd.c
+deleted file mode 100644
+index f1f0234..0000000
+--- a/bindings/tcl/tclrrd.c
+++ /dev/null
+@@ -1,762 +0,0 @@
+-/*
+- * tclrrd.c -- A TCL interpreter extension to access the RRD library.
+- *
+- * Copyright (c) 1999,2000 Frank Strauss, Technical University of Braunschweig.
+- *
+- * Thread-safe code copyright (c) 2005 Oleg Derevenetz, CenterTelecom Voronezh ISP.
+- *
+- * See the file "COPYING" for information on usage and redistribution
+- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+- *
+- * $Id: tclrrd.c 1854 2009-06-07 14:46:21Z oetiker $
+- */
+-
+-
+-
+-#include <errno.h>
+-#include <string.h>
+-#include <time.h>
+-#include <unistd.h>
+-#include <tcl.h>
+-#include <stdlib.h>
+-#include "../../src/rrd_tool.h"
+-#include "../../src/rrd_format.h"
+-
+-/* support pre-8.4 tcl */
+-
+-#ifndef CONST84
+-#   define CONST84
+-#endif
+-
+-extern int Tclrrd_Init(
+-    Tcl_Interp *interp);
+-extern int Tclrrd_SafeInit(
+-    Tcl_Interp *interp);
+-
+-
+-/*
+- * some rrd_XXX() and new thread-safe versions of Rrd_XXX()
+- * functions might modify the argv strings passed to it.
+- * Hence, we need to do some preparation before
+- * calling the rrd library functions.
+- */
+-static char **getopt_init(
+-    int argc,
+-    CONST84 char *argv[])
+-{
+-    char    **argv2;
+-    int       i;
+-
+-    argv2 = calloc(argc, sizeof(char *));
+-    for (i = 0; i < argc; i++) {
+-        argv2[i] = strdup(argv[i]);
+-    }
+-    return argv2;
+-}
+-
+-static void getopt_cleanup(
+-    int argc,
+-    char **argv2)
+-{
+-    int       i;
+-
+-    for (i = 0; i < argc; i++) {
+-        if (argv2[i] != NULL) {
+-            free(argv2[i]);
+-        }
+-    }
+-    free(argv2);
+-}
+-
+-static void getopt_free_element(
+-    char *argv2[],
+-    int argn)
+-{
+-    if (argv2[argn] != NULL) {
+-        free(argv2[argn]);
+-        argv2[argn] = NULL;
+-    }
+-}
+-
+-static void getopt_squieeze(
+-    int *argc,
+-    char *argv2[])
+-{
+-    int       i, null_i = 0, argc_tmp = *argc;
+-
+-    for (i = 0; i < argc_tmp; i++) {
+-        if (argv2[i] == NULL) {
+-            (*argc)--;
+-        } else {
+-            argv2[null_i++] = argv2[i];
+-        }
+-    }
+-}
+-
+-
+-
+-/* Thread-safe version */
+-static int Rrd_Create(
+-    ClientData __attribute__((unused)) clientData,
+-    Tcl_Interp *interp,
+-    int argc,
+-    CONST84 char *argv[])
+-{
+-    int       argv_i;
+-    char    **argv2;
+-    char     *parsetime_error = NULL;
+-    time_t    last_up = time(NULL) - 10;
+-    long int  long_tmp;
+-    unsigned long int pdp_step = 300;
+-    rrd_time_value_t last_up_tv;
+-
+-    argv2 = getopt_init(argc, argv);
+-
+-    for (argv_i = 1; argv_i < argc; argv_i++) {
+-        if (!strcmp(argv2[argv_i], "--start") || !strcmp(argv2[argv_i], "-b")) {
+-            if (argv_i++ >= argc) {
+-                Tcl_AppendResult(interp, "RRD Error: option '",
+-                                 argv2[argv_i - 1], "' needs an argument",
+-                                 (char *) NULL);
+-                getopt_cleanup(argc, argv2);
+-                return TCL_ERROR;
+-            }
+-            if ((parsetime_error = rrd_parsetime(argv2[argv_i], &last_up_tv))) {
+-                Tcl_AppendResult(interp, "RRD Error: invalid time format: '",
+-                                 argv2[argv_i], "'", (char *) NULL);
+-                getopt_cleanup(argc, argv2);
+-                return TCL_ERROR;
+-            }
+-            if (last_up_tv.type == RELATIVE_TO_END_TIME ||
+-                last_up_tv.type == RELATIVE_TO_START_TIME) {
+-                Tcl_AppendResult(interp,
+-                                 "RRD Error: specifying time relative to the 'start' ",
+-                                 "or 'end' makes no sense here",
+-                                 (char *) NULL);
+-                getopt_cleanup(argc, argv2);
+-                return TCL_ERROR;
+-            }
+-            last_up = mktime(&last_up_tv.tm) +last_up_tv.offset;
+-            if (last_up < 3600 * 24 * 365 * 10) {
+-                Tcl_AppendResult(interp,
+-                                 "RRD Error: the first entry to the RRD should be after 1980",
+-                                 (char *) NULL);
+-                getopt_cleanup(argc, argv2);
+-                return TCL_ERROR;
+-            }
+-            getopt_free_element(argv2, argv_i - 1);
+-            getopt_free_element(argv2, argv_i);
+-        } else if (!strcmp(argv2[argv_i], "--step")
+-                   || !strcmp(argv2[argv_i], "-s")) {
+-            if (argv_i++ >= argc) {
+-                Tcl_AppendResult(interp, "RRD Error: option '",
+-                                 argv2[argv_i - 1], "' needs an argument",
+-                                 (char *) NULL);
+-                getopt_cleanup(argc, argv2);
+-                return TCL_ERROR;
+-            }
+-            long_tmp = atol(argv2[argv_i]);
+-            if (long_tmp < 1) {
+-                Tcl_AppendResult(interp,
+-                                 "RRD Error: step size should be no less than one second",
+-                                 (char *) NULL);
+-                getopt_cleanup(argc, argv2);
+-                return TCL_ERROR;
+-            }
+-            pdp_step = long_tmp;
+-            getopt_free_element(argv2, argv_i - 1);
+-            getopt_free_element(argv2, argv_i);
+-        } else if (!strcmp(argv2[argv_i], "--")) {
+-            getopt_free_element(argv2, argv_i);
+-            break;
+-        } else if (argv2[argv_i][0] == '-') {
+-            Tcl_AppendResult(interp, "RRD Error: unknown option '",
+-                             argv2[argv_i], "'", (char *) NULL);
+-            getopt_cleanup(argc, argv2);
+-            return TCL_ERROR;
+-        }
+-    }
+-
+-    getopt_squieeze(&argc, argv2);
+-
+-    if (argc < 2) {
+-        Tcl_AppendResult(interp, "RRD Error: needs rrd filename",
+-                         (char *) NULL);
+-        getopt_cleanup(argc, argv2);
+-        return TCL_ERROR;
+-    }
+-
+-    rrd_create_r(argv2[1], pdp_step, last_up, argc - 2,
+-                 (const char **)argv2 + 2);
+-
+-    getopt_cleanup(argc, argv2);
+-
+-    if (rrd_test_error()) {
+-        Tcl_AppendResult(interp, "RRD Error: ",
+-                         rrd_get_error(), (char *) NULL);
+-        rrd_clear_error();
+-        return TCL_ERROR;
+-    }
+-
+-    return TCL_OK;
+-}
+-
+-
+-
+-/* Thread-safe version */
+-static int Rrd_Dump(
+-    ClientData __attribute__((unused)) clientData,
+-    Tcl_Interp *interp,
+-    int argc,
+-    CONST84 char *argv[])
+-{
+-    if (argc < 2) {
+-        Tcl_AppendResult(interp, "RRD Error: needs rrd filename",
+-                         (char *) NULL);
+-        return TCL_ERROR;
+-    }
+-
+-    rrd_dump_r(argv[1], NULL);
+-
+-    /* NOTE: rrd_dump() writes to stdout. No interaction with TCL. */
+-
+-    if (rrd_test_error()) {
+-        Tcl_AppendResult(interp, "RRD Error: ",
+-                         rrd_get_error(), (char *) NULL);
+-        rrd_clear_error();
+-        return TCL_ERROR;
+-    }
+-
+-    return TCL_OK;
+-}
+-
+-/* Thread-safe version */
+-static int Rrd_Flushcached(
+-    ClientData __attribute__((unused)) clientData,
+-    Tcl_Interp *interp,
+-    int argc,
+-    CONST84 char *argv[])
+-{
+-    if (argc < 2) {
+-        Tcl_AppendResult(interp, "RRD Error: needs rrd filename",
+-                         (char *) NULL);
+-        return TCL_ERROR;
+-    }
+-
+-    rrd_flushcached(argc, (char**)argv);
+-
+-    if (rrd_test_error()) {
+-        Tcl_AppendResult(interp, "RRD Error: ",
+-                         rrd_get_error(), (char *) NULL);
+-        rrd_clear_error();
+-        return TCL_ERROR;
+-    }
+-
+-    return TCL_OK;
+-}
+-
+-
+-/* Thread-safe version */
+-static int Rrd_Last(
+-    ClientData __attribute__((unused)) clientData,
+-    Tcl_Interp *interp,
+-    int argc,
+-    CONST84 char *argv[])
+-{
+-    time_t    t;
+-
+-    if (argc < 2) {
+-        Tcl_AppendResult(interp, "RRD Error: needs rrd filename",
+-                         (char *) NULL);
+-        return TCL_ERROR;
+-    }
+-
+-    t = rrd_last_r(argv[1]);
+-
+-    if (rrd_test_error()) {
+-        Tcl_AppendResult(interp, "RRD Error: ",
+-                         rrd_get_error(), (char *) NULL);
+-        rrd_clear_error();
+-        return TCL_ERROR;
+-    }
+-
+-    Tcl_SetIntObj(Tcl_GetObjResult(interp), t);
+-
+-    return TCL_OK;
+-}
+-
+-
+-
+-/* Thread-safe version */
+-static int Rrd_Update(
+-    ClientData __attribute__((unused)) clientData,
+-    Tcl_Interp *interp,
+-    int argc,
+-    CONST84 char *argv[])
+-{
+-    int       argv_i;
+-    char    **argv2, *template = NULL;
+-
+-    argv2 = getopt_init(argc, argv);
+-
+-    for (argv_i = 1; argv_i < argc; argv_i++) {
+-        if (!strcmp(argv2[argv_i], "--template")
+-            || !strcmp(argv2[argv_i], "-t")) {
+-            if (argv_i++ >= argc) {
+-                Tcl_AppendResult(interp, "RRD Error: option '",
+-                                 argv2[argv_i - 1], "' needs an argument",
+-                                 (char *) NULL);
+-                if (template != NULL) {
+-                    free(template);
+-                }
+-                getopt_cleanup(argc, argv2);
+-                return TCL_ERROR;
+-            }
+-            if (template != NULL) {
+-                free(template);
+-            }
+-            template = strdup(argv2[argv_i]);
+-            getopt_free_element(argv2, argv_i - 1);
+-            getopt_free_element(argv2, argv_i);
+-        } else if (!strcmp(argv2[argv_i], "--")) {
+-            getopt_free_element(argv2, argv_i);
+-            break;
+-        } else if (argv2[argv_i][0] == '-') {
+-            Tcl_AppendResult(interp, "RRD Error: unknown option '",
+-                             argv2[argv_i], "'", (char *) NULL);
+-            if (template != NULL) {
+-                free(template);
+-            }
+-            getopt_cleanup(argc, argv2);
+-            return TCL_ERROR;
+-        }
+-    }
+-
+-    getopt_squieeze(&argc, argv2);
+-
+-    if (argc < 2) {
+-        Tcl_AppendResult(interp, "RRD Error: needs rrd filename",
+-                         (char *) NULL);
+-        if (template != NULL) {
+-            free(template);
+-        }
+-        getopt_cleanup(argc, argv2);
+-        return TCL_ERROR;
+-    }
+-
+-    rrd_update_r(argv2[1], template, argc - 2, (const char **)argv2 + 2);
+-
+-    if (template != NULL) {
+-        free(template);
+-    }
+-    getopt_cleanup(argc, argv2);
+-
+-    if (rrd_test_error()) {
+-        Tcl_AppendResult(interp, "RRD Error: ",
+-                         rrd_get_error(), (char *) NULL);
+-        rrd_clear_error();
+-        return TCL_ERROR;
+-    }
+-
+-    return TCL_OK;
+-}
+-
+-static int Rrd_Lastupdate(
+-    ClientData __attribute__((unused)) clientData,
+-    Tcl_Interp *interp,
+-    int argc,
+-    CONST84 char *argv[])
+-{
+-    time_t    last_update;
+-    char    **argv2;
+-    char    **ds_namv;
+-    char    **last_ds;
+-    char      s[30];
+-    Tcl_Obj  *listPtr;
+-    unsigned long ds_cnt, i;
+-
+-    /* TODO: support for rrdcached */
+-    if (argc != 2) {
+-        Tcl_AppendResult(interp, "RRD Error: needs a single rrd filename",
+-                         (char *) NULL);
+-        return TCL_ERROR;
+-    }
+-
+-    argv2 = getopt_init(argc, argv);
+-    if (rrd_lastupdate_r(argv2[1], &last_update,
+-                       &ds_cnt, &ds_namv, &last_ds) == 0) {
+-        listPtr = Tcl_GetObjResult(interp);
+-        for (i = 0; i < ds_cnt; i++) {
+-            sprintf(s, " %28s", ds_namv[i]);
+-            Tcl_ListObjAppendElement(interp, listPtr,
+-                                     Tcl_NewStringObj(s, -1));
+-            sprintf(s, "\n\n%10lu:", last_update);
+-            Tcl_ListObjAppendElement(interp, listPtr,
+-                                     Tcl_NewStringObj(s, -1));
+-            for (i = 0; i < ds_cnt; i++) {
+-                sprintf(s, " %s", last_ds[i]);
+-                Tcl_ListObjAppendElement(interp, listPtr,
+-                                         Tcl_NewStringObj(s, -1));
+-                free(last_ds[i]);
+-                free(ds_namv[i]);
+-            }
+-            sprintf(s, "\n");
+-            Tcl_ListObjAppendElement(interp, listPtr,
+-                                     Tcl_NewStringObj(s, -1));
+-            free(last_ds);
+-            free(ds_namv);
+-        }
+-    }
+-    return TCL_OK;
+-}
+-
+-static int Rrd_Fetch(
+-    ClientData __attribute__((unused)) clientData,
+-    Tcl_Interp *interp,
+-    int argc,
+-    CONST84 char *argv[])
+-{
+-    time_t    start, end, j;
+-    unsigned long step, ds_cnt, i, ii;
+-    rrd_value_t *data, *datai;
+-    char    **ds_namv;
+-    Tcl_Obj  *listPtr;
+-    char      s[30];
+-    char    **argv2;
+-
+-    argv2 = getopt_init(argc, argv);
+-    if (rrd_fetch(argc, argv2, &start, &end, &step,
+-                  &ds_cnt, &ds_namv, &data) != -1) {
+-        datai = data;
+-        listPtr = Tcl_GetObjResult(interp);
+-        for (j = start; j <= end; j += step) {
+-            for (ii = 0; ii < ds_cnt; ii++) {
+-                sprintf(s, "%.2f", *(datai++));
+-                Tcl_ListObjAppendElement(interp, listPtr,
+-                                         Tcl_NewStringObj(s, -1));
+-            }
+-        }
+-        for (i = 0; i < ds_cnt; i++)
+-            free(ds_namv[i]);
+-        free(ds_namv);
+-        free(data);
+-    }
+-    getopt_cleanup(argc, argv2);
+-
+-    if (rrd_test_error()) {
+-        Tcl_AppendResult(interp, "RRD Error: ",
+-                         rrd_get_error(), (char *) NULL);
+-        rrd_clear_error();
+-        return TCL_ERROR;
+-    }
+-
+-    return TCL_OK;
+-}
+-
+-
+-
+-static int Rrd_Graph(
+-    ClientData __attribute__((unused)) clientData,
+-    Tcl_Interp *interp,
+-    int argc,
+-    CONST84 char *argv[])
+-{
+-    Tcl_Channel channel;
+-    int       mode, fd2;
+-    ClientData fd1;
+-    FILE     *stream = NULL;
+-    char    **calcpr = NULL;
+-    int       rc, xsize, ysize;
+-    double    ymin, ymax;
+-    char      dimensions[50];
+-    char    **argv2;
+-    CONST84 char *save;
+-
+-    /*
+-     * If the "filename" is a Tcl fileID, then arrange for rrd_graph() to write to
+-     * that file descriptor.  Will this work with windoze?  I have no idea.
+-     */
+-    if ((channel = Tcl_GetChannel(interp, argv[1], &mode)) != NULL) {
+-        /*
+-         * It >is< a Tcl fileID
+-         */
+-        if (!(mode & TCL_WRITABLE)) {
+-            Tcl_AppendResult(interp, "channel \"", argv[1],
+-                             "\" wasn't opened for writing", (char *) NULL);
+-            return TCL_ERROR;
+-        }
+-        /*
+-         * Must flush channel to make sure any buffered data is written before
+-         * rrd_graph() writes to the stream
+-         */
+-        if (Tcl_Flush(channel) != TCL_OK) {
+-            Tcl_AppendResult(interp, "flush failed for \"", argv[1], "\": ",
+-                             strerror(Tcl_GetErrno()), (char *) NULL);
+-            return TCL_ERROR;
+-        }
+-        if (Tcl_GetChannelHandle(channel, TCL_WRITABLE, &fd1) != TCL_OK) {
+-            Tcl_AppendResult(interp,
+-                             "cannot get file descriptor associated with \"",
+-                             argv[1], "\"", (char *) NULL);
+-            return TCL_ERROR;
+-        }
+-        /*
+-         * Must dup() file descriptor so we can fclose(stream), otherwise the fclose()
+-         * would close Tcl's file descriptor
+-         */
+-        if ((fd2 = dup((int)fd1)) == -1) {
+-            Tcl_AppendResult(interp,
+-                             "dup() failed for file descriptor associated with \"",
+-                             argv[1], "\": ", strerror(errno), (char *) NULL);
+-            return TCL_ERROR;
+-        }
+-        /*
+-         * rrd_graph() wants a FILE*
+-         */
+-        if ((stream = fdopen(fd2, "wb")) == NULL) {
+-            Tcl_AppendResult(interp,
+-                             "fdopen() failed for file descriptor associated with \"",
+-                             argv[1], "\": ", strerror(errno), (char *) NULL);
+-            close(fd2); /* plug potential file descriptor leak */
+-            return TCL_ERROR;
+-        }
+-
+-        save = argv[1];
+-        argv[1] = "-";
+-        argv2 = getopt_init(argc, argv);
+-        argv[1] = save;
+-    } else {
+-        Tcl_ResetResult(interp);    /* clear error from Tcl_GetChannel() */
+-        argv2 = getopt_init(argc, argv);
+-    }
+-
+-    rc = rrd_graph(argc, argv2, &calcpr, &xsize, &ysize, stream, &ymin,
+-                   &ymax);
+-    getopt_cleanup(argc, argv2);
+-
+-    if (stream != NULL)
+-        fclose(stream); /* plug potential malloc & file descriptor leak */
+-
+-    if (rc != -1) {
+-        sprintf(dimensions, "%d %d", xsize, ysize);
+-        Tcl_AppendResult(interp, dimensions, (char *) NULL);
+-        if (calcpr) {
+-#if 0
+-            int       i;
+-
+-            for (i = 0; calcpr[i]; i++) {
+-                printf("%s\n", calcpr[i]);
+-                free(calcpr[i]);
+-            }
+-#endif
+-            free(calcpr);
+-        }
+-    }
+-
+-    if (rrd_test_error()) {
+-        Tcl_AppendResult(interp, "RRD Error: ",
+-                         rrd_get_error(), (char *) NULL);
+-        rrd_clear_error();
+-        return TCL_ERROR;
+-    }
+-
+-    return TCL_OK;
+-}
+-
+-
+-
+-static int Rrd_Tune(
+-    ClientData __attribute__((unused)) clientData,
+-    Tcl_Interp *interp,
+-    int argc,
+-    CONST84 char *argv[])
+-{
+-    char    **argv2;
+-
+-    argv2 = getopt_init(argc, argv);
+-    rrd_tune(argc, argv2);
+-    getopt_cleanup(argc, argv2);
+-
+-    if (rrd_test_error()) {
+-        Tcl_AppendResult(interp, "RRD Error: ",
+-                         rrd_get_error(), (char *) NULL);
+-        rrd_clear_error();
+-        return TCL_ERROR;
+-    }
+-
+-    return TCL_OK;
+-}
+-
+-
+-
+-static int Rrd_Resize(
+-    ClientData __attribute__((unused)) clientData,
+-    Tcl_Interp *interp,
+-    int argc,
+-    CONST84 char *argv[])
+-{
+-    char    **argv2;
+-
+-    argv2 = getopt_init(argc, argv);
+-    rrd_resize(argc, argv2);
+-    getopt_cleanup(argc, argv2);
+-
+-    if (rrd_test_error()) {
+-        Tcl_AppendResult(interp, "RRD Error: ",
+-                         rrd_get_error(), (char *) NULL);
+-        rrd_clear_error();
+-        return TCL_ERROR;
+-    }
+-
+-    return TCL_OK;
+-}
+-
+-
+-
+-static int Rrd_Restore(
+-    ClientData __attribute__((unused)) clientData,
+-    Tcl_Interp *interp,
+-    int argc,
+-    CONST84 char *argv[])
+-{
+-    char    **argv2;
+-
+-    argv2 = getopt_init(argc, argv);
+-    rrd_restore(argc, argv2);
+-    getopt_cleanup(argc, argv2);
+-
+-    if (rrd_test_error()) {
+-        Tcl_AppendResult(interp, "RRD Error: ",
+-                         rrd_get_error(), (char *) NULL);
+-        rrd_clear_error();
+-        return TCL_ERROR;
+-    }
+-
+-    return TCL_OK;
+-}
+-
+-
+-
+-/*
+- * The following structure defines the commands in the Rrd extension.
+- */
+-
+-typedef struct {
+-    char     *name;     /* Name of the command. */
+-    Tcl_CmdProc *proc;  /* Procedure for command. */
+-    int       hide;     /* Hide if safe interpreter */
+-} CmdInfo;
+-
+-static CmdInfo rrdCmds[] = {
+-    {"Rrd::create", Rrd_Create, 1}, /* Thread-safe version */
+-    {"Rrd::dump", Rrd_Dump, 0}, /* Thread-safe version */
+-    {"Rrd::flushcached", Rrd_Flushcached, 0},
+-    {"Rrd::last", Rrd_Last, 0}, /* Thread-safe version */
+-    {"Rrd::lastupdate", Rrd_Lastupdate, 0}, /* Thread-safe version */
+-    {"Rrd::update", Rrd_Update, 1}, /* Thread-safe version */
+-    {"Rrd::fetch", Rrd_Fetch, 0},
+-    {"Rrd::graph", Rrd_Graph, 1},   /* Due to RRD's API, a safe
+-                                       interpreter cannot create
+-                                       a graph since it writes to
+-                                       a filename supplied by the
+-                                       caller */
+-    {"Rrd::tune", Rrd_Tune, 1},
+-    {"Rrd::resize", Rrd_Resize, 1},
+-    {"Rrd::restore", Rrd_Restore, 1},
+-    {(char *) NULL, (Tcl_CmdProc *) NULL, 0}
+-};
+-
+-
+-
+-static int init(
+-    Tcl_Interp *interp,
+-    int safe)
+-{
+-    CmdInfo  *cmdInfoPtr;
+-    Tcl_CmdInfo info;
+-
+-    if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL)
+-        return TCL_ERROR;
+-
+-    if (Tcl_PkgRequire(interp, "Tcl", TCL_VERSION, 1) == NULL) {
+-        return TCL_ERROR;
+-    }
+-
+-    /*
+-     * Why a global array?  In keeping with the Rrd:: namespace, why
+-     * not simply create a normal variable Rrd::version and set it?
+-     */
+-    Tcl_SetVar2(interp, "rrd", "version", VERSION, TCL_GLOBAL_ONLY);
+-
+-    for (cmdInfoPtr = rrdCmds; cmdInfoPtr->name != NULL; cmdInfoPtr++) {
+-        /*
+-         * Check if the command already exists and return an error
+-         * to ensure we detect name clashes while loading the Rrd
+-         * extension.
+-         */
+-        if (Tcl_GetCommandInfo(interp, cmdInfoPtr->name, &info)) {
+-            Tcl_AppendResult(interp, "command \"", cmdInfoPtr->name,
+-                             "\" already exists", (char *) NULL);
+-            return TCL_ERROR;
+-        }
+-        if (safe && cmdInfoPtr->hide) {
+-#if 0
+-            /*
+-             * Turns out the one cannot hide a command in a namespace
+-             * due to a limitation of Tcl, one can only hide global
+-             * commands.  Thus, if we created the commands without
+-             * the Rrd:: namespace in a safe interpreter, then the
+-             * "unsafe" commands could be hidden -- which would allow
+-             * an owning interpreter either un-hiding them or doing
+-             * an "interp invokehidden".  If the Rrd:: namespace is
+-             * used, then it's still possible for the owning interpreter
+-             * to fake out the missing commands:
+-             *
+-             *   # Make all Rrd::* commands available in master interperter
+-             *   package require Rrd
+-             *   set safe [interp create -safe]
+-             *   # Make safe Rrd::* commands available in safe interperter
+-             *   interp invokehidden $safe -global load ./tclrrd1.2.11.so
+-             *   # Provide the safe interpreter with the missing commands
+-             *   $safe alias Rrd::update do_update $safe
+-             *   proc do_update {which_interp $args} {
+-             *     # Do some checking maybe...
+-             *       :
+-             *     return [eval Rrd::update $args]
+-             *   }
+-             *
+-             * Our solution for now is to just not create the "unsafe"
+-             * commands in a safe interpreter.
+-             */
+-            if (Tcl_HideCommand(interp, cmdInfoPtr->name, cmdInfoPtr->name) !=
+-                TCL_OK)
+-                return TCL_ERROR;
+-#endif
+-        } else
+-            Tcl_CreateCommand(interp, cmdInfoPtr->name, cmdInfoPtr->proc,
+-                              (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+-    }
+-
+-    if (Tcl_PkgProvide(interp, "Rrd", VERSION) != TCL_OK) {
+-        return TCL_ERROR;
+-    }
+-
+-    return TCL_OK;
+-}
+-
+-int Tclrrd_Init(
+-    Tcl_Interp *interp)
+-{
+-    return init(interp, 0);
+-}
+-
+-/*
+- * See the comments above and note how few commands are considered "safe"...
+- * Using rrdtool in a safe interpreter has very limited functionality.  It's
+- * tempting to just return TCL_ERROR and forget about it.
+- */
+-int Tclrrd_SafeInit(
+-    Tcl_Interp *interp)
+-{
+-    return init(interp, 1);
+-}
+diff --git a/configure.ac b/configure.ac
+index 73ef4ec..acd74e8 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -830,57 +830,6 @@ AM_CONDITIONAL(LUA_SITE_LINSTALL, [test "$LUA_INSTALL_LMOD" != "$LUA_RRD_LIBDIR"
+ AM_CONDITIONAL(LUA50, [test "$lua_vndot" = "50"])
+ AM_CONDITIONAL(BUILD_LUA, [test "$enable_lua" = "yes"])
+ 
+-enable_tcl_site=no
+-
+-AC_ARG_ENABLE(tcl,AS_HELP_STRING([--disable-tcl],[do not build the tcl modules]),
+-[],[enable_tcl=yes])
+-
+-if test  "$enable_tcl" = "yes"; then
+-  dnl Check for Tcl.
+-  withval=""
+-  AC_ARG_WITH(tcllib,[  --with-tcllib=DIR       location of the tclConfig.sh])
+-  enable_tcl=no
+-  for dir in $withval /usr/lib /usr/lib64 /usr/local/lib /usr/lib/tcl8.4 /usr/lib/tcl8.3 ; do
+-    AC_MSG_CHECKING(for tclConfig.sh in $dir)
+-    if test -f "$dir/tclConfig.sh" ; then
+-       tcl_config=$dir/tclConfig.sh
+-        enable_tcl=yes
+-        AC_MSG_RESULT(yes)
+-        break
+-    else
+-        AC_MSG_RESULT(no)
+-    fi
+-  done
+-
+-  if test "$enable_tcl" = "no"; then
+-        AC_MSG_WARN([tclConfig.sh not found - Tcl interface will not be built])
+-  else
+-       . $tcl_config
+-       TCL_PACKAGE_DIR="$TCL_PACKAGE_PATH/tclrrd$VERSION"
+-       if test -n "$TCL_INC_DIR"; then
+-         TCL_INCLUDE_SPEC="$TCL_INCLUDE_SPEC -I$TCL_INC_DIR"
+-       fi
+-  fi
+-  AC_ARG_ENABLE(tcl-site,AS_HELP_STRING([--enable-tcl-site],[install the tcl extension in the tcl tree]),
+-  [],[enable_tcl_site=yes])
+-
+-fi
+-
+-AM_CONDITIONAL(BUILD_TCL, test "$enable_tcl" = "yes" )
+-AM_CONDITIONAL(BUILD_TCL_SITE, test "$enable_tcl_site" = "yes" )
+-
+-
+-AC_SUBST(TCL_PREFIX)
+-AC_SUBST(TCL_SHLIB_CFLAGS)
+-AC_SUBST(TCL_SHLIB_LD)
+-AC_SUBST(TCL_SHLIB_SUFFIX)
+-AC_SUBST(TCL_PACKAGE_PATH)
+-AC_SUBST(TCL_LD_SEARCH_FLAGS)
+-AC_SUBST(TCL_STUB_LIB_SPEC)
+-AC_SUBST(TCL_VERSION)
+-AC_SUBST(TCL_PACKAGE_DIR)
+-AC_SUBST(TCL_INCLUDE_SPEC)
+-
+ AC_ARG_ENABLE(python,AS_HELP_STRING([--disable-python],[do not build the python modules]),
+ [],[enable_python=yes])
+ 
+@@ -932,8 +881,6 @@ AC_CONFIG_FILES([src/Makefile])
+ AC_CONFIG_FILES([src/librrd.sym.in])
+ AC_CONFIG_FILES([src/librrd.pc])
+ AC_CONFIG_FILES([bindings/Makefile])
+-AC_CONFIG_FILES([bindings/tcl/Makefile])
+-AC_CONFIG_FILES([bindings/tcl/ifOctets.tcl])
+ AC_CONFIG_FILES([Makefile])          
+ AC_CONFIG_FILES([bindings/lua/Makefile])
+ 
+@@ -982,7 +929,6 @@ if test "$lua_need_compat51" = "1"; then
+ echo "   Lua Lua-modules dir: $LUA_INSTALL_LMOD"
+ fi
+ fi
+-echo "    Build Tcl Bindings: $enable_tcl"
+ echo " Build Python Bindings: $enable_python"
+ echo "          Build rrdcgi: $enable_rrdcgi"
+ echo "       Build librrd MT: $enable_pthread"
+-- 
+1.7.10
diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool/remove_hardcoded_xml_include.patch b/meta-oe/recipes-extended/rrdtool/rrdtool/remove_hardcoded_xml_include.patch
new file mode 100644
index 0000000000..321a842b62
--- /dev/null
+++ b/meta-oe/recipes-extended/rrdtool/rrdtool/remove_hardcoded_xml_include.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac      2012-11-06 11:20:54.099021892 -0500
+++ b/configure.ac~     2012-11-06 11:19:57.255023857 -0500
+@@ -548,7 +548,7 @@
+ 
+ fi
+ EX_CHECK_ALL(glib-2.0,   glib_check_version,            glib.h,                 glib-2.0,    2.28.7, ftp://ftp.gtk.org/pub/glib/2.28/, "")
+-EX_CHECK_ALL(xml2,       xmlParseFile,                  libxml/parser.h,        libxml-2.0,        2.7.8,  http://xmlsoft.org/downloads.html, /usr/include/libxml2)
+EX_CHECK_ALL(xml2,       xmlParseFile,                  libxml/parser.h,        libxml-2.0,        2.7.8,  http://xmlsoft.org/downloads.html, "")
+ 
+ if test "$EX_CHECK_ALL_ERR" = "YES"; then
+   AC_MSG_ERROR([Please fix the library issues listed above and try again.])
diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.7.bb b/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.7.bb
new file mode 100644
index 0000000000..2994df28ea
--- /dev/null
+++ b/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.7.bb
@@ -0,0 +1,119 @@
+SUMMARY = "High performance data logging and graphing system for time series data"
+HOMEPAGE = "http://oss.oetiker.ch/rrdtool/"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=44fee82a1d2ed0676cf35478283e0aa0"
+DEPENDS = "libpng zlib cairo pango glib-2.0 libxml2"
+PR = "r2"
+SRC_URI = "http://oss.oetiker.ch/rrdtool/pub/rrdtool-${PV}.tar.gz \
+           file://0001-rrdtool-eradicate-tcl-support.patch \
+           file://remove_hardcoded_xml_include.patch \
+"
+SRC_URI[md5sum] = "ffe369d8921b4dfdeaaf43812100c38f"
+SRC_URI[sha256sum] = "956aaf431c955ba88dd7d98920ade3a8c4bad04adb1f9431377950a813a7af11"
+inherit autotools gettext pythonnative perlnative python-dir
+EXTRA_AUTORECONF = "-I m4"
+PACKAGECONFIG ??= "python perl"
+PACKAGECONFIG[python] = "--enable-python=yes \
+am_cv_python_pythondir=${STAGING_LIBDIR}/python${PYTHON_BASEVERSION}/site-packages \
+am_cv_python_pyexecdir=${STAGING_LIBDIR}/python${PYTHON_BASEVERSION}/site-packages,\
+--disable-python,python,"
+PACKAGECONFIG[perl] = \
+"--enable-perl=yes --with-perl-options='INSTALLDIRS="vendor"' \
+ac_cv_path_PERL_CC='${CC}',  \
+--disable-perl,perl,"
+PACKAGECONFIG[dbi] = "--enable-libdbi,--disable-libdbi,libdbi"
+EXTRA_OECONF = " \
+    --enable-shared \
+    --disable-libwrap \
+    --program-prefix='' \
+    rd_cv_ieee_works=yes \
+    --disable-ruby \
+    --disable-lua \
+    --disable-rpath \
+"
+# don't use perl.real, this results in break issues with prebuilts since perl.real doesn't
+# know where the PERL5LIB is...
+# use wrapper perl instead
+EXTRA_OEMAKE = "PERL=${STAGING_BINDIR_NATIVE}/perl-native/perl FULLPERL=${STAGING_BINDIR_NATIVE}/perl-native/perl"
+export BUILD_SYS
+export HOST_SYS
+export STAGING_LIBDIR
+export STAGING_INCDIR
+do_configure() {
+        #fix the pkglib problem with newer automake
+        #perl
+        sed -i -e "s|-Wl,--rpath -Wl,\$rp||g" \
+            ${S}/bindings/perl-shared/Makefile.PL
+        #python
+        sed -i -e '/PYTHON_INCLUDES="-I${/c \
+        PYTHON_INCLUDES="-I=/usr/include/python${PYTHON_BASEVERSION}"' \
+            ${S}/m4/acinclude.m4
+        #remove the hardcoded $(libdir) rpath
+        sed -i -e 's|--rpath=$(libdir)||g' ${S}/bindings/Makefile.am
+        autotools_do_configure
+        perl_version=`perl -v 2>/dev/null | \
+            sed -n 's/This is perl.*v[a-z ]*\([0-9]\.[0-9][0-9.]*\).*$/\1/p'`
+        #modify python sitepkg
+        #remove the dependency of perl-shared:Makefile
+        #or perl-shared/Makefile will be regenerated
+        #if any code touch bindings/Makefile after below perl bindings code
+        sed -i -e "s:\$(PYTHON) setup.py install:\$(PYTHON) setup.py install \
+            --install-lib=${D}${PYTHON_SITEPACKAGES_DIR}:" \
+            -e "s:perl-shared/Makefile.PL Makefile:perl-shared/Makefile.PL:" \
+            ${S}/bindings/Makefile
+        #redo the perl bindings
+        (
+        cd bindings/perl-shared;
+        perl -I${STAGING_LIBDIR}/perl/$perl_version Makefile.PL INSTALLDIRS="vendor"
+            INSTALLPRIVLIB="abc";
+        sed -i -e "s| ${libdir}/perl/| ${STAGING_LIBDIR}/perl/|g" Makefile;
+        cd ../../bindings/perl-piped;
+        perl -I${STAGING_LIBDIR}/perl/$perl_version Makefile.PL INSTALLDIRS="vendor";
+        sed -i -e "s| ${libdir}/perl/| ${STAGING_LIBDIR}/perl/|g" Makefile;
+        )
+        #change the interpreter in file
+        sed -i -e "s|^PERL = ${STAGING_BINDIR_NATIVE}/.*|PERL = /usr/bin/perl|g" \
+            ${S}/examples/Makefile
+        sed -i -e "s|${STAGING_BINDIR_NATIVE}/perl-native/perl|/usr/bin/perl|g" \
+            ${S}/examples/*.pl
+}
+PACKAGES =+ "${PN}-perl ${PN}-python"
+FILES_${PN}-doc += "${datadir}/examples"
+DESCRIPTION_${PN}-perl = \
+"The ${PN}-perl package includes RRDtool bindings for perl."
+FILES_${PN}-perl = "${libdir}/perl/vendor_perl/*/*.pm ${datadir}/${PN}/examples \
+    ${libdir}/perl/vendor_perl/*/auto/RRDs/RRDs.*"
+RDEPENDS_${PN}-perl = "perl perl-module-lib perl-module-getopt-long perl-module-time-hires \
+    perl-module-io-file perl-module-ipc-open2 perl-module-io-socket"
+DESCRIPTION_${PN}-python = \
+"The ${PN}-python package includes RRDtool bindings for python."
+FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*"
+RDEPENDS_${PN}-python = "python"
+FILES_${PN}-dbg += "${libdir}/perl/vendor_perl/*/auto/RRDs/.debug \
+    ${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug"
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/initscript b/meta-oe/recipes-extended/rsyslog/rsyslog/initscript
new file mode 100644
index 0000000000..7a8f8f9918
--- /dev/null
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog/initscript
@@ -0,0 +1,118 @@
+#! /bin/sh
+#
+# This is an init script for openembedded
+# Copy it to /etc/init.d/rsyslog and type
+# > update-rc.d rsyslog defaults 5
+#
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+NAME=rsyslog
+RSYSLOGD=rsyslogd
+RSYSLOGD_BIN=/usr/sbin/rsyslogd
+RSYSLOGD_OPTIONS=""
+RSYSLOGD_PIDFILE=/var/run/rsyslogd.pid
+SCRIPTNAME=/etc/init.d/$NAME
+# Exit if the package is not installed
+[ -x "$RSYSLOGD_BIN" ] || exit 0
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+        DAEMON=$1
+        DAEMON_ARGS=$2
+        PIDFILE=$3
+        # Return
+        #   0 if daemon has been started
+        #   1 if daemon could not be started
+        #   if daemon had already been started, start-stop-daemon will return 1
+        #   so add -o/--oknodo(if nothing is done, exit 0)
+        start-stop-daemon -S --quiet --pidfile $PIDFILE --exec $DAEMON \
+                             --oknodo -- $DAEMON_ARGS || return 1
+}
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+        NAME=$1
+        PIDFILE=$2
+        # Return
+        #   0 if daemon has been stopped
+        #   1 if daemon was already stopped
+        #   2 if daemon could not be stopped
+        #   other if a failure occurred
+        # QUIT/TERM/INT should work here, but they don't ????? 
+        start-stop-daemon -K --quiet --signal KILL --pidfile $PIDFILE --name $NAME
+        RETVAL="$?"
+        rm -f $PIDFILE
+        return "$RETVAL"
+}
+#
+# Function that sends a SIGHUP to the daemon/service
+#
+do_reload() {
+        NAME=$1
+        PIDFILE=$2
+        start-stop-daemon -K --signal HUP --quiet --pidfile $PIDFILE --name $NAME
+        return 0
+}
+do_status() {
+        NAME=$1
+        PIDFILE=$2
+        # -t: test only but not stop
+        start-stop-daemon -K -t --quiet --pidfile $PIDFILE --name $NAME
+        # exit with status 0 if process is found
+        if [ "$?" = "0" ]; then
+                return 0
+        else
+                return 1
+        fi
+}
+case "$1" in
+  start)
+        echo -n "starting $RSYSLOGD ... "
+        do_start "$RSYSLOGD_BIN" "$RSYSLOGD_OPTIONS" "$RSYSLOGD_PIDFILE"
+        case "$?" in
+                0) echo "done" ;;
+                1) echo "failed" ;;
+        esac
+        ;;
+  stop)
+        echo -n "stopping $RSYSLOGD ... "
+        do_stop "$RSYSLOGD" "$RSYSLOGD_PIDFILE"
+        case "$?" in
+                0|1) echo "done" ;;
+                2) echo "failed" ;;
+        esac
+        ;;
+  reload|force-reload)
+        echo -n "reloading $RSYSLOGD ... "
+        do_reload "$RSYSLOGD" "$RSYSLOGD_PIDFILE"
+        echo "done"
+        ;;
+  restart)
+        $0 stop
+        $0 start
+        ;;
+  status)
+        echo -n "status $RSYSLOGD ... "
+        do_status "$RSYSLOGD" "$RSYSLOGD_PIDFILE"
+        if [ "$?" = "0" ]; then
+                echo "running"
+                exit 0        
+        else
+                echo "stopped"
+                exit 1        
+        fi
+        ;;
+  *)
+        echo "Usage: $SCRIPTNAME {start|stop|status|restart|reload|force-reload}" >&2
+        exit 3
+        ;;
+esac
+exit 0
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf
new file mode 100644
index 0000000000..54f8bb6a56
--- /dev/null
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf
@@ -0,0 +1,84 @@
+# if you experience problems, check
+# http://www.rsyslog.com/troubleshoot for assistance
+# rsyslog v3: load input modules
+# If you do not load inputs, nothing happens!
+# You may need to set the module load path if modules are not found.
+#
+# Ported from debian's sysklogd.conf
+$ModLoad immark   # provides --MARK-- message capability
+$ModLoad imuxsock # provides support for local system logging (e.g. via logger command)
+$ModLoad imklog   # kernel logging (formerly provided by rklogd)
+#
+# Set the default permissions
+#
+$FileCreateMode 0640
+$DirCreateMode 0755
+$Umask 0022
+auth,authpriv.*                 /var/log/auth.log
+*.*;auth,authpriv.none          -/var/log/syslog
+cron.*                          /var/log/cron.log
+daemon.*                        -/var/log/daemon.log
+kern.*                          -/var/log/kern.log
+lpr.*                           -/var/log/lpr.log
+mail.*                          -/var/log/mail.log
+user.*                          -/var/log/user.log
+#
+# Logging for the mail system.  Split it up so that
+# it is easy to write scripts to parse these files.
+#
+mail.info                       -/var/log/mail.info
+mail.warn                       -/var/log/mail.warn
+mail.err                        /var/log/mail.err
+# Logging for INN news system
+#
+news.crit                       /var/log/news.crit
+news.err                        /var/log/news.err
+news.notice                     -/var/log/news.notice
+#
+# Some `catch-all' logfiles.
+#
+*.=debug;\
+        auth,authpriv.none;\
+        news.none;mail.none     -/var/log/debug
+*.=info;*.=notice;*.=warn;\
+        auth,authpriv.none;\
+        cron,daemon.none;\
+        mail,news.none          -/var/log/messages
+#
+# Emergencies are sent to everybody logged in.
+#
+*.emerg                         :omusrmsg:*
+# Save boot messages also to boot.log
+local7.*                                                /var/log/boot.log
+# Remote Logging (we use TCP for reliable delivery)
+# An on-disk queue is created for this action. If the remote host is
+# down, messages are spooled to disk and sent when it is up again.
+#$WorkDirectory /var/spool/rsyslog # where to place spool files
+#$ActionQueueFileName uniqName # unique name prefix for spool files
+$ActionQueueMaxDiskSpace 10m   # 1gb space limit (use as much as possible)
+#$ActionQueueSaveOnShutdown on # save messages to disk on shutdown
+#$ActionQueueType LinkedList   # run asynchronously
+#$ActionResumeRetryCount -1    # infinite retries if host is down
+# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional
+#*.* @@remote-host:514
+# ######### Receiving Messages from Remote Hosts ##########
+# TCP Syslog Server:
+# provides TCP syslog reception and GSS-API (if compiled to support it)
+#$ModLoad imtcp.so  # load module
+#$InputTCPServerRun 514 # start up TCP listener at port 514
+# UDP Syslog Server:
+#$ModLoad imudp.so  # provides UDP syslog reception
+#$UDPServerRun 514 # start a UDP syslog server at standard port 514
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate
new file mode 100644
index 0000000000..ba1120af44
--- /dev/null
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate
@@ -0,0 +1,39 @@
+# /etc/logrotate.d/rsyslog - Ported from Debian
+/var/log/syslog
+{
+        rotate 7
+        daily
+        missingok
+        notifempty
+        delaycompress
+        compress
+        postrotate
+                /etc/init.d/rsyslog reload 2> /dev/null || true
+        endscript
+}
+/var/log/mail.info
+/var/log/mail.warn
+/var/log/mail.err
+/var/log/mail.log
+/var/log/daemon.log
+/var/log/kern.log
+/var/log/auth.log
+/var/log/user.log
+/var/log/lpr.log
+/var/log/cron.log
+/var/log/debug
+/var/log/messages
+{
+        rotate 4
+        weekly
+        missingok
+        notifempty
+        compress
+        delaycompress
+        sharedscripts
+        postrotate
+                /etc/init.d/rsyslog reload 2> /dev/null || true
+        endscript
+}
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb
new file mode 100644
index 0000000000..344a131579
--- /dev/null
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb
@@ -0,0 +1,105 @@
+SUMMARY = "Rsyslog is an enhanced multi-threaded syslogd"
+DESCRIPTION = "\
+Rsyslog is an enhanced syslogd supporting, among others, MySQL,\
+ PostgreSQL, failover log destinations, syslog/tcp, fine grain\
+ output format control, high precision timestamps, queued operations\
+ and the ability to filter on any message part. It is quite\
+ compatible to stock sysklogd and can be used as a drop-in replacement.\
+ Its advanced features make it suitable for enterprise-class,\
+ encryption protected syslog relay chains while at the same time being\
+ very easy to setup for the novice user."
+DEPENDS = "zlib libestr json-c bison-native flex-native"
+HOMEPAGE = "http://www.rsyslog.com/"
+LICENSE = "GPLv3 & LGPLv3 & Apache-2.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=51d9635e646fb75e1b74c074f788e973 \
+                    file://COPYING.LESSER;md5=cb7903f1e5c39ae838209e130dca270a \
+                    file://COPYING.ASL20;md5=052f8a09206615ab07326ff8ce2d9d32\
+"
+SRC_URI = "http://www.rsyslog.com/files/download/rsyslog/${BPN}-${PV}.tar.gz \
+           file://initscript \
+           file://rsyslog.conf \
+           file://rsyslog.logrotate \
+"
+SRC_URI[md5sum] = "ebcc010a6205c28eb505c0fe862f32c6"
+SRC_URI[sha256sum] = "276d094d1e4c62c770ec8a72723667f119eee038912b79cf3337d439bc2f9087"
+inherit autotools pkgconfig systemd update-rc.d update-alternatives
+EXTRA_OECONF += "--enable-cached-man-pages"
+# first line is default yes in configure
+PACKAGECONFIG ??= " \
+    zlib rsyslogd rsyslogrt klog inet regexp uuid libgcrypt \
+    imdiag gnutls \
+    ${@base_contains('DISTRO_FEATURES', 'snmp', 'snmp', '', d)} \
+    ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
+"
+# default yes in configure
+PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib,"
+PACKAGECONFIG[rsyslogd] = "--enable-rsyslogd,--disable-rsyslogd,,"
+PACKAGECONFIG[rsyslogrt] = "--enable-rsyslogrt,--disable-rsyslogrt,,"
+PACKAGECONFIG[inet] = "--enable-inet,--disable-inet,,"
+PACKAGECONFIG[klog] = "--enable-klog,--disable-klog,,"
+PACKAGECONFIG[regexp] = "--enable-regexp,--disable-regexp,,"
+PACKAGECONFIG[uuid] = "--enable-uuid,--disable-uuid,util-linux,"
+PACKAGECONFIG[libgcrypt] = "--enable-libgcrypt,--disable-libgcrypt,libgcrypt,"
+PACKAGECONFIG[testbench] = "--enable-testbench,--disable-testbench,,"
+# default no in configure
+PACKAGECONFIG[debug] = "--enable-debug,--disable-debug,,"
+PACKAGECONFIG[imdiag] = "--enable-imdiag,--disable-imdiag,,"
+PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp,"
+PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls,"
+PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir,systemd,"
+PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5,"
+PACKAGECONFIG[postgresql] = "--enable-pgsql,--disable-pgsql,postgresql,"
+PACKAGECONFIG[libdbi] = "--enable-libdbi,--disable-libdbi,libdbi,"
+PACKAGECONFIG[mail] = "--enable-mail,--disable-mail,,"
+PACKAGECONFIG[gui] = "--enable-gui,--disable-gui,,"
+do_install_append() {
+    install -d "${D}${sysconfdir}/init.d"
+    install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/rsyslogd
+    install -m 644 ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf
+    install -m 644 ${WORKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.rsyslog
+}
+FILES_${PN} += "${bindir}"
+INITSCRIPT_NAME = "rsyslogd"
+INITSCRIPT_PARAMS = "defaults"
+# higher than sysklogd's 100
+ALTERNATIVE_PRIORITY = "110"
+ALTERNATIVE_${PN} = "rsyslogd syslog-conf syslog-logrotate"
+ALTERNATIVE_LINK_NAME[rsyslogd] = "${base_sbindir}/syslogd"
+ALTERNATIVE_TARGET[rsyslogd] = "${sbindir}/rsyslogd"
+ALTERNATIVE_LINK_NAME[syslog-conf] = "${sysconfdir}/syslog.conf"
+ALTERNATIVE_TARGET[syslog-conf] = "${sysconfdir}/rsyslog.conf"
+ALTERNATIVE_LINK_NAME[syslog-logrotate] = "${sysconfdir}/logrotate.d/syslog"
+ALTERNATIVE_TARGET[syslog-logrotate] = "${sysconfdir}/logrotate.rsyslog"
+CONFFILES_${PN} = "${sysconfdir}/rsyslog.conf"
+RPROVIDES_${PN} += "${PN}-systemd"
+RREPLACES_${PN} += "${PN}-systemd"
+RCONFLICTS_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "${BPN}.service"
+RDEPENDS_${PN} += "logrotate"
+# no syslog-init for systemd
+python () {
+    if 'sysvinit' in d.getVar("DISTRO_FEATURES", True).split():
+        pn = d.getVar('PN', True)
+        sysconfdir = d.getVar('sysconfdir', True)
+        d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-init')
+        d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-init', '%s/init.d/syslogd' % (sysconfdir))
+        d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-init', '%s/init.d/rsyslogd' % (sysconfdir))
+}
diff --git a/meta-oe/recipes-extended/sip/sip-native_4.14.2.bb b/meta-oe/recipes-extended/sip/sip-native_4.14.2.bb
new file mode 100644
index 0000000000..602dc250f5
--- /dev/null
+++ b/meta-oe/recipes-extended/sip/sip-native_4.14.2.bb
@@ -0,0 +1,35 @@
+SUMMARY = "SIP is a C++/Python Wrapper Generator"
+AUTHOR = "Phil Thompson"
+HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip"
+SECTION = "devel"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://sipgen.sbf;endline=15;md5=61b2ce7ddd624968411804d2fa9d776c"
+# riverbankcomputing is upstream, but keeps only latest version, sf usually have few older
+#SRC_URI = "http://www.riverbankcomputing.com/static/Downloads/sip4/sip-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/pyqt/sip/sip-${PV}/sip-${PV}.tar.gz"
+SRC_URI[md5sum] = "b93442e745b3be2fad89de0686a76ce9"
+SRC_URI[sha256sum] = "1a9d3bf26c821f369c175f8e68946b79bc994da4f96e8f5ecff06e6ee7ac0528"
+S = "${WORKDIR}/sip-${PV}/sipgen"
+inherit qmake2 native python-dir
+EXTRA_QMAKEVARS_POST += "DESTDIR=${S} CONFIG=console"
+export BUILD_SYS
+export HOST_SYS
+export STAGING_LIBDIR
+export STAGING_INCDIR
+do_configure_prepend() {
+    cat sipgen.sbf | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, > sipgen.pro
+}
+do_install() {
+    install -d ${D}${bindir}
+    install -m 0755 sip ${D}${bindir}/sip
+    # python-pyqt expects sip4
+    ln -sf sip ${D}${bindir}/sip4
+    cd ${WORKDIR}/sip-${PV} && python configure.py
+    install -d ${D}${PYTHON_SITEPACKAGES_DIR}
+    install -m 0755 sip*.py ${D}${PYTHON_SITEPACKAGES_DIR}
+}
diff --git a/meta-oe/recipes-extended/smartmontools/files/initd.smartd b/meta-oe/recipes-extended/smartmontools/files/initd.smartd
new file mode 100755
index 0000000000..29c27e4756
--- /dev/null
+++ b/meta-oe/recipes-extended/smartmontools/files/initd.smartd
@@ -0,0 +1,108 @@
+#! /bin/sh
+# smartmontools init file for smartd
+# Copyright (C) 2002-8 Bruce Allen <smartmontools-support@lists.sourceforge.net>
+# $Id: smartd.initd.in 3360 2011-06-06 19:25:36Z chrfranke $
+# For RedHat and cousins:
+# chkconfig: - 60 60
+# description: Self Monitoring and Reporting Technology (SMART) Daemon
+# processname: smartd 
+# For SuSE and cousins
+### BEGIN INIT INFO
+# Provides:                   smartd
+# Required-Start:             $syslog $remote_fs
+# Should-Start:               sendmail
+# Required-Stop:              $syslog $remote_fs
+# Should-Stop:                sendmail
+# Default-Start:              
+# Default-Stop:               0 1 2 3 4 5 6
+# Short-Description:          Monitors disk and tape health via S.M.A.R.T.
+# Description:                Start S.M.A.R.T. disk and tape monitor.
+### END INIT INFO
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the Free
+# Software Foundation; either version 2, or (at your option) any later
+# version. 
+# You should have received a copy of the GNU General Public License (for
+# example COPYING); if not, write to the Free Software Foundation, Inc., 675
+# Mass Ave, Cambridge, MA 02139, USA.
+# This code was originally developed as a Senior Thesis by Michael Cornwell
+# at the Concurrent Systems Laboratory (now part of the Storage Systems
+# Research Center), Jack Baskin School of Engineering, University of
+# California, Santa Cruz. http://ssrc.soe.ucsc.edu/.
+# Uncomment the line below to pass options to smartd on startup. 
+# Note that distribution specific configuration files like
+# /etc/{default,sysconfig}/smartmontools might override these
+#smartd_opts="--interval=1800"
+SMARTD_BIN=/usr/sbin/smartd
+SMARTDPID=/var/run/smartd.pid
+[ -x $SMARTD_BIN ] || exit 0
+RET=0
+# source configuration file
+[ -r /etc/default/rcS ] && . /etc/default/rcS
+[ -r /etc/default/smartmontools ] && . /etc/default/smartmontools
+smartd_opts="--pidfile $SMARTDPID $smartd_opts"
+case "$1" in
+        start)
+                echo -n "Starting S.M.A.R.T. daemon: smartd"
+                if start-stop-daemon --start --quiet --pidfile $SMARTDPID \
+                        --exec $SMARTD_BIN -- $smartd_opts; then
+                        echo "."
+                else
+                        echo " (failed)"
+                        RET=1
+                fi
+                ;;
+        stop)
+                echo -n "Stopping S.M.A.R.T. daemon: smartd"
+                start-stop-daemon --stop --quiet --oknodo --pidfile $SMARTDPID
+                echo "."
+                ;;
+        restart)
+                $0 stop
+                $0 start
+                ;;
+        force-reload)
+                $0 reload || $0 restart
+                ;;
+        reload)
+                echo -n "Reload S.M.A.R.T. daemon: smartd"
+                if start-stop-daemon --stop --quiet --signal 1 \
+                        --pidfile $SMARTDPID; then
+                        echo "."
+                else
+                        echo " (failed)"
+                        RET=1
+                fi
+                ;;
+        report)
+                echo -n "Checking SMART devices now"
+                if start-stop-daemon --stop --quiet --signal 10 \
+                        --pidfile $SMARTDPID; then
+                        echo "."
+                else
+                        echo " (failed)"
+                        RET=1
+                fi
+                ;;
+        status)
+                if pidof $SMARTD_BIN >/dev/null; then
+                        echo "$SMARTD_BIN is running."
+                else
+                        echo "$SMARTD_BIN is not running."
+                        RET=1
+                fi
+                ;;
+        *)
+                echo "Usage: $0 {start|stop|restart|force-reload|reload|report|status}"
+                exit 1
+esac
+exit $RET
diff --git a/meta-oe/recipes-extended/smartmontools/smartmontools_6.2.bb b/meta-oe/recipes-extended/smartmontools/smartmontools_6.2.bb
new file mode 100644
index 0000000000..9b9454c880
--- /dev/null
+++ b/meta-oe/recipes-extended/smartmontools/smartmontools_6.2.bb
@@ -0,0 +1,39 @@
+SUMMARY = "Control and monitor storage systems using S.M.A.R.T"
+DESCRIPTION = \
+"The smartmontools package contains two utility programs (smartctl \
+and smartd) to control and monitor storage systems using the Self-\
+Monitoring, Analysis and Reporting Technology System (SMART) built \
+into most modern ATA and SCSI hard disks. In many cases, these \
+utilities will provide advanced warning of disk degradation and failure."
+HOMEPAGE = "http://smartmontools.sourceforge.net/"
+SECTION = "console/utils"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+SRC_URI = "${SOURCEFORGE_MIRROR}/smartmontools/smartmontools-${PV}.tar.gz \
+           file://initd.smartd \
+          "
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'libcap-ng', 'libcap-ng', '', d)} \
+                   ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
+                  "
+PACKAGECONFIG[libcap-ng] = "--with-libcap-ng=yes,--with-libcap-ng=no,libcap-ng"
+PACKAGECONFIG[selinux] = "--with-selinux=yes,--with-selinux=no,libselinux"
+SRC_URI[md5sum] = "d44f84081a12cef79cd17f78044351fc"
+SRC_URI[sha256sum] = "486f660579bb0fb4f6b927ded7531cb1f99685c666397377761c5b04dd96065b"
+inherit autotools update-rc.d
+do_install_append () {
+        #install the init.d/smartd
+        install -d ${D}${sysconfdir}/init.d
+        install -p -m 0755 ${WORKDIR}/initd.smartd ${D}${sysconfdir}/init.d/smartd
+}
+INITSCRIPT_NAME = "smartd"
+INITSCRIPT_PARAMS = "start 60 . stop 60 0 1 2 3 4 5 6 ."
+RDEPENDS_${PN} += "mailx"
diff --git a/meta-oe/recipes-extended/socketcan/can-utils_git.bb b/meta-oe/recipes-extended/socketcan/can-utils_git.bb
new file mode 100644
index 0000000000..d8de9dfd27
--- /dev/null
+++ b/meta-oe/recipes-extended/socketcan/can-utils_git.bb
@@ -0,0 +1,16 @@
+SUMMARY = "Linux CAN network development utilities"
+DESCRIPTION = "Linux CAN network development"
+LICENSE = "GPLv2 & BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://include/linux/can.h;endline=43;md5=390a2c9a3c5e3595a069ac1436553ee7"
+DEPENDS = "libsocketcan"
+SRC_URI = "git://git.gitorious.org/linux-can/${BPN}.git;protocol=git;branch=master"
+SRCREV = "67a2bdcd336e6becfa5784742e18c88dbeddc973"
+PV = "0.0+gitr${SRCPV}"
+S = "${WORKDIR}/git"
+inherit autotools pkgconfig
diff --git a/meta-oe/recipes-extended/socketcan/canutils/0001-canutils-candump-Add-error-frame-s-handling.patch b/meta-oe/recipes-extended/socketcan/canutils/0001-canutils-candump-Add-error-frame-s-handling.patch
new file mode 100644
index 0000000000..fcc38e0617
--- /dev/null
+++ b/meta-oe/recipes-extended/socketcan/canutils/0001-canutils-candump-Add-error-frame-s-handling.patch
@@ -0,0 +1,94 @@
+From bab595e38295dcafcfc17a011d3d51f2df1618e6 Mon Sep 17 00:00:00 2001
+From: AnilKumar Ch <anilkumar@ti.com>
+Date: Tue, 10 Jan 2012 18:55:11 +0530
+Subject: [PATCH] canutils: candump: Add error frame's handling
+This patch adds the error handling capability to candump utility
+by adding error flags for displaying all kind of error frames
+like tx_timeout, lost arbitration, controller problems, buserrors,
+bus warnings etc.
+Usage of candump for error frame display on console:
+candump [<can-interface>] [Options]
+Ex: candump can0 --error
+This patch is created on top of canutils-4.0.6 tag from
+http://git.pengutronix.de/?p=tools/canutils.git
+Signed-off-by: AnilKumar Ch <anilkumar@ti.com>
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+Upstream-Status: Backport
+ src/candump.c | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+diff --git a/src/candump.c b/src/candump.c
+index 259d442..c16425b 100644
+--- a/src/candump.c
+++ b/src/candump.c
+@@ -20,6 +20,7 @@
+ 
+ #include <linux/can.h>
+ #include <linux/can/raw.h>
+#include <linux/can/error.h>
+ 
+ extern int optind, opterr, optopt;
+ 
+@@ -40,6 +41,7 @@ static void print_usage(char *prg)
+                " -p, --protocol=PROTO\t"       "CAN protocol (default CAN_RAW = %d)\n"
+                "     --filter=id:mask[:id:mask]...\n"
+                "\t\t\t"                        "apply filter\n"
+               " -e, --error\t\t"              "dump error frames along with data frames\n"
+                " -h, --help\t\t"               "this help\n"
+                " -o <filename>\t\t"            "output into filename\n"
+                " -d\t\t\t"                     "daemonize\n"
+@@ -86,6 +88,11 @@ int main(int argc, char **argv)
+        int nbytes, i;
+        int opt, optdaemon = 0;
+        uint32_t id, mask;
+       int error = 0;
+       can_err_mask_t err_mask = (CAN_ERR_TX_TIMEOUT | CAN_ERR_LOSTARB |
+                                       CAN_ERR_CRTL | CAN_ERR_PROT |
+                                       CAN_ERR_TRX | CAN_ERR_ACK | CAN_ERR_BUSOFF |
+                                       CAN_ERR_BUSERROR);
+ 
+        signal(SIGPIPE, SIG_IGN);
+ 
+@@ -95,6 +102,7 @@ int main(int argc, char **argv)
+                { "protocol", required_argument, 0, 'p' },
+                { "type", required_argument, 0, 't' },
+                { "filter", required_argument, 0, FILTER_OPTION },
+               { "error", no_argument, 0, 'e' },
+                { "version", no_argument, 0, VERSION_OPTION},
+                { 0, 0, 0, 0},
+        };
+@@ -121,6 +129,10 @@ int main(int argc, char **argv)
+                        proto = strtoul(optarg, NULL, 0);
+                        break;
+ 
+               case 'e':
+                       error = 1;
+                       break;
+
+                case 'o':
+                        optout = optarg;
+                        break;
+@@ -186,6 +198,14 @@ int main(int argc, char **argv)
+                }
+        }
+ 
+       if (error) {
+               if (setsockopt(s, SOL_CAN_RAW, CAN_RAW_ERR_FILTER, &err_mask,
+                              sizeof(err_mask)) != 0) {
+                       perror("setsockopt");
+                       exit(1);
+               }
+       }
+
+        if (optdaemon)
+                daemon(1, 0);
+        else {
+-- 
+1.8.3.1
diff --git a/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb b/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb
new file mode 100644
index 0000000000..8195ed9183
--- /dev/null
+++ b/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb
@@ -0,0 +1,17 @@
+SUMMARY = "canutils (PTX flavour)"
+HOMEPAGE = "http://www.pengutronix.de"
+SECTION = "console/network"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+DEPENDS = "libsocketcan"
+SRCREV = "299dff7f5322bf0348dcdd60071958ebedf5f09d"
+SRC_URI = "git://git.pengutronix.de/git/tools/canutils.git;protocol=git \
+    file://0001-canutils-candump-Add-error-frame-s-handling.patch \
+"
+S = "${WORKDIR}/git"
+inherit autotools
diff --git a/meta-oe/recipes-extended/socketcan/libsocketcan/0001-Use-strcmp-instead-of-sizeof-on-char-string.patch b/meta-oe/recipes-extended/socketcan/libsocketcan/0001-Use-strcmp-instead-of-sizeof-on-char-string.patch
new file mode 100644
index 0000000000..aa6196ee90
--- /dev/null
+++ b/meta-oe/recipes-extended/socketcan/libsocketcan/0001-Use-strcmp-instead-of-sizeof-on-char-string.patch
@@ -0,0 +1,39 @@
+From 94094cc4ee7ae585da3e5e7e83e7d82b5d6de656 Mon Sep 17 00:00:00 2001
+From: Alexander Stein <alexander.stein@systec-electronic.com>
+Date: Wed, 14 Nov 2012 12:13:06 +0100
+Subject: [PATCH] Use strcmp instead of sizeof on char* string
+This bug was detected by the clang warning:
+libsocketcan.c:384:16: warning: argument to 'sizeof' in 'strncmp' call
+is the same expression as the source; did you mean to provide an
+explicit length? [-Wsizeof-pointer-memaccess]
+sizeof(name)) != 0)
+~~~~~~~^~~~~~
+Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+Upstream-Status: Backport
+ src/libsocketcan.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+diff --git a/src/libsocketcan.c b/src/libsocketcan.c
+index fedcbdc..841c2ed 100644
+--- a/src/libsocketcan.c
+++ b/src/libsocketcan.c
+@@ -379,9 +379,8 @@ static int do_get_nl_link(int fd, __u8 acquire, const char *name, void *res)
+                                nl_msg->nlmsg_len - NLMSG_LENGTH(sizeof(struct ifaddrmsg));
+                        parse_rtattr(tb, IFLA_MAX, IFLA_RTA(ifi), len);
+ 
+-                       if (strncmp
+-                           ((char *)RTA_DATA(tb[IFLA_IFNAME]), name,
+-                            sizeof(name)) != 0)
+                       if (strcmp
+                           ((char *)RTA_DATA(tb[IFLA_IFNAME]), name) != 0)
+                                continue;
+ 
+                        if (tb[IFLA_LINKINFO])
+-- 
+1.8.3.1
diff --git a/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.9.bb b/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.9.bb
new file mode 100644
index 0000000000..df3c163ba3
--- /dev/null
+++ b/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.9.bb
@@ -0,0 +1,20 @@
+SUMMARY = "Control basic functions in socketcan from userspace"
+HOMEPAGE = "http://www.pengutronix.de"
+SECTION = "libs/network"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://src/libsocketcan.c;beginline=3;endline=17;md5=97e38adced4385d8fba1ae2437cedee1"
+SRCREV = "e1a224bf1c409adf0c02b07a90deada634e54b88"
+SRC_URI = "git://git.pengutronix.de/git/tools/libsocketcan.git;protocol=git \
+    file://0001-Use-strcmp-instead-of-sizeof-on-char-string.patch \
+"
+S = "${WORKDIR}/git"
+inherit autotools pkgconfig
+do_configure_prepend() {
+    sed -i -e s:tests/GNUmakefile::g -e s:trunk:0.0.9: configure.ac
+}
diff --git a/meta-oe/recipes-extended/subsurface/subsurface_git.bb b/meta-oe/recipes-extended/subsurface/subsurface_git.bb
new file mode 100644
index 0000000000..eb4536aa61
--- /dev/null
+++ b/meta-oe/recipes-extended/subsurface/subsurface_git.bb
@@ -0,0 +1,30 @@
+SUMMARY = "Subsurface is an open source dive log program"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+DEPENDS = "libdivecomputer gtk+ libxml2 glib-2.0 gconf"
+inherit gtk-icon-cache
+inherit gitpkgv
+PKGV = "${GITPKGVTAG}"
+PV = "1.1"
+SRCREV = "bd275d73ac06823619230915a3aa29deddc996fb"
+SRC_URI = "git://subsurface.hohndel.org/subsurface.git"
+S = "${WORKDIR}/git"
+EXTRA_OEMAKE = "CC='${CC}' \
+                libdc-usr=${STAGING_INCDIR}/libdivecomputer/* \
+                LIBDIVECOMPUTERINCLUDES=${STAGING_INCDIR}/libdivecomputer \
+                LIBDIVECOMPUTERARCHIVE=${STAGING_LIBDIR}/libdivecomputer.a \
+"
+do_install() {
+    oe_runmake install DESTDIR=${D}
+    rm ${D}${datadir}/icons/hicolor/icon-theme.cache
+}
+FILES_${PN} += "${datadir}/icons/hicolor/scalable/apps/subsurface.svg"
+RRECOMMENDS_${PN}_append_libc-glibc = " eglibc-gconv-iso8859-15"
diff --git a/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/configure.patch b/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/configure.patch
new file mode 100644
index 0000000000..8b98707cd7
--- /dev/null
+++ b/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/configure.patch
@@ -0,0 +1,128 @@
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+--- t1lib-5.0.2/configure.in~configure.patch
+++ t1lib-5.0.2/configure.in
+@@ -75,9 +75,9 @@
+ T1LIB_VERSIONSTRING=\"MACRO_T1LIB_IDENTIFIER\"
+ 
+ 
+-dnl We use this file by Andreas Zeller to check for libXaw
+-builtin(include, ac-tools/ice_find_athena.m4)
+-builtin(include, ac-tools/aclocal.m4)
+#dnl We use this file by Andreas Zeller to check for libXaw
+#builtin(include, ac-tools/ice_find_athena.m4)
+#builtin(include, ac-tools/aclocal.m4)
+ 
+ dnl We want these before the checks, so the checks can modify their values.
+ test -z "$LDLIBS" && LDLIBS=-lm   AC_SUBST(LDLIBS)
+@@ -161,6 +161,7 @@
+ 
+ dnl **** Check for underscore on external symbols ****
+ 
+AH_TEMPLATE([NEED_UNDERSCORE_PREFIX], [Define if external symbols need an underscore prefix])
+ AC_CACHE_CHECK("whether external symbols need an underscore prefix",
+                ac_cv_c_extern_prefix,
+ [saved_libs=$LIBS
+@@ -178,68 +179,48 @@
+   AC_DEFINE(NEED_UNDERSCORE_PREFIX)
+ fi
+ 
+-dnl **** Check which ANSI integer type is 16 bit 
+dnl **** Check which ANSI integer type is 16 bit
+T1_AA_TYPE16=""
+for type in short int; do
+       if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x2"; then
+               T1_AA_TYPE16="-DT1_AA_TYPE16=$type"
+               T1_INT16="$type"
+               break
+       fi
+done
+ 
+-AC_CACHE_CHECK( "which ANSI integer type is 16 bit", ac_16bit_type,
+-               AC_TRY_RUN([
+-int main(void) {
+-  if (sizeof(short)==2)
+-    return(0);
+-  else if (sizeof(int)==2)
+-    return(1);
+-  else
+-    return(2);
+-}], ac_16bit_type="short", ac_16bit_type="int", ac_16bit_type=))
+-if test "$ac_16bit_type" = "short"
+-then
+-  T1_AA_TYPE16="-DT1_AA_TYPE16=short"
+-  T1_INT16="short"
+-else
+-  T1_AA_TYPE16="-DT1_AA_TYPE16=int"
+-  T1_INT16="int"
+if test x"$T1_AA_TYPE16" = "x"; then
+       AC_MSG_ERROR("Unable to determine which integer type is 16 bit.")
+ fi
+ 
+-
+ dnl **** Check which ANSI integer type is 32 bit 
+T1_AA_TYPE32=""
+for type in int long; do
+       if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x4"; then
+               T1_AA_TYPE32="-DT1_AA_TYPE32=$type"
+               T1_INT32="$type"
+               break
+       fi
+done
+ 
+-AC_CACHE_CHECK( "which ANSI integer type is 32 bit", ac_32bit_type,
+-               AC_TRY_RUN([
+-int main(void) {
+-  if (sizeof(int)==4)
+-    return(0);
+-  else if (sizeof(long)==4)
+-    return(1);
+-  else
+-    return(2);
+-}], ac_32bit_type="int", ac_32bit_type="long", ac_32bit_type=))
+-if test "$ac_32bit_type" = "int"
+-then
+-  T1_AA_TYPE32="-DT1_AA_TYPE32=int"
+-  T1_INT32="int"
+-else
+-  T1_AA_TYPE32="-DT1_AA_TYPE32=long"
+-  T1_INT32="long"
+if test x"$T1_AA_TYPE32" = "x"; then
+       AC_MSG_ERROR("Unable to determine which integer type is 32 bit.")
+ fi
+ 
+-
+ dnl **** Check which ANSI integer type is 64 bit 
+T1_AA_TYPE64=""
+for type in long long_long; do
+       if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x8"; then
+               AC_MSG_WARN("$type is 64 bit")
+               T1_AA_TYPE64="-DT1_AA_TYPE64=\"`echo $type|tr '_' ' '`\""
+               break
+       fi
+done
+ 
+-AC_CACHE_CHECK( "which ANSI integer type is 64 bit", ac_64bit_type,
+-               AC_TRY_RUN([
+-int main(void) {
+-  if (sizeof(long)==8)
+-    return(0);
+-  else
+-    return(1);
+-}], ac_64bit_type="long", ac_64bit_type="<none>"))
+-if test "$ac_64bit_type" = "long"
+-then
+-  T1_AA_TYPE64="-DT1_AA_TYPE64=long"
+-else
+-  T1_AA_TYPE64=
+if test x"$T1_AA_TYPE64" = "x"; then
+       AC_MSG_ERROR("Unable to determine which integer type is 64 bit.")
+ fi
+ 
+-
+ CFLAGS="${CFLAGS} -DT1LIB_IDENT=\"\\\"${T1LIB_IDENTIFIER}\\\"\" -DGLOBAL_CONFIG_DIR=\"\\\"${T1LIB_DATA_DIR}\\\"\""
+ 
+ dnl **** Check for functions and header files ****
diff --git a/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/libtool.patch b/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/libtool.patch
new file mode 100644
index 0000000000..e050025739
--- /dev/null
+++ b/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/libtool.patch
@@ -0,0 +1,116 @@
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+--- t1lib-5.0.2/Makefile.in~libtool
+++ t1lib-5.0.2/Makefile.in
+@@ -18,7 +18,8 @@
+ # Last modified:       2001-04-01
+ #
+ 
+-SHELL     = /bin/sh
+SHELL     = @SHELL@
+LIBTOOL   = @LIBTOOL@
+ CC        = @CC@
+ CPP       = @CPP@
+ CFLAGS    = @CFLAGS@
+@@ -150,7 +151,7 @@
+        $(RM) examples/Makefile
+        $(RM) xglyph/Makefile
+        $(RM) doc/Makefile
+-       $(RM) libtool
+       $(RM) $(LIBTOOL)
+ 
+ 
+ # The following two targets are for building and cleaning the python-
+--- t1lib-5.0.2/examples/Makefile.in~libtool
+++ t1lib-5.0.2/examples/Makefile.in
+@@ -14,9 +14,10 @@
+ # Last modified:       2001-04-01
+ #
+ 
+top_builddir = @top_builddir@
+ 
+-LIBTOOL   = ../libtool
+-SHELL     = /bin/sh
+LIBTOOL   = @LIBTOOL@
+SHELL     = @SHELL@
+ CC        = @CC@
+ CPP       = @CPP@
+ CFLAGS    = @CFLAGS@
+--- t1lib-5.0.2/lib/Makefile.in~libtool
+++ t1lib-5.0.2/lib/Makefile.in
+@@ -15,8 +15,10 @@
+ #
+ # Contributions by H.Kakugawa to use libtool!
+ 
+-LIBTOOL   = ../libtool
+-SHELL     = /bin/sh
+top_builddir = @top_builddir@
+
+LIBTOOL   = @LIBTOOL@
+SHELL     = @SHELL@
+ CC        = @CC@
+ CPP       = @CPP@
+ CFLAGS    = @CFLAGS@
+--- t1lib-5.0.2/lib/t1lib/Makefile.in~libtool
+++ t1lib-5.0.2/lib/t1lib/Makefile.in
+@@ -14,8 +14,10 @@
+ #
+ # Modified by H.Kakugawa to use libtool
+ 
+-LIBTOOL   = ../../libtool
+-SHELL     = /bin/sh
+top_builddir = @top_builddir@
+
+LIBTOOL   = @LIBTOOL@
+SHELL     = @SHELL@
+ CC        = @CC@
+ CPP       = @CPP@
+ CFLAGS    = @CFLAGS@
+--- t1lib-5.0.2/lib/type1/Makefile.in~libtool
+++ t1lib-5.0.2/lib/type1/Makefile.in
+@@ -14,8 +14,10 @@
+ #
+ # Modified by H.Kakugawa to use libtool
+ 
+-LIBTOOL   = ../../libtool
+-SHELL     = /bin/sh
+top_builddir = @top_builddir@
+
+LIBTOOL   = @LIBTOOL@
+SHELL     = @SHELL@
+ CC        = @CC@
+ CPP       = @CPP@
+ CFLAGS    = @CFLAGS@
+--- t1lib-5.0.2/type1afm/Makefile.in~libtool
+++ t1lib-5.0.2/type1afm/Makefile.in
+@@ -15,8 +15,10 @@
+ #
+ # Modified by H.Kakugawa to use libtool
+ 
+-LIBTOOL   = ../libtool
+-SHELL     = /bin/sh
+top_builddir = @top_builddir@
+
+LIBTOOL   = @LIBTOOL@
+SHELL     = @SHELL@
+ CC        = @CC@
+ CPP       = @CPP@
+ CFLAGS    = @CFLAGS@
+--- t1lib-5.0.2/xglyph/Makefile.in~libtool
+++ t1lib-5.0.2/xglyph/Makefile.in
+@@ -15,8 +15,10 @@
+ #
+ # Modified by H.Kakugawa to use libtool
+ 
+-LIBTOOL   = ../libtool
+-SHELL     = /bin/sh
+top_builddir = @top_builddir@
+
+LIBTOOL   = @LIBTOOL@
+SHELL     = @SHELL@
+ CC        = @CC@
+ CPP       = @CPP@
+ CFLAGS    = @CFLAGS@
diff --git a/meta-oe/recipes-extended/t1lib/t1lib_5.1.2.bb b/meta-oe/recipes-extended/t1lib/t1lib_5.1.2.bb
new file mode 100644
index 0000000000..86cc166e2d
--- /dev/null
+++ b/meta-oe/recipes-extended/t1lib/t1lib_5.1.2.bb
@@ -0,0 +1,26 @@
+SUMMARY = "A Type1 Font Rastering Library"
+SECTION = "libs"
+DEPENDS = "virtual/libx11 libxaw"
+LICENSE = "LGPLv2 GPLv2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=8ca43cbc842c2336e835926c2166c28b \
+                    file://LGPL;md5=6e29c688d912da12b66b73e32b03d812 \
+"
+SRC_URI = "${DEBIAN_MIRROR}/main/t/t1lib/t1lib_${PV}.orig.tar.gz \
+           file://configure.patch \
+           file://libtool.patch"
+SRC_URI[md5sum] = "a5629b56b93134377718009df1435f3c"
+SRC_URI[sha256sum] = "821328b5054f7890a0d0cd2f52825270705df3641dbd476d58d17e56ed957b59"
+inherit autotools-brokensep
+# Fix GNU_HASH problem
+TARGET_CC_ARCH += "${LDFLAGS}"
+EXTRA_OECONF = "--with-x --without-athena"
+EXTRA_OEMAKE = "without_doc"
+FILES_${PN} += " ${datadir}/t1lib/t1lib.config"
+FILES_${PN}-doc = "${datadir}/t1lib/doc/t1lib_doc.pdf"
diff --git a/meta-oe/recipes-extended/tcsh/files/01_build.1.patch b/meta-oe/recipes-extended/tcsh/files/01_build.1.patch
new file mode 100644
index 0000000000..b9f41ade90
--- /dev/null
+++ b/meta-oe/recipes-extended/tcsh/files/01_build.1.patch
@@ -0,0 +1,16 @@
+Author: Franz Pletz <fpletz@franz-pletz.org>
+Description: Original comment: Fix build
+Not sure why we have this patch. Let's keep it for compatibility.
+--- a/pathnames.h
+++ b/pathnames.h
+@@ -92,6 +92,10 @@
+ # define _PATH_TCSHELL         "/local/bin/tcsh"       /* use ram disk */
+ #endif /* _MINIX && !_PATH_TCSHELL */
+ 
+#ifndef _PATH_TCSHELL
+# define _PATH_TCSHELL         "/bin/tcsh"             /* Debian */
+#endif /* !_PATH_TCSHELL */
+
+ #if defined(__EMX__) && !defined(_PATH_DEVNULL)
+ # define _PATH_DEVNULL         "nul"
+ #endif /* __EMX__ && !_PATH_DEVNULL */
diff --git a/meta-oe/recipes-extended/tcsh/files/01_build.2.patch b/meta-oe/recipes-extended/tcsh/files/01_build.2.patch
new file mode 100644
index 0000000000..ff2753154f
--- /dev/null
+++ b/meta-oe/recipes-extended/tcsh/files/01_build.2.patch
@@ -0,0 +1,13 @@
+Author: Franz Pletz <fpletz@franz-pletz.org>
+Description: Update manpage.
+--- a/tcsh.man
+++ b/tcsh.man
+@@ -578,7 +578,7 @@ Repeating \fIdabbrev-expand\fR without a
+ changes to the next previous word etc., skipping identical matches
+ much like \fIhistory-search-backward\fR does.
+ .TP 8
+-.B delete-char \fR(not bound)
+.B delete-char \fR(bound to `Del' if using the standard \fI/etc/csh.cshrc\fR)
+ Deletes the character under the cursor.
+ See also \fIdelete-char-or-list-or-eof\fR.
+ .TP 8
diff --git a/meta-oe/recipes-extended/tcsh/files/01_build.3.patch b/meta-oe/recipes-extended/tcsh/files/01_build.3.patch
new file mode 100644
index 0000000000..d36c177af7
--- /dev/null
+++ b/meta-oe/recipes-extended/tcsh/files/01_build.3.patch
@@ -0,0 +1,13 @@
+Author: Franz Pletz <fpletz@franz-pletz.org>
+Description: Enable NODOT
+--- a/config_f.h
+++ b/config_f.h
+@@ -98,7 +98,7 @@
+ /*
+  * NODOT       Don't put "." in the default path, for security reasons
+  */
+-#undef NODOT
+#define NODOT
+ 
+ /*
+  * AUTOLOGOUT  tries to determine if it should set autologout depending
diff --git a/meta-oe/recipes-extended/tcsh/files/12_unknown_lscolors.patch b/meta-oe/recipes-extended/tcsh/files/12_unknown_lscolors.patch
new file mode 100644
index 0000000000..faa59cc800
--- /dev/null
+++ b/meta-oe/recipes-extended/tcsh/files/12_unknown_lscolors.patch
@@ -0,0 +1,24 @@
+Author: Franz Pletz <fpletz@franz-pletz.org>
+Description: Don't die on unknown LS_COLORS values
+Removing the patch causes a segfault when dircolors is set by coreutils' dircolors.
+Debian-Bug: #592089
+--- a/tw.color.c
+++ b/tw.color.c
+@@ -239,13 +239,10 @@ parseLS_COLORS(const Char *value)
+                    if ((Char)variables[i].variable[0] == (v[0] & CHAR) &&
+                        (Char)variables[i].variable[1] == (v[1] & CHAR))
+                        break;
+-               if (i < nvariables) {
+-                   v += 3;
+               v += 3;
+               if (i < nvariables)
+                    getstring(&c, &v, &variables[i].color, ':');
+-                   continue;
+-               }
+-               else
+-                   stderror(ERR_BADCOLORVAR, v[0], v[1]);
+               continue;
+            }
+            break;
+        }
diff --git a/meta-oe/recipes-extended/tcsh/files/15_no-strip.patch b/meta-oe/recipes-extended/tcsh/files/15_no-strip.patch
new file mode 100644
index 0000000000..cbc9f65d04
--- /dev/null
+++ b/meta-oe/recipes-extended/tcsh/files/15_no-strip.patch
@@ -0,0 +1,14 @@
+Author: Lucas Nussbaum <lucas@debian.org>
+Description: do not strip binary
+ Stripping should be handled by dh_strip instead, so DEB_BUILD_OPTIONS=nostrip works.
+ Closes: #438109, #411607
+--- a/Makefile.in
+++ b/Makefile.in
+@@ -596,7 +596,6 @@ install: tcsh$(EXEEXT)
+        -mkdir -p ${DESTBIN}
+        -mv -f ${DESTBIN}/tcsh$(EXEEXT)  ${DESTBIN}/tcsh.old
+        cp tcsh$(EXEEXT) ${DESTBIN}/tcsh$(EXEEXT)
+-       -strip ${DESTBIN}/tcsh$(EXEEXT)
+        chmod 755 ${DESTBIN}/tcsh$(EXEEXT)
+ 
+ install.man: tcsh.man
diff --git a/meta-oe/recipes-extended/tcsh/files/disable-broken-test.patch b/meta-oe/recipes-extended/tcsh/files/disable-broken-test.patch
new file mode 100644
index 0000000000..0bda0ba103
--- /dev/null
+++ b/meta-oe/recipes-extended/tcsh/files/disable-broken-test.patch
@@ -0,0 +1,14 @@
+Author: Lucas Nussbaum <lucas@debian.org>
+Description: disable syntactically incorrect test
+--- a/tests/lexical.at
+++ b/tests/lexical.at
+@@ -172,9 +172,6 @@
+ AT_DATA([nohist.csh],
+ [echo ! space !        tab != "!(" newline !
+ ])
+-AT_CHECK([tcsh -f nohist.csh], ,
+-[[! space ! tab != !( newline !
+-]])
+ 
+ AT_CLEANUP
+ 
diff --git a/meta-oe/recipes-extended/tcsh/files/disable-lexical.at-31.patch b/meta-oe/recipes-extended/tcsh/files/disable-lexical.at-31.patch
new file mode 100644
index 0000000000..98a9b2e1d5
--- /dev/null
+++ b/meta-oe/recipes-extended/tcsh/files/disable-lexical.at-31.patch
@@ -0,0 +1,30 @@
+--- a/tests/lexical.at
+++ b/tests/lexical.at
+@@ -27,27 +27,6 @@ AT_CHECK([tcsh -f oneword.csh], ,
+ 
+ AT_CLEANUP
+ 
+-
+-AT_SETUP([Comments])
+-
+-AT_CHECK([echo 'echo OK@%:@comment' | tcsh -f], , [OK
+-])
+-
+-AT_CHECK([tcsh -f -c 'echo @%:@no comment'], ,
+-[@%:@no comment
+-])
+-
+-AT_DATA([comment2.csh],
+-[[echo testing...@%:@\
+-OK
+-]])
+-AT_CHECK([tcsh -f comment2.csh], ,
+-[testing... OK
+-])
+-
+-AT_CLEANUP
+-
+-
+ AT_SETUP([Escaping special characters])
+ 
+ AT_DATA([nosplit.csh],
diff --git a/meta-oe/recipes-extended/tcsh/files/disable-test-nice.patch b/meta-oe/recipes-extended/tcsh/files/disable-test-nice.patch
new file mode 100644
index 0000000000..79f918c083
--- /dev/null
+++ b/meta-oe/recipes-extended/tcsh/files/disable-test-nice.patch
@@ -0,0 +1,23 @@
+Author: Lucas Nussbaum <lucas@debian.org>
+Description: disable test that fails on the buildd with
+  "setpriority: Permission denied".
+--- a/tests/commands.at
+++ b/tests/commands.at
+@@ -888,17 +888,6 @@ TCSH_UNTESTED([migrate])
+ TCSH_UNTESTED([newgrp])
+ 
+ 
+-AT_SETUP([nice])
+-
+-# Nothing really tested
+-AT_CHECK([tcsh -f -c 'nice set var=1; echo $?var'], ,
+-[0
+-])
+-
+-
+-AT_CLEANUP
+-
+-
+ AT_SETUP([nohup])
+ 
+ AT_DATA([nohup.csh],
diff --git a/meta-oe/recipes-extended/tcsh/files/disable-test-notty.patch b/meta-oe/recipes-extended/tcsh/files/disable-test-notty.patch
new file mode 100644
index 0000000000..69f0564e88
--- /dev/null
+++ b/meta-oe/recipes-extended/tcsh/files/disable-test-notty.patch
@@ -0,0 +1,30 @@
+From: Lucas Nussbaum <lucas@debian.org>
+Description: Those tests fail when running the testsuite without a tty. Disabling them.
+--- a/tests/commands.at
+++ b/tests/commands.at
+@@ -1203,11 +1203,6 @@ AT_SETUP([source])
+ AT_DATA([script.csh],
+ [[set var=$1
+ ]])
+-AT_CHECK([[tcsh -f -c 'source -h script.csh foo; history' \
+-          | sed 's/    [^      ]*      / TIME /']], ,
+-[     1 TIME source -h script.csh foo ; history
+-     2 TIME set var=$1
+-])
+ 
+ AT_CHECK([tcsh -f -c 'source -h script.csh foo; echo $var'], 1, [],
+ [var: Undefined variable.
+--- a/tests/variables.at
+++ b/tests/variables.at
+@@ -319,10 +319,6 @@ AT_CLEANUP
+ 
+ AT_SETUP([$ edit])
+ 
+-AT_CHECK([TERM=something tcsh -f -c 'echo $?edit'], ,
+-[1
+-])
+-
+ AT_CHECK([TERM=dumb tcsh -f -c 'echo $?edit'], ,
+ [0
+ ])
diff --git a/meta-oe/recipes-extended/tcsh/files/tcsh-6.17.02-multibyte.patch b/meta-oe/recipes-extended/tcsh/files/tcsh-6.17.02-multibyte.patch
new file mode 100644
index 0000000000..3dd420a0e3
--- /dev/null
+++ b/meta-oe/recipes-extended/tcsh/files/tcsh-6.17.02-multibyte.patch
@@ -0,0 +1,18 @@
+Author:  Jean-Luc Leger <reiga@dspnet.fr.eu.org>
+Description: fix broken globbing expansion
+Debian-Bug: #603545
+Index: tcsh-6.18.01/tc.str.c
+===================================================================
+--- tcsh-6.18.01.orig/tc.str.c  2012-01-10 13:34:31.000000000 -0800
+++ tcsh-6.18.01/tc.str.c       2013-02-26 13:12:13.429153489 -0800
+@@ -122,8 +122,9 @@
+ #else
+     ret = mbtowc(&tmp, s, n);
+ #endif
+-    if (ret > 0) {
+    if (ret >= 0)
+        *pwc = tmp;
+    if (ret >= 0) {
+ #if defined(UTF16_STRINGS) && defined(HAVE_MBRTOWC)
+        if (tmp >= 0xd800 && tmp <= 0xdbff) {
+            /* UTF-16 surrogate pair.  Fetch second half and compute
diff --git a/meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb b/meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb
new file mode 100644
index 0000000000..16ecdb025f
--- /dev/null
+++ b/meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb
@@ -0,0 +1,49 @@
+DESCRIPTION = "TENEX C Shell, an enhanced version of Berkeley csh \
+    The TENEX C Shell is an enhanced version of the Berkeley Unix C shell. \
+    It includes all features of 4.4BSD C shell, plus a command-line editor, \
+    programmable word completion, spelling correction and more."
+HOMEPAGE = "http://www.tcsh.org/"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://Copyright;md5=1cf29be62df2be1a3763118b25b4c780"
+SECTION = "base"
+DEPENDS = "ncurses"
+SRC_URI = " \
+    ${DEBIAN_MIRROR}/main/t/tcsh/tcsh_${PV}.orig.tar.gz;name=tarball \
+    ${DEBIAN_MIRROR}/main/t/tcsh/tcsh_${PV}-2.diff.gz;name=diffs \
+    file://01_build.1.patch \
+    file://01_build.2.patch \
+    file://01_build.3.patch \
+    file://15_no-strip.patch \
+    file://disable-test-notty.patch \
+    file://disable-test-nice.patch \
+    file://disable-lexical.at-31.patch \
+    file://12_unknown_lscolors.patch \
+    file://tcsh-6.17.02-multibyte.patch \
+    file://disable-broken-test.patch \
+"
+SRC_URI[tarball.md5sum] = "6eed09dbd4223ab5b6955378450d228a"
+SRC_URI[tarball.sha256sum] = "d81ca27851f3e8545666399b4bcf25433e602a195113b3f7c73886fef84c9fa8"
+SRC_URI[diffs.md5sum] = "ea39b818b624aca49ebf2cd2708d6ff9"
+SRC_URI[diffs.sha256sum] = "95b0c1a339b745c47c5d2f9d02c22a71597462e2e882b51614a9d1f75bd3d16c"
+inherit autotools
+do_install_append () {
+    oe_runmake install.man DESTDIR=${D}
+    install -d ${D}${base_bindir}
+    ln -s /usr/bin/tcsh ${D}${base_bindir}/tcsh
+    install -d ${D}${sysconfdir}/csh/login.d
+    install -m 0644 ${S}/debian/csh.cshrc ${S}/debian/csh.login ${S}/debian/csh.logout ${S}/complete.tcsh ${D}${sysconfdir}
+    install -D -m 0644 ${S}/csh-mode.el ${D}${datadir}/emacs/site-lisp/csh-mode.el
+}
+FILES_${PN} += "${datadir}/emacs/site-lisp/csh-mode.el"
+pkg_postinst_${PN} () {
+#!/bin/sh -e
+echo /usr/bin/tcsh >> $D/etc/shells
+}
diff --git a/meta-oe/recipes-extended/tipcutils/tipcutils_2.0.6.bb b/meta-oe/recipes-extended/tipcutils/tipcutils_2.0.6.bb
new file mode 100644
index 0000000000..ee56952d9e
--- /dev/null
+++ b/meta-oe/recipes-extended/tipcutils/tipcutils_2.0.6.bb
@@ -0,0 +1,40 @@
+SUMMARY = "Transparent Inter-Process Communication protocol"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://tipc-config/tipc-config.c;endline=32;md5=527a3d5745e1581b15a4fddfb5dfda68"
+SRC_URI = "git://tipc.git.sourceforge.net/gitroot/tipc/tipcutils"
+SRCREV = "292a03e17f889013fca2c7bd0aaeebd600c88f40"
+DEPENDS="virtual/kernel"
+inherit autotools
+S = "${WORKDIR}/git"
+do_configure_prepend() {
+    ( cd ${S}; ${S}/bootstrap )
+}
+do_install_append() {
+    demos="benchmark hello_world topology_subscr_demo connection_demo \
+           multicast_demo stream_demo"
+    for i in $demos;do
+        install -d ${D}/opt/tipcutils/demos/$i
+        install ${S}/demos/$i/client_tipc ${D}/opt/tipcutils/demos/$i/
+        install ${S}/demos/$i/server_tipc ${D}/opt/tipcutils/demos/$i/
+    done
+    install -d ${D}/opt/tipcutils/demos/inventory_sim
+    install ${S}/demos/inventory_sim/inventory_sim ${D}/opt/tipcutils/demos/inventory_sim/
+    install -d ${D}/opt/tipcutils/ptts
+    install ${S}/ptts/tipcTS ${D}/opt/tipcutils/ptts/
+    install ${S}/ptts/tipcTC ${D}/opt/tipcutils/ptts/
+    install -d ${D}${sysconfdir}
+    cp -a ${S}/scripts/etc/* ${D}${sysconfdir}/
+}
+PACKAGES += "${PN}-demos"
+FILES_${PN}-dbg += "/opt/tipcutils/demos/*/.debug /opt/tipcutils/ptts/.debug"
+FILES_${PN}-demos = "/opt/tipcutils/*"
diff --git a/meta-oe/recipes-extended/tmux/tmux_1.6.bb b/meta-oe/recipes-extended/tmux/tmux_1.6.bb
new file mode 100644
index 0000000000..def5520099
--- /dev/null
+++ b/meta-oe/recipes-extended/tmux/tmux_1.6.bb
@@ -0,0 +1,18 @@
+SUMMARY = "Terminal multiplexer"
+HOMEPAGE = "http://tmux.sourceforge.net"
+SECTION = "console/utils"
+LICENSE = "ISC"
+LIC_FILES_CHKSUM = "file://tmux.c;beginline=3;endline=17;md5=8685b4455330a940fab1ff451aa941a0"
+DEPENDS = "ncurses libevent sed-native"
+SRC_URI = "${SOURCEFORGE_MIRROR}/tmux/${P}.tar.gz"
+SRC_URI[md5sum] = "3e37db24aa596bf108a0442a81c845b3"
+SRC_URI[sha256sum] = "faee08ba1bd8c22537cd5b7458881d1bdb4985df88ed6bc5967c56881a7efbd6"
+inherit autotools
+do_configure_prepend () {
+    sed -i -e 's:-I/usr/local/include::' Makefile.am || bb_fatal "sed failed"
+}
diff --git a/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/fix-ldflags.patch b/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/fix-ldflags.patch
new file mode 100644
index 0000000000..05cc5371f7
--- /dev/null
+++ b/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/fix-ldflags.patch
@@ -0,0 +1,16 @@
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+--- tools/mconsole/Makefile~fix-ldflags 2003-02-08 05:10:08.000000000 +0100
+++ tools/mconsole/Makefile     2004-04-01 15:37:37.000000000 +0200
+@@ -7,7 +7,7 @@
+ all : $(BIN)
+ 
+ $(BIN) : $(OBJS)
+-       $(CC) $(CFLAGS) -o $(BIN) $(OBJS) -lreadline -lncurses
+       $(CC) $(CFLAGS) -o $(BIN) $(OBJS) $(LDFLAGS) -lreadline -lncurses
+ 
+ clean : 
+        rm -f $(BIN) $(OBJS) *~
diff --git a/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/unstrip.patch b/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/unstrip.patch
new file mode 100644
index 0000000000..868001dbd5
--- /dev/null
+++ b/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/unstrip.patch
@@ -0,0 +1,84 @@
+Dont strip during install let the packaging handle it
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Index: tools/jailtest/Makefile
+===================================================================
+--- tools.orig/jailtest/Makefile        2003-02-07 20:10:27.000000000 -0800
+++ tools/jailtest/Makefile     2012-09-05 12:13:56.061615854 -0700
+@@ -14,4 +14,4 @@
+ 
+ install : $(BIN)
+        install -d $(DESTDIR)$(BIN_DIR)
+-       install -s $(BIN) $(DESTDIR)$(BIN_DIR)
+       install $(BIN) $(DESTDIR)$(BIN_DIR)
+Index: tools/mconsole/Makefile
+===================================================================
+--- tools.orig/mconsole/Makefile        2012-09-05 12:05:09.869607043 -0700
+++ tools/mconsole/Makefile     2012-09-05 12:14:07.725607469 -0700
+@@ -14,4 +14,4 @@
+ 
+ install : $(BIN)
+        install -d $(DESTDIR)$(BIN_DIR)
+-       install -s $(BIN) $(DESTDIR)$(BIN_DIR)
+       install $(BIN) $(DESTDIR)$(BIN_DIR)
+Index: tools/moo/Makefile
+===================================================================
+--- tools.orig/moo/Makefile     2003-06-26 09:27:00.000000000 -0700
+++ tools/moo/Makefile  2012-09-05 12:14:20.981604580 -0700
+@@ -22,4 +22,4 @@
+ 
+ install : $(BIN)
+        install -d $(DESTDIR)$(BIN_DIR)
+-       install -s $(BIN) $(DESTDIR)$(BIN_DIR)
+       install $(BIN) $(DESTDIR)$(BIN_DIR)
+Index: tools/port-helper/Makefile
+===================================================================
+--- tools.orig/port-helper/Makefile     2003-02-07 20:05:31.000000000 -0800
+++ tools/port-helper/Makefile  2012-09-05 12:14:39.429609678 -0700
+@@ -14,4 +14,4 @@
+ 
+ install : $(BIN)
+        install -d $(DESTDIR)$(LIB_DIR)
+-       install -s $(BIN) $(DESTDIR)$(LIB_DIR)
+       install $(BIN) $(DESTDIR)$(LIB_DIR)
+Index: tools/tunctl/Makefile
+===================================================================
+--- tools.orig/tunctl/Makefile  2003-02-07 20:05:04.000000000 -0800
+++ tools/tunctl/Makefile       2012-09-05 12:14:49.985606470 -0700
+@@ -14,4 +14,4 @@
+ 
+ install : $(BIN)
+        install -d $(DESTDIR)$(BIN_DIR)
+-       install -s $(BIN) $(DESTDIR)$(BIN_DIR)
+       install $(BIN) $(DESTDIR)$(BIN_DIR)
+Index: tools/uml_net/Makefile
+===================================================================
+--- tools.orig/uml_net/Makefile 2003-02-07 20:04:55.000000000 -0800
+++ tools/uml_net/Makefile      2012-09-05 12:15:00.961607290 -0700
+@@ -21,4 +21,4 @@
+ 
+ install : $(BIN)
+        install -d $(DESTDIR)$(BIN_DIR)
+-       install -s -m 04755 $(BIN) $(DESTDIR)$(BIN_DIR)
+       install -m 04755 $(BIN) $(DESTDIR)$(BIN_DIR)
+Index: tools/uml_router/Makefile
+===================================================================
+--- tools.orig/uml_router/Makefile      2003-02-07 20:04:39.000000000 -0800
+++ tools/uml_router/Makefile   2012-09-05 12:15:10.649607571 -0700
+@@ -20,4 +20,4 @@
+ 
+ install : $(BIN)
+        install -d $(DESTDIR)$(BIN_DIR)
+-       install -s $(BIN) $(DESTDIR)$(BIN_DIR)
+       install $(BIN) $(DESTDIR)$(BIN_DIR)
+Index: tools/watchdog/Makefile
+===================================================================
+--- tools.orig/watchdog/Makefile        2003-02-07 20:04:25.000000000 -0800
+++ tools/watchdog/Makefile     2012-09-05 12:15:35.561612203 -0700
+@@ -14,4 +14,4 @@
+ 
+ install : $(BIN)
+        install -d $(DESTDIR)$(BIN_DIR)
+-       install -s $(BIN) $(DESTDIR)$(BIN_DIR)
+       install $(BIN) $(DESTDIR)$(BIN_DIR)
diff --git a/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb b/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb
new file mode 100644
index 0000000000..45cc2e7511
--- /dev/null
+++ b/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb
@@ -0,0 +1,26 @@
+SECTION = "console/utils"
+SUMMARY = "Utilities for User-Mode-Linux"
+LICENSE = "GPL-2.0"
+DEPENDS = "zlib ncurses readline"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
+SRC_URI = "http://downloads.sourceforge.net/project/user-mode-linux/tools/1/uml_utilities_${PV}.tar.bz2  \
+           file://fix-ldflags.patch \
+           file://unstrip.patch \
+"
+SRC_URI[md5sum] = "2c1ccd9efacbfb39e42d482b89b2550a"
+SRC_URI[sha256sum] = "4f179b1db021ef15ac7e9b2eed57c525db127a754c574f591c367460cded9f41"
+PR = "r1"
+S = "${WORKDIR}/tools"
+do_compile() {
+    oe_runmake
+}
+do_install() {
+    oe_runmake install DESTDIR=${D}
+}
+FILES_${PN} += "${exec_prefix}${nonarch_base_libdir}"
+FILES_${PN}-dbg += "${exec_prefix}${nonarch_base_libdir}/uml/.debug"
diff --git a/meta-oe/recipes-extended/zram/zram/init b/meta-oe/recipes-extended/zram/zram/init
new file mode 100644
index 0000000000..d12616936c
--- /dev/null
+++ b/meta-oe/recipes-extended/zram/zram/init
@@ -0,0 +1,85 @@
+#!/bin/bash
+### BEGIN INIT INFO
+# Provides: zram
+# Required-Start:
+# Required-Stop:
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Increased Performance In Linux With zRam (Virtual Swap Compressed in RAM)
+# Description: Adapted from systemd scripts at https://github.com/mystilleef/FedoraZram
+# Included as part of antix-goodies package by anticapitalista <antiX@operamail.com>
+# This script was written by tradetaxfree and is found at http://crunchbanglinux.org/forums/topic/15344/zram-a-good-idea/
+# Copy this script (as root) from /usr/local/bin to /etc/init.d and then #update-rc.d zram defaults
+# After booting verify the module is loaded with: lsmod | grep zram
+### END INIT INFO
+set -e
+start() {
+    # get the number of CPUs
+    num_cpus=$(grep -c processor /proc/cpuinfo)
+    # if something goes wrong, assume we have 1
+    [ "$num_cpus" != 0 ] || num_cpus=1
+    # set decremented number of CPUs
+    last_cpu=$((num_cpus - 1))
+    #default Factor % = 90 change this value here or create /etc/default/zram
+    FACTOR=90
+    #& put the above single line in /etc/default/zram with the value you want
+    [ -f /etc/default/zram ] && source /etc/default/zram || true
+    factor=$FACTOR # percentage
+    # get the amount of memory in the machine
+    memtotal=$(grep MemTotal /proc/meminfo | awk ' { print $2 } ')
+    mem_by_cpu=$(($memtotal/$num_cpus*$factor/100*1024))
+    # load dependency modules
+    modprobe zram zram_num_devices=$num_cpus
+    echo "zram devices probed successfully"
+    # initialize the devices
+    for i in $(seq 0 $last_cpu); do
+        echo 1 > /sys/block/zram$i/reset
+        echo $mem_by_cpu > /sys/block/zram$i/disksize
+        # Creating swap filesystems
+        mkswap /dev/zram$i
+        # Switch the swaps on
+        swapon -p 100 /dev/zram$i
+    done
+}
+stop() {
+    # get the number of CPUs
+    num_cpus=$(grep -c processor /proc/cpuinfo)
+    # set decremented number of CPUs
+    last_cpu=$((num_cpus - 1))
+    # Switching off swap
+    for i in $(seq 0 $last_cpu); do
+        if [ "$(grep /dev/zram$i /proc/swaps)" != "" ]; then
+                swapoff /dev/zram$i
+                sleep 1
+        fi
+    done
+    sleep 1
+    rmmod zram
+}
+case "$1" in
+    start)
+        start
+        ;;
+    stop)
+        stop
+        ;;
+    restart)
+        stop
+        sleep 3
+        start
+        ;;
+    *)
+        echo "Usage: $0 {start|stop|restart}"
+        RETVAL=1
+esac
+exit $RETVAL
diff --git a/meta-oe/recipes-extended/zram/zram/zram.service b/meta-oe/recipes-extended/zram/zram/zram.service
new file mode 100644
index 0000000000..4a19367d93
--- /dev/null
+++ b/meta-oe/recipes-extended/zram/zram/zram.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Enable zram compressed in-memory swap.
+After=multi-user.target
+[Service]
+RemainAfterExit=yes
+ExecStart=/usr/bin/zram-load.sh --load
+ExecStop=/usr/bin/zram-load.sh --unload
+Type=oneshot
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-oe/recipes-extended/zram/zram_0.1.bb b/meta-oe/recipes-extended/zram/zram_0.1.bb
new file mode 100644
index 0000000000..e07f570d1a
--- /dev/null
+++ b/meta-oe/recipes-extended/zram/zram_0.1.bb
@@ -0,0 +1,33 @@
+SUMMARY = "Linux zram compressed in-memory swap"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690"
+inherit update-rc.d systemd
+RDEPENDS_${PN} = "util-linux-swaponoff kmod"
+RRECOMMENDS_${PN} = "kernel-module-zram"
+PR = "r3"
+SRC_URI = " \
+           file://init \
+           file://zram.service \
+"
+do_install () {
+    # Sysvinit
+    install -d ${D}${sysconfdir}/init.d
+    install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/zram
+    install -d ${D}${systemd_unitdir}/system
+    install -m 0644 ${WORKDIR}/zram.service ${D}${systemd_unitdir}/system
+}
+FILES_${PN} = "${sysconfdir}"
+INITSCRIPT_NAME = "zram"
+INITSCRIPT_PARAMS = "start 05 2 3 4 5 . stop 22 0 1 6 ."
+RPROVIDES_${PN} += "${PN}-systemd"
+RREPLACES_${PN} += "${PN}-systemd"
+RCONFLICTS_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "zram.service"
diff --git a/meta-oe/recipes-extended/zsh/zsh.inc b/meta-oe/recipes-extended/zsh/zsh.inc
new file mode 100644
index 0000000000..db51f39605
--- /dev/null
+++ b/meta-oe/recipes-extended/zsh/zsh.inc
@@ -0,0 +1,57 @@
+SUMMARY = "UNIX Shell similar to the Korn shell"
+DESCRIPTION = "Zsh is a shell designed for interactive use, although it is also a \
+               powerful scripting language. Many of the useful features of bash, \
+               ksh, and tcsh were incorporated into zsh; many original features were added."
+HOMEPAGE = "http://www.zsh.org"
+SECTION = "base/shell"
+LICENSE = "zsh"
+LIC_FILES_CHKSUM = "file://LICENCE;md5=b7bc853894664be455a922db9805288e"
+DEPENDS = "ncurses bison-native"
+SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz"
+inherit autotools gettext update-alternatives
+EXTRA_OECONF = " \
+    --bindir=${base_bindir} \
+    --enable-etcdir=${sysconfdir} \
+    --enable-fndir=${datadir}/${PN}/${PV}/functions \
+    --enable-site-fndir=${datadir}/${PN}/site-functions \
+    --with-term-lib='ncursesw ncurses' \
+    --with-tcsetpgrp \
+    --enable-cap \
+    --enable-multibyte \
+    --disable-gdbm \
+    --disable-dynamic \
+    zsh_cv_shared_environ=yes \
+"
+ALTERNATIVE_${PN} = "sh"
+ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh"
+ALTERNATIVE_TARGET[sh] = "${base_bindir}/${BPN}"
+ALTERNATIVE_PRIORITY = "100"
+export AUTOHEADER = "true"
+do_configure () {
+    gnu-configize --force
+    oe_runconf
+}
+do_install_append () {
+    rm -fr ${D}/usr/share
+}
+pkg_postinst_${PN} () {
+    touch $D${sysconfdir}/shells
+    grep -q "bin/zsh" $D${sysconfdir}/shells || echo /bin/zsh >> $D${sysconfdir}/shells
+    grep -q "bin/sh" $D${sysconfdir}/shells || echo /bin/sh >> $D${sysconfdir}/shells
+}
+FILES_${PN}-dbg += "\
+    ${libdir}/${PN}/${PV}/${PN}/.debug/*.so \
+    ${libdir}/${PN}/${PV}/${PN}/db/.debug/*.so \
+    ${libdir}/${PN}/${PV}/${PN}/net/.debug/*.so \
+"
diff --git a/meta-oe/recipes-extended/zsh/zsh_5.0.5.bb b/meta-oe/recipes-extended/zsh/zsh_5.0.5.bb
new file mode 100644
index 0000000000..a7170dca87
--- /dev/null
+++ b/meta-oe/recipes-extended/zsh/zsh_5.0.5.bb
@@ -0,0 +1,5 @@
+require zsh.inc
+DEPENDS += "libcap libpcre gdbm groff-native"
+SRC_URI[md5sum] = "6fb0e3e52a0f8de5ca63138391b81ce0"
+SRC_URI[sha256sum] = "b35cf19e4a6ba39fd03c6372b8a8760a491cc2e2e4aba3d15023ff291c2894b4"
author	Tudor Florea <tudor.florea@enea.com>	2014-10-10 03:20:04 +0200
committer	Tudor Florea <tudor.florea@enea.com>	2014-10-10 03:20:04 +0200
commit	1b8dfe266937a37a4c642f96ceb2347bf4c00a17 (patch)
tree	0c6aab146bb3c82efd9c7846a9a4e70dcb0ec84f /meta-oe/recipes-extended
download	meta-openembedded-daisy-140929.tar.gz