mirror of
				https://github.com/fspc/gbootroot.git
				synced 2025-11-04 00:05:35 -05:00 
			
		
		
		
	This removes any existing stuff under tmp/gbootroot in the specs if it
exists, which can creates nasties when a build fails at -bl, and removed modules/CVS filter from gbootroot_pkg which didn't effect 7.3 or Mandrake 9.0, but did effect 8.0, now have to check whether this is working properly on Debian again. Not sure why these directories were causing a problem to begin with.
This commit is contained in:
		
							parent
							
								
									a6b8114ecf
								
							
						
					
					
						commit
						56aae6038b
					
				@ -415,9 +415,6 @@ if ( $ARGV[0] eq "both" || $ARGV[0] eq "rpm" ) {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        "/usr/share/doc-base/gbootroot\n", 1,
 | 
					        "/usr/share/doc-base/gbootroot\n", 1,
 | 
				
			||||||
        "/usr/lib/menu/gbootroot\n", 1, 
 | 
					        "/usr/lib/menu/gbootroot\n", 1, 
 | 
				
			||||||
        "/usr/lib/bootroot/yard/Replacements/lib/modules/CVS/Root\n", 1, 
 | 
					 | 
				
			||||||
        "/usr/lib/bootroot/yard/Replacements/lib/modules/CVS/Repository\n", 1, 
 | 
					 | 
				
			||||||
        "/usr/lib/bootroot/yard/Replacements/lib/modules/CVS/Entries\n", 1, 
 | 
					 | 
				
			||||||
        "/usr/share/doc/gbootroot/Changes.gz\n", 1, 
 | 
					        "/usr/share/doc/gbootroot/Changes.gz\n", 1, 
 | 
				
			||||||
        "/usr/share/doc/gbootroot/copyright\n", 1, 
 | 
					        "/usr/share/doc/gbootroot/copyright\n", 1, 
 | 
				
			||||||
        "/usr/share/doc/gbootroot/changelog.Debian.gz\n", 1,
 | 
					        "/usr/share/doc/gbootroot/changelog.Debian.gz\n", 1,
 | 
				
			||||||
 | 
				
			|||||||
@ -91,7 +91,10 @@ as mdk.
 | 
				
			|||||||
%prep
 | 
					%prep
 | 
				
			||||||
%setup -n gbootroot-%{version}
 | 
					%setup -n gbootroot-%{version}
 | 
				
			||||||
#chown -R root:root .
 | 
					#chown -R root:root .
 | 
				
			||||||
if [ ! -e /tmp/gbootroot ] ; then
 | 
					if [ -e /tmp/gbootroot ] ; then
 | 
				
			||||||
 | 
					    rm -rf /tmp/gbootroot;
 | 
				
			||||||
 | 
					    mkdir /tmp/gbootroot;
 | 
				
			||||||
 | 
					elif [ ! -e /tmp/gbootroot ] ; then
 | 
				
			||||||
    mkdir /tmp/gbootroot;
 | 
					    mkdir /tmp/gbootroot;
 | 
				
			||||||
fi;
 | 
					fi;
 | 
				
			||||||
install -d $HOME/gbootroot/RPMS/i386
 | 
					install -d $HOME/gbootroot/RPMS/i386
 | 
				
			||||||
 | 
				
			|||||||
@ -89,7 +89,10 @@ as mdk.
 | 
				
			|||||||
%prep
 | 
					%prep
 | 
				
			||||||
%setup -n gbootroot-%{version}
 | 
					%setup -n gbootroot-%{version}
 | 
				
			||||||
#chown -R root:root .
 | 
					#chown -R root:root .
 | 
				
			||||||
if [ ! -e /tmp/gbootroot ] ; then
 | 
					if [ -e /tmp/gbootroot ] ; then
 | 
				
			||||||
 | 
					    rm -rf /tmp/gbootroot;
 | 
				
			||||||
 | 
					    mkdir /tmp/gbootroot;
 | 
				
			||||||
 | 
					elif [ ! -e /tmp/gbootroot ] ; then
 | 
				
			||||||
    mkdir /tmp/gbootroot;
 | 
					    mkdir /tmp/gbootroot;
 | 
				
			||||||
fi;
 | 
					fi;
 | 
				
			||||||
install -d $HOME/gbootroot/RPMS/i386
 | 
					install -d $HOME/gbootroot/RPMS/i386
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user