Hi,
Some comments on your very helpfull patch :)
On Fri, May 10, 2002 at 03:17:21PM -0700, Taylor, ForrestX wrote:
> I have a patch to splitdistro that fixes several things:
>
> - Remove the preview directory (not included in RH 7.3)
This causes one big problem for me:
<...>
Splitting tree...
Creating disc1...
Creating disc2...
Creating disc3...
Creating first source disc...
Creating second source disc...
Dropping remainder of sources on third disc...
1.5G /var/ftp/pub/linux/th/i386-disc1 <-- ouch
60k /var/ftp/pub/linux/th/i386-disc2
64k /var/ftp/pub/linux/th/i386-disc3
12k /var/ftp/pub/linux/th/i386-disc4
12k /var/ftp/pub/linux/th/i386-disc5
I had to patch a single line to have a proper i386-disc[123]
directory split:
164c164
< disc1used = totalsize - rpmsize - dirsize
---
> disc1used = totalsize - rpmsize
> - Remove the beta.eula and replace with the real files
ok
> - Changes the max size of the discs from 640 to 650 (I live on the edge!)
ok
> - Remove the i386-disc3 directory (a must have if you run splitdistro
> more than once)
ok
BTW I have added the creation of the SRPMS in i386-disc4 (aka disc1SrcDir)
as a workaround of Jean Paul JP Robinson 's splitdistro error.
Now i have :D
<...>
Splitting tree...
Creating disc1...
Creating disc2...
Creating disc3...
Creating first source disc...
Creating second source disc...
Dropping remainder of sources on third disc...
640M /var/ftp/pub/linux/th/i386-disc1
642M /var/ftp/pub/linux/th/i386-disc2
251M /var/ftp/pub/linux/th/i386-disc3
12k /var/ftp/pub/linux/th/i386-disc4
12k /var/ftp/pub/linux/th/i386-disc5
Hope that helps
Tru
full patch (including your modifications)
--- splitdistro.orig Wed May 15 22:19:33 2002
+++ splitdistro Wed May 15 22:50:29 2002
@@ -1,10 +1,10 @@
#!/usr/bin/python
# These dirs, along with RPMS, make up disc 2
-disc2dirs = [ "preview" ]
+disc2dirs = [ "" ]
# These files appear on all binary CDs
-jointfiles = [ "beta_eula.txt", "RPM-GPG-KEY", "README", "autorun" ]
+jointfiles = [ "EULA", "GPL", "RPM-GPG-KEY", "README", "autorun" ]
targetSize = 650 * 1024.0 * 1024.0
@@ -161,11 +161,11 @@
if os.access(what, os.R_OK):
dirsize = dirsize + spaceUsed(distDir + "/" + dir)
-disc1used = totalsize - rpmsize - dirsize
+disc1used = totalsize - rpmsize
-os.system("rm -rf %s %s %s %s" % ( disc1Dir, disc2Dir, disc1SrcDir,
- disc2SrcDir))
-os.system("mkdir -p %s %s %s/SRPMS %s/RedHat/RPMS %s/RedHat/RPMS %s/SRPMS" %
+os.system("rm -rf %s %s %s %s %s" % ( disc1Dir, disc2Dir, disc1SrcDir,
+ disc3Dir, disc2SrcDir))
+os.system("mkdir -p %s %s/SRPMS %s/SRPMS %s/RedHat/RPMS %s/RedHat/RPMS %s/SRPMS" %
(disc1Dir, disc1SrcDir, disc2SrcDir, disc2Dir,
disc3Dir, disc3SrcDir))
--
Dr Tru Huynh | http://www.pasteur.fr/recherche/unites/Binfs/
mailto:tru@xxxxxxxxxx | tel/fax +33 1 45 68 87 37/19
Institut Pasteur, 25-28 rue du Docteur Roux, 75724 Paris CEDEX 15 France
