Merge branch 'master' of github.com:archlinuxarm/PKGBUILDs

This commit is contained in:
Jason Plum 2015-11-02 11:58:04 -05:00
commit da36f3cf84
63 changed files with 2011 additions and 715 deletions

View file

@ -1,7 +1,7 @@
From f5fde76f3bf5e15c3599823f45e5a24dac04a4a6 Mon Sep 17 00:00:00 2001
From 71e4b550ede1e546640056b38d0e93b9d0b20bc3 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 13 Jun 2015 19:37:54 -0600
Subject: [PATCH] arietta dtb name fix
Subject: [PATCH 1/2] arietta dtb name fix
This sets the dtb name based on RAM size.
@ -28,5 +28,5 @@ index 97851eb..eb3bf4a 100644
}
--
2.4.1
2.6.1

View file

@ -0,0 +1,25 @@
From a198443121aa446161d04d04b669218f58f7b7e6 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Mon, 19 Oct 2015 19:04:18 -0600
Subject: [PATCH 2/2] fix for gcc 5
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 11062f0..d0d73d4 100644
--- a/Makefile
+++ b/Makefile
@@ -214,7 +214,7 @@ GC_SECTIONS=--gc-sections
NOSTDINC_FLAGS=-nostdinc -isystem $(shell $(CC) -print-file-name=include)
CPPFLAGS=$(NOSTDINC_FLAGS) -ffunction-sections -g -Os -Wall \
- -fno-stack-protector -fno-common \
+ -fno-stack-protector -fno-common -fgnu89-inline \
-I$(INCL) -Iinclude -Ifs/include \
-DAT91BOOTSTRAP_VERSION=\"$(VERSION)$(REV)$(SCMINFO)\" -DCOMPILE_TIME="\"$(DATE)\""
--
2.6.1

View file

