diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 6dae036b338..8a35e640324 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -105,16 +105,6 @@ $ make menuconfig ARCH=arch - - Make sure that - CONFIG_FB_TILEBLITTING is not - set (otherwise fbsplash 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. - - Copy .config over the new config file (e.g. config-2.6.22-i686-smp). @@ -137,22 +127,9 @@ $ make menuconfig ARCH=arch kernel modules and kernel-dependent packages listed in the kernelPackagesFor function in all-packages.nix (such as the NVIDIA drivers, - AUFS, splashutils, etc.). If the updated packages aren’t - 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 - kernelPackagesFor says: - - -splashutils = - if kernel.features ? fbSplash then splashutils_13 else - if kernel.features ? fbConDecor then splashutils_15 else - null; - -splashutils_13 = ...; -splashutils_15 = ...; - - + AUFS, etc.). If the updated packages aren’t backwards compatible + with older kernels, you may need to keep the older versions + around. diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index da832359979..01a605aac30 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -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 diff --git a/pkgs/os-specific/linux/splashutils/default.nix b/pkgs/os-specific/linux/splashutils/default.nix deleted file mode 100644 index 86bdd7eee9b..00000000000 --- a/pkgs/os-specific/linux/splashutils/default.nix +++ /dev/null @@ -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"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8bf9da517b2..0217f664729 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index bad99175714..ef7bc038c62 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -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; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 557203f9fb1..87b63e33891 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -271,7 +271,6 @@ let sloccount = allBut "i686-cygwin"; smartmontools = linux; spidermonkey = linux; - splashutils = linux; sqlite = allBut "i686-cygwin"; squid = linux; ssmtp = linux;