[Ocfs2-commits] smushran commits r3066 - branches/ocfs2-1.2/vendor/rhel5

[svn-commits at oss.oracle.com]

Author: smushran
Date: 2007-10-01 13:00:41 -0700 (Mon, 01 Oct 2007)
New Revision: 3066

Modified:
   branches/ocfs2-1.2/vendor/rhel5/Vendor.make
   branches/ocfs2-1.2/vendor/rhel5/ocfs2.spec-generic.in
Log:
ocfs2: Disable default debug build for rhel5

Signed-off-by: mfasheh

Modified: branches/ocfs2-1.2/vendor/rhel5/Vendor.make
===================================================================
--- branches/ocfs2-1.2/vendor/rhel5/Vendor.make	2007-10-01 19:59:35 UTC (rev 3065)
+++ branches/ocfs2-1.2/vendor/rhel5/Vendor.make	2007-10-01 20:00:41 UTC (rev 3066)
@@ -9,7 +9,7 @@
 	SPECVER="$@"; \
 		SPECVER="$${SPECVER#*ocfs2-}"; \
 		SPECVER="$${SPECVER%.spec}"; \
-		sed -e 's/@@KVER@@/'$${SPECVER}'/' -e 's/@@PKG_VERSION@@/'$(PKG_VERSION)'/' < $< > $@
+		sed -e 's/@@KVER@@/'$${SPECVER}'/' -e 's/@@PKG_VERSION@@/'$(PKG_VERSION)'/' -e 's/@@DONT_STRIP@@/'$(DONT_STRIP)'/' < $< > $@
 
 rhel5_%_srpm: dist $(TOPDIR)/vendor/rhel5/ocfs2-%.spec
 	rpmbuild -bs --define "_sourcedir $(TOPDIR)" --define "_srcrpmdir $(TOPDIR)" $(TOPDIR)/vendor/rhel5/ocfs2-$(patsubst rhel5_%_srpm,%,$@).spec

Modified: branches/ocfs2-1.2/vendor/rhel5/ocfs2.spec-generic.in
===================================================================
--- branches/ocfs2-1.2/vendor/rhel5/ocfs2.spec-generic.in	2007-10-01 19:59:35 UTC (rev 3065)
+++ branches/ocfs2-1.2/vendor/rhel5/ocfs2.spec-generic.in	2007-10-01 20:00:41 UTC (rev 3066)
@@ -37,6 +37,7 @@
 %define karch		s390x
 %endif
 
+%define dont_strip	@@DONT_STRIP@@
 %define kver		@@KVER@@
 
 # The minimum tools package required for the kernel bits.
@@ -126,6 +127,17 @@
 		--with-vendorkernel="$1"
 }
 
+strip_modules()
+{
+%if %{dont_strip}
+	return
+%endif
+
+	# Mark modules executable so that brp-strip can strip them.
+	# This requires the <percent>install section to exist.
+	find "$1" -name "*.ko" -type f | xargs chmod u+x
+}
+
 %if %{builddef}
 local_configure "%{kver}"
 
@@ -141,6 +153,7 @@
 	mv "${EXTRA_MODLIB}"/$i/ocfs2*.ko "${INST_MODLIB}/fs/$i"
 	rm -f "${EXTRA_MODLIB}"/$i/*.ko
 done
+strip_modules "${INST_MODLIB}"
 make clean
 %endif
 
@@ -159,6 +172,7 @@
 	mv "${EXTRA_MODLIB}"/$i/ocfs2*.ko "${INST_MODLIB}/fs/$i"
 	rm -f "${EXTRA_MODLIB}"/$i/*.ko
 done
+strip_modules "${INST_MODLIB}"
 make clean
 %endif
 
@@ -177,9 +191,13 @@
 	mv "${EXTRA_MODLIB}"/$i/ocfs2*.ko "${INST_MODLIB}/fs/$i"
 	rm -f "${EXTRA_MODLIB}"/$i/*.ko
 done
+strip_modules "${INST_MODLIB}"
 make clean
 %endif
 
+%install
+# We don't do anything here, but it is required to force RPM
+# magic behaviors ... thanks guys.
 
 %clean
 rm -rf "$RPM_BUILD_ROOT"