[Demudi-commits] r715 - in bootsplash/trunk/debian: . patches

Fri Mar 3 19:32:44 UTC 2006

Author: free-guest
Date: 2006-03-03 19:32:41 +0000 (Fri, 03 Mar 2006)
New Revision: 715

Added:
   bootsplash/trunk/debian/patches/initramfs.dpatch
Modified:
   bootsplash/trunk/debian/bootsplash-default
   bootsplash/trunk/debian/changelog
   bootsplash/trunk/debian/control
   bootsplash/trunk/debian/dirs
   bootsplash/trunk/debian/patches/00list
   bootsplash/trunk/debian/postinst
   bootsplash/trunk/debian/rules
Log:
  * Starting from 2.6.15 Debian kernels use initramfs, updated postinst
    script accordingly
  * Depend on initramfs-tools

Modified: bootsplash/trunk/debian/bootsplash-default
===================================================================

--- bootsplash/trunk/debian/bootsplash-default	2006-02-18 14:42:27 UTC (rev 714)
+++ bootsplash/trunk/debian/bootsplash-default	2006-03-03 19:32:41 UTC (rev 715)
@@ -26,3 +26,7 @@
 # The default configuration use the dynamicaly linked fbtruetype
 # Set USE_STATIC_FBT to yes to use fbtruetype.static
 USE_STATIC_FBT="no"
+
+# Size for the bootsplash-image in the initrd
+SPLASH_SIZE="1024x768"
+

Modified: bootsplash/trunk/debian/changelog
===================================================================
--- bootsplash/trunk/debian/changelog	2006-02-18 14:42:27 UTC (rev 714)
+++ bootsplash/trunk/debian/changelog	2006-03-03 19:32:41 UTC (rev 715)
@@ -20,6 +20,9 @@
   * Don't ship splashpbm, AFAIK it's currently used only by a single upstream
     theme, which is not going to be package ATM. We may want to re-include it
     later in case somebody requests it.
+  * Starting from 2.6.15 Debian kernels use initramfs, updated postinst
+    script accordingly
+  * Depend on initramfs-tools
 
  -- Free Ekanayaka <free at agnula.org>  Mon,  6 Feb 2006 05:27:50 -0500
 

Modified: bootsplash/trunk/debian/control
===================================================================
--- bootsplash/trunk/debian/control	2006-02-18 14:42:27 UTC (rev 714)
+++ bootsplash/trunk/debian/control	2006-03-03 19:32:41 UTC (rev 715)
@@ -8,7 +8,7 @@
 
 Package: bootsplash
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, bootsplash-theme-newlinux | bootsplash-theme
+Depends: ${shlibs:Depends}, ${misc:Depends}, bootsplash-theme-newlinux | bootsplash-theme, initramfs-tools
 Recommends: sysv-rc-bootsplash
 Suggests: kernel-patch-bootsplash (>= 3.0.0)
 Conflicts: bootsplash-theme-debiantux

Modified: bootsplash/trunk/debian/dirs
===================================================================
--- bootsplash/trunk/debian/dirs	2006-02-18 14:42:27 UTC (rev 714)
+++ bootsplash/trunk/debian/dirs	2006-03-03 19:32:41 UTC (rev 715)
@@ -3,3 +3,4 @@
 etc/bootsplash
 etc/default
 etc/init.d
+usr/share/initramfs-tools/hooks

Modified: bootsplash/trunk/debian/patches/00list
===================================================================
--- bootsplash/trunk/debian/patches/00list	2006-02-18 14:42:27 UTC (rev 714)
+++ bootsplash/trunk/debian/patches/00list	2006-03-03 19:32:41 UTC (rev 715)
@@ -4,3 +4,4 @@
 bootanim
 splash.sh
 Makefile
+initramfs

Added: bootsplash/trunk/debian/patches/initramfs.dpatch
===================================================================
--- bootsplash/trunk/debian/patches/initramfs.dpatch	2006-02-18 14:42:27 UTC (rev 714)
+++ bootsplash/trunk/debian/patches/initramfs.dpatch	2006-03-03 19:32:41 UTC (rev 715)
@@ -0,0 +1,68 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## initramfs.dpatch by Free Ekanayaka <free at 64studio.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad bootsplash-3.1~/Scripts/initramfs bootsplash-3.1/Scripts/initramfs
+--- bootsplash-3.1~/Scripts/initramfs	1969-12-31 19:00:00.000000000 -0500
++++ bootsplash-3.1/Scripts/initramfs	2006-02-28 14:26:11.000000000 -0500
+@@ -0,0 +1,57 @@
++#!/bin/sh
++
++PREREQ=""
++
++prereqs()
++{
++	echo "$PREREQ"
++}
++
++case $1 in
++prereqs)
++	prereqs
++	exit 0
++	;;
++esac
++
++
++SPLASH_BIN=/usr/sbin/splash
++SPLASH_CONFIG=/etc/default/bootsplash
++
++
++if [ ! -x $SPLASH_BIN ]
++then
++	echo "$SPLASH_BIN not found. Bootsplash image won't be installed"
++	exit 0
++fi
++
++if [ ! -e $SPLASH_CONFIG ]
++then
++	echo "$SPLASH_CONFIG not found. Bootsplash image won't be installed"
++	exit 0
++fi
++
++. $SPLASH_CONFIG
++
++if [ $SPLASH != "yes" ]
++then
++	echo "Bootsplash disabled. (see /etc/default/bootsplash)"
++	exit 0
++fi
++
++SPLASH_FILE=/etc/bootsplash/themes/$THEME/config/bootsplash-$SPLASH_SIZE.cfg
++
++if [ ! -e $SPLASH_FILE ]
++then
++	echo "Config file $SPLASH_FILE not found. Bootsplash image won't be installed"
++	echo "Check the SPLASH_SIZE entry in $SPLASH_CONFIG"
++	exit 0
++fi
++
++echo "Installing bootsplash theme $THEME with size $SPLASH_SIZE..."
++splash -s -f $SPLASH_FILE > $DESTDIR/bootsplash
++echo "Done."
++
++
++
++


Property changes on: bootsplash/trunk/debian/patches/initramfs.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: bootsplash/trunk/debian/postinst
===================================================================
--- bootsplash/trunk/debian/postinst	2006-02-18 14:42:27 UTC (rev 714)
+++ bootsplash/trunk/debian/postinst	2006-03-03 19:32:41 UTC (rev 715)
@@ -89,10 +89,12 @@
       cp "$SPLASH_INITRD" "$SPLASH_INITRD.orig"
    fi
 
-   # create an initrd and include all the selected resolutions
+   # create an initramfs with the first available resolution
    for i in $RESOLUTIONS
    do
-      splash -s -f /etc/bootsplash/themes/current/config/bootsplash-$i.cfg >> "$SPLASH_INITRD"
+      sed -i -e "s/^SPLASH_SIZE=.*/SPLASH_SIZE=\"$i\"/g" /etc/default/bootsplash
+      mkinitramfs -o "$SPLASH_INITRD"
+      break
    done
 
    db_get shared/bootsplash-bootloader
@@ -123,8 +125,8 @@
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
 
-#DEBHELPER#
 
+
 exit 0
 
 

Modified: bootsplash/trunk/debian/rules
===================================================================
--- bootsplash/trunk/debian/rules	2006-02-18 14:42:27 UTC (rev 714)
+++ bootsplash/trunk/debian/rules	2006-03-03 19:32:41 UTC (rev 715)
@@ -69,6 +69,7 @@
 
 	$(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.
 binary-indep: build install


