[Demudi-commits] r156 - in demudi-debian-cd/trunk: . data/sarge debian tasks
Free Ekanayaka
free-guest@haydn.debian.org
Tue, 09 Nov 2004 12:37:59 -0700
Author: free-guest
Date: 2004-11-09 12:36:37 -0700 (Tue, 09 Nov 2004)
New Revision: 156
Added:
demudi-debian-cd/trunk/data/sarge/demudi_i386_udeb_include
demudi-debian-cd/trunk/demudi-tasksel
Modified:
demudi-debian-cd/trunk/data/sarge/demudi_i386_late_command
demudi-debian-cd/trunk/data/sarge/demudi_i386_preseed
demudi-debian-cd/trunk/debian-cd.conf
demudi-debian-cd/trunk/debian/changelog
demudi-debian-cd/trunk/debian/install
demudi-debian-cd/trunk/demudi-debian-cd
demudi-debian-cd/trunk/tasks/forcd1-demudi
Log:
* Using UDEB_INCLUDE to pull in DeMuDi custom base-installer
* Sorting tasks by relevance
Modified: demudi-debian-cd/trunk/data/sarge/demudi_i386_late_command
===================================================================
--- demudi-debian-cd/trunk/data/sarge/demudi_i386_late_command 2004-11-09 19:12:49 UTC (rev 155)
+++ demudi-debian-cd/trunk/data/sarge/demudi_i386_late_command 2004-11-09 19:36:37 UTC (rev 156)
@@ -5,10 +5,19 @@
grub=/sbin/update-grub
apt=/usr/bin/apt-get
-packages="demudi-base-config demudi-cfengine demudi-debtags demudi-grub-splashimages demudi-tasksel"
+alsa="alsa-modules-$(ls /boot/config-* | cut -d - -f 2- | tail -1)"
+packages="\
+ $alsa \
+ demudi-base-config \
+ demudi-base-files \
+ demudi-cfengine \
+ demudi-debtags \
+ demudi-grub-splashimages \
+ demudi-tasksel \
+ "
splash=/boot/grub/splashimages/agnula-romantic.xpm.gz
-if [ -x $apt ]; then \
+if [ -x $apt ]; then
apt-get install -y $packages
else
logger -t late-command "Failed to install $pakcages"
@@ -18,7 +27,8 @@
rm /boot/grub/splash.xpm.gz
fi
if [ -x $grub ] && [ -f $splash ]; then
- ln -sf $splash /boot/grub/splash.xpm.gz;
+ ln -sf $splash /boot/grub/splash.xpm.gz
+ 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"
Modified: demudi-debian-cd/trunk/data/sarge/demudi_i386_preseed
===================================================================
--- demudi-debian-cd/trunk/data/sarge/demudi_i386_preseed 2004-11-09 19:12:49 UTC (rev 155)
+++ demudi-debian-cd/trunk/data/sarge/demudi_i386_preseed 2004-11-09 19:36:37 UTC (rev 156)
@@ -60,14 +60,14 @@
# This command is run just before the install finishes, but when there is
# still a usable /target directory.
#d-i preseed/late_command string for deb in /hd-media/*.deb; do cp $deb /target/tmp; chroot /target dpkg -i /tmp/$(basename $deb); done
-d-i preseed/late_command string /bin/sh /cdrom/.disk/late_command
+d-i preseed/late_command string cp /cdrom/.disk/late_command /target/tmp/late_command && chroot /target /bin/sh /tmp/late_command
# This command is run just as base-config is starting up.
#base-config base-config/early_command string echo hi mom
# This command is run after base-config is done, just before the login:
# prompt. This is a good way to install a set of packages you want, or to
# tweak the configuration of the system.
-base-config base-config/late_command string /usr/sbin/demudi-cfengine
+base-config base-config/late_command string /usr/sbin/demudi-cfengine all
#### Network configuration.
@@ -98,6 +98,7 @@
#d-i netcfg/wireless_wep string
# The wacky dhcp hostname that some ISPs use as a password of sorts.
##d-i netcfg/dhcp_hostname string radish
+d-i netcfg/dhcp_failed note ignore
d-i netcfg/dhcp_options select Do not configure the network at this time
#### Mirror settings.
Added: demudi-debian-cd/trunk/data/sarge/demudi_i386_udeb_include
===================================================================
--- demudi-debian-cd/trunk/data/sarge/demudi_i386_udeb_include 2004-11-09 19:12:49 UTC (rev 155)
+++ demudi-debian-cd/trunk/data/sarge/demudi_i386_udeb_include 2004-11-09 19:36:37 UTC (rev 156)
@@ -0,0 +1,5 @@
+base-installer
+netcfg
+ethdetect
+pcmcia-cs-udeb
+wireless-tools-udeb
Modified: demudi-debian-cd/trunk/debian/changelog
===================================================================
--- demudi-debian-cd/trunk/debian/changelog 2004-11-09 19:12:49 UTC (rev 155)
+++ demudi-debian-cd/trunk/debian/changelog 2004-11-09 19:36:37 UTC (rev 156)
@@ -1,5 +1,7 @@
demudi-debian-cd (0.1) UNRELEASED; urgency=low
+ * Using UDEB_INCLUDE to pull in DeMuDi custom base-installer
+ * Sorting tasks by relevance
* Added some sanity checks in the build scripts
* Added late command hook
* Using kernel 2.4.27
Modified: demudi-debian-cd/trunk/debian/install
===================================================================
--- demudi-debian-cd/trunk/debian/install 2004-11-09 19:12:49 UTC (rev 155)
+++ demudi-debian-cd/trunk/debian/install 2004-11-09 19:36:37 UTC (rev 156)
@@ -3,3 +3,4 @@
demudi-debian-cd.conf etc/default/
demudi-debian-cd usr/bin/
debian-cd.conf usr/share/demudi-debian-cd/
+demudi-tasksel usr/share/demudi-debian-cd/
Modified: demudi-debian-cd/trunk/debian-cd.conf
===================================================================
--- demudi-debian-cd/trunk/debian-cd.conf 2004-11-09 19:12:49 UTC (rev 155)
+++ demudi-debian-cd/trunk/debian-cd.conf 2004-11-09 19:36:37 UTC (rev 156)
@@ -177,11 +177,11 @@
# Set this if the recommended packages should be skipped when adding
# package on the CD. The default is 'false'.
-export NORECOMMENDS=1
+export NORECOMMENDS=0
# Set this if the suggested packages should be skipped when adding
# package on the CD. The default is 'true'.
-export NOSUGGESTS=0
+#export NOSUGGESTS=0
# Produce jigdo files:
# 0/unset = Don't do jigdo at all, produce only the full iso image.
@@ -250,7 +250,7 @@
# first stage installer (debian-installer). One package per line.
# Lines starting with '#' are comments. The package order is
# important, as the packages will be installed in the given order.
-#export UDEB_INCLUDE="$BASEDIR"/data/$CODENAME/udeb_include
+export UDEB_INCLUDE="$BASEDIR"/data/$CODENAME/demudi_${ARCH}_udeb_include
# File with list of packages to exclude as above.
#export UDEB_EXCLUDE="$BASEDIR"/data/$CODENAME/udeb_exclude
Modified: demudi-debian-cd/trunk/demudi-debian-cd
===================================================================
--- demudi-debian-cd/trunk/demudi-debian-cd 2004-11-09 19:12:49 UTC (rev 155)
+++ demudi-debian-cd/trunk/demudi-debian-cd 2004-11-09 19:36:37 UTC (rev 156)
@@ -10,8 +10,13 @@
. /etc/default/demudi-debian-cd.conf
. /usr/share/demudi-debian-cd/debian-cd.conf
-cat /etc/debtags/tagpatch.d/demudi | cut -f 1 -d : > /tmp/demudi-tasksel
+/usr/share/demudi-debian-cd/demudi-tasksel > /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
+ exit 1
+fi
+
make distclean
make status
make bin-list TASK=tasks/demudi COMPLETE=0
@@ -23,11 +28,14 @@
make bin-images
# Sanity checks
-cd1="/var/cache/demudi-debian-cd/tmp/sarge-i386/CD1"
-files=".disk/base_installable"
+tmpdir="/var/cache/demudi-debian-cd/tmp/sarge-i386"
+files="CD1/.disk/base_installable"
+grep "Can't" $tmpdir/log.list2cds
+grep "WARNING" $tmpdir/log.list2cds
+
for file in $files; do
- if ! [ -e $cd1/$file ]; then
+ if ! [ -e $tmpdir/$file ]; then
echo "ERROR: $file not present in CD1"
exit 1
fi
Added: demudi-debian-cd/trunk/demudi-tasksel
===================================================================
--- demudi-debian-cd/trunk/demudi-tasksel 2004-11-09 19:12:49 UTC (rev 155)
+++ demudi-debian-cd/trunk/demudi-tasksel 2004-11-09 19:36:37 UTC (rev 156)
@@ -0,0 +1,31 @@
+#!/usr/bin/python2.4
+
+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)
Property changes on: demudi-debian-cd/trunk/demudi-tasksel
___________________________________________________________________
Name: svn:executable
+ *
Modified: demudi-debian-cd/trunk/tasks/forcd1-demudi
===================================================================
--- demudi-debian-cd/trunk/tasks/forcd1-demudi 2004-11-09 19:12:49 UTC (rev 155)
+++ demudi-debian-cd/trunk/tasks/forcd1-demudi 2004-11-09 19:36:37 UTC (rev 156)
@@ -1,5 +1,6 @@
demudi-debtags
demudi-tasksel
+demudi-base-config
demudi-base-files
demudi-cfengine
demudi-grub-splashimages
@@ -55,3 +56,6 @@
console-cyrillic
console-terminus
iso-codes
+libxerces23
+python-glade-1.2
+libwxgtk2.4-python