From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 29 Nov 2007 12:07:01 +0000 (+0000)
Subject: defines excludedocs
X-Git-Tag: 4.2-rc2~422
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=bea9255283583ecdb78bbb15e0f154ffaeacfbdf;p=build.git

defines excludedocs
---

diff --git a/Makefile b/Makefile
index 0e20f012..37fd6d34 100644
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,7 @@
 # (*) package-DEPENDDEVELS
 #     a set of *packages* that the build will rpm-install the -devel variant before building <package>
 # (*) package-DEPENDDEVELRPMS
-#     a set of *rpm* that the build will rpm-install before building <package>
+#     a set of *rpms* that the build will rpm-install before building <package>
 # (*) package-DEPENDFILES
 #     a set of files that the package depends on - and that make needs to know about
 #     if this contains RPMS/yumgroups.xml, then the toplevel RPMS's index 
@@ -285,6 +285,7 @@ export HOME := /building
 	echo "%_tmppath $(HOME)/tmp" >> $@
 	echo "%_netsharedpath /proc:/dev/pts" >> $@
 	echo "%_install_langs C:de:en:es:fr" >> $@
+	echo "%_excludedocs yes" >> $@
 
 ### run spec2make on the spec file and include the result
 # usage: spec2make package
diff --git a/mkfedora b/mkfedora
index b6fe7451..9dc3cac9 100755
--- a/mkfedora
+++ b/mkfedora
@@ -190,20 +190,21 @@ fi
 # Do not tolerate errors
 set -e
 
-# Mount /dev/pts and /dev/shm in reference image
-mount -t devpts none $vroot/dev/pts
-mount -t tmpfs none $vroot/dev/shm
-
-## make rpms ignore installing stuff to /proc
-mkdir -p $vroot/etc/rpm
+## make rpms ignore installing stuff to special fs entries like /proc
 # Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725
 # you have to use at least one language beside 'C'
-echo "%_install_langs C:de:en:es:fr" > $vroot/etc/rpm/macros
-echo "%_netsharedpath /proc:/dev/pts" >> $vroot/etc/rpm/macros
-# append to the vserver's rpm macros
-echo "%_install_langs C:de:en:es:fr" > /etc/rpm/macros
-echo "%_netsharedpath /proc:/dev/pts" >> /etc/rpm/macros
-# Mount /proc in reference image
+cat > /etc/rpm/macros <<EOF
+%_install_langs C:de:en:es:fr
+%_netsharedpath /proc:/dev/pts
+%_excludedocs yes
+EOF
+# copy to the vserver's rpm macros
+mkdir -p $vroot/etc/rpm
+cp /etc/rpm/macros $vroot/etc/rpm/macros
+
+# Mount in reference image
+mount -t devpts none $vroot/dev/pts
+mount -t tmpfs none $vroot/dev/shm
 mkdir -p $vroot/proc
 mount -t proc none $vroot/proc