From 855ad8d21bb69b8db500260c9e4033f3e60f1414 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Tue, 25 Mar 2014 05:15:34 +0000 Subject: main/xen: fix uclibc regression in musl-support patch --- main/xen/APKBUILD | 6 +++--- main/xen/musl-support.patch | 11 ----------- 2 files changed, 3 insertions(+), 14 deletions(-) (limited to 'main') diff --git a/main/xen/APKBUILD b/main/xen/APKBUILD index 093eded2b..97f41962b 100644 --- a/main/xen/APKBUILD +++ b/main/xen/APKBUILD @@ -216,7 +216,7 @@ f8ea5786b0a6157b9cb3e67e323b592c qemu-xen-websocket-plain-hack.patch e449bb3359b490804ffc7b0ae08d62a0 hotplug-vif-vtrill.patch 229539a822e14a6a62babffd71ecfbf3 0001-ipxe-dont-clobber-ebp.patch 08a30d56902b660f5102a5c208e545c9 init-xenstore-domain.patch -3af67f7ddac0fae038e7c6b068ba41b0 musl-support.patch +f7aa282a27f270a923f229f2040cd7b5 musl-support.patch 3178b2ccd06c608b17444231831d4245 xenstored.initd d86504e12f05deca6b3eeeb90157160e xenstored.confd ed262f15fb880badb53575539468646c xenconsoled.initd @@ -246,7 +246,7 @@ f34590761b627d69d2033c1350f2403e9d572b2172e852e3b30e7630bc009a9f qemu-xen-vnc-r dd1e784bc455eb62cb85b3fa24bfc34f575ceaab9597ef6a2f1ee7ff7b3cae0a hotplug-vif-vtrill.patch 751ef06569de66578b8713dc170976832b0671ac2696f32eb9ad69d60332d594 0001-ipxe-dont-clobber-ebp.patch 0204d69804e83864cd6b2122f51b9c1940588158a35c159a7ef0c3b8fb0af4cb init-xenstore-domain.patch -ad15c6a7a9af5242f1bdc7688688f080e25490934f0076eedcc255786a66c25a musl-support.patch +2513ab530c80b32bd7fe4d35a5b1ecbda14c8e093e556e040a68226796e63791 musl-support.patch 6ba1fb78d28c6acd47348b79f14620dc6fdd3308580e6a1e82a5e7fb06ff6de0 xenstored.initd 991bb7c9da02941556e29714bd96b26e39e57e0a5b514eadd78d9bfa3fa5a9dc xenstored.confd 93bea2eb90ea1b4628854c8141dd351bbd1fbc5959b12795447ea933ad025f01 xenconsoled.initd @@ -276,7 +276,7 @@ a52aa303dd3d9abae3ddb3af788b1f1f7a6bd9eb0c13f67f0995190238f7638f7909ea7d7bf7d778 f095ea373f36381491ad36f0662fb4f53665031973721256b23166e596318581da7cbb0146d0beb2446729adfdb321e01468e377793f6563a67d68b8b0f7ffe3 hotplug-vif-vtrill.patch c3a1b270347a99c8ce21118010ad8d817b4462a31cc5c75352faa7086969ef0646f3f4d0922d85c2e504cff091ce7e9fe79c92f983c2ba4af2fae85c52c3835a 0001-ipxe-dont-clobber-ebp.patch 475eb800660dc928914b8c15562f18f24d6e7a76f4cc7bed9249ce52d444c29aec1aef843eb37ade0c7c9616195bbbc1606a3195e25b2bd4b6a1d1af5f69256e init-xenstore-domain.patch -66642115b3204b73b370903586e10a76955223e00531a8033baa9a62065a53995f07ed1ac1ca390fefe6c634228752daebbb14f47d0bf1bad583291d175f3210 musl-support.patch +3d6b180d631c6d7baeff9976503cf6b16f24b0e99c25b2b2a5153db85f41600159d10d4f47eda0e33e1f41197dc9d6d935cf33f31ffbcf429d35002e0affdb2d musl-support.patch 0329596bde7227a9f2b5a8f50c0bc404b45765384b6bade164ec3549fde5a667972f9f5659fecc04db97539e3acc5147f16e1da430c418a2a1bff18148044900 xenstored.initd 093f7fbd43faf0a16a226486a0776bade5dc1681d281c5946a3191c32d74f9699c6bf5d0ab8de9d1195a2461165d1660788e92a3156c9b3c7054d7b2d52d7ff0 xenstored.confd 12f981b2459c65d66e67ec0b32d0d19b95a029bc54c2a79138cfe488d3524a22e51860f755abfe25ddcdaf1b27f2ded59b6e350b9d5f8791193d00e2d3673137 xenconsoled.initd diff --git a/main/xen/musl-support.patch b/main/xen/musl-support.patch index 5872d7d74..7946cb64b 100644 --- a/main/xen/musl-support.patch +++ b/main/xen/musl-support.patch @@ -1,16 +1,5 @@ --- xen-4.3.1.orig/m4/ptyfuncs.m4 +++ xen-4.3.1/m4/ptyfuncs.m4 -@@ -10,7 +10,7 @@ - ]) - AX_SAVEVAR_RESTORE(CPPFLAGS) - AC_CACHE_CHECK([for openpty et al], [ax_cv_ptyfuncs_libs], [ -- for ax_cv_ptyfuncs_libs in -lutil "" NOT_FOUND; do -+ for ax_cv_ptyfuncs_libs in -lc -lutil "" NOT_FOUND; do - if test "x$ax_cv_ptyfuncs_libs" = "xNOT_FOUND"; then - AC_MSG_FAILURE([Unable to find library for openpty and login_tty]) - fi ---- xen-4.3.1.orig/m4/ptyfuncs.m4 -+++ xen-4.3.1/m4/ptyfuncs.m4 @@ -22,7 +22,6 @@ #endif int main(void) { -- cgit v1.2.3