diff options
Diffstat (limited to 'pkgs/os-specific/linux')
19 files changed, 0 insertions, 777 deletions
diff --git a/pkgs/os-specific/linux/dietlibc/builder.sh b/pkgs/os-specific/linux/dietlibc/builder.sh deleted file mode 100644 index ee0cb2b7522b..000000000000 --- a/pkgs/os-specific/linux/dietlibc/builder.sh +++ /dev/null @@ -1,36 +0,0 @@ -source $stdenv/setup - -makeFlags="prefix=$out" -installFlags="prefix=$out" - -postInstall() { - (cd $out && ln -s lib-* lib) - (cd $out/lib && ln -s start.o crt1.o) - - # Fake crti.o and crtn.o. - touch empty.c - gcc -c empty.c -o $out/lib/crti.o - gcc -c empty.c -o $out/lib/crtn.o - - # Copy <sys/user.h> from Glibc; binutils wants it. - cp $glibc/include/sys/user.h $out/include/sys/ - - # Remove <dlfcn.h>, it makes some packages think we can load - # dynamic libraries. - rm $out/include/dlfcn.h - - # Dietlibc has a asm include directory, whose presence makes the - # asm directory of kernel-headers unreachable. So make symlinks - # from the dietlibc asm to the kernel-headers asm. - ln -s $kernelHeaders/include/asm/* $out/include/asm/ || true - - # Make asm-x86_64 etc. available. - for i in $kernelHeaders/include/asm-*; do - ln -s $i $out/include/ - done - - # Idem for include/linux. - ln -s $kernelHeaders/include/linux/* $out/include/linux/ || true -} - -genericBuild diff --git a/pkgs/os-specific/linux/dietlibc/default.nix b/pkgs/os-specific/linux/dietlibc/default.nix deleted file mode 100644 index d98bfb967356..000000000000 --- a/pkgs/os-specific/linux/dietlibc/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{stdenv, fetchurl, glibc}: - -assert stdenv.isLinux; - -stdenv.mkDerivation { - name = "dietlibc-0.30"; - src = fetchurl { - url = mirror://kernel/linux/libs/dietlibc/dietlibc-0.30.tar.bz2; - md5 = "2465d652fff6f1fad3da3b98e60e83c9"; - }; - builder = ./builder.sh; - - inherit glibc; - kernelHeaders = glibc.linuxHeaders; - - patches = [ - - # dietlibc's sigcontext.h provides a macro called PC(), which is - # rather intrusive (e.g., binutils fails to compile because of - # it). Rename it. - ./pc.patch - - # wchar.h declares lots of functions that don't actually exist. - # Remove them. - ./no-wchar.patch - - # Fix to get DNS resolution to work on 64-bit platforms. Taken - # from 0.31 CVS. - ./dns64.patch - - # Get lseek64 working on x86_64. From - # http://svn.annvix.org/cgi-bin/viewvc.cgi/packages/releases/2.0-CURRENT/dietlibc/SOURCES - ./x86_64-lseek64.patch - #./x86_64-stat64.patch - - ]; - - meta = { - homepage = http://www.fefe.de/dietlibc/; - description = "A small implementation of the C library"; - license = "GPL"; - }; -} diff --git a/pkgs/os-specific/linux/dietlibc/dns64.patch b/pkgs/os-specific/linux/dietlibc/dns64.patch deleted file mode 100644 index 47d54d1d16b7..000000000000 --- a/pkgs/os-specific/linux/dietlibc/dns64.patch +++ /dev/null @@ -1,109 +0,0 @@ -Only in dietlibc-0.30: CHANGES.orig -diff -rc dietlibc-0.30-orig/libcruft/dnscruft2.c dietlibc-0.30/libcruft/dnscruft2.c -*** dietlibc-0.30-orig/libcruft/dnscruft2.c 2005-05-01 22:08:25.000000000 +0200 ---- dietlibc-0.30/libcruft/dnscruft2.c 2007-01-22 15:32:18.000000000 +0100 -*************** -*** 5,11 **** - #include <netdb.h> - #include <stdlib.h> - #include <arpa/inet.h> -- #include <sys/poll.h> - #include <unistd.h> - #include <errno.h> - #include <arpa/nameser.h> ---- 5,10 ---- -diff -rc dietlibc-0.30-orig/libcruft/dnscruft.c dietlibc-0.30/libcruft/dnscruft.c -*** dietlibc-0.30-orig/libcruft/dnscruft.c 2006-06-18 20:32:35.000000000 +0200 ---- dietlibc-0.30/libcruft/dnscruft.c 2007-01-22 15:32:18.000000000 +0100 -*************** -*** 45,53 **** - tmp=socket(PF_INET6,SOCK_DGRAM,IPPROTO_UDP); - if (tmp<0) return; - fcntl(tmp,F_SETFD,FD_CLOEXEC); - si.sin6_family=AF_INET6; -- si.sin6_port=0; -- memset(&si.sin6_addr,0,16); - if (bind(tmp,(struct sockaddr*)&si,sizeof(si))) return; - __dns_fd6=tmp; - } ---- 45,52 ---- - tmp=socket(PF_INET6,SOCK_DGRAM,IPPROTO_UDP); - if (tmp<0) return; - fcntl(tmp,F_SETFD,FD_CLOEXEC); -+ memset(&si,0,sizeof(si)); - si.sin6_family=AF_INET6; - if (bind(tmp,(struct sockaddr*)&si,sizeof(si))) return; - __dns_fd6=tmp; - } -diff -rc dietlibc-0.30-orig/libcruft/res_mkquery.c dietlibc-0.30/libcruft/res_mkquery.c -*** dietlibc-0.30-orig/libcruft/res_mkquery.c 2004-11-10 18:45:17.000000000 +0100 ---- dietlibc-0.30/libcruft/res_mkquery.c 2007-01-22 15:32:18.000000000 +0100 -*************** -*** 42,51 **** - int res_mkquery(int op, const char *dname, int class, int type, char* data, - int datalen, const unsigned char* newrr, char* buf, int buflen) { - unsigned char packet[512]; -! unsigned long len=0; -! memmove(packet,dnspacket,12); - if ((_res.options&RES_RECURSE)==0) packet[2]=0; -- *(unsigned short*)packet=rand(); - { - unsigned char* x; - const char* y,* tmp; ---- 42,55 ---- - int res_mkquery(int op, const char *dname, int class, int type, char* data, - int datalen, const unsigned char* newrr, char* buf, int buflen) { - unsigned char packet[512]; -! unsigned long len; -! -! memcpy(packet,dnspacket,12); -! len=rand(); -! packet[0]=len; -! packet[1]=len>>8; -! len=0; - if ((_res.options&RES_RECURSE)==0) packet[2]=0; - { - unsigned char* x; - const char* y,* tmp; -diff -rc dietlibc-0.30-orig/libcruft/res_query.c dietlibc-0.30/libcruft/res_query.c -*** dietlibc-0.30-orig/libcruft/res_query.c 2005-10-14 17:37:59.000000000 +0200 ---- dietlibc-0.30/libcruft/res_query.c 2007-01-22 15:32:18.000000000 +0100 -*************** -*** 99,105 **** - duh[1].fd=pnpfd; - } else { - duh[1].fd=-1; -! duh[1].revents=0; - } - - #endif ---- 99,105 ---- - duh[1].fd=pnpfd; - } else { - duh[1].fd=-1; -! duh[1].events=0; - } - - #endif -diff -rc dietlibc-0.30-orig/syscalls.s/__guard.S dietlibc-0.30/syscalls.s/__guard.S -*** dietlibc-0.30-orig/syscalls.s/__guard.S 2006-04-07 17:33:20.000000000 +0200 ---- dietlibc-0.30/syscalls.s/__guard.S 2007-01-22 15:32:18.000000000 +0100 -*************** -*** 1,3 **** ---- 1,4 ---- -+ #include <endian.h> - .data - .type __guard,@object - .global __guard -*************** -*** 5,9 **** ---- 6,14 ---- - .global __stack_chk_guard - __guard: - __stack_chk_guard: -+ #if __WORDSIZE == 64 -+ .quad 0xaff00 -+ #else - .long 0xaff00 -+ #endif - diff --git a/pkgs/os-specific/linux/dietlibc/no-wchar.patch b/pkgs/os-specific/linux/dietlibc/no-wchar.patch deleted file mode 100644 index 92be2cd2feaf..000000000000 --- a/pkgs/os-specific/linux/dietlibc/no-wchar.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff -rc dietlibc-0.30-orig/include/wchar.h dietlibc-0.30/include/wchar.h -*** dietlibc-0.30-orig/include/wchar.h 2005-09-21 09:33:08.000000000 +0200 ---- dietlibc-0.30/include/wchar.h 2006-10-20 15:04:04.000000000 +0200 -*************** -*** 30,99 **** - unsigned long sofar; - } mbstate_t; - -- wint_t btowc(int); -- wint_t fgetwc(FILE *); -- wchar_t* fgetws(wchar_t *__restrict__, int, FILE *__restrict__); -- wint_t fputwc(wchar_t, FILE *); -- int fputws(const wchar_t *__restrict__, FILE *__restrict__); -- int fwide(FILE *, int); -- int fwprintf(FILE *__restrict__, const wchar_t *__restrict__, ...); -- int fwscanf(FILE *__restrict__, const wchar_t *__restrict__, ...); -- wint_t getwc(FILE *); -- wint_t getwchar(void); -- -- size_t mbrlen(const char *__restrict__, size_t, mbstate_t *__restrict__); -- size_t mbrtowc(wchar_t *__restrict__, const char *__restrict__, size_t, mbstate_t *__restrict__); -- int mbsinit(const mbstate_t *); -- size_t mbsrtowcs(wchar_t *__restrict__, const char **__restrict__, size_t, mbstate_t *__restrict__); -- wint_t putwc(wchar_t, FILE *); -- wint_t putwchar(wchar_t); -- int swprintf(wchar_t *__restrict__, size_t, const wchar_t *__restrict__, ...); -- int swscanf(const wchar_t *__restrict__, const wchar_t *__restrict__, ...); -- -- wint_t ungetwc(wint_t, FILE *); -- int vfwprintf(FILE *__restrict__, const wchar_t *__restrict__, va_list); -- int vfwscanf(FILE *__restrict__, const wchar_t *__restrict__, va_list); -- int vwprintf(const wchar_t *__restrict__, va_list); -- int vswprintf(wchar_t *__restrict__, size_t, const wchar_t *__restrict__, va_list); -- int vswscanf(const wchar_t *__restrict__, const wchar_t *__restrict__, va_list); -- int vwscanf(const wchar_t *__restrict__, va_list); -- size_t wcrtomb(char *__restrict__, wchar_t, mbstate_t *__restrict__); -- wchar_t *wcscat(wchar_t *__restrict__, const wchar_t *__restrict__); -- wchar_t *wcschr(const wchar_t *, wchar_t); -- int wcscmp(const wchar_t *, const wchar_t *); -- int wcscoll(const wchar_t *, const wchar_t *); -- wchar_t* wcscpy(wchar_t *__restrict__, const wchar_t *__restrict__); -- size_t wcscspn(const wchar_t *, const wchar_t *); -- size_t wcsftime(wchar_t *__restrict__, size_t, const wchar_t *__restrict__, const struct tm *__restrict__); -- size_t wcslen(const wchar_t *) __pure; -- wchar_t *wcsncat(wchar_t *__restrict__, const wchar_t *__restrict__, size_t); -- int wcsncmp(const wchar_t *, const wchar_t *, size_t); -- wchar_t *wcsncpy(wchar_t *__restrict__, const wchar_t *__restrict__, size_t); -- wchar_t *wcspbrk(const wchar_t *, const wchar_t *); -- wchar_t *wcsrchr(const wchar_t *, wchar_t); -- size_t wcsrtombs(char *__restrict__, const wchar_t **__restrict__, size_t, mbstate_t *__restrict__); -- size_t wcsspn(const wchar_t *, const wchar_t *); -- wchar_t *wcsstr(const wchar_t *__restrict__, const wchar_t *__restrict__); -- double wcstod(const wchar_t *__restrict__, wchar_t **__restrict__); -- float wcstof(const wchar_t *__restrict__, wchar_t **__restrict__); -- wchar_t *wcstok(wchar_t *__restrict__, const wchar_t *__restrict__, wchar_t **__restrict__); -- long wcstol(const wchar_t *__restrict__, wchar_t **__restrict__, int); -- long double wcstold(const wchar_t *__restrict__, wchar_t **__restrict__); -- long long wcstoll(const wchar_t *__restrict__, wchar_t **__restrict__, int); -- unsigned long wcstoul(const wchar_t *__restrict__, wchar_t **__restrict__, int); -- unsigned long long wcstoull(const wchar_t *__restrict__, wchar_t **__restrict__, int); -- -- size_t wcsxfrm(wchar_t *__restrict__, const wchar_t *__restrict__, size_t); -- int wctob(wint_t); -- -- wchar_t *wmemchr(const wchar_t *, wchar_t, size_t); -- int wmemcmp(const wchar_t *, const wchar_t *, size_t); -- wchar_t *wmemcpy(wchar_t *__restrict__, const wchar_t *__restrict__, size_t); -- wchar_t *wmemmove(wchar_t *, const wchar_t *, size_t); -- wchar_t *wmemset(wchar_t *, wchar_t, size_t); -- int wprintf(const wchar_t *__restrict__, ...); -- int wscanf(const wchar_t *__restrict__, ...); -- - __END_DECLS - - #endif ---- 30,35 ---- -Only in dietlibc-0.30/include: wchar.h~ diff --git a/pkgs/os-specific/linux/dietlibc/pc.patch b/pkgs/os-specific/linux/dietlibc/pc.patch deleted file mode 100644 index fd274d24f038..000000000000 --- a/pkgs/os-specific/linux/dietlibc/pc.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff -rc dietlibc-0.30-orig/include/asm/arm-sigcontext.h dietlibc-0.30/include/asm/arm-sigcontext.h -*** dietlibc-0.30-orig/include/asm/arm-sigcontext.h 2002-05-09 03:05:10.000000000 +0200 ---- dietlibc-0.30/include/asm/arm-sigcontext.h 2006-10-19 12:40:30.000000000 +0200 -*************** -*** 1,5 **** - -! #define PC(ctx) (ctx.arm_pc) - - /* - * Signal context structure - contains all info to do with the state ---- 1,5 ---- - -! #define __DIETLIBC_PC(ctx) (ctx.arm_pc) - - /* - * Signal context structure - contains all info to do with the state -diff -rc dietlibc-0.30-orig/include/asm/i386-sigcontext.h dietlibc-0.30/include/asm/i386-sigcontext.h -*** dietlibc-0.30-orig/include/asm/i386-sigcontext.h 2005-09-21 09:33:08.000000000 +0200 ---- dietlibc-0.30/include/asm/i386-sigcontext.h 2006-10-19 12:40:41.000000000 +0200 -*************** -*** 38,44 **** - }; - - #define X86_FXSR_MAGIC 0x0000 -! #define PC(ctx) (ctx.eip) - - struct sigcontext { - __u16 gs, __gsh; ---- 38,44 ---- - }; - - #define X86_FXSR_MAGIC 0x0000 -! #define __DIETLIBC_PC(ctx) (ctx.eip) - - struct sigcontext { - __u16 gs, __gsh; -diff -rc dietlibc-0.30-orig/include/asm/ia64-sigcontext.h dietlibc-0.30/include/asm/ia64-sigcontext.h -*** dietlibc-0.30-orig/include/asm/ia64-sigcontext.h 2002-07-20 18:47:48.000000000 +0200 ---- dietlibc-0.30/include/asm/ia64-sigcontext.h 2006-10-19 12:39:40.000000000 +0200 -*************** -*** 1,6 **** - #include <sys/ptrace.h> - -! #define PC(ctx) (ctx.sc_ip) - - struct sigcontext { - unsigned long sc_flags; ---- 1,6 ---- - #include <sys/ptrace.h> - -! #define __DIETLIBC_PC(ctx) (ctx.sc_ip) - - struct sigcontext { - unsigned long sc_flags; -diff -rc dietlibc-0.30-orig/profiling/profil.c dietlibc-0.30/profiling/profil.c -*** dietlibc-0.30-orig/profiling/profil.c 2002-04-08 00:13:53.000000000 +0200 ---- dietlibc-0.30/profiling/profil.c 2006-10-19 12:40:58.000000000 +0200 -*************** -*** 43,51 **** - static void - profiler (int signal, struct sigcontext ctx) - { -! size_t s = PC(ctx)-low_pc; - (void)signal; -! if ((PC(ctx)) < low_pc) return; - s >>= 1; - if (s < maxhits) - ++buffer[s]; ---- 43,51 ---- - static void - profiler (int signal, struct sigcontext ctx) - { -! size_t s = __DIETLIBC_PC(ctx)-low_pc; - (void)signal; -! if ((__DIETLIBC_PC(ctx)) < low_pc) return; - s >>= 1; - if (s < maxhits) - ++buffer[s]; diff --git a/pkgs/os-specific/linux/dietlibc/x86_64-lseek64.patch b/pkgs/os-specific/linux/dietlibc/x86_64-lseek64.patch deleted file mode 100644 index 47187a310d2c..000000000000 --- a/pkgs/os-specific/linux/dietlibc/x86_64-lseek64.patch +++ /dev/null @@ -1,6 +0,0 @@ ---- dietlibc-0.27/x86_64/lseek64.S.x86_64-lseek64 2005-03-29 08:46:09.074515293 -0500 -+++ dietlibc-0.27/x86_64/lseek64.S 2005-03-29 08:46:09.074515293 -0500 -@@ -0,0 +1,3 @@ -+#include "syscalls.h" -+ -+syscall_weak(lseek,lseek64,__libc_lseek64) diff --git a/pkgs/os-specific/linux/e3cfsprogs/builder.sh b/pkgs/os-specific/linux/e3cfsprogs/builder.sh deleted file mode 100755 index c3352ec84ae3..000000000000 --- a/pkgs/os-specific/linux/e3cfsprogs/builder.sh +++ /dev/null @@ -1,14 +0,0 @@ -source $stdenv/setup - -tar -zxvf $src -cd e3cfsprogs*/ - -mkdir build; -cd build; -../configure --prefix=$out -make -#make check #almost all checks fail... maybe they have to be done on a ext3cow fs ??? -make install - -#we must rename according to the manual of e3cfprogs -cp misc/mke2fs $out/sbin/mkfs.ext3cow diff --git a/pkgs/os-specific/linux/e3cfsprogs/default.nix b/pkgs/os-specific/linux/e3cfsprogs/default.nix deleted file mode 100644 index ef25d59a9df5..000000000000 --- a/pkgs/os-specific/linux/e3cfsprogs/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{stdenv, fetchurl, gettext}: - -stdenv.mkDerivation { - name = "e3cfsprogs-1.39"; - builder = ./builder.sh; - - patches = [ ./e3cfsprogs-1.39_bin_links.patch ./e3cfsprogs-1.39_etc.patch ]; - - src = fetchurl { - url = http://ext3cow.com/e3cfsprogs/e3cfsprogs-1.39.tgz; - sha256 = "8dd3de546aeb1ae42fb05409aeb724a145fe9aa1dbe1115441c2297c9d48cf31"; - }; - - configureFlags ="--enable-dynamic-e2fsck --enable-elf-shlibs"; - buildInputs = [gettext]; - preInstall = "installFlagsArray=('LN=ln -s')"; - postInstall = "make install-libs"; -} - -#note that ext3cow requires the ext3cow kernel patch !!!! diff --git a/pkgs/os-specific/linux/e3cfsprogs/e3cfsprogs-1.39_bin_links.patch b/pkgs/os-specific/linux/e3cfsprogs/e3cfsprogs-1.39_bin_links.patch deleted file mode 100644 index cf8c819c97a4..000000000000 --- a/pkgs/os-specific/linux/e3cfsprogs/e3cfsprogs-1.39_bin_links.patch +++ /dev/null @@ -1,111 +0,0 @@ -diff -Naur e3cfsprogs-1.39/config/config.guess e3cfsprogs-1.39_mod/config/config.guess ---- e3cfsprogs-1.39/config/config.guess 2006-04-10 00:34:21.000000000 +0200 -+++ e3cfsprogs-1.39_mod/config/config.guess 2007-07-20 16:28:58.000000000 +0200 -@@ -319,7 +319,7 @@ - echo sparc-icl-nx6 - exit ;; - DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) -- case `/usr/bin/uname -p` in -+ case `uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; - sun4H:SunOS:5.*:*) -@@ -460,7 +460,7 @@ - exit ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures -- UNAME_PROCESSOR=`/usr/bin/uname -p` -+ UNAME_PROCESSOR=`uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ -@@ -1054,7 +1054,7 @@ - exit ;; - i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. -- case `/bin/uname -X | grep "^Machine"` in -+ case `uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; -@@ -1065,14 +1065,14 @@ - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` - echo ${UNAME_MACHINE}-pc-isc$UNAME_REL -- elif /bin/uname -X 2>/dev/null >/dev/null ; then -- UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` -- (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 -- (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ -+ elif uname -X 2>/dev/null >/dev/null ; then -+ UNAME_REL=`(uname -X|grep Release|sed -e 's/.*= //')` -+ (uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 -+ (uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 -- (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ -+ (uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 -- (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ -+ (uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL - else -@@ -1114,12 +1114,12 @@ - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` -- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -+ uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } -- /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ -+ uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) -- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -+ uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} -@@ -1471,8 +1471,8 @@ - uname -s = `(uname -s) 2>/dev/null || echo unknown` - uname -v = `(uname -v) 2>/dev/null || echo unknown` - --/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` --/bin/uname -X = `(/bin/uname -X) 2>/dev/null` -+uname -p = `(uname -p) 2>/dev/null` -+uname -X = `(uname -X) 2>/dev/null` - - hostinfo = `(hostinfo) 2>/dev/null` - /bin/universe = `(/bin/universe) 2>/dev/null` -diff -Naur e3cfsprogs-1.39/lib/blkid/test_probe.in e3cfsprogs-1.39_mod/lib/blkid/test_probe.in ---- e3cfsprogs-1.39/lib/blkid/test_probe.in 2005-09-10 20:08:42.000000000 +0200 -+++ e3cfsprogs-1.39_mod/lib/blkid/test_probe.in 2007-07-20 16:26:02.000000000 +0200 -@@ -21,7 +21,7 @@ - fi - bunzip2 < $SRCDIR/tests/$i.img.bz2 > /tmp/test.img.$$ - ./tst_probe /tmp/test.img.$$ > tests/$i.out -- /bin/rm -f /tmp/test.img.$$ tests/$i.ok tests/$i.failed -+ rm -f /tmp/test.img.$$ tests/$i.ok tests/$i.failed - cmp -s tests/$i.out $SRCDIR/tests/$i.results - if [ $? = 0 ]; then - echo ok -diff -Naur e3cfsprogs-1.39/tests/defaults/e_script e3cfsprogs-1.39_mod/tests/defaults/e_script ---- e3cfsprogs-1.39/tests/defaults/e_script 2005-09-06 11:40:14.000000000 +0200 -+++ e3cfsprogs-1.39_mod/tests/defaults/e_script 2007-07-20 16:26:26.000000000 +0200 -@@ -25,7 +25,7 @@ - elif [ "$class" = icount ]; then - TEST_PROG=$TEST_ICOUNT - else -- TEST_PROG=/bin/cat -+ TEST_PROG=cat - fi - - cat $SRCDIR/progs/test_data/$instance.setup $SRCDIR/progs/test_data/test.$class \ -diff -Naur e3cfsprogs-1.39/util/gcc-wall-cleanup e3cfsprogs-1.39_mod/util/gcc-wall-cleanup ---- e3cfsprogs-1.39/util/gcc-wall-cleanup 2005-09-06 11:40:15.000000000 +0200 -+++ e3cfsprogs-1.39_mod/util/gcc-wall-cleanup 2007-07-20 16:30:04.000000000 +0200 -@@ -1,4 +1,4 @@ --#!/bin/sed -f -+#!sed -f - # - # This script filters out gcc-wall crud that we're not interested in seeing. - # diff --git a/pkgs/os-specific/linux/e3cfsprogs/e3cfsprogs-1.39_etc.patch b/pkgs/os-specific/linux/e3cfsprogs/e3cfsprogs-1.39_etc.patch deleted file mode 100644 index 5997d431f4c6..000000000000 --- a/pkgs/os-specific/linux/e3cfsprogs/e3cfsprogs-1.39_etc.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur e3cfsprogs-1.39/misc/Makefile.in e3cfsprogs-1.39_path_mod/misc/Makefile.in ---- e3cfsprogs-1.39/misc/Makefile.in 2006-03-27 07:58:10.000000000 +0200 -+++ e3cfsprogs-1.39_path_mod/misc/Makefile.in 2007-07-20 16:45:04.000000000 +0200 -@@ -223,12 +223,12 @@ - @$(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8 - - installdirs: -- @echo " MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir)" -+ @echo " MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)" - @$(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \ - $(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \ - $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \ - $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \ -- $(DESTDIR)$(libdir) $(DESTDIR)/etc -+ $(DESTDIR)$(libdir) $(DESTDIR)$(root_sysconfdir)/etc - - install: all $(SMANPAGES) $(UMANPAGES) installdirs - @for i in $(SPROGS); do \ -@@ -291,7 +291,7 @@ - @if ! test -f $(DESTDIR)/etc/mke2fs.conf; then \ - echo " INSTALL_DATA /etc/mke2fs.conf"; \ - $(INSTALL_DATA) $(srcdir)/mke2fs.conf \ -- $(DESTDIR)/etc/mke2fs.conf; \ -+ $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; \ - fi - - install-strip: install diff --git a/pkgs/os-specific/linux/ifplugd/interface.patch b/pkgs/os-specific/linux/ifplugd/interface.patch deleted file mode 100644 index 9c2de464bbde..000000000000 --- a/pkgs/os-specific/linux/ifplugd/interface.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- src/interface.c 2004/12/19 00:08:01 114 -+++ src/interface.c 2006/03/07 13:15:11 133 -@@ -22,9 +22,9 @@ - #include <config.h> - #endif - -+#include <sys/types.h> - #include <linux/sockios.h> - #include <linux/if_ether.h> --#include <sys/types.h> - #include <sys/socket.h> - #include <sys/ioctl.h> - #include <linux/if.h> diff --git a/pkgs/os-specific/linux/kernel-headers-cross/builder.sh b/pkgs/os-specific/linux/kernel-headers-cross/builder.sh deleted file mode 100644 index 3bc4abc92331..000000000000 --- a/pkgs/os-specific/linux/kernel-headers-cross/builder.sh +++ /dev/null @@ -1,31 +0,0 @@ -source $stdenv/setup - - -buildPhase() { - make include/linux/version.h -} - - -installPhase() { - mkdir $out - mkdir $out/include - #cd $out/include - #ln -s asm-arm asm - if test $cross = "arm-linux"; then - arch=arm - elif test $cross = "mips-linux"; then - arch=mips - elif test $cross = "sparc-linux"; then - arch=sparc - elif test $cross = "powerpc-linux"; then - arch=ppc - elif test $cross = "ppc-linux"; then - arch=ppc - fi - make include/asm ARCH=$arch - cp -prvd include/linux include/asm include/asm-$arch include/asm-generic $out/include - echo -n > $out/include/linux/autoconf.h -} - - -genericBuild diff --git a/pkgs/os-specific/linux/kernel-headers-cross/default.nix b/pkgs/os-specific/linux/kernel-headers-cross/default.nix deleted file mode 100644 index e2d4dedf799a..000000000000 --- a/pkgs/os-specific/linux/kernel-headers-cross/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, cross}: - -assert stdenv.system == "i686-linux"; - -stdenv.mkDerivation { - name = "linux-headers-2.6.14.5"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://kernel/linux/kernel/v2.6/linux-2.6.14.5.tar.bz2; - md5 = "9f057e3bd31c50dc48553def01bc8037"; - }; - inherit cross; -} diff --git a/pkgs/os-specific/linux/pam_devperm/default.nix b/pkgs/os-specific/linux/pam_devperm/default.nix deleted file mode 100644 index 1e5a7095e047..000000000000 --- a/pkgs/os-specific/linux/pam_devperm/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{stdenv, fetchurl, pam}: - -stdenv.mkDerivation { - name = "pam_devperm-1.6"; - - src = fetchurl { - url = http://ftp.suse.com/pub/people/kukuk/pam/pam_devperm/pam_devperm-1.6.tar.bz2; - sha256 = "0rvndh6yvcgmjnkqxv24pjy3ayy4p8r29w25xscwjfzqmrdyfbpw"; - }; - - buildInputs = [pam]; -} diff --git a/pkgs/os-specific/linux/procps/default.nix b/pkgs/os-specific/linux/procps/default.nix deleted file mode 100644 index 9c894256413c..000000000000 --- a/pkgs/os-specific/linux/procps/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, ncurses }: - -stdenv.mkDerivation { - name = "procps-3.2.8"; - - src = fetchurl { - url = http://procps.sourceforge.net/procps-3.2.8.tar.gz; - sha256 = "0d8mki0q4yamnkk4533kx8mc0jd879573srxhg6r2fs3lkc6iv8i"; - }; - - patches = - [ ./makefile.patch - ./procps-build.patch - ./gnumake3.82.patch - ./linux-ver-init.patch - ]; - - buildInputs = [ ncurses ]; - - makeFlags = "DESTDIR=$(out)"; - - crossAttrs = { - CC = stdenv.cross.config + "-gcc"; - }; - - meta = { - homepage = http://procps.sourceforge.net/; - description = "Utilities that give information about processes using the /proc filesystem"; - }; -} diff --git a/pkgs/os-specific/linux/procps/gnumake3.82.patch b/pkgs/os-specific/linux/procps/gnumake3.82.patch deleted file mode 100644 index 2b1f28d4bce7..000000000000 --- a/pkgs/os-specific/linux/procps/gnumake3.82.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile -index 09fb3ed..59eba16 100644 ---- a/Makefile -+++ b/Makefile -@@ -174,7 +174,7 @@ INSTALL := $(BINFILES) $(MANFILES) - # want this rule first, use := on ALL, and ALL not filled in yet - all: do_all - ---include */module.mk -+-include proc/module.mk ps/module.mk - - do_all: $(ALL) - diff --git a/pkgs/os-specific/linux/procps/linux-ver-init.patch b/pkgs/os-specific/linux/procps/linux-ver-init.patch deleted file mode 100644 index 9f93784a1fd9..000000000000 --- a/pkgs/os-specific/linux/procps/linux-ver-init.patch +++ /dev/null @@ -1,23 +0,0 @@ -https://bugs.gentoo.org/303120 - -make sure the linux version constructor runs before the libproc constructor -since the latter uses variables setup by the former - -fix by Chris Coleman - -Index: proc/version.c -=================================================================== -RCS file: /cvsroot/procps/procps/proc/version.c,v -retrieving revision 1.7 -diff -u -p -r1.7 version.c ---- a/proc/version.c 9 Feb 2003 07:27:16 -0000 1.7 -+++ b/proc/version.c 14 Nov 2010 00:22:44 -0000 -@@ -33,7 +33,7 @@ void display_version(void) { - - int linux_version_code; - --static void init_Linux_version(void) __attribute__((constructor)); -+static void init_Linux_version(void) __attribute__((constructor(100))); - static void init_Linux_version(void) { - static struct utsname uts; - int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 3 */ diff --git a/pkgs/os-specific/linux/procps/makefile.patch b/pkgs/os-specific/linux/procps/makefile.patch deleted file mode 100644 index 20ff71ecdc15..000000000000 --- a/pkgs/os-specific/linux/procps/makefile.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -rc procps-orig/Makefile procps-3.2.4/Makefile -*** procps-orig/Makefile 2004-10-10 23:31:12.000000000 +0200 ---- procps-3.2.4/Makefile 2005-01-21 19:33:49.700437229 +0100 -*************** -*** 24,47 **** - ############ vars - - # so you can disable them or choose alternates -! ldconfig := ldconfig - ln_f := ln -f - ln_sf := ln -sf -! install := install -D --owner 0 --group 0 - - # Lame x86-64 /lib64 and /usr/lib64 abomination: - lib64 := lib$(shell [ -d /lib64 ] && echo 64) - -! usr/bin := $(DESTDIR)/usr/bin/ - bin := $(DESTDIR)/bin/ - sbin := $(DESTDIR)/sbin/ -! usr/proc/bin := $(DESTDIR)/usr/bin/ -! man1 := $(DESTDIR)/usr/share/man/man1/ -! man5 := $(DESTDIR)/usr/share/man/man5/ -! man8 := $(DESTDIR)/usr/share/man/man8/ -! lib := $(DESTDIR)/$(lib64)/ -! usr/lib := $(DESTDIR)/usr/$(lib64)/ -! usr/include := $(DESTDIR)/usr/include/ - - #SKIP := $(bin)kill $(man1)kill.1 - ---- 24,47 ---- - ############ vars - - # so you can disable them or choose alternates -! ldconfig := true - ln_f := ln -f - ln_sf := ln -sf -! install := install -D - - # Lame x86-64 /lib64 and /usr/lib64 abomination: - lib64 := lib$(shell [ -d /lib64 ] && echo 64) - -! usr/bin := $(DESTDIR)/bin/ - bin := $(DESTDIR)/bin/ - sbin := $(DESTDIR)/sbin/ -! usr/proc/bin := $(DESTDIR)/bin/ -! man1 := $(DESTDIR)/share/man/man1/ -! man5 := $(DESTDIR)/share/man/man5/ -! man8 := $(DESTDIR)/share/man/man8/ -! lib := $(DESTDIR)/lib/ -! usr/lib := $(DESTDIR)/lib/ -! usr/include := $(DESTDIR)/include/ - - #SKIP := $(bin)kill $(man1)kill.1 - -*************** -*** 71,77 **** - - # Preprocessor flags. - PKG_CPPFLAGS := -D_GNU_SOURCE -I proc -! CPPFLAGS := -I/usr/include/ncurses - ALL_CPPFLAGS := $(PKG_CPPFLAGS) $(CPPFLAGS) - - # Left out -Wconversion due to noise in glibc headers. ---- 71,77 ---- - - # Preprocessor flags. - PKG_CPPFLAGS := -D_GNU_SOURCE -I proc -! CPPFLAGS := - ALL_CPPFLAGS := $(PKG_CPPFLAGS) $(CPPFLAGS) - - # Left out -Wconversion due to noise in glibc headers. diff --git a/pkgs/os-specific/linux/procps/procps-build.patch b/pkgs/os-specific/linux/procps/procps-build.patch deleted file mode 100644 index 67141715bb6c..000000000000 --- a/pkgs/os-specific/linux/procps/procps-build.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -ruN procps-3.2.6/Makefile procps-3.2.6.new/Makefile ---- procps-3.2.6/Makefile 2005-10-30 07:27:04.000000000 +0100 -+++ procps-3.2.6.new/Makefile 2005-12-13 16:52:02.000000000 +0100 -@@ -43,7 +43,7 @@ - usr/lib := $(DESTDIR)/usr/$(lib64)/ - usr/include := $(DESTDIR)/usr/include/ - --#SKIP := $(bin)kill $(man1)kill.1 -+SKIP := $(bin)kill $(man1)kill.1 $(usr/bin)uptime $(man1)uptime.1 - - BINFILES := $(usr/bin)uptime $(usr/bin)tload $(usr/bin)free $(usr/bin)w \ - $(usr/bin)top $(usr/bin)vmstat $(usr/bin)watch $(usr/bin)skill \ -@@ -127,26 +127,26 @@ - # produce separate executables for ppc and ppc64, s390 and s390x, - # i386 and x86-64, mips and mips64, sparc and sparc64, and so on. - # Failure to do so will cause data corruption. --m64 := $(call check_gcc,-m64,$(call check_gcc,-mabi=64,)) --ALL_CFLAGS += $(m64) -+#m64 := $(call check_gcc,-m64,$(call check_gcc,-mabi=64,)) -+#ALL_CFLAGS += $(m64) - --ALL_CFLAGS += $(call check_gcc,-Wdeclaration-after-statement,) --ALL_CFLAGS += $(call check_gcc,-Wpadded,) --ALL_CFLAGS += $(call check_gcc,-Wstrict-aliasing,) -+#ALL_CFLAGS += $(call check_gcc,-Wdeclaration-after-statement,) -+#ALL_CFLAGS += $(call check_gcc,-Wpadded,) -+#ALL_CFLAGS += $(call check_gcc,-Wstrict-aliasing,) - - # Adding -fno-gcse might be good for those files which - # use computed goto. - #ALL_CFLAGS += $(call check_gcc,-fno-gcse,) - - # if not debugging, enable things that could confuse gdb --ifeq (,$(findstring -g,$(filter -g%,$(CFLAGS)))) --ALL_CFLAGS += $(call check_gcc,-fweb,) --ALL_CFLAGS += $(call check_gcc,-frename-registers,) --ALL_CFLAGS += $(call check_gcc,-fomit-frame-pointer,) --endif -+#ifeq (,$(findstring -g,$(filter -g%,$(CFLAGS)))) -+#ALL_CFLAGS += $(call check_gcc,-fweb,) -+#ALL_CFLAGS += $(call check_gcc,-frename-registers,) -+#ALL_CFLAGS += $(call check_gcc,-fomit-frame-pointer,) -+#endif - - # in case -O3 is enabled, avoid bloat --ALL_CFLAGS += $(call check_gcc,-fno-inline-functions,) -+#ALL_CFLAGS += $(call check_gcc,-fno-inline-functions,) - - endif - endif |