Removed the manually maintained list of packages in upd-instroot. Move
any missing required packages to Requires tags in the spec file, remove
package names that no longer exist or are redundant.
The following package names were removed entirely because their contents
was not found in install.img:
attr, echo-icon-theme, gail, gnome-themes, gpm, libXevie, libXfont,
libfontenc, neon, redhat-artwork, tigervnc-server-module,
vim-minimal, tcp_wrappers, xorg-x11-xfs, gdk-pixbuf
gail is provided by gtk2. libbdevid is provided by nash. python-sqlite
is provided by python.
libxkbfile is pulled in during depsolving xorg-x11-font-utils.
python-decorator is pulled in during depsolving pyparted.
xkeyboard-config is pulled in during depsolving xorg-x11-server-Xorg.
The remaining packages were moved to Requires: tags.
---
anaconda.spec.in | 189 ++++++++++++++++++++++++++++++++++++++++----------
scripts/upd-instroot | 91 +------------------------
2 files changed, 153 insertions(+), 127 deletions(-)
diff --git a/anaconda.spec.in b/anaconda.spec.in
index 7dfa5c8..28d0c96 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -81,67 +81,182 @@ BuildRequires: desktop-file-utils
%endif
BuildRequires: iscsi-initiator-utils-devel >= %{iscsiver}
-Requires: policycoreutils
-Requires: rpm-python >= %{rpmpythonver}
+Requires: /etc/gtk-2.0/gtkrc
+Requires: NetworkManager >= %{nmver}
+Requires: anaconda-yum-plugins
+Requires: at-spi
+Requires: authconfig
+Requires: btrfs-progs
+Requires: bzip2
Requires: comps-extras
-Requires: rhpl >= %{rhplver}
-Requires: parted >= %{partedver}
-Requires: pyparted >= %{pypartedver}
-Requires: yum >= %{yumver}
-Requires: libxml2-python
-Requires: python-urlgrabber
-Requires: system-logos
-Requires: pykickstart >= %{pykickstartver}
-Requires: system-config-date >= %{syscfgdatever}
+Requires: cracklib-python
+Requires: createrepo >= %{createrepover}
+Requires: cryptsetup-luks
+Requires: dbus-python
Requires: device-mapper >= %{dmver}
Requires: device-mapper-libs >= %{dmver}
+Requires: dhclient
+Requires: dhcpv6-client
+Requires: dialog
+Requires: dogtail
Requires: dosfstools
+Requires: dump
Requires: e2fsprogs >= %{e2fsver}
+Requires: firstaidkit-plugin-all
+Requires: ftp
+Requires: gdb-gdbserver
+Requires: genisoimage >= %{genisoimagever}
+Requires: gfs2-utils
+Requires: gnome-python2-gconf
+Requires: gnome-python2-gtkhtml2
+Requires: gtk2-engines
Requires: gzip
-%ifarch %{ix86} x86_64 ia64
-Requires: dmidecode
-%endif
-Requires: python-pyblock >= %{pythonpyblockver}
-Requires: libbdevid >= %{libbdevidver}
+Requires: hal
+Requires: isomd5sum
+Requires: jfsutils
+Requires: joe
Requires: libbdevid-python
+Requires: libbonobo
+Requires: libselinux-python >= %{libselinuxver}
Requires: libuser-python
+Requires: libxml2-python
+Requires: lvm2
+Requires: man
+Requires: mdadm
+Requires: mt-st
+Requires: mtr
Requires: newt-python
-Requires: authconfig
-Requires: gnome-python2-gtkhtml2
-Requires: system-config-firewall
-Requires: cryptsetup-luks
+Requires: nfs-utils
+Requires: ntfs-3g
+Requires: ntfsprogs
+Requires: openssh-clients
+Requires: openssh-server
+Requires: parted >= %{partedver}
+Requires: policycoreutils
+Requires: prelink
+Requires: pykickstart >= %{pykickstartver}
+Requires: pyparted >= %{pypartedver}
+Requires: python-bugzilla
Requires: python-cryptsetup >= %{pythoncryptsetupver}
-Requires: mdadm
-Requires: lvm2
+Requires: python-pyblock >= %{pythonpyblockver}
+Requires: python-urlgrabber
+Requires: reiserfs-utils
+Requires: rhpl >= %{rhplver}
+Requires: rpm-python >= %{rpmpythonver}
+Requires: rsh
+Requires: rsync
+Requires: samba-client
+Requires: selinux-policy-targeted
+Requires: smartmontools
+Requires: specspo
+Requires: squashfs-tools
+Requires: system-config-date >= %{syscfgdatever}
+Requires: system-config-firewall
+Requires: system-logos
+Requires: tigervnc-server
+Requires: traceroute
Requires: util-linux-ng >= 2.15.1
+Requires: xfsdump
+Requires: xfsprogs
+Requires: xorg-x11-drivers
+Requires: xorg-x11-font-utils
+Requires: xorg-x11-server-Xorg
+Requires: xorg-x11-xauth
+Requires: xorg-x11-xkb-utils
+Requires: yum >= %{yumver}
+Requires: yum-utils >= %{yumutilsver}
+
+Requires: bitmap-fonts-cjk
+Requires: cjkuni-uming-fonts
+Requires: dejavu-sans-fonts
+Requires: dejavu-sans-mono-fonts
+Requires: fonts-ISO8859-2
+Requires: lklug-fonts
+Requires: lohit-assamese-fonts
+Requires: lohit-bengali-fonts
+Requires: lohit-gujarati-fonts
+Requires: lohit-hindi-fonts
+Requires: lohit-kashmiri-fonts
+Requires: lohit-kannada-fonts
+Requires: lohit-maithili-fonts
+Requires: lohit-marathi-fonts
+Requires: lohit-oriya-fonts
+Requires: lohit-punjabi-fonts
+Requires: lohit-sindhi-fonts
+Requires: lohit-tamil-fonts
+Requires: lohit-telugu-fonts
+Requires: madan-fonts
+Requires: smc-meera-fonts
+Requires: taipeifonts
+Requires: un-core-fonts-dotum
+Requires: urw-fonts
+Requires: vlgothic-fonts
+Requires: xorg-x11-fonts-ethiopic
+
+%ifarch i386
+Requires: glibc.i386
+Requires: openssl.i386
+%endif
+
+%ifarch i586
+Requires: glibc.i586
+Requires: openssl.i586
+%endif
+
+%ifarch %{ix86} x86_64 ia64
+Requires: dmidecode
+Requires: efibootmgr
+%endif
+
%ifnarch s390 s390x ppc64
+Requires: binutils
+Requires: login
+Requires: portmap
+Requires: s390utils
+Requires: strace
Requires: system-config-keyboard
%endif
-Requires: hal, dbus-python
-Requires: cracklib-python
-Requires: python-bugzilla
+
%ifarch %livearches
Requires: usermode
Requires: zenity
%endif
-Requires: createrepo >= %{createrepover}
-Requires: squashfs-tools
-Requires: genisoimage >= %{genisoimagever}
+
%ifarch %{ix86} x86_64
-Requires: syslinux >= 3.73
+Requires: grub
+Requires: gpart
Requires: makebootfat
-Requires: device-mapper
+Requires: memtest86+
+Requires: pcmciautils
+Requires: syslinux >= 3.73
+%endif
+
+%ifarch ia64
+Requires: elilo
%endif
+
%ifarch s390 s390x
Requires: openssh
%endif
-Requires: isomd5sum
-Requires: yum-utils >= %{yumutilsver}
-Requires: NetworkManager >= %{nmver}
-Requires: dhclient
-Requires: dhcpv6-client
-Requires: anaconda-yum-plugins
-Requires: libselinux-python >= %{libselinuxver}
+
+%ifarch sparc sparc64
+Requires: silo
+Requires: tilo
+%endif
+
+%ifarch alpha
+Requires: aboot
+%endif
+
+%ifarch ppc ppc64
+Requires: fbset
+Requires: hfsutils
+Requires: pdisk
+Requires: pcmciautils
+Requires: ppc64-utils
+Requires: yaboot
+%endif
+
Obsoletes: anaconda-images <= 10
Provides: anaconda-images = %{version}-%{release}
Obsoletes: anaconda-runtime < %{version}-%{release}
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 8899b37..8754b83 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -150,91 +150,6 @@ die () {
exit 1
}
-FONTS="bitmap-fonts-cjk cjkuni-uming-fonts dejavu-sans-fonts
- dejavu-sans-mono-fonts fonts-ISO8859-2 lklug-fonts
- lohit-assamese-fonts lohit-bengali-fonts lohit-gujarati-fonts
- lohit-hindi-fonts lohit-kashmiri-fonts lohit-kannada-fonts
- lohit-maithili-fonts lohit-marathi-fonts lohit-oriya-fonts
- lohit-punjabi-fonts lohit-sindhi-fonts lohit-tamil-fonts
- lohit-telugu-fonts madan-fonts smc-meera-fonts taipeifonts
- un-core-fonts-dotum urw-fonts vlgothic-fonts
- xorg-x11-fonts-ethiopic xorg-x11-fonts-misc"
-
-PACKAGES="anaconda at-spi attr btrfs-progs bzip2 dogtail echo-icon-theme
- gail gdb-gdbserver gdk-pixbuf gfs2-utils gnome-python2-gconf
- gnome-themes gpm gtk2-engines jfsutils libXevie libXfont
- libbdevid libbonobo libfontenc libxkbfile neon nfs-utils ntfs-3g
- prelink python-decorator python-sqlite redhat-artwork
- reiserfs-utils selinux-policy-targeted specspo synaptics
- tcp_wrappers tigervnc-server tigervnc-server-module vim-minimal
- xkeyboard-config xfsdump xfsprogs xorg-x11-auth xorg-x11-drivers
- xorg-x11-font-utils xorg-x11-server-Xorg xorg-x11-xkb-utils
- xorg-x11-xfs /etc/gtk-2.0/gtkrc $FONTS"
-
-if [ $ARCH = i386 ]; then
- PACKAGES="$PACKAGES glibc.i386 openssl.i386"
-elif [ $ARCH = i586 ]; then
- PACKAGES="$PACKAGES glibc.i586 openssl.i586"
-fi
-
-if [ $ARCH = i386 -o $ARCH = i586 -o $ARCH = x86_64 ]; then
- PACKAGES="$PACKAGES pcmciautils grub"
-fi
-
-if [ $ARCH = i386 -o $ARCH = i586 -o $ARCH = x86_64 -o $ARCH = ia64 ]; then
- PACKAGES="$PACKAGES efibootmgr"
-fi
-
-if [ $ARCH = ia64 ]; then
- # XXX this needs to switch to grub at some point...
- PACKAGES="$PACKAGES elilo"
-fi
-
-if [ $ARCH = s390 -o $ARCH = s390x ]; then
- PACKAGES="$PACKAGES s390utils binutils tcp_wrappers
- openssh openssh-server login portmap
- strace xorg-x11-xauth xorg-x11-libs"
-fi
-
-if [ $ARCH = ppc -o $ARCH = ppc64 ]; then
- PACKAGES="$PACKAGES pcmciautils pdisk yaboot hfsutils"
-fi
-
-#
-# stuff ONLY included for rescue mode
-#
-# these packages are combined with the PACKAGES for big stage 2
-#
-PACKAGESRESCUE="bzip2 dump ftp joe man mt-st mtr smartmontools
- openssh openssh-clients rsh traceroute rsync
- ntfsprogs samba-client dialog
- firstaidkit firstaidkit-plugin-all"
-
-if [ $ARCH = i386 -o $ARCH = i586 -o $ARCH = x86_64 ]; then
- PACKAGESRESCUE="$PACKAGESRESCUE gpart grub"
-fi
-
-#
-# add bootloader for particular arch
-#
-if [ $ARCH = sparc ]; then
- PACKAGES="$PACKAGES tilo silo"
-fi
-
-if [ $ARCH = i386 -o $ARCH = i586 -o $ARCH = x86_64 ]; then
- PACKAGES="$PACKAGES syslinux memtest86+ grub"
-fi
-
-if [ $ARCH = alpha ]; then
- PACKAGES="$PACKAGES aboot"
-fi
-
-if [ $ARCH = ppc ]; then
- PACKAGES="$PACKAGES fbset yaboot ppc64-utils"
-fi
-
-#
-# KEEPFILE is all files to keep from the packages in PACKAGES
#
# The files in this list define the install image used for all installation
# methods.
@@ -704,8 +619,6 @@ usr/lib/python?.?/site-packages/dogtail/*.py
EOF
#
-# KEEPFILERESCUE is all files to keep from the packages in PACKAGESRESCUE
-#
# This defines the files in addition to KEEPFILE that make up
# the install images for NFS and CD/DVD based rescue mode installs. This
# image is not loaded into memory so it can be considerably larger.
@@ -822,8 +735,6 @@ EOF
fi
echo "Assembling package list..."
-RPMS="$PACKAGES $PACKAGESRESCUE"
-[ -n "$DEBUG" ] && echo "RPMS are $RPMS"
rm -rf $DEST; mkdir -p $DEST/usr/sbin $DEST/var/lib $DEST/boot
ln -s /tmp $DEST/var/lib/xkb
@@ -838,7 +749,7 @@ YUMDIR=${TMPDIR:-/tmp}/yumdir.$$
mkdir -p $YUMDIR/var/log
mkdir -p $YUMDIR/var/lib/yum
-expandPackageSet $yumconf $YUMDIR "$RPMS" $DEST $KEEPFILE
+expandPackageSet $yumconf $YUMDIR "anaconda" $DEST $KEEPFILE
echo `date` "Done Expanding packages..."
# Dogtail will check this
--
1.6.2.5
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
