1. photon
  2. Commit 37862132ced4a74d60289e07ed40b9471ee9bd5c
Browse code

Remove debug info from svn and prevent copying grub setup for ova uefi

Anish Swaminathan authored on 2015/09/10 06:08:47
Showing 2 changed files
SPECS/subversion/subversion.spec
History View file @ 3786213
... ... 
@@ -36,6 +36,7 @@ make -j1 DESTDIR=%{buildroot} install
36 36 
 %defattr(-,root,root)
37 37 
 %{_bindir}/*
38 38 
 %{_libdir}/*
39 
+%exclude %{_libdir}/debug/
39 40 
 %{_includedir}/*
40 41 
 %{_mandir}/*/*
41 42 
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/subversion.mo
support/cloud-image-builder/cloud-image-build.sh
History View file @ 3786213
... ... 
@@ -32,7 +32,7 @@ cp $VMDK_CONFIG_FILE $VMDK_CONFIG_SAFE_FILE
32 32 
 cp ${BUILD_SCRIPTS_PATH}/mk-setup-vmdk.sh .
33 33 
 cp ${BUILD_SCRIPTS_PATH}/mk-clean-vmdk.sh .
34 34
35 
-if [ $IMG_NAME != "ova" ]
35 
+if [ $IMG_NAME != "ova" ] && [ $IMG_NAME != "ova_uefi" ]
36 36 
   then
37 37 
     cp ${BUILD_SCRIPTS_PATH}/mk-setup-grub.sh .
38 38 
 fi
... ... 
@@ -77,7 +77,6 @@ cp $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/shadow $PHOTON_IMG_OUTPUT_PATH
77 77 
 sed -e "s/^\(root:\)[^:]*:/\1*:/" $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/shadow.bak > $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/shadow
78 78 
 rm -f $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/shadow.bak
79 79 
 rm -f $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/shadow-
80 
-
81 80 
 if [ $IMG_NAME != "ova" ] && [ $IMG_NAME != "ova_uefi" ]
82 81 
   then
83 82 
     mount -o bind /proc $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/proc