summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChad Voegele2017-07-15 17:43:21 -0700
committerChad Voegele2017-07-15 17:43:21 -0700
commitd5c5e5a0d57a2147609b8052096fb0fd9b8f6588 (patch)
tree80303331349927d2c38bdab7d87c20f6746aabf4
parent44518561a2c7077186f693c23943bdce6fde2ddc (diff)
downloadaur-linux-surface3-git.tar.gz
Backport guid change to resolve build errors.
From https://patchwork.kernel.org/patch/9816601/
-rw-r--r--.SRCINFO7
-rw-r--r--0001-power-MSHW0011-rev-eng-implementation.patch11
-rw-r--r--PKGBUILD13
3 files changed, 11 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3daef638c67..97efba70a80 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,13 @@
# Generated by mksrcinfo v8
-# Sun Mar 26 22:06:12 UTC 2017
+# Sun Jul 16 00:42:09 UTC 2017
pkgbase = linux-surface3-git
- pkgver = 4.11rc3.r402.g0dc82fa59b9d
+ pkgver = 4.13rc1.r0.g5771a8c08880
pkgrel = 1
url = http://www.kernel.org/
arch = i686
arch = x86_64
license = GPL2
makedepends = xmlto
- makedepends = docbook-xsl
makedepends = kmod
makedepends = inetutils
makedepends = bc
@@ -26,7 +25,7 @@ pkgbase = linux-surface3-git
sha256sums = becc0c98cff692dee9500f19d38882636caf4c58d5086c7725690a245532f5dc
sha256sums = 2bf64f96aa977a996d2aaeeb249a266a7c6f83483d49a31a23e595cd895f0846
sha256sums = 95fcfdfcb9d540d1a1428ce61e493ddf2c2a8ec96c8573deeadbb4ee407508c7
- sha256sums = 8fb00d96cb11ef3d9c250d6a5389c7eaf9f71d1259fb0a2cd210bf707adb8a71
+ sha256sums = a3b8f8baa8bf97f8ef5823e9cfd786697b57f28e88390194f4c5c5ccb0684a98
sha256sums = 62eeb51c1ee81c2545fa0c1ac5a2b8f4a112ede4113095ce2ea4a66d07059734
sha256sums = abae4abc0495026b35b982b426207e7cbad4bf5314a1e706fa295c7f91886307
diff --git a/0001-power-MSHW0011-rev-eng-implementation.patch b/0001-power-MSHW0011-rev-eng-implementation.patch
index af7e4590fe5..d6e4387605a 100644
--- a/0001-power-MSHW0011-rev-eng-implementation.patch
+++ b/0001-power-MSHW0011-rev-eng-implementation.patch
@@ -74,7 +74,7 @@ new file mode 100644
index 0000000..eee21d3
--- /dev/null
+++ b/drivers/power/supply/surface3_power.c
-@@ -0,0 +1,674 @@
+@@ -0,0 +1,673 @@
+/*
+ * Supports for the power IC on the Surface 3 tablet.
+ *
@@ -253,10 +253,9 @@ index 0000000..eee21d3
+mshw0011_notify(struct mshw0011_data *cdata, u8 arg1, u8 arg2,
+ unsigned int *ret_value)
+{
-+ static const u8 mshw0011_guid[] = {
-+ 0x67, 0xE3, 0x99, 0x3F, 0x20, 0x62, 0x55, 0x49,
-+ 0x8b, 0x0f, 0x06, 0xef, 0x2a, 0xe7, 0x94, 0x12,
-+ };
++ static const uuid_le mshw0011_guid =
++ GUID_INIT(0x3F99E367, 0x6220, 0x4955,
++ 0x8B, 0x0F, 0x06, 0xEF, 0x2A, 0xE7, 0x94, 0x12);
+ union acpi_object *obj;
+ struct acpi_device *adev;
+ acpi_handle handle;
@@ -266,7 +265,7 @@ index 0000000..eee21d3
+ if (!handle || acpi_bus_get_device(handle, &adev))
+ return -ENODEV;
+
-+ obj = acpi_evaluate_dsm_typed(handle, mshw0011_guid, arg1, arg2, NULL,
++ obj = acpi_evaluate_dsm_typed(handle, &mshw0011_guid, arg1, arg2, NULL,
+ ACPI_TYPE_BUFFER);
+ if (!obj) {
+ dev_err(&cdata->adp1->dev, "device _DSM execution failed\n");
diff --git a/PKGBUILD b/PKGBUILD
index d61f70ef228..8ec247d7511 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,12 +10,12 @@
pkgbase=linux-surface3-git
_srcname=linux
-pkgver=4.11rc3.r402.g0dc82fa59b9d
+pkgver=4.13rc1.r0.g5771a8c08880
pkgrel=1
arch=('i686' 'x86_64')
url="http://www.kernel.org/"
license=('GPL2')
-makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git' 'libelf')
+makedepends=('xmlto' 'kmod' 'inetutils' 'bc' 'git' 'libelf')
options=('!strip')
source=(
'git+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git'
@@ -32,7 +32,7 @@ sha256sums=('SKIP'
'becc0c98cff692dee9500f19d38882636caf4c58d5086c7725690a245532f5dc'
'2bf64f96aa977a996d2aaeeb249a266a7c6f83483d49a31a23e595cd895f0846'
'95fcfdfcb9d540d1a1428ce61e493ddf2c2a8ec96c8573deeadbb4ee407508c7'
- '8fb00d96cb11ef3d9c250d6a5389c7eaf9f71d1259fb0a2cd210bf707adb8a71'
+ 'a3b8f8baa8bf97f8ef5823e9cfd786697b57f28e88390194f4c5c5ccb0684a98'
'62eeb51c1ee81c2545fa0c1ac5a2b8f4a112ede4113095ce2ea4a66d07059734'
'abae4abc0495026b35b982b426207e7cbad4bf5314a1e706fa295c7f91886307')
@@ -193,10 +193,6 @@ _package-headers() {
cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/kernel/"
- # add docbook makefile
- install -D -m644 Documentation/DocBook/Makefile \
- "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/DocBook/Makefile"
-
# add dm headers
mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/md"
cp drivers/md/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/md"
@@ -285,9 +281,6 @@ _package-docs() {
cp -al Documentation "${pkgdir}/usr/lib/modules/${_kernver}/build"
find "${pkgdir}" -type f -exec chmod 444 {} \;
find "${pkgdir}" -type d -exec chmod 755 {} \;
-
- # remove a file already in linux package
- rm -f "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/DocBook/Makefile"
}
pkgname=("${pkgbase}" "${pkgbase}-headers" "${pkgbase}-docs")