diff options
| author | Khem Raj <raj.khem@gmail.com> | 2014-08-25 16:45:03 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-27 12:12:07 +0100 |
| commit | 7562021eef5b7585122c92db8b686808ebe7d85e (patch) | |
| tree | 1624fcad4af0647ce1ca0fedca4aaeed251f8973 /meta/recipes-core | |
| parent | 8003ce0df3f6297391a709cc9720adffbd8fbd0f (diff) | |
| download | openembedded-core-7562021eef5b7585122c92db8b686808ebe7d85e.tar.gz openembedded-core-7562021eef5b7585122c92db8b686808ebe7d85e.tar.bz2 openembedded-core-7562021eef5b7585122c92db8b686808ebe7d85e.zip | |
uclibc: Support systemd builds
Systemd needs some extra defines e.g.
ADJ_NANO and IPTOS_CLASS_CS6
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
3 files changed, 110 insertions, 0 deletions
diff --git a/meta/recipes-core/uclibc/uclibc-git.inc b/meta/recipes-core/uclibc/uclibc-git.inc index a6b9f65b54..a2b2353c5a 100644 --- a/meta/recipes-core/uclibc/uclibc-git.inc +++ b/meta/recipes-core/uclibc/uclibc-git.inc @@ -23,5 +23,7 @@ SRC_URI = "git://uclibc.org/uClibc.git;branch=master \ file://0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch \ file://0001-Add-eventfd_read-and-eventfd_write.patch \ file://0002-wire-setns-syscall.patch \ + file://0001-Define-IPTOS_CLASS_-macros-according-to-RFC-2474.patch \ + file://0001-timex-Sync-with-glibc.patch \ " S = "${WORKDIR}/git" diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-Define-IPTOS_CLASS_-macros-according-to-RFC-2474.patch b/meta/recipes-core/uclibc/uclibc-git/0001-Define-IPTOS_CLASS_-macros-according-to-RFC-2474.patch new file mode 100644 index 0000000000..d613823695 --- /dev/null +++ b/meta/recipes-core/uclibc/uclibc-git/0001-Define-IPTOS_CLASS_-macros-according-to-RFC-2474.patch @@ -0,0 +1,75 @@ +From be8ed13a90c528adfbe3c8543946bb2c5a2ad713 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 25 Aug 2014 15:50:36 -0700 +Subject: [PATCH] Define IPTOS_CLASS_* macros according to RFC 2474 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-status: Pending +--- + include/netinet/ip.h | 42 ++++++++++++++++++++++++++++++------------ + 1 file changed, 30 insertions(+), 12 deletions(-) + +diff --git a/include/netinet/ip.h b/include/netinet/ip.h +index 19e1249..3fe58b9 100644 +--- a/include/netinet/ip.h ++++ b/include/netinet/ip.h +@@ -188,7 +188,25 @@ struct ip_timestamp + #define IPTOS_DSCP_EF 0xb8 + + /* +- * Definitions for IP type of service (ip_tos) ++ * In RFC 2474, Section 4.2.2.1, the Class Selector Codepoints subsume ++ * the old ToS Precedence values. ++ */ ++#define IPTOS_CLASS_MASK 0xe0 ++#define IPTOS_CLASS(class) ((class) & IPTOS_CLASS_MASK) ++#define IPTOS_CLASS_CS0 0x00 ++#define IPTOS_CLASS_CS1 0x20 ++#define IPTOS_CLASS_CS2 0x40 ++#define IPTOS_CLASS_CS3 0x60 ++#define IPTOS_CLASS_CS4 0x80 ++#define IPTOS_CLASS_CS5 0xa0 ++#define IPTOS_CLASS_CS6 0xc0 ++#define IPTOS_CLASS_CS7 0xe0 ++ ++#define IPTOS_CLASS_DEFAULT IPTOS_CLASS_CS0 ++ ++/* ++ * Definitions for IP type of service (ip_tos) [deprecated; use DSCP ++ * and CS definitions above instead.] + */ + #define IPTOS_TOS_MASK 0x1E + #define IPTOS_TOS(tos) ((tos) & IPTOS_TOS_MASK) +@@ -199,18 +217,18 @@ struct ip_timestamp + #define IPTOS_MINCOST IPTOS_LOWCOST + + /* +- * Definitions for IP precedence (also in ip_tos) (hopefully unused) ++ * Definitions for IP precedence (also in ip_tos) [also deprecated.] + */ +-#define IPTOS_PREC_MASK 0xe0 +-#define IPTOS_PREC(tos) ((tos) & IPTOS_PREC_MASK) +-#define IPTOS_PREC_NETCONTROL 0xe0 +-#define IPTOS_PREC_INTERNETCONTROL 0xc0 +-#define IPTOS_PREC_CRITIC_ECP 0xa0 +-#define IPTOS_PREC_FLASHOVERRIDE 0x80 +-#define IPTOS_PREC_FLASH 0x60 +-#define IPTOS_PREC_IMMEDIATE 0x40 +-#define IPTOS_PREC_PRIORITY 0x20 +-#define IPTOS_PREC_ROUTINE 0x00 ++#define IPTOS_PREC_MASK IPTOS_CLASS_MASK ++#define IPTOS_PREC(tos) IPTOS_CLASS(tos) ++#define IPTOS_PREC_NETCONTROL IPTOS_CLASS_CS7 ++#define IPTOS_PREC_INTERNETCONTROL IPTOS_CLASS_CS6 ++#define IPTOS_PREC_CRITIC_ECP IPTOS_CLASS_CS5 ++#define IPTOS_PREC_FLASHOVERRIDE IPTOS_CLASS_CS4 ++#define IPTOS_PREC_FLASH IPTOS_CLASS_CS3 ++#define IPTOS_PREC_IMMEDIATE IPTOS_CLASS_CS2 ++#define IPTOS_PREC_PRIORITY IPTOS_CLASS_CS1 ++#define IPTOS_PREC_ROUTINE IPTOS_CLASS_CS0 + + /* + * Definitions for options. +-- +2.1.0 + diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-timex-Sync-with-glibc.patch b/meta/recipes-core/uclibc/uclibc-git/0001-timex-Sync-with-glibc.patch new file mode 100644 index 0000000000..5d6a0a5366 --- /dev/null +++ b/meta/recipes-core/uclibc/uclibc-git/0001-timex-Sync-with-glibc.patch @@ -0,0 +1,33 @@ +From f489cc44a209f6c4370e94c9c788fc9cc4820be1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 25 Aug 2014 16:22:57 -0700 +Subject: [PATCH] timex: Sync with glibc + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-status: Pending +--- + include/sys/timex.h | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/include/sys/timex.h b/include/sys/timex.h +index 9082a28..57059bd 100644 +--- a/include/sys/timex.h ++++ b/include/sys/timex.h +@@ -67,8 +67,12 @@ struct timex + #define ADJ_ESTERROR 0x0008 /* estimated time error */ + #define ADJ_STATUS 0x0010 /* clock status */ + #define ADJ_TIMECONST 0x0020 /* pll time constant */ +-#define ADJ_TICK 0x4000 /* tick value */ +-#define ADJ_OFFSET_SINGLESHOT 0x8001 /* old-fashioned adjtime */ ++#define ADJ_TAI 0x0080 /* set TAI offset */ ++#define ADJ_MICRO 0x1000 /* select microsecond resolution */ ++#define ADJ_NANO 0x2000 /* select nanosecond resolution */ ++#define ADJ_TICK 0x4000 /* tick value */ ++#define ADJ_OFFSET_SINGLESHOT 0x8001 /* old-fashioned adjtime */ ++#define ADJ_OFFSET_SS_READ 0xa001 /* read-only adjtime */ + + /* xntp 3.4 compatibility names */ + #define MOD_OFFSET ADJ_OFFSET +-- +2.1.0 + |