[Demudi-commits] r185 - in demudi-debian-cd/trunk: . data/sarge debian tasks
Free Ekanayaka
free-guest@haydn.debian.org
Sun, 14 Nov 2004 03:55:00 -0700
Author: free-guest
Date: 2004-11-14 03:54:50 -0700 (Sun, 14 Nov 2004)
New Revision: 185
Modified:
demudi-debian-cd/trunk/data/sarge/demudi_i386_late_command
demudi-debian-cd/trunk/debian/control
demudi-debian-cd/trunk/demudi-debian-cd
demudi-debian-cd/trunk/demudi-tasksel
demudi-debian-cd/trunk/tasks/demudi-kernel
demudi-debian-cd/trunk/tasks/exclude-demudi
demudi-debian-cd/trunk/tasks/forcd1-demudi
Log:
Fixed automatic kernel selection
Modified: demudi-debian-cd/trunk/data/sarge/demudi_i386_late_command
===================================================================
--- demudi-debian-cd/trunk/data/sarge/demudi_i386_late_command 2004-11-13 15:30:38 UTC (rev 184)
+++ demudi-debian-cd/trunk/data/sarge/demudi_i386_late_command 2004-11-14 10:54:50 UTC (rev 185)
@@ -16,11 +16,11 @@
"
splash=/boot/grub/splashimages/agnula-romantic.xpm.gz
-if [ -x $apt ]; then
- apt-get install -y $packages
-else
- logger -t late-command "Failed to install $pakcages"
-fi
+for package in $packages; do
+ if ! apt-get install -y $package; then
+ echo "Failed to install $pakcage"
+ fi
+done
if [ -e /boot/grub/splash.xpm.gz ]; then
rm /boot/grub/splash.xpm.gz
@@ -30,5 +30,5 @@
sed -i -e 's/^# kopt=\(.*\)/# kopt=\1 vga=791 video=vesafb:ypan/g' /boot/grub/menu.lst
$grub
else
- logger -t late-command "Failed to install the splash image"
+ echo "Failed to install the splash image"
fi
Modified: demudi-debian-cd/trunk/debian/control
===================================================================
--- demudi-debian-cd/trunk/debian/control 2004-11-13 15:30:38 UTC (rev 184)
+++ demudi-debian-cd/trunk/debian/control 2004-11-14 10:54:50 UTC (rev 185)
@@ -8,7 +8,7 @@
Package: demudi-debian-cd
Architecture: all
Section: admin
-Depends: debian-cd, demudi-debtags
+Depends: debian-cd, demudi-debtags, python
Recommends: demudi-debpartial-mirror
Description: Tool for building DeMuDi CD set
This is a little collection of scripts and configuration files
Modified: demudi-debian-cd/trunk/demudi-debian-cd
===================================================================
--- demudi-debian-cd/trunk/demudi-debian-cd 2004-11-13 15:30:38 UTC (rev 184)
+++ demudi-debian-cd/trunk/demudi-debian-cd 2004-11-14 10:54:50 UTC (rev 185)
@@ -10,7 +10,7 @@
. /etc/default/demudi-debian-cd.conf
. /usr/share/demudi-debian-cd/debian-cd.conf
-/usr/share/demudi-debian-cd/demudi-tasksel > /tmp/demudi-tasksel
+/usr/share/demudi-debian-cd/demudi-tasksel | grep -v -e "^$" > /tmp/demudi-tasksel
cat /etc/debtags/tagpatch.d/demudi | cut -f 1 -d : | sort > /tmp/demudi-tasksel.raw
if ! sort /tmp/demudi-tasksel | diff -q /tmp/demudi-tasksel.raw -; then
@@ -19,7 +19,7 @@
make distclean
make status
-make bin-list TASK=tasks/demudi COMPLETE=0
+make bin-list TASK=tasks/demudi COMPLETE=0 SIZELIMIT1=730000000
mkdir -p /var/cache/demudi-debian-cd/tmp/sarge-i386/CD1/dists/sarge/local/binary-i386/
mkdir -p /var/cache/demudi-debian-cd/tmp/sarge-i386/CD1/dists/sarge/local/debian-installer/binary-i386/
make bootable
Modified: demudi-debian-cd/trunk/demudi-tasksel
===================================================================
--- demudi-debian-cd/trunk/demudi-tasksel 2004-11-13 15:30:38 UTC (rev 184)
+++ demudi-debian-cd/trunk/demudi-tasksel 2004-11-14 10:54:50 UTC (rev 185)
@@ -1,31 +1,5 @@
-#!/usr/bin/python2.4
+#!/bin/sh
-import sys
-import os
-import re
-import string
-from operator import itemgetter
-
-relevance = {}
-
-lines = (file( '/etc/debtags/tagvoc.d/demudi', 'r')).readlines()
-
-for line in lines:
-
- pattern = re.compile("^Tag: (.*)$")
- if pattern.match(line):
- current = pattern.match(line).group(1)
-
- pattern = re.compile("^Relevance: (\d+)$")
- if pattern.match(line):
- relevance[current] = pattern.match(line).group(1)
-
-
-lines = (file( '/etc/debtags/tagpatch.d/demudi', 'r')).readlines()
-
-for item in sorted(relevance.items(), key=itemgetter(1), reverse=True):
- tag = item[0]
- for line in lines:
- pattern = re.compile("^([^:]+):[ \t]*\+%s" % (tag))
- if pattern.match(line):
- print pattern.match(line).group(1)
+grep +relevance:: /etc/debtags/tagpatch.d/demudi \
+ | sed -e 's/^\([^:]*\):.*\+relevance::\([[:digit:]]\).*/\2 \1/g'|sort -r | cut -f 2 -d " "
+
\ No newline at end of file
Modified: demudi-debian-cd/trunk/tasks/demudi-kernel
===================================================================
--- demudi-debian-cd/trunk/tasks/demudi-kernel 2004-11-13 15:30:38 UTC (rev 184)
+++ demudi-debian-cd/trunk/tasks/demudi-kernel 2004-11-14 10:54:50 UTC (rev 185)
@@ -4,28 +4,14 @@
*
*/
-/* Needed by kernel-image-* */
-initrd-tools
-cramfsprogs
-dash
-
-/* Needed by kernel-patch-* */
-grep-dctrl
-
-/* Needed by alsa-source */
-debhelper
-html2text
-po-debconf
-intltool
-
-alsa-base
-alsa-utils
-alsa-source
-
-kernel-source-2.4.27
-
#ifdef ARCH_i386
+kernel-image-2.4-386
+kernel-image-2.4-586tsc
+kernel-image-2.4-686
+kernel-image-2.4-k6
+kernel-image-2.4-k7
+
kernel-image-2.4.27-1-multimedia-386
kernel-image-2.4.27-1-multimedia-586tsc
kernel-image-2.4.27-1-multimedia-686
@@ -44,8 +30,4 @@
alsa-modules-2.4.27-1-multimedia-k6
alsa-modules-2.4.27-1-multimedia-k7
-kernel-patch-2.4-lowlatency
-kernel-patch-2.4-preempt
-kernel-patch-2.4-givecap
-
#endif
Modified: demudi-debian-cd/trunk/tasks/exclude-demudi
===================================================================
--- demudi-debian-cd/trunk/tasks/exclude-demudi 2004-11-13 15:30:38 UTC (rev 184)
+++ demudi-debian-cd/trunk/tasks/exclude-demudi 2004-11-14 10:54:50 UTC (rev 185)
@@ -1,4 +1,119 @@
-#include <exclude-sarge>
+acorn-fdisk
+aspell-bg
+aspell-br
+aspell-cy
+aspell-da
+aspell-de
+aspell-el
+aspell-es
+aspell-fr
+aspell-pt
+cfdisk-utf8
+gcc272
+kernel-image-2.4.21-5-386
+kernel-image-2.4.21-5-586tsc
+kernel-image-2.4.21-5-686
+kernel-image-2.4.21-5-686-smp
+kernel-image-2.4.21-5-k6
+kernel-image-2.4.21-5-k7
+kernel-image-2.4.21-5-k7-smp
+kernel-image-2.4.24-1-386
+kernel-image-2.4.24-1-586tsc
+kernel-image-2.4.24-1-686
+kernel-image-2.4.24-1-686-smp
+kernel-image-2.4.24-1-k6
+kernel-image-2.4.24-1-k7
+kernel-image-2.4.24-1-k7-smp
+kernel-image-2.4.24-speakup
+kernel-image-2.4.25-1-386
+kernel-image-2.4.25-1-586tsc
+kernel-image-2.4.25-1-686
+kernel-image-2.4.25-1-686-smp
+kernel-image-2.4.25-1-k6
+kernel-image-2.4.25-1-k7
+kernel-image-2.4.25-1-k7-smp
+kernel-image-2.4.26-speakup
+kernel-image-2.4.26-1-386
+kernel-image-2.4.26-1-586tsc
+kernel-image-2.4.26-1-686
+kernel-image-2.4.26-1-686-smp
+kernel-image-2.4.26-1-k6
+kernel-image-2.4.26-1-k7
+kernel-image-2.4.26-1-k7-smp
+kernel-image-2.4.27-1-586tsc
+kernel-image-2.4.27-1-k6
+kernel-image-2.4.27-1-k7
+kernel-image-2.4.27-1-k7-smp
+kernel-image-2.6-386
+kernel-image-2.6-686
+kernel-image-2.6-686-smp
+kernel-image-2.6-k7
+kernel-image-2.6-k7-smp
+kernel-image-2.6.3-1-386
+kernel-image-2.6.3-1-686
+kernel-image-2.6.3-1-686-smp
+kernel-image-2.6.3-1-k7
+kernel-image-2.6.3-1-k7-smp
+kernel-image-2.6.5-1-386
+kernel-image-2.6.5-1-686
+kernel-image-2.6.5-1-686-smp
+kernel-image-2.6.5-1-k7
+kernel-image-2.6.5-1-k7-smp
+kernel-image-2.6.6-1-386
+kernel-image-2.6.6-1-686
+kernel-image-2.6.6-1-686-smp
+kernel-image-2.6.6-1-k7
+kernel-image-2.6.6-1-k7-smp
+kernel-image-2.6.7-1-386
+kernel-image-2.6.7-1-686
+kernel-image-2.6.7-1-k7
+kernel-image-2.6.7-1-k7-smp
+kernel-image-2.6.8-1-k7
+kernel-image-2.6.8-1-k7-smp
+kernel-image-2.6.9-1-k7
+kernel-image-2.6.9-1-k7-smp
+kernel-pcmcia-modules-2.4-386
+kernel-pcmcia-modules-2.4-586tsc
+kernel-pcmcia-modules-2.4-686
+kernel-pcmcia-modules-2.4-686-smp
+kernel-pcmcia-modules-2.4-k6
+kernel-pcmcia-modules-2.4-k7
+kernel-pcmcia-modules-2.4-k7-smp
+kernel-pcmcia-modules-2.4.24-1-386
+kernel-pcmcia-modules-2.4.24-1-586tsc
+kernel-pcmcia-modules-2.4.24-1-686
+kernel-pcmcia-modules-2.4.24-1-686-smp
+kernel-pcmcia-modules-2.4.24-1-k6
+kernel-pcmcia-modules-2.4.24-1-k7
+kernel-pcmcia-modules-2.4.24-1-k7-smp
+kernel-pcmcia-modules-2.4.25-1-386
+kernel-pcmcia-modules-2.4.25-1-586tsc
+kernel-pcmcia-modules-2.4.25-1-686
+kernel-pcmcia-modules-2.4.25-1-686-smp
+kernel-pcmcia-modules-2.4.25-1-k6
+kernel-pcmcia-modules-2.4.25-1-k7
+kernel-pcmcia-modules-2.4.25-1-k7-smp
+kernel-pcmcia-modules-2.4.26-1-386
+kernel-pcmcia-modules-2.4.26-1-586tsc
+kernel-pcmcia-modules-2.4.26-1-686
+kernel-pcmcia-modules-2.4.26-1-686-smp
+kernel-pcmcia-modules-2.4.26-1-k6
+kernel-pcmcia-modules-2.4.26-1-k7
+kernel-pcmcia-modules-2.4.26-1-k7-smp
+kernel-pcmcia-modules-2.4.27-1-586tsc
+kernel-pcmcia-modules-2.4.27-1-k6
+kernel-pcmcia-modules-2.4.27-1-k7
+kernel-pcmcia-modules-2.4.27-1-k7-smp
+kernel-pcmcia-modules-2.4.28-1-586tsc
+kernel-pcmcia-modules-2.4.28-1-k6
+kernel-pcmcia-modules-2.4.28-1-k7
+kernel-pcmcia-modules-2.4.28-1-k7-smp
+python2.1
+smail
+tcl8.0
+tk8.0
+xserver-xfree86-dbg
+zmailer
amiga-fdisk-cross
aptitude-doc-cs
@@ -13,15 +128,6 @@
finger
gnu-efi
isapnptools
-kernel-headers-2.4-386
-kernel-headers-2.4-586tsc
-kernel-headers-2.4-686
-kernel-headers-2.4-686-smp
-kernel-headers-2.4-k6
-kernel-headers-2.4-k7
-kernel-headers-2.4-k7-smp
-kernel-headers-2.4.27-1
-kernel-headers-2.4.27-1-386
kernel-headers-2.4.27-1-586tsc
kernel-headers-2.4.27-1-686
kernel-headers-2.4.27-1-686-smp
@@ -70,3 +176,19 @@
wcanadian-small
wgalician-minimos
wnorwegian
+gcc-2.95
+gcc-3.2
+gcc-3.2-base
+gcc-3.4
+gcc-3.4-base
+xemacs21-mule
+xemacs21-support
+xemacs21
+xemacs21-bin
+xemacs21-mulesupport
+xemacs21-basesupport
+xemacs21-mule-canna-wnn
+xemacs21-gnome-mule
+xemacs21-gnome-mule-canna-wnn
+xemacs21-nomule
+xemacs21-gnome-nomule
Modified: demudi-debian-cd/trunk/tasks/forcd1-demudi
===================================================================
--- demudi-debian-cd/trunk/tasks/forcd1-demudi 2004-11-13 15:30:38 UTC (rev 184)
+++ demudi-debian-cd/trunk/tasks/forcd1-demudi 2004-11-14 10:54:50 UTC (rev 185)
@@ -8,9 +8,7 @@
demudi-pixmaps
demudi-wallpapers
ssh
-gnupg
base-config
-build-essential
deborphan
debfoster
debsums
@@ -25,7 +23,6 @@
libmailtools-perl
pump
xviddetect
-twm
menu
libterm-readline-gnu-perl
whiptail