From: Jeff Mahoney <jeffm@suse.com>
To: ocfs2-devel@oss.oracle.com
Subject: [Ocfs2-devel] [PATCH] fix up sles9 spec file
Date: Mon Apr 16 10:57:16 2007 [thread overview]
Message-ID: <4623B8E3.4090002@suse.com> (raw)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
This patch teaches the sles9 spec file to understand that configfs
is built conditionally, and may not be present in the output.
- -Jeff
diff -ruNp ocfs2-1.2.5/vendor/sles9/ocfs2.spec-generic.in ocfs2-1.2.5.devel/vendor/sles9/ocfs2.spec-generic.in
- --- ocfs2-1.2.5/vendor/sles9/ocfs2.spec-generic.in 2007-03-27 15:54:15.000000000 -0400
+++ ocfs2-1.2.5.devel/vendor/sles9/ocfs2.spec-generic.in 2007-04-16 13:05:25.962229912 -0400
@@ -301,9 +301,11 @@ mv "${EXTRA_MODLIB}"/ocfs2_nodemanager.k
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 @@ mv "${EXTRA_MODLIB}"/ocfs2_nodemanager.k
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 @@ mv "${EXTRA_MODLIB}"/ocfs2_nodemanager.k
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 @@ mv "${EXTRA_MODLIB}"/ocfs2_nodemanager.k
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 @@ mv "${EXTRA_MODLIB}"/ocfs2_nodemanager.k
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 @@ mv "${EXTRA_MODLIB}"/ocfs2_nodemanager.k
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 @@ mv "${EXTRA_MODLIB}"/ocfs2_nodemanager.k
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 @@ mv "${EXTRA_MODLIB}"/ocfs2_nodemanager.k
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 @@ mv "${EXTRA_MODLIB}"/ocfs2_nodemanager.k
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 @@ mv "${EXTRA_MODLIB}"/ocfs2_nodemanager.k
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
- --
Jeff Mahoney
SUSE Labs
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org
iD8DBQFGI7jjLPWxlyuTD7IRArXSAJ46nvnYc57oaIqyavc3P02Q+U0duwCfSEU9
fSRooxqW35a9LTX6EJAg3qw=
=CyVk
-----END PGP SIGNATURE-----
reply other threads:[~2007-04-16 10:57 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4623B8E3.4090002@suse.com \
--to=jeffm@suse.com \
--cc=ocfs2-devel@oss.oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.