* [gentoo-commits] genkernel r620 - in trunk: . patches/busybox/1.7.4
@ 2008-03-11 19:35 Andrew Gaffney (agaffney)
0 siblings, 0 replies; only message in thread
From: Andrew Gaffney (agaffney) @ 2008-03-11 19:35 UTC (permalink / raw
To: gentoo-commits
Author: agaffney
Date: 2008-03-11 19:35:23 +0000 (Tue, 11 Mar 2008)
New Revision: 620
Modified:
trunk/ChangeLog
trunk/patches/busybox/1.7.4/1.7.4-mdadm.diff
trunk/patches/busybox/1.7.4/1.7.4-mdstart.diff
Log:
Update mdadm and mdstart patches
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-03-11 19:06:58 UTC (rev 619)
+++ trunk/ChangeLog 2008-03-11 19:35:23 UTC (rev 620)
@@ -2,6 +2,11 @@
# Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 11 Mar 2008; Andrew Gaffney <agaffney@gentoo.org>
+ patches/busybox/1.7.4/1.7.4-mdadm.diff,
+ patches/busybox/1.7.4/1.7.4-mdstart.diff:
+ Update mdadm and mdstart patches
+
11 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_compile.sh:
It helps if we assign the correct value to version
Send output of patch command to /dev/null
Modified: trunk/patches/busybox/1.7.4/1.7.4-mdadm.diff
===================================================================
--- trunk/patches/busybox/1.7.4/1.7.4-mdadm.diff 2008-03-11 19:06:58 UTC (rev 619)
+++ trunk/patches/busybox/1.7.4/1.7.4-mdadm.diff 2008-03-11 19:35:23 UTC (rev 620)
@@ -17,7 +17,7 @@
+++ busybox-1.7.4+gentoo+mdadm/include/applets.h 2008-03-11 10:32:22.000000000 -0700
@@ -223,2 +223,3 @@
USE_MD5SUM(APPLET_ODDNAME(md5sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SUID_NEVER, md5sum))
-+USE_MDADM(APPLET(mdadm, mdadm_main, _BB_DIR_SBIN, _BB_SUID_NEVER))
++USE_MDADM(APPLET(mdadm, _BB_DIR_SBIN, _BB_SUID_NEVER))
USE_MDEV(APPLET(mdev, _BB_DIR_SBIN, _BB_SUID_NEVER))
diff -Nuar --exclude '*.orig' busybox-1.7.4+gentoo/include/usage.h busybox-1.7.4+gentoo+mdadm/include/usage.h
--- busybox-1.7.4+gentoo/include/usage.h 2008-03-11 10:19:04.000000000 -0700
@@ -1171,7 +1171,7 @@
+
+menu "Linux mdadm Utilities"
+
-+config CONFIG_MDADM
++config MDADM
+ bool "mdadm"
+ default n
+ help
@@ -1291,68 +1291,6 @@
+void dl_del(void*);
+void dl_free(void*);
+void dl_init(void*);
-diff -Nuar --exclude '*.orig' busybox-1.7.4+gentoo/mdadm/Makefile busybox-1.7.4+gentoo+mdadm/mdadm/Makefile
---- busybox-1.7.4+gentoo/mdadm/Makefile 1969-12-31 16:00:00.000000000 -0800
-+++ busybox-1.7.4+gentoo+mdadm/mdadm/Makefile 2008-03-11 10:31:00.000000000 -0700
-@@ -0,0 +1,23 @@
-+# Makefile for busybox
-+#
-+# Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
-+#
-+# Licensed under the GPL v2, see the file LICENSE in this tarball.
-+
-+ifndef top_srcdir
-+top_srcdir=..
-+endif
-+ifndef top_builddir
-+top_builddir=..
-+endif
-+srcdir=$(top_srcdir)/mdadm
-+MDADM_DIR:=./
-+include $(top_builddir)/Rules.mak
-+include $(top_builddir)/.config
-+include Makefile.in
-+all: $(libraries-y)
-+-include $(top_builddir)/.depend
-+
-+clean:
-+ rm -f *.o *.a $(AR_TARGET)
-+
-diff -Nuar --exclude '*.orig' busybox-1.7.4+gentoo/mdadm/Makefile.in busybox-1.7.4+gentoo+mdadm/mdadm/Makefile.in
---- busybox-1.7.4+gentoo/mdadm/Makefile.in 1969-12-31 16:00:00.000000000 -0800
-+++ busybox-1.7.4+gentoo+mdadm/mdadm/Makefile.in 2008-03-11 10:31:00.000000000 -0700
-@@ -0,0 +1,31 @@
-+# Makefile for busybox
-+#
-+# Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
-+#
-+# Licensed under the GPL v2, see the file LICENSE in this tarball.
-+
-+MDADM_AR:=mdadm.a
-+ifndef $(MDADM_DIR)
-+MDADM_DIR:=$(top_builddir)/mdadm/
-+endif
-+srcdir=$(top_srcdir)/mdadm
-+
-+MDADM-y:= config.o util.o dlink.o sha1.o super0.o super1.o mdexamine.o mdassemble.o
-+MDADM-$(CONFIG_MDADM) += mdadm.o
-+
-+MDADM_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(MDADM-y))
-+MDADM_SRC-a:=$(wildcard $(srcdir)/*.c)
-+APPLET_SRC-y+=$(MDADM_SRC-y)
-+APPLET_SRC-a+=$(MDADM_SRC-a)
-+
-+MDADM-y:=$(sort $(MDADM-y))
-+
-+ifneq ($(strip $(MDADM-y)),)
-+libraries-y+=$(MDADM_DIR)$(MDADM_AR)
-+endif
-+
-+$(MDADM_DIR)$(MDADM_AR): $(patsubst %,$(MDADM_DIR)%, $(MDADM-y))
-+ $(do_ar)
-+
-+$(MDADM_DIR)%.o: $(srcdir)/%.c
-+ $(compile.c)
diff -Nuar --exclude '*.orig' busybox-1.7.4+gentoo/mdadm/md5.h busybox-1.7.4+gentoo+mdadm/mdadm/md5.h
--- busybox-1.7.4+gentoo/mdadm/md5.h 1969-12-31 16:00:00.000000000 -0800
+++ busybox-1.7.4+gentoo+mdadm/mdadm/md5.h 2008-03-11 10:31:00.000000000 -0700
@@ -5930,3 +5868,15 @@
+ *sizep = ldsize;
+ return 1;
+}
+--- busybox-1.7.4+gentoo/mdadm/Kbuild 2008-03-01 18:44:05.526713152 -0800
++++ busybox-1.7.4+gentoo+mdadm/mdadm/Kbuild 2008-03-11 12:19:18.000000000 -0700
+@@ -0,0 +1,9 @@
++# Makefile for busybox
++#
++# Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
++#
++# Licensed under the GPL v2, see the file LICENSE in this tarball.
++
++lib-y:=
++MDADM-y:= config.o util.o dlink.o sha1.o super0.o super1.o mdexamine.o mdassemble.o
++lib-$(CONFIG_MDADM) += mdadm.o $(MDADM-y)
Modified: trunk/patches/busybox/1.7.4/1.7.4-mdstart.diff
===================================================================
--- trunk/patches/busybox/1.7.4/1.7.4-mdstart.diff 2008-03-11 19:06:58 UTC (rev 619)
+++ trunk/patches/busybox/1.7.4/1.7.4-mdstart.diff 2008-03-11 19:35:23 UTC (rev 620)
@@ -17,12 +17,14 @@
diff -Nuar --exclude '*.orig' busybox-1.7.4/include/usage.h busybox-1.7.4+gentoo/include/usage.h
--- busybox-1.7.4/include/usage.h 2007-09-03 04:48:46.000000000 -0700
+++ busybox-1.7.4+gentoo/include/usage.h 2008-03-11 10:19:04.000000000 -0700
-@@ -2072,6 +2072,9 @@
+@@ -2072,6 +2072,11 @@
"the last line match .* to override this.)\n\n" \
)
+#define mdstart_trivial_usage \
+ "{[PARTITION] MD-NODE}..."
++#define mdstart_full_usage \
++ "Run the RAID_AUTORUN ioctl on the given MD number"
+
#define mesg_trivial_usage \
"[y|n]"
@@ -34,7 +36,7 @@
/lib/firmware/ and if it exists, send it to the kernel for
loading into the hardware.
-+config CONFIG_MDSTART
++config MDSTART
+ bool "mdstart"
+ default n
+ help
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-03-11 19:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-11 19:35 [gentoo-commits] genkernel r620 - in trunk: . patches/busybox/1.7.4 Andrew Gaffney (agaffney)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox