[Demudi-commits] r787 - in bootsplash/trunk/debian: . patches
Free Ekanayaka
free-guest at costa.debian.org
Thu May 25 08:26:01 UTC 2006
Author: free-guest
Date: 2006-05-25 08:25:44 +0000 (Thu, 25 May 2006)
New Revision: 787
Added:
bootsplash/trunk/debian/README.Debian
bootsplash/trunk/debian/bootsplash.init
Modified:
bootsplash/trunk/debian/bootsplash.config
bootsplash/trunk/debian/bootsplash.templates
bootsplash/trunk/debian/changelog
bootsplash/trunk/debian/control
bootsplash/trunk/debian/patches/00list
bootsplash/trunk/debian/postinst
bootsplash/trunk/debian/postrm
bootsplash/trunk/debian/rules
Log:
releasing version 3.1-13
Added: bootsplash/trunk/debian/README.Debian
===================================================================
--- bootsplash/trunk/debian/README.Debian 2006-05-23 06:00:21 UTC (rev 786)
+++ bootsplash/trunk/debian/README.Debian 2006-05-25 08:25:44 UTC (rev 787)
@@ -0,0 +1,45 @@
+bootsplah for Debian
+====================
+
+To activate the bootsplash you need to pass some command line
+parameters to the kernel. This can be done by configuring
+your bootloader
+
+If you use GRUB you just need to edit your
+
+/boot/grub/menu.lst
+
+file and:
+
+1) append "splash=silent" to your kernel's boot parameters.
+2) dd the correct "vga=???" boot parameter, depending on what
+ resolution you want to use.
+
+For examle:
+
+ title Debian GNU/Linux, kernel 2.6.10-2-386
+ root (hd0,0)
+ kernel /boot/vmlinuz-2.6.10-2-386 root=/dev/hda1 ro vga=791 splash=silent
+ initrd /boot/initrd.img-2.6.10-2-mediastation-386
+ savedefault
+ boot
+
+To make the changes permanent and to apply them to all your kernels,
+you can set the kopt variable in menu.lst:
+
+# kopt=root=/dev/hda3 ro vga=791 splash=silent
+
+Some common frambuffer resolutions are:
+
+ 640x480 - 785
+ 800x600 - 788
+ 1024x768 - 791
+ 1152x864 - 355
+ 1280x1024 - 794
+ 1600x1200 - 798
+
+
+These display modes can also be found in the FrameBuffer HOWTO. Any
+16bit mode should work.
+
+ -- Free Ekanayaka <free at 64studio.com>, Thu, 25 May 2006 10:20:14 z
Modified: bootsplash/trunk/debian/bootsplash.config
===================================================================
--- bootsplash/trunk/debian/bootsplash.config 2006-05-23 06:00:21 UTC (rev 786)
+++ bootsplash/trunk/debian/bootsplash.config 2006-05-25 08:25:44 UTC (rev 787)
@@ -13,46 +13,21 @@
db_metaget shared/bootsplash-theme owners
OWNERS="$RET"
+# set the possible choices
db_subst shared/bootsplash-theme choices $OWNERS
-#db_metaget shared/bootsplash-theme choices
-#CHOICES="$RET"
-
-# check if owners and choices are the same
-#if [ "$OWNERS" != "$CHOICES" ]
-#then
-# db_subst shared/bootsplash-theme choices $OWNERS
-#fi
-
# input the desired theme
db_input medium shared/bootsplash-theme || true
db_go
-# set first choice as default
-NEW_DEFAULT="$(echo $OWNERS|cut -f 1 -d ,)"
-
# get the new default theme
db_get shared/bootsplash-theme
-#NEW_DEFAULT="$RET"
-if [ "$RET" != "" ]; then
- NEW_DEFAULT=$RET
-else
- db_set shared/bootsplash-theme $NEW_DEFAULT
-fi
+NEW_DEFAULT="$RET"
+# input the desired resolutions
+db_input medium $NEW_DEFAULT/resolutions || true
+db_go
-# don't ask which resoultion if there is only one choice
-
-db_metaget $NEW_DEFAULT/resolutions choices
-RES=($RET)
-
-if [ ${#RES[*]} -ne 1 ]
-then
- # input the desired resolutions
- db_input medium $NEW_DEFAULT/resolutions || true
- db_go
-fi
-
db_get $NEW_DEFAULT/resolutions
NEW_RES="$RET"
@@ -64,14 +39,10 @@
rm -f $THEME_SYMLINK || true
fi
-db_input medium shared/bootsplash-bootloader || true
+db_input high bootsplash/bootloader-info || true
db_go
-# inform the user about editing his/her lilo.conf (politically correct)
-db_input high shared/bootsplash-bootloader-info || true
+db_input high bootsplash/initramfs || true
db_go
-db_input medium shared/bootsplash-initscript || true
-db_go
-
exit 0
Added: bootsplash/trunk/debian/bootsplash.init
===================================================================
--- bootsplash/trunk/debian/bootsplash.init 2006-05-23 06:00:21 UTC (rev 786)
+++ bootsplash/trunk/debian/bootsplash.init 2006-05-25 08:25:44 UTC (rev 787)
@@ -0,0 +1,75 @@
+#!/bin/sh
+# based on initscript from gentoo linux
+# made some changes to fit normal sysvinit like used by debian
+# everything in here is GPL ;)
+# tcs at double-action.org
+
+# source our config
+source /etc/default/bootsplash 2>/dev/null
+
+# default settings
+test -z "${THEME}" && THEME="default"
+test -z "${BOOTSPLASH_TTYS}" && BOOTSPLASH_TTYS=`seq 0 5`
+
+get_bootsplash_theme () {
+ # try to get bootsplash theme from kernel command line
+ for param in `grep "theme=" /proc/cmdline`; do
+ if [ "${param%=*}" == "theme" ]; then
+ THEME="${param#*=}"
+ fi
+ done
+}
+
+SPLASH=$(which splash)
+
+case "$1" in
+start)
+ # Only do this if the kernel has support
+ if [ -f /proc/splash ]
+ then
+ echo "Setting Console frame buffer images"
+
+ get_bootsplash_theme
+ echo "Using theme $THEME"
+ # get console resolution
+ RESOLUTION=$(/sbin/fbresolution)
+
+ # switch to a usable image on all consoles
+ for TTY in `echo "${BOOTSPLASH_TTYS}" | sed -e 's# #\n#g'`
+ do
+ # support for a different config per virtual terminal
+ if [ -e /etc/bootsplash/themes/${THEME}/config/vtsplash-${TTY}-${RESOLUTION}.cfg ]
+ then
+ $SPLASH -s -u $TTY -n /etc/bootsplash/themes/${THEME}/config/vtsplash-${TTY}-${RESOLUTION}.cfg
+ else
+ $SPLASH -s -u $TTY -n /etc/bootsplash/themes/${THEME}/config/bootsplash-${RESOLUTION}.cfg
+ fi
+ done
+ fi
+;;
+stop)
+ CHVT=$(which chvt)
+ # Stop doesn't really stop, it actually changes the image
+ # on vt1 back to the bootsplash image.
+ # Only do this if the kernel has support
+ if [ -f /proc/splash ]
+ then
+ echo "Setting Console frame buffer images"
+ get_bootsplash_theme
+ # source bootsplash config
+ source /etc/bootsplash/themes/${THEME}/config/bootsplash-$(/sbin/fbresolution).cfg 2>/dev/null
+ # Put bootsplash image up
+ $SPLASH -s -u 0 /etc/bootsplash/themes/${THEME}/config/bootsplash-$(/sbin/fbresolution).cfg
+ # ensure "silent" image is displayed
+ echo "silent" > /proc/splash
+ # switch to vt1 (must be &'d otherwise script hangs)
+ ${CHVT} 1 &
+ # print a nice message
+ # /sbin/fbtruetype ........
+ fi
+;;
+restart|force-reload)
+;;
+esac
+
+exit 0
Property changes on: bootsplash/trunk/debian/bootsplash.init
___________________________________________________________________
Name: svn:executable
+ *
Modified: bootsplash/trunk/debian/bootsplash.templates
===================================================================
--- bootsplash/trunk/debian/bootsplash.templates 2006-05-23 06:00:21 UTC (rev 786)
+++ bootsplash/trunk/debian/bootsplash.templates 2006-05-25 08:25:44 UTC (rev 787)
@@ -1,43 +1,13 @@
-Template: shared/bootsplash-bootloader-info
+Template: bootsplash/bootloader-info
Type: note
-_Description: You need to configure your bootloader.
- In order to complete the bootsplash installation you need adjust your
- /boot/grub/menu.lst file (or configure whatever bootloader you use).
- - Add the correct "initrd" line to your kernel entry.
- - Append "splash=silent" to your kernel's boot parameters.
- - Add the correct "vga=???" boot parameter, depending on what
- resolution you want to use.
- .
- title Debian GNU/Linux, kernel 2.6.10-2-386
- root (hd0,0)
- kernel /boot/vmlinuz-2.6.10-2-386 root=/dev/hda1 ro vga=791 splash=silent
- initrd /boot/initrd.img-2.6.10-2-mediastation-386
- savedefault
- boot
- .
- Frambuffer resolutions:
- 640x480 - 785
- 800x600 - 788
- 1024x768 - 791
- 1152x864 - 355
- 1280x1024 - 794
- 1600x1200 - 798
- .
- These display modes can also be found in the FrameBuffer HOWTO. Any 16bit
- mode should work.
+_Description: You need to configure your bootloader
+ In order to complete the bootsplash installation you need to
+ configure your bootloader. See /usr/share/doc/bootsplash/README.Debian
-Template: shared/bootsplash-bootloader
-Type: select
-_Choices: lilo, grub
-Default: grub
-_Description: Select your bootloader.
- In order to work properly bootsplash needs to know which bootloader you
- use.
-
-Template: shared/bootsplash-initscript
+Template: bootsplash/initramfs
Type: boolean
-Default: false
-_Description: Activate initscript?
- Activating the initscript allows you to apply the same background
- image on all tty's. If you activate initscript and your screen flickers,
- run dpkg-reconfigure bootsplash and deactivate the initscript.
+Default: true
+_Description: Update your initramfs images?
+ To let the Linux kernel find your bootsplash them at boot you need
+ to update your initramfs images. Do you want this package to automatically
+ run the appropriate script.
Modified: bootsplash/trunk/debian/changelog
===================================================================
--- bootsplash/trunk/debian/changelog 2006-05-23 06:00:21 UTC (rev 786)
+++ bootsplash/trunk/debian/changelog 2006-05-25 08:25:44 UTC (rev 787)
@@ -1,6 +1,7 @@
-bootsplash (3.1-12+13pre2) UNRELEASED; urgency=low
+bootsplash (3.1-13) unstable; urgency=low
[ Free Ekanayaka ]
+ * First Debian upload (closes: #368826)
* Using dpatch from now on
* Converted all the previous patches in dpatch files
* Set me as new maintainer
@@ -25,8 +26,11 @@
* Depend on initramfs-tools and use update-initramfs to update the
kernels which provide bootsplash support
* New maintainer address freee at debian.org
+ * Drop support for lilo
+ * Drop unnecessary question about init activating script
+ * Added README.Debian with indications on how to configure GRUB
- -- Free Ekanayaka <freee at debian.org> Wed, 19 Apr 2006 14:19:35 +0200
+ -- Free Ekanayaka <freee at debian.org> Thu, 25 May 2006 10:21:53 +0200
bootsplash (3.1-11) unstable; urgency=low
Modified: bootsplash/trunk/debian/control
===================================================================
--- bootsplash/trunk/debian/control 2006-05-23 06:00:21 UTC (rev 786)
+++ bootsplash/trunk/debian/control 2006-05-25 08:25:44 UTC (rev 787)
@@ -4,11 +4,11 @@
Maintainer: Free Ekanayaka <freee at debian.org>
Uploaders: Junichi Uekawa <dancer at debian.org>
Build-Depends: debhelper (>= 4.1.16), libfreetype6-dev (>= 2.0.0), libmng-dev (>= 1.0), zlib1g-dev, dpatch
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
Package: bootsplash
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, bootsplash-theme-newlinux | bootsplash-theme, initramfs-tools
+Depends: ${shlibs:Depends}, ${misc:Depends}, bootsplash-theme-debian | bootsplash-theme, initramfs-tools
Recommends: sysv-rc-bootsplash
Suggests: kernel-patch-bootsplash (>= 3.0.0)
Conflicts: bootsplash-theme-debiantux
Modified: bootsplash/trunk/debian/patches/00list
===================================================================
--- bootsplash/trunk/debian/patches/00list 2006-05-23 06:00:21 UTC (rev 786)
+++ bootsplash/trunk/debian/patches/00list 2006-05-25 08:25:44 UTC (rev 787)
@@ -1,6 +1,5 @@
gcc-4.0
includeprog
-initscript
bootanim
splash.sh
Makefile
Modified: bootsplash/trunk/debian/postinst
===================================================================
--- bootsplash/trunk/debian/postinst 2006-05-23 06:00:21 UTC (rev 786)
+++ bootsplash/trunk/debian/postinst 2006-05-25 08:25:44 UTC (rev 787)
@@ -28,12 +28,34 @@
# `abort-remove' or `abort-deconfigure'.
case "$1" in
- configure|install)
+ configure)
+ # if we need to change the theme the $THEME_SYMLINK will be missing
+ # if it is we will make it point to the new theme
+ if [ ! -e "$THEME_SYMLINK" ]; then
+ db_get shared/bootsplash-theme
+
+ # first we must extract the locatation of the theme from the theme name
+ NEW_THEME="$(echo $RET | sed -e 's/^bootsplash-theme-//g')"
+
+ # make the symlink
+ ln -s /etc/bootsplash/themes/$NEW_THEME $THEME_SYMLINK
+
+ # set the new resolution
+ db_get bootsplash-theme-$NEW_THEME/resolutions
+ NEW_RES=$RET
+ sed -i -e "s/^SPLASH_SIZE=.*/SPLASH_SIZE=$RET/g" /etc/default/bootsplash
+
+ # update the initramfs images
+ db_get bootsplash/initramfs
+ if [ "$RET" = "true" ]; then
+ update-initramfs -u
+ fi
+
+ fi
;;
abort-upgrade|abort-remove|abort-deconfigure)
-
;;
*)
@@ -42,50 +64,9 @@
;;
esac
-# if we need to change the theme the $THEME_SYMLINK will be missing
-# if it is we will make it point to the new theme
-if [ ! -e "$THEME_SYMLINK" ]; then
-
- db_get shared/bootsplash-theme
-
- # first we must extract the locatation of the theme from the theme name
- NEW_THEME="$(echo $RET | sed -e 's/^bootsplash-theme-//g')"
-
- # make the symlink
- ln -s /etc/bootsplash/themes/$NEW_THEME $THEME_SYMLINK
-
-fi
-
-# create new initramfs images for kernel with bootsplash support enable
-for config in $(find /boot/ -mindepth 1 -maxdepth 1 -name "config-*"); do
- if grep -q ^CONFIG_BOOTSPLASH=y $config; then
- KVER=$(basename $config | sed -e 's/^config-//g')
- echo -n "Found kernel $KVER with bootsplash support, updating initramfs ... "
- if ! update-initramfs -k $KVER -u; then
- echo "failed"
- else
- echo "done"
- fi
- fi
-done
-
-db_get shared/bootsplash-bootloader
-if [ "$RET" = "grub" ]; then
- true # Implment auto configuration of menu.lst
-fi
-
-db_get shared/bootsplash-initscript
-if [ "$RET" = "true" ]
-then
- update-rc.d bootsplash defaults 00 > /dev/null
-else
- update-rc.d -f bootsplash remove > /dev/null 2>&1
-fi
-db_go
-
-db_stop
-
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
+#DEBHELPER#
+
exit 0
Modified: bootsplash/trunk/debian/postrm
===================================================================
--- bootsplash/trunk/debian/postrm 2006-05-23 06:00:21 UTC (rev 786)
+++ bootsplash/trunk/debian/postrm 2006-05-25 08:25:44 UTC (rev 787)
@@ -21,8 +21,6 @@
case "$1" in
purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- update-rc.d -f bootsplash remove > /dev/null
-
;;
*)
@@ -31,11 +29,6 @@
esac
-# remove initrd.splash and /etc/bootsplash/themes/current
-#echo "Cleaning up after bootsplash..."
-#rm -f /boot/initrd.splash || true
-#rm -f /etc/bootsplash/themes/current || true
-
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
Modified: bootsplash/trunk/debian/rules
===================================================================
--- bootsplash/trunk/debian/rules 2006-05-23 06:00:21 UTC (rev 786)
+++ bootsplash/trunk/debian/rules 2006-05-25 08:25:44 UTC (rev 787)
@@ -68,7 +68,6 @@
$(MAKE) -C Utilities install DESTDIR="$(CURDIR)/debian/bootsplash"
$(INSTALL_NOSTRIP) Scripts/splash.sh Scripts/bootanim Scripts/includeprog "$(CURDIR)/debian/bootsplash/sbin/"
- $(INSTALL_NOSTRIP) Scripts/bootsplash "$(CURDIR)/debian/bootsplash/etc/init.d/"
$(INSTALL_NOSTRIP) Scripts/initramfs "$(CURDIR)/debian/bootsplash/usr/share/initramfs-tools/hooks/bootsplash"
# Build architecture-independent files here.
@@ -89,7 +88,7 @@
# dh_installemacsen
# dh_installpam
# dh_installmime
-# dh_installinit
+ dh_installinit -u"defaults 00"
# dh_installcron
# dh_installinfo
cp debian/bootsplash-default "$(CURDIR)/debian/bootsplash/etc/default/bootsplash"
More information about the Demudi-commits
mailing list