diff --git a/pkgs/os-specific/linux/util-linux-static/MCONFIG.patch b/pkgs/os-specific/linux/util-linux-static/MCONFIG.patch new file mode 100644 index 00000000000..2a7816db850 --- /dev/null +++ b/pkgs/os-specific/linux/util-linux-static/MCONFIG.patch @@ -0,0 +1,141 @@ +diff -rc util-linux-2.12q-orig/MCONFIG util-linux-2.12q/MCONFIG +*** util-linux-2.12q-orig/MCONFIG 2004-12-13 00:15:48.000000000 +0100 +--- util-linux-2.12q/MCONFIG 2005-03-10 16:28:53.000000000 +0100 +*************** +*** 64,75 **** + # If HAVE_WRITE is set to "yes", then write will not be built or + # installed from the misc-utils subdirectory. + # (There is a network aware write in netwrite from NetKit 0.16 or later.) +! HAVE_WRITE=no + + # If HAVE_GETTY is set to "yes", then agetty will not be built or + # installed from the login-utils subdirectory. Note that agetty can + # co-exist with other gettys, so this option should never be used. +! HAVE_GETTY=no + + # If USE_TTY_GROUP is set to "yes", then wall and write will be installed + # setgid to the "tty" group, and mesg will only set the group write bit. +--- 64,75 ---- + # If HAVE_WRITE is set to "yes", then write will not be built or + # installed from the misc-utils subdirectory. + # (There is a network aware write in netwrite from NetKit 0.16 or later.) +! HAVE_WRITE=yes + + # If HAVE_GETTY is set to "yes", then agetty will not be built or + # installed from the login-utils subdirectory. Note that agetty can + # co-exist with other gettys, so this option should never be used. +! HAVE_GETTY=yes + + # If USE_TTY_GROUP is set to "yes", then wall and write will be installed + # setgid to the "tty" group, and mesg will only set the group write bit. +*************** +*** 77,83 **** + # user's tty to "tty" [The login in util-linux does this correctly, and + # xterm will do it correctly if X is compiled with USE_TTY_GROUP set + # properly.] +! USE_TTY_GROUP=yes + + # If HAVE_KILL is set to "yes", then kill will not be built or + # installed from the misc-utils subdirectory. +--- 77,83 ---- + # user's tty to "tty" [The login in util-linux does this correctly, and + # xterm will do it correctly if X is compiled with USE_TTY_GROUP set + # properly.] +! USE_TTY_GROUP=no + + # If HAVE_KILL is set to "yes", then kill will not be built or + # installed from the misc-utils subdirectory. +*************** +*** 102,111 **** + # If HAVE_SLN is set to "yes", then sln won't be installed + # (but the man page sln.8 will be installed anyway). + # sln also comes with libc and glibc. +! HAVE_SLN=no + + # If HAVE_FDUTILS is set to "yes", then setfdprm won't be installed. +! HAVE_FDUTILS=no + + # If SILENT_PG is set to "yes", then pg will not ring the bell + # when an invalid key is pressed +--- 102,111 ---- + # If HAVE_SLN is set to "yes", then sln won't be installed + # (but the man page sln.8 will be installed anyway). + # sln also comes with libc and glibc. +! HAVE_SLN=yes + + # If HAVE_FDUTILS is set to "yes", then setfdprm won't be installed. +! HAVE_FDUTILS=yes + + # If SILENT_PG is set to "yes", then pg will not ring the bell + # when an invalid key is pressed +*************** +*** 168,184 **** + DEV_DIR= /dev + ETC_DIR= /etc + SBIN_DIR= /sbin +! USRSBIN_DIR= /usr/sbin +! USRLIB_DIR= /usr/lib +! USRBIN_DIR= /usr/bin +! USRGAMES_DIR= /usr/games +! USRSHAREMISC_DIR=/usr/share/misc +! LOCALE_DIR= /usr/share/locale + BIN_DIR= /bin + VAR_PATH= /var + LOG_DIR= /var/log +! MAN_DIR= /usr/share/man +! INFO_DIR= /usr/share/info + + # + # Paths used for install +--- 168,184 ---- + DEV_DIR= /dev + ETC_DIR= /etc + SBIN_DIR= /sbin +! USRSBIN_DIR= /sbin +! USRLIB_DIR= /lib +! USRBIN_DIR= /bin +! USRGAMES_DIR= /games +! USRSHAREMISC_DIR=/share/misc +! LOCALE_DIR= /share/locale + BIN_DIR= /bin + VAR_PATH= /var + LOG_DIR= /var/log +! MAN_DIR= /share/man +! INFO_DIR= /share/info + + # + # Paths used for install +*************** +*** 212,218 **** + MANMODE= 644 + DATMODE= 644 + INFOMODE= 644 +! SUIDMODE= 4755 + + CHMOD= chmod + INSTALL= install +--- 212,218 ---- + MANMODE= 644 + DATMODE= 644 + INFOMODE= 644 +! SUIDMODE= 755 + + CHMOD= chmod + INSTALL= install +*************** +*** 220,226 **** + INSTALLBIN= $(INSTALL) -m $(BINMODE) + INSTALLMAN= $(INSTALL) -m $(MANMODE) + INSTALLDAT= $(INSTALL) -m $(DATMODE) +! INSTALLSUID= $(INSTALL) -m $(SUIDMODE) -o root + + ifeq "$(DISABLE_NLS)" "yes" + NLSFLAGS = -DDISABLE_NLS +--- 220,226 ---- + INSTALLBIN= $(INSTALL) -m $(BINMODE) + INSTALLMAN= $(INSTALL) -m $(MANMODE) + INSTALLDAT= $(INSTALL) -m $(DATMODE) +! INSTALLSUID= $(INSTALL) -m $(SUIDMODE) # -o root + + ifeq "$(DISABLE_NLS)" "yes" + NLSFLAGS = -DDISABLE_NLS diff --git a/pkgs/os-specific/linux/util-linux-static/builder.sh b/pkgs/os-specific/linux/util-linux-static/builder.sh new file mode 100644 index 00000000000..5adc2456706 --- /dev/null +++ b/pkgs/os-specific/linux/util-linux-static/builder.sh @@ -0,0 +1,9 @@ +source $stdenv/setup + +export LDFLAGS=-static +export DESTDIR=$out + +genericBuild + +strip $out/bin/* +strip $out/sbin/* diff --git a/pkgs/os-specific/linux/util-linux-static/default.nix b/pkgs/os-specific/linux/util-linux-static/default.nix new file mode 100644 index 00000000000..134260defef --- /dev/null +++ b/pkgs/os-specific/linux/util-linux-static/default.nix @@ -0,0 +1,11 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "util-linux-2.12r"; + builder = ./builder.sh; + src = fetchurl { + url = http://www.kernel.org/pub/linux/utils/util-linux/util-linux-2.12r.tar.bz2; + md5 = "af9d9e03038481fbf79ea3ac33f116f9"; + }; + patches = [./MCONFIG.patch]; +}