[Lunar-commits] <moonbase> lrm2, mkinitrd and dmraid(-static) Change submitted by Peter De Ridder:

[Samuel Verstraete]

commit d16cb0f1b4fed6c27b597e6557b6840a07a110e2
Author: Samuel Verstraete <elangelo at lunar-linux.org>
Date:   Wed Dec 9 09:31:24 2009 +0100

    lrm2, mkinitrd and dmraid(-static)
    Change submitted by Peter De Ridder:
    
    lvm2: Added --enable-static_link.
     This is necessary for dmraid-static. Also needed for mkinitrd
    lvm.static, when not useing the lvm module.
    dmraid: Version bump.
     Dependency changed from device_mapper to lvm2.
    dmraid-static: Version bump.
     Dependency changed from device_mapper to lvm2.
    mkinitrd:
     Removed install of installkernel. Another version is already
    installed by lunar-tools. (Debatable, maybe others want the mkinitrd
    version)
     Signedness patch. Fixes signedness compile errors. Probably because
    of gcc4 stricter checks.
     Dmraid patch. Make dmraid available in the initrd to support fake
    raid. This should be check for none raid and lvm users. (Maybe only
    apply this patch if dmraid-static in installed, optional depends)
     The dmraid patch also changes the cpio line (-c to -Hnewc) i thought
    the newer kernels require this.
---
 filesys/lvm2/BUILD          |    1 +
 utils/mkinitrd/BUILD        |    3 +++
 utils/mkinitrd/DETAILS      |    8 +++++++-
 zbeta/dmraid-static/DEPENDS |    2 +-
 zbeta/dmraid-static/DETAILS |    6 +++---
 zbeta/dmraid/DEPENDS        |    2 +-
 zbeta/dmraid/DETAILS        |    6 +++---
 7 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/filesys/lvm2/BUILD b/filesys/lvm2/BUILD
index 384e1fd..f0aeae2 100644
--- a/filesys/lvm2/BUILD
+++ b/filesys/lvm2/BUILD
@@ -7,6 +7,7 @@
                --with-optimisation="$CFLAGS" \
                --enable-fsadm                \
                --enable-dmeventd             \
+               --enable-static_link          \
                $OPTS                        &&
   default_make
 
diff --git a/utils/mkinitrd/BUILD b/utils/mkinitrd/BUILD
index 8746e48..acec937 100644
--- a/utils/mkinitrd/BUILD
+++ b/utils/mkinitrd/BUILD
@@ -1,8 +1,11 @@
 (
  
   patch_it $SOURCE2 1 &&
+  patch_it $SOURCE3 1 &&
+  patch_it $SOURCE4 1 &&
   sedit 's/grub\.conf/menu.lst/' grubby/grubby.c &&
   sedit 's/grub\.conf/menu.lst/' grubby/grubby.8 &&
+  sedit '/installkernel/d' Makefile &&
   default_make &&
   mkdir -p $DOCUMENT_DIRECTORY/$MODULE &&
   cp mkinitrd.spec $DOCUMENT_DIRECTORY/$MODULE
diff --git a/utils/mkinitrd/DETAILS b/utils/mkinitrd/DETAILS
index e18bae1..236c932 100644
--- a/utils/mkinitrd/DETAILS
+++ b/utils/mkinitrd/DETAILS
@@ -6,9 +6,15 @@
          SOURCE2=$MODULE-4.x-modutils-wrappers.patch.gz
      SOURCE2_URL=$PATCH_URL
      SOURCE2_VFY=sha1:68ff94e5c916a2c88fac00f6dcddd2e8eb67391a
+         SOURCE3=$MODULE-$VERSION-signedness.patch.gz
+     SOURCE3_URL=$PATCH_URL
+     SOURCE3_VFY=sha1:f683a4970fe81c5586e196e45c8ecd88b5dad06a
+         SOURCE4=$MODULE-$VERSION-dmraid.patch.gz
+     SOURCE4_URL=$PATCH_URL
+     SOURCE4_VFY=sha1:cea6c7f662e55bb7d850aaeb6f396aa5d886cd11
         WEB_SITE=http://www.redhat.com/
          ENTERED=20030825
-         UPDATED=20060724
+         UPDATED=20091112
       MAINTAINER="tchan at lunar-linux.org"
            SHORT="Creates an initial ramdisk image for preloading modules"
 cat << EOF
diff --git a/zbeta/dmraid-static/DEPENDS b/zbeta/dmraid-static/DEPENDS
index 12179f5..d2bd511 100644
--- a/zbeta/dmraid-static/DEPENDS
+++ b/zbeta/dmraid-static/DEPENDS
@@ -1 +1 @@
-depends device-mapper
+depends lvm2
diff --git a/zbeta/dmraid-static/DETAILS b/zbeta/dmraid-static/DETAILS
index 12846b5..67dddc8 100644
--- a/zbeta/dmraid-static/DETAILS
+++ b/zbeta/dmraid-static/DETAILS
@@ -1,13 +1,13 @@
           MODULE=dmraid-static
         BASENAME=dmraid
-         VERSION=1.0.0.rc15
+         VERSION=1.0.0.rc16
           SOURCE=$BASENAME-$VERSION.tar.bz2
       SOURCE_URL=http://people.redhat.com/~heinzm/sw/$BASENAME/src/
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$BASENAME/$VERSION
-      SOURCE_VFY=sha1:3fa1f184a497fd2cc6cefa4cb2892ffb1ede64bf
+      SOURCE_VFY=sha1:99e76332bb03c5a79406e3c8cb12b6746288635d
         WEB_SITE="http://people.redhat.com/~heinzm/"
          ENTERED=20081025
-         UPDATED=20081025
+         UPDATED=20091109
            SHORT="discovers, activates, deactivates and displays software RAID sets"
 cat <<EOF
 This software discovers, activates, deactivates and displays properties
diff --git a/zbeta/dmraid/DEPENDS b/zbeta/dmraid/DEPENDS
index 12179f5..d2bd511 100644
--- a/zbeta/dmraid/DEPENDS
+++ b/zbeta/dmraid/DEPENDS
@@ -1 +1 @@
-depends device-mapper
+depends lvm2
diff --git a/zbeta/dmraid/DETAILS b/zbeta/dmraid/DETAILS
index a99c0b0..4a23888 100644
--- a/zbeta/dmraid/DETAILS
+++ b/zbeta/dmraid/DETAILS
@@ -1,12 +1,12 @@
           MODULE=dmraid
-         VERSION=1.0.0.rc15
+         VERSION=1.0.0.rc16
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=http://people.redhat.com/~heinzm/sw/$MODULE/src/
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE/$VERSION
-      SOURCE_VFY=sha1:3fa1f184a497fd2cc6cefa4cb2892ffb1ede64bf
+      SOURCE_VFY=sha1:99e76332bb03c5a79406e3c8cb12b6746288635d
         WEB_SITE="http://people.redhat.com/~heinzm/"
          ENTERED=20081025
-         UPDATED=20081025
+         UPDATED=20091109
            SHORT="discovers, activates, deactivates and displays software RAID sets"
 cat <<EOF
 This software discovers, activates, deactivates and displays properties