@ -12,9 +12,11 @@ url="https://github.com/tanzilli/at91bootstrap"
makedepends=('git' 'bc')
license=('GPL')
source=("git+https://github.com/tanzilli/at91bootstrap.git"
'0001-arietta-dtb-name-fix.patch')
'0001-arietta-dtb-name-fix.patch'
'0002-fix-for-gcc-5.patch')
md5sums=('SKIP'
'f330724c9bc8836985e954c22324646e')
'48707263a58bfaf566641bbcf080fdea'
'b6e82a87eda88cc63f1df3965e9e544f')
pkgver() {
cd at91bootstrap
@ -27,6 +29,7 @@ prepare() {
cd at91bootstrap
git apply ../0001-arietta-dtb-name-fix.patch
git apply ../0002-fix-for-gcc-5.patch
}
build() {

View file

@ -3,11 +3,11 @@
buildarch=4
pkgname=ec-utils
pkgver=r4029.ed3f712
pkgver=r4648.49d4254
pkgrel=1
pkgdesc="Chromium OS Embedded Controller utilities"
arch=('armv7h')
makedepends=('git')
makedepends=('git' 'inetutils')
license=('custom:chromiumos')
source=("git+https://chromium.googlesource.com/chromiumos/platform/ec")
md5sums=('SKIP')

View file

@ -3,13 +3,13 @@
buildarch=4
pkgname=gst-imx
pkgver=0.11.1.r10.gb94ea3c
pkgver=0.11.1.r17.gdbf46cc
pkgrel=1
pkgdesc="GStreamer plugins for i.MX platforms"
arch=('armv7h')
license=('LGPL')
url="https://github.com/Freescale/gstreamer-imx"
depends=('gst-plugins-base-libs' 'libfslvpuwrap' 'gpu-viv-bin-mx6q-fb')
depends=('gst-plugins-base-libs' 'gst-plugins-bad' 'libfslvpuwrap' 'gpu-viv-bin-mx6q-fb')
makedepends=('python2' 'linux-headers-imx6-fsl' 'git')
source=('git+https://github.com/Freescale/gstreamer-imx.git')
md5sums=('SKIP')

View file

@ -6,9 +6,9 @@ pkgname=('raspberrypi-firmware'
'raspberrypi-firmware-bootloader-x'
'raspberrypi-firmware-tools'
'raspberrypi-firmware-examples')
pkgver=20151023
pkgver=20151028
pkgrel=1
_commit=4047fe26797884cedf53bc8671d19e7f6f9f59d5
_commit=7f01b12b0f4e9893bb79dd6abdce5f6f7ed54e6c
pkgdesc="Firmware files for Raspberry Pi"
arch=('any')
url="https://github.com/raspberrypi/firmware"
@ -16,7 +16,7 @@ makedepends=('git')
license=('custom')
options=(!strip)
source=("https://github.com/raspberrypi/firmware/archive/${_commit}.tar.gz")
md5sums=('041d96de5fb242f39ae04493fd94e8be')
md5sums=('3213ee79546b7de52a87d17a40288e8e')
package_raspberrypi-firmware() {
depends=('raspberrypi-firmware-bootloader'

View file

@ -1,6 +1,6 @@
From 303685d289f55de059290a7b2a60416523bcbe58 Mon Sep 17 00:00:00 2001
From 2db7b7cd826260180268077b7f22e7380d9b3390 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Mon, 8 Jun 2015 19:18:43 -0600
Date: Sat, 31 Oct 2015 10:05:29 -0600
Subject: [PATCH] arch linux arm modifications
Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
@ -9,11 +9,11 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
1 file changed, 60 insertions(+), 74 deletions(-)
diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h
index e377fea..16ae29a 100644
index 529f73b..3b57a8a 100644
--- a/include/configs/mx23_olinuxino.h
+++ b/include/configs/mx23_olinuxino.h
@@ -26,6 +26,17 @@
#define CONFIG_CMD_NET
@@ -24,6 +24,17 @@
#define CONFIG_CMD_MMC
#define CONFIG_CMD_USB
+/* Arch Linux ARM extras */
@ -30,7 +30,7 @@ index e377fea..16ae29a 100644
/* Memory configuration */
#define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */
#define PHYS_SDRAM_1 0x40000000 /* Base address */
@@ -66,92 +77,67 @@
@@ -64,92 +75,67 @@
#endif
/* Booting Linux */
@ -173,5 +173,5 @@ index e377fea..16ae29a 100644
/* The rest of the configuration is shared */
#include <configs/mxs.h>
--
2.4.2
2.6.1

View file

@ -6,7 +6,7 @@ buildarch=2
pkgname=uboot-olinuxino
pkgdesc="U-Boot for i.MX233-OLinuXino"
pkgver=2015.04
pkgver=2015.10
pkgrel=1
arch=('arm')
license=('GPL')
@ -16,8 +16,8 @@ options=('!strip')
source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
'0001-arch-linux-arm-modifications.patch'
'uEnv.txt')
md5sums=('570bdc2c47270c2a98ca60ff6c5c74cd'
'b68e3fdda72067a403edd7a9c9e9421f'
md5sums=('7c203b0fc3390a122d8e8b75f147eac5'
'6b5f319d0b043e223629d001579c3a2e'
'd41d8cd98f00b204e9800998ecf8427e')
prepare() {

View file

@ -1,15 +1,15 @@
From 80bcddf384ff200c677d47926f9159f7a555bd44 Mon Sep 17 00:00:00 2001
From 2d409f8b850b526091cc35889de9509dba32e362 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 22 Nov 2014 22:55:40 -0700
Subject: [PATCH] arch linux arm modifications
Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
---
include/configs/ti_omap4_common.h | 95 +++++++++++++++++++++------------------
1 file changed, 52 insertions(+), 43 deletions(-)
include/configs/ti_omap4_common.h | 87 ++++++++++++++++++++++-----------------
1 file changed, 49 insertions(+), 38 deletions(-)
diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
index 1c93aab..e8b6c90 100644
index 1cd7dae..12c5f69 100644
--- a/include/configs/ti_omap4_common.h
+++ b/include/configs/ti_omap4_common.h
@@ -46,7 +46,6 @@
@ -20,40 +20,25 @@ index 1c93aab..e8b6c90 100644
#ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
#define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION
#define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
@@ -82,6 +81,12 @@
#undef CONFIG_CMD_NET
#undef CONFIG_CMD_NFS
@@ -78,6 +77,9 @@
#define CONFIG_USB_TTY 1
#define CONFIG_SYS_CONSOLE_IS_IN_ENV 1
+/* Arch Linux ARM extras */
+#define CONFIG_IDENT_STRING " Arch Linux ARM"
+#define CONFIG_SUPPORT_RAW_INITRD
+#define CONFIG_CMD_PART
+#define CONFIG_PARTITION_UUIDS
+
/*
* Environment setup
*/
@@ -89,32 +94,57 @@
DEFAULT_LINUX_BOOT_ENV \
"console=ttyO2,115200n8\0" \
@@ -88,23 +90,53 @@
"fdtfile=undefined\0" \
- "bootpart=0:2\0" \
+ "bootpart=0:1\0" \
"bootpart=0:2\0" \
"bootdir=/boot\0" \
+ "fdtdir=/boot/dtbs\0" \
"bootfile=zImage\0" \
+ "rdfile=initramfs-linux.img\0" \
"usbtty=cdc_acm\0" \
"vram=16M\0" \
"mmcdev=0\0" \
- "mmcroot=/dev/mmcblk0p2 rw\0" \
- "mmcrootfstype=ext3 rootwait\0" \
+ "optargs=\0" \
+ "mmcroot=/dev/mmcblk0p1 rw rootwait\0" \
"mmcargs=setenv bootargs console=${console} " \
"vram=${vram} " \
- "root=${mmcroot} " \
- "rootfstype=${mmcrootfstype}\0" \
- "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \
- "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
- "source ${loadaddr}\0" \
@ -63,11 +48,14 @@ index 1c93aab..e8b6c90 100644
- "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
- "loaduimage=load mmc ${mmcdev} ${loadaddr} uImage\0" \
- "mmcboot=echo Booting from mmc${mmcdev} ...; " \
- "run mmcargs; " \
- "run args_mmc; " \
- "bootz ${loadaddr} - ${fdtaddr}\0" \
- "uimageboot=echo Booting from mmc${mmcdev} ...; " \
- "run mmcargs; " \
- "run args_mmc; " \
- "bootm ${loadaddr}\0" \
+ "optargs=\0" \
+ "mmcargs=setenv bootargs console=${console} " \
+ "vram=${vram} " \
+ "root=${root} " \
+ "${optargs}\0" \
+ "loadimage=load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
@ -110,7 +98,7 @@ index 1c93aab..e8b6c90 100644
"findfdt="\
"if test $board_name = sdp4430; then " \
"setenv fdtfile omap4-sdp.dtb; fi; " \
@@ -127,32 +157,11 @@
@@ -117,32 +149,11 @@
"if test $board_name = duovero; then " \
"setenv fdtfile omap4-duovero-parlor.dtb; fi;" \
"if test $fdtfile = undefined; then " \
@ -146,5 +134,5 @@ index 1c93aab..e8b6c90 100644
/*
* Defines for SPL
--
2.4.2
2.6.1

View file

@ -4,7 +4,7 @@
buildarch=4
pkgname=uboot-pandaboard
pkgver=2015.04
pkgver=2015.10
pkgrel=1
pkgdesc="U-Boot for Pandaboard and Pandaboard ES"
arch=('armv7h')
@ -15,8 +15,8 @@ install=${pkgname}.install
source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
'0001-arch-linux-arm-modifications.patch'
'uEnv.txt')
md5sums=('570bdc2c47270c2a98ca60ff6c5c74cd'
'6a4060a6cef75dd47b841c7a46a866e8'
md5sums=('7c203b0fc3390a122d8e8b75f147eac5'
'49f3466b86722425598ee3ef42146115'
'86004660f2912861a040e335c9c0e85b')
prepare() {

View file

@ -1,4 +1,4 @@
From 7e2c115b770bd73b84f8a48d33ce32cb9fe50740 Mon Sep 17 00:00:00 2001
From 6b2f5de6ad3b427b3149d142b74d0667e5fbe8cb Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 2 Jan 2015 20:16:57 -0700
Subject: [PATCH] arch linux arm modifications
@ -9,10 +9,10 @@ Subject: [PATCH] arch linux arm modifications
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h
index 8237239..2477edf 100644
index 9d1de55..b75c454 100644
--- a/include/config_distro_defaults.h
+++ b/include/config_distro_defaults.h
@@ -59,4 +59,7 @@
@@ -67,4 +67,7 @@
#define CONFIG_SUPPORT_RAW_INITRD
#define CONFIG_SYS_HUSH_PARSER
@ -21,18 +21,18 @@ index 8237239..2477edf 100644
+
#endif /* _CONFIG_CMD_DISTRO_DEFAULTS_H */
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 1f7a1cb..ae0ddf7 100644
index f5db4d3..1cdba92 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -141,7 +141,7 @@
@@ -176,7 +176,7 @@
#define CONFIG_SYS_NO_FLASH
#define CONFIG_SYS_MONITOR_LEN (512 << 10) /* 512 KiB */
#define CONFIG_SYS_MONITOR_LEN (768 << 10) /* 768 KiB */
-#define CONFIG_IDENT_STRING " Allwinner Technology"
+#define CONFIG_IDENT_STRING " Arch Linux ARM"
#define CONFIG_ENV_OFFSET (544 << 10) /* (8 + 24 + 512) KiB */
#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
--
2.3.6
2.6.1

View file

@ -17,7 +17,7 @@ pkgname=('uboot-a10-olinuxino-lime'
'uboot-pcduino'
'uboot-pcduino3'
'uboot-pcduino3-nano')
pkgver=2015.07
pkgver=2015.10
pkgrel=1
arch=('armv7h')
url="http://git.denx.de/u-boot.git/"
@ -28,8 +28,8 @@ source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
'0001-arch-linux-arm-modifications.patch'
'boot.txt'
'mkscr')
md5sums=('3dac9a0b46fed77fc768ad3bd2d68c05'
'ead92cccf290422f5da7b0d99bc212ab'
md5sums=('7c203b0fc3390a122d8e8b75f147eac5'
'c8258485e1a760a24bf951fc18657ad3'
'b05eae006e4e35176ee3032eba1c4663'
'021623a04afd29ac3f368977140cfbfd')

View file

@ -3,17 +3,17 @@
# Contributor: Julian Langschaedel <meta.rb@gmail.com>
pkgname=uboot-tools
pkgver=2015.07
pkgver=2015.10
pkgrel=1
pkgdesc="U-Boot Tools"
arch=('arm' 'armv6h' 'armv7h')
arch=('arm' 'armv6h' 'armv7h' 'aarch64')
license=('GPL' 'LGPL')
provides=('uboot-env' 'uboot-mkimage')
replaces=('uboot-env' 'uboot-mkimage')
backup=(etc/fw_env.config)
source=(ftp://ftp.denx.de/pub/u-boot/u-boot-$pkgver.tar.bz2
fw_env.config)
md5sums=('3dac9a0b46fed77fc768ad3bd2d68c05'
md5sums=('7c203b0fc3390a122d8e8b75f147eac5'
'5a9dcbae5957f8621080d4bbc0e1520f')
build() {

View file

@ -1,4 +1,4 @@
From 6b6652055bab1024b85422526c7624b303c7e5a5 Mon Sep 17 00:00:00 2001
From ea95f07929ff01e6ac8f9f56faa3bb2f76e2eff3 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 27 Jun 2015 12:37:40 -0600
Subject: [PATCH] arch linux arm modifications
@ -9,10 +9,10 @@ Subject: [PATCH] arch linux arm modifications
2 files changed, 5 insertions(+)
diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h
index 8237239..2477edf 100644
index d8165cc..377322b 100644
--- a/include/config_distro_defaults.h
+++ b/include/config_distro_defaults.h
@@ -59,4 +59,7 @@
@@ -68,4 +68,7 @@
#define CONFIG_SUPPORT_RAW_INITRD
#define CONFIG_SYS_HUSH_PARSER
@ -21,10 +21,10 @@ index 8237239..2477edf 100644
+
#endif /* _CONFIG_CMD_DISTRO_DEFAULTS_H */
diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index f29ab2d..9a947d2 100644
index 714e3e2..6be57dc 100644
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -24,6 +24,8 @@
@@ -23,6 +23,8 @@
#include <config_distro_defaults.h>
@ -32,7 +32,7 @@ index f29ab2d..9a947d2 100644
+
/* U-Boot commands */
#define CONFIG_CMD_MEMTEST
#undef CONFIG_CMD_IMLS
--
2.4.4
2.6.1

View file

@ -1,11 +1,11 @@
# U-Boot: Inverse Path USB armory
# Maintainer: Kevin Mihelich <kevin@archlinuxarm.org>
# Maintainer: Jason Plum <jplum@archlinuxarm.org>
# Contributor: Jason Plum <jplum@archlinuxarm.org>
buildarch=4
pkgname=uboot-usbarmory
pkgver=2015.04
pkgver=2015.10
pkgrel=1
pkgdesc="U-Boot for USB armory"
arch=('armv7h')
@ -18,8 +18,8 @@ source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
'0001-arch-linux-arm-modifications.patch'
'boot.txt'
'mkscr')
md5sums=('570bdc2c47270c2a98ca60ff6c5c74cd'
'145e9053347b729ff1d65b27c1accc9f'
md5sums=('7c203b0fc3390a122d8e8b75f147eac5'
'fd8e3b72bce31c5294d70e64cee2be01'
'3e9799661eec04d1ce0f3fe20ed21838'
'021623a04afd29ac3f368977140cfbfd')

View file

@ -13,8 +13,8 @@
buildarch=6
pkgname=plex-media-server
pkgver=0.9.12.13.1464
_pkgsum=4ccd2ca
pkgver=0.9.12.18.1520
_pkgsum=6833552
pkgrel=1
pkgdesc='Plex Media Server'
arch=('arm' 'armv7h')
@ -35,8 +35,8 @@ source_armv7h=("https://downloads.plex.tv/plex-media-server/${pkgver}-${_pkgsum}
sha256sums=('7ab1ee8da9012d257b7f473fb79d76b201ca592cbe3722f977a43b58bfad180e'
'9da45cc3951ae03086ec663e6273c2de0183495fd15dc34ddd9aa100346d4d3a'
'7bb97271eb2dc5d1dcb95f9763f505970d234df17f1b8d79b467b9020257915a')
sha256sums_arm=('72f4a9f4b575d341d45ecb39894a78951e8db837220578ad243c8f3c2f04fc73')
sha256sums_armv7h=('88349fabbfc914a77e58ac95a82a420173c6d1381c6a4fd63d1bb4bf4e42277b')
sha256sums_arm=('2607d240b70a770f2035ba78db19a8d4df4e9bd6ebddd1c9b8cbdc675c452ab7')
sha256sums_armv7h=('c87b8357c13ebb40ff2a8071ea80d0203df47770c2512957955fb675a315c21b')
prepare() {
mkdir ${srcdir}/plexmediaserver

136
community/boinc/PKGBUILD Normal file
View file

@ -0,0 +1,136 @@
# $Id$
# Maintainer: Felix Yan <felixonmars@archlinux.org>
# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Michal Krenek <mikos@sg1.cz>
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
# - set boinc alternate platform to match their platforms:
# https://boinc.berkeley.edu/trac/wiki/BoincPlatforms
pkgbase=boinc
pkgname=(boinc boinc-nox)
pkgver=7.6.12
_tag="client_release/7.6/$pkgver"
pkgrel=1.1
arch=('i686' 'x86_64')
url="http://boinc.berkeley.edu/"
license=('LGPL')
makedepends=('libxslt' 'perl-xml-sax' 'git' 'libxss' 'libnotify' 'wxgtk' 'webkitgtk2' 'sqlite3' 'curl' 'inetutils' 'libxmu' 'freeglut' 'glu' 'mesa')
install=$pkgbase.install
options=('!staticlibs')
source=("git+https://github.com/BOINC/boinc.git#tag=$_tag"
boinc.bash
boinc.desktop
boinc.service
boinc.sysusers
boinc-AM_CONDITIONAL.patch)
md5sums=('SKIP'
'4d00e1aa4090a3f51feb20f5a541b9ee'
'db62de2f08117e6379a3c613b58fa7ff'
'3d5cbab785cc8b004661b17c65883fd5'
'240f952d38c5814cc3d8cd1668fe2154'
'e27047518dec54d4db38816487a28661')
prepare() {
cd "$srcdir/$pkgbase"
patch -Np1 -i "${srcdir}/boinc-AM_CONDITIONAL.patch"
./_autosetup
cp -r "$srcdir/$pkgbase" "$srcdir/$pkgbase-nox"
}
build() {
if [[ $CARCH == "arm" ]]; then
CONFIG="--with-boinc-alt-platform=arm-linux-gnueabisf"
else
CONFIG="--with-boinc-alt-platform=arm-linux-gnueabihf"
fi
cd "$srcdir/$pkgbase"
LDFLAGS='-lX11' ./configure \
--prefix=/usr \
--enable-libraries \
--enable-unicode \
--enable-shared \
--enable-dynamic-client-linkage \
--enable-client \
--enable-manager \
--disable-static \
--disable-server \
--with-ssl \
--with-x \
--with-wxdir=/usr/lib \
--with-wx-config=$(which wx-config) \
${CONFIG}
make
# Build boinc-nox
cd "$srcdir/$pkgbase-nox"
PKG_CONFIG=/usr/bin/pkg-config ./configure \
--prefix=/usr \
--enable-libraries \
--enable-unicode \
--enable-shared \
--enable-dynamic-client-linkage \
--enable-client \
--disable-server \
--disable-xss \
--disable-static \
--disable-manager \
--with-ssl \
--without-wxdir \
--without-x \
${CONFIG}
make
}
package_boinc() {
pkgdesc="Berkeley Open Infrastructure for Network Computing for desktop"
depends=("libxss" "libnotify" "wxgtk" "webkitgtk2" "curl" "sqlite3")
cd $pkgbase
make DESTDIR="$pkgdir" install
#install systemd unit
install -Dm644 "${srcdir}/$pkgbase.service" "${pkgdir}/usr/lib/systemd/system/$pkgbase.service"
#install sysusers conf
install -Dm644 "${srcdir}/$pkgbase.sysusers" "${pkgdir}/usr/lib/sysusers.d/$pkgbase.conf"
#install bash-completion
install -Dm644 "${srcdir}/$pkgbase.bash" "${pkgdir}/usr/share/bash-completion/completions/$pkgbase"
#install .desktop File
install -Dm644 "${srcdir}/${pkgbase}.desktop" "${pkgdir}/usr/share/applications/${pkgbase}.desktop"
#install icons
install -Dm644 "${srcdir}/${pkgbase}/packages/generic/sea/boincmgr.48x48.png" "${pkgdir}/usr/share/pixmaps/$pkgbase.png"
#remove initscripts stuff
rm -rf "$pkgdir/etc"
}
package_boinc-nox() {
pkgdesc="Berkeley Open Infrastructure for Network Computing for desktop without Xorg dependencies"
depends=("curl" "libjpeg-turbo")
provides=("boinc")
conflicts=("boinc")
cd $pkgbase-nox
make DESTDIR="$pkgdir" install
#install systemd unit
install -Dm644 "${srcdir}/$pkgbase.service" "${pkgdir}/usr/lib/systemd/system/$pkgbase.service"
#install sysusers conf
install -Dm644 "${srcdir}/$pkgbase.sysusers" "${pkgdir}/usr/lib/sysusers.d/$pkgbase.conf"
#install bash-completion
install -Dm644 "${srcdir}/$pkgbase.bash" "${pkgdir}/usr/share/bash-completion/completions/$pkgbase"
#remove initscripts stuff
rm -rf "$pkgdir/etc"
}

View file

@ -0,0 +1,19 @@
--- A/configure.ac
+++ B/configure.ac
@@ -39,6 +39,7 @@ AC_PROG_CC
AC_PROG_CXX
AC_PROG_F77
AC_PROG_CPP
+AC_PROG_OBJCXX
AC_PROG_MAKE_SET
SAH_LINKS
AC_LANG_PUSH(C)
@@ -744,6 +745,8 @@ AM_CONDITIONAL(ENABLE_LIBRARIES, [test "
AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes])
AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f ./coprocs/CUDA/posix/${boinc_platform}/libcudart.so])
+PKG_CHECK_MODULES([GTK2], [gtk+-2.0])
+
dnl ======================================================================
dnl some more vodoo required for building portable client-binary (client, clientgui)
dnl ======================================================================

View file

@ -0,0 +1,99 @@
# Source this file in BASH to get command completion (using tab) for
# boinc and boinccmd. Written by Frank S. Thomas <fst@debian.org>.
# See also: http://boinc.berkeley.edu/trac/wiki/BashCommandCompletion
_boinc()
{
local cur prev opts
COMPREPLY=()
cur="${COMP_WORDS[COMP_CWORD]}"
prev="${COMP_WORDS[COMP_CWORD-1]}"
opts="$(boinc_client --help | \
sed -n -r 's/^[[:space:]]*(--[a-z_]*).*/\1/p')"
# Handle options that require one or more arguments.
case "$prev" in
--attach_project|--detach_project|--reset_project|--update_prefs|\
--gui_rpc_port)
return 0
;;
esac
# Handle options that require two arguments.
if [[ COMP_CWORD -gt 1 ]]; then
pprev="${COMP_WORDS[COMP_CWORD-2]}"
case "$pprev" in
--attach_project)
return 0
;;
esac
fi
if [[ "$cur" == -* ]]; then
COMPREPLY=( $(compgen -W "$opts" -- "$cur") )
return 0
fi
}
complete -F _boinc -o default boinc_client
_boinccmd()
{
local cur prev opts cmds
COMPREPLY=()
cur="${COMP_WORDS[COMP_CWORD]}"
prev="${COMP_WORDS[COMP_CWORD-1]}"
opts="--host --passwd -h --help -V --version"
cmds="$(boinc_cmd --help 2>&1 | \
sed -n -r 's/^[[:space:]]*(--[a-z_]*).*/\1/p')"
# The following construct assures that:
# - no command follows if one of $opts or $cmds was given
# - after --host follows only one command or --passwd and one command
# - after --passwd follows only one command
if [[ $COMP_CWORD -eq 1 ]]; then
COMPREPLY=( $(compgen -W "$opts $cmds" -- "$cur") )
return 0
else
if [[ "${COMP_WORDS[@]}" =~ ".* --host .* --passwd .*" ]]; then
if [[ $COMP_CWORD -eq 5 ]]; then
COMPREPLY=( $(compgen -W "$cmds" -- "$cur") )
fi
elif [[ "${COMP_WORDS[@]}" =~ ".* --passwd .*" ]]; then
if [[ $COMP_CWORD -eq 3 ]]; then
COMPREPLY=( $(compgen -W "$cmds" -- "$cur") )
fi
elif [[ "${COMP_WORDS[@]}" =~ ".* --host .*" ]]; then
if [[ $COMP_CWORD -eq 3 ]]; then
COMPREPLY=( $(compgen -W "--passwd $cmds" -- "$cur") )
fi
fi
fi
# Handle options/commands that require one or more arguments.
case "$prev" in
--get_messages|--passwd)
return 0
;;
--host)
_known_hosts
return 0
;;
--set_run_mode|--set_network_mode)
COMPREPLY=( $(compgen -W "always auto never" -- "$cur") )
return 0
;;
--set_screensaver_mode)
COMPREPLY=( $(compgen -W "on off" -- "$cur") )
return 0
;;
esac
}
complete -F _boinccmd boinc_cmd
# vim: syntax=sh

View file

@ -0,0 +1,16 @@
[Desktop Entry]
Type=Application
Version=1.0
Exec=/usr/bin/boincmgr
Path=/var/lib/boinc
Icon=boinc
Categories=System;Monitor;GTK;
Name=BOINC Manager
GenericName=BOINC monitor and control utility
GenericName[cs]=Monitorovací a ovládací nástroj pro BOINC
GenericName[de]=BOINC Überwachungs- und Kontrollprogramm
GenericName[pt]=Monitorização BOINC e utilitário de controlo
Comment=Configure or monitor a BOINC core client
Comment[cs]=Monitoruje a nastavuje klienta BOINC
Comment[de]=BOINC Basis Client konfigurieren oder überwachen
Comment[pt]=Configurar ou monitorizar o cliente básico do BOINC

View file

@ -0,0 +1,5 @@
post_install() {
systemd-sysusers boinc.conf
mkdir -p var/lib/boinc
chown -R boinc:boinc var/lib/boinc
}

View file

@ -0,0 +1,10 @@
[Unit]
Description=BOINC Daemon
[Service]
User=boinc
Nice=19
ExecStart=/usr/bin/boinc_client --dir /var/lib/boinc --redirectio
[Install]
WantedBy=multi-user.target

View file

@ -0,0 +1,2 @@
u boinc - "BOINC Daemon" /var/lib/boinc
g boinc -

View file

@ -9,7 +9,7 @@
pkgname=gdal
pkgver=2.0.1
pkgrel=2
pkgrel=3
pkgdesc="A translator library for raster geospatial data formats"
arch=('i686' 'x86_64')
url="http://www.gdal.org/"

View file

@ -1,3 +1,4 @@
# $Id$
# Maintainer: Antonio Rojas <arojas@archlinux.org>
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
@ -5,19 +6,18 @@
pkgname=gf2x
pkgver=1.1
pkgrel=1
pkgrel=2
pkgdesc="A library for multiplying polynomials over the binary field"
arch=('i686' 'x86_64')
arch=(i686 x86_64)
url="http://gforge.inria.fr/projects/gf2x/"
license=('GPL' 'LGPL')
depends=('glibc')
options=('!libtool')
license=(GPL LGPL)
depends=(glibc)
source=("http://gforge.inria.fr/frs/download.php/30873/gf2x-1.1.tar.gz")
md5sums=('d9ce3a0d8cb6be50e3a1ff6d90be669f')
build() {
cd $pkgname-$pkgver
./configure --prefix=/usr
./configure --prefix=/usr --disable-pclmul
make
}

View file

@ -8,7 +8,7 @@
pkgname=mpv
epoch=1
pkgver=0.11.0
pkgver=0.12.0
pkgrel=1.1
pkgdesc='Video player based on MPlayer/mplayer2'
arch=('i686' 'x86_64')
@ -25,7 +25,7 @@ optdepends=('youtube-dl: for video-sharing websites playback')
options=('!emptydirs' '!buildflags')
install=mpv.install
source=("$pkgname-$pkgver.tar.gz::https://github.com/mpv-player/$pkgname/archive/v$pkgver.tar.gz")
sha256sums=('a2157174e46db46dad5deb1fde94283e72ebe922fd15447cb16a2a243fae5bda')
sha256sums=('df242044c749d850344f5499860d852849147f20c63d36d2cd678627bd8d6cc4')
prepare() {
cd ${pkgname}-${pkgver}
@ -53,9 +53,6 @@ package() {
./waf install --destdir="$pkgdir"
install -d "$pkgdir"/usr/share/doc/mpv/examples
install -m644 etc/{input,example}.conf \
"$pkgdir"/usr/share/doc/mpv/examples
install -m644 DOCS/{encoding.rst,tech-overview.txt} \
"$pkgdir"/usr/share/doc/mpv
}

View file

@ -9,7 +9,7 @@
# Contributor: Jason Plum <jplum@archlinuxarm.org>
pkgname=nodejs
pkgver=4.2.1
pkgver=5.0.0
pkgrel=1
pkgdesc='Evented I/O for V8 javascript'
arch=('i686' 'x86_64')
@ -21,7 +21,7 @@ makedepends=('python2' 'procps-ng')
optdepends=('npm: nodejs package manager')
source=("http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz"
'0001-arm-fixes.patch')
sha256sums=('8861b9f4c3b4db380fcda19a710c0430c3d62d03ee176c64db63eef95a672663'
sha256sums=('698d9662067ae6a20a2586e5c09659735fc0050769a0d8f76f979189ceaccdf4'
'8fa868fca31bac8d62c5fae17fa64bcb0d38d0f42a9c53e9339c94a8267dbb78')
set_flags_for_arm() {

View file

@ -1,91 +0,0 @@
# $Id$
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
# - patch to fix building on ARM
pkgname=opensips
pkgver=2.1.1
pkgrel=1
pkgdesc="An Open Source SIP Server able to act as a SIP proxy, registrar, location server, redirect server ..."
url="http://www.opensips.org"
depends=('gcc-libs' 'openssl' 'db' 'attr' 'libxml2')
makedepends=('postgresql-libs>=8.4.1' 'unixodbc' 'libldap>=2.4.18' 'libmariadbclient'
'lynx' 'libxslt' 'libmicrohttpd')
optdepends=('postgresql-libs'
'unixodbc'
'libldap'
'libmariadbclient'
'libsasl'
'python2'
'pcre')
backup=("etc/opensips/opensips.cfg"
"etc/opensips/dictionary.radius"
"etc/opensips/opensipsctlrc")
arch=('i686' 'x86_64')
license=('GPL')
install=opensips.install
options=('!emptydirs' 'zipman' '!makeflags' 'docs')
source=(http://opensips.org/pub/opensips/$pkgver/src/opensips-${pkgver}.tar.gz
remove-inline.patch
opensips.service
arm.patch)
md5sums=('ea7b3d394eb7461e172af4b900f19b70'
'3771f5720c54c7fe3326611f9b57013d'
'35cdcb3692f6925236fd5fe7e9484c58'
'dc8d8f992e4e5ca24f740a046252fd2e')
prepare() {
cd $srcdir/$pkgname-$pkgver/
# python2 fix
for file in $(find . -name '*.py' -print); do
sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
done
sed -i 's|sbin|bin|g' Makefile
sed -i 's|bin-dir = sbin/|bin-dir = bin/|' Makefile.defs
# patch -p1 <$srcdir/remove-inline.patch
patch -p1 -i ../arm.patch
}
_modules="ldap db_mysql db_postgres db_unixodbc presence presence_xml h350 proto_tls tlsops db_http httpd tm rr"
build() {
cd $srcdir/$pkgname-$pkgver/
make \
include_modules="${_modules}" \
LIBDIR=lib PREFIX=/usr
}
package() {
cd $srcdir/$pkgname-$pkgver/
make \
include_modules="${_modules}" \
BASEDIR=$pkgdir PREFIX=/usr LIBDIR=lib install
# Conforms to the arch packaging standards (http://wiki.archlinux.org/index.php/Arch_Packaging_Standards)
mkdir -p $pkgdir/etc/
mv $pkgdir/usr/etc/opensips/ $pkgdir/etc/
sed -i 's#mpath=".*lib/opensips/modules/"#mpath="/usr/lib/opensips/modules/"#' $pkgdir/etc/opensips/opensips.cfg
# fix bad paths
cd $pkgdir/usr/share
find -type f -exec sed -i "s#$pkgdir##" {} \;
cd $pkgdir/usr/lib/opensips/opensipsctl
find -type f -exec sed -i "s#$pkgdir##" {} \;
cd $pkgdir/usr/bin
sed -i "s#$pkgdir##" opensipsctl opensipsdbctl osipsconsole
cd $pkgdir/etc
find -type f -exec sed -i "s#$pkgdir##" {} \;
install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
}

View file

@ -1,21 +0,0 @@
diff -urN a/Makefile.defs b/Makefile.defs
--- a/Makefile.defs 2014-07-02 07:52:34.000000000 -0600
+++ b/Makefile.defs 2014-07-27 20:14:16.713085258 -0600
@@ -88,7 +88,7 @@
endif
HOST_ARCH := $(shell $(GETARCH) |sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
- -e s/armv4l/arm/ -e "s/Power Macintosh/ppc/" \
+ -e s/armv4l/arm/ -e s/armv5tel/arm/ -e s/armv6l/arm/ -e s/armv7l/arm/ -e "s/Power Macintosh/ppc/" \
-e s/sun4v/sparc64/ -e "s/cobalt/mips2/" \
-e s/amd64/x86_64/ )
@@ -1006,7 +1006,7 @@
-Wall
#if gcc 4.x+
ifeq ($(CC_CLASS), 4.x)
- CFLAGS+=-mcpu=strongarm1100 -minline-all-stringops \
+ CFLAGS+=-minline-all-stringops \
-ftree-vectorize
else
#if gcc 3.0+

View file

@ -1,3 +0,0 @@
post_install() {
echo "To use MySQL, you should install mysql package and run '/usr/bin/openser_mysql.sh create'"
}

View file

@ -1,11 +0,0 @@
[Unit]
Description=OpenSIPS daemon
After=network.target remote-fs.target nss-lookup.target
[Service]
Type=forking
PIDFile=/run/opensips.pid
ExecStart=/usr/bin/opensips -f /etc/opensips/opensips.cfg -w /var/tmp -P /run/opensips.pid
[Install]
WantedBy=multi-user.target

View file

@ -1,157 +0,0 @@
diff -wbBur opensips-2.1.0/db/db_insertq.c opensips-2.1.0.my/db/db_insertq.c
--- opensips-2.1.0/db/db_insertq.c 2015-04-22 11:20:03.000000000 +0300
+++ opensips-2.1.0.my/db/db_insertq.c 2015-05-25 16:57:42.010460560 +0300
@@ -534,7 +534,7 @@
}
/* clean shm memory used by the rows */
-inline void cleanup_rows(db_val_t **rows)
+void cleanup_rows(db_val_t **rows)
{
int i;
diff -wbBur opensips-2.1.0/db/db_insertq.h opensips-2.1.0.my/db/db_insertq.h
--- opensips-2.1.0/db/db_insertq.h 2015-04-22 11:20:03.000000000 +0300
+++ opensips-2.1.0.my/db/db_insertq.h 2015-05-25 16:57:34.480593553 +0300
@@ -92,7 +92,7 @@
lock_release((entry)->lock); \
} while (0)
-inline void cleanup_rows(db_val_t **rows);
+void cleanup_rows(db_val_t **rows);
void handle_ql_shutdown(void);
#endif
diff -wbBur opensips-2.1.0/dprint.c opensips-2.1.0.my/dprint.c
--- opensips-2.1.0/dprint.c 2015-04-22 11:20:03.000000000 +0300
+++ opensips-2.1.0.my/dprint.c 2015-05-25 16:57:11.490999596 +0300
@@ -119,18 +119,18 @@
}
/* change the actual log level of the current process */
-inline void set_proc_debug_level(int level)
+void set_proc_debug_level(int level)
{
__set_proc_debug_level(process_no, level);
}
/* change the actual log level of a given process */
-inline void __set_proc_debug_level(int proc_idx, int level)
+void __set_proc_debug_level(int proc_idx, int level)
{
pt[proc_idx].debug = level;
}
-inline void set_global_debug_level(int level)
+void set_global_debug_level(int level)
{
int i;
@@ -140,7 +140,7 @@
}
}
-inline void reset_proc_debug_level(void)
+void reset_proc_debug_level(void)
{
*debug = *default_debug;
}
diff -wbBur opensips-2.1.0/dprint.h opensips-2.1.0.my/dprint.h
--- opensips-2.1.0/dprint.h 2015-04-22 11:20:03.000000000 +0300
+++ opensips-2.1.0.my/dprint.h 2015-05-25 16:57:21.624153957 +0300
@@ -117,21 +117,21 @@
int str2facility(char *s);
/* set the current and default log levels for all OpenSIPS processes */
-inline void set_global_debug_level(int level);
+void set_global_debug_level(int level);
/* set the log level of the current process */
-inline void set_proc_debug_level(int level);
+void set_proc_debug_level(int level);
/*
* set the (default) log level of a given process
*
* Note: the index param is not validated!
*/
-inline void __set_proc_debug_level(int proc_idx, int level);
-inline void __set_proc_default_debug(int proc_idx, int level);
+void __set_proc_debug_level(int proc_idx, int level);
+void __set_proc_default_debug(int proc_idx, int level);
/* changes the logging level to the default value for the current process */
-inline void reset_proc_debug_level(void);
+void reset_proc_debug_level(void);
inline static char* dp_time(void)
{
diff -wbBur opensips-2.1.0/mem/mem.c opensips-2.1.0.my/mem/mem.c
--- opensips-2.1.0/mem/mem.c 2015-04-22 11:20:03.000000000 +0300
+++ opensips-2.1.0.my/mem/mem.c 2015-05-25 16:55:03.996584777 +0300
@@ -166,7 +166,7 @@
event_pkg_pending = 0;
}
-inline void pkg_threshold_check(void)
+void pkg_threshold_check(void)
{
long pkg_perc, used, size;
diff -wbBur opensips-2.1.0/mem/meminfo.h opensips-2.1.0.my/mem/meminfo.h
--- opensips-2.1.0/mem/meminfo.h 2015-04-22 11:20:03.000000000 +0300
+++ opensips-2.1.0.my/mem/meminfo.h 2015-05-25 16:54:49.196846178 +0300
@@ -44,7 +44,7 @@
// threshold percentage checked
extern long event_pkg_threshold;
// events are used only if STATISTICS are used
-inline void pkg_threshold_check(void);
+void pkg_threshold_check(void);
#else
#define pkg_threshold_check()
#endif /* STATISTICS */
diff -wbBur opensips-2.1.0/resolve.c opensips-2.1.0.my/resolve.c
--- opensips-2.1.0/resolve.c 2015-04-22 11:20:03.000000000 +0300
+++ opensips-2.1.0.my/resolve.c 2015-05-25 16:54:37.070393698 +0300
@@ -445,7 +445,7 @@
return &global_he;
}
-inline struct hostent* resolvehost(char* name, int no_ip_test)
+struct hostent* resolvehost(char* name, int no_ip_test)
{
static struct hostent* he=0;
#ifdef HAVE_GETIPNODEBYNAME
@@ -591,7 +591,7 @@
}
-inline struct hostent* rev_resolvehost(struct ip_addr *ip)
+struct hostent* rev_resolvehost(struct ip_addr *ip)
{
if (dnscache_fetch_func != NULL) {
return own_gethostbyaddr((char*)(ip)->u.addr, (ip)->len, (ip)->af);
diff -wbBur opensips-2.1.0/socket_info.c opensips-2.1.0.my/socket_info.c
--- opensips-2.1.0/socket_info.c 2015-04-22 11:20:03.000000000 +0300
+++ opensips-2.1.0.my/socket_info.c 2015-05-25 16:57:57.863513899 +0300
@@ -101,7 +101,7 @@
/* another helper function, it just creates a socket_info struct */
-inline struct socket_info* new_sock_info( char* name,
+struct socket_info* new_sock_info( char* name,
unsigned short port, unsigned short proto,
char *adv_name, unsigned short adv_port,
unsigned short children,enum si_flags flags)
diff -wbBur opensips-2.1.0/socket_info.h opensips-2.1.0.my/socket_info.h
--- opensips-2.1.0/socket_info.h 2015-05-07 17:13:54.000000000 +0300
+++ opensips-2.1.0.my/socket_info.h 2015-05-25 16:57:54.256910931 +0300
@@ -43,7 +43,7 @@
int add_listen_iface(char* name, unsigned short port, unsigned short proto,
char *adv_name, unsigned short adv_port,
unsigned short children, enum si_flags flags);
-inline struct socket_info *
+struct socket_info *
new_sock_info(char* name, unsigned short port, unsigned short proto,
char *adv_name, unsigned short adv_port,
unsigned short children, enum si_flags flags);

View file

@ -24,7 +24,7 @@ pkgname=(uwsgi
uwsgi-plugin-webdav
mod_proxy_uwsgi)
pkgver=2.0.11.2
pkgrel=1
pkgrel=2
arch=(i686 x86_64)
url="http://projects.unbit.it/$pkgbase"
license=(GPL2)

View file

@ -7,7 +7,7 @@ pkgbase=linux-am33x
_srcname=linux-4.2
_kernelname=${pkgbase#linux}
_desc="TI AM335x Beaglebone (Black)"
pkgver=4.2.4
pkgver=4.2.5
pkgrel=1
rcnrel=bone2
arch=('armv7h')
@ -23,8 +23,8 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
"git+https://github.com/RobertCNelson/bb.org-overlays.git"
'config')
md5sums=('3d5ea06d767e2f35c999eeadafc76523'
'1289fdb357a552edc672208ce729d9c6'
'61298ddd86abc5334798669270367225'
'19e47863ca441b2e11f90f25fb6c41ec'
'c9b07b1434364a15ea2446b1266fc9c5'
'SKIP'
'6e4765ef4940fdcac868939d965ff477')

View file

@ -1,7 +1,7 @@
From add69dc91b475d71a299f0c1576793e5c1635b5c Mon Sep 17 00:00:00 2001
From 2179361c67eec3ab63c1c829ca95e28f2d9be0fd Mon Sep 17 00:00:00 2001
From: Douglas Gilbert <[mailto:dgilbert@interlog.com]>
Date: Mon, 12 Aug 2013 10:36:25 -0500
Subject: [PATCH 1/2] at91: ariag25 updates
Subject: [PATCH 1/3] at91: ariag25 updates
v2: dropped at91sam9x5 usart fix, as merged mainline
@ -89,5 +89,5 @@ index e9ced30..8308515 100644
usb0: ohci@00600000 {
--
2.4.5
2.6.1

View file

@ -1,7 +1,7 @@
From 2b820ecb336ca5c14227bb293a983ede0bf53523 Mon Sep 17 00:00:00 2001
From af036aa9d14c0ab088667731b6fc989adea59624 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 13 Jun 2015 13:46:30 -0600
Subject: [PATCH 2/2] at91: arietta-g25 support
Subject: [PATCH 2/3] at91: arietta-g25 support
Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
---
@ -13,7 +13,7 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
create mode 100644 arch/arm/boot/dts/at91-arietta256.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 246473a..1d33487 100644
index bb8fa02..e9d8445 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -31,6 +31,8 @@ dtb-$(CONFIG_SOC_SAM_V4_V5) += \
@ -376,5 +376,5 @@ index 0000000..cbae789
+
+};
--
2.4.5
2.6.1

View file

@ -0,0 +1,95 @@
From 780ebd54d6f3792b3b951432a462ef05ba47671f Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 18 Feb 2014 01:43:50 -0300
Subject: [PATCH 3/3] net/smsc95xx: Allow mac address to be set as a parameter
---
drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 56 insertions(+)
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index 26423ad..e29a323 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -59,6 +59,7 @@
#define SUSPEND_SUSPEND3 (0x08)
#define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \
SUSPEND_SUSPEND2 | SUSPEND_SUSPEND3)
+#define MAC_ADDR_LEN (6)
struct smsc95xx_priv {
u32 mac_cr;
@@ -74,6 +75,10 @@ static bool turbo_mode = true;
module_param(turbo_mode, bool, 0644);
MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction");
+static char *macaddr = ":";
+module_param(macaddr, charp, 0);
+MODULE_PARM_DESC(macaddr, "MAC address");
+
static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
u32 *data, int in_pm)
{
@@ -763,8 +768,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
}
+/* Check the macaddr module parameter for a MAC address */
+static int smsc95xx_is_macaddr_param(struct usbnet *dev, u8 *dev_mac)
+{
+ int i, j, got_num, num;
+ u8 mtbl[MAC_ADDR_LEN];
+
+ if (macaddr[0] == ':')
+ return 0;
+
+ i = 0;
+ j = 0;
+ num = 0;
+ got_num = 0;
+ while (j < MAC_ADDR_LEN) {
+ if (macaddr[i] && macaddr[i] != ':') {
+ got_num++;
+ if ('0' <= macaddr[i] && macaddr[i] <= '9')
+ num = num * 16 + macaddr[i] - '0';
+ else if ('A' <= macaddr[i] && macaddr[i] <= 'F')
+ num = num * 16 + 10 + macaddr[i] - 'A';
+ else if ('a' <= macaddr[i] && macaddr[i] <= 'f')
+ num = num * 16 + 10 + macaddr[i] - 'a';
+ else
+ break;
+ i++;
+ } else if (got_num == 2) {
+ mtbl[j++] = (u8) num;
+ num = 0;
+ got_num = 0;
+ i++;
+ } else {
+ break;
+ }
+ }
+
+ if (j == MAC_ADDR_LEN) {
+ netif_dbg(dev, ifup, dev->net, "Overriding MAC address with: "
+ "%02x:%02x:%02x:%02x:%02x:%02x\n", mtbl[0], mtbl[1], mtbl[2],
+ mtbl[3], mtbl[4], mtbl[5]);
+ for (i = 0; i < MAC_ADDR_LEN; i++)
+ dev_mac[i] = mtbl[i];
+ return 1;
+ } else {
+ return 0;
+ }
+}
+
static void smsc95xx_init_mac_address(struct usbnet *dev)
{
+ /* Check module parameters */
+ if (smsc95xx_is_macaddr_param(dev, dev->net->dev_addr))
+ return;
+
/* try reading mac address from EEPROM */
if (smsc95xx_read_eeprom(dev, EEPROM_MAC_OFFSET, ETH_ALEN,
dev->net->dev_addr) == 0) {
--
2.6.1

View file

@ -4,10 +4,10 @@
buildarch=2
pkgbase=linux-armv5
_srcname=linux-4.2
_srcname=linux-4.3
_kernelname=${pkgbase#linux}
_desc="ARMv5 multi-platform"
pkgver=4.2.4
pkgver=4.3.0
pkgrel=1
arch=('arm')
url="http://www.kernel.org/"
@ -15,27 +15,29 @@ license=('GPL2')
makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git')
options=('!strip')
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"
#"http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz"
#"git+https://github.com/sfjro/aufs4-standalone.git#branch=aufs${pkgver%.*}"
#"git+https://github.com/sfjro/aufs4-standalone.git#branch=aufs4.x-rcN"
'0001-at91-ariag25-updates.patch'
'0002-at91-arietta-g25-support.patch'
'0003-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch'
'config')
md5sums=('3d5ea06d767e2f35c999eeadafc76523'
'1289fdb357a552edc672208ce729d9c6'
'3546c330c90f674bf823ca989f63a6f1'
'fe0776a546e62cbd2c6b3696a4932ea4'
'cecc0166051dc46fbf2156360017c1fb')
md5sums=('58b35794eee3b6d52ce7be39357801e7'
'efc43501dde0e8fb9329c8ef762ffdf4'
'8cf88daec8febbc1a0703c8a3bd6b25c'
'd311439f7fb7cb067121812236bbad47'
'98876fead669652b0a5c47dc238c6a2f')
prepare() {
cd "${srcdir}/${_srcname}"
# add upstream patch
git apply --whitespace=nowarn "${srcdir}/patch-${pkgver}"
#git apply --whitespace=nowarn "${srcdir}/patch-${pkgver}"
# ALARM patches
git apply ../0001-at91-ariag25-updates.patch
git apply ../0002-at91-arietta-g25-support.patch
git apply ../0003-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
# AUFS patches
#cp -ru "${srcdir}/aufs4-standalone/Documentation" .
@ -91,7 +93,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

View file

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 4.2.0-rc7-1 Kernel Configuration
# Linux/arm 4.3.0-1 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@ -12,6 +12,7 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
CONFIG_LOCKDEP_SUPPORT=y
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
CONFIG_FIX_EARLYCON_MEM=y
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_NEED_DMA_MAP_STATE=y
@ -111,6 +112,7 @@ CONFIG_GENERIC_SCHED_CLOCK=y
CONFIG_CGROUPS=y
# CONFIG_CGROUP_DEBUG is not set
CONFIG_CGROUP_FREEZER=y
# CONFIG_CGROUP_PIDS is not set
CONFIG_CGROUP_DEVICE=y
CONFIG_CPUSETS=y
CONFIG_PROC_PID_CPUSET=y
@ -172,6 +174,8 @@ CONFIG_BPF_SYSCALL=y
CONFIG_SHMEM=y
CONFIG_AIO=y
CONFIG_ADVISE_SYSCALLS=y
# CONFIG_USERFAULTFD is not set
CONFIG_MEMBARRIER=y
CONFIG_EMBEDDED=y
CONFIG_HAVE_PERF_EVENTS=y
CONFIG_PERF_USE_VMALLOC=y
@ -187,11 +191,13 @@ CONFIG_COMPAT_BRK=y
# CONFIG_SLAB is not set
CONFIG_SLUB=y
# CONFIG_SLOB is not set
# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
# CONFIG_SYSTEM_DATA_VERIFICATION is not set
# CONFIG_PROFILING is not set
CONFIG_KEXEC_CORE=y
CONFIG_HAVE_OPROFILE=y
# CONFIG_KPROBES is not set
CONFIG_JUMP_LABEL=y
# CONFIG_STATIC_KEYS_SELFTEST is not set
# CONFIG_UPROBES is not set
# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
CONFIG_ARCH_USE_BUILTIN_BSWAP=y
@ -428,6 +434,7 @@ CONFIG_AEABI=y
# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
CONFIG_HAVE_ARCH_PFN_VALID=y
# CONFIG_HIGHMEM is not set
CONFIG_CPU_SW_DOMAIN_PAN=y
CONFIG_HW_PERF_EVENTS=y
CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
# CONFIG_ARM_MODULE_PLTS is not set
@ -453,6 +460,8 @@ CONFIG_NEED_PER_CPU_KM=y
CONFIG_ZSMALLOC=y
# CONFIG_PGTABLE_MAPPING is not set
# CONFIG_ZSMALLOC_STAT is not set
# CONFIG_IDLE_PAGE_TRACKING is not set
CONFIG_FRAME_VECTOR=y
CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_ALIGNMENT_TRAP=y
CONFIG_UACCESS_WITH_MEMCPY=y
@ -545,6 +554,7 @@ CONFIG_COREDUMP=y
#
CONFIG_SUSPEND=y
CONFIG_SUSPEND_FREEZER=y
# CONFIG_SUSPEND_SKIP_SYNC is not set
# CONFIG_HIBERNATION is not set
CONFIG_PM_SLEEP=y
# CONFIG_PM_AUTOSLEEP is not set
@ -604,7 +614,6 @@ CONFIG_SYN_COOKIES=y
CONFIG_NET_UDP_TUNNEL=m
CONFIG_NET_FOU=m
CONFIG_NET_FOU_IP_TUNNELS=y
# CONFIG_GENEVE_CORE is not set
CONFIG_INET_AH=m
CONFIG_INET_ESP=m
CONFIG_INET_IPCOMP=m
@ -642,6 +651,7 @@ CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
CONFIG_INET6_IPCOMP=m
CONFIG_IPV6_MIP6=m
CONFIG_IPV6_ILA=m
CONFIG_INET6_XFRM_TUNNEL=m
CONFIG_INET6_TUNNEL=m
CONFIG_INET6_XFRM_MODE_TRANSPORT=m
@ -845,7 +855,9 @@ CONFIG_NF_CONNTRACK_PROC_COMPAT=y
CONFIG_NF_TABLES_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_DUP_IPV4=m
CONFIG_NF_TABLES_ARP=m
CONFIG_NF_DUP_IPV4=m
CONFIG_NF_LOG_ARP=m
CONFIG_NF_LOG_IPV4=m
CONFIG_NF_REJECT_IPV4=m
@ -887,6 +899,8 @@ CONFIG_NF_CONNTRACK_IPV6=m
CONFIG_NF_TABLES_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_REJECT_IPV6=m
CONFIG_NFT_DUP_IPV6=m
CONFIG_NF_DUP_IPV6=m
CONFIG_NF_REJECT_IPV6=m
CONFIG_NF_LOG_IPV6=m
CONFIG_NF_NAT_IPV6=m
@ -997,12 +1011,14 @@ CONFIG_BATMAN_ADV_MCAST=y
CONFIG_OPENVSWITCH=m
CONFIG_OPENVSWITCH_GRE=m
CONFIG_OPENVSWITCH_VXLAN=m
CONFIG_OPENVSWITCH_GENEVE=m
# CONFIG_VSOCKETS is not set
# CONFIG_NETLINK_MMAP is not set
# CONFIG_NETLINK_DIAG is not set
CONFIG_MPLS=y
CONFIG_NET_MPLS_GSO=m
CONFIG_MPLS_ROUTING=m
CONFIG_MPLS_IPTUNNEL=m
# CONFIG_HSR is not set
# CONFIG_NET_SWITCHDEV is not set
CONFIG_CGROUP_NET_PRIO=y
@ -1113,6 +1129,7 @@ CONFIG_BT_BNEP=m
CONFIG_BT_BNEP_MC_FILTER=y
CONFIG_BT_BNEP_PROTO_FILTER=y
CONFIG_BT_HIDP=m
CONFIG_BT_HS=y
CONFIG_BT_LE=y
# CONFIG_BT_6LOWPAN is not set
# CONFIG_BT_SELFTEST is not set
@ -1124,6 +1141,7 @@ CONFIG_BT_DEBUGFS=y
CONFIG_BT_INTEL=m
CONFIG_BT_BCM=m
CONFIG_BT_RTL=m
CONFIG_BT_QCA=m
CONFIG_BT_HCIBTUSB=m
CONFIG_BT_HCIBTUSB_BCM=y
CONFIG_BT_HCIBTUSB_RTL=y
@ -1136,6 +1154,7 @@ CONFIG_BT_HCIUART_LL=y
CONFIG_BT_HCIUART_3WIRE=y
CONFIG_BT_HCIUART_INTEL=y
CONFIG_BT_HCIUART_BCM=y
CONFIG_BT_HCIUART_QCA=y
CONFIG_BT_HCIBCM203X=m
CONFIG_BT_HCIBPA10X=m
CONFIG_BT_HCIBFUSB=m
@ -1216,6 +1235,8 @@ CONFIG_NFC_ST21NFCA_I2C=m
# CONFIG_NFC_ST_NCI is not set
CONFIG_NFC_NXP_NCI=m
CONFIG_NFC_NXP_NCI_I2C=m
# CONFIG_NFC_S3FWRN5_I2C is not set
CONFIG_LWTUNNEL=y
CONFIG_HAVE_BPF_JIT=y
#
@ -1344,7 +1365,7 @@ CONFIG_MTD_NAND_ECC=y
CONFIG_MTD_NAND=y
# CONFIG_MTD_NAND_ECC_BCH is not set
# CONFIG_MTD_SM_COMMON is not set
# CONFIG_MTD_NAND_DENALI is not set
# CONFIG_MTD_NAND_DENALI_DT is not set
# CONFIG_MTD_NAND_GPIO is not set
# CONFIG_MTD_NAND_OMAP_BCH_BUILD is not set
CONFIG_MTD_NAND_IDS=y
@ -1477,6 +1498,7 @@ CONFIG_EEPROM_93CX6=m
# CONFIG_ECHO is not set
# CONFIG_CXL_BASE is not set
# CONFIG_CXL_KERNEL_API is not set
# CONFIG_CXL_EEH is not set
#
# SCSI device support
@ -1570,6 +1592,7 @@ CONFIG_MACVLAN=m
CONFIG_MACVTAP=m
CONFIG_IPVLAN=m
CONFIG_VXLAN=m
CONFIG_GENEVE=m
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
@ -1577,6 +1600,7 @@ CONFIG_TUN=m
# CONFIG_TUN_VNET_CROSS_LE is not set
CONFIG_VETH=m
# CONFIG_NLMON is not set
CONFIG_NET_VRF=m
#
# CAIF transport drivers
@ -1630,6 +1654,8 @@ CONFIG_SMC911X=m
CONFIG_SMSC911X=m
# CONFIG_SMSC911X_ARCH_HOOKS is not set
# CONFIG_NET_VENDOR_STMICRO is not set
CONFIG_NET_VENDOR_SYNOPSYS=y
# CONFIG_SYNOPSYS_DWC_ETH_QOS is not set
CONFIG_NET_VENDOR_VIA=y
# CONFIG_VIA_RHINE is not set
# CONFIG_VIA_VELOCITY is not set
@ -1641,6 +1667,7 @@ CONFIG_PHYLIB=y
#
# MII PHY device drivers
#
# CONFIG_AQUANTIA_PHY is not set
# CONFIG_AT803X_PHY is not set
# CONFIG_AMD_PHY is not set
# CONFIG_MARVELL_PHY is not set
@ -1649,6 +1676,7 @@ CONFIG_DAVICOM_PHY=y
# CONFIG_LXT_PHY is not set
# CONFIG_CICADA_PHY is not set
# CONFIG_VITESSE_PHY is not set
# CONFIG_TERANETICS_PHY is not set
# CONFIG_SMSC_PHY is not set
# CONFIG_BROADCOM_PHY is not set
# CONFIG_BCM7XXX_PHY is not set
@ -1659,7 +1687,9 @@ CONFIG_DAVICOM_PHY=y
# CONFIG_STE10XP is not set
# CONFIG_LSI_ET1011C_PHY is not set
CONFIG_MICREL_PHY=y
# CONFIG_DP83848_PHY is not set
# CONFIG_DP83867_PHY is not set
# CONFIG_MICROCHIP_PHY is not set
# CONFIG_FIXED_PHY is not set
# CONFIG_MDIO_BITBANG is not set
# CONFIG_MDIO_BUS_MUX_GPIO is not set
@ -1685,6 +1715,7 @@ CONFIG_USB_KAWETH=m
CONFIG_USB_PEGASUS=m
CONFIG_USB_RTL8150=m
CONFIG_USB_RTL8152=m
CONFIG_USB_LAN78XX=m
CONFIG_USB_USBNET=m
CONFIG_USB_NET_AX8817X=m
CONFIG_USB_NET_AX88179_178A=m
@ -1719,6 +1750,7 @@ CONFIG_USB_NET_INT51X1=m
CONFIG_USB_IPHETH=m
CONFIG_USB_SIERRA_NET=m
CONFIG_USB_VL600=m
CONFIG_USB_NET_CH9200=m
CONFIG_WLAN=y
CONFIG_LIBERTAS_THINFIRM=m
# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
@ -1913,7 +1945,7 @@ CONFIG_TABLET_USB_HANWANG=m
CONFIG_TABLET_USB_KBTAB=m
CONFIG_TABLET_SERIAL_WACOM4=m
CONFIG_INPUT_TOUCHSCREEN=y
CONFIG_OF_TOUCHSCREEN=y
CONFIG_TOUCHSCREEN_PROPERTIES=y
CONFIG_TOUCHSCREEN_ADS7846=m
# CONFIG_TOUCHSCREEN_AD7877 is not set
# CONFIG_TOUCHSCREEN_AD7879 is not set
@ -1941,6 +1973,7 @@ CONFIG_TOUCHSCREEN_ADS7846=m
# CONFIG_TOUCHSCREEN_MCS5000 is not set
# CONFIG_TOUCHSCREEN_MMS114 is not set
# CONFIG_TOUCHSCREEN_MTOUCH is not set
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
# CONFIG_TOUCHSCREEN_MK712 is not set
# CONFIG_TOUCHSCREEN_PENMOUNT is not set
@ -1961,6 +1994,7 @@ CONFIG_TOUCHSCREEN_MC13783=m
# CONFIG_TOUCHSCREEN_SX8654 is not set
# CONFIG_TOUCHSCREEN_TPS6507X is not set
# CONFIG_TOUCHSCREEN_ZFORCE is not set
# CONFIG_TOUCHSCREEN_COLIBRI_VF50 is not set
CONFIG_INPUT_MISC=y
CONFIG_INPUT_AD714X=m
CONFIG_INPUT_AD714X_I2C=m
@ -2049,6 +2083,7 @@ CONFIG_SERIAL_ATMEL_PDC=y
# CONFIG_SERIAL_ATMEL_TTYAT is not set
# CONFIG_SERIAL_MAX3100 is not set
# CONFIG_SERIAL_MAX310X is not set
# CONFIG_SERIAL_UARTLITE is not set
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
# CONFIG_SERIAL_SCCNXP is not set
@ -2094,6 +2129,7 @@ CONFIG_I2C_MUX=y
# CONFIG_I2C_MUX_PCA9541 is not set
# CONFIG_I2C_MUX_PCA954x is not set
# CONFIG_I2C_MUX_PINCTRL is not set
# CONFIG_I2C_MUX_REG is not set
CONFIG_I2C_HELPER_AUTO=y
CONFIG_I2C_ALGOBIT=y
@ -2107,6 +2143,7 @@ CONFIG_I2C_ALGOBIT=y
CONFIG_I2C_AT91=y
# CONFIG_I2C_CBUS_GPIO is not set
# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
# CONFIG_I2C_EMEV2 is not set
CONFIG_I2C_GPIO=y
CONFIG_I2C_MXS=y
# CONFIG_I2C_NOMADIK is not set
@ -2257,6 +2294,7 @@ CONFIG_GPIO_MXS=y
# CONFIG_GPIO_MAX7301 is not set
# CONFIG_GPIO_MCP23S08 is not set
# CONFIG_GPIO_MC33880 is not set
# CONFIG_GPIO_ZX is not set
#
# USB GPIO expanders
@ -2464,6 +2502,7 @@ CONFIG_WATCHDOG_CORE=y
# CONFIG_XILINX_WATCHDOG is not set
# CONFIG_ARM_SP805_WATCHDOG is not set
CONFIG_AT91SAM9X_WATCHDOG=y
# CONFIG_SAMA5D4_WATCHDOG is not set
# CONFIG_CADENCE_WATCHDOG is not set
# CONFIG_DW_WATCHDOG is not set
CONFIG_STMP3XXX_RTC_WATCHDOG=y
@ -2513,6 +2552,7 @@ CONFIG_MFD_ATMEL_HLCDC=y
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9055 is not set
# CONFIG_MFD_DA9062 is not set
# CONFIG_MFD_DA9063 is not set
# CONFIG_MFD_DA9150 is not set
CONFIG_MFD_DLN2=m
@ -2616,6 +2656,7 @@ CONFIG_REGULATOR_GPIO=y
CONFIG_REGULATOR_MC13XXX_CORE=y
CONFIG_REGULATOR_MC13783=y
CONFIG_REGULATOR_MC13892=y
# CONFIG_REGULATOR_MT6311 is not set
# CONFIG_REGULATOR_PFUZE100 is not set
# CONFIG_REGULATOR_PWM is not set
# CONFIG_REGULATOR_TPS51632 is not set
@ -2845,6 +2886,7 @@ CONFIG_USB_MSI2500=m
# CONFIG_V4L_PLATFORM_DRIVERS is not set
# CONFIG_V4L_MEM2MEM_DRIVERS is not set
# CONFIG_V4L_TEST_DRIVERS is not set
# CONFIG_DVB_PLATFORM_DRIVERS is not set
#
# Supported MMC/SDIO adapters
@ -3108,13 +3150,10 @@ CONFIG_DVB_AF9033=m
# Graphics support
#
CONFIG_HAVE_FB_ATMEL=y
#
# Direct Rendering Manager
#
CONFIG_DRM=y
CONFIG_DRM_KMS_HELPER=y
CONFIG_DRM_KMS_FB_HELPER=y
CONFIG_DRM_FBDEV_EMULATION=y
# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
CONFIG_DRM_GEM_CMA_HELPER=y
CONFIG_DRM_KMS_CMA_HELPER=y
@ -3126,22 +3165,29 @@ CONFIG_DRM_KMS_CMA_HELPER=y
# CONFIG_DRM_I2C_CH7006 is not set
# CONFIG_DRM_I2C_SIL164 is not set
# CONFIG_DRM_I2C_NXP_TDA998X is not set
# CONFIG_DRM_PTN3460 is not set
# CONFIG_DRM_PS8622 is not set
# CONFIG_DRM_VGEM is not set
# CONFIG_DRM_EXYNOS is not set
CONFIG_DRM_UDL=m
# CONFIG_DRM_ARMADA is not set
CONFIG_DRM_ATMEL_HLCDC=y
# CONFIG_DRM_TILCDC is not set
# CONFIG_DRM_FSL_DCU is not set
CONFIG_DRM_PANEL=y
#
# Display Panels
#
# CONFIG_DRM_PANEL_SIMPLE is not set
# CONFIG_DRM_PANEL_LD9040 is not set
# CONFIG_DRM_PANEL_S6E8AA0 is not set
# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
# CONFIG_DRM_PANEL_LG_LG4573 is not set
# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
CONFIG_DRM_BRIDGE=y
#
# Display Interface Bridges
#
# CONFIG_DRM_NXP_PTN3460 is not set
# CONFIG_DRM_PARADE_PS8622 is not set
# CONFIG_DRM_STI is not set
#
@ -3160,7 +3206,7 @@ CONFIG_FB_SYS_FILLRECT=y
CONFIG_FB_SYS_COPYAREA=y
CONFIG_FB_SYS_IMAGEBLIT=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
CONFIG_FB_SYS_FOPS=m
CONFIG_FB_SYS_FOPS=y
CONFIG_FB_DEFERRED_IO=y
# CONFIG_FB_SVGALIB is not set
# CONFIG_FB_MACMODES is not set
@ -3191,6 +3237,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_BACKLIGHT_ATMEL_LCDC=y
# CONFIG_BACKLIGHT_GENERIC is not set
# CONFIG_BACKLIGHT_PWM is not set
# CONFIG_BACKLIGHT_PM8941_WLED is not set
# CONFIG_BACKLIGHT_ADP8860 is not set
# CONFIG_BACKLIGHT_ADP8870 is not set
# CONFIG_BACKLIGHT_LM3630A is not set
@ -3303,7 +3350,6 @@ CONFIG_SND_AT91_SOC_SAM9X5_WM8731=y
# CONFIG_SND_SOC_IMX_AUDMUX is not set
CONFIG_SND_MXS_SOC=y
CONFIG_SND_SOC_MXS_SGTL5000=y
# CONFIG_SND_SOC_QCOM is not set
# CONFIG_SND_SOC_XTFPGA_I2S is not set
CONFIG_SND_SOC_I2C_AND_SPI=y
@ -3327,8 +3373,10 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
# CONFIG_SND_SOC_CS4271_I2C is not set
# CONFIG_SND_SOC_CS4271_SPI is not set
# CONFIG_SND_SOC_CS42XX8_I2C is not set
# CONFIG_SND_SOC_CS4349 is not set
# CONFIG_SND_SOC_HDMI_CODEC is not set
# CONFIG_SND_SOC_ES8328 is not set
# CONFIG_SND_SOC_GTM601 is not set
# CONFIG_SND_SOC_PCM1681 is not set
# CONFIG_SND_SOC_PCM1792A is not set
# CONFIG_SND_SOC_PCM512x_I2C is not set
@ -3343,6 +3391,7 @@ CONFIG_SND_SOC_SGTL5000=y
# CONFIG_SND_SOC_SSM4567 is not set
# CONFIG_SND_SOC_STA32X is not set
# CONFIG_SND_SOC_STA350 is not set
# CONFIG_SND_SOC_STI_SAS is not set
# CONFIG_SND_SOC_TAS2552 is not set
# CONFIG_SND_SOC_TAS5086 is not set
# CONFIG_SND_SOC_TAS571X is not set
@ -3406,6 +3455,7 @@ CONFIG_HID_EMS_FF=m
CONFIG_HID_ELECOM=m
CONFIG_HID_ELO=m
CONFIG_HID_EZKEY=m
CONFIG_HID_GEMBIRD=m
CONFIG_HID_HOLTEK=m
CONFIG_HOLTEK_FF=y
CONFIG_HID_GT683R=m
@ -3579,6 +3629,10 @@ CONFIG_USB_MUSB_DUAL_ROLE=y
#
# Platform Glue Layer
#
#
# MUSB DMA mode
#
CONFIG_MUSB_PIO_ONLY=y
# CONFIG_USB_DWC3 is not set
CONFIG_USB_DWC2=y
@ -3785,8 +3839,10 @@ CONFIG_SDIO_UART=m
#
# CONFIG_MMC_ARMMMCI is not set
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_IO_ACCESSORS=y
CONFIG_MMC_SDHCI_PLTFM=y
# CONFIG_MMC_SDHCI_OF_ARASAN is not set
CONFIG_MMC_SDHCI_OF_AT91=y
# CONFIG_MMC_SDHCI_F_SDH30 is not set
CONFIG_MMC_ATMELMCI=y
CONFIG_MMC_MXS=y
@ -3833,7 +3889,6 @@ CONFIG_LEDS_PWM=y
#
# CONFIG_LEDS_BLINKM is not set
# CONFIG_LEDS_SYSCON is not set
# CONFIG_LEDS_PM8941_WLED is not set
#
# LED Triggers
@ -3938,6 +3993,7 @@ CONFIG_RTC_DRV_RV3029C2=y
# CONFIG_RTC_DRV_BQ4802 is not set
# CONFIG_RTC_DRV_RP5C01 is not set
# CONFIG_RTC_DRV_V3020 is not set
# CONFIG_RTC_DRV_ZYNQMP is not set
#
# on-CPU RTC drivers
@ -3960,16 +4016,17 @@ CONFIG_DMADEVICES=y
#
# DMA Devices
#
# CONFIG_AMBA_PL08X is not set
# CONFIG_DW_DMAC is not set
CONFIG_AT_HDMAC=y
# CONFIG_AT_XDMAC is not set
# CONFIG_PL330_DMA is not set
CONFIG_MXS_DMA=y
# CONFIG_FSL_EDMA is not set
# CONFIG_NBPFAXI_DMA is not set
CONFIG_DMA_ENGINE=y
CONFIG_DMA_OF=y
# CONFIG_AMBA_PL08X is not set
CONFIG_AT_HDMAC=y
# CONFIG_AT_XDMAC is not set
# CONFIG_FSL_EDMA is not set
# CONFIG_IDMA64 is not set
CONFIG_MXS_DMA=y
# CONFIG_NBPFAXI_DMA is not set
# CONFIG_PL330_DMA is not set
# CONFIG_DW_DMAC is not set
#
# DMA Clients
@ -4122,7 +4179,6 @@ CONFIG_LIRC_ZILOG=m
# Android
#
# CONFIG_STAGING_BOARD is not set
CONFIG_USB_WPAN_HCD=m
CONFIG_WIMAX_GDM72XX=m
CONFIG_WIMAX_GDM72XX_QOS=y
CONFIG_WIMAX_GDM72XX_K_MODE=y
@ -4142,7 +4198,7 @@ CONFIG_FB_TFT_BD663474=m
CONFIG_FB_TFT_HX8340BN=m
CONFIG_FB_TFT_HX8347D=m
CONFIG_FB_TFT_HX8353D=m
# CONFIG_FB_TFT_HX8357D is not set
CONFIG_FB_TFT_HX8357D=m
CONFIG_FB_TFT_ILI9163=m
CONFIG_FB_TFT_ILI9320=m
CONFIG_FB_TFT_ILI9325=m
@ -4161,11 +4217,13 @@ CONFIG_FB_TFT_SSD1351=m
CONFIG_FB_TFT_ST7735R=m
CONFIG_FB_TFT_TINYLCD=m
CONFIG_FB_TFT_TLS8204=m
CONFIG_FB_TFT_UC1611=m
CONFIG_FB_TFT_UC1701=m
CONFIG_FB_TFT_UPD161704=m
CONFIG_FB_TFT_WATTEROTT=m
CONFIG_FB_FLEX=m
# CONFIG_FB_TFT_FBTFT_DEVICE is not set
# CONFIG_MOST is not set
# CONFIG_CHROME_PLATFORMS is not set
CONFIG_CLKDEV_LOOKUP=y
CONFIG_HAVE_CLK_PREPARE=y
@ -4217,6 +4275,7 @@ CONFIG_ATMEL_PIT=y
# CONFIG_PM_DEVFREQ is not set
# CONFIG_EXTCON is not set
CONFIG_MEMORY=y
# CONFIG_ARM_PL172_MPMC is not set
CONFIG_ATMEL_SDRAMC=y
CONFIG_IIO=y
CONFIG_IIO_BUFFER=y
@ -4236,13 +4295,13 @@ CONFIG_IIO_ST_ACCEL_3AXIS=m
CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
CONFIG_KXSD9=m
CONFIG_MMA8452=m
CONFIG_KXCJK1013=m
CONFIG_MMA8452=m
CONFIG_MMA9551_CORE=m
CONFIG_MMA9551=m
CONFIG_MMA9553=m
# CONFIG_STK8312 is not set
# CONFIG_STK8BA50 is not set
CONFIG_STK8312=m
CONFIG_STK8BA50=m
#
# Analog to digital converters
@ -4303,7 +4362,7 @@ CONFIG_AD5755=m
CONFIG_AD5764=m
CONFIG_AD5791=m
CONFIG_AD7303=m
# CONFIG_M62332 is not set
CONFIG_M62332=m
CONFIG_MAX517=m
CONFIG_MAX5821=m
CONFIG_MCP4725=m
@ -4361,7 +4420,7 @@ CONFIG_IIO_ADIS_LIB_BUFFER=y
CONFIG_ADJD_S311=m
CONFIG_AL3320A=m
CONFIG_APDS9300=m
# CONFIG_BH1750 is not set
CONFIG_BH1750=m
CONFIG_CM32181=m
CONFIG_CM3232=m
CONFIG_CM3323=m
@ -4371,8 +4430,11 @@ CONFIG_ISL29125=m
CONFIG_HID_SENSOR_ALS=m
CONFIG_HID_SENSOR_PROX=m
CONFIG_JSA1212=m
CONFIG_RPR0521=m
CONFIG_LTR501=m
# CONFIG_STK3310 is not set
CONFIG_OPT3001=m
CONFIG_PA12203001=m
CONFIG_STK3310=m
CONFIG_TCS3414=m
CONFIG_TCS3472=m
CONFIG_SENSORS_TSL2563=m
@ -4386,11 +4448,11 @@ CONFIG_AK8975=m
CONFIG_AK09911=m
CONFIG_MAG3110=m
CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
# CONFIG_MMC35240 is not set
CONFIG_MMC35240=m
CONFIG_IIO_ST_MAGN_3AXIS=m
CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
# CONFIG_BMC150_MAGN is not set
CONFIG_BMC150_MAGN=m
#
# Inclinometer sensors
@ -4459,10 +4521,17 @@ CONFIG_ATMEL_AIC_IRQ=y
# CONFIG_POWERCAP is not set
# CONFIG_MCB is not set
#
# Performance monitor support
#
CONFIG_ARM_PMU=y
# CONFIG_RAS is not set
#
# Android
#
# CONFIG_ANDROID is not set
# CONFIG_NVMEM is not set
#
# Firmware Drivers
@ -4475,7 +4544,7 @@ CONFIG_ATMEL_AIC_IRQ=y
# CONFIG_EXT2_FS is not set
# CONFIG_EXT3_FS is not set
CONFIG_EXT4_FS=y
CONFIG_EXT4_USE_FOR_EXT23=y
CONFIG_EXT4_USE_FOR_EXT2=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXT4_ENCRYPTION=y
@ -4845,6 +4914,7 @@ CONFIG_TRACING_SUPPORT=y
# CONFIG_TEST_FIRMWARE is not set
# CONFIG_TEST_UDELAY is not set
# CONFIG_MEMTEST is not set
# CONFIG_TEST_STATIC_KEYS is not set
# CONFIG_SAMPLES is not set
CONFIG_HAVE_ARCH_KGDB=y
# CONFIG_KGDB is not set
@ -4903,6 +4973,7 @@ CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
CONFIG_CRYPTO_GF128MUL=y
CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_NULL2=y
CONFIG_CRYPTO_WORKQUEUE=y
CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_MCRYPTD=m
@ -5009,6 +5080,11 @@ CONFIG_CRYPTO_DEV_ATMEL_TDES=y
CONFIG_CRYPTO_DEV_ATMEL_SHA=y
CONFIG_CRYPTO_DEV_MXS_DCP=y
# CONFIG_ASYMMETRIC_KEY_TYPE is not set
#
# Certificates for signature checking
#
# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
CONFIG_ARM_CRYPTO=y
CONFIG_CRYPTO_SHA1_ARM=y
CONFIG_CRYPTO_SHA256_ARM=y
@ -5028,7 +5104,6 @@ CONFIG_GENERIC_NET_UTILS=y
CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_GENERIC_IO=y
CONFIG_STMP_DEVICE=y
CONFIG_PERCPU_RWSEM=y
CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
CONFIG_CRC_CCITT=y
CONFIG_CRC16=y
@ -5078,7 +5153,6 @@ CONFIG_DQL=y
CONFIG_NLATTR=y
CONFIG_GENERIC_ATOMIC64=y
CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
CONFIG_AVERAGE=y
CONFIG_CORDIC=m
# CONFIG_DDR is not set
CONFIG_LIBFDT=y
@ -5096,5 +5170,6 @@ CONFIG_FONT_MINI_4x6=y
# CONFIG_FONT_SUN8x16 is not set
# CONFIG_FONT_SUN12x22 is not set
# CONFIG_FONT_10x18 is not set
# CONFIG_SG_SPLIT is not set
CONFIG_ARCH_HAS_SG_CHAIN=y
# CONFIG_VIRTUALIZATION is not set

View file

@ -7,7 +7,7 @@ pkgbase=linux-armv7
_srcname=linux-4.2
_kernelname=${pkgbase#linux}
_desc="ARMv7 multi-platform"
pkgver=4.2.4
pkgver=4.2.5
pkgrel=1
rcnrel=armv7-x2
arch=('armv7h')
@ -34,8 +34,8 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
'kernel.keyblock'
'kernel_data_key.vbprivk')
md5sums=('3d5ea06d767e2f35c999eeadafc76523'
'1289fdb357a552edc672208ce729d9c6'
'ee35326daef5496af13fa3444bb0fdd7'
'19e47863ca441b2e11f90f25fb6c41ec'
'f5cac70ed1546912a47e350dbe449886'
'61f728f854713d17a3d4ef00f8e38f1e'
'bc39bcc5d752155854f31eb7758db5e8'
'e871d819421abab551d8219b62cccdf9'

View file

@ -1,7 +1,7 @@
From 6c25652c1f1b59476d6a548a1d1d811f49615b52 Mon Sep 17 00:00:00 2001
From 6139e70c5d096d5d8f9824f347d5464c2b58d36c Mon Sep 17 00:00:00 2001
From: Tom Lendacky <thomas.lendacky@amd.com>
Date: Thu, 28 May 2015 16:38:57 -0400
Subject: [PATCH 1/4] amd-xgbe-a0: Add support for XGBE on A0
Subject: [PATCH 1/7] amd-xgbe-a0: Add support for XGBE on A0
Add XGBE driver support for A0 hardware.
@ -10387,5 +10387,5 @@ index 0000000..04c00d2
+
+#endif
--
2.5.3
2.6.1

View file

@ -1,7 +1,7 @@
From 3cc72dc1310f5dd00d38f6dcac4e18a1a136622e Mon Sep 17 00:00:00 2001
From 2d023b26ac133794b5a3c9923c4e090b9d8e2159 Mon Sep 17 00:00:00 2001
From: Tom Lendacky <thomas.lendacky@amd.com>
Date: Tue, 17 Mar 2015 10:58:38 -0500
Subject: [PATCH 2/4] amd-xgbe-phy-a0: Add support for XGBE PHY on A0
Subject: [PATCH 2/7] amd-xgbe-phy-a0: Add support for XGBE PHY on A0
Add XGBE phy driver support for A0 hardware.
@ -16,10 +16,10 @@ Signed-off-by: Mark Salter <msalter@redhat.com>
create mode 100644 drivers/net/phy/amd-xgbe-phy-a0.c
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index cb86d7a..a3138b1 100644
index c5ad98a..1401e35 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -24,6 +24,13 @@ config AMD_PHY
@@ -29,6 +29,13 @@ config AMD_PHY
---help---
Currently supports the am79c874
@ -34,10 +34,10 @@ index cb86d7a..a3138b1 100644
tristate "Drivers for Marvell PHYs"
---help---
diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
index fcc25a0..6ebb9ba 100644
index 87f079c..b76303f 100644
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -29,6 +29,7 @@ obj-$(CONFIG_MDIO_OCTEON) += mdio-octeon.o
@@ -31,6 +31,7 @@ obj-$(CONFIG_MDIO_OCTEON) += mdio-octeon.o
obj-$(CONFIG_MICREL_KS8995MA) += spi_ks8995.o
obj-$(CONFIG_AT803X_PHY) += at803x.o
obj-$(CONFIG_AMD_PHY) += amd.o
@ -1866,5 +1866,5 @@ index 0000000..c352d5c
+};
+MODULE_DEVICE_TABLE(mdio, amd_xgbe_phy_a0_ids);
--
2.5.3
2.6.1

View file

@ -1,14 +1,14 @@
From 4d105425bac75a6341c2536e4617f144e529ddbb Mon Sep 17 00:00:00 2001
From ae47936291ae710deb86e82c3cd93dc1542205e7 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Sun, 3 May 2015 18:35:23 +0100
Subject: [PATCH 3/4] arm64: acpi drop expert patch
Subject: [PATCH 3/7] arm64: acpi drop expert patch
---
drivers/acpi/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 114cf48..70ba3ef 100644
index 5d1015c..b2c68bb 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -5,7 +5,7 @@
@ -21,5 +21,5 @@ index 114cf48..70ba3ef 100644
select PNP
default y
--
2.5.3
2.6.1

View file

@ -1,7 +1,7 @@
From 5c695c47800d6066d5650637d719284e837414a1 Mon Sep 17 00:00:00 2001
From 244a166ec33d083b65b6883e88249e191698d5a5 Mon Sep 17 00:00:00 2001
From: Mark Langsdorf <mlangsdo@redhat.com>
Date: Wed, 25 Mar 2015 14:12:51 -0400
Subject: [PATCH 4/4] usb: make xhci platform driver use 64 bit or 32 bit DMA
Subject: [PATCH 4/7] usb: make xhci platform driver use 64 bit or 32 bit DMA
The xhci platform driver needs to work on systems that either only
support 64-bit DMA or only support 32-bit DMA. Attempt to set a
@ -40,5 +40,5 @@ index 890ad9d..122b1fb 100644
hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));
if (!hcd)
--
2.5.3
2.6.1

View file

@ -0,0 +1,132 @@
From 4e0a44d00cc1248ef06915cf795232e94968313f Mon Sep 17 00:00:00 2001
From: Kumar Gala <galak@codeaurora.org>
Date: Tue, 3 Mar 2015 15:39:07 -0600
Subject: [PATCH 5/7] devicetree: bindings: Document qcom,msm-id and
qcom,board-id
The top level qcom,msm-id and qcom,board-id are utilized by bootloaders
on Qualcomm MSM platforms to determine which device tree should be
utilized and passed to the kernel.
Cc: <devicetree@vger.kernel.org>
Signed-off-by: Kumar Gala <galak@codeaurora.org>
---
Documentation/devicetree/bindings/arm/msm/ids.txt | 65 +++++++++++++++++++++++
include/dt-bindings/arm/qcom-ids.h | 33 ++++++++++++
2 files changed, 98 insertions(+)
create mode 100644 Documentation/devicetree/bindings/arm/msm/ids.txt
create mode 100644 include/dt-bindings/arm/qcom-ids.h
diff --git a/Documentation/devicetree/bindings/arm/msm/ids.txt b/Documentation/devicetree/bindings/arm/msm/ids.txt
new file mode 100644
index 0000000..9ee8428
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/msm/ids.txt
@@ -0,0 +1,65 @@
+* MSM-ID
+
+The qcom,msm-id entry specifies the MSM chipset and hardware revision. It can
+optionally be an array of these to indicate multiple hardware that use the same
+device tree. It is expected that the bootloader will use this information at
+boot-up to decide which device tree to use when given multiple device trees,
+some of which may not be compatible with the actual hardware. It is the
+bootloader's responsibility to pass the correct device tree to the kernel.
+
+PROPERTIES
+
+- qcom,msm-id:
+ Usage: required
+ Value type: <prop-encoded-array> (<chipset_id, rev_id> [, <c2, r2> ..])
+ Definition:
+ The "chipset_id" consists of three fields as below:
+
+ bits 0-15 = The unique MSM chipset id.
+ bits 16-31 = Reserved. Should be 0
+
+ chipset_id is an exact match value
+
+ The "rev_id" is a chipset specific 32-bit id that represents
+ the version of the chipset.
+
+ The rev_id is a best match id. The bootloader will look for
+ the closest possible patch.
+
+* BOARD-ID
+
+The qcom,board-id entry specifies the board type and revision information. It
+can optionally be an array of these to indicate multiple boards that use the
+same device tree. It is expected that the bootloader will use this information
+at boot-up to decide which device tree to use when given multiple device trees,
+some of which may not be compatible with the actual hardware. It is the
+bootloader's responsibility to pass the correct device tree to the kernel.
+
+PROPERTIES
+
+- qcom,board-id:
+ Usage: required
+ Value type: <prop-encoded-array> (<board_id, subtype_id> [, <b2, s2> ..])
+ Definition:
+ The "board_id" consists of three fields as below:
+
+ bits 31-24 = Unusued.
+ bits 23-16 = Platform Version Major
+ bits 15-8 = Platfrom Version Minor
+ bits 7-0 = Platform Type
+
+ Platform Type field is an exact match value. The Platform
+ Major/Minor field is a best match. The bootloader will look
+ for the closest possible match.
+
+ The "subtype_id" is unique to a Platform Type/Chipset ID. For
+ a given Platform Type, there will typically only be a single
+ board and the subtype_id will be 0. However in some cases board
+ variants may need to be distinquished by different subtype_id
+ values.
+
+ subtype_id is an exact match value.
+
+EXAMPLE:
+ qcom,board-id = <15 2>;
+ qcom,msm-id = <0x1007e 0>;
diff --git a/include/dt-bindings/arm/qcom-ids.h b/include/dt-bindings/arm/qcom-ids.h
new file mode 100644
index 0000000..a18f34e
--- /dev/null
+++ b/include/dt-bindings/arm/qcom-ids.h
@@ -0,0 +1,33 @@
+/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+#ifndef __DT_BINDINGS_QCOM_IDS_H
+#define __DT_BINDINGS_QCOM_IDS_H
+
+/* qcom,msm-id */
+#define QCOM_ID_MSM8916 206
+#define QCOM_ID_APQ8016 247
+#define QCOM_ID_MSM8216 248
+#define QCOM_ID_MSM8116 249
+#define QCOM_ID_MSM8616 250
+
+/* qcom,board-id */
+#define QCOM_BRD_ID(a, major, minor) \
+ (((major & 0xff) << 16) | ((minor & 0xff) << 8) | QCOM_BRD_ID_##a)
+
+#define QCOM_BRD_ID_MTP 8
+#define QCOM_BRD_ID_DRAGONBRD 10
+#define QCOM_BRD_ID_SBC 24
+
+#define QCOM_BRD_SUBTYPE_DEFAULT 0
+#define QCOM_BRD_SUBTYPE_MTP8916_SMB1360 1
+
+#endif
--
2.6.1

View file

@ -0,0 +1,55 @@
From 32fd37c09fee1d3a80ec7e4fc23a124aa14503c4 Mon Sep 17 00:00:00 2001
From: Kumar Gala <galak@codeaurora.org>
Date: Wed, 11 Mar 2015 15:51:20 -0500
Subject: [PATCH 6/7] arm64: dts: Add Qualcomm MSM8916 & MTP8916 ids
Add qcom,msm-id and qcom,board-id to allow bootloader to identify which
device tree to boot on the MTP8916 boards.
Signed-off-by: Kumar Gala <galak@codeaurora.org>
---
arch/arm64/boot/dts/qcom/msm8916-mtp.dts | 3 +++
arch/arm64/boot/dts/qcom/msm8916.dtsi | 5 +++++
2 files changed, 8 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/msm8916-mtp.dts b/arch/arm64/boot/dts/qcom/msm8916-mtp.dts
index fced77f..6c68b4e 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-mtp.dts
@@ -13,10 +13,13 @@
/dts-v1/;
+#include <dt-bindings/arm/qcom-ids.h>
#include "msm8916-mtp.dtsi"
/ {
model = "Qualcomm Technologies, Inc. MSM 8916 MTP";
compatible = "qcom,msm8916-mtp", "qcom,msm8916-mtp-smb1360",
"qcom,msm8916", "qcom,mtp";
+ qcom,board-id = <QCOM_BRD_ID(MTP, 1, 0) QCOM_BRD_SUBTYPE_DEFAULT>,
+ <QCOM_BRD_ID(MTP, 1, 0) QCOM_BRD_SUBTYPE_MTP8916_SMB1360>;
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index 5911de0..d369133 100644
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -14,10 +14,15 @@
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/clock/qcom,gcc-msm8916.h>
#include <dt-bindings/reset/qcom,gcc-msm8916.h>
+#include <dt-bindings/arm/qcom-ids.h>
/ {
model = "Qualcomm Technologies, Inc. MSM8916";
compatible = "qcom,msm8916";
+ qcom,msm-id = <QCOM_ID_MSM8916 0>,
+ <QCOM_ID_MSM8216 0>,
+ <QCOM_ID_MSM8116 0>,
+ <QCOM_ID_MSM8616 0>;
interrupt-parent = <&intc>;
--
2.6.1

View file

@ -0,0 +1,50 @@
From b26a60486bb31529cbb6b1cacd20657ad16dfdbd Mon Sep 17 00:00:00 2001
From: Andy Gross <agross@codeaurora.org>
Date: Tue, 31 Mar 2015 14:26:15 -0500
Subject: [PATCH 7/7] arm64: dts: qcom: Add APQ8016 SBC support
This patch set adds support for the APQ8016 SBC.
Signed-off-by: Andy Gross <agross@codeaurora.org>
[Srinivas Kandagatla]: rebased on top of kumars original patch
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 3 ++-
arch/arm64/boot/dts/qcom/msm8916.dtsi | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
index 825f489..b0cac53 100644
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
@@ -12,10 +12,11 @@
*/
/dts-v1/;
-
+#include <dt-bindings/arm/qcom-ids.h>
#include "apq8016-sbc.dtsi"
/ {
model = "Qualcomm Technologies, Inc. APQ 8016 SBC";
compatible = "qcom,apq8016-sbc", "qcom,apq8016", "qcom,sbc";
+ qcom,board-id = <QCOM_BRD_ID(SBC, 1, 0) QCOM_BRD_SUBTYPE_DEFAULT>;
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index d369133..a7aa37d 100644
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -22,7 +22,9 @@
qcom,msm-id = <QCOM_ID_MSM8916 0>,
<QCOM_ID_MSM8216 0>,
<QCOM_ID_MSM8116 0>,
- <QCOM_ID_MSM8616 0>;
+ <QCOM_ID_MSM8616 0>,
+ <QCOM_ID_APQ8016 0>;
+
interrupt-parent = <&intc>;
--
2.6.1

View file

@ -4,10 +4,10 @@
buildarch=8
pkgbase=linux-armv8
_srcname=linux-4.2
_srcname=linux-4.3
_kernelname=${pkgbase#linux}
_desc="ARMv8 multi-platform"
pkgver=4.2.3
pkgver=4.3.0
pkgrel=1
arch=('aarch64')
url="http://www.kernel.org/"
@ -15,33 +15,41 @@ license=('GPL2')
makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git')
options=('!strip')
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"
#"http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz"
'0001-amd-xgbe-a0-Add-support-for-XGBE-on-A0.patch'
'0002-amd-xgbe-phy-a0-Add-support-for-XGBE-PHY-on-A0.patch'
'0003-arm64-acpi-drop-expert-patch.patch'
'0004-usb-make-xhci-platform-driver-use-64-bit-or-32-bit-D.patch'
'0005-devicetree-bindings-Document-qcom-msm-id-and-qcom-bo.patch'
'0006-arm64-dts-Add-Qualcomm-MSM8916-MTP8916-ids.patch'
'0007-arm64-dts-qcom-Add-APQ8016-SBC-support.patch'
'config'
'linux.preset')
md5sums=('3d5ea06d767e2f35c999eeadafc76523'
'6a7355d968116129c19dc053fb2d557a'
'36d2311875f32f694282b10d4237c243'
'49674599c92ee328463f4b6c83b15612'
'f5e39c9f752c1accd7267dea3f0e7a36'
'31e279e23056ddb39b1c5353de5d477a'
'0a5285e98eb57115398cca6e15d01ffd'
md5sums=('58b35794eee3b6d52ce7be39357801e7'
'a87ebaf5c2af339ffea8b4192b96b64d'
'cca24878b9021979a56ad71094e3f525'
'13a487bdc9774028c7906dfd8e642bc8'
'e35e5c40596a67872a8696bb8cb4e1ed'
'1ec8970e2fdba212479eae61cd799a12'
'1a66e243ed08e3331b2550cd777ef800'
'634737dc18404f4a05a1fd557dc4839d'
'220a53cd10a5952a2c573b34e95edfc1'
'c1b17ea11a6c9ca95a26881db1376e8e')
prepare() {
cd "${srcdir}/${_srcname}"
# add upstream patch
git apply --whitespace=nowarn ../patch-${pkgver}
#git apply --whitespace=nowarn ../patch-${pkgver}
# ALARM patches
git apply ../0001-amd-xgbe-a0-Add-support-for-XGBE-on-A0.patch
git apply ../0002-amd-xgbe-phy-a0-Add-support-for-XGBE-PHY-on-A0.patch
git apply ../0003-arm64-acpi-drop-expert-patch.patch
git apply ../0004-usb-make-xhci-platform-driver-use-64-bit-or-32-bit-D.patch
git apply ../0005-devicetree-bindings-Document-qcom-msm-id-and-qcom-bo.patch
git apply ../0006-arm64-dts-Add-Qualcomm-MSM8916-MTP8916-ids.patch
git apply ../0007-arm64-dts-qcom-Add-APQ8016-SBC-support.patch
cat "${srcdir}/config" > ./.config
@ -80,7 +88,7 @@ build() {
# build!
unset LDFLAGS
make ${MAKEFLAGS} Image modules dtbs
make ${MAKEFLAGS} Image Image.gz modules dtbs
}
_package() {
@ -103,8 +111,8 @@ _package() {
mkdir -p "${pkgdir}"/{lib/modules,lib/firmware}
make INSTALL_MOD_PATH="${pkgdir}" modules_install
make INSTALL_DTBS_PATH="${pkgdir}/boot/dtb-${pkgbase}" dtbs_install
cp arch/$KARCH/boot/Image "${pkgdir}/boot/vmlinuz-${pkgbase}"
make INSTALL_DTBS_PATH="${pkgdir}/boot/dtbs" dtbs_install
cp arch/$KARCH/boot/Image{,.gz} "${pkgdir}/boot"
# set correct depmod command for install
sed \

File diff suppressed because it is too large Load diff

View file

@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=-armv8
KERNEL_VERSION=4.2.3-1-ARCH
KERNEL_VERSION=4.3.0-1-ARCH
post_install () {
# updating module dependencies
@ -26,6 +26,6 @@ post_upgrade() {
post_remove() {
# also remove the compat symlinks
rm -f boot/initramfs-linux${KERNEL_NAME}.img
rm -f boot/initramfs-linux${KERNEL_NAME}-fallback.img
rm -f boot/initramfs-linux.img
rm -f boot/initramfs-linux-fallback.img
}

View file

@ -4,12 +4,12 @@
buildarch=4
pkgbase=linux-odroid-c1
_commit=f444f77250eec5310730b31b3a0d9599bbe2135c
_commit=c5a11154dba55343fc7cabcef3903cc09fb9b250
_srcname=linux-${_commit}
_kernelname=${pkgbase#linux}
_desc="ODROID-C1"
pkgver=3.10.80
pkgrel=15
pkgrel=16
arch=('armv7h')
url="https://github.com/hardkernel/linux"
license=('GPL2')
@ -20,10 +20,10 @@ source=("https://github.com/hardkernel/linux/archive/${_commit}.tar.gz"
'0001-gcc-5.1-fix-for-mac-address.patch'
'config'
'amlogic.service')
md5sums=('990f103463ab229dd8d7d70d85f80f32'
md5sums=('216465091dbfe7d05d493c0824ce8b9d'
'SKIP'
'31b78a5c8c50bae59d62b11f53e14642'
'fb1db66cb36fc6e6d1ce438a2524554a'
'1ac4f9f07abe1a53af4e4c42eaf98981'
'b8956789318f49cec5b8bb0b41654a9b')
prepare() {

View file

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 3.10.80-14 Kernel Configuration
# Linux/arm 3.10.80-16 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@ -345,6 +345,7 @@ CONFIG_CLKTREE_DEBUG=y
# CONFIG_MESON_CPU_TEMP_SENSOR is not set
CONFIG_MESON_SUSPEND_FIRMWARE_BASE=0x04f00000
# CONFIG_MESON_TRUSTZONE is not set
CONFIG_MESON_GIC_FIQ=y
# CONFIG_MESON_CUSTOM_BOARD_SUPPORT is not set
# CONFIG_GPIO_PCA953X is not set
# CONFIG_KEYBOARD_GPIO_POLLED is not set

View file

@ -6,7 +6,7 @@
# - drop valgrind makedepend
pkgname=cairo
pkgver=1.14.2
pkgver=1.14.4
pkgrel=1
pkgdesc="Cairo vector graphics library"
arch=(i686 x86_64)
@ -20,7 +20,7 @@ makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc'
provides=('cairo-xcb')
replaces=('cairo-xcb')
source=(http://cairographics.org/releases/cairo-$pkgver.tar.xz)
sha1sums=('c8da68aa66ca0855b5d0ff552766d3e8679e1d24')
sha1sums=('5b44471e7c328f96de6830baf8ea65030de797f9')
build() {
cd $pkgname-$pkgver
@ -36,7 +36,7 @@ build() {
--enable-ps \
--enable-pdf \
--enable-gobject \
--enable-gtk-doc
--enable-gtk-doc
#--disable-xlib-xcb \
#--enable-test-surfaces \ takes ages

View file

@ -5,7 +5,7 @@
# - patch to remove neon detection in configure
pkgname=ceph
pkgver=0.94.4
pkgver=0.94.5
pkgrel=1
pkgdesc='Distributed, fault-tolerant storage platform delivering object, block, and file system'
arch=('x86_64' 'i686')
@ -38,7 +38,7 @@ source=("http://ceph.com/download/$pkgname-$pkgver.tar.bz2"
'ceph-mon@.service'
'ceph-mds@.service'
'no-neon.patch')
md5sums=('d7b42d06e8eaa7820fe34490aaaba101'
md5sums=('e7c35581f8d36d34f7cde16a862e54fb'
'9104b5b90349d2aa7802eb89158456e8'
'63a584aa2a4e2b0efbee4e8fd32593f0'
'd2411c41208d95743baa6d899cc1e0b0'

View file

@ -8,7 +8,7 @@
pkgname=ghostscript
pkgver=9.18
pkgrel=3
pkgrel=4
pkgdesc="An interpreter for the PostScript language"
arch=('i686' 'x86_64')
license=('AGPL' 'custom')
@ -20,12 +20,14 @@ optdepends=('texlive-core: needed for dvipdf'
url="http://www.ghostscript.com/"
source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2
ghostscript-sys-zlib.patch
bug_696246.diff)
bug_696246.diff
add_gserrors_h.diff)
#options=('!makeflags')
# http://downloads.ghostscript.com/public/SHA1SUMS
sha1sums=('388fea50a38e422a4c6ff27c184491bf5ecb96e1'
'e054caf753df4d67221b29a2eac66130653f7556'
'f259eaac3beb0ec346bb2d4d2455e4e3baddecd4')
'f259eaac3beb0ec346bb2d4d2455e4e3baddecd4'
'ca686fed1af36d1f9fa866b47ff129c71d6a19ff')
prepare() {
cd ghostscript-${pkgver}
@ -33,6 +35,8 @@ prepare() {
patch -Np1 -i ${srcdir}/ghostscript-sys-zlib.patch
# fix http://bugs.ghostscript.com/show_bug.cgi?id=696246 - FS#46637, FS#46734?
patch -Np1 -i ${srcdir}/bug_696246.diff
# add a missing header; FS#46928
patch -Np1 -i ${srcdir}/add_gserrors_h.diff
}
build() {

View file

@ -0,0 +1,43 @@
From feafe5e540a0545ec5d28f3f66bb542056bba495 Mon Sep 17 00:00:00 2001
From: Chris Liddell <chris.liddell@artifex.com>
Date: Fri, 23 Oct 2015 10:16:11 +0100
Subject: [PATCH] Bug 696301: add gserrors.h to the installed files
for the so-install target.
Also remove a spurious (copy'n'paste error) comment.
No cluster differences
---
base/gserrors.h | 2 +-
base/unix-dll.mak | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/base/gserrors.h b/base/gserrors.h
index 5f18081..cdebb38 100644
--- a/base/gserrors.h
+++ b/base/gserrors.h
@@ -25,7 +25,7 @@
/* We don't use a typedef internally to avoid a lot of casting. */
enum gs_error_type {
- gs_error_ok = 0, /* unknown error */
+ gs_error_ok = 0,
gs_error_unknownerror = -1, /* unknown error */
gs_error_dictfull = -2,
gs_error_dictstackoverflow = -3,
diff --git a/base/unix-dll.mak b/base/unix-dll.mak
index 7b67aa1..73b4fa9 100644
--- a/base/unix-dll.mak
+++ b/base/unix-dll.mak
@@ -186,6 +186,7 @@ install-so-subtarget: so-subtarget
ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
$(INSTALL_DATA) $(PSSRC)iapi.h $(DESTDIR)$(gsincludedir)iapi.h
$(INSTALL_DATA) $(PSSRC)ierrors.h $(DESTDIR)$(gsincludedir)ierrors.h
+ $(INSTALL_DATA) $(GLSRC)gserrors.h $(DESTDIR)$(gsincludedir)gserrors.h
$(INSTALL_DATA) $(DEVSRC)gdevdsp.h $(DESTDIR)$(gsincludedir)gdevdsp.h
soinstall:
--
2.5.1

View file

@ -5,8 +5,8 @@
# - drop valgrind makedepend
pkgname=gst-plugins-bad
pkgver=1.6.0
pkgrel=2
pkgver=1.6.1
pkgrel=1
pkgdesc="GStreamer Multimedia Framework Bad Plugins"
arch=('i686' 'x86_64')
license=('LGPL')
@ -16,7 +16,7 @@ makedepends=('schroedinger' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2' 'python
'gobject-introspection' 'gtk-doc' 'gtk3' 'clutter' 'opencv' 'libtiger' 'ladspa' 'openal' 'libusb')
options=(!emptydirs)
source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
sha256sums=('d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49')
sha256sums=('e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466')
prepare() {
cd $pkgname-$pkgver

View file

@ -0,0 +1,142 @@
From 0bee2d927c97454e629b0789c7f4e3d509cf4178 Mon Sep 17 00:00:00 2001
From: Evgeniy Stepanov <eugeni.stepanov@gmail.com>
Date: Thu, 8 Oct 2015 21:35:34 +0000
Subject: [PATCH] New MSan mapping layout (compiler-rt part).
This is an implementation of
https://github.com/google/sanitizers/issues/579
It has a number of advantages over the current mapping:
* Works for non-PIE executables.
* Does not require ASLR; as a consequence, debugging MSan programs in
gdb no longer requires "set disable-randomization off".
* Supports linux kernels >=4.1.2.
* The code is marginally faster and smaller.
This is an ABI break. We never really promised ABI stability, but
this patch includes a courtesy escape hatch: a compile-time macro
that reverts back to the old mapping layout.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@249754 91177308-0d34-0410-b5e6-96231b3b80d8
---
lib/msan/msan.h | 23 ++++++++++++++++++++++
lib/msan/msan_allocator.cc | 8 +++++++-
test/msan/mmap.cc | 4 +++-
test/msan/strlen_of_shadow.cc | 2 +-
.../TestCases/Posix/decorate_proc_maps.cc | 4 ++--
5 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/lib/msan/msan.h b/lib/msan/msan.h
index 3776fa9..2d77983 100644
--- a/lib/msan/msan.h
+++ b/lib/msan/msan.h
@@ -135,6 +135,7 @@ const MappingDesc kMemoryLayout[] = {
#elif SANITIZER_LINUX && SANITIZER_WORDSIZE == 64
+#ifdef MSAN_LINUX_X86_64_OLD_MAPPING
// Requries PIE binary and ASLR enabled.
// Main thread stack and DSOs at 0x7f0000000000 (sometimes 0x7e0000000000).
// Heap at 0x600000000000.
@@ -146,6 +147,28 @@ const MappingDesc kMemoryLayout[] = {
#define MEM_TO_SHADOW(mem) (((uptr)(mem)) & ~0x400000000000ULL)
#define SHADOW_TO_ORIGIN(mem) (((uptr)(mem)) + 0x200000000000ULL)
+#else // MSAN_LINUX_X86_64_OLD_MAPPING
+// All of the following configurations are supported.
+// ASLR disabled: main executable and DSOs at 0x555550000000
+// PIE and ASLR: main executable and DSOs at 0x7f0000000000
+// non-PIE: main executable below 0x100000000, DSOs at 0x7f0000000000
+// Heap at 0x700000000000.
+const MappingDesc kMemoryLayout[] = {
+ {0x000000000000ULL, 0x010000000000ULL, MappingDesc::APP, "app-1"},
+ {0x010000000000ULL, 0x100000000000ULL, MappingDesc::SHADOW, "shadow-2"},
+ {0x100000000000ULL, 0x110000000000ULL, MappingDesc::INVALID, "invalid"},
+ {0x110000000000ULL, 0x200000000000ULL, MappingDesc::ORIGIN, "origin-2"},
+ {0x200000000000ULL, 0x300000000000ULL, MappingDesc::SHADOW, "shadow-3"},
+ {0x300000000000ULL, 0x400000000000ULL, MappingDesc::ORIGIN, "origin-3"},
+ {0x400000000000ULL, 0x500000000000ULL, MappingDesc::INVALID, "invalid"},
+ {0x500000000000ULL, 0x510000000000ULL, MappingDesc::SHADOW, "shadow-1"},
+ {0x510000000000ULL, 0x600000000000ULL, MappingDesc::APP, "app-2"},
+ {0x600000000000ULL, 0x610000000000ULL, MappingDesc::ORIGIN, "origin-1"},
+ {0x610000000000ULL, 0x700000000000ULL, MappingDesc::INVALID, "invalid"},
+ {0x700000000000ULL, 0x800000000000ULL, MappingDesc::APP, "app-3"}};
+#define MEM_TO_SHADOW(mem) (((uptr)(mem)) ^ 0x500000000000ULL)
+#define SHADOW_TO_ORIGIN(mem) (((uptr)(mem)) + 0x100000000000ULL)
+#endif // MSAN_LINUX_X86_64_OLD_MAPPING
#else
#error "Unsupported platform"
diff --git a/lib/msan/msan_allocator.cc b/lib/msan/msan_allocator.cc
index 865a458..b7d3947 100644
--- a/lib/msan/msan_allocator.cc
+++ b/lib/msan/msan_allocator.cc
@@ -49,15 +49,21 @@ struct MsanMapUnmapCallback {
typedef SizeClassAllocator32<0, SANITIZER_MMAP_RANGE_SIZE, sizeof(Metadata),
SizeClassMap, kRegionSizeLog, ByteMap,
MsanMapUnmapCallback> PrimaryAllocator;
+
#elif defined(__x86_64__)
+#if SANITIZER_LINUX && !defined(MSAN_LINUX_X86_64_OLD_MAPPING)
+ static const uptr kAllocatorSpace = 0x700000000000ULL;
+#else
static const uptr kAllocatorSpace = 0x600000000000ULL;
- static const uptr kAllocatorSize = 0x80000000000; // 8T.
+#endif
+ static const uptr kAllocatorSize = 0x80000000000; // 8T.
static const uptr kMetadataSize = sizeof(Metadata);
static const uptr kMaxAllowedMallocSize = 8UL << 30;
typedef SizeClassAllocator64<kAllocatorSpace, kAllocatorSize, kMetadataSize,
DefaultSizeClassMap,
MsanMapUnmapCallback> PrimaryAllocator;
+
#elif defined(__powerpc64__)
static const uptr kAllocatorSpace = 0x300000000000;
static const uptr kAllocatorSize = 0x020000000000; // 2T
diff --git a/test/msan/mmap.cc b/test/msan/mmap.cc
index 250ce34..962836c 100644
--- a/test/msan/mmap.cc
+++ b/test/msan/mmap.cc
@@ -15,7 +15,9 @@ bool AddrIsApp(void *p) {
#if defined(__FreeBSD__) && defined(__x86_64__)
return addr < 0x010000000000ULL || addr >= 0x600000000000ULL;
#elif defined(__x86_64__)
- return addr >= 0x600000000000ULL;
+ return (addr >= 0x000000000000ULL && addr < 0x010000000000ULL) ||
+ (addr >= 0x510000000000ULL && addr < 0x600000000000ULL) ||
+ (addr >= 0x700000000000ULL && addr < 0x800000000000ULL);
#elif defined(__mips64)
return addr >= 0x00e000000000ULL;
#elif defined(__powerpc64__)
diff --git a/test/msan/strlen_of_shadow.cc b/test/msan/strlen_of_shadow.cc
index fee9223..0594f00 100644
--- a/test/msan/strlen_of_shadow.cc
+++ b/test/msan/strlen_of_shadow.cc
@@ -12,7 +12,7 @@
const char *mem_to_shadow(const char *p) {
#if defined(__x86_64__)
- return (char *)((uintptr_t)p & ~0x400000000000ULL);
+ return (char *)((uintptr_t)p ^ 0x500000000000ULL);
#elif defined (__mips64)
return (char *)((uintptr_t)p & ~0x4000000000ULL);
#elif defined(__powerpc64__)
diff --git a/test/sanitizer_common/TestCases/Posix/decorate_proc_maps.cc b/test/sanitizer_common/TestCases/Posix/decorate_proc_maps.cc
index 8744c3f..36d4df5 100644
--- a/test/sanitizer_common/TestCases/Posix/decorate_proc_maps.cc
+++ b/test/sanitizer_common/TestCases/Posix/decorate_proc_maps.cc
@@ -47,8 +47,8 @@ int main(void) {
// CHECK-asan: rw-p {{.*}} [high shadow]
// CHECK-msan: ---p {{.*}} [invalid]
-// CHECK-msan: rw-p {{.*}} [shadow]
-// CHECK-msan: ---p {{.*}} [origin]
+// CHECK-msan: rw-p {{.*}} [shadow{{.*}}]
+// CHECK-msan: ---p {{.*}} [origin{{.*}}]
// CHECK-tsan: rw-p {{.*}} [shadow]
// CHECK-tsan: rw-p {{.*}} [meta shadow]
--
2.6.1

View file

@ -0,0 +1,115 @@
From 2c87d24da09ecd2c14c38a0b4f7a0e3f332b08ee Mon Sep 17 00:00:00 2001
From: Evgeniy Stepanov <eugeni.stepanov@gmail.com>
Date: Thu, 8 Oct 2015 21:35:26 +0000
Subject: [PATCH] New MSan mapping layout (llvm part).
This is an implementation of
https://github.com/google/sanitizers/issues/579
It has a number of advantages over the current mapping:
* Works for non-PIE executables.
* Does not require ASLR; as a consequence, debugging MSan programs in
gdb no longer requires "set disable-randomization off".
* Supports linux kernels >=4.1.2.
* The code is marginally faster and smaller.
This is an ABI break. We never really promised ABI stability, but
this patch includes a courtesy escape hatch: a compile-time macro
that reverts back to the old mapping layout.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@249753 91177308-0d34-0410-b5e6-96231b3b80d8
---
lib/Transforms/Instrumentation/MemorySanitizer.cpp | 22 +++++++++++++++-------
.../MemorySanitizer/origin-alignment.ll | 10 ++++++----
2 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/lib/Transforms/Instrumentation/MemorySanitizer.cpp b/lib/Transforms/Instrumentation/MemorySanitizer.cpp
index 9d4c7de..bc6da5a 100644
--- a/lib/Transforms/Instrumentation/MemorySanitizer.cpp
+++ b/lib/Transforms/Instrumentation/MemorySanitizer.cpp
@@ -232,10 +232,17 @@ static const MemoryMapParams Linux_I386_MemoryMapParams = {
// x86_64 Linux
static const MemoryMapParams Linux_X86_64_MemoryMapParams = {
+#ifdef MSAN_LINUX_X86_64_OLD_MAPPING
0x400000000000, // AndMask
0, // XorMask (not used)
0, // ShadowBase (not used)
0x200000000000, // OriginBase
+#else
+ 0, // AndMask (not used)
+ 0x500000000000, // XorMask
+ 0, // ShadowBase (not used)
+ 0x100000000000, // OriginBase
+#endif
};
// mips64 Linux
@@ -926,16 +933,17 @@ struct MemorySanitizerVisitor : public InstVisitor<MemorySanitizerVisitor> {
///
/// Offset = (Addr & ~AndMask) ^ XorMask
Value *getShadowPtrOffset(Value *Addr, IRBuilder<> &IRB) {
+ Value *OffsetLong = IRB.CreatePointerCast(Addr, MS.IntptrTy);
+
uint64_t AndMask = MS.MapParams->AndMask;
- assert(AndMask != 0 && "AndMask shall be specified");
- Value *OffsetLong =
- IRB.CreateAnd(IRB.CreatePointerCast(Addr, MS.IntptrTy),
- ConstantInt::get(MS.IntptrTy, ~AndMask));
+ if (AndMask)
+ OffsetLong =
+ IRB.CreateAnd(OffsetLong, ConstantInt::get(MS.IntptrTy, ~AndMask));
uint64_t XorMask = MS.MapParams->XorMask;
- if (XorMask != 0)
- OffsetLong = IRB.CreateXor(OffsetLong,
- ConstantInt::get(MS.IntptrTy, XorMask));
+ if (XorMask)
+ OffsetLong =
+ IRB.CreateXor(OffsetLong, ConstantInt::get(MS.IntptrTy, XorMask));
return OffsetLong;
}
diff --git a/test/Instrumentation/MemorySanitizer/origin-alignment.ll b/test/Instrumentation/MemorySanitizer/origin-alignment.ll
index ce0dbfc..562d194 100644
--- a/test/Instrumentation/MemorySanitizer/origin-alignment.ll
+++ b/test/Instrumentation/MemorySanitizer/origin-alignment.ll
@@ -24,7 +24,7 @@ entry:
; CHECK-ORIGINS1: [[ORIGIN:%[01-9a-z]+]] = load {{.*}} @__msan_param_origin_tls
; CHECK-ORIGINS2: [[ORIGIN0:%[01-9a-z]+]] = load {{.*}} @__msan_param_origin_tls
; CHECK-ORIGINS2: [[ORIGIN:%[01-9a-z]+]] = call i32 @__msan_chain_origin(i32 [[ORIGIN0]])
-; CHECK: store i32 [[ORIGIN]], i32* inttoptr (i64 add (i64 and (i64 ptrtoint {{.*}} to i32*), align 8
+; CHECK: store i32 [[ORIGIN]], i32* inttoptr (i64 add (i64 xor (i64 ptrtoint (i8* @a8 to i64), i64 {{.*}}), i64 {{.*}}) to i32*), align 8
; CHECK: ret void
@@ -39,7 +39,7 @@ entry:
; CHECK-ORIGINS1: [[ORIGIN:%[01-9a-z]+]] = load {{.*}} @__msan_param_origin_tls
; CHECK-ORIGINS2: [[ORIGIN0:%[01-9a-z]+]] = load {{.*}} @__msan_param_origin_tls
; CHECK-ORIGINS2: [[ORIGIN:%[01-9a-z]+]] = call i32 @__msan_chain_origin(i32 [[ORIGIN0]])
-; CHECK: store i32 [[ORIGIN]], i32* inttoptr (i64 add (i64 and (i64 ptrtoint {{.*}} to i32*), align 4
+; CHECK: store i32 [[ORIGIN]], i32* inttoptr (i64 add (i64 xor (i64 ptrtoint (i8* @a4 to i64), i64 {{.*}}), i64 {{.*}}) to i32*), align 4
; CHECK: ret void
@@ -54,7 +54,8 @@ entry:
; CHECK-ORIGINS1: [[ORIGIN:%[01-9a-z]+]] = load {{.*}} @__msan_param_origin_tls
; CHECK-ORIGINS2: [[ORIGIN0:%[01-9a-z]+]] = load {{.*}} @__msan_param_origin_tls
; CHECK-ORIGINS2: [[ORIGIN:%[01-9a-z]+]] = call i32 @__msan_chain_origin(i32 [[ORIGIN0]])
-; CHECK: store i32 [[ORIGIN]], i32* inttoptr (i64 and (i64 add (i64 and (i64 ptrtoint {{.*}} i64 -4) to i32*), align 4
+; CHECK: store i32 [[ORIGIN]], i32* inttoptr (i64 and (i64 add (i64 xor (i64 ptrtoint (i8* @a2 to i64), i64 {{.*}}), i64 {{.*}}), i64 -4) to i32*), align 4
+
; CHECK: ret void
@@ -69,5 +70,6 @@ entry:
; CHECK-ORIGINS1: [[ORIGIN:%[01-9a-z]+]] = load {{.*}} @__msan_param_origin_tls
; CHECK-ORIGINS2: [[ORIGIN0:%[01-9a-z]+]] = load {{.*}} @__msan_param_origin_tls
; CHECK-ORIGINS2: [[ORIGIN:%[01-9a-z]+]] = call i32 @__msan_chain_origin(i32 [[ORIGIN0]])
-; CHECK: store i32 [[ORIGIN]], i32* inttoptr (i64 and (i64 add (i64 and (i64 ptrtoint {{.*}} i64 -4) to i32*), align 4
+; CHECK: store i32 [[ORIGIN]], i32* inttoptr (i64 and (i64 add (i64 xor (i64 ptrtoint (i8* @a1 to i64), i64 {{.*}}), i64 {{.*}}), i64 -4) to i32*), align 4
+
; CHECK: ret void
--
2.6.1

View file

@ -16,7 +16,7 @@
pkgname=('llvm' 'llvm-libs' 'llvm-ocaml' 'lldb' 'clang' 'clang-analyzer'
'clang-tools-extra')
pkgver=3.7.0
pkgrel=4
pkgrel=5
_ocaml_ver=4.02.3
arch=('i686' 'x86_64')
url="http://llvm.org/"
@ -35,6 +35,8 @@ source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.xz{,.sig}
llvm-3.7.0-export-more-symbols.patch
clang-tools-extra-3.7.0-install-clang-query.patch
lldb-3.7.0-avoid-linking-to-libLLVM.patch
0001-New-MSan-mapping-layout-llvm-part.patch
0001-New-MSan-mapping-layout-compiler-rt-part.patch
llvm-Config-llvm-config.h)
sha256sums=('ab45895f9dcdad1e140a3a79fd709f64b05ad7364e308c0e582c5b02e9cc3153'
'SKIP'
@ -50,6 +52,8 @@ sha256sums=('ab45895f9dcdad1e140a3a79fd709f64b05ad7364e308c0e582c5b02e9cc3153'
'a1c9f36b97c639666ab6a1bd647a08a027e93e3d3cfd6f5af9c36e757599ce81'
'3abf85430c275ecb8dbb526ecb82b1c9f4b4f782a8a43b5a06d040ec0baba7e7'
'2d53b6ed4c7620eeade87e7761b98093a0434801ddd599056daed7881141fb01'
'c5f4e329143bef36b623ba5daf311b5a73fa99ab05fed4ba506c1c3bc4cf5ee7'
'f44e8fe3cef9b6f706d651f443922261e1dcf53bcaabdd0ac7edb1758e4bc44d'
'597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48')
validpgpkeys=('11E521D646982372EB577A1F8F0871F202119294'
'B6C8F98282B944E3B0D5C2530FC3042E345AD05D')
@ -81,6 +85,10 @@ prepare() {
# https://llvm.org/bugs/show_bug.cgi?id=24953
patch -d tools/lldb -Np1 <../lldb-3.7.0-avoid-linking-to-libLLVM.patch
# https://llvm.org/bugs/show_bug.cgi?id=24155
patch -Np1 -i ../0001-New-MSan-mapping-layout-llvm-part.patch
patch -d projects/compiler-rt -Np1 <../0001-New-MSan-mapping-layout-compiler-rt-part.patch
# Use Python 2
find tools/lldb -name Makefile -exec sed -i 's/python-config/python2-config/' {} +
sed -i 's|/usr/bin/env python|&2|' \
@ -106,7 +114,7 @@ build() {
-DLLVM_BUILD_DOCS=ON \
-DLLVM_ENABLE_SPHINX=ON \
-DLLVM_ENABLE_DOXYGEN=OFF \
-DFFI_INCLUDE_DIR=$(pkg-config --cflags-only-I libffi | cut -c3-) \
-DFFI_INCLUDE_DIR=$(pkg-config --variable=includedir libffi) \
-DLLVM_BINUTILS_INCDIR=/usr/include \
$CONFIG ..

View file

@ -6,9 +6,9 @@
pkgbase=mariadb
pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb')
pkgver=10.0.21
pkgver=10.0.22
_pkgver=${pkgver/.a/a}
pkgrel=3
pkgrel=1
arch=('i686' 'x86_64')
license=('GPL')
url='http://mariadb.org/'
@ -18,7 +18,7 @@ source=(http://ftp.heanet.ie/mirrors/mariadb/mariadb-$pkgver/source/mariadb-$pkg
mariadb.service
mariadb-post.sh
mariadb-tmpfile.conf)
md5sums=('956561f3798d1fe8dfbe4b665287a87a'
md5sums=('fa818946e43e1eeda191a7736efa1ef9'
'd488fffa9f62f9949c4aa1bb6e6db692'
'b79e65a5aa536e6b5bc60988eb0b78a2'
'2fa6e456964d4ff5e6d4f9ff0126aed6')

View file

@ -11,8 +11,8 @@
pkgbase=pulseaudio
pkgname=(pulseaudio libpulse pulseaudio-{gconf,zeroconf,lirc,jack,bluetooth,equalizer})
pkgdesc="A featureful, general-purpose sound server"
pkgver=7.0
pkgrel=2
pkgver=7.1
pkgrel=1
arch=(i686 x86_64)
url="http://www.freedesktop.org/wiki/Software/PulseAudio"
license=(LGPL)
@ -23,7 +23,7 @@ makedepends=(libasyncns libcap attr libxtst libsm libsndfile libtool rtkit libso
options=(!emptydirs)
source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz
padsp-lib32.patch)
sha256sums=('ca1ae1377e8926bfc3ffe2aeb9f657f6c363a16f72861166fcf9454e3eeae8fa'
sha256sums=('e667514a28328f92aceea754a224a0150dddfe7e9a71b4c6d31489220153b9d9'
'7832fc59df76538ff10aedd297c03cb7ff117235da8bfad26082994bb5b84332')
prepare() {

View file

@ -41,7 +41,7 @@ pkgname=('qt5-3d'
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.5.1
pkgrel=1
pkgrel=2
arch=('i686' 'x86_64')
url='http://www.qt.io/developers'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@ -232,7 +232,7 @@ package_qt5-connectivity() {
package_qt5-declarative() {
pkgdesc='Classes for QML and JavaScript languages'
depends=('qt5-xmlpatterns' 'libxkbcommon-x11')
depends=('qt5-xmlpatterns' 'libxkbcommon-x11' 'libsm')
conflicts=('qt')
cd ${_pkgfqn}/qtdeclarative