New kernel version detection, patch for 2.6.3.

5 files changed, 195 insertions, 6 deletions

diff --git a/media-gfx/bootsplash/ChangeLog b/media-gfx/bootsplash/ChangeLog
index 6840b5c0fa5e..630adf1b574f 100644
--- a/media-gfx/bootsplash/ChangeLog
+++ b/media-gfx/bootsplash/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/bootsplash 
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash/ChangeLog,v 1.18 2004/02/15 09:14:17 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash/ChangeLog,v 1.19 2004/02/15 18:44:38 spock Exp $
+
+*bootsplash-0.6-r6 (15 Feb 2004)
+
+  15 Feb 2004; Michal Januszewski <spock@gentoo.org> bootsplash-0.6-r6.ebuild,
+  metadata.xml:
+  New revision, includes the patch for 2.6.3 kernels and has an updated patching
+  system.
 
   15 Feb 2004; Michal Januszewski <spock@gentoo.org> bootsplash-0.6-r5.ebuild:
   Added a statically linked version of fbmngplay, closes #41476.
@@ -14,7 +21,7 @@
 
 *bootsplash-0.6-r5 (26 Jan 2004)
 
-  26 Jan 2004; Michal 'Spock' Januszewski <spock@gentoo.org>
+  26 Jan 2004; Michal Januszewski <spock@gentoo.org>
   bootsplash-0.6-r5.ebuild:
   Added support for user-defined boot messages and user-specified font for
   silent bootplash, added an option to specify different configs for selected
@@ -23,7 +30,7 @@
 
 *bootsplash-0.6-r4 (17 Jan 2004)
 
-  17 Jan 2004; Michal 'Spock' Januszewski <spock@gentoo.org>
+  17 Jan 2004; Michal Januszewski <spock@gentoo.org>
   bootsplash-0.6-r4.ebuild, metadata.xml:
   Added support for 2.6 kernels, fixed a few minor issues with silent mode,
   added the BOOTSPLASH_TTYS variable.
diff --git a/media-gfx/bootsplash/Manifest b/media-gfx/bootsplash/Manifest
index 9ad6fae02d7d..8c0b934947f7 100644
--- a/media-gfx/bootsplash/Manifest
+++ b/media-gfx/bootsplash/Manifest
@@ -1,12 +1,14 @@
+MD5 bce0dcbce51cf8b6d3b8a1772e91561d bootsplash-0.6-r6.ebuild 5140
 MD5 2a77ed704b718a7396c97e5e39249e21 bootsplash-0.6-r1.ebuild 3342
 MD5 000b763c35a5c1604070379a0c3a2a44 bootsplash-0.6-r3.ebuild 3437
 MD5 ac7c832cde29a6fe85e59bbf9a8aaed9 bootsplash-0.6-r5.ebuild 5392
 MD5 6a3f6108142e93e8d969e4078e49bf27 bootsplash-0.6-r2.ebuild 3401
 MD5 cb4bad8e460384e14ecd02984dea1d04 bootsplash-0.6-r4.ebuild 4961
-MD5 719436973f7475452b01358a2541a271 ChangeLog 3137
-MD5 bee39157a0491e747442baf4eed96348 metadata.xml 263
+MD5 aa542c7951a73126e690ff2a6c652cfa ChangeLog 3342
+MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
 MD5 3fa4a534a7a0b0dd84e1e99c032010b8 files/digest-bootsplash-0.6-r1 67
 MD5 0bf6318b85e220548699e20dbb0b9390 files/digest-bootsplash-0.6-r2 70
 MD5 250d9fd431815e7ee0ebdad859d9796a files/digest-bootsplash-0.6-r3 70
 MD5 eacb36a273e1eccd1f98e95d0a3b2646 files/digest-bootsplash-0.6-r4 70
 MD5 b691cde294a34c424af911aca0796593 files/digest-bootsplash-0.6-r5 70
