Browse Source

mdadm: Updated (2.6.9 -> 3.2.2)

user/amery/next/luajit
Christian Wiese 14 years ago
parent
commit
94988ed492
  1. 24
      base/mdadm/mdadm-3.2.2-no-susv3-legacy.patch
  2. 4
      base/mdadm/mdadm.desc

24
base/mdadm/mdadm-2.6.7-no-susv3-legacy.patch → base/mdadm/mdadm-3.2.2-no-susv3-legacy.patch

@ -1,8 +1,8 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# Filename: package/.../mdadm/mdadm-2.6.7-no-susv3-legacy.patch # Filename: package/.../mdadm/mdadm-3.2.2-no-susv3-legacy.patch
# Copyright (C) 2010 The OpenSDE Project # Copyright (C) 2010 - 2011 The OpenSDE Project
# #
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
# #
@ -19,16 +19,22 @@ Description: Replace usleep() with nanosleep()
usleep() was deprecated by SUSv3 and newer LIBCs are starting to enforce that usleep() was deprecated by SUSv3 and newer LIBCs are starting to enforce that
deprecation. deprecation.
--- ./mdadm.h.orig 2010-09-25 22:49:01.040000255 +0200 --- mdadm-3.2.2/mdadm.h.orig 2011-08-21 01:13:43.876087027 +0200
+++ ./mdadm.h 2010-09-25 22:50:27.192000253 +0200 +++ mdadm-3.2.2/mdadm.h 2011-08-21 01:20:20.980080863 +0200
@@ -566,3 +566,10 @@ @@ -1343,5 +1343,16 @@
#define ALGORITHM_RIGHT_ASYMMETRIC 1 */
#define ALGORITHM_LEFT_SYMMETRIC 2 #ifndef PATH_MAX
#define ALGORITHM_RIGHT_SYMMETRIC 3 #define PATH_MAX 4096
+ +
+#define usleep(x) xx_usleep(x) +/* usleep() was deprecated by SUSv3 and newer LIBCs are starting to
+ * enforce that deprecation.
+ */
+#define usleep(x) xx_usleep(x)
+static inline void xx_usleep(unsigned k) +static inline void xx_usleep(unsigned k)
+{ +{
+ const struct timespec t = { k/1000000UL, (k%1000000UL)*1000UL }; + const struct timespec t = { k/1000000UL, (k%1000000UL)*1000UL };
+ nanosleep(&t, NULL); + nanosleep(&t, NULL);
+} +}
+
#endif

4
base/mdadm/mdadm.desc

@ -28,7 +28,7 @@
[L] GPL [L] GPL
[S] Stable [S] Stable
[V] 2.6.9 [V] 3.2.2
[P] X -?---5---9 194.000 [P] X -?---5---9 194.000
[D] 2903557843 mdadm-2.6.9.tar.bz2 http://www.kernel.org/pub/linux/utils/raid/mdadm/ [D] 1813206371 mdadm-3.2.2.tar.bz2 http://www.kernel.org/pub/linux/utils/raid/mdadm/

Loading…
Cancel
Save