From 68d80ff094ef240baa1e7e58df0cb82820f63c93 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 27 Mar 2007 11:15:10 +0000 Subject: [PATCH] * Get rid of the old UML, move uml-utilities to os-specific/linux. svn path=/nixpkgs/trunk/; revision=8424 --- pkgs/misc/uml/builder.sh | 38 -- pkgs/misc/uml/config | 393 ------------------ pkgs/misc/uml/default.nix | 29 -- pkgs/misc/uml/no-aio.patch | 24 -- .../linux}/uml-utilities/builder.sh | 0 .../linux}/uml-utilities/default.nix | 0 pkgs/top-level/all-packages.nix | 23 +- 7 files changed, 9 insertions(+), 498 deletions(-) delete mode 100644 pkgs/misc/uml/builder.sh delete mode 100644 pkgs/misc/uml/config delete mode 100644 pkgs/misc/uml/default.nix delete mode 100644 pkgs/misc/uml/no-aio.patch rename pkgs/{misc => os-specific/linux}/uml-utilities/builder.sh (100%) rename pkgs/{misc => os-specific/linux}/uml-utilities/default.nix (100%) diff --git a/pkgs/misc/uml/builder.sh b/pkgs/misc/uml/builder.sh deleted file mode 100644 index 0d786586ef0..00000000000 --- a/pkgs/misc/uml/builder.sh +++ /dev/null @@ -1,38 +0,0 @@ -source $stdenv/setup - -# !!! hack -source $NIX_GCC/nix-support/add-flags.sh -export NIX_LDFLAGS - -postUnpack() { - unp() { - bunzip2 < $umlPatch > patch - } - unpackCmd=unp - unpackFile $umlPatch - patches="`pwd`/patch $noAioPatch" -} -postUnpack=postUnpack - -configurePhase() { - cp $config .config - yes | make oldconfig ARCH=um -} -configurePhase=configurePhase - -buildPhase() { - make linux ARCH=um - strip linux - make modules ARCH=um -} -buildPhase=buildPhase - -installPhase() { - mkdir $out - mkdir $out/bin - cp -p linux $out/bin - make modules_install INSTALL_MOD_PATH=$out ARCH=um DEPMOD=$modutils/sbin/depmod -} -installPhase=installPhase - -genericBuild diff --git a/pkgs/misc/uml/config b/pkgs/misc/uml/config deleted file mode 100644 index 37bf83b8690..00000000000 --- a/pkgs/misc/uml/config +++ /dev/null @@ -1,393 +0,0 @@ -# -# Automatically generated make config: don't edit -# -CONFIG_USERMODE=y -# CONFIG_ISA is not set -# CONFIG_SBUS is not set -# CONFIG_PCI is not set -CONFIG_UID16=y -CONFIG_RWSEM_XCHGADD_ALGORITHM=y - -# -# Code maturity level options -# -CONFIG_EXPERIMENTAL=y - -# -# General Setup -# -CONFIG_MODE_SKAS=y -CONFIG_MODE_TT=y -CONFIG_NET=y -CONFIG_SYSVIPC=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_SYSCTL=y -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 -# CONFIG_HOST_2G_2G is not set -# CONFIG_UML_SMP is not set -# CONFIG_SMP is not set -CONFIG_NEST_LEVEL=0 -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 -# -CONFIG_MODULES=y -CONFIG_KMOD=y - -# -# Character Devices -# -CONFIG_STDIO_CONSOLE=y -CONFIG_SSL=y -CONFIG_FD_CHAN=y -# CONFIG_NULL_CHAN is not set -CONFIG_PORT_CHAN=y -CONFIG_PTY_CHAN=y -CONFIG_TTY_CHAN=y -CONFIG_XTERM_CHAN=y -CONFIG_CON_ZERO_CHAN="fd:0,fd:1" -CONFIG_CON_CHAN="xterm" -CONFIG_SSL_CHAN="pty" -CONFIG_UNIX98_PTYS=y -CONFIG_UNIX98_PTY_COUNT=256 -# CONFIG_WATCHDOG is not set -# CONFIG_WATCHDOG_NOWAYOUT is not set -# CONFIG_SOFT_WATCHDOG is not set -# CONFIG_UML_WATCHDOG is not set -CONFIG_UML_SOUND=y -CONFIG_SOUND=y -CONFIG_HOSTAUDIO=y -# CONFIG_TTY_LOG is not set - -# -# Block Devices -# -CONFIG_BLK_DEV_UBD=y -# CONFIG_BLK_DEV_UBD_SYNC is not set -CONFIG_COW=y -CONFIG_COW_COMMON=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_NBD=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=4096 -CONFIG_BLK_DEV_INITRD=y -# CONFIG_MMAPPER is not set -CONFIG_NETDEVICES=y - -# -# Network Devices -# -CONFIG_UML_NET=y -CONFIG_UML_NET_ETHERTAP=y -CONFIG_UML_NET_TUNTAP=y -CONFIG_UML_NET_SLIP=y -# CONFIG_UML_NET_SLIRP is not set -CONFIG_UML_NET_DAEMON=y -CONFIG_UML_NET_MCAST=y -# CONFIG_UML_NET_PCAP is not set -CONFIG_DUMMY=y -# CONFIG_BONDING is not set -CONFIG_EQUALIZER=m -CONFIG_TUN=y -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -# CONFIG_PPP_FILTER is not set -# CONFIG_PPP_ASYNC is not set -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 -# CONFIG_SLIP_MODE_SLIP6 is not set - -# -# Networking options -# -CONFIG_PACKET=y -CONFIG_PACKET_MMAP=y -# CONFIG_NETLINK_DEV is not set -# CONFIG_NETFILTER is not set -# CONFIG_FILTER is not set -CONFIG_UNIX=y -CONFIG_INET=y -# CONFIG_IP_MULTICAST is not set -# CONFIG_IP_ADVANCED_ROUTER is not set -# CONFIG_IP_PNP is not set -# CONFIG_NET_IPIP is not set -# CONFIG_NET_IPGRE is not set -# CONFIG_ARPD is not set -# CONFIG_INET_ECN is not set -# CONFIG_SYN_COOKIES is not set -# CONFIG_IPV6 is not set -# CONFIG_KHTTPD is not set - -# -# SCTP Configuration (EXPERIMENTAL) -# -# CONFIG_IP_SCTP is not set -# CONFIG_ATM is not set -# CONFIG_VLAN_8021Q is not set - -# -# -# -# CONFIG_IPX is not set -# CONFIG_ATALK is not set - -# -# Appletalk devices -# -# CONFIG_DEV_APPLETALK is not set -# CONFIG_DECNET is not set -# CONFIG_BRIDGE is not set -# CONFIG_X25 is not set -# CONFIG_LAPB is not set -# CONFIG_LLC is not set -# CONFIG_NET_DIVERT is not set -# CONFIG_ECONET is not set -# CONFIG_WAN_ROUTER is not set -# CONFIG_NET_FASTROUTE is not set -# CONFIG_NET_HW_FLOWCONTROL is not set - -# -# QoS and/or fair queueing -# -# CONFIG_NET_SCHED is not set - -# -# Network testing -# -# CONFIG_NET_PKTGEN is not set - -# -# File systems -# -CONFIG_QUOTA=y -# CONFIG_QFMT_V2 is not set -CONFIG_AUTOFS_FS=m -CONFIG_AUTOFS4_FS=m -CONFIG_REISERFS_FS=m -# CONFIG_REISERFS_CHECK is not set -# CONFIG_REISERFS_PROC_INFO is not set -CONFIG_ADFS_FS=m -# CONFIG_ADFS_FS_RW is not set -CONFIG_AFFS_FS=m -# CONFIG_HFS_FS is not set -# CONFIG_HFSPLUS_FS is not set -# CONFIG_BEFS_FS is not set -# CONFIG_BEFS_DEBUG is not set -CONFIG_BFS_FS=m -CONFIG_EXT3_FS=y -CONFIG_JBD=y -# CONFIG_JBD_DEBUG is not set -CONFIG_FAT_FS=y -CONFIG_MSDOS_FS=y -CONFIG_UMSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_EFS_FS=m -# CONFIG_JFFS_FS is not set -# CONFIG_JFFS2_FS is not set -CONFIG_CRAMFS=m -CONFIG_TMPFS=y -CONFIG_RAMFS=y -CONFIG_ISO9660_FS=y -# CONFIG_JOLIET is not set -# CONFIG_ZISOFS is not set -# CONFIG_JFS_FS is not set -# CONFIG_JFS_DEBUG is not set -# CONFIG_JFS_STATISTICS is not set -CONFIG_MINIX_FS=m -CONFIG_VXFS_FS=m -# CONFIG_NTFS_FS is not set -# CONFIG_NTFS_RW is not set -CONFIG_HPFS_FS=m -CONFIG_PROC_FS=y -CONFIG_DEVFS_FS=y -CONFIG_DEVFS_MOUNT=y -# CONFIG_DEVFS_DEBUG is not set -CONFIG_DEVPTS_FS=y -CONFIG_QNX4FS_FS=m -# CONFIG_QNX4FS_RW is not set -CONFIG_ROMFS_FS=m -CONFIG_EXT2_FS=y -CONFIG_SYSV_FS=m -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 -# -# CONFIG_CODA_FS is not set -# CONFIG_INTERMEZZO_FS is not set -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -# CONFIG_NFS_DIRECTIO is not set -# CONFIG_ROOT_NFS is not set -CONFIG_NFSD=y -CONFIG_NFSD_V3=y -# CONFIG_NFSD_TCP is not set -CONFIG_SUNRPC=y -CONFIG_LOCKD=y -CONFIG_LOCKD_V4=y -# CONFIG_SMB_FS is not set -# CONFIG_NCP_FS is not set -# CONFIG_NCPFS_PACKET_SIGNING is not set -# CONFIG_NCPFS_IOCTL_LOCKING is not set -# CONFIG_NCPFS_STRONG is not set -# CONFIG_NCPFS_NFS_NS is not set -# CONFIG_NCPFS_OS2_NS is not set -# CONFIG_NCPFS_SMALLDOS is not set -# CONFIG_NCPFS_NLS is not set -# CONFIG_NCPFS_EXTRAS is not set -# CONFIG_ZISOFS_FS is not set - -# -# Partition Types -# -# CONFIG_PARTITION_ADVANCED is not set -CONFIG_MSDOS_PARTITION=y -# CONFIG_SMB_NLS is not set -CONFIG_NLS=y - -# -# Native Language Support -# -CONFIG_NLS_DEFAULT="iso8859-1" -# CONFIG_NLS_CODEPAGE_437 is not set -# CONFIG_NLS_CODEPAGE_737 is not set -# CONFIG_NLS_CODEPAGE_775 is not set -# CONFIG_NLS_CODEPAGE_850 is not set -# CONFIG_NLS_CODEPAGE_852 is not set -# CONFIG_NLS_CODEPAGE_855 is not set -# CONFIG_NLS_CODEPAGE_857 is not set -# CONFIG_NLS_CODEPAGE_860 is not set -# CONFIG_NLS_CODEPAGE_861 is not set -# CONFIG_NLS_CODEPAGE_862 is not set -# CONFIG_NLS_CODEPAGE_863 is not set -# CONFIG_NLS_CODEPAGE_864 is not set -# CONFIG_NLS_CODEPAGE_865 is not set -# CONFIG_NLS_CODEPAGE_866 is not set -# CONFIG_NLS_CODEPAGE_869 is not set -# CONFIG_NLS_CODEPAGE_936 is not set -# CONFIG_NLS_CODEPAGE_950 is not set -# CONFIG_NLS_CODEPAGE_932 is not set -# CONFIG_NLS_CODEPAGE_949 is not set -# CONFIG_NLS_CODEPAGE_874 is not set -# CONFIG_NLS_ISO8859_8 is not set -# CONFIG_NLS_CODEPAGE_1250 is not set -# CONFIG_NLS_CODEPAGE_1251 is not set -# CONFIG_NLS_ISO8859_1 is not set -# CONFIG_NLS_ISO8859_2 is not set -# CONFIG_NLS_ISO8859_3 is not set -# CONFIG_NLS_ISO8859_4 is not set -# CONFIG_NLS_ISO8859_5 is not set -# CONFIG_NLS_ISO8859_6 is not set -# CONFIG_NLS_ISO8859_7 is not set -# CONFIG_NLS_ISO8859_9 is not set -# CONFIG_NLS_ISO8859_13 is not set -# CONFIG_NLS_ISO8859_14 is not set -# CONFIG_NLS_ISO8859_15 is not set -# CONFIG_NLS_KOI8_R is not set -# CONFIG_NLS_KOI8_U is not set -# CONFIG_NLS_UTF8 is not set - -# -# SCSI support -# -CONFIG_SCSI=y - -# -# SCSI support type (disk, tape, CD-ROM) -# -# CONFIG_BLK_DEV_SD is not set -# CONFIG_CHR_DEV_ST is not set -# CONFIG_BLK_DEV_SR is not set -# CONFIG_CHR_DEV_SG is not set - -# -# Some SCSI devices (e.g. CD jukebox) support multiple LUNs -# -# CONFIG_SCSI_DEBUG_QUEUES is not set -# CONFIG_SCSI_MULTI_LUN is not set -# CONFIG_SCSI_CONSTANTS is not set -# CONFIG_SCSI_LOGGING is not set -CONFIG_SCSI_DEBUG=m - -# -# Multi-device support (RAID and LVM) -# -# CONFIG_MD is not set -# CONFIG_BLK_DEV_MD is not set -# CONFIG_MD_LINEAR is not set -# CONFIG_MD_RAID0 is not set -# CONFIG_MD_RAID1 is not set -# CONFIG_MD_RAID5 is not set -# CONFIG_MD_MULTIPATH is not set -# CONFIG_BLK_DEV_LVM is not set - -# -# Memory Technology Devices (MTD) -# -# CONFIG_MTD is not set - -# -# Library routines -# -# CONFIG_CRC32 is not set -CONFIG_ZLIB_INFLATE=m -CONFIG_ZLIB_DEFLATE=m - -# -# Cryptographic options -# -CONFIG_CRYPTO=n -CONFIG_CRYPTO_HMAC=n -CONFIG_CRYPTO_NULL=n -CONFIG_CRYPTO_MD4=n -CONFIG_CRYPTO_MD5=n -CONFIG_CRYPTO_SHA1=n -CONFIG_CRYPTO_SHA256=n -CONFIG_CRYPTO_SHA512=n -CONFIG_CRYPTO_DES=n -CONFIG_CRYPTO_BLOWFISH=n -CONFIG_CRYPTO_TWOFISH=n -CONFIG_CRYPTO_SERPENT=n -CONFIG_CRYPTO_AES=n -CONFIG_CRYPTO_CAST5=n -CONFIG_CRYPTO_CAST6=n -CONFIG_CRYPTO_TEA=n -CONFIG_CRYPTO_ARC4=n -CONFIG_CRYPTO_DEFLATE=n -CONFIG_CRYPTO_MICHAEL_MIC=n -CONFIG_CRYPTO_TEST=n - -# -# Kernel hacking -# -# CONFIG_DEBUG_SLAB is not set -# CONFIG_DEBUGSYM is not set -# CONFIG_PT_PROXY is not set -# CONFIG_GCOV is not set diff --git a/pkgs/misc/uml/default.nix b/pkgs/misc/uml/default.nix deleted file mode 100644 index 406eca809bd..00000000000 --- a/pkgs/misc/uml/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{stdenv, fetchurl, perl, m4, gcc, modutils}: - -assert perl != null && m4 != null; - -stdenv.mkDerivation { - name = "uml-2.4.27-1"; - builder = ./builder.sh; - src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/linux-2.4.27.tar.bz2; - md5 = "59a2e6fde1d110e2ffa20351ac8b4d9e"; - }; - umlPatch = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/uml-patch-2.4.27-1.bz2; - md5 = "63178bbd3a383a1005738f4628ff583e"; - }; - noAioPatch = ./no-aio.patch; -# hostfsPatch = ./hostfs.patch; -# hostfsAccessPatch = ./hostfs-access.patch; - config = ./config; - buildInputs = [perl m4]; - NIX_GCC = gcc; - - # Quick hack to get UML to build with the latest kernel headers, - # which don't export the macro `offsetof' anymore unless __KERNEL__ - # is set. - NIX_CFLAGS_COMPILE = "-Doffsetof(TYPE,MEMBER)=((size_t)&((TYPE*)0)->MEMBER)"; - - inherit modutils; -} diff --git a/pkgs/misc/uml/no-aio.patch b/pkgs/misc/uml/no-aio.patch deleted file mode 100644 index a5ce94be8cb..00000000000 --- a/pkgs/misc/uml/no-aio.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -rc linux-orig/arch/um/os-Linux/Makefile linux-2.4.24/arch/um/os-Linux/Makefile -*** linux-orig/arch/um/os-Linux/Makefile 2004-07-29 23:32:53.000000000 +0200 ---- linux-2.4.24/arch/um/os-Linux/Makefile 2004-07-29 23:33:15.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,14 ---- - - obj-y = aio.o file.o process.o time.o tty.o - -! HAVE_AIO_ABI = -! HAVE_AIO_LIBC = - CFLAGS_aio.o = $(HAVE_AIO_ABI) $(HAVE_AIO_LIBC) - - include $(TOPDIR)/Rules.make diff --git a/pkgs/misc/uml-utilities/builder.sh b/pkgs/os-specific/linux/uml-utilities/builder.sh similarity index 100% rename from pkgs/misc/uml-utilities/builder.sh rename to pkgs/os-specific/linux/uml-utilities/builder.sh diff --git a/pkgs/misc/uml-utilities/default.nix b/pkgs/os-specific/linux/uml-utilities/default.nix similarity index 100% rename from pkgs/misc/uml-utilities/default.nix rename to pkgs/os-specific/linux/uml-utilities/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 512150f0d43..4833f72f0da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2294,11 +2294,6 @@ rec { ]; }; - umlNew = import ../os-specific/linux/kernel/linux-2.6.20.nix { - inherit fetchurl stdenv perl mktemp module_init_tools; - userModeLinux = true; - }; - libselinux = import ../os-specific/linux/libselinux { inherit fetchurl stdenv libsepol; }; @@ -2448,6 +2443,15 @@ rec { inherit fetchurl stdenv; }; + uml = import ../os-specific/linux/kernel/linux-2.6.20.nix { + inherit fetchurl stdenv perl mktemp module_init_tools; + userModeLinux = true; + }; + + umlutilities = import ../os-specific/uml-utilities { + inherit fetchurl stdenv; + }; + upstart = import ../os-specific/linux/upstart { inherit fetchurl stdenv; }; @@ -3227,13 +3231,4 @@ rec { }; }; - uml = import ../misc/uml { - inherit fetchurl stdenv perl modutils m4; - gcc = gcc33; - }; - - umlutilities = import ../misc/uml-utilities { - inherit fetchurl stdenv; - }; - }