This commit is contained in:
Ertuğrul Erata
2016-10-18 22:46:08 +03:00
parent 887f25965b
commit 19402286a4
5 changed files with 58 additions and 4 deletions
Binary file not shown.
@@ -0,0 +1,37 @@
From e461958e7a7eb8df2e022e02f782dff5f60a44d0 Mon Sep 17 00:00:00 2001
From: Thomas Backlund <tmb@mageia.org>
Date: Sun, 16 Oct 2016 20:09:27 +0300
Subject: [PATCH] Revert "include/uapi/linux/atm_zatm.h: include linux/time.h"
This reverts commit cf00713a655d3019be7faa184402f16c43a0fed3.
It causes linux-atm build breakage between glibc headers and kernel headers...
Fixws are in progress upstream as of:
https://patchwork.kernel.org/patch/9294305/
But it's not accepted yet so it might still change, and since its uapi
we dont want to expose changes that might never land upstream.
Reported by: Pascal Terjam <pterjan@gmail.com>
Signed-off-by: Thomas Backlund <tmb@mageia.org>
---
include/uapi/linux/atm_zatm.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/include/uapi/linux/atm_zatm.h b/include/uapi/linux/atm_zatm.h
index 5cd4d4d..9c9c6ad 100644
--- a/include/uapi/linux/atm_zatm.h
+++ b/include/uapi/linux/atm_zatm.h
@@ -14,7 +14,6 @@
#include <linux/atmapi.h>
#include <linux/atmioc.h>
-#include <linux/time.h>
#define ZATM_GETPOOL _IOW('a',ATMIOC_SARPRV+1,struct atmif_sioc)
/* get pool statistics */
--
2.10.1
@@ -357,6 +357,11 @@ video-mageia-logo.patch
### Tools
###
# wipe powerpc refrence so we can nuke dangling symlinks (mga#17676)
tools-testing-selftest-Makefile-remove-powerpc-reference.patch
###
### UAPI
###
# breaks linux-arm build
Revert-include-uapi-linux-atm_zatm.h-include-linux-t.patch
@@ -0,0 +1,10 @@
--- linux/tools/testing/selftests/Makefile.orig
+++ linux/tools/testing/selftests/Makefile
@@ -15,7 +15,6 @@ TARGETS += memory-hotplug
TARGETS += mount
TARGETS += mqueue
TARGETS += net
-TARGETS += powerpc
TARGETS += pstore
TARGETS += ptrace
TARGETS += seccomp
+6 -4
View File
@@ -28,8 +28,8 @@
</BuildDependencies>
<Patches>
<!-- Linux patches -->
<Patch level="1" compressionType="xz">patches/linux/patch-4.8.1.xz</Patch>
<!-- Mageia Linux patches // compatible with http://svnweb.mageia.org/packages/cauldron/kernel/releases/4.8.1/1.mga6/PATCHES/patches/series-->
<Patch level="1" compressionType="xz">patches/linux/patch-4.8.2.xz</Patch>
<!-- Mageia Linux patches // compatible with http://svnweb.mageia.org/packages/cauldron/kernel/releases/4.8.2/1.mga6/PATCHES/patches/series-->
<!--stable patches-->
<!--other patches-->
<Patch level="1">patches/mageia/Revert-ipmi-Start-the-timer-and-thread-on-internal-m.patch</Patch>
@@ -129,6 +129,8 @@
<Patch level="1">patches/mageia/3rd-rtl8723bs.patch</Patch>
<Patch level="1">patches/mageia/3rd-rtl8723bs-4.7-buildfix.patch</Patch>
<Patch level="1">patches/mageia/3rd-rtl8723bs-4.8-buildfix.patch</Patch>
<Patch level="1">patches/mageia/tools-testing-selftest-Makefile-remove-powerpc-reference.patch</Patch>
<Patch level="1">patches/mageia/Revert-include-uapi-linux-atm_zatm.h-include-linux-t.patch</Patch>
</Patches>
</Source>
@@ -185,8 +187,8 @@
<History>
<Update release="7">
<Date>2016-10-14</Date>
<Version>4.8.1</Version>
<Date>2016-10-18</Date>
<Version>4.8.2</Version>
<Comment>Version Bump.</Comment>
<Type package="kernel">security</Type>
<Requires>