Changeset 11

Timestamp:

04/14/10 16:49:56 (11 years ago)

Author:

dennis

Message:

Moved mdadm, using version 3.1.2 instead of 2.6.4

Location:

trunk/initrd_source

Files:

• initrd.rul (modified) (3 diffs)
• make.d/mdadm.rul (copied) (copied from trunk/make.d/mdadm.rul) (3 diffs)

trunk/initrd_source/initrd.rul

@@ -70 +70 @@
 include $(INITRD_DIR)/make.d/sysvinit.rul
 include $(INITRD_DIR)/make.d/udev.rul
+include $(INITRD_DIR)/make.d/mdadm.rul
 
 ## BOEL BINARIES
@@ -137 +138 @@
                                                                 $(MKE2FS_BINARY)                \
                                                                 $(TUNE2FS_BINARY)               \
-                                                                $(PARTED_BINARY)
+                                                                $(PARTED_BINARY)                \
+                                                                $(MDADM_BINARIES)
                                                                 
 
@@ -178 +180 @@
         install -m 755 --strip $(TUNE2FS_BINARY)    $(INITRD_BUILD_DIR)/sbin/
         install -m 755 --strip $(PARTED_BINARY)     $(INITRD_BUILD_DIR)/sbin/
+        install -m 755 --strip $(MDADM_BINARIES)    $(INITRD_BUILD_DIR)/sbin/
 
         # Copy over text files from the skel directory.

trunk/initrd_source/make.d/mdadm.rul

@@ -6 +6 @@
 #
 
-MDADM_VERSION := 2.6.4
+MDADM_VERSION := 3.1.2
 MDADM_DIR := mdadm-$(MDADM_VERSION)
-MDADM_TARBALL := mdadm-$(MDADM_VERSION).tgz
-# MDADM_URL := http://www.cse.unsw.edu.au/~neilb/source/mdadm/$(MDADM_TARBALL)
-MDADM_URL := http://download.systemimager.org/pub/mdadm/$(MDADM_TARBALL)
-MDADM_BINARIES := $(SRC_DIR)/$(MDADM_DIR)/mdadm
-MDADM_PATCHES := $(shell ls $(PATCH_DIR)/mdadm.*.patch 2>/dev/null | sort)
+MDADM_TARBALL := mdadm-$(MDADM_VERSION).tar.gz
+MDADM_URL := http://www.kernel.org/pub/linux/utils/raid/mdadm/$(MDADM_TARBALL)
+# MDADM_URL := http://download.systemimager.org/pub/mdadm/$(MDADM_TARBALL)
+MDADM_BINARIES := $(INITRD_SRC_DIR)/$(MDADM_DIR)/mdadm
 
-ALL_SOURCE += $(SRC_DIR)/$(MDADM_TARBALL)
+## Disabled
+#MDADM_PATCHES := $(shell ls $(PATCH_DIR)/mdadm.*.patch 2>/dev/null | sort)
+
+ALL_SOURCE += $(INITRD_SRC_DIR)/$(MDADM_TARBALL)
 
 #
@@ -26 +28 @@
 install_mdadm:  $(MDADM_BINARIES)
         $(SI_INSTALL) -d $(TFTP_BIN_DEST)
-        $(SI_INSTALL) -m 755 $(SRC_DIR)/$(MDADM_DIR)/mdadm \
+        $(SI_INSTALL) -m 755 $(INITRD_SRC_DIR)/$(MDADM_DIR)/mdadm \
             $(TFTP_BIN_DEST)/mdadm
 
@@ -33 +35 @@
 PHONY += install_standard_mdadm
 install_standard_mdadm: $(MDADM_BINARIES)
-        $(SI_INSTALL) -m 755 $(SRC_DIR)/$(MDADM_DIR)/mdadm $(DESTDIR)
+        $(SI_INSTALL) -m 755 $(INITRD_SRC_DIR)/$(MDADM_DIR)/mdadm $(DESTDIR)
 
-$(MDADM_BINARIES): $(SRC_DIR)/patched_kernel-stamp
-        rm -rf $(SRC_DIR)/$(MDADM_DIR)
-        $(MAKE) $(SRC_DIR)/$(MDADM_TARBALL)
-        [ -d $(SRC_DIR)/$(MDADM_DIR) ] || \
-            ( cd $(SRC_DIR) && tar -xvzf $(MDADM_TARBALL) )
-        cd $(SRC_DIR)/$(MDADM_DIR) && \
-            cat $(MDADM_PATCHES) < /dev/null | patch -p1
-        $(MAKE) -j $(NCPUS) -C $(SRC_DIR)/$(MDADM_DIR)
+$(MDADM_BINARIES): 
+        rm -rf $(INITRD_SRC_DIR)/$(MDADM_DIR)
+        $(MAKE) $(INITRD_SRC_DIR)/$(MDADM_TARBALL)
+        [ -d $(INITRD_SRC_DIR)/$(MDADM_DIR) ] || \
+            ( cd $(INITRD_SRC_DIR) && tar -xvzf $(MDADM_TARBALL) )
+        cd $(INITRD_SRC_DIR)/$(MDADM_DIR) 
+        $(MAKE) -j $(NCPUS) -C $(INITRD_SRC_DIR)/$(MDADM_DIR)
 
 # download the mdadm tarball
-$(SRC_DIR)/$(MDADM_TARBALL):
-        [ -d $(SRC_DIR) ] || mkdir -p $(SRC_DIR)
-        $(GETSOURCE) $(MDADM_URL) $(SRC_DIR)
+$(INITRD_SRC_DIR)/$(MDADM_TARBALL):
+        [ -d $(INITRD_SRC_DIR) ] || mkdir -p $(INITRD_SRC_DIR)
+        $(GETSOURCE) $(MDADM_URL) $(INITRD_SRC_DIR)
 
 PHONY += mdadm_clean
 mdadm_clean:
-        rm -rf $(SRC_DIR)/$(MDADM_DIR)
+        rm -rf $(INITRD_SRC_DIR)/$(MDADM_DIR)