From 4ea29e87169b072710e0348fcdeafcaba506f92f Mon Sep 17 00:00:00 2001 From: Sergej Pupykin Date: Thu, 2 Jun 2016 21:34:54 +0300 Subject: [PATCH] upd --- .SRCINFO | 16 ++++++++-------- PKGBUILD | 12 ++++++------ config-i686 | 34 ++++++++++++++++++++++++---------- config-x86_64 | 34 ++++++++++++++++++++++++---------- modules.install | 2 +- 5 files changed, 63 insertions(+), 35 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 964a139ab620..8687feca0a52 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Sat Apr 16 21:38:38 UTC 2016 +# Thu Jun 2 18:34:25 UTC 2016 pkgbase = linux-usermode pkgdesc = User mode Linux kernel and modules - pkgver = 4.5.1 + pkgver = 4.6.1 pkgrel = 1 url = http://user-mode-linux.sourceforge.net/ arch = i686 @@ -13,14 +13,14 @@ pkgbase = linux-usermode makedepends = vde2-static makedepends = vde2 depends = coreutils - source = http://www.kernel.org/pub/linux/kernel/v4.x/linux-4.5.tar.xz - source = http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.5.1.xz + source = http://www.kernel.org/pub/linux/kernel/v4.x/linux-4.6.tar.xz + source = http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.6.1.xz source = config-i686 source = config-x86_64 - md5sums = a60d48eee08ec0536d5efb17ca819aef - md5sums = 1df9ff0283c1732ebbf7c55f340a121b - md5sums = 6ea12a1081777445a7aa0b83943a2e2c - md5sums = 0b7d5565e655edc4a58a09eab21005bc + md5sums = d2927020e24a76da4ab482a8bc3e9ef3 + md5sums = e3479d9c8a0e8757c16eb03a4258587c + md5sums = 3dbaa1af7fddb8dda218b6001a87478a + md5sums = 5d2f5ff58dab428ff492b482d4565afc pkgname = linux-usermode diff --git a/PKGBUILD b/PKGBUILD index 973b673eacc6..76fdda34e0b1 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,8 +2,8 @@ pkgname=linux-usermode true && pkgname=(linux-usermode linux-usermode-modules) pkgbase=linux-usermode _kernelname=-usermodelinux -_srcname=linux-4.5 -pkgver=4.5.1 +_srcname=linux-4.6 +pkgver=4.6.1 pkgrel=1 pkgdesc="User mode Linux kernel and modules" arch=('i686' 'x86_64') @@ -15,10 +15,10 @@ 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" config-i686 config-x86_64) -md5sums=('a60d48eee08ec0536d5efb17ca819aef' - '1df9ff0283c1732ebbf7c55f340a121b' - '6ea12a1081777445a7aa0b83943a2e2c' - '0b7d5565e655edc4a58a09eab21005bc') +md5sums=('d2927020e24a76da4ab482a8bc3e9ef3' + 'e3479d9c8a0e8757c16eb03a4258587c' + '3dbaa1af7fddb8dda218b6001a87478a' + '5d2f5ff58dab428ff492b482d4565afc') prepare() { cd "${srcdir}/${_srcname}" diff --git a/config-i686 b/config-i686 index 970af0cd3e38..5af8914c71a3 100644 --- a/config-i686 +++ b/config-i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# User Mode Linux/x86 4.5.1 Kernel Configuration +# User Mode Linux/x86 4.6.1 Kernel Configuration # CONFIG_UML=y CONFIG_MMU=y @@ -119,7 +119,7 @@ CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y CONFIG_CROSS_MEMORY_ATTACH=y -# CONFIG_FHANDLE is not set +CONFIG_FHANDLE=y CONFIG_USELIB=y # CONFIG_AUDIT is not set CONFIG_HAVE_ARCH_AUDITSYSCALL=y @@ -201,6 +201,8 @@ CONFIG_SYSFS_SYSCALL=y # CONFIG_SYSCTL_SYSCALL is not set CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_ABSOLUTE_PERCPU is not set +CONFIG_KALLSYMS_BASE_RELATIVE=y CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y @@ -376,6 +378,10 @@ CONFIG_BLK_DEV_NBD=m # SCIF Bus Driver # +# +# VOP Bus Driver +# + # # Intel MIC Host Driver # @@ -391,6 +397,10 @@ CONFIG_BLK_DEV_NBD=m # # Intel MIC Coprocessor State Management (COSM) Drivers # + +# +# VOP Driver +# # CONFIG_ECHO is not set # CONFIG_CXL_BASE is not set # CONFIG_CXL_KERNEL_API is not set @@ -414,6 +424,7 @@ CONFIG_DUMMY=m # CONFIG_MACVLAN is not set # CONFIG_VXLAN is not set # CONFIG_GENEVE is not set +# CONFIG_MACSEC is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set @@ -438,6 +449,7 @@ CONFIG_NET_VENDOR_EZCHIP=y CONFIG_NET_VENDOR_INTEL=y CONFIG_NET_VENDOR_I825XX=y CONFIG_NET_VENDOR_MARVELL=y +# CONFIG_MVNETA_BM is not set CONFIG_NET_VENDOR_NATSEMI=y CONFIG_NET_VENDOR_NETRONOME=y CONFIG_NET_VENDOR_8390=y @@ -612,9 +624,6 @@ CONFIG_ARM_GIC_MAX_NR=1 # CONFIG_ANDROID is not set # CONFIG_NVMEM is not set # CONFIG_STM is not set -# CONFIG_STM_DUMMY is not set -# CONFIG_STM_SOURCE_CONSOLE is not set -# CONFIG_INTEL_TH is not set # # FPGA Configuration Support @@ -654,7 +663,6 @@ CONFIG_NET_FOU=y CONFIG_INET_XFRM_MODE_TRANSPORT=y CONFIG_INET_XFRM_MODE_TUNNEL=y CONFIG_INET_XFRM_MODE_BEET=y -# CONFIG_INET_LRO is not set CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y # CONFIG_INET_UDP_DIAG is not set @@ -695,7 +703,6 @@ CONFIG_BATMAN_ADV_BLA=y # CONFIG_BATMAN_ADV_MCAST is not set # CONFIG_OPENVSWITCH is not set # CONFIG_VSOCKETS is not set -# CONFIG_NETLINK_MMAP is not set # CONFIG_NETLINK_DIAG is not set # CONFIG_MPLS is not set # CONFIG_HSR is not set @@ -716,6 +723,7 @@ CONFIG_BQL=y # CONFIG_IRDA is not set # CONFIG_BT is not set # CONFIG_AF_RXRPC is not set +# CONFIG_AF_KCM is not set CONFIG_WIRELESS=y # CONFIG_CFG80211 is not set # CONFIG_LIB80211 is not set @@ -733,6 +741,9 @@ CONFIG_CEPH_LIB=m # CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set # CONFIG_NFC is not set # CONFIG_LWTUNNEL is not set +CONFIG_DST_CACHE=y +# CONFIG_NET_DEVLINK is not set +CONFIG_MAY_USE_DEVLINK=y # # UML Network Devices @@ -790,9 +801,10 @@ CONFIG_BTRFS_FS=m # CONFIG_F2FS_FS is not set # CONFIG_FS_DAX is not set CONFIG_FS_POSIX_ACL=y -CONFIG_EXPORTFS=m +CONFIG_EXPORTFS=y CONFIG_FILE_LOCKING=y CONFIG_MANDATORY_FILE_LOCKING=y +# CONFIG_FS_ENCRYPTION is not set CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y @@ -831,6 +843,7 @@ CONFIG_FAT_FS=m CONFIG_VFAT_FS=m CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_FAT_DEFAULT_UTF8 is not set # CONFIG_NTFS_FS is not set # @@ -849,6 +862,7 @@ CONFIG_TMPFS=y # CONFIG_HUGETLB_PAGE is not set # CONFIG_CONFIGFS_FS is not set CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ORANGEFS_FS is not set # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set # CONFIG_ECRYPT_FS is not set @@ -979,7 +993,6 @@ 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 @@ -1072,7 +1085,6 @@ CONFIG_CRYPTO_DES=m # Compression # # 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 @@ -1179,6 +1191,7 @@ CONFIG_DEBUG_KERNEL=y # # CONFIG_PAGE_EXTENSION is not set # CONFIG_DEBUG_PAGEALLOC is not set +# CONFIG_PAGE_POISONING is not set # CONFIG_DEBUG_OBJECTS is not set # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_STACK_USAGE is not set @@ -1248,6 +1261,7 @@ CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_TEST_STRING_HELPERS is not set # CONFIG_TEST_KSTRTOX is not set # CONFIG_TEST_PRINTF is not set +# CONFIG_TEST_BITMAP is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_LKM is not set # CONFIG_TEST_USER_COPY is not set diff --git a/config-x86_64 b/config-x86_64 index 9a3e36e322e3..3c9bd0b82e01 100644 --- a/config-x86_64 +++ b/config-x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# User Mode Linux/x86 4.5.1 Kernel Configuration +# User Mode Linux/x86 4.6.1 Kernel Configuration # CONFIG_UML=y CONFIG_MMU=y @@ -95,7 +95,7 @@ CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y CONFIG_CROSS_MEMORY_ATTACH=y -# CONFIG_FHANDLE is not set +CONFIG_FHANDLE=y CONFIG_USELIB=y # CONFIG_AUDIT is not set CONFIG_HAVE_ARCH_AUDITSYSCALL=y @@ -177,6 +177,8 @@ CONFIG_SYSFS_SYSCALL=y # CONFIG_SYSCTL_SYSCALL is not set CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_ABSOLUTE_PERCPU is not set +CONFIG_KALLSYMS_BASE_RELATIVE=y CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y @@ -348,6 +350,10 @@ CONFIG_BLK_DEV_NBD=m # SCIF Bus Driver # +# +# VOP Bus Driver +# + # # Intel MIC Host Driver # @@ -363,6 +369,10 @@ CONFIG_BLK_DEV_NBD=m # # Intel MIC Coprocessor State Management (COSM) Drivers # + +# +# VOP Driver +# # CONFIG_ECHO is not set # CONFIG_CXL_BASE is not set # CONFIG_CXL_KERNEL_API is not set @@ -386,6 +396,7 @@ CONFIG_DUMMY=m # CONFIG_MACVLAN is not set # CONFIG_VXLAN is not set # CONFIG_GENEVE is not set +# CONFIG_MACSEC is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set @@ -410,6 +421,7 @@ CONFIG_NET_VENDOR_EZCHIP=y CONFIG_NET_VENDOR_INTEL=y CONFIG_NET_VENDOR_I825XX=y CONFIG_NET_VENDOR_MARVELL=y +# CONFIG_MVNETA_BM is not set CONFIG_NET_VENDOR_NATSEMI=y CONFIG_NET_VENDOR_NETRONOME=y CONFIG_NET_VENDOR_8390=y @@ -584,9 +596,6 @@ CONFIG_ARM_GIC_MAX_NR=1 # CONFIG_LIBNVDIMM is not set # CONFIG_NVMEM is not set # CONFIG_STM is not set -# CONFIG_STM_DUMMY is not set -# CONFIG_STM_SOURCE_CONSOLE is not set -# CONFIG_INTEL_TH is not set # # FPGA Configuration Support @@ -626,7 +635,6 @@ CONFIG_NET_FOU=y CONFIG_INET_XFRM_MODE_TRANSPORT=y CONFIG_INET_XFRM_MODE_TUNNEL=y CONFIG_INET_XFRM_MODE_BEET=y -# CONFIG_INET_LRO is not set CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y # CONFIG_INET_UDP_DIAG is not set @@ -667,7 +675,6 @@ CONFIG_BATMAN_ADV_BLA=y # CONFIG_BATMAN_ADV_MCAST is not set # CONFIG_OPENVSWITCH is not set # CONFIG_VSOCKETS is not set -# CONFIG_NETLINK_MMAP is not set # CONFIG_NETLINK_DIAG is not set # CONFIG_MPLS is not set # CONFIG_HSR is not set @@ -688,6 +695,7 @@ CONFIG_BQL=y # CONFIG_IRDA is not set # CONFIG_BT is not set # CONFIG_AF_RXRPC is not set +# CONFIG_AF_KCM is not set CONFIG_WIRELESS=y # CONFIG_CFG80211 is not set # CONFIG_LIB80211 is not set @@ -705,6 +713,9 @@ CONFIG_CEPH_LIB=m # CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set # CONFIG_NFC is not set # CONFIG_LWTUNNEL is not set +CONFIG_DST_CACHE=y +# CONFIG_NET_DEVLINK is not set +CONFIG_MAY_USE_DEVLINK=y # # UML Network Devices @@ -762,9 +773,10 @@ CONFIG_BTRFS_FS=m # CONFIG_F2FS_FS is not set # CONFIG_FS_DAX is not set CONFIG_FS_POSIX_ACL=y -CONFIG_EXPORTFS=m +CONFIG_EXPORTFS=y CONFIG_FILE_LOCKING=y CONFIG_MANDATORY_FILE_LOCKING=y +# CONFIG_FS_ENCRYPTION is not set CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y @@ -803,6 +815,7 @@ CONFIG_FAT_FS=m CONFIG_VFAT_FS=m CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_FAT_DEFAULT_UTF8 is not set # CONFIG_NTFS_FS is not set # @@ -821,6 +834,7 @@ CONFIG_TMPFS=y # CONFIG_HUGETLB_PAGE is not set # CONFIG_CONFIGFS_FS is not set CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ORANGEFS_FS is not set # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set # CONFIG_ECRYPT_FS is not set @@ -951,7 +965,6 @@ 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 @@ -1044,7 +1057,6 @@ CONFIG_CRYPTO_DES=m # Compression # # 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 @@ -1151,6 +1163,7 @@ CONFIG_DEBUG_KERNEL=y # # CONFIG_PAGE_EXTENSION is not set # CONFIG_DEBUG_PAGEALLOC is not set +# CONFIG_PAGE_POISONING is not set # CONFIG_DEBUG_OBJECTS is not set # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_STACK_USAGE is not set @@ -1220,6 +1233,7 @@ CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_TEST_STRING_HELPERS is not set # CONFIG_TEST_KSTRTOX is not set # CONFIG_TEST_PRINTF is not set +# CONFIG_TEST_BITMAP is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_LKM is not set # CONFIG_TEST_USER_COPY is not set diff --git a/modules.install b/modules.install index 841253f8da39..7772a89ae12e 100644 --- a/modules.install +++ b/modules.install @@ -1,4 +1,4 @@ -KERNEL_VERSION=4.5.1-usermodelinux +KERNEL_VERSION=4.6.1-usermodelinux post_install() { echo ">>> Updating module dependencies. Please wait ..."