diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 15 | ||||
| -rw-r--r-- | config-i686 | 20 | ||||
| -rw-r--r-- | config-x86_64 | 52 | ||||
| -rw-r--r-- | modules.install | 2 |
5 files changed, 74 insertions, 27 deletions
@@ -1,6 +1,6 @@ pkgbase = linux-usermode pkgdesc = User mode Linux kernel and modules - pkgver = 4.1.5 + pkgver = 4.2.0 pkgrel = 1 url = http://user-mode-linux.sourceforge.net/ arch = i686 @@ -11,14 +11,12 @@ pkgbase = linux-usermode makedepends = vde2-static makedepends = vde2 depends = coreutils - source = http://www.kernel.org/pub/linux/kernel/v4.x/linux-4.1.tar.xz - source = http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.1.5.xz + source = http://www.kernel.org/pub/linux/kernel/v4.x/linux-4.2.tar.xz source = config-i686 source = config-x86_64 - md5sums = fe9dc0f6729f36400ea81aa41d614c37 - md5sums = 79d9a168b73d91544c15b3b77221528a - md5sums = 3f269b45d681772081d1ef7f5a5b2701 - md5sums = 87db1e4450352d472798b98996501e1a + md5sums = 3d5ea06d767e2f35c999eeadafc76523 + md5sums = 80abbe6afc9d3444381968eea4d6dd74 + md5sums = 3cc1ee484f8a619447d1f9e238e3392f pkgname = linux-usermode @@ -2,8 +2,8 @@ pkgname=linux-usermode true && pkgname=(linux-usermode linux-usermode-modules) pkgbase=linux-usermode _kernelname=-usermodelinux -_srcname=linux-4.1 -pkgver=4.1.5 +_srcname=linux-4.2 +pkgver=4.2.0 pkgrel=1 pkgdesc="User mode Linux kernel and modules" arch=('i686' 'x86_64') @@ -12,17 +12,16 @@ url="http://user-mode-linux.sourceforge.net/" depends=('coreutils') makedepends=('bc' 'inetutils' 'vde2-static' 'vde2') source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" - "http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz" +# "http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz" config-i686 config-x86_64) -md5sums=('fe9dc0f6729f36400ea81aa41d614c37' - '79d9a168b73d91544c15b3b77221528a' - '3f269b45d681772081d1ef7f5a5b2701' - '87db1e4450352d472798b98996501e1a') +md5sums=('3d5ea06d767e2f35c999eeadafc76523' + '80abbe6afc9d3444381968eea4d6dd74' + '3cc1ee484f8a619447d1f9e238e3392f') prepare() { cd "${srcdir}/${_srcname}" - patch -p1 -i "${srcdir}/patch-${pkgver}" +# patch -p1 -i "${srcdir}/patch-${pkgver}" } build() { diff --git a/config-i686 b/config-i686 index 4e3fc9715d09..8130fc10084d 100644 --- a/config-i686 +++ b/config-i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# User Mode Linux/x86 4.1.0 Kernel Configuration +# User Mode Linux/x86 4.2.0 Kernel Configuration # CONFIG_UML=y CONFIG_MMU=y @@ -329,6 +329,7 @@ CONFIG_GENERIC_CPU_DEVICES=y # # CONFIG_CONNECTOR is not set # CONFIG_MTD is not set +# CONFIG_OF is not set CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=y CONFIG_BLK_DEV_UBD=y @@ -400,6 +401,7 @@ CONFIG_NET_VENDOR_QUALCOMM=y # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set CONFIG_TUN=m +# CONFIG_TUN_VNET_CROSS_LE is not set # CONFIG_VETH is not set # CONFIG_NLMON is not set @@ -441,6 +443,7 @@ CONFIG_SLHC=m # CONFIG_WLAN=y # CONFIG_HOSTAP is not set +# CONFIG_WL_MEDIATEK is not set # CONFIG_WL_TI is not set # @@ -523,6 +526,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y # Microsoft Hyper-V guest support # # CONFIG_STAGING is not set +# CONFIG_CHROME_PLATFORMS is not set # # Generic IOMMU Pagetable Support @@ -544,6 +548,7 @@ CONFIG_IOMMU_SUPPORT=y # # Remoteproc drivers # +# CONFIG_SUNXI_SRAM is not set # CONFIG_SOC_TI is not set # @@ -668,6 +673,7 @@ CONFIG_WIRELESS=y # # CFG80211 needs to be enabled for MAC80211 # +CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 # CONFIG_WIMAX is not set # CONFIG_RFKILL is not set # CONFIG_NET_9P is not set @@ -914,6 +920,7 @@ CONFIG_CRYPTO=y # CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=m CONFIG_CRYPTO_AEAD2=y CONFIG_CRYPTO_BLKCIPHER=m CONFIG_CRYPTO_BLKCIPHER2=y @@ -939,13 +946,15 @@ CONFIG_CRYPTO_WORKQUEUE=y # # CONFIG_CRYPTO_CCM is not set # CONFIG_CRYPTO_GCM is not set -# CONFIG_CRYPTO_SEQIV is not set +# CONFIG_CRYPTO_CHACHA20POLY1305 is not set +CONFIG_CRYPTO_SEQIV=m +CONFIG_CRYPTO_ECHAINIV=m # # Block modes # CONFIG_CRYPTO_CBC=m -# CONFIG_CRYPTO_CTR is not set +CONFIG_CRYPTO_CTR=m CONFIG_CRYPTO_CTS=m CONFIG_CRYPTO_ECB=m # CONFIG_CRYPTO_LRW is not set @@ -967,6 +976,7 @@ CONFIG_CRYPTO_CRC32C=y # CONFIG_CRYPTO_CRC32 is not set CONFIG_CRYPTO_CRCT10DIF=y # CONFIG_CRYPTO_GHASH is not set +# CONFIG_CRYPTO_POLY1305 is not set CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=m # CONFIG_CRYPTO_MICHAEL_MIC is not set @@ -1008,6 +1018,7 @@ CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_DEFLATE is not set # CONFIG_CRYPTO_ZLIB is not set # CONFIG_CRYPTO_LZO is not set +# CONFIG_CRYPTO_842 is not set # CONFIG_CRYPTO_LZ4 is not set # CONFIG_CRYPTO_LZ4HC is not set @@ -1032,6 +1043,7 @@ CONFIG_BITREVERSE=y CONFIG_GENERIC_NET_UTILS=y CONFIG_GENERIC_FIND_FIRST_BIT=y CONFIG_GENERIC_IO=y +CONFIG_PERCPU_RWSEM=y # CONFIG_CRC_CCITT is not set CONFIG_CRC16=y CONFIG_CRC_T10DIF=y @@ -1115,6 +1127,7 @@ CONFIG_DEBUG_MEMORY_INIT=y CONFIG_PANIC_ON_OOPS_VALUE=0 CONFIG_PANIC_TIMEOUT=0 CONFIG_SCHED_DEBUG=y +# CONFIG_SCHED_INFO is not set # CONFIG_SCHEDSTATS is not set # CONFIG_SCHED_STACK_END_CHECK is not set # CONFIG_DEBUG_TIMEKEEPING is not set @@ -1146,6 +1159,7 @@ CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_TORTURE_TEST is not set # CONFIG_RCU_TORTURE_TEST is not set # CONFIG_RCU_TRACE is not set +# CONFIG_RCU_EQS_DEBUG is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_NOTIFIER_ERROR_INJECTION is not set # CONFIG_FAULT_INJECTION is not set diff --git a/config-x86_64 b/config-x86_64 index fb3aa5c30b7c..0455ee88e2aa 100644 --- a/config-x86_64 +++ b/config-x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# User Mode Linux/x86 4.1.0 Kernel Configuration +# User Mode Linux/x86 4.2.0 Kernel Configuration # CONFIG_UML=y CONFIG_MMU=y @@ -71,7 +71,6 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_BINFMT_MISC=m CONFIG_COREDUMP=y CONFIG_HOSTFS=y -# CONFIG_HPPFS is not set CONFIG_MCONSOLE=y CONFIG_MAGIC_SYSRQ=y CONFIG_KERNEL_STACK_ORDER=1 @@ -129,11 +128,11 @@ CONFIG_BSD_PROCESS_ACCT=y # RCU Subsystem # CONFIG_TINY_RCU=y +# CONFIG_RCU_EXPERT is not set CONFIG_SRCU=y # CONFIG_TASKS_RCU is not set # CONFIG_RCU_STALL_COMMON is not set # CONFIG_TREE_RCU_TRACE is not set -CONFIG_RCU_KTHREAD_PRIO=0 # CONFIG_RCU_EXPEDITE_BOOT is not set CONFIG_BUILD_BIN2C=y CONFIG_IKCONFIG=y @@ -301,6 +300,7 @@ CONFIG_GENERIC_CPU_DEVICES=y # # CONFIG_CONNECTOR is not set # CONFIG_MTD is not set +# CONFIG_OF is not set CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=y CONFIG_BLK_DEV_UBD=y @@ -340,14 +340,23 @@ CONFIG_BLK_DEV_NBD=m # # +# SCIF Bus Driver +# + +# # Intel MIC Host Driver # # # Intel MIC Card Driver # + +# +# SCIF Driver +# # CONFIG_ECHO is not set # CONFIG_CXL_BASE is not set +# CONFIG_CXL_KERNEL_API is not set # # SCSI device support @@ -370,6 +379,7 @@ CONFIG_DUMMY=m # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set CONFIG_TUN=m +# CONFIG_TUN_VNET_CROSS_LE is not set # CONFIG_VETH is not set # CONFIG_NLMON is not set @@ -384,12 +394,14 @@ CONFIG_TUN=m # CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set CONFIG_ETHERNET=y CONFIG_NET_VENDOR_ARC=y +CONFIG_NET_VENDOR_EZCHIP=y CONFIG_NET_VENDOR_INTEL=y CONFIG_NET_VENDOR_I825XX=y CONFIG_NET_VENDOR_MARVELL=y CONFIG_NET_VENDOR_NATSEMI=y CONFIG_NET_VENDOR_8390=y CONFIG_NET_VENDOR_QUALCOMM=y +CONFIG_NET_VENDOR_RENESAS=y CONFIG_NET_VENDOR_ROCKER=y CONFIG_NET_VENDOR_SAMSUNG=y CONFIG_NET_VENDOR_VIA=y @@ -414,6 +426,7 @@ CONFIG_SLHC=m # CONFIG_WLAN=y # CONFIG_HOSTAP is not set +# CONFIG_WL_MEDIATEK is not set # CONFIG_WL_TI is not set # @@ -485,6 +498,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y # Microsoft Hyper-V guest support # # CONFIG_STAGING is not set +# CONFIG_CHROME_PLATFORMS is not set # # Hardware Spinlock drivers @@ -512,6 +526,7 @@ CONFIG_IOMMU_SUPPORT=y # # SOC (System On Chip) specific Drivers # +# CONFIG_SUNXI_SRAM is not set # CONFIG_SOC_TI is not set # CONFIG_PM_DEVFREQ is not set # CONFIG_EXTCON is not set @@ -531,6 +546,7 @@ CONFIG_IOMMU_SUPPORT=y # Android # # CONFIG_ANDROID is not set +# CONFIG_LIBNVDIMM is not set CONFIG_NET=y # @@ -557,7 +573,7 @@ CONFIG_NET_IP_TUNNEL=y # CONFIG_NET_IPVTI is not set CONFIG_NET_UDP_TUNNEL=y CONFIG_NET_FOU=y -# CONFIG_GENEVE is not set +# CONFIG_GENEVE_CORE is not set # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set @@ -632,6 +648,7 @@ CONFIG_WIRELESS=y # # CFG80211 needs to be enabled for MAC80211 # +CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 # CONFIG_WIMAX is not set # CONFIG_RFKILL is not set # CONFIG_NET_9P is not set @@ -749,6 +766,7 @@ CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_PROC_SYSCTL=y CONFIG_PROC_PAGE_MONITOR=y +# CONFIG_PROC_CHILDREN is not set CONFIG_KERNFS=y CONFIG_SYSFS=y CONFIG_TMPFS=y @@ -878,6 +896,7 @@ CONFIG_CRYPTO=y # CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=m CONFIG_CRYPTO_AEAD2=y CONFIG_CRYPTO_BLKCIPHER=m CONFIG_CRYPTO_BLKCIPHER2=y @@ -885,13 +904,16 @@ CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_HASH2=y CONFIG_CRYPTO_RNG=m CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_RNG_DEFAULT=m CONFIG_CRYPTO_PCOMP2=y +CONFIG_CRYPTO_AKCIPHER2=y +# CONFIG_CRYPTO_RSA is not set CONFIG_CRYPTO_MANAGER=m CONFIG_CRYPTO_MANAGER2=y # CONFIG_CRYPTO_USER is not set CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y CONFIG_CRYPTO_GF128MUL=m -# CONFIG_CRYPTO_NULL is not set +CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_WORKQUEUE=y # CONFIG_CRYPTO_CRYPTD is not set CONFIG_CRYPTO_MCRYPTD=m @@ -903,13 +925,15 @@ CONFIG_CRYPTO_MCRYPTD=m # # CONFIG_CRYPTO_CCM is not set # CONFIG_CRYPTO_GCM is not set -# CONFIG_CRYPTO_SEQIV is not set +# CONFIG_CRYPTO_CHACHA20POLY1305 is not set +CONFIG_CRYPTO_SEQIV=m +CONFIG_CRYPTO_ECHAINIV=m # # Block modes # CONFIG_CRYPTO_CBC=m -# CONFIG_CRYPTO_CTR is not set +CONFIG_CRYPTO_CTR=m CONFIG_CRYPTO_CTS=m CONFIG_CRYPTO_ECB=m # CONFIG_CRYPTO_LRW is not set @@ -931,6 +955,7 @@ CONFIG_CRYPTO_CRC32C=y # CONFIG_CRYPTO_CRC32 is not set CONFIG_CRYPTO_CRCT10DIF=y # CONFIG_CRYPTO_GHASH is not set +# CONFIG_CRYPTO_POLY1305 is not set CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=m # CONFIG_CRYPTO_MICHAEL_MIC is not set @@ -960,6 +985,7 @@ CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_KHAZAD is not set # CONFIG_CRYPTO_SALSA20 is not set # CONFIG_CRYPTO_SALSA20_X86_64 is not set +# CONFIG_CRYPTO_CHACHA20 is not set # CONFIG_CRYPTO_SEED is not set # CONFIG_CRYPTO_SERPENT is not set # CONFIG_CRYPTO_TEA is not set @@ -972,6 +998,7 @@ CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_DEFLATE is not set # CONFIG_CRYPTO_ZLIB is not set # CONFIG_CRYPTO_LZO is not set +# CONFIG_CRYPTO_842 is not set # CONFIG_CRYPTO_LZ4 is not set # CONFIG_CRYPTO_LZ4HC is not set @@ -979,10 +1006,16 @@ CONFIG_CRYPTO_DES=m # Random Number Generation # CONFIG_CRYPTO_ANSI_CPRNG=m -# CONFIG_CRYPTO_DRBG_MENU is not set +CONFIG_CRYPTO_DRBG_MENU=m +CONFIG_CRYPTO_DRBG_HMAC=y +# CONFIG_CRYPTO_DRBG_HASH is not set +# CONFIG_CRYPTO_DRBG_CTR is not set +CONFIG_CRYPTO_DRBG=m +CONFIG_CRYPTO_JITTERENTROPY=m # CONFIG_CRYPTO_USER_API_HASH is not set # CONFIG_CRYPTO_USER_API_SKCIPHER is not set # CONFIG_CRYPTO_USER_API_RNG is not set +# CONFIG_CRYPTO_USER_API_AEAD is not set CONFIG_CRYPTO_HW=y # CONFIG_ASYMMETRIC_KEY_TYPE is not set # CONFIG_BINARY_PRINTF is not set @@ -996,6 +1029,7 @@ CONFIG_BITREVERSE=y CONFIG_GENERIC_NET_UTILS=y CONFIG_GENERIC_FIND_FIRST_BIT=y CONFIG_GENERIC_IO=y +CONFIG_PERCPU_RWSEM=y # CONFIG_CRC_CCITT is not set CONFIG_CRC16=y CONFIG_CRC_T10DIF=y @@ -1079,6 +1113,7 @@ CONFIG_DEBUG_MEMORY_INIT=y CONFIG_PANIC_ON_OOPS_VALUE=0 CONFIG_PANIC_TIMEOUT=0 CONFIG_SCHED_DEBUG=y +# CONFIG_SCHED_INFO is not set # CONFIG_SCHEDSTATS is not set # CONFIG_SCHED_STACK_END_CHECK is not set # CONFIG_DEBUG_TIMEKEEPING is not set @@ -1110,6 +1145,7 @@ CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_TORTURE_TEST is not set # CONFIG_RCU_TORTURE_TEST is not set # CONFIG_RCU_TRACE is not set +# CONFIG_RCU_EQS_DEBUG is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_NOTIFIER_ERROR_INJECTION is not set # CONFIG_FAULT_INJECTION is not set diff --git a/modules.install b/modules.install index 4cb4d4acd26c..9c122b8a4829 100644 --- a/modules.install +++ b/modules.install @@ -1,4 +1,4 @@ -KERNEL_VERSION=4.1.5-usermodelinux +KERNEL_VERSION=4.2.0-usermodelinux post_install() { echo ">>> Updating module dependencies. Please wait ..." |