summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/genlocalelist20
-rwxr-xr-xscripts/mk-images9
-rw-r--r--scripts/mk-images.i38617
-rwxr-xr-xscripts/pkgorder3
-rwxr-xr-xscripts/splitdistro14
-rwxr-xr-xscripts/upd-instroot14
6 files changed, 59 insertions, 18 deletions
diff --git a/scripts/genlocalelist b/scripts/genlocalelist
index da9082199..b2490ee29 100755
--- a/scripts/genlocalelist
+++ b/scripts/genlocalelist
@@ -28,16 +28,17 @@ $defaultTerritory{"Vietnamese"} = "Vietnam";
$defaultTerritory{"Turkish"} = "Turkey";
$defaultTerritory{"Thai"} = "Thailand";
-$charMap{"GB2312"} = "iso01";
-$charMap{"BIG5"} = "iso01";
-$charMap{"EUC-JP"} = "iso01";
-$charMap{"EUC-TW"} = "iso01";
-$charMap{"EUC-KR"} = "iso01";
-$charMap{"GB2312"} = "iso01";
-$charMap{"BIG5"} = "iso01";
+$charMap{"GB2312"} = "iso15";
+$charMap{"GB18030"} = "iso15";
+$charMap{"BIG5"} = "iso15";
+$charMap{"EUC-JP"} = "iso15";
+$charMap{"EUC-TW"} = "iso15";
+$charMap{"EUC-KR"} = "iso15";
+$charMap{"GB2312"} = "iso15";
+$charMap{"BIG5"} = "iso15";
$charMap{"KOI8-U"} = "koi8-u";
$charMap{"KOI8-R"} = "koi8-u";
-$charMap{"ISO-8859-1"} = "iso01";
+$charMap{"ISO-8859-1"} = "iso15";
$charMap{"ISO-8859-2"} = "iso02";
$charMap{"ISO-8859-3"} = "iso03";
$charMap{"ISO-8859-5"} = "iso05";
@@ -51,6 +52,7 @@ $charFont{"EUC-JP"} = "lat0-sun16";
$charFont{"EUC-TW"} = "lat0-sun16";
$charFont{"EUC-KR"} = "lat0-sun16";
$charFont{"GB2312"} = "lat0-sun16";
+$charFont{"GB18030"} = "lat0-sun16";
$charFont{"BIG5"} = "lat0-sun16";
$charFont{"KOI8-U"} = "cyr-sun16";
$charFont{"KOI8-R"} = "cyr-sun16";
@@ -77,13 +79,13 @@ while (<FILE>) {
$lang=$_;
$lang =~ s/eucjp/eucJP/;
$lang =~ s/euckr/eucKR/;
+ $lang =~ s/gb18030/GB18030/;
$lang =~ s/^zh_CN$/zh_CN.GB2312/;
$lang =~ s/^zh_TW$/zh_TW.Big5/;
# someone put nb_NO in locale.alias. yuck. We don't
# want to offer that.
("nb_" eq substr($lang, 0, 3)) && next;
- ("zh_CN.gb18030" eq $lang) && next;
("zh_TW.euctw" eq $lang) && next;
open(INFO, "LANG=$lang locale language territory charmap|");
diff --git a/scripts/mk-images b/scripts/mk-images
index acf9167b1..23deaf949 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -1,6 +1,7 @@
#!/bin/bash
PATH=$PATH:/sbin:/usr/sbin
+IMAGEUUID=$(date +%Y%m%d%H%M)
usage () {
echo "usage: mk-images <pkgsrc> <toplevel> <template> <buildarch> <version>"
@@ -411,6 +412,8 @@ EOF
install -m 644 $IMGPATH/usr/share/terminfo/x/xterm $MBD_DIR/etc/terminfo/x/xterm
install -m 644 $IMGPATH/usr/share/terminfo/x/xterm-color $MBD_DIR/etc/terminfo/x/xterm-color
install -m 644 $IMGPATH/usr/share/terminfo/v/vt100 $MBD_DIR/etc/terminfo/v/vt100
+ rm -f $MBD_DIR/.buildstamp
+ echo $IMAGEUUID > $MBD_DIR/.buildstamp
if [ -f $LOADERBINDIR/kon.cfg ]; then
mkdir -p $MBD_DIR/etc/terminfo/k
@@ -639,6 +642,8 @@ makeinstimage () {
cp -f $KERNELROOT/lib/modules/*/kernel/drivers/s390/*/* $KERNELROOT/lib/modules/misc
fi
makemoduleball $tmpdir/modules "$modlist"
+ rm -f $tmpdir/.buildstamp
+ echo $IMAGEUUID > $tmpdir/.buildstamp
mkcramfs $tmpdir $INSTIMGPATH/${imagename}1.img
size=$(ls -l $INSTIMGPATH/${imagename}1.img | awk '{print $5}')
@@ -680,9 +685,13 @@ makemainimage () {
(cd $IMGPATH; find . | fgrep -v "./usr/lib/anaconda-runtime" |
cpio -H crc -o) | (cd $mmi_mntpoint; cpio -iumd)
+ rm -f $mmi_mntpoint/.buildstamp
+ echo $IMAGEUUID > $mmi_mntpoint/.buildstamp
umount $mmi_mntpoint
rmdir $mmi_mntpoint
elif [ $type = "cramfs" ]; then
+ rm -f $IMGPATH/.buildstamp
+ echo $IMAGEUUID > $IMGPATH/.buildstamp
mkcramfs $IMGPATH $mmi_tmpimage
SIZE=$(expr `cat $mmi_tmpimage | wc -c` / 1024)
fi
diff --git a/scripts/mk-images.i386 b/scripts/mk-images.i386
index 5e66a4de3..c1229ddeb 100644
--- a/scripts/mk-images.i386
+++ b/scripts/mk-images.i386
@@ -180,8 +180,25 @@ makebootdisk --kernelto $TOPDESTPATH/dosutils/autoboot/vmlinuz \
--imagename ../dosutils/autoboot/cdboot.img \
--initrd $TOPDESTPATH/dosutils/autoboot/initrd.img
+makeinitrd --initrdto $TOPDESTPATH/images/pxeboot/initrd-everything.img \
+ --pcmcia \
+ --initrdsize 4000 \
+ --loaderbin loader-pcmcia \
+ --modules "$LOCALMODULES $NETWORKMODULES $PCMCIAMAINMODULES $PCMCIAMODULES =scsi =net"
+
makemainmodules "=scsi =net $SECSTAGE"
makeinstimage "netstg" "=scsi $SECSTAGE"
makeinstimage "hdstg" "=net $SECSTAGE"
makemainimage "stage2" "cramfs"
+
+
+cat > $TOPDESTPATH/images/pxeboot/README <<EOF
+The files in this directory are useful for booting a machine via PXE.
+
+The following files are available:
+vmlinuz - the BOOT kernel used for the installer
+initrd.img - the regular network initrd used by the bootnet images
+initrd-everything.img - an initrd with support for all install methods and
+ drivers supported for installation of Red Hat Linux
+EOF
diff --git a/scripts/pkgorder b/scripts/pkgorder
index 8841c0e27..2decc375c 100755
--- a/scripts/pkgorder
+++ b/scripts/pkgorder
@@ -6,6 +6,9 @@ import os.path
import rpm
import string
+# set up rpm dependency whiteouts
+import whiteout
+
rpmFD = None
import comps
diff --git a/scripts/splitdistro b/scripts/splitdistro
index 01d0089f4..778f8e4ce 100755
--- a/scripts/splitdistro
+++ b/scripts/splitdistro
@@ -4,9 +4,9 @@
disc2dirs = [ "preview" ]
# These files appear on all binary CDs
-jointfiles = [ "COPYING", "RPM-GPG-KEY", "README", "autorun" ]
+jointfiles = [ "beta_eula.txt", "RPM-GPG-KEY", "README", "autorun" ]
-targetSize = 640 * 1024 * 1024
+targetSize = 640 * 1024.0 * 1024.0
# Leave about 1.2MB of space on the disc
fudgeFactor = 1.2 * 1024 * 1024
@@ -40,6 +40,7 @@ def moveFiles(srcDir, destDir, files):
def excessFiles(path, fileList, maxSize):
total = 0
moveList = []
+ found = 0
for fns in fileList:
if type(fns) == types.StringType:
@@ -54,6 +55,9 @@ def excessFiles(path, fileList, maxSize):
total = total + size
else:
# once we're done, we're done
+ if found == 0:
+# print "straw was %s" % (fns,)
+ found = 1
total = maxSize
moveList.extend(fns)
@@ -187,6 +191,7 @@ disc2pkgs = excessFiles(distDir + "/RedHat/RPMS", binPkgList,
moveFiles("%s/RedHat/RPMS" % disc1Dir,
"%s/RedHat/RPMS" % disc2Dir,
disc2pkgs);
+disc1Size = spaceUsed(disc1Dir)
print "Creating disc3..."
stamp(disc3Dir, releasestr, "disc3", arch, startedAt)
@@ -200,7 +205,7 @@ for file in jointfiles:
print "**** WARNING linking %s to %s: %s" % (src, dest, msg)
disc3pkgs = excessFiles(distDir + "/RedHat/RPMS", binPkgList,
- targetSize * 2 - disc1used - fudgeFactor)
+ targetSize + disc1Size - disc1used - fudgeFactor)
moveFiles("%s/RedHat/RPMS" % disc2Dir,
"%s/RedHat/RPMS" % disc3Dir,
@@ -220,10 +225,11 @@ disc2pkgs = excessFiles(srcDir + "/SRPMS", srcPkgList,
moveFiles("%s/SRPMS" % disc1SrcDir,
"%s/SRPMS" % disc2SrcDir,
disc2pkgs);
+srcDisc1Size = spaceUsed(disc1SrcDir)
print "Dropping remainder of sources on third disc..."
disc3pkgs = excessFiles(srcDir + "/SRPMS", srcPkgList,
- (targetSize - fudgeFactor) * 2)
+ srcDisc1Size + targetSize - fudgeFactor)
moveFiles("%s/SRPMS" % disc2SrcDir,
"%s/SRPMS" % disc3SrcDir,
disc3pkgs)
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 70959e575..b102c09fc 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -121,16 +121,17 @@ PACKAGESGR="anaconda XFree86-libs imlib libpng libtiff libjpeg
XFree86-S3 XFree86-SVGA XFree86-75dpi-fonts
XFree86-ISO8859-2-75dpi-fonts glib2 gtk2
XFree86-ISO8859-9-75dpi-fonts esound audiofile libgnome
- XFree86-100dpi-fonts XFree86-ISO8859-2 XFree86-ISO8859-9
+ XFree86-100dpi-fonts fonts-ISO8859-2 fonts-ISO8859-9
XFree86-xfs e2fsprogs fileutils glibc glibc-common rsh less
ftp readline gzip popt specspo util-linux rpm rpm-devel
open grep net-tools traceroute tar procps textutils sed
- ncurses bash cpio mt-st iputils sh-utils XFree86-cyrillic-fonts
+ ncurses bash cpio mt-st iputils sh-utils
XFree86 Xconfigurator gnome-python2 pygtk2 gdk-pixbuf
XFree86-KOI8-R XFree86-KOI8-R-75dpi-fonts pciutils pam
reiserfs-utils atk pango freetype gnome-python2-canvas
libgnomecanvas libart_lgpl libzvt gnome-python2-zvt
- anaconda-images anaconda-help hdparm XFree86-base-fonts"
+ anaconda-images anaconda-help hdparm XFree86-base-fonts
+ ttfonts-ko taipeifonts XFree86-ISO8859-15-75dpi-fonts"
if [ -z "$NEEDGR" ]; then
PACKAGESGR="bash"
@@ -232,6 +233,7 @@ sbin/mkdosfs
sbin/mke2fs
sbin/busybox.anaconda
sbin/mkfs.ext2
+sbin/mkfs.ext3
sbin/mkfs.jfs
sbin/mkfs.msdos
sbin/mkfs.vfat
@@ -246,6 +248,7 @@ sbin/pvdisplay
sbin/pvmove
sbin/pvscan
sbin/probe
+sbin/sfdisk
sbin/tune2fs
sbin/vgcfgbackup
sbin/vgcfgrestore
@@ -466,8 +469,9 @@ usr/X11R6/lib/X11/fonts/75dpi/cour*ISO8859*
usr/X11R6/lib/X11/fonts/75dpi/fonts*ISO8859*
usr/X11R6/lib/X11/fonts/75dpi/helv*ISO8859*
usr/X11R6/lib/X11/fonts/75dpi/tim*ISO8859*
-usr/X11R6/lib/X11/fonts/cyrillic/*
usr/X11R6/lib/X11/fonts/encodings/large/big5*
+usr/X11R6/lib/X11/fonts/korean/gulim*
+usr/X11R6/lib/X11/fonts/korean/font*
usr/X11R6/lib/X11/fonts/misc/12x*
usr/X11R6/lib/X11/fonts/misc/6x*
usr/X11R6/lib/X11/fonts/misc/7x*
@@ -476,10 +480,10 @@ usr/X11R6/lib/X11/fonts/misc/9x*
usr/X11R6/lib/X11/fonts/misc/cursor*
usr/X11R6/lib/X11/fonts/misc/fonts*
usr/X11R6/lib/X11/fonts/misc/gb*
-usr/X11R6/lib/X11/fonts/misc/hangl*
usr/X11R6/lib/X11/fonts/misc/jis*
usr/X11R6/lib/X11/fonts/misc/k14*
usr/X11R6/lib/X11/fonts/misc/olcursor*
+usr/X11R6/lib/X11/fonts/misc/taipei*
usr/X11R6/lib/X11/locale/*
usr/X11R6/lib/X11/rgb*
usr/X11R6/lib/X11/xkb/*
generated by cgit (git 2.34.1) at 2024-10-05 00:25:39 +0000