Openembedded Core Discussions
 help / color / mirror / Atom feed
* [PATCH 0/4] linux-yocto/3.4: linux-libc-headers: version updates
@ 2013-01-07 15:43 Bruce Ashfield
  2013-01-07 15:43 ` [PATCH 1/4] linux-yocto/3.4: integrate v3.4.21, v3.4.22, v3.4.23 Bruce Ashfield
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Bruce Ashfield @ 2013-01-07 15:43 UTC (permalink / raw)
  To: richard.purdie; +Cc: openembedded-core

Richard/Saul,

I've separated the version updates to linux-yocto/3.4 and
linux-libc-headers so we can merge them separately from my other
pending items in the linux-yocto merge queue.

I've been building with these since December, and meant to send
them out last week .. but ended up not getting dug out of 
backlogged items until now.

I've added Ross to the cc: since the linux-yocto/3.4 version 
bumps should be considered for danny as well. Ross: if you'd
prefer a separate pull request for danny, yell and I'll create
one for you.

This also has the updated to linux-libc-headers talked about
before the holidays. I've jumped the version to 3.7 for
Marcin's use case, and I've been build and boot testing against
the existing 3.4 userspace as well as my development kernel
on 3.8-rc2. I haven't run into any compatibililty issues, so 
my I've gone and removed the older libc-headers versions, since
we want to have a single reference .. not one per kernel, and
in particular not one per dependent layer.

I'll bump the linux-libc-headers again, once the kernel version
for yocto/oe-core 1.4 has been locked.

Cheers,

Bruce

The following changes since commit 5b658729eff73963262dda4d6c683fdd023b8d04:

  libgdata: finalize recipe removal (2013-01-07 14:43:28 +0000)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib zedd/kernel
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel

Bruce Ashfield (3):
  linux-yocto/3.4: integrate v3.4.21, v3.4.22, v3.4.23
  linux-yocto/3.4: update to v3.4.24
  linux-libc-headers: make 3.7 the default and remove older libc-header
    recipes

Marcin Juszkiewicz (1):
  linux-libc-headers: add 3.7 version

 meta/conf/distro/include/tcmode-default.inc            |    2 +-
 .../linux-libc-headers/linux-libc-headers_3.0.8.bb     |    7 -------
 .../linux-libc-headers/linux-libc-headers_3.2.bb       |    6 ------
 .../linux-libc-headers/linux-libc-headers_3.4.3.bb     |    6 ------
 .../linux-libc-headers/linux-libc-headers_3.7.bb       |    4 ++++
 meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb        |    8 ++++----
 meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb      |    6 +++---
 meta/recipes-kernel/linux/linux-yocto_3.4.bb           |   16 ++++++++--------
 8 files changed, 20 insertions(+), 35 deletions(-)
 delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.0.8.bb
 delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.2.bb
 delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb
 create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.7.bb

-- 
1.7.10.4




^ permalink raw reply	[flat|nested] 5+ messages in thread
* [PATCH 1/4] linux-yocto/3.4: integrate v3.4.21, v3.4.22, v3.4.23
  2013-01-07 15:43 [PATCH 0/4] linux-yocto/3.4: linux-libc-headers: version updates Bruce Ashfield
@ 2013-01-07 15:43 ` Bruce Ashfield
  2013-01-07 15:43 ` [PATCH 2/4] linux-yocto/3.4: update to v3.4.24 Bruce Ashfield
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Bruce Ashfield @ 2013-01-07 15:43 UTC (permalink / raw)
  To: richard.purdie; +Cc: openembedded-core

Updating the SRCREVs to integrate the korg -stable updates.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb   |    8 ++++----
 meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb |    6 +++---
 meta/recipes-kernel/linux/linux-yocto_3.4.bb      |   16 ++++++++--------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
index 6412edc..c3f3c4f 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
@@ -3,14 +3,14 @@ require recipes-kernel/linux/linux-yocto.inc
 KBRANCH = "standard/preempt-rt/base"
 KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
 
-LINUX_VERSION ?= "3.4.20"
+LINUX_VERSION ?= "3.4.23"
 LINUX_KERNEL_TYPE = "preempt-rt"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "61a6e7a812b3b49988c4eb29a78c5db94d380197"
-SRCREV_machine_qemuppc ?= "0d29fe9056288412b8b538e48af3c78bac3494f1"
-SRCREV_meta ?= "6737e890fff2a423fbb022ab1f7f82ef187fd8b1"
+SRCREV_machine ?= "14f4a06b2275a9b23c5a5e50da687d4218227981"
+SRCREV_machine_qemuppc ?= "ebcf52db41ea59f6dfb8824cf214eb2ed0318dac"
+SRCREV_meta ?= "6d4cb3c86cde2f37ea1d67933a1d24e45920753c"
 
 PR = "${INC_PR}.0"
 PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
index a18a561..62fb184 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
@@ -8,12 +8,12 @@ KBRANCH = "${KBRANCH_DEFAULT}"
 LINUX_KERNEL_TYPE = "tiny"
 KCONFIG_MODE = "--allnoconfig"
 
-LINUX_VERSION ?= "3.4.20"
+LINUX_VERSION ?= "3.4.23"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "b13bef6377719a488293af196236cc290566fad3"
-SRCREV_meta ?= "6737e890fff2a423fbb022ab1f7f82ef187fd8b1"
+SRCREV_machine ?= "782622711662dc3676040f085f589d10780a1e33"
+SRCREV_meta ?= "6d4cb3c86cde2f37ea1d67933a1d24e45920753c"
 
 PR = "${INC_PR}.0"
 PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
index 91785f9..ace0b7f 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
@@ -3,17 +3,17 @@ require recipes-kernel/linux/linux-yocto.inc
 KBRANCH_DEFAULT = "standard/base"
 KBRANCH = "${KBRANCH_DEFAULT}"
 
-SRCREV_machine_qemuarm ?= "092d66e326abfda80c50dcf1869417d7420847f1"
-SRCREV_machine_qemumips  ?= "b258437665477f44a868c38c6c9cc5199db58cd8"
-SRCREV_machine_qemuppc ?= "67a370223d695ec08b6e5a38860fa1fe5d0d9f1e"
-SRCREV_machine_qemux86 ?= "b13bef6377719a488293af196236cc290566fad3"
-SRCREV_machine_qemux86-64 ?= "b13bef6377719a488293af196236cc290566fad3"
-SRCREV_machine ?= "b13bef6377719a488293af196236cc290566fad3"
-SRCREV_meta ?= "6737e890fff2a423fbb022ab1f7f82ef187fd8b1"
+SRCREV_machine_qemuarm ?= "c1e1ed0f4ab5f90f11f49d4d1aa79b378a14708f"
+SRCREV_machine_qemumips  ?= "d6138383ef03c70e3580beffe318e6a2f1a2767e"
+SRCREV_machine_qemuppc ?= "9ef6eddfeeb8e5cda01c008c4fa49629902561de"
+SRCREV_machine_qemux86 ?= "782622711662dc3676040f085f589d10780a1e33"
+SRCREV_machine_qemux86-64 ?= "782622711662dc3676040f085f589d10780a1e33"
+SRCREV_machine ?= "782622711662dc3676040f085f589d10780a1e33"
+SRCREV_meta ?= "6d4cb3c86cde2f37ea1d67933a1d24e45920753c"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
 
-LINUX_VERSION ?= "3.4.20"
+LINUX_VERSION ?= "3.4.23"
 
 PR = "${INC_PR}.3"
 PV = "${LINUX_VERSION}+git${SRCPV}"
-- 
1.7.10.4




^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH 2/4] linux-yocto/3.4: update to v3.4.24
  2013-01-07 15:43 [PATCH 0/4] linux-yocto/3.4: linux-libc-headers: version updates Bruce Ashfield
  2013-01-07 15:43 ` [PATCH 1/4] linux-yocto/3.4: integrate v3.4.21, v3.4.22, v3.4.23 Bruce Ashfield
