summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-core/uclibc/uclibc-git.inc2
-rw-r--r--meta/recipes-core/uclibc/uclibc-git/0001-Define-IPTOS_CLASS_-macros-according-to-RFC-2474.patch75
-rw-r--r--meta/recipes-core/uclibc/uclibc-git/0001-timex-Sync-with-glibc.patch33
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 \
23 file://0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch \ 23 file://0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch \
24 file://0001-Add-eventfd_read-and-eventfd_write.patch \ 24 file://0001-Add-eventfd_read-and-eventfd_write.patch \
25 file://0002-wire-setns-syscall.patch \ 25 file://0002-wire-setns-syscall.patch \
26 file://0001-Define-IPTOS_CLASS_-macros-according-to-RFC-2474.patch \
27 file://0001-timex-Sync-with-glibc.patch \
26 " 28 "
27S = "${WORKDIR}/git" 29S = "${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 @@
1From be8ed13a90c528adfbe3c8543946bb2c5a2ad713 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 25 Aug 2014 15:50:36 -0700
4Subject: [PATCH] Define IPTOS_CLASS_* macros according to RFC 2474
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7Upstream-status: Pending
8---
9 include/netinet/ip.h | 42 ++++++++++++++++++++++++++++++------------
10 1 file changed, 30 insertions(+), 12 deletions(-)
11
12diff --git a/include/netinet/ip.h b/include/netinet/ip.h
13index 19e1249..3fe58b9 100644
14--- a/include/netinet/ip.h
15+++ b/include/netinet/ip.h
16@@ -188,7 +188,25 @@ struct ip_timestamp
17 #define IPTOS_DSCP_EF 0xb8
18
19 /*
20- * Definitions for IP type of service (ip_tos)
21+ * In RFC 2474, Section 4.2.2.1, the Class Selector Codepoints subsume
22+ * the old ToS Precedence values.
23+ */
24+#define IPTOS_CLASS_MASK 0xe0
25+#define IPTOS_CLASS(class) ((class) & IPTOS_CLASS_MASK)
26+#define IPTOS_CLASS_CS0 0x00
27+#define IPTOS_CLASS_CS1 0x20
28+#define IPTOS_CLASS_CS2 0x40
29+#define IPTOS_CLASS_CS3 0x60
30+#define IPTOS_CLASS_CS4 0x80
31+#define IPTOS_CLASS_CS5 0xa0
32+#define IPTOS_CLASS_CS6 0xc0
33+#define IPTOS_CLASS_CS7 0xe0
34+
35+#define IPTOS_CLASS_DEFAULT IPTOS_CLASS_CS0
36+
37+/*
38+ * Definitions for IP type of service (ip_tos) [deprecated; use DSCP
39+ * and CS definitions above instead.]
40 */
41 #define IPTOS_TOS_MASK 0x1E
42 #define IPTOS_TOS(tos) ((tos) & IPTOS_TOS_MASK)
43@@ -199,18 +217,18 @@ struct ip_timestamp
44 #define IPTOS_MINCOST IPTOS_LOWCOST
45
46 /*
47- * Definitions for IP precedence (also in ip_tos) (hopefully unused)
48+ * Definitions for IP precedence (also in ip_tos) [also deprecated.]
49 */
50-#define IPTOS_PREC_MASK 0xe0
51-#define IPTOS_PREC(tos) ((tos) & IPTOS_PREC_MASK)
52-#define IPTOS_PREC_NETCONTROL 0xe0
53-#define IPTOS_PREC_INTERNETCONTROL 0xc0
54-#define IPTOS_PREC_CRITIC_ECP 0xa0
55-#define IPTOS_PREC_FLASHOVERRIDE 0x80
56-#define IPTOS_PREC_FLASH 0x60
57-#define IPTOS_PREC_IMMEDIATE 0x40
58-#define IPTOS_PREC_PRIORITY 0x20
59-#define IPTOS_PREC_ROUTINE 0x00
60+#define IPTOS_PREC_MASK IPTOS_CLASS_MASK
61+#define IPTOS_PREC(tos) IPTOS_CLASS(tos)
62+#define IPTOS_PREC_NETCONTROL IPTOS_CLASS_CS7
63+#define IPTOS_PREC_INTERNETCONTROL IPTOS_CLASS_CS6
64+#define IPTOS_PREC_CRITIC_ECP IPTOS_CLASS_CS5
65+#define IPTOS_PREC_FLASHOVERRIDE IPTOS_CLASS_CS4
66+#define IPTOS_PREC_FLASH IPTOS_CLASS_CS3
67+#define IPTOS_PREC_IMMEDIATE IPTOS_CLASS_CS2
68+#define IPTOS_PREC_PRIORITY IPTOS_CLASS_CS1
69+#define IPTOS_PREC_ROUTINE IPTOS_CLASS_CS0
70
71 /*
72 * Definitions for options.
73--
742.1.0
75
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 @@
1From f489cc44a209f6c4370e94c9c788fc9cc4820be1 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 25 Aug 2014 16:22:57 -0700
4Subject: [PATCH] timex: Sync with glibc
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7Upstream-status: Pending
8---
9 include/sys/timex.h | 8 ++++++--
10 1 file changed, 6 insertions(+), 2 deletions(-)
11
12diff --git a/include/sys/timex.h b/include/sys/timex.h
13index 9082a28..57059bd 100644
14--- a/include/sys/timex.h
15+++ b/include/sys/timex.h
16@@ -67,8 +67,12 @@ struct timex
17 #define ADJ_ESTERROR 0x0008 /* estimated time error */
18 #define ADJ_STATUS 0x0010 /* clock status */
19 #define ADJ_TIMECONST 0x0020 /* pll time constant */
20-#define ADJ_TICK 0x4000 /* tick value */
21-#define ADJ_OFFSET_SINGLESHOT 0x8001 /* old-fashioned adjtime */
22+#define ADJ_TAI 0x0080 /* set TAI offset */
23+#define ADJ_MICRO 0x1000 /* select microsecond resolution */
24+#define ADJ_NANO 0x2000 /* select nanosecond resolution */
25+#define ADJ_TICK 0x4000 /* tick value */
26+#define ADJ_OFFSET_SINGLESHOT 0x8001 /* old-fashioned adjtime */
27+#define ADJ_OFFSET_SS_READ 0xa001 /* read-only adjtime */
28
29 /* xntp 3.4 compatibility names */
30 #define MOD_OFFSET ADJ_OFFSET
31--
322.1.0
33
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-12 15:52:46 +0000