diff --git a/core/linux-armv5-rc/PKGBUILD b/core/linux-armv5-rc/PKGBUILD index 31ea77db6..1eac1a2e0 100644 --- a/core/linux-armv5-rc/PKGBUILD +++ b/core/linux-armv5-rc/PKGBUILD @@ -4,7 +4,7 @@ buildarch=2 _rcver=4.1 -_rcrel=1 +_rcrel=2 pkgbase=linux-armv5-rc _srcname=linux-4.$((${_rcver##*.}-1)) @@ -19,7 +19,6 @@ makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git') options=('!strip') source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" "https://www.kernel.org/pub/linux/kernel/v4.x/testing/patch-${_rcver}-rc${_rcrel}.xz" - "git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs3.x-rcN" '0001-Added-ASoC-driver-for-i.MX233-s-builtin-ADC-DAC-code.patch' '0002-ARM-dts-imx23-olinuxino-enable-mxs-builtin-audio.patch' '0003-imx23-I2C-fixes.patch' @@ -27,14 +26,13 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" '0005-at91-ariag25-updates.patch' 'config') md5sums=('a86916bd12798220da9eb4a1eec3616d' - '7178b5adbaac914f1aa81757295f32c0' - 'SKIP' + '1af1ca2f20db7ebc2a94a786fb6f8e86' '4425a61f4850823509c4c308bf98a85e' '5d8b0f650d70f7603ce385a11c73a7f9' '0a604a9981434bddb98045169645c516' 'bd8b8485d4084247565f3a877eeb73e0' '6c3aee91d74e45dd8ff0787a99949890' - '7c2b83c6e861fdb4208618699dc7506f') + 'bb9f3cb5b02ae37b589d9109590095b4') prepare() { cd "${srcdir}/${_srcname}" @@ -49,17 +47,6 @@ prepare() { git apply ../0004-Added-DTS-with-mxs-builtin-entries-for-testing-the-a.patch git apply ../0005-at91-ariag25-updates.patch - # AUFS patches - #cp -ru "${srcdir}/aufs3-standalone/Documentation" . - #cp -ru "${srcdir}/aufs3-standalone/fs" . - #cp -ru "${srcdir}/aufs3-standalone/include/uapi/linux/aufs_type.h" ./include/linux - #cp -ru "${srcdir}/aufs3-standalone/include/uapi/linux/aufs_type.h" ./include/uapi/linux - - #git apply ../aufs3-standalone/aufs3-kbuild.patch - #git apply ../aufs3-standalone/aufs3-base.patch - #git apply ../aufs3-standalone/aufs3-mmap.patch - #git apply ../aufs3-standalone/aufs3-standalone.patch - cat "${srcdir}/config" > ./.config # add pkgrel to extraversion @@ -103,7 +90,7 @@ _package() { pkgdesc="The Linux Kernel and modules - ${_desc}" depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') optdepends=('crda: to set the correct wireless channels of your country') - provides=('kernel26' 'linux=${pkgver}' 'aufs_friendly') + provides=('kernel26' 'linux=${pkgver}') conflicts=('linux') install=${pkgname}.install diff --git a/core/linux-armv5-rc/config b/core/linux-armv5-rc/config index f71a5bea6..3bdaeb54a 100644 --- a/core/linux-armv5-rc/config +++ b/core/linux-armv5-rc/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.1.0-rc1-1 Kernel Configuration +# Linux/arm 4.1.0-rc2-1 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -4377,7 +4377,6 @@ CONFIG_MV_XOR=y CONFIG_MXS_DMA=y # CONFIG_FSL_EDMA is not set # CONFIG_NBPFAXI_DMA is not set -# CONFIG_XGENE_DMA is not set CONFIG_DMA_ENGINE=y CONFIG_DMA_OF=y @@ -4874,7 +4873,8 @@ CONFIG_EXT4_FS=y CONFIG_EXT4_USE_FOR_EXT23=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y -# CONFIG_EXT4_FS_ENCRYPTION is not set +CONFIG_EXT4_ENCRYPTION=y +CONFIG_EXT4_FS_ENCRYPTION=y # CONFIG_EXT4_DEBUG is not set CONFIG_JBD2=y # CONFIG_JBD2_DEBUG is not set @@ -5330,7 +5330,7 @@ CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" CONFIG_KEYS=y # CONFIG_PERSISTENT_KEYRINGS is not set # CONFIG_BIG_KEYS is not set -# CONFIG_ENCRYPTED_KEYS is not set +CONFIG_ENCRYPTED_KEYS=y # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITY=y CONFIG_SECURITYFS=y @@ -5376,7 +5376,7 @@ CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER2=y CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y -CONFIG_CRYPTO_GF128MUL=m +CONFIG_CRYPTO_GF128MUL=y CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_WORKQUEUE=y # CONFIG_CRYPTO_CRYPTD is not set @@ -5400,7 +5400,7 @@ CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_ECB=y # CONFIG_CRYPTO_LRW is not set # CONFIG_CRYPTO_PCBC is not set -CONFIG_CRYPTO_XTS=m +CONFIG_CRYPTO_XTS=y # # Hash modes