[Ocfs2-commits] jlbec commits r3018 - branches/ocfs2-1.2/vendor/sles9

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2007-05-03 14:17:30 -0700 (Thu, 03 May 2007)
New Revision: 3018

Modified:
   branches/ocfs2-1.2/vendor/sles9/ocfs2.spec-generic.in
Log:

From: Jeff Mahoney <jeffm at suse.com>

This patch teaches the sles9 spec file to understand that configfs
is built conditionally, and may not be present in the output.

Signed-off-by: smushran



Modified: branches/ocfs2-1.2/vendor/sles9/ocfs2.spec-generic.in
===================================================================
--- branches/ocfs2-1.2/vendor/sles9/ocfs2.spec-generic.in	2007-05-03 21:14:48 UTC (rev 3017)
+++ branches/ocfs2-1.2/vendor/sles9/ocfs2.spec-generic.in	2007-05-03 21:17:30 UTC (rev 3018)
@@ -301,9 +301,11 @@
 mkdir -p "${INST_MODLIB}/fs/ocfs2/dlm"
 mv "${EXTRA_MODLIB}"/ocfs2_dlm.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
 mv "${EXTRA_MODLIB}"/ocfs2_dlmfs.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
-mkdir -p "${INST_MODLIB}/fs/configfs"
-mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
-rm "${EXTRA_MODLIB}"/*.ko
+if [ -e "${EXTRA_MODLIB}/configfs.ko" ]; then
+	mkdir -p "${INST_MODLIB}/fs/configfs"
+	mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
+fi
+rm -f "${EXTRA_MODLIB}"/*.ko
 
 make clean
 %endif
@@ -324,9 +326,11 @@
 mkdir -p "${INST_MODLIB}/fs/ocfs2/dlm"
 mv "${EXTRA_MODLIB}"/ocfs2_dlm.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
 mv "${EXTRA_MODLIB}"/ocfs2_dlmfs.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
-mkdir -p "${INST_MODLIB}/fs/configfs"
-mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
-rm "${EXTRA_MODLIB}"/*.ko
+if [ -e "${EXTRA_MODLIB}/configfs.ko" ]; then
+	mkdir -p "${INST_MODLIB}/fs/configfs"
+	mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
+fi
+rm -f "${EXTRA_MODLIB}"/*.ko
 
 make clean
 %endif
@@ -347,9 +351,11 @@
 mkdir -p "${INST_MODLIB}/fs/ocfs2/dlm"
 mv "${EXTRA_MODLIB}"/ocfs2_dlm.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
 mv "${EXTRA_MODLIB}"/ocfs2_dlmfs.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
-mkdir -p "${INST_MODLIB}/fs/configfs"
-mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
-rm "${EXTRA_MODLIB}"/*.ko
+if [ -e "${EXTRA_MODLIB}/configfs.ko" ]; then
+	mkdir -p "${INST_MODLIB}/fs/configfs"
+	mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
+fi
+rm -f "${EXTRA_MODLIB}"/*.ko
 
 make clean
 %endif
@@ -370,9 +376,11 @@
 mkdir -p "${INST_MODLIB}/fs/ocfs2/dlm"
 mv "${EXTRA_MODLIB}"/ocfs2_dlm.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
 mv "${EXTRA_MODLIB}"/ocfs2_dlmfs.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
-mkdir -p "${INST_MODLIB}/fs/configfs"
-mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
-rm "${EXTRA_MODLIB}"/*.ko
+if [ -e "${EXTRA_MODLIB}/configfs.ko" ]; then
+	mkdir -p "${INST_MODLIB}/fs/configfs"
+	mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
+fi
+rm -f "${EXTRA_MODLIB}"/*.ko
 
 make clean
 %endif
@@ -393,9 +401,11 @@
 mkdir -p "${INST_MODLIB}/fs/ocfs2/dlm"
 mv "${EXTRA_MODLIB}"/ocfs2_dlm.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
 mv "${EXTRA_MODLIB}"/ocfs2_dlmfs.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
-mkdir -p "${INST_MODLIB}/fs/configfs"
-mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
-rm "${EXTRA_MODLIB}"/*.ko
+if [ -e "${EXTRA_MODLIB}/configfs.ko" ]; then
+	mkdir -p "${INST_MODLIB}/fs/configfs"
+	mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
+fi
+rm -f "${EXTRA_MODLIB}"/*.ko
 
 make clean
 %endif
@@ -416,9 +426,11 @@
 mkdir -p "${INST_MODLIB}/fs/ocfs2/dlm"
 mv "${EXTRA_MODLIB}"/ocfs2_dlm.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
 mv "${EXTRA_MODLIB}"/ocfs2_dlmfs.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
-mkdir -p "${INST_MODLIB}/fs/configfs"
-mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
-rm "${EXTRA_MODLIB}"/*.ko
+if [ -e "${EXTRA_MODLIB}/configfs.ko" ]; then
+	mkdir -p "${INST_MODLIB}/fs/configfs"
+	mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
+fi
+rm -f "${EXTRA_MODLIB}"/*.ko
 
 make clean
 %endif
@@ -439,9 +451,11 @@
 mkdir -p "${INST_MODLIB}/fs/ocfs2/dlm"
 mv "${EXTRA_MODLIB}"/ocfs2_dlm.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
 mv "${EXTRA_MODLIB}"/ocfs2_dlmfs.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
-mkdir -p "${INST_MODLIB}/fs/configfs"
-mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
-rm "${EXTRA_MODLIB}"/*.ko
+if [ -e "${EXTRA_MODLIB}/configfs.ko" ]; then
+	mkdir -p "${INST_MODLIB}/fs/configfs"
+	mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
+fi
+rm -f "${EXTRA_MODLIB}"/*.ko
 
 make clean
 %endif
@@ -462,9 +476,11 @@
 mkdir -p "${INST_MODLIB}/fs/ocfs2/dlm"
 mv "${EXTRA_MODLIB}"/ocfs2_dlm.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
 mv "${EXTRA_MODLIB}"/ocfs2_dlmfs.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
-mkdir -p "${INST_MODLIB}/fs/configfs"
-mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
-rm "${EXTRA_MODLIB}"/*.ko
+if [ -e "${EXTRA_MODLIB}/configfs.ko" ]; then
+	mkdir -p "${INST_MODLIB}/fs/configfs"
+	mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
+fi
+rm -f "${EXTRA_MODLIB}"/*.ko
 
 make clean
 %endif
@@ -485,9 +501,11 @@
 mkdir -p "${INST_MODLIB}/fs/ocfs2/dlm"
 mv "${EXTRA_MODLIB}"/ocfs2_dlm.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
 mv "${EXTRA_MODLIB}"/ocfs2_dlmfs.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
-mkdir -p "${INST_MODLIB}/fs/configfs"
-mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
-rm "${EXTRA_MODLIB}"/*.ko
+if [ -e "${EXTRA_MODLIB}/configfs.ko" ]; then
+	mkdir -p "${INST_MODLIB}/fs/configfs"
+	mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
+fi
+rm -f "${EXTRA_MODLIB}"/*.ko
 
 make clean
 %endif
@@ -508,9 +526,11 @@
 mkdir -p "${INST_MODLIB}/fs/ocfs2/dlm"
 mv "${EXTRA_MODLIB}"/ocfs2_dlm.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
 mv "${EXTRA_MODLIB}"/ocfs2_dlmfs.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
-mkdir -p "${INST_MODLIB}/fs/configfs"
-mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
-rm "${EXTRA_MODLIB}"/*.ko
+if [ -e "${EXTRA_MODLIB}/configfs.ko" ]; then
+	mkdir -p "${INST_MODLIB}/fs/configfs"
+	mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
+fi
+rm -f "${EXTRA_MODLIB}"/*.ko
 
 make clean
 %endif