diff --git a/core/linux-sun5i/PKGBUILD b/core/linux-sun5i/PKGBUILD index 246d5f361..9f9922b7f 100644 --- a/core/linux-sun5i/PKGBUILD +++ b/core/linux-sun5i/PKGBUILD @@ -6,7 +6,7 @@ buildarch=4 _mach=sun5i _github_user=linux-sunxi _github_repo=linux-sunxi -_github_commitID=89a5378dd5ef60c1d3fba0aa96cc543dfe65266c +_github_commitID=b38d613b40a87a8238e97f1bd58de87d9d781c18 pkgbase=linux-${_mach} pkgname=("linux-${_mach}" "linux-headers-${_mach}") # pkgname=linux-custom # Build kernel with a different name @@ -22,10 +22,9 @@ options=('!strip') source=('config' 'change-default-console-loglevel.patch' "linux.tar.gz::https://github.com/${_github_user}/${_github_repo}/tarball/${_github_commitID}") -md5sums=('2fef4542718375e870f5f782191948b8' +md5sums=('3c637bc9075d4c9e9db6232f4883571b' '9d3c56a4b999c8bfbd4018089a62f662' - '2950b29bf222bb521b6aa21170da95f7') - + '613691bd886623247c250d4398a434e0') build() { cd ${srcdir} # the github-commit-tarball issue results in this, rename it sanely @@ -212,29 +211,29 @@ package_linux-headers-sun5i() { # add dvb headers for external modules # in reference to: # http://bugs.archlinux.org/task/9912 - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core" - cp drivers/media/dvb/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core/" +# mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core" +# cp drivers/media/dvb/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core/" # and... # http://bugs.archlinux.org/task/11194 - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/" - cp include/config/dvb/*.h "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/" +# mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/" +# cp include/config/dvb/*.h "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/" # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new # in reference to: # http://bugs.archlinux.org/task/13146 - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" - cp drivers/media/dvb/frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" - cp drivers/media/video/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" +# mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" +# cp drivers/media/dvb/frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" +# cp drivers/media/video/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" # add dvb headers # in reference to: # http://bugs.archlinux.org/task/20402 - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb" - cp drivers/media/dvb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb/" - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends" - cp drivers/media/dvb/frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners" - cp drivers/media/common/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners/" +# mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb" +# cp drivers/media/dvb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb/" +# mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends" +# cp drivers/media/dvb/frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" +# mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners" +# cp drivers/media/common/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners/" # copy in Kconfig files for i in `find . -name "Kconfig*"`; do diff --git a/core/linux-sun5i/config b/core/linux-sun5i/config index 399159418..526a21e5a 100644 --- a/core/linux-sun5i/config +++ b/core/linux-sun5i/config @@ -276,7 +276,7 @@ CONFIG_ARCH_SUN5I=y # CONFIG_SW_DEBUG_UART=1 # CONFIG_SUNXI_IGNORE_ATAG_MEM is not set -CONFIG_SUNXI_MALI_RESERVED_MEM=y +# CONFIG_SUNXI_MALI_RESERVED_MEM is not set CONFIG_MACH_SUN5I=y # @@ -1047,7 +1047,7 @@ CONFIG_PA_CONFIG=y # # CONFIG_DRM is not set # CONFIG_ION is not set -CONFIG_MALI=m +# CONFIG_MALI is not set CONFIG_MALI400=m # CONFIG_MALI400_DEBUG is not set # CONFIG_MALI400_GPU_UTILIZATION is not set @@ -1084,7 +1084,7 @@ CONFIG_FB_MODE_HELPERS=y # CONFIG_LYCHEE_FB_SUN5I=y CONFIG_FB_SUNXI=y -CONFIG_FB_SUNXI_RESERVED_MEM=y +# CONFIG_FB_SUNXI_RESERVED_MEM is not set CONFIG_FB_SUNXI_UMP=y CONFIG_LYCHEE_LCD_SUN5I=y CONFIG_FB_SUNXI_LCD=y diff --git a/core/linux-sun5i/linux-sun5i.install b/core/linux-sun5i/linux-sun5i.install index 64e3a2be5..cb7224838 100644 --- a/core/linux-sun5i/linux-sun5i.install +++ b/core/linux-sun5i/linux-sun5i.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-sun5i -KERNEL_VERSION=3.0.57-1-ARCH +KERNEL_VERSION=3.0.57-1 post_install () { # updating module dependencies