mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-02-16 23:57:11 +00:00
core/linux-kirkwood-dt to 3.15-1
This commit is contained in:
moonman
parent
7320f491da
commit
4548ef0cb3
6 changed files with 563 additions and 7511 deletions
|
|
@ -7,12 +7,10 @@ buildarch=2
|
|||
pkgbase=linux-kirkwood-dt
|
||||
_kernelname=${pkgbase#linux}
|
||||
_desc="Marvell Kirkwood DT"
|
||||
pkgver=3.12.8
|
||||
pkgrel=3
|
||||
cryptover=1.6
|
||||
bfqver=v6r2
|
||||
uksmver="0.1.2.2"
|
||||
uksmname="v3.12"
|
||||
pkgver=3.15
|
||||
pkgrel=1
|
||||
cryptodev_commit=57b5544de80db85c8955499831fdaa30829db77a
|
||||
bfqver=v7r4
|
||||
|
||||
arch=('arm')
|
||||
url="http://www.kernel.org/"
|
||||
|
|
@ -21,41 +19,29 @@ makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage' 'kmod' 'inetutils' 'bc' 'git'
|
|||
options=('!strip')
|
||||
|
||||
source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${pkgver}.tar.xz"
|
||||
'archlinuxarm.patch'
|
||||
'config'
|
||||
'archlinuxarm.patch'
|
||||
'mach-types::http://www.arm.linux.org.uk/developer/machines/download.php'
|
||||
'change-default-console-loglevel.patch'
|
||||
'usb-add-reset-resume-quirk-for-several-webcams.patch'
|
||||
"git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs${pkgver%.*}"
|
||||
"http://download.gna.org/cryptodev-linux/cryptodev-linux-${cryptover}.tar.gz"
|
||||
"http://kerneldedup.org/download/uksm/${uksmver}/uksm-${uksmver}-for-${uksmname}.patch"
|
||||
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${pkgver%.*}.0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${pkgver%.*}.patch"
|
||||
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${pkgver%.*}.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${pkgver%.*}.patch"
|
||||
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${pkgver%.*}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${pkgver%.*}.0.patch"
|
||||
'aufs-sources-3.12.7-mmap-aufs3.patch')
|
||||
"git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs3.x-rcN"
|
||||
# "git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs${pkgver:0:4}"
|
||||
"https://github.com/cryptodev-linux/cryptodev-linux/archive/${cryptodev_commit}.tar.gz"
|
||||
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${pkgver:0:4}.0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${pkgver:0:4}.patch"
|
||||
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${pkgver:0:4}.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${pkgver:0:4}.patch"
|
||||
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${pkgver:0:4}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${pkgver:0:4}.0.patch")
|
||||
|
||||
md5sums=('bacfc23a07a6fee0d271a4b062862445'
|
||||
'a4580de76f17c7eb8fce9189ed0c414e'
|
||||
'a7a10c814fad35eced1cbe6e767ebfcb'
|
||||
md5sums=('97ca1625bb40368dc41b9a7971549071'
|
||||
'a1620004e1444b41041404d2c56428b6'
|
||||
'e319a8e1a596a39a8951fc6454664b15'
|
||||
'SKIP'
|
||||
'65d5a4f313310bb2a732d022d51ea7e7'
|
||||
'9b5a265440abf57d2052838f31486a3a'
|
||||
'SKIP'
|
||||
'eade38998313c25fd7934719cdf8a2ea'
|
||||
'57cbf7fa8220461f8a052ea0eb9af779'
|
||||
'2d39966d14fdad1e05679232f97fdb3c'
|
||||
'2965641038a5aae263722b1ba16b971b'
|
||||
'9a55951ee4c3741b61e2e159631b5cf2'
|
||||
'2dd9dae61c1d0eacda41a17bd13e7f7f')
|
||||
'a59f78f0a34cfe321921265246a7b725'
|
||||
'7789bef14c7eb81ac5ab8a54e378878f'
|
||||
'b5ca74d065ebac9ff225bb257ffa2281'
|
||||
'f69d29121f9ea26ba84924e9355894fe')
|
||||
|
||||
prepare() {
|
||||
|
||||
#Remove after this fix is in the tree
|
||||
msg2 "Fixing aufs3 for kernel >=3.12.7"
|
||||
cd "${srcdir}/aufs3-standalone"
|
||||
patch -p1 -i ../aufs-sources-3.12.7-mmap-aufs3.patch
|
||||
#Evomer
|
||||
|
||||
cd "${srcdir}/linux-${pkgver}"
|
||||
|
||||
msg2 "Copying aufs3 patches into the kernel source tree"
|
||||
|
|
@ -79,13 +65,10 @@ msg2 "Add Arch Linux ARM patch for ARMv5te plug computers, mach-types"
|
|||
patch -Np1 -i "${srcdir}/archlinuxarm.patch"
|
||||
cp "${srcdir}/mach-types" arch/arm/tools
|
||||
|
||||
msg2 "Add UKSM patch"
|
||||
patch -Np1 -i "${srcdir}/uksm-${uksmver}-for-${uksmname}.patch"
|
||||
|
||||
msg2 "Add BFQ patches"
|
||||
patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${pkgver%.*}.patch"
|
||||
patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${pkgver%.*}.patch"
|
||||
patch -Np1 -i "${srcdir}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${pkgver%.*}.0.patch"
|
||||
patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${pkgver:0:4}.patch"
|
||||
patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${pkgver:0:4}.patch"
|
||||
patch -Np1 -i "${srcdir}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${pkgver:0:4}.0.patch"
|
||||
|
||||
cat "${srcdir}/config" > ./.config
|
||||
|
||||
|
|
@ -116,27 +99,26 @@ build() {
|
|||
####################
|
||||
# stop here
|
||||
# this is useful to configure the kernel
|
||||
# msg "Stopping build"
|
||||
# return 1
|
||||
#msg "Stopping build"
|
||||
#return 1
|
||||
####################
|
||||
|
||||
#yes "" | make config
|
||||
|
||||
msg "Building!"
|
||||
make ${MAKEFLAGS} zImage modules
|
||||
make dtbs
|
||||
make ${MAKEFLAGS} zImage modules dtbs
|
||||
|
||||
msg "Building cryptodev module"
|
||||
cd "${srcdir}/cryptodev-linux-${cryptover}"
|
||||
cd "${srcdir}/cryptodev-linux-${cryptodev_commit}"
|
||||
make KERNEL_DIR="${srcdir}/linux-${pkgver}"
|
||||
}
|
||||
|
||||
_package() {
|
||||
pkgdesc="The Linux Kernel and modules - ${_desc}"
|
||||
depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7' 'uboot-mkimage' 'uboot-env')
|
||||
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' 'cryptodev_friendly')
|
||||
conflicts=('linux-kirkwood' 'linux' 'linux-olinuxino')
|
||||
conflicts=('linux-kirkwood-dt' 'linux' 'linux-olinuxino')
|
||||
install=${pkgname}.install
|
||||
|
||||
cd "${srcdir}/linux-${pkgver}"
|
||||
|
|
@ -152,13 +134,7 @@ _package() {
|
|||
mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot/dtbs}
|
||||
make INSTALL_MOD_PATH="${pkgdir}" modules_install
|
||||
cp arch/$KARCH/boot/zImage "${pkgdir}/boot/zImage"
|
||||
cp arch/$KARCH/boot/dts/*.dtb "${pkgdir}/boot/dtbs/."
|
||||
cp arch/$KARCH/boot/dts/skeleton.dtsi "${pkgdir}/boot/dtbs/."
|
||||
cp arch/$KARCH/boot/dts/kirkwood*.dts "${pkgdir}/boot/dtbs/."
|
||||
cp arch/$KARCH/boot/dts/kirkwood*.dtsi "${pkgdir}/boot/dtbs/."
|
||||
|
||||
mkdir -p "${pkgdir}"/usr/local/sbin
|
||||
cp scripts/dtc/dtc "${pkgdir}/usr/local/sbin/."
|
||||
cp arch/$KARCH/boot/dts/*.dtb "${pkgdir}/boot/dtbs"
|
||||
|
||||
# set correct depmod command for install
|
||||
sed \
|
||||
|
|
@ -179,7 +155,7 @@ _package() {
|
|||
echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}-${_kernelname:-ARCH}/version"
|
||||
|
||||
# install cryptodev module
|
||||
cd "${srcdir}/cryptodev-linux-${cryptover}"
|
||||
cd "${srcdir}/cryptodev-linux-${cryptodev_commit}"
|
||||
make -C "${srcdir}/linux-${pkgver}" INSTALL_MOD_PATH="${pkgdir}" SUBDIRS=`pwd` modules_install
|
||||
|
||||
cd "${srcdir}/linux-${pkgver}"
|
||||
|
|
@ -195,8 +171,8 @@ _package() {
|
|||
_package-headers() {
|
||||
pkgdesc="Header files and scripts for building modules for linux kernel - ${_desc}"
|
||||
provides=('linux-headers=${pkgver}')
|
||||
conflicts=('linux-headers-kirkwood' 'linux-headers' 'linux-headers-olinuxino')
|
||||
replaces=('linux-headers-kirkwood-dt')
|
||||
conflicts=('linux-headers-kirkwood-dt' 'linux-headers' 'linux-headers-olinuxino')
|
||||
replaces=('linux-headers-kirkwood')
|
||||
|
||||
install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
|
||||
|
||||
|
|
@ -247,7 +223,7 @@ _package-headers() {
|
|||
cp -a drivers/media/pci/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}"
|
||||
done
|
||||
# usb
|
||||
for i in cpia2 em28xx pwc sn9c102; do
|
||||
for i in cpia2 em28xx pwc; do
|
||||
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}"
|
||||
cp -a drivers/media/usb/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}"
|
||||
done
|
||||
|
|
@ -332,7 +308,7 @@ _package-headers() {
|
|||
rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,x86,xtensa}
|
||||
|
||||
# install cryptodev header
|
||||
cd "${srcdir}/cryptodev-linux-${cryptover}"
|
||||
cd "${srcdir}/cryptodev-linux-${cryptodev_commit}"
|
||||
install -D crypto/cryptodev.h "${pkgdir}/usr/src/linux-${_kernver}/crypto/cryptodev.h"
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,17 +1,3 @@
|
|||
diff -ruN a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
|
||||
--- a/arch/arm/plat-orion/common.c 2013-11-03 16:41:51.000000000 -0700
|
||||
+++ b/arch/arm/plat-orion/common.c 2013-11-08 01:39:48.788011812 -0700
|
||||
@@ -256,7 +256,9 @@
|
||||
/*****************************************************************************
|
||||
* GE00
|
||||
****************************************************************************/
|
||||
-struct mv643xx_eth_shared_platform_data orion_ge00_shared_data;
|
||||
+struct mv643xx_eth_shared_platform_data orion_ge00_shared_data = {
|
||||
+ .tx_csum_limit = 1600,
|
||||
+};
|
||||
|
||||
static struct resource orion_ge00_shared_resources[] = {
|
||||
{
|
||||
diff -ruN a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
|
||||
--- a/drivers/ata/sata_mv.c 2013-11-03 16:41:51.000000000 -0700
|
||||
+++ b/drivers/ata/sata_mv.c 2013-11-08 01:39:48.868014917 -0700
|
||||
|
|
|
|||
|
|
@ -1,38 +0,0 @@
|
|||
aufs3-mmap.patch | 17 ++++++-----------
|
||||
1 file changed, 6 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/aufs3-mmap.patch b/aufs3-mmap.patch
|
||||
index acebfa8..8682a6d 100644
|
||||
--- a/aufs3-mmap.patch
|
||||
+++ b/aufs3-mmap.patch
|
||||
@@ -215,24 +215,19 @@ index ae4846f..3f890ee 100644
|
||||
if (page->mapping != inode->i_mapping) {
|
||||
unlock_page(page);
|
||||
diff --git a/mm/fremap.c b/mm/fremap.c
|
||||
-index 5bff081..246a9c7 100644
|
||||
+index bbc4d66..7deee2c 100644
|
||||
--- a/mm/fremap.c
|
||||
+++ b/mm/fremap.c
|
||||
-@@ -207,11 +207,12 @@ get_write_lock:
|
||||
- */
|
||||
- if (mapping_cap_account_dirty(mapping)) {
|
||||
- unsigned long addr;
|
||||
-- struct file *file = get_file(vma->vm_file);
|
||||
-+ struct file *file = vma->vm_file;
|
||||
+@@ -211,7 +211,9 @@ get_write_lock:
|
||||
+ /* mmap_region may free vma; grab the info now */
|
||||
+ vm_flags = vma->vm_flags;
|
||||
|
||||
+ vma_get_file(vma);
|
||||
- addr = mmap_region(file, start, size,
|
||||
- vma->vm_flags, pgoff);
|
||||
-- fput(file);
|
||||
+ addr = mmap_region(file, start, size, vm_flags, pgoff);
|
||||
+ vma_fput(vma);
|
||||
+ fput(file);
|
||||
if (IS_ERR_VALUE(addr)) {
|
||||
err = addr;
|
||||
- } else {
|
||||
diff --git a/mm/madvise.c b/mm/madvise.c
|
||||
index 539eeb9..5e700b1 100644
|
||||
--- a/mm/madvise.c
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -2,7 +2,7 @@
|
|||
# arg 2: the old package version
|
||||
|
||||
KERNEL_NAME=-kirkwood-dt
|
||||
KERNEL_VERSION=3.12.8-1-ARCH
|
||||
KERNEL_VERSION=3.15.0-1-ARCH
|
||||
|
||||
post_install () {
|
||||
# updating module dependencies
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue