OpenSDE
/
rocklinux
mirror of https://github.com/amery/rocklinux.git
2
0
Fork 0
Code Releases Wiki Activity
Browse Source

Rene Rebe: 

* merged r3405, r3407, r3410 and r3411 from branches/2.0-stable:
	  * added a minimal-desktop package preselection template
	  * added a .la sanity check to functions - currently it searches for
            occurrences of -pthread (the famous one) in the files and aborts
	    the package build when present (to be removed again in the future)
	  * cosmetic status output fix and using the compressed image on sparc
	  * removed the sparc boot.msg . terminator present from initial copy
          * fixed the silo.conf to use the right ramdisk and ramdisk size



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@3415 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
rocklinux
Rene Rebe 20 years ago
parent
5abb6edd08
commit
6287c654be
5 changed files with 225 additions and 6 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +206
    -0
      misc/pkgsel/minimal-desktop.in
  2. +11
    -1
      scripts/functions
  3. +0
    -1
      target/bootdisk/sparc/boot.msg
  4. +2
    -2
      target/bootdisk/sparc/build.sh
  5. +6
    -2
      target/bootdisk/sparc/silo.conf

+ 206
- 0
misc/pkgsel/minimal-desktop.in
View File

@ -0,0 +1,206 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/misc/pkgsel/minimal+xfree.in
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. A copy of the GNU General Public
# License can be found at Documentation/COPYING.
#
# Many people helped and are helping developing ROCK Linux. Please
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
# file for details.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
#
# TITLE: Minimalistic desktop
pkgfilter sed '
# Add strictly required packages
/ 00-dirtree / { p; d; };
/ bind / { p; d; };
/ devfsd / { p; d; };
/ dhcp / { p; d; };
/ dialog / { p; d; };
/ autoconf / { p; d; };
/ automake / { p; d; };
/ bash / { p; d; };
/ binutils / { p; d; };
/ bison / { p; d; };
/ bzip2 / { p; d; };
/ cracklib/ { p; d; };
/ cron / { p; d; };
/ curl / { p; d; };
/ diffutils / { p; d; };
/ e2fsprogs / { p; d; };
/ reiserfsprogs / { p; d; };
/ raidtools / { p; d; };
/ ed / { p; d; };
/ bc / { p; d; };
/ expat / { p; d; };
/ file / { p; d; };
/ coreutils / { p; d; };
/ findutils / { p; d; };
/ flex / { p; d; };
/ gawk / { p; d; };
/ gcc3 / { p; d; };
/ gettext / { p; d; };
/ glibc23 / { p; d; };
/ grep / { p; d; };
/ groff / { p; d; };
/ gzip / { p; d; };
/ iproute2 / { p; d; };
/ iptables / { p; d; };
/ wireless-tools / { p; d; };
/ kbd / { p; d; };
/ less / { p; d; };
/ libtool / { p; d; };
/ libjpeg / { p; d; };
/ libpng / { p; d; };
/ libtiff / { p; d; };
/ libungif / { p; d; };
/ linux.*-src / { s/^X /O / ; p; d; };
/ linux.* / { p; d; };
/ linux.*-header / { p; d; };
/ m4 / { p; d; };
/ make / { p; d; };
/ man / { p; d; };
/ man-pages / { p; d; };
/ mine / { p; d; };
/ mktemp / { p; d; };
/ modutils / { p; d; };
/ module-init-tools / { p; d; };
/ ncompress / { p; d; };
/ ncurses / { p; d; };
/ netkit-base / { p; d; };
/ net-tools/ { p; d; };
/ nfs-utils / { p; d; };
/ netkit-telnet/ { p; d; };
/ openssh / { p; d; };
/ openssl / { p; d; };
/ pam / { p; d; };
/ patch / { p; d; };
/ perl5 / { p; d; };
/ procinfo / { p; d; };
/ procps / { p; d; };
/ psmisc / { p; d; };
/ pciutils/ { p; d; };
/ screen / { p; d; };
/ pkgconfig / { p; d; };
/ sed / { p; d; };
/ shadow / { p; d; };
/ sysfiles / { p; d; };
/ sysklogd / { p; d; };
/ sysvinit / { p; d; };
/ tar / { p; d; };
/ texinfo / { p; d; };
/ time / { p; d; };
/ unzip / { p; d; };
/ util-linux / { p; d; };
/ vim / { p; d; };
/ vlock / { p; d; };
/ wget / { p; d; };
/ xfree86 / { p; d; };
/ zip / { p; d; };
/ zlib / { p; d; };
/ zsh/ { p; d; };
/ ghostscript / { p; d; };
/ ghostscript-fonts / { p; d; };
/ kdevelop / { s/^X /O / ; p; d; };
/ quanta / { s/^X /O / ; p; d; };
/ kdeedu / { s/^X /O / ; p; d; };
/ kdegames / { s/^X /O / ; p; d; };
/ kde-i18n-fr / { s/^X /O / ; p; d; };
/ kde-i18n-es / { s/^X /O / ; p; d; };
/ kde-i18n-it / { s/^X /O / ; p; d; };
/ kde / { p; d; };
/ mozilla / { p; d; };
/ bitstream-vera-fonts / { p; d; };
/ freetype / { p; d; };
/ apache / { p; d; };
/ samba / { p; d; };
/ cups / { p; d; };
/ atk / { p; d; };
/ glib / { p; d; };
/ pango / { p; d; };
/ gtk+ / { p; d; };
/ glib12 / { p; d; };
/ gtk+12 / { p; d; };
/ gimp / { p; d; };
/ ogg-vorbis / { p; d; };
/ xmms / { p; d; };
/ xine / { p; d; };
/ mplayer / { p; d; };
/ mplayer-fonts / { p; d; };
/ wv2 / { p; d; };
/ libmng / { p; d; };
/ libgphoto / { p; d; };
/ sane-backends / { p; d; };
/ libusb / { p; d; };
/ bdb41 / { p; d; };
/ bdb42 / { p; d; };
/ neon / { p; d; };
/ subversion / { p; d; };
/ gimp-print42 / { p; d; };
/ lesstif / { p; d; };
/ libgsf / { p; d; };
/ libidl / { p; d; };
/ libxml2 / { p; d; };
/ libxslt / { p; d; };
/ pcre / { p; d; };
/ xpdf / { p; d; };
/ libart_lgpl23 / { p; d; };
/ popt / { p; d; };
/ exim / { p; d; };
/ alsa / { p; d; };
/ alsa-driver / { p; d; };
/ cvs / { p; d; };
/ lame / { p; d; };
/ audiofile / { p; d; };
/ cdrtools / { p; d; };
/ cdrdao / { p; d; };
/ cdparanoia / { p; d; };
/ tvtime / { p; d; };
/ xvid / { p; d; };
/ jfsutils / { p; d; };
/ xfsprogs / { p; d; };
/ taglib / { p; d; };
/ freefonts / { p; d; };
/ rsync / { p; d; };
/ gnupg / { p; d; };
/ squid / { p; d; };
/ gdb / { p; d; };
/ sudo / { p; d; };
/ xdialog / { p; d; };
/ readline / { p; d; };
/ strace / { p; d; };
/ bonnie++ / { p; d; };
/ ppp / { p; d; };
/ tuxcursor / { p; d; };
/ cheapskatefonts / { p; d; };
# Some architecture-specifc-packages with missing deps
/ macosd / { s/^X /O / ; p; d; };
/ apmd / { s/^X /O / ; p; d; };
# Add architecture-specific-packages
/ alpha / { p; d; };
/ mips / { p; d; };
/ powerpc / { p; d; };
/ sparc / { p; d; };
/ x86 / { p; d; };
# Disabling the rest of packages
/.*/ { s/^X /O / ; p; d; };'

