diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-23 13:31:10 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-23 13:31:10 +0000 |
commit | 7689a348c4eb7ed55bfaa273fadbb036f7f0bde7 (patch) | |
tree | 8ebc0483e7a9f60f47c00f1cc09675cfcf2bc2f1 /pkgs/os-specific | |
parent | 0f10222e4ecee30837fe7631a37e343ccf82f49f (diff) |
* Got rid of a lot of "postInstall=postInstall" and similar lines in
builders. These are redundant now. * Inlined some trivial builders. * Removed a few explicit setup-hook creations. This is done automatically now if setupHook is set. * Deleted the initscripts package. NixOS doesn't use it anymore. svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/dietlibc/builder.sh | 1 | ||||
-rw-r--r-- | pkgs/os-specific/linux/initscripts/builder.sh | 20 | ||||
-rw-r--r-- | pkgs/os-specific/linux/initscripts/default.nix | 12 | ||||
-rw-r--r-- | pkgs/os-specific/linux/initscripts/initscripts-8.18.patch | 49 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel-headers-cross/builder.sh | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/klibc/builder.sh | 1 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kudzu/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/squashfs/builder.sh | 17 | ||||
-rw-r--r-- | pkgs/os-specific/linux/squashfs/default.nix | 13 | ||||
-rw-r--r-- | pkgs/os-specific/linux/sysvinit/builder.sh | 2 |
11 files changed, 12 insertions, 111 deletions
diff --git a/pkgs/os-specific/linux/dietlibc/builder.sh b/pkgs/os-specific/linux/dietlibc/builder.sh index 50779de8f996c..ee0cb2b7522bc 100644 --- a/pkgs/os-specific/linux/dietlibc/builder.sh +++ b/pkgs/os-specific/linux/dietlibc/builder.sh @@ -3,7 +3,6 @@ source $stdenv/setup makeFlags="prefix=$out" installFlags="prefix=$out" -postInstall=postInstall postInstall() { (cd $out && ln -s lib-* lib) (cd $out/lib && ln -s start.o crt1.o) diff --git a/pkgs/os-specific/linux/initscripts/builder.sh b/pkgs/os-specific/linux/initscripts/builder.sh deleted file mode 100644 index 37bc538d692ff..0000000000000 --- a/pkgs/os-specific/linux/initscripts/builder.sh +++ /dev/null @@ -1,20 +0,0 @@ -source $stdenv/setup - -export ROOT=$out - -buildPhase() { - cd src - make -} - -buildPhase=buildPhase - -installPhase() { - make install - cd ..; cp -af rc.d sysconfig ppp $ROOT/etc - -} - -installPhase=installPhase - -genericBuild diff --git a/pkgs/os-specific/linux/initscripts/default.nix b/pkgs/os-specific/linux/initscripts/default.nix deleted file mode 100644 index acb138265154c..0000000000000 --- a/pkgs/os-specific/linux/initscripts/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{stdenv, fetchurl, popt, pkgconfig, glib}: - -stdenv.mkDerivation { - name = "initscripts-8.18"; - builder = ./builder.sh; - src = fetchurl { - url = http://nixos.org/tarballs/initscripts-8.18.tar.bz2; - md5 = "1b89ac4d344f1f20fe5022a198b69915"; - }; - buildInputs = [popt pkgconfig glib]; - patches = [./initscripts-8.18.patch]; -} diff --git a/pkgs/os-specific/linux/initscripts/initscripts-8.18.patch b/pkgs/os-specific/linux/initscripts/initscripts-8.18.patch deleted file mode 100644 index c548b99b4f161..0000000000000 --- a/pkgs/os-specific/linux/initscripts/initscripts-8.18.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -ruN initscripts-8.18/src/Makefile initscripts-8.18.new/src/Makefile ---- initscripts-8.18/src/Makefile 2005-03-31 22:52:04.000000000 +0200 -+++ initscripts-8.18.new/src/Makefile 2005-12-12 17:54:14.000000000 +0100 -@@ -1,12 +1,13 @@ - CFLAGS+=$(RPM_OPT_FLAGS) -Wall -D_GNU_SOURCE - - PROGS=usernetctl doexec netreport testd usleep ipcalc initlog \ -- getkey ppp-watch consoletype genhostid kmodule -+ getkey consoletype genhostid -+ #getkey ppp-watch consoletype genhostid kmodule - PPPWATCH_OBJS=ppp-watch.o shvar.o - INITLOG_OBJS=initlog.o process.o - USLEEP_OBJS=usleep.o - --mandir=/usr/share/man -+mandir= - - all: $(PROGS) - -@@ -14,9 +15,9 @@ - rm -f $(PROGS) *.o - - install: -- mkdir -p $(ROOT)/bin $(ROOT)/usr/sbin $(ROOT)$(mandir)/man{1,8} $(ROOT)/etc -+ mkdir -p $(ROOT)/bin $(ROOT)/sbin $(ROOT)/usr/sbin $(ROOT)$(mandir)/man{1,8} $(ROOT)/etc - install -m 755 doexec $(ROOT)/bin/doexec -- install -m 755 kmodule $(ROOT)/sbin/kmodule -+ #install -m 755 kmodule $(ROOT)/sbin/kmodule - install -m 755 usleep $(ROOT)/bin/usleep - install -m 4755 usernetctl $(ROOT)/usr/sbin/usernetctl - install -m 2755 netreport $(ROOT)/sbin/netreport -@@ -24,7 +25,7 @@ - install -m 755 genhostid $(ROOT)/sbin/genhostid - install -m 755 initlog $(ROOT)/sbin/initlog - install -m 755 getkey $(ROOT)/sbin/getkey -- install -m 755 ppp-watch $(ROOT)/sbin/ppp-watch -+ #install -m 755 ppp-watch $(ROOT)/sbin/ppp-watch - install -m 755 consoletype $(ROOT)/sbin/consoletype - install -m 644 initlog.1 $(ROOT)$(mandir)/man1 - install -m 644 genhostid.1 $(ROOT)$(mandir)/man1 -@@ -32,7 +33,7 @@ - install -m 644 netreport.1 $(ROOT)$(mandir)/man1 - install -m 644 usleep.1 $(ROOT)$(mandir)/man1 - install -m 644 usernetctl.8 $(ROOT)$(mandir)/man8 -- install -m 644 ppp-watch.8 $(ROOT)$(mandir)/man8 -+ #install -m 644 ppp-watch.8 $(ROOT)$(mandir)/man8 - install -m 644 ipcalc.1 $(ROOT)$(mandir)/man1 - install -m 644 consoletype.1 $(ROOT)$(mandir)/man1 - install -m 644 initlog.conf $(ROOT)/etc diff --git a/pkgs/os-specific/linux/kernel-headers-cross/builder.sh b/pkgs/os-specific/linux/kernel-headers-cross/builder.sh index 277246a27d0cf..3bc4abc923313 100644 --- a/pkgs/os-specific/linux/kernel-headers-cross/builder.sh +++ b/pkgs/os-specific/linux/kernel-headers-cross/builder.sh @@ -5,8 +5,6 @@ buildPhase() { make include/linux/version.h } -buildPhase=buildPhase - installPhase() { mkdir $out @@ -29,7 +27,5 @@ installPhase() { echo -n > $out/include/linux/autoconf.h } -installPhase=installPhase - genericBuild diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh index 84064134d01f1..823e2139c558e 100644 --- a/pkgs/os-specific/linux/kernel/builder.sh +++ b/pkgs/os-specific/linux/kernel/builder.sh @@ -1,7 +1,6 @@ source $stdenv/setup -configurePhase=configurePhase configurePhase() { if test -n "$preConfigure"; then eval "$preConfigure"; @@ -56,7 +55,6 @@ configurePhase() { } -installPhase=installPhase installPhase() { ensureDir $out diff --git a/pkgs/os-specific/linux/klibc/builder.sh b/pkgs/os-specific/linux/klibc/builder.sh index 7bb77608cf9be..4ae5a9d080b18 100644 --- a/pkgs/os-specific/linux/klibc/builder.sh +++ b/pkgs/os-specific/linux/klibc/builder.sh @@ -1,6 +1,5 @@ source $stdenv/setup -preBuild=preBuild preBuild() { mkdir -p linux/include cp -prd $kernel/lib/modules/*/build/include/* linux/include/ diff --git a/pkgs/os-specific/linux/kudzu/builder.sh b/pkgs/os-specific/linux/kudzu/builder.sh index 7493b6f6df4c9..744d1d516a332 100644 --- a/pkgs/os-specific/linux/kudzu/builder.sh +++ b/pkgs/os-specific/linux/kudzu/builder.sh @@ -10,6 +10,4 @@ preInstall() { make install-program } -preInstall=preInstall - genericBuild diff --git a/pkgs/os-specific/linux/squashfs/builder.sh b/pkgs/os-specific/linux/squashfs/builder.sh deleted file mode 100644 index ca514515c450b..0000000000000 --- a/pkgs/os-specific/linux/squashfs/builder.sh +++ /dev/null @@ -1,17 +0,0 @@ -source $stdenv/setup - -preBuild() { - cd squashfs-tools -} - -preBuild=preBuild - -installPhase() { - ensureDir $out/sbin - cp mksquashfs $out/sbin - cp unsquashfs $out/sbin -} - -installPhase=installPhase - -genericBuild diff --git a/pkgs/os-specific/linux/squashfs/default.nix b/pkgs/os-specific/linux/squashfs/default.nix index 00ce8fba56e84..8fdf288d7dd58 100644 --- a/pkgs/os-specific/linux/squashfs/default.nix +++ b/pkgs/os-specific/linux/squashfs/default.nix @@ -2,10 +2,21 @@ stdenv.mkDerivation { name = "squashfs-3.3"; - builder = ./builder.sh; + src = fetchurl { url = mirror://sourceforge/squashfs/squashfs3.3.tgz; sha256 = "1j55m26nyvlbld4yxad0r6s1f4rdw9yg89y2gv93ihkx3rx048w4"; }; + buildInputs = [zlib]; + + preBuild = '' + cd squashfs-tools + ''; + + installPhase = '' + ensureDir $out/sbin + cp mksquashfs $out/sbin + cp unsquashfs $out/sbin + ''; } diff --git a/pkgs/os-specific/linux/sysvinit/builder.sh b/pkgs/os-specific/linux/sysvinit/builder.sh index 48574d6ec3e97..198fa9ba4160b 100644 --- a/pkgs/os-specific/linux/sysvinit/builder.sh +++ b/pkgs/os-specific/linux/sysvinit/builder.sh @@ -4,7 +4,6 @@ makeFlagsArray=(LCRYPT=-lcrypt BIN_OWNER=$(id -u) BIN_GROUP=$(id -g) ROOT=$out) preBuild="cd src" -preInstall=preInstall preInstall() { substituteInPlace Makefile --replace /usr / mkdir $out @@ -18,7 +17,6 @@ preInstall() { mkdir $out/share/man/man8 } -postInstall=postInstall postInstall() { if test -n "$withoutInitTools"; then mv $out/sbin/killall5 $out/bin |