+MD5 9dfc24b59ada6a41dabaf698c9a2edf5 files/digest-bootsplash-0.6-r6 70
diff --git a/media-gfx/bootsplash/bootsplash-0.6-r6.ebuild b/media-gfx/bootsplash/bootsplash-0.6-r6.ebuild
new file mode 100644
index 000000000000..c43bc77d2512
--- /dev/null
+++ b/media-gfx/bootsplash/bootsplash-0.6-r6.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash/bootsplash-0.6-r6.ebuild,v 1.1 2004/02/15 18:44:38 spock Exp $
+
+DESCRIPTION="Graphical backgrounds for frame buffer consoles"
+HOMEPAGE="http://linux.tkdack.com/"
+SRC_URI="http://dev.gentoo.org/~spock/portage/distfiles/bootsplash-${PV}-${PR}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 amd64 ~ppc"
+
+S="${WORKDIR}/${PF}"
+
+DEPEND=">=media-libs/freetype-2
+	media-libs/libmng"
+
+src_compile() {
+	# compile utils
+	# the util builds but the rc scripts have not been modified
+	# animated boot up require patches to the baselayout package
+	cd ${S}/utils/fbmngplay
+	emake || die
+
+	cd ${S}/utils/fbtruetype
+	emake || die
+
+	cd ${S}/utils/splashutils
+	emake || die
+}
+
+src_install() {
+	# Splash utilities
+	exeinto /sbin
+	doexe ${S}/utils/fbmngplay/fbmngplay
+	doexe ${S}/utils/fbmngplay/fbmngplay.static
+	doexe ${S}/utils/fbtruetype/fbtruetype
+	doexe ${S}/utils/fbtruetype/fbtruetype.static
+	newexe ${S}/utils/splashutils/splash splash.bin
+	doexe ${S}/misc/splash
+	doexe ${S}/utils/splashutils/fbresolution
+	doexe ${S}/utils/splashutils/getkey
+	doexe ${S}/utils/splashutils/progress
+
+	mkdir -p ${D}/etc/${PN}
+	cp -pR ${S}/themes/* ${D}/etc/${PN}
+
+	# link default config for boot images if not already set
+	if [ ! -e /etc/bootsplash/default ]; then
+		dosym  ./gentoo /etc/bootsplash/default
+	fi
+
+	insinto /etc/init.d
+	doins ${S}/misc/bootsplash
+	fperms 755 /etc/init.d/bootsplash
+
+	insinto /etc/conf.d
+	doins ${S}/misc/bootsplash.conf
+
+	insinto /usr/share/${PN}
+	doins ${S}/kernel/*.bz2
+	doins ${S}/misc/grub.conf.sample
+
+	cat >${D}/sbin/bootsplash_patch <<END
+#!/bin/bash
+LINUX=\$1 ebuild /var/db/pkg/media-gfx/${PF}/${PF}.ebuild config
+END
+	chmod 0754 ${D}/sbin/bootsplash_patch
+}
+
+pkg_postinst() {
+	# Has to be done here so that the initrd images are created properly
+	for SIZE in 800x600 1024x768 1280x1024 1600x1200
+	do
+		/sbin/splash -s -f /etc/bootsplash/gentoo/config/bootsplash-${SIZE}.cfg > /usr/share/${PN}/initrd-${SIZE}
+	done
+
+	echo ""
+	einfo "Execute \"bootsplash_patch\" to have your kernel sources in"
+	einfo "/usr/src/linux patched with the Framebuffer Bootsplash patches."
+	einfo
+	einfo "You can also use:"
+	einfo "    bootsplash_patch /path/to/your/custom/kernel/"
+	einfo "to patch your custom kernel sources."
+	echo ""
+	ewarn "If you have already patched the kernel then you only need to copy"
+	ewarn "an initrd from /usr/share/${PN} to /boot"
+	echo ""
+	einfo "Run:"
+	einfo "    rc-update add bootsplash default"
+	einfo "to change the console images after startup"
+	echo ""
+	einfo "Please note that in case /usr is a separate partition"
+	einfo "you'll need to use the statically linked versions of Bootplash"
+	einfo 'utilities (fbmngplay.static, fbtruetype.static) during boot-time.'
+	echo ""
+}
+
+pkg_config() {
+
+	if [ "${LINUX}" == "" ]; then
+		LINUX='/usr/src/linux'
+	fi
+
+	eval `sed -n -e 's/^\([A-Z]*\) = \([0-9]*\)$/\1=\2/p' -e 's/^\([A-Z]*\) = \(-[-a-z0-9]*\)$/\1=\2/p' ${LINUX}/Makefile`
+
+	if [ -z "$VERSION" -o -z "$PATCHLEVEL" -o -z "$SUBLEVEL" ]
+	then
+		die "Unable to determine kernel version in ${LINUX}"
+	fi
+
+	KB="${VERSION}.${PATCHLEVEL}"
+	KV_MINOR="${SUBLEVEL}"
+
+	ewarn
+	ewarn "Patching the kernel (branch: ${KB}) in ${LINUX} ..."
+	ewarn
+
+	cd ${ROOT}/${LINUX}
+
+	if [ "${KB}" == "2.4" ]; then
+
+		if [ -f drivers/video/fbcon-splash.c ]; then
+			eerror
+			eerror "It appears your kernel has already been patched."
+			eerror
+			exit 1
+		fi
+
+		if [ ${KV_MINOR} -ge 22 ]; then
+			bzip2 -dc ${ROOT}/usr/share/${PN}/bootsplash-3.0.7-2.4.22-vanilla.diff.bz2 | patch -p1 || die
+		else
+			bzip2 -dc ${ROOT}/usr/share/${PN}/bootsplash-3.0.7-2.4.20-vanilla.diff.bz2 | patch -p1 || die
+		fi
+
+	elif [ "${KB}" == "2.6" ]; then
+
+		if [ -d drivers/video/bootsplash ]; then
+			eerror
+			eerror "It appears your kernel has already been patched."
+			eerror
+			exit 1
+		fi
+
+		if [ ${KV_MINOR} -ge 3 ]; then
+			bzip2 -dc ${ROOT}/usr/share/${PN}/bootsplash-3.1.3-2.6.3.patch.bz2 | patch -p1 || die
+		else
+			bzip2 -dc ${ROOT}/usr/share/${PN}/bootsplash-3.1.3-2.6.0-test9.diff.bz2 | patch -p1 || die
+		fi
+	else
+		die "Sorry, this kernel branch is not supported."
+	fi
+
+	ewarn
+	ewarn " ... complete."
+	einfo
+	einfo "Your kernel has been patched, rebuild with the following options"
+	einfo "enabled (do not build them as modules!):"
+	einfo "		Block Devices ->"
+	einfo "			[*] RAM disk support"
+	einfo "			[*] Loopback device support"
+	einfo "			[*] Initial RAM disk (initrd) support"
+	einfo
+	einfo "		Console Drivers ->"
+	einfo "			[*] Video mode selection support"
+	einfo "			Frame-buffer support ->"
+	einfo "				[*] Support for frame buffer devices"
+	einfo "				[*] VESA VGA graphics console"
+	einfo "				[*] Use splash screen instead of boot logo"
+	einfo
+	einfo "Copy an initrd from /usr/share/${PN} to /boot"
+	einfo
+	einfo "Look at \"/usr/share/${PN}/grub.conf.sample\" for an example"
+	einfo "grub.conf file with the appropriate changes to enable the"
+	einfo "framebuffer boot screens"
+	einfo
+	einfo "Ensure you make the appropriate changes to your grub.conf"
+	einfo
+}
diff --git a/media-gfx/bootsplash/files/digest-bootsplash-0.6-r6 b/media-gfx/bootsplash/files/digest-bootsplash-0.6-r6
new file mode 100644
index 000000000000..8cb4cd871467
--- /dev/null
+++ b/media-gfx/bootsplash/files/digest-bootsplash-0.6-r6
@@ -0,0 +1 @@
+MD5 d19a2c7adba167d91ab8afce861dfef2 bootsplash-0.6-r6.tar.bz2 428832
diff --git a/media-gfx/bootsplash/metadata.xml b/media-gfx/bootsplash/metadata.xml
index 13021607759c..daa8053eefc4 100644
--- a/media-gfx/bootsplash/metadata.xml
+++ b/media-gfx/bootsplash/metadata.xml
@@ -4,6 +4,6 @@
 <herd>no-herd</herd>
 <maintainer>
   <email>spock@gentoo.org</email>
-  <name>Michal 'Spock' Januszewski</name>
+  <name>Michal Januszewski</name>
 </maintainer>
 </pkgmetadata>