+ 11
- 1
scripts/functions
View File

@ -291,7 +291,7 @@ function run_check() {
# inside the .la file
#
postflist_static_lib() {
echo "processing static lib corrections ..."
echo "Processing static lib corrections ..."
egrep '^lib/.*\.(a|la)$' $builddir/flist.txt |
while read fn ; do
[ -e $root/$fn -o -L $root/$fn ] || continue
@ -304,6 +304,16 @@ postflist_static_lib() {
fi
add_flist $root/usr/$fn
done
# this check might be removed in the future when we decide this is not
# an issue anymore ...
echo "Verifing the .la files ..."
defect_la="`egrep 'lib/.*\.la$' $builddir/flist.txt |
xargs egrep 'dependency_libs=.*-pthread.*' |
cut -d : -f1 | sort -u | tr '\n' ' '`"
if [ "$defect_la" ] ; then
abort "-pthread in: $defect_la!"
fi
}
# Parse the *.desc file. Use the description from PKG-DESC-FORMAT and

+ 0
- 1
target/bootdisk/sparc/boot.msg
View File

@ -16,4 +16,3 @@ So you are going to install ROCK Linux ...
Possible choices are:
install ........... normal CD boot
.

+ 2
- 2
target/bootdisk/sparc/build.sh
View File

@ -20,8 +20,8 @@ then
cp -v $base/target/$target/sparc/{silo.conf,boot.msg} \
boot
#
# echo_status "Moving image (initrd) to boot directory."
# mv -v initrd.img boot/
echo_status "Moving image (initrd) to boot directory."
mv -v initrd.gz boot/
#
buildroot="build/${ROCKCFG_ID}"
datadir="build/${ROCKCFG_ID}/ROCK/bootdisk"

+ 6
- 2
target/bootdisk/sparc/silo.conf
View File

@ -16,10 +16,14 @@ message=/boot/boot.msg
image[sun4u]=/boot/vmlinux64.gz
label=install
alias=linux
initrd=/boot/initrd.img
initrd=/boot/initrd.gz
ramdisk=8388608
append="root=/dev/ram devfs=nocompat init=/linuxrc rw"
image[sun4c,sun4d,sun4m]=/boot/vmlinux.gz
label=install
alias=linux
initrd=/boot/initrd.img
initrd=/boot/initrd.gz
ramdisk=8388608
append="root=/dev/ram devfs=nocompat init=/linuxrc rw"

Write Preview
Loading…
Cancel
Save