@ 2013-01-07 15:43 ` Bruce Ashfield
  2013-01-07 15:43 ` [PATCH 3/4] linux-libc-headers: add 3.7 version Bruce Ashfield
  2013-01-07 15:43 ` [PATCH 4/4] linux-libc-headers: make 3.7 the default and remove older libc-header recipes Bruce Ashfield
  3 siblings, 0 replies; 5+ messages in thread
From: Bruce Ashfield @ 2013-01-07 15:43 UTC (permalink / raw)
  To: richard.purdie; +Cc: openembedded-core

Updating the 3.4 recipes to v3.4.24 stable version.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb   |    8 ++++----
 meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb |    6 +++---
 meta/recipes-kernel/linux/linux-yocto_3.4.bb      |   16 ++++++++--------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
index c3f3c4f..93adb06 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
@@ -3,14 +3,14 @@ require recipes-kernel/linux/linux-yocto.inc
 KBRANCH = "standard/preempt-rt/base"
 KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
 
-LINUX_VERSION ?= "3.4.23"
+LINUX_VERSION ?= "3.4.24"
 LINUX_KERNEL_TYPE = "preempt-rt"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "14f4a06b2275a9b23c5a5e50da687d4218227981"
-SRCREV_machine_qemuppc ?= "ebcf52db41ea59f6dfb8824cf214eb2ed0318dac"
-SRCREV_meta ?= "6d4cb3c86cde2f37ea1d67933a1d24e45920753c"
+SRCREV_machine ?= "729e8634f75bf10582916eae6b5b96325785c001"
+SRCREV_machine_qemuppc ?= "15ce18fac50c49ea4893b0d7ed3d0086ef9c7448"
+SRCREV_meta ?= "7e0cd2990798aae80565baa17d3b6c771874f284"
 
 PR = "${INC_PR}.0"
 PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
index 62fb184..5a4959e 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
@@ -8,12 +8,12 @@ KBRANCH = "${KBRANCH_DEFAULT}"
 LINUX_KERNEL_TYPE = "tiny"
 KCONFIG_MODE = "--allnoconfig"
 
-LINUX_VERSION ?= "3.4.23"
+LINUX_VERSION ?= "3.4.24"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "782622711662dc3676040f085f589d10780a1e33"
-SRCREV_meta ?= "6d4cb3c86cde2f37ea1d67933a1d24e45920753c"
+SRCREV_machine ?= "5432e2acb6053f9f7563cf63abd101ed2fdc1b6f"
+SRCREV_meta ?= "7e0cd2990798aae80565baa17d3b6c771874f284"
 
 PR = "${INC_PR}.0"
 PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
index ace0b7f..70ed967 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
@@ -3,17 +3,17 @@ require recipes-kernel/linux/linux-yocto.inc
 KBRANCH_DEFAULT = "standard/base"
 KBRANCH = "${KBRANCH_DEFAULT}"
 
-SRCREV_machine_qemuarm ?= "c1e1ed0f4ab5f90f11f49d4d1aa79b378a14708f"
-SRCREV_machine_qemumips  ?= "d6138383ef03c70e3580beffe318e6a2f1a2767e"
-SRCREV_machine_qemuppc ?= "9ef6eddfeeb8e5cda01c008c4fa49629902561de"
-SRCREV_machine_qemux86 ?= "782622711662dc3676040f085f589d10780a1e33"
-SRCREV_machine_qemux86-64 ?= "782622711662dc3676040f085f589d10780a1e33"
-SRCREV_machine ?= "782622711662dc3676040f085f589d10780a1e33"
-SRCREV_meta ?= "6d4cb3c86cde2f37ea1d67933a1d24e45920753c"
+SRCREV_machine_qemuarm ?= "50986c7d971c28505acdbdcab6601f4d5b6dbff4"
+SRCREV_machine_qemumips  ?= "4d355c57fe0d9f117c272f1679fa3d3f451a8c8e"
+SRCREV_machine_qemuppc ?= "1c8a1aa8cc839f0328edbfe0d755100368bc4ae6"
+SRCREV_machine_qemux86 ?= "5432e2acb6053f9f7563cf63abd101ed2fdc1b6f"
+SRCREV_machine_qemux86-64 ?= "5432e2acb6053f9f7563cf63abd101ed2fdc1b6f"
+SRCREV_machine ?= "5432e2acb6053f9f7563cf63abd101ed2fdc1b6f"
+SRCREV_meta ?= "7e0cd2990798aae80565baa17d3b6c771874f284"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
 
-LINUX_VERSION ?= "3.4.23"
+LINUX_VERSION ?= "3.4.24"
 
 PR = "${INC_PR}.3"
 PV = "${LINUX_VERSION}+git${SRCPV}"
-- 
1.7.10.4




^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH 3/4] linux-libc-headers: add 3.7 version
  2013-01-07 15:43 [PATCH 0/4] linux-yocto/3.4: linux-libc-headers: version updates Bruce Ashfield
  2013-01-07 15:43 ` [PATCH 1/4] linux-yocto/3.4: integrate v3.4.21, v3.4.22, v3.4.23 Bruce Ashfield
  2013-01-07 15:43 ` [PATCH 2/4] linux-yocto/3.4: update to v3.4.24 Bruce Ashfield
@ 2013-01-07 15:43 ` Bruce Ashfield
  2013-01-07 15:43 ` [PATCH 4/4] linux-libc-headers: make 3.7 the default and remove older libc-header recipes Bruce Ashfield
  3 siblings, 0 replies; 5+ messages in thread
From: Bruce Ashfield @ 2013-01-07 15:43 UTC (permalink / raw)
  To: richard.purdie; +Cc: openembedded-core

From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.7.bb |    4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.7.bb

diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.7.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.7.bb
new file mode 100644
index 0000000..3d688b7
--- /dev/null
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.7.bb
@@ -0,0 +1,4 @@
+require linux-libc-headers.inc
+
+SRC_URI[md5sum] = "5323f3faadd051e83af605a63be5ea2e"
+SRC_URI[sha256sum] = "dc08d87a579fe2918362e6666e503a95a76296419195cb499aa9dd4dbe171a9e"
-- 
1.7.10.4




^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH 4/4] linux-libc-headers: make 3.7 the default and remove older libc-header recipes
  2013-01-07 15:43 [PATCH 0/4] linux-yocto/3.4: linux-libc-headers: version updates Bruce Ashfield
                   ` (2 preceding siblings ...)
  2013-01-07 15:43 ` [PATCH 3/4] linux-libc-headers: add 3.7 version Bruce Ashfield
@ 2013-01-07 15:43 ` Bruce Ashfield
  3 siblings, 0 replies; 5+ messages in thread
