--- builds_bin/build_installer 2005/10/10 03:15:53 1.1 +++ builds_bin/build_installer 2006/06/30 00:18:36 1.4 @@ -19,13 +19,15 @@ echo "Checking packages not installed in CentOS workstation group" -for package in anaconda anaconda-runtime bogl booty createrepo mkisofs zsync +for package in anaconda anaconda-runtime bogl booty createrepo mkisofs zsync \ + xorg-x11-font-utils netpbm-progs netpbm do rpm -q $package || exit "$package must be installed" done distname='SME Server' distvers=$(basename $(pwd)) +distarch=i386 for img in product updates do @@ -40,59 +42,68 @@ PYTHONPATH=/usr/lib/anaconda/ /usr/lib/a PYTHONPATH=/usr/lib/anaconda/ /usr/lib/anaconda-runtime/pkgorder \ $(pwd)/cdrom.image \ - i386 > pkgorder + $distarch > pkgorder -# Link to necessary rpms to rebuild installer -for rpm in anaconda-10.1.1.19-1.centos4.i386.rpm \ - anaconda-help-10.1.0-1.centos4.noarch.rpm \ - anaconda-runtime-10.1.1.19-1.centos4.i386.rpm \ - atk-1.8.0-2.i386.rpm \ - audiofile-0.2.6-1.i386.rpm \ - bogl-0.1.18-4.i386.rpm \ - bogl-bterm-0.1.18-4.i386.rpm \ - booty-0.44-1.i386.rpm \ - busybox-anaconda-1.00.rc1-5.i386.rpm \ - comps-extras-10.1-1.noarch.rpm \ - esound-0.2.35-2.i386.rpm \ - fonts-arabic-1.5-3.noarch.rpm \ - fonts-bengali-0.1-3.noarch.rpm \ - fonts-xorg-base-6.8.1.1-1.EL.1.noarch.rpm \ - gdk-pixbuf-0.22.0-16.el4.i386.rpm \ - gnome-python2-2.6.0-3.i386.rpm \ - gnome-python2-applet-2.6.0-3.i386.rpm \ - gnome-python2-canvas-2.6.0-3.i386.rpm \ - gnome-python2-nautilus-2.6.0-3.i386.rpm \ - gtk2-2.4.13-14.i386.rpm \ - joe-3.1-6.i386.rpm \ - libart_lgpl-2.3.16-3.i386.rpm \ - libgnomecanvas-2.8.0-1.i386.rpm \ - memtest86+-1.26-2.i386.rpm \ - open-1.4-21.i386.rpm \ - pango-1.6.0-9.i386.rpm \ - parted-1.6.19-1.EL.i386.rpm \ - pygtk2-2.4.0-1.i386.rpm \ - pyparted-1.6.8-2.i386.rpm \ - redhat-artwork-0.120-1.1E.centos4.1.i386.rpm \ - redhat-logos-1.1.25-1.centos4.3.noarch.rpm \ - rsh-0.17-25.3.i386.rpm \ - system-config-date-1.7.15-0.RHEL4.1.noarch.rpm \ - ttfonts-bn-1.8-1.noarch.rpm \ - ttfonts-gu-1.8-1.noarch.rpm \ - ttfonts-hi-1.8-1.noarch.rpm \ - ttfonts-ja-1.2-36.EL4.0.noarch.rpm \ - ttfonts-ko-1.0.11-32.2.noarch.rpm \ - ttfonts-pa-1.8-1.noarch.rpm \ - ttfonts-ta-1.8-1.noarch.rpm \ - ttfonts-zh_CN-2.14-6.noarch.rpm \ - ttfonts-zh_TW-2.11-28.noarch.rpm \ - urw-fonts-2.2-6.noarch.rpm \ - vnc-server-4.0-8.1.i386.rpm \ - xorg-x11-6.8.2-1.EL.13.6.i386.rpm; do - ln -fs /mirrors/centos/4.1/os/i386/CentOS/RPMS/$rpm $(pwd)/cdrom.image/CentOS/RPMS/ +PACKAGES="acl anaconda anaconda-help anaconda-images anaconda-runtime ash + atk attr audiofile audit-libs bash beecrypt bitmap-fonts-cjk bogl + bogl-bterm booty busybox-anaconda bzip2 bzip2-libs comps-extras + convertdb1 coreutils cpio device-mapper dmapi dosfstools dump + e2fsprogs elfutils-libelf esound expat fedora-logos findutils + fontconfig fonts-arabic fonts-bengali fonts-ISO8859-2 fonts-ISO8859-9 + fonts-xorg-100dpi fonts-xorg-base fonts-xorg-ISO8859-15-75dpi + fonts-xorg-ISO8859-2-75dpi fonts-xorg-ISO8859-9-75dpi fonts-xorg-KOI8-R + fonts-xorg-KOI8-R-75dpi freetype ftp gdk-pixbuf glib2 glibc glibc-common + gnome-python2 gnome-python2-canvas gpm gtk2 gzip hdparm hwdata iputils + jfsutils joe kernel-pcmcia-cs kernel-utils krb5-libs kudzu less libacl + libart_lgpl libattr libgcc libgnome libgnomecanvas libjpeg libpng + libselinux libsepol libstdc++ libtermcap libxml2 libxml2-python lvm2 + man mdadm memtest86+ modutils mtools mtr mt-st ncurses net-tools newt + open openssh openssh-clients openssl pam pango parted pciutils policy + policycoreutils popt prelink procps pygtk2 pyparted python pyxf86config + raidtools readline redhat-artwork redhat-logos reiserfs-utils rhpl rpm + rpm-libs rpm-python rsh sed selinux-policy-targeted setup slang specspo + syslinux system-config-date system-config-keyboard taipeifonts tar + tcp_wrappers traceroute ttfonts-bn ttfonts-gu ttfonts-hi ttfonts-ja + ttfonts-ko ttfonts-pa ttfonts-ta ttfonts-zh_CN ttfonts-zh_TW tzdata + urw-fonts util-linux vnc-server Xconfigurator XFree86 XFree86-100dpi-fonts + XFree86-75dpi-fonts XFree86-base-fonts XFree86-ISO8859-15-75dpi-fonts + XFree86-ISO8859-2-75dpi-fonts XFree86-ISO8859-9-75dpi-fonts + XFree86-KOI8-R XFree86-KOI8-R-75dpi-fonts XFree86-libs XFree86-libs-data + XFree86-xfs xfsdump xfsprogs Xft xorg-x11 xorg-x11-100dpi-fonts + xorg-x11-base xorg-x11-base-fonts xorg-x11-ISO8859-15-75dpi + xorg-x11-ISO8859-15-75dpi-fonts xorg-x11-ISO8859-2-75dpi-fonts + xorg-x11-ISO8859-9-75dpi-fonts xorg-x11-KOI8-R xorg-x11-KOI8-R-75dpi-fonts + xorg-x11-libs xorg-x11-libs-data xorg-x11-xfs zlib" + +for PKG in $PACKAGES +do + PACKAGEFILES=$(rpm --qf "%{NAME} %{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}.rpm\n" --nodigest --nosignature -qp /mirrors/centos/4/updates/$distarch/RPMS/$PKG*.rpm | grep "^$PKG " | sed 's/.* //') + if [ -n "$PACKAGEFILES" ]; + then + for PKGFILE in $PACKAGEFILES + do + if [ ! -f $(pwd)/cdrom.image/CentOS/RPMS/$PKGFILE ]; + then + ln -sf /mirrors/centos/4/updates/$distarch/RPMS/$PKGFILE $(pwd)/cdrom.image/CentOS/RPMS/$PKGFILE + fi + done + else + PACKAGEFILES=$(rpm --qf "%{NAME} %{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}.rpm\n" --nodigest --nosignature -qp /mirrors/centos/4/os/$distarch/CentOS/RPMS/$PKG*.rpm | grep "^$PKG " | sed 's/.* //') + if [ -n "$PACKAGEFILES" ]; + then + for PKGFILE in $PACKAGEFILES + do + if [ ! -f $(pwd)/cdrom.image/CentOS/RPMS/$PKGFILE ]; + then + ln -sf /mirrors/centos/4/os/$distarch/CentOS/RPMS/$PKGFILE $(pwd)/cdrom.image/CentOS/RPMS/$PKGFILE + fi + done + fi + fi done PYTHONPATH=/usr/lib/anaconda/ sudo /usr/lib/anaconda-runtime/buildinstall \ - --comp dist-4.1 \ + --comp dist-4.3 \ --pkgorder pkgorder \ --release "$distname" \ --product "$distname" \ @@ -105,8 +116,6 @@ find $(pwd)/cdrom.image/CentOS/RPMS/ -ty # Copy updated isolinux files sudo cp -fR /builds/isolinux/* $(pwd)/cdrom.image/isolinux/ -cd cdrom.image - -/builds/bin/build_IS0 +echo "You now need to run /builds/bin/build_ISO as non-root" # That's it.