splashutils: Remove

This commit is contained in:
Eelco Dolstra 2013-09-26 17:31:21 +02:00
parent fc961af360
commit 8a182718ca
6 changed files with 3 additions and 74 deletions

View file

@ -105,16 +105,6 @@ $ make menuconfig ARCH=<replaceable>arch</replaceable></screen>
</para>
</listitem>
<listitem>
<para>Make sure that
<literal>CONFIG_FB_TILEBLITTING</literal> is <emphasis>not
set</emphasis> (otherwise <command>fbsplash</command> won't
work). This option has a tendency to be enabled as a
side-effect of other options. If it is, investigate why
(there's probably another option that forces it to be on)
and fix it.</para>
</listitem>
<listitem>
<para>Copy <filename>.config</filename> over the new config
file (e.g. <filename>config-2.6.22-i686-smp</filename>).</para>
@ -137,22 +127,9 @@ $ make menuconfig ARCH=<replaceable>arch</replaceable></screen>
kernel modules and kernel-dependent packages listed in the
<varname>kernelPackagesFor</varname> function in
<filename>all-packages.nix</filename> (such as the NVIDIA drivers,
AUFS, splashutils, etc.). If the updated packages arent
backwards compatible with older kernels, you need to keep the
older versions and use some conditionals. For example, new
kernels require splashutils 1.5 while old kernel require 1.3, so
<varname>kernelPackagesFor</varname> says:
<programlisting>
splashutils =
if kernel.features ? fbSplash then splashutils_13 else
if kernel.features ? fbConDecor then splashutils_15 else
null;
splashutils_13 = ...;
splashutils_15 = ...;</programlisting>
</para>
AUFS, etc.). If the updated packages arent backwards compatible
with older kernels, you may need to keep the older versions
around.</para>
</listitem>
</orderedlist>

View file

@ -86,9 +86,6 @@ with stdenv.lib;
''}
BCMA_HOST_PCI y
# Some settings to make sure that fbcondecor works - in particular,
# disable tileblitting and the drivers that need it.
# Enable various FB devices.
FB y
FB_EFI y

View file

@ -1,36 +0,0 @@
{ stdenv, fetchurl, zlib, libjpeg }:
stdenv.mkDerivation {
name = "splashutils-1.5.4.3";
src = fetchurl {
url = http://dev.gentoo.org/~spock/projects/splashutils/current/splashutils-1.5.4.3.tar.bz2;
sha256 = "0vn0ifqp9a3bmprzx2yr82hgq8m2y5xv8qcifs2plz6p3lidagpg";
};
buildInputs = [ zlib libjpeg ];
configureFlags = "--without-ttf --without-png --without-gpm --with-themedir=/etc/splash KLCC=gcc";
dontDisableStatic = true;
preConfigure = ''
configureFlags="$configureFlags --with-essential-prefix=$out"
substituteInPlace src/common.h \
--replace 'FBSPLASH_DIR"/sys"' '"/sys"' \
--replace 'FBSPLASH_DIR"/proc"' '"/proc"'
substituteInPlace src/Makefile.in \
--replace '-all-static' "" \
--replace '-static' ""
'';
CPP = "gcc -E";
CXXCPP = "g++ -E";
NIX_CFLAGS_COMPILE = "-fPIC";
passthru = {
helperName = "sbin/fbcondecor_helper";
controlName = "sbin/fbcondecor_ctl";
helperProcFile = "/proc/sys/kernel/fbcondecor";
};
}

View file

@ -6658,11 +6658,6 @@ let
linuxHeaders = glibc.kernelHeaders;
};
splashutils = let hasFbConDecor = if self.kernel ? features
then self.kernel.features ? fbConDecor
else self.kernel.config.isEnabled "FB_CON_DECOR";
in if hasFbConDecor then pkgs.splashutils else null;
/* compiles but has to be integrated into the kernel somehow
Let's have it uncommented and finish it..
*/
@ -6866,8 +6861,6 @@ let
shadow = callPackage ../os-specific/linux/shadow { };
splashutils = callPackage ../os-specific/linux/splashutils/default.nix { };
statifier = builderDefsPackage (import ../os-specific/linux/statifier) { };
sysfsutils = callPackage ../os-specific/linux/sysfsutils { };

View file

@ -158,7 +158,6 @@ with (import ./release-lib.nix);
sharutils = all;
sloccount = allBut "i686-cygwin";
smartmontools = all;
splashutils = linux;
sqlite = allBut "i686-cygwin";
squid = linux;
ssmtp = linux;

View file

@ -271,7 +271,6 @@ let
sloccount = allBut "i686-cygwin";
smartmontools = linux;
spidermonkey = linux;
splashutils = linux;
sqlite = allBut "i686-cygwin";
squid = linux;
ssmtp = linux;