From: Bruce Ashfield @ 2013-01-07 15:43 UTC (permalink / raw)
  To: richard.purdie; +Cc: openembedded-core

Switch the default libc-headers to the 3.7 version. At the same time, remove
older versions of the headers to keep things simple and clear. All userspace
and kernel combinations should build and boot against this single lib-headers
version.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/conf/distro/include/tcmode-default.inc                     |    2 +-
 .../linux-libc-headers/linux-libc-headers_3.0.8.bb              |    7 -------
 .../recipes-kernel/linux-libc-headers/linux-libc-headers_3.2.bb |    6 ------
 .../linux-libc-headers/linux-libc-headers_3.4.3.bb              |    6 ------
 4 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.0.8.bb
 delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.2.bb
 delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb

diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 1d6cd8b..8f3ba2b 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -22,7 +22,7 @@ SDKGCCVERSION ?= "${GCCVERSION}"
 BINUVERSION ?= "2.23.1"
 EGLIBCVERSION ?= "2.16"
 UCLIBCVERSION ?= "0.9.33"
-LINUXLIBCVERSION ?= "3.4.3"
+LINUXLIBCVERSION ?= "3.7"
 
 PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
 PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}"
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.0.8.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.0.8.bb
deleted file mode 100644
index 7bb5895..0000000
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.0.8.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require linux-libc-headers.inc
-
-PR = "r1"
-
-SRC_URI += " file://connector-msg-size-fix.patch"
-SRC_URI[md5sum] = "eac4d398a0ecd98214487cd47a228998"
-SRC_URI[sha256sum] = "4ed16da319848f681f711dbda2ac2cf1b306a280ec22f90bae190cf23b533add"
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.2.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.2.bb
deleted file mode 100644
index 9bee02b..0000000
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require linux-libc-headers.inc
-
-PR = "r1"
-
-SRC_URI[md5sum] = "7ceb61f87c097fc17509844b71268935"
-SRC_URI[sha256sum] = "c881fc2b53cf0da7ca4538aa44623a7de043a41f76fd5d0f51a31f6ed699d463"
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb
deleted file mode 100644
index 6f8d9e8..0000000
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require linux-libc-headers.inc
-
-PR = "r0"
-
-SRC_URI[md5sum] = "3aefa02db55715d627ed23a01667057d"
-SRC_URI[sha256sum] = "17f1256daa289dde1a0a587c9753556d37a52770f7c4efcf2666fd4796a6eacc"
-- 
1.7.10.4




^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-01-07 15:58 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-07 15:43 [PATCH 0/4] linux-yocto/3.4: linux-libc-headers: version updates Bruce Ashfield
2013-01-07 15:43 ` [PATCH 1/4] linux-yocto/3.4: integrate v3.4.21, v3.4.22, v3.4.23 Bruce Ashfield
2013-01-07 15:43 ` [PATCH 2/4] linux-yocto/3.4: update to v3.4.24 Bruce Ashfield
2013-01-07 15:43 ` [PATCH 3/4] linux-libc-headers: add 3.7 version Bruce Ashfield
2013-01-07 15:43 ` [PATCH 4/4] linux-libc-headers: make 3.7 the default and remove older libc-header recipes Bruce Ashfield

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox