bug 4.3/943

modified:   operation/configure_bootloader_cnf.sh
	modified:   operation/install_pkg.sh
	modified:   operation/makeinitrd
	modified:   xml/D5000-server.xml
	modified:   xml/D5000-workstation.xml
	new file:   xml/config.xml
	modified:   xml/dependency.xml
	deleted:    xml/server.xml
This commit is contained in:
fling
2011-07-18 17:45:31 +08:00
parent 1cec472931
commit d12ff2ddb2
7 changed files with 574 additions and 26 deletions

View File

@@ -128,24 +128,43 @@ EOF
fi
info "root_dev: $root_dev"
# modify grub.conf.sample from here
# modify root
sed "/^splashimage / s/(hd0,0)/$root/
/^kernel / s/(hd0,0)/$root/" "$GRUBCNF" >"$GRUBMENU"
# modify boot directory
# boot directory mount stand alone
local boot
if [ -n "$BOOT_PARTITION" ];then
sed -i "/^kernel / s@/boot@@
/^initrd / s@/boot@@" "$GRUBMENU"
boot=
else
boot="boot"
fi
cat >>"$TMPGRUBMENU"<< EOF
## LINX splash image
splashimage $root/boot/grub/linx.xpm.gz
# modify OS version
sed -i "/^title / s/Secure System/Secure Operating System Version $OSVERSION/" "$GRUBMENU"
# modify root partition
sed -i "/^kernel / s@root=/dev/hda1@root=$root_dev@" "$GRUBMENU"
# append kernel parameter
sed -i "s/^kernel .*$/& $KPARAMETER/g" $GRUBMENU
## define special fore-/background colors for splash screen image
foreground = FFFFFF
background = AAAAAA
## time to wait for user interaction
timeout 10
## default boot kernel
default 0
## Default menu entries
title LINX Rocky Secure Operating System Version $OSVERSION with root
kernel $root/$boot/vmlinuz-root root=$root_dev $KPARAMETER
initrd /$boot/initrd.gz
title LINX Rocky Secure Operating System Version $OSVERSION without root
kernel $root/$boot/vmlinuz-root-n root=$root_dev $KPARAMETER
initrd /$boot/initrd.gz
title LINX Rocky Secure Operating System Version $OSVERSION with root but no cgroup
kernel $root/$boot/vmlinuz-root-nocgroup root=$root_dev $KPARAMETER
initrd /$boot/initrd-nocgroup.gz
title LINX Rocky Secure Operating System Version $OSVERSION without root but no cgroup
kernel $root/$boot/vmlinuz-root-n-nocgroup root=$root_dev $KPARAMETER
initrd /$boot/initrd-nocgroup.gz
EOF
}
main ()
@@ -229,6 +248,7 @@ KPARAMETER=""
OSVERSION=""
GRUB_DIR="$TARGET/boot/grub"
GRUBMENU="$GRUB_DIR/menu.lst"
TMPGRUBMENU="$GRUB_DIR/tmpmenu.lst"
GRUBCNF="$GRUB_DIR/grub.conf.sample"
DEVICEMAP="$GRUB_DIR/device.map"
ELILO_CNF="/tmp/tmppoint/efi/boot/elilo.conf"

View File

@@ -87,6 +87,8 @@ get_pkg_file ()
# get the first package if have multi-package in source directory
if [ -e "$PKG_SOURCE_DIR"/"$pkgname"'#'*tar.gz ]; then
ls "$PKG_SOURCE_DIR"/"$pkgname"'#'*tar.gz|head -n 1
elif [ -e "/Rocky/install_lib_32/pkg_lib_i686"/"$pkgname"'#'*tar.gz ]; then
ls "/Rocky/install_lib_32/pkg_lib_i686"/"$pkgname"'#'*tar.gz|head -n 1
else
err "package \"$pkgname\" doesn't exist in "$PKG_SOURCE_DIR" "
return 3
@@ -142,7 +144,6 @@ main ()
local line
local tmp
local pkgname
tmp=$(getopt -o s: --long source:,help -- "$@" 2>>$DEV_LOG)
if [ $? -ne 0 ];then
usage; erv

View File

@@ -2,6 +2,15 @@
source ./functions
modules=$(ls /Rocky/modules/|grep -v .bak|grep -v .old)
LOGFILE=$LOG_FILE mkTmpfstab.sh -f "$TARGET/etc/fstab" -t "/tmp/fstab"
mkinitrd "$TARGET"/boot/initrd.gz $modules --without-usb --without-multipath --fstab="/tmp/fstab" -f
modules=$(ls /Rocky/modules/)
for module in $modules
do
nocgroup=${module##*-}
if [ "$nocgroup" == `uname -m` ];then
initrd="initrd.gz"
else
initrd="initrd-$nocgroup.gz"
fi
LOGFILE=$LOG_FILE mkTmpfstab.sh -f "$TARGET/etc/fstab" -t "/tmp/fstab"
mkinitrd "$TARGET"/boot/$initrd $module --without-usb --without-multipath --fstab="/tmp/fstab" -f
done

View File

@@ -163,6 +163,8 @@
<package name='libcap'/>
<package name='libcgroup'/>
<package name='libdrm'/>
<package name='libidl'/>
@@ -222,7 +224,6 @@
<package name='m4'/>
<package name='m4_i686_lib'/>
<package name='mactools'/>
@@ -455,7 +456,6 @@
<package name='e2fsprogs_i686_lib'/>
<package name='expat_i686_lib'/>
<package name='expect_i686_lib'/>
<package name='gcc_i686_lib'/>
<package name='gdbm_i686_lib'/>
<package name='gettext_i686_lib'/>
<package name='glibc_i686_lib'/>
@@ -576,6 +576,7 @@
<including install='mandatory' package='libaio'/>
<including install='mandatory' package='libarchive'/>
<including install='mandatory' package='libcap'/>
<including install='mandatory' package='libcgroup'/>
<including install='mandatory' package='libusb'/>
<including install='mandatory' package='libxml2'/>
<including install='mandatory' package='libxslt'/>
@@ -676,7 +677,6 @@ group name='development'>
<including install='mandatory' package='libxml++'/>
<including install='mandatory' package='libtool'/>
<including install='mandatory' package='m4'/>
<including install='mandatory' package='m4_i686_lib'/>
<including install='mandatory' package='make'/>
<including install='mandatory' package='nasm'/>
<including install='mandatory' package='strace'/>
@@ -786,7 +786,6 @@ group name='development'>
<including install='mandatory' package='e2fsprogs_i686_lib'/>
<including install='mandatory' package='expat_i686_lib'/>
<including install='mandatory' package='expect_i686_lib'/>
<including install='mandatory' package='gcc_i686_lib'/>
<including install='mandatory' package='gdbm_i686_lib'/>
<including install='mandatory' package='gettext_i686_lib'/>
<including install='mandatory' package='glibc_i686_lib'/>

View File

@@ -266,6 +266,8 @@
<package name='libcap'/>
<package name='libcgroup'/>
<package name='libdrm'/>
<package name='libidl'/>
@@ -645,7 +647,6 @@
<package name='e2fsprogs_i686_lib'/>
<package name='expat_i686_lib'/>
<package name='expect_i686_lib'/>
<package name='gcc_i686_lib'/>
<package name='gdbm_i686_lib'/>
<package name='gettext_i686_lib'/>
<package name='glibc_i686_lib'/>
@@ -874,6 +875,7 @@
<including install='mandatory' package='libaio'/>
<including install='mandatory' package='libarchive'/>
<including install='mandatory' package='libcap'/>
<including install='mandatory' package='libcgroup'/>
<including install='mandatory' package='libusb'/>
<including install='mandatory' package='libxml2'/>
<including install='mandatory' package='libxslt'/>
@@ -1219,7 +1221,6 @@ group name='development'>
<including install='mandatory' package='e2fsprogs_i686_lib'/>
<including install='mandatory' package='expat_i686_lib'/>
<including install='mandatory' package='expect_i686_lib'/>
<including install='mandatory' package='gcc_i686_lib'/>
<including install='mandatory' package='gdbm_i686_lib'/>
<including install='mandatory' package='gettext_i686_lib'/>
<including install='mandatory' package='glibc_i686_lib'/>

View File

@@ -4,7 +4,9 @@
<package name='Archive-Zip'/>
<package name='Compress-Raw-Zlib'/>
<package name='Compress-Zlib'/>
<package name='IO-Compress-Base'/>
@@ -12,6 +14,11 @@
<package name='Mesa'/>
<package name='PyXML'>
<description>
xml processor for Python
</description>
</package>
<package name='SDL'/>
@@ -25,25 +32,41 @@
<package name='adjtimex'/>
<package name='alsa-lib'/>
<package name='alsa-oss'/>
<package name='alsa-utils'/>
<package name='amsn'>
<description>
TLS is an OpenSSL / RSA-bsafe Tcl extension that provides secure connections on top of the Tcl socket mechanism.
</description>
</package>
<package name='ant'/>
<package name='apache'/>
<package name='apr'/>
<package name='arts'/>
<package name='at'/>
<package name='atk'/>
<package name='attr'/>
<package name='audiofile'/>
<package name='audit'/>
<package name='autoconf'/>
<package name='autogen'/>
<package name='automake'/>
<package name='bash'/>
@@ -51,31 +74,51 @@
<package name='beecrypt'/>
<package name='bin86'/>
<package name='bind'/>
<package name='bindutils'/>
<package name='binutils'/>
<package name='bison'/>
<package name='bridge-utils'/>
<package name='byacc'/>
<package name='bzip2'/>
<package name='cairo'/>
<package name='ccache'/>
<package name='cdrtools'/>
<package name='clearsilver'/>
<package name='coreutils'/>
<package name='cpio'/>
<package name='cpufrequtils'>
<description>
Clock scaling userspace tools
</description>
</package>
<package name='cracklib'/>
<package name='cscope'>
<description>
Cscope is a developer's tool for browsing source code.
</description>
</package>
<package name='cups'/>
<package name='cvs'/>
<package name='db'/>
@@ -83,8 +126,11 @@
<package name='dbus-glib-1'/>
<package name='ddd'/>
<package name='dejagnu'/>
<package name='dhcp'/>
<package name='dhcpcd'/>
@@ -94,6 +140,7 @@
<package name='dosfstools'/>
<package name='dvd+rw-tools'/>
<package name='e2fsprogs'/>
@@ -101,12 +148,15 @@
<package name='eject'/>
<package name='emacs'/>
<package name='esound'/>
<package name='expat'/>
<package name='expect'/>
<package name='fcitx'/>
<package name='fetchmail'/>
@@ -116,27 +166,47 @@
<package name='findutils'/>
<package name='firefox'/>
<package name='flex'/>
<package name='fontconfig'/>
<package name='freetype'/>
<package name='fribidi'/>
<package name='gamin'/>
<package name='gawk'/>
<package name='gcc'/>
<package name='gd'/>
<package name='gdb'/>
<package name='gdbm'/>
<package name='gdk-pixbuf'/>
<package name='gettext'/>
<package name='git'>
<description>
git, fast version control system
</description>
</package>
<package name='git-manpages'>
<description>
git manpages
</description>
</package>
<package name='glib1'/>
<package name='glib2'/>
<package name='glibc'/>
@@ -146,10 +216,19 @@
</description>
</package>
<package name='glitz'/>
<package name='gmp'/>
<package name='gnupg'>
<description>
GNU privacy guard version 1.4.x
</description>
</package>
<package name='gperf'/>
<package name='gpm'/>
<package name='grep'/>
@@ -157,21 +236,31 @@
<package name='grub'/>
<package name='gtk1'/>
<package name='gtk2'/>
<package name='guile'/>
<package name='gzip'/>
<package name='haskell-ghc'/>
<package name='haskell-libedit'/>
<package name='haskell-pandoc'/>
<package name='hdparm'/>
<package name='help2man'/>
<package name='hicolor-icon-theme'/>
<package name='hotplug'/>
<package name='imlib'/>
<package name='intltool'/>
<package name='iproute2'/>
@@ -179,59 +268,89 @@
<package name='ispell'/>
<package name='jdk'/>
<package name='jfsutils'/>
<package name='kbd'/>
<package name='kde-i18n-zh_CN'/>
<package name='kdeaccessibility'/>
<package name='kdeaddons'/>
<package name='kdeadmin'/>
<package name='kdeartwork'/>
<package name='kdebase'/>
<package name='kdebindings'/>
<package name='kdeedu'/>
<package name='kdegames'/>
<package name='kdegraphics'/>
<package name='kdelibs'/>
<package name='kdemultimedia'/>
<package name='kdenetwork'/>
<package name='kdepim'/>
<package name='kdesdk'/>
<package name='kdetoys'/>
<package name='kdeutils'/>
<package name='kdevelop'/>
<package name='kdewebdev'/>
<package name='kernel-header'/>
<package name='kernel_source'/>
<package name='killproc'/>
<package name='lcms'/>
<package name='less'/>
<package name='lesstif'/>
<package name='libaio'/>
<package name='libarchive'/>
<package name='libart_lgpl'/>
<package name='libcap'/>
<package name='libcgroup'/>
<package name='libdrm'/>
<package name='libidl'/>
<package name='libjpeg'/>
<package name='libmac'/>
<package name='libmec'/>
<package name='libmng'/>
<package name='libogg'/>
<package name='libpcap'/>
<package name='libpng'/>
<package name='libpthread-stubs'/>
@@ -243,12 +362,15 @@
<package name='libstdc++-compat'/>
<package name='libtiff'/>
<package name='libtool'/>
<package name='libungif'/>
<package name='libusb'/>
<package name='libvorbis'/>
<package name='libxcb'/>
@@ -278,9 +400,11 @@
</description>
</package>
<package name='lukemftp'/>
<package name='lvm2'/>
<package name='lynx'/>
<package name='m4'/>
@@ -340,6 +464,7 @@
<package name='openldap'/>
<package name='openoffice'/>
<package name='openssh'>
<service script='sshd' name='ssh' number='S205'/>
@@ -349,6 +474,7 @@
<package name='pam_make'/>
<package name='pango'/>
<package name='parted'/>
@@ -364,11 +490,14 @@
<package name='pine'/>
<package name='pixman'/>
<package name='pkg-config'/>
<package name='pkgutils'/>
<package name='poppler'/>
<package name='popt'/>
<package name='portmap'/>
@@ -391,9 +520,13 @@
<package name='python'/>
<package name='python-genshi'/>
<package name='python-setuptools'/>
<package name='qemu-kvm'/>
<package name='qt3'/>
<package name='quota'/>
@@ -411,12 +544,17 @@
<package name='rsync'/>
<package name='ruby'/>
<package name='rxvt'/>
<package name='samba'/>
<package name='scim'/>
<package name='scim-pinyin'/>
<package name='scim-tables'/>
<package name='sed'/>
@@ -426,16 +564,21 @@
<package name='smartmontools'/>
<package name='snort'/>
<package name='sqlite'/>
<package name='squid'/>
<package name='star'/>
<package name='strace'/>
<package name='subversion'/>
<package name='subversion-python'/>
<package name='swig'/>
<package name='sysfsutils'/>
@@ -461,6 +604,14 @@
<package name='texinfo'/>
<package name='thunderbird'>
<description>
email client from the Mozilla project
</description>
</package>
<package name='tightvnc'/>
<package name='time'/>
<package name='timezone'/>
@@ -473,6 +624,7 @@
</description>
</package>
<package name='trac'/>
<package name='traceroute'/>
@@ -480,6 +632,7 @@
<package name='udev'/>
<package name='uml-utilities'/>
<package name='unrar'>
<description>
@@ -497,6 +650,7 @@
<package name='vixie-cron'/>
<package name='webfs'/>
<package name='wget'/>
@@ -504,62 +658,123 @@
<package name='windowmaker'/>
<package name='wireshark'>
<description>
Wireshark is an award-winning network protocol analyzer.
</description>
</package>
<package name='x11-fonts-chinese'/>
<package name='xcb-proto'/>
<package name='xchat'/>
<package name='xfsprogs'/>
<package name='xkeyboard-config'/>
<package name='xorg-x11-app'/>
<package name='xorg-x11-app-twm'/>
<package name='xorg-x11-app-xinit'/>
<package name='xorg-x11-doc'/>
<package name='xorg-x11-driver'/>
<package name='xorg-x11-font-util'/>
<package name='xorg-x11-font-x11'/>
<package name='xorg-x11-libAppleWM'/>
<package name='xorg-x11-libFS'/>
<package name='xorg-x11-libICE'/>
<package name='xorg-x11-libSM'/>
<package name='xorg-x11-libWindowsWM'/>
<package name='xorg-x11-libX11'/>
<package name='xorg-x11-libXScrnSaver'/>
<package name='xorg-x11-libXau'/>
<package name='xorg-x11-libXaw'/>
<package name='xorg-x11-libXcomposite'/>
<package name='xorg-x11-libXcursor'/>
<package name='xorg-x11-libXdamage'/>
<package name='xorg-x11-libXdmcp'/>
<package name='xorg-x11-libXext'/>
<package name='xorg-x11-libXfixes'/>
<package name='xorg-x11-libXfont'/>
<package name='xorg-x11-libXfontcache'/>
<package name='xorg-x11-libXft'/>
<package name='xorg-x11-libXi'/>
<package name='xorg-x11-libXinerama'/>
<package name='xorg-x11-libXmu'/>
<package name='xorg-x11-libXp'/>
<package name='xorg-x11-libXpm'/>
<package name='xorg-x11-libXrandr'/>
<package name='xorg-x11-libXrender'/>
<package name='xorg-x11-libXres'/>
<package name='xorg-x11-libXt'/>
<package name='xorg-x11-libXtst'/>
<package name='xorg-x11-libXv'/>
<package name='xorg-x11-libXvMC'/>
<package name='xorg-x11-libXxf86dga'/>
<package name='xorg-x11-libXxf86misc'/>
<package name='xorg-x11-libXxf86vm'/>
<package name='xorg-x11-libdmx'/>
<package name='xorg-x11-libfontenc'/>
<package name='xorg-x11-libpciaccess'/>
<package name='xorg-x11-libxkbfile'/>
<package name='xorg-x11-proto'/>
<package name='xorg-x11-util'/>
<package name='xorg-x11-xbitmaps'/>
<package name='xorg-x11-xcursor-themes'/>
<package name='xorg-x11-xserver'/>
<package name='xorg-x11-xtrans'/>
<package name='xosview'/>
<package name='zip'/>
@@ -585,6 +800,7 @@
<including install='optional' package='cdrtools'/>
<including install='mandatory' package='coreutils'/>
<including install='mandatory' package='cpio'/>
<including install='optional' package='cpufrequtils'/>
<including install='mandatory' package='cracklib'/>
<including install='mandatory' package='db'/>
<!-- delete device-mapper, because new version lvm2 includes it -->
@@ -623,6 +839,7 @@
<including install='optional' package='libaio'/>
<including install='mandatory' package='libarchive'/>
<including install='mandatory' package='libcap'/>
<including install='mandatory' package='libcgroup'/>
<including install='mandatory' package='libusb'/>
<including install='optional' package='libxml2'/>
<including install='optional' package='libxslt'/>
@@ -709,13 +926,35 @@
开发类包括 C、C++Fortran、DDD 等开发工具。
开发类软件包分为必选包和可选包,当选择安装该类后,必选包是默认安装的,可选包可以自由选择安装。
</description>
<including install='optional' package='ant'/>
<including install='optional' package='Archive-Zip'/>
<including install='mandatory' package='autoconf'/>
<including install='optional' package='autogen'/>
<including install='mandatory' package='automake'/>
<including install='optional' package='bin86'/>
<including install='mandatory' package='binutils'/>
<including install='optional' package='bison'/>
<including install='optional' package='byacc'/>
<including install='optional' package='ccache'/>
<including install='optional' package='Compress-Raw-Zlib'/>
<including install='optional' package='Compress-Zlib'/>
<including install='optional' package='cvs'/>
<including install='optional' package='cscope'/>
<including install='optional' package='ddd'/>
<including install='optional' package='dejagnu'/>
<including install='optional' package='flex'/>
<including install='mandatory' package='gdb'/>
<including install='optional' package='git'/>
<including install='optional' package='git-manpages'/>
<including install='optional' package='glibmm'/>
<including install='optional' package='gnupg'/>
<including install='optional' package='gperf'/>
<including install='optional' package='guile'/>
<including install='optional' package='intltool'/>
<including install='optional' package='IO-Compress-Base'/>
<including install='optional' package='IO-Compress-Zlib'/>
<including install='optional' package='jdk'/>
<including install='optional' package='kernel_source'/>
<including install='optional' package='libidl'/>
<including install='optional' package='libsigc++'/>
<including install='optional' package='libstdc++-compat'/>
@@ -724,10 +963,19 @@
<including install='mandatory' package='m4'/>
<including install='mandatory' package='make'/>
<including install='optional' package='nasm'/>
<including install='optional' package='PyXML'/>
<including install='optional' package='strace'/>
<including install='optional' package='tls'/>
<including install='optional' package='XML-Parser'/>
<including install='optional' package='clearsilver'/>
<including install='optional' package='python-genshi'/>
<including install='optional' package='python-setuptools'/>
<including install='optional' package='sqlite'/>
<including install='optional' package='subversion'/>
<including install='optional' package='subversion-python'/>
<including install='optional' package='swig'/>
<including install='optional' package='trac'/>
<including install='optional' package='ruby'/>
</group>
<group name='gui'>
@@ -735,14 +983,98 @@
图形类包括 X11 相关的各种程序。
图形类软件包分为必选包和可选包,当选择安装该类后,必选包是默认安装的,可选包可以自由选择安装。
</description>
<including install='optional' package='arts'/>
<including install='optional' package='atk'/>
<including install='optional' package='cairo'/>
<including install='optional' package='emacs'/>
<including install='optional' package='fcitx'/>
<including install='optional' package='fontconfig'/>
<including install='optional' package='freetype'/>
<including install='optional' package='fribidi'/>
<including install='optional' package='gamin'/>
<including install='optional' package='gd'/>
<including install='optional' package='gdk-pixbuf'/>
<including install='optional' package='glib1'/>
<including install='optional' package='glib2'/>
<including install='optional' package='glitz'/>
<including install='optional' package='gpm'/>
<including install='optional' package='gtk1'/>
<including install='optional' package='gtk2'/>
<including install='optional' package='hicolor-icon-theme'/>
<including install='optional' package='imlib'/>
<including install='optional' package='lesstif'/>
<including install='optional' package='pango'/>
<including install='optional' package='pixman'/>
<including install='optional' package='poppler'/>
<including install='optional' package='qt3'/>
<including install='optional' package='rxvt'/>
<including install='mandatory' package='scim'/>
<including install='mandatory' package='scim-pinyin'/>
<including install='mandatory' package='scim-tables'/>
<including install='optional' package='SDL'/>
<including install='optional' package='tightvnc'/>
<including install='optional' package='tk'/>
<including install='optional' package='windowmaker'/>
<!-- xorg related packages -->
<including install='mandatory' package='xorg-x11-proto'/>
<including install='mandatory' package='xorg-x11-util'/>
<including install='mandatory' package='xorg-x11-xtrans'/>
<including install='mandatory' package='xorg-x11-libXau'/>
<including install='mandatory' package='xorg-x11-libXdmcp'/>
<including install='mandatory' package='xorg-x11-libX11'/>
<including install='mandatory' package='xorg-x11-libXext'/>
<including install='mandatory' package='xorg-x11-libdmx'/>
<including install='mandatory' package='xorg-x11-libfontenc'/>
<including install='mandatory' package='xorg-x11-libFS'/>
<including install='mandatory' package='xorg-x11-libICE'/>
<including install='mandatory' package='xorg-x11-libXp'/>
<including install='mandatory' package='xorg-x11-libXpm'/>
<including install='mandatory' package='xorg-x11-libXfixes'/>
<including install='mandatory' package='xorg-x11-libXcomposite'/>
<including install='mandatory' package='xorg-x11-libXrender'/>
<including install='mandatory' package='xorg-x11-libXdamage'/>
<including install='mandatory' package='xorg-x11-libXcursor'/>
<including install='mandatory' package='xorg-x11-libXfont'/>
<including install='mandatory' package='xorg-x11-libXfontcache'/>
<including install='mandatory' package='xorg-x11-libXft'/>
<including install='mandatory' package='xorg-x11-libXi'/>
<including install='mandatory' package='xorg-x11-libXinerama'/>
<including install='mandatory' package='xorg-x11-libxkbfile'/>
<including install='mandatory' package='xorg-x11-libXrandr'/>
<including install='mandatory' package='xorg-x11-libXres'/>
<including install='mandatory' package='xorg-x11-libXScrnSaver'/>
<including install='mandatory' package='xorg-x11-libXtst'/>
<including install='mandatory' package='xorg-x11-libXv'/>
<including install='mandatory' package='xorg-x11-libXvMC'/>
<including install='mandatory' package='xorg-x11-libXxf86dga'/>
<including install='mandatory' package='xorg-x11-libXxf86misc'/>
<including install='mandatory' package='xorg-x11-libXxf86vm'/>
<including install='mandatory' package='xorg-x11-libSM'/>
<including install='mandatory' package='xorg-x11-libpciaccess'/>
<including install='mandatory' package='xorg-x11-libXt'/>
<including install='mandatory' package='xorg-x11-libXmu'/>
<including install='mandatory' package='xorg-x11-libXaw'/>
<including install='mandatory' package='xorg-x11-libAppleWM'/>
<including install='mandatory' package='xorg-x11-libWindowsWM'/>
<including install='optional' package='xorg-x11-doc'/>
<including install='mandatory' package='xorg-x11-xbitmaps'/>
<including install='mandatory' package='xorg-x11-app'/>
<including install='mandatory' package='xorg-x11-xcursor-themes'/>
<including install='mandatory' package='xorg-x11-font-util'/>
<including install='mandatory' package='xorg-x11-font-x11'/>
<including install='mandatory' package='xorg-x11-xserver'/>
<including install='mandatory' package='xorg-x11-driver'/>
<including install='optional' package='xorg-x11-app-twm'/>
<including install='optional' package='xorg-x11-app-xinit'/>
<including install='mandatory' package='xcb-proto'/>
<including install='mandatory' package='libxcb'/>
<including install='mandatory' package='libpthread-stubs'/>
<including install='mandatory' package='Mesa'/>
<including install='mandatory' package='libdrm'/>
<including install='mandatory' package='xkeyboard-config'/>
<including install='mandatory' package='x11-fonts-chinese'/>
<including install='optional' package='xchat'/>
<including install='optional' package='xosview'/>
</group>
<group name='internet'>
@@ -750,10 +1082,60 @@
因特网类包括万维网浏览器 Firefox 等。
因特网类软件包都是必选包,当选择安装该类后,必选包是默认安装的。
</description>
<including install='optional' package='amsn'/>
<including install='mandatory' package='dbus'/>
<including install='mandatory' package='dbus-glib-1'/>
<including install='mandatory' package='firefox'/>
<including install='optional' package='thunderbird'/>
</group>
<group name='kde'>
<description>
KDE是一种著名的自由图形工作环境,整个系统采用Qt程序库
KDE桌面类都是可选软件包可以自由选择安装。
</description>
<including install='optional' package='kde-i18n-zh_CN'/>
<including install='optional' package='kdeaccessibility'/>
<including install='optional' package='kdeaddons'/>
<including install='optional' package='kdeadmin'/>
<including install='optional' package='kdeartwork'/>
<including install='optional' package='kdebase'/>
<including install='optional' package='kdebindings'/>
<including install='optional' package='kdeedu'/>
<including install='optional' package='kdegames'/>
<including install='optional' package='kdegraphics'/>
<including install='optional' package='kdelibs'/>
<including install='optional' package='kdemultimedia'/>
<including install='optional' package='kdenetwork'/>
<including install='optional' package='kdepim'/>
<including install='optional' package='kdesdk'/>
<including install='optional' package='kdetoys'/>
<including install='optional' package='kdeutils'/>
<including install='optional' package='kdevelop'/>
<including install='optional' package='kdewebdev'/>
</group>
<group name='multi-media'>
<description>
多媒体类包括各种媒体库。
多媒体类都是可选软件包,可以自由选择安装。
</description>
<including install='optional' package='alsa-lib'/>
<including install='optional' package='alsa-oss'/>
<including install='optional' package='alsa-utils'/>
<including install='optional' package='audiofile'/>
<including install='optional' package='dvd+rw-tools'/>
<including install='optional' package='esound'/>
<including install='optional' package='lcms'/>
<including install='optional' package='libart_lgpl'/>
<including install='optional' package='libjpeg'/>
<including install='optional' package='libmng'/>
<including install='optional' package='libogg'/>
<including install='optional' package='libpng'/>
<including install='optional' package='libtiff'/>
<including install='optional' package='libungif'/>
<including install='optional' package='libvorbis'/>
</group>
<group name='network_service'>
<description>
@@ -762,11 +1144,15 @@
</description>
<including install='optional' package='apache'/>
<including install='optional' package='apr'/>
<including install='optional' package='bind'/>
<including install='optional' package='bindutils'/>
<including install='optional' package='cups'/>
<including install='optional' package='dhcp'/>
<including install='optional' package='dhcpcd'/>
<including install='optional' package='fetchmail'/>
<including install='optional' package='linux-identd'/>
<including install='optional' package='lukemftp'/>
<including install='optional' package='lynx'/>
<including install='optional' package='mod_perl'/>
<including install='optional' package='mod_php'/>
<including install='optional' package='nail'/>
@@ -784,6 +1170,9 @@
<including install='optional' package='rdate'/>
<including install='optional' package='rsync'/>
<including install='optional' package='samba'/>
<including install='optional' package='snort'/>
<including install='optional' package='squid'/>
<including install='optional' package='webfs'/>
</group>
<group name='network_tools'>
@@ -794,17 +1183,47 @@
<including install='optional' package='libpcap'/>
<including install='optional' package='openldap'/>
<including install='optional' package='tcpdump'/>
<including install='optional' package='wireshark'/>
</group>
<group name='office'>
<description>
办公类包括 OpenOffice.org 等办公软件。
办公类都是必选软件包,当选择安装该类后,必选包是默认安装的。
</description>
<including install='mandatory' package='openoffice'/>
</group>
<group name='publish'>
<description>
</description>
<including install='optional' package='haskell-libedit'/>
<including install='optional' package='haskell-ghc'/>
<including install='optional' package='haskell-pandoc'/>
</group>
<group name='vm'>
<description>
通过软件模拟的具有完整硬件系统功能的、运行在一个完全隔离环境中的完整计算机系统
虚拟机类都是可选软件包,可以自由选择安装
</description>
<including install='optional' package='qemu-kvm'/>
<including install='optional' package='bridge-utils'/>
<including install='optional' package='uml-utilities'/>
</group>
<release name='security'>
<including group='base' install='mandatory'/>
<including group='development' install='optional'/>
<including group='gui' install='optional'/>
<including group='kde' install='optional'/>
<including group='internet' install='optional'/>
<including group='multi-media' install='optional'/>
<including group='network_service' install='optional'/>
<including group='network_tools' install='optional'/>
<including group='vm' install='optional'/>
<including group='office' install='optional'/>
<including group='publish' install='optional'/>
</release>
</configuration>

View File

@@ -595,7 +595,6 @@
<depending via='shared_lib' package='glibc'/>
</runtime>
</package>
<package name='gcc_i686_lib'/>
<package name='gcc'>
<runtime>
<depending via='shared_lib' package='alsa-lib'/>
@@ -1832,6 +1831,7 @@
<depending via='shared_lib' package='glibc'/>
</runtime>
</package>
<package name='libcgroup'/>
<package name='libcap'>
<runtime>
<depending via='shared_lib' package='attr'/>
@@ -2005,6 +2005,7 @@
<depending via='shared_lib' package='openssl'/>
</runtime>
</package>
<package name='m4_i686_lib'/>
<package name='m4'>
<runtime>
<depending via='shared_lib' package='glibc'/>
@@ -4171,16 +4172,25 @@
<depending via='shared_lib' package='glib2_i686_lib'/>
<depending via='shared_lib' package='glibc_i686_lib'/>
<depending via='shared_lib' package='glitz_i686_lib'/>
<depending via='shared_lib' package='gtk2_i686_lib'/>
<depending via='shared_lib' package='libidl_i686_lib'/>
<depending via='shared_lib' package='libjpeg_i686_lib'/>
<depending via='shared_lib' package='libpng_i686_lib'/>
<depending via='shared_lib' package='libxcb_i686_lib'/>
<depending via='shared_lib' package='pango_i686_lib'/>
<depending via='shared_lib' package='sqlite_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libICE_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libSM_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libX11_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXau_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXcomposite_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXcursor_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXdamage_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXext_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXfixes_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXft_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXinerama_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXrandr_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXrender_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXt_i686_lib'/>
<depending via='shared_lib' package='zlib_i686_lib'/>
@@ -4324,6 +4334,35 @@
<depending via='shared_lib' package='xorg-x11-libXi_i686_lib'/>
</runtime>
</package>
<package name='gtk2_i686_lib'>
<runtime>
<depending via='shared_lib' package='atk_i686_lib'/>
<depending via='shared_lib' package='cairo_i686_lib'/>
<depending via='shared_lib' package='expat_i686_lib'/>
<depending via='shared_lib' package='fontconfig_i686_lib'/>
<depending via='shared_lib' package='freetype_i686_lib'/>
<depending via='shared_lib' package='glib2_i686_lib'/>
<depending via='shared_lib' package='glibc_i686_lib'/>
<depending via='shared_lib' package='glitz_i686_lib'/>
<depending via='shared_lib' package='libjpeg_i686_lib'/>
<depending via='shared_lib' package='libpng_i686_lib'/>
<depending via='shared_lib' package='libtiff_i686_lib'/>
<depending via='shared_lib' package='libxcb_i686_lib'/>
<depending via='shared_lib' package='openssl_i686_lib'/>
<depending via='shared_lib' package='pango_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libX11_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXau_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXcomposite_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXcursor_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXdamage_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXext_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXfixes_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXinerama_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXrandr_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXrender_i686_lib'/>
<depending via='shared_lib' package='zlib_i686_lib'/>
</runtime>
</package>
<package name='guile_i686_lib'>
<runtime>
<depending via='shared_lib' package='glibc_i686_lib'/>
@@ -5396,16 +5435,22 @@
<depending via='shared_lib' package='glibc_i686_lib'/>
<depending via='shared_lib' package='glitz_i686_lib'/>
<depending via='shared_lib' package='gmp_i686_lib'/>
<depending via='shared_lib' package='gtk2_i686_lib'/>
<depending via='shared_lib' package='libpng_i686_lib'/>
<depending via='shared_lib' package='libxcb_i686_lib'/>
<depending via='shared_lib' package='ncurses_i686_lib'/>
<depending via='shared_lib' package='openssl_i686_lib'/>
<depending via='shared_lib' package='pango_i686_lib'/>
<depending via='shared_lib' package='readline_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libICE_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libSM_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libX11_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXau_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXcomposite_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXcursor_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXdamage_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXext_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXfixes_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXinerama_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXrandr_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXrender_i686_lib'/>
@@ -5431,6 +5476,24 @@
<depending via='shared_lib' package='glibc_i686_lib'/>
</runtime>
</package>
<package name='pango_i686_lib'>
<runtime>
<depending via='shared_lib' package='cairo_i686_lib'/>
<depending via='shared_lib' package='expat_i686_lib'/>
<depending via='shared_lib' package='fontconfig_i686_lib'/>
<depending via='shared_lib' package='freetype_i686_lib'/>
<depending via='shared_lib' package='glib2_i686_lib'/>
<depending via='shared_lib' package='glibc_i686_lib'/>
<depending via='shared_lib' package='glitz_i686_lib'/>
<depending via='shared_lib' package='libpng_i686_lib'/>
<depending via='shared_lib' package='libxcb_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libX11_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXau_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXft_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXrender_i686_lib'/>
<depending via='shared_lib' package='zlib_i686_lib'/>
</runtime>
</package>
<package name='pciutils_i686_lib'/>
<package name='pcre_i686_lib'>
<runtime>
@@ -5465,11 +5528,20 @@
<depending via='shared_lib' package='glib2_i686_lib'/>
<depending via='shared_lib' package='glibc_i686_lib'/>
<depending via='shared_lib' package='glitz_i686_lib'/>
<depending via='shared_lib' package='gtk2_i686_lib'/>
<depending via='shared_lib' package='libjpeg_i686_lib'/>
<depending via='shared_lib' package='libpng_i686_lib'/>
<depending via='shared_lib' package='libxcb_i686_lib'/>
<depending via='shared_lib' package='pango_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libX11_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXau_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXcomposite_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXcursor_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXdamage_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXext_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXfixes_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXinerama_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXrandr_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXrender_i686_lib'/>
<depending via='shared_lib' package='zlib_i686_lib'/>
</runtime>
@@ -5567,11 +5639,20 @@
<depending via='shared_lib' package='glib2_i686_lib'/>
<depending via='shared_lib' package='glibc_i686_lib'/>
<depending via='shared_lib' package='glitz_i686_lib'/>
<depending via='shared_lib' package='gtk2_i686_lib'/>
<depending via='shared_lib' package='libpng_i686_lib'/>
<depending via='shared_lib' package='libxcb_i686_lib'/>
<depending via='shared_lib' package='pango_i686_lib'/>
<depending via='shared_lib' package='scim_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libX11_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXau_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXcomposite_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXcursor_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXdamage_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXext_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXfixes_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXinerama_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXrandr_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXrender_i686_lib'/>
<depending via='shared_lib' package='zlib_i686_lib'/>
</runtime>
@@ -5587,11 +5668,20 @@
<depending via='shared_lib' package='glib2_i686_lib'/>
<depending via='shared_lib' package='glibc_i686_lib'/>
<depending via='shared_lib' package='glitz_i686_lib'/>
<depending via='shared_lib' package='gtk2_i686_lib'/>
<depending via='shared_lib' package='libpng_i686_lib'/>
<depending via='shared_lib' package='libxcb_i686_lib'/>
<depending via='shared_lib' package='pango_i686_lib'/>
<depending via='shared_lib' package='scim_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libX11_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXau_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXcomposite_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXcursor_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXdamage_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXext_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXfixes_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXinerama_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXrandr_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXrender_i686_lib'/>
<depending via='shared_lib' package='zlib_i686_lib'/>
</runtime>
@@ -5607,10 +5697,19 @@
<depending via='shared_lib' package='glib2_i686_lib'/>
<depending via='shared_lib' package='glibc_i686_lib'/>
<depending via='shared_lib' package='glitz_i686_lib'/>
<depending via='shared_lib' package='gtk2_i686_lib'/>
<depending via='shared_lib' package='libpng_i686_lib'/>
<depending via='shared_lib' package='libxcb_i686_lib'/>
<depending via='shared_lib' package='pango_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libX11_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXau_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXcomposite_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXcursor_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXdamage_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXext_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXfixes_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXinerama_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXrandr_i686_lib'/>
<depending via='shared_lib' package='xorg-x11-libXrender_i686_lib'/>
<depending via='shared_lib' package='zlib_i686_lib'/>
</runtime>