From bf1fece97a53061351cb5c5253deba4e6f9edbfc Mon Sep 17 00:00:00 2001 From: Kevin Mihelich <kevin@archlinuxarm.org> Date: Sun, 8 Jun 2014 21:31:55 +0000 Subject: [PATCH] core/linux-sun7i to 3.4.90-1, fixes #861 --- core/linux-sun7i/PKGBUILD | 16 ++++++++++------ core/linux-sun7i/config | 8 +++++--- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/core/linux-sun7i/PKGBUILD b/core/linux-sun7i/PKGBUILD index 799801c98..9acf171bb 100644 --- a/core/linux-sun7i/PKGBUILD +++ b/core/linux-sun7i/PKGBUILD @@ -4,22 +4,24 @@ buildarch=4 pkgbase=linux-sun7i -_commit=8ea347bcb4b4a5e50ec0343afac579e933ce8402 +_commit=e37d760b363888f3a65cd6455c99a75cac70a7b8 _srcname=linux-sunxi-${_commit} _kernelname=${pkgbase#linux} _desc="sun7i" -pkgver=3.4.79 -pkgrel=8 +pkgver=3.4.90 +pkgrel=1 arch=('armv7h') url="https://github.com/linux-sunxi/linux-sunxi/" license=('GPL2') -makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'uboot-mkimage') +makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'uboot-mkimage' 'git') options=('!strip') source=("https://github.com/linux-sunxi/linux-sunxi/archive/${_commit}.tar.gz" + 'http://archlinuxarm.org/builder/src/0001-cgroup-add-xattr-support-sunxi.patch' 'config' 'working-bcmdhd-driver.patch') -md5sums=('a6f18158a7f8dcb552547ea958c24c6b' - 'f2ee96871b22ed4d538ed89f6748d25b' +md5sums=('dbf73f4cb6b1399e73449f4e91bf5694' + '4aa5087e3396f3179b61ccd478e9e604' + '7efbd916ae63028c45013580e601a0d1' '07c260ca97572a830778362c7b744f9c') prepare() { @@ -30,6 +32,8 @@ prepare() { # patch bcmdhd driver with a working version patch -Np1 -i "${srcdir}/working-bcmdhd-driver.patch" + git apply ../0001-cgroup-add-xattr-support-sunxi.patch + # add pkgrel to extraversion sed -ri "s|^(EXTRAVERSION =)(.*)|\1 \2-${pkgrel}|" Makefile diff --git a/core/linux-sun7i/config b/core/linux-sun7i/config index b45f8a430..5bc90bc2f 100644 --- a/core/linux-sun7i/config +++ b/core/linux-sun7i/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.4.79-8 Kernel Configuration +# Linux/arm 3.4.90-1 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -108,6 +108,7 @@ CONFIG_IPC_NS=y CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y +CONFIG_UIDGID_STRICT_TYPE_CHECKS=y CONFIG_SCHED_AUTOGROUP=y CONFIG_MM_OWNER=y # CONFIG_SYSFS_DEPRECATED is not set @@ -520,8 +521,7 @@ CONFIG_NEON=y CONFIG_BINFMT_ELF=y CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y -CONFIG_HAVE_AOUT=y -CONFIG_BINFMT_AOUT=y +# CONFIG_HAVE_AOUT is not set CONFIG_BINFMT_MISC=y # @@ -1279,6 +1279,7 @@ CONFIG_MD_RAID456=m # CONFIG_MULTICORE_RAID456 is not set CONFIG_MD_MULTIPATH=m CONFIG_MD_FAULTY=m +CONFIG_BLK_DEV_DM_BUILTIN=y CONFIG_BLK_DEV_DM=m # CONFIG_DM_DEBUG is not set CONFIG_DM_BUFIO=m @@ -1844,6 +1845,7 @@ CONFIG_AW_AXP=y CONFIG_AW_AXP20=y CONFIG_AXP_CHARGEINIT=y CONFIG_AXP_CHGCHANGE=y +CONFIG_AXP_HWMON=y # CONFIG_POWER_SUPPLY_DEBUG is not set # CONFIG_AXP152 is not set # CONFIG_PDA_POWER is not set