ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 04:12:44 +03:00
Code Issues Projects Releases Wiki Activity

* UML 2.4.25.

Browse Source 
svn path=/nixpkgs/trunk/; revision=1197
This commit is contained in:
Eelco Dolstra 2004-07-29 20:20:59 +00:00
parent de387a0368
commit b63ec4b441
4 changed files with 50 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/misc/uml/builder.sh
View File

@ -10,7 +10,7 @@ postUnpack() {
}
unpackCmd=unp
unpackFile $umlPatch
patches=`pwd`/patch
patches="`pwd`/patch $noAioPatch"
}
postUnpack=postUnpack

23
pkgs/misc/uml/config
View File

@ -16,8 +16,7 @@ CONFIG_EXPERIMENTAL=y
#
# General Setup
#
# CONFIG_MODE_SKAS is not set
CONFIG_MODE_TT=y
CONFIG_MODE_SKAS=y
CONFIG_MODE_TT=y
CONFIG_NET=y
CONFIG_SYSVIPC=y
@ -27,6 +26,8 @@ CONFIG_BINFMT_AOUT=y
CONFIG_BINFMT_ELF=y
CONFIG_BINFMT_MISC=y
CONFIG_HOSTFS=y
CONFIG_HUMFS=y
CONFIG_EXTERNFS=y
# CONFIG_HPPFS is not set
CONFIG_MCONSOLE=y
CONFIG_MAGIC_SYSRQ=y
@ -38,6 +39,7 @@ CONFIG_KERNEL_HALF_GIGS=1
# CONFIG_HIGHMEM is not set
# CONFIG_PROC_MM is not set
CONFIG_KERNEL_STACK_ORDER=2
# CONFIG_UML_REAL_TIME_CLOCK is not set
#
# Loadable module support
@ -97,7 +99,7 @@ CONFIG_UML_NET_DAEMON=y
CONFIG_UML_NET_MCAST=y
# CONFIG_UML_NET_PCAP is not set
CONFIG_DUMMY=y
CONFIG_BONDING=m
CONFIG_BONDING=n
CONFIG_EQUALIZER=m
CONFIG_TUN=y
CONFIG_PPP=m
@ -108,6 +110,7 @@ CONFIG_PPP_SYNC_TTY=m
CONFIG_PPP_DEFLATE=m
CONFIG_PPP_BSDCOMP=m
CONFIG_PPPOE=m
# CONFIG_PPP_MPPE is not set
CONFIG_SLIP=m
# CONFIG_SLIP_COMPRESSED is not set
# CONFIG_SLIP_SMART is not set
@ -133,6 +136,12 @@ CONFIG_INET=y
# CONFIG_SYN_COOKIES is not set
# CONFIG_IPV6 is not set
# CONFIG_KHTTPD is not set
#
# SCTP Configuration (EXPERIMENTAL)
#
CONFIG_IPV6_SCTP__=y
# CONFIG_IP_SCTP is not set
# CONFIG_ATM is not set
# CONFIG_VLAN_8021Q is not set
@ -180,7 +189,7 @@ CONFIG_REISERFS_FS=m
CONFIG_ADFS_FS=m
# CONFIG_ADFS_FS_RW is not set
CONFIG_AFFS_FS=m
CONFIG_HFS_FS=m
CONFIG_HFS_FS=n
# CONFIG_HFSPLUS_FS is not set
# CONFIG_BEFS_FS is not set
# CONFIG_BEFS_DEBUG is not set
@ -223,6 +232,11 @@ CONFIG_UDF_FS=m
# CONFIG_UDF_RW is not set
CONFIG_UFS_FS=m
# CONFIG_UFS_FS_WRITE is not set
# CONFIG_XFS_FS is not set
# CONFIG_XFS_QUOTA is not set
# CONFIG_XFS_RT is not set
# CONFIG_XFS_TRACE is not set
# CONFIG_XFS_DEBUG is not set
#
# Network File Systems
@ -353,5 +367,4 @@ CONFIG_ZLIB_DEFLATE=m
# CONFIG_DEBUG_SLAB is not set
# CONFIG_DEBUGSYM is not set
# CONFIG_PT_PROXY is not set
# CONFIG_GPROF is not set
# CONFIG_GCOV is not set

11
pkgs/misc/uml/default.nix
View File

@ -3,16 +3,17 @@
assert patch != null && perl != null && m4 != null;
stdenv.mkDerivation {
name = "uml-2.4.22-3";
name = "uml-2.4.25-1";
builder = ./builder.sh;
src = fetchurl {
url = ftp://ftp.nl.kernel.org/pub/linux/kernel/v2.4/linux-2.4.22.tar.bz2;
md5 = "75dc85149b06ac9432106b8941eb9f7b";
url = ftp://ftp.nl.kernel.org/pub/linux/kernel/v2.4/linux-2.4.25.tar.bz2;
md5 = "5fc8e9f43fa44ac29ddf9a9980af57d8";
};
umlPatch = fetchurl {
url = http://uml-pub.ists.dartmouth.edu/uml/uml-patch-2.4.22-3.bz2;
md5 = "1ffa698fed37d14c6750ec841b7d9858";
url = http://heanet.dl.sourceforge.net/sourceforge/user-mode-linux/uml-patch-2.4.25-1.bz2;
md5 = "aacbb7b19ec7599119313a31328e1912";
};
noAioPatch = ./no-aio.patch;
config = ./config;
buildInputs = [patch perl m4];
}

25
pkgs/misc/uml/no-aio.patch Normal file
View File

@ -0,0 +1,25 @@
diff -rc linux-orig/arch/um/os-Linux/Makefile linux-2.4.25/arch/um/os-Linux/Makefile
*** linux-orig/arch/um/os-Linux/Makefile 2004-07-29 21:39:41.000000000 +0200
--- linux-2.4.25/arch/um/os-Linux/Makefile 2004-07-29 21:56:51.000000000 +0200
***************
*** 7,16 ****
obj-y = aio.o file.o process.o time.o tty.o
! HAVE_AIO_ABI = $(shell [ -e /usr/include/linux/aio_abi.h ] && \
! echo -DHAVE_AIO_ABI)
! HAVE_AIO_LIBC = $(shell objdump -T /lib/libc-*.so | grep io_submit && \
! echo -DHAVE_AIO_LIBC)
CFLAGS_aio.o = $(HAVE_AIO_ABI) $(HAVE_AIO_LIBC)
include $(TOPDIR)/Rules.make
--- 7,15 ----
obj-y = aio.o file.o process.o time.o tty.o
! # Removed impure check for AIO feature in glibc.
! HAVE_AIO_ABI =
! HAVE_AIO_LIBC =
CFLAGS_aio.o = $(HAVE_AIO_ABI) $(HAVE_AIO_LIBC)
include $(TOPDIR)/Rules.make