From a7794c782826aa3d7ec05af9b58ca7d90e8c7f7f2d5c25304ff7a48795e0bb63 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Wed, 29 Jul 2015 11:12:13 +0000 Subject: [PATCH 1/4] Accepting request 319270 from home:dimstar:Factory - Add linux-glibc-devel-if_pppox-includes.patch: fix compilation of userspace programs including if_pppox.h (e.g. ebtables). OBS-URL: https://build.opensuse.org/request/show/319270 OBS-URL: https://build.opensuse.org/package/show/Base:System/linux-glibc-devel?expand=0&rev=91 --- linux-glibc-devel-if_pppox-includes.patch | 21 +++++++++++++++++++++ linux-glibc-devel.changes | 6 ++++++ linux-glibc-devel.spec | 3 +++ 3 files changed, 30 insertions(+) create mode 100644 linux-glibc-devel-if_pppox-includes.patch diff --git a/linux-glibc-devel-if_pppox-includes.patch b/linux-glibc-devel-if_pppox-includes.patch new file mode 100644 index 0000000..308c4e7 --- /dev/null +++ b/linux-glibc-devel-if_pppox-includes.patch @@ -0,0 +1,21 @@ +Fixes userspace compilation error: + +error: "IFNAMSIZ" undeclared here (not in a function) + +Signed-off-by: Mikko Rapeli +--- +include/uapi/linux/if_pppox.h | 1 + +1 file changed, 1 insertion(+) + +Index: linux-glibc-devel-4.1/usr/include/linux/if_pppox.h +=================================================================== +--- linux-glibc-devel-4.1.orig/usr/include/linux/if_pppox.h ++++ linux-glibc-devel-4.1/usr/include/linux/if_pppox.h +@@ -21,6 +21,7 @@ + #include + + #include ++#include + #include + #include + diff --git a/linux-glibc-devel.changes b/linux-glibc-devel.changes index a5d7339..e05d0d6 100644 --- a/linux-glibc-devel.changes +++ b/linux-glibc-devel.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 29 10:44:36 UTC 2015 - dimstar@opensuse.org + +- Add linux-glibc-devel-if_pppox-includes.patch: fix compilation of + userspace programs including if_pppox.h (e.g. ebtables). + ------------------------------------------------------------------- Fri Jul 3 18:19:17 UTC 2015 - crrodriguez@opensuse.org diff --git a/linux-glibc-devel.spec b/linux-glibc-devel.spec index 6e23672..bb52755 100644 --- a/linux-glibc-devel.spec +++ b/linux-glibc-devel.spec @@ -37,6 +37,8 @@ Obsoletes: linux-kernel-headers < %{version} PreReq: coreutils Source: %{name}-%{upstream_version}.tar.xz Source1: install_all.sh +# PATCH-FIX-UPSTREAM linux-glibc-devel-if_pppox-includes.patch dimstar@opensuse.org -- Fixes userspace compilation error +Patch0: linux-glibc-devel-if_pppox-includes.patch %description This package provides Linux kernel headers, the kernel API description @@ -49,6 +51,7 @@ packages, instead. %prep %setup -q -n linux-glibc-devel-%{upstream_version} +%patch0 -p1 %build cat > version.h <<-BOGUS From 2a7d6c80563b0805463f88105fa83653c1542442f6c5a7f9abafcd892ba0e041 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Wed, 29 Jul 2015 12:53:55 +0000 Subject: [PATCH 2/4] osc copypac from project:Base:System package:linux-glibc-devel revision:90 OBS-URL: https://build.opensuse.org/package/show/Base:System/linux-glibc-devel?expand=0&rev=92 --- linux-glibc-devel-if_pppox-includes.patch | 21 --------------------- linux-glibc-devel.changes | 6 ------ linux-glibc-devel.spec | 3 --- 3 files changed, 30 deletions(-) delete mode 100644 linux-glibc-devel-if_pppox-includes.patch diff --git a/linux-glibc-devel-if_pppox-includes.patch b/linux-glibc-devel-if_pppox-includes.patch deleted file mode 100644 index 308c4e7..0000000 --- a/linux-glibc-devel-if_pppox-includes.patch +++ /dev/null @@ -1,21 +0,0 @@ -Fixes userspace compilation error: - -error: "IFNAMSIZ" undeclared here (not in a function) - -Signed-off-by: Mikko Rapeli ---- -include/uapi/linux/if_pppox.h | 1 + -1 file changed, 1 insertion(+) - -Index: linux-glibc-devel-4.1/usr/include/linux/if_pppox.h -=================================================================== ---- linux-glibc-devel-4.1.orig/usr/include/linux/if_pppox.h -+++ linux-glibc-devel-4.1/usr/include/linux/if_pppox.h -@@ -21,6 +21,7 @@ - #include - - #include -+#include - #include - #include - diff --git a/linux-glibc-devel.changes b/linux-glibc-devel.changes index e05d0d6..a5d7339 100644 --- a/linux-glibc-devel.changes +++ b/linux-glibc-devel.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Wed Jul 29 10:44:36 UTC 2015 - dimstar@opensuse.org - -- Add linux-glibc-devel-if_pppox-includes.patch: fix compilation of - userspace programs including if_pppox.h (e.g. ebtables). - ------------------------------------------------------------------- Fri Jul 3 18:19:17 UTC 2015 - crrodriguez@opensuse.org diff --git a/linux-glibc-devel.spec b/linux-glibc-devel.spec index bb52755..6e23672 100644 --- a/linux-glibc-devel.spec +++ b/linux-glibc-devel.spec @@ -37,8 +37,6 @@ Obsoletes: linux-kernel-headers < %{version} PreReq: coreutils Source: %{name}-%{upstream_version}.tar.xz Source1: install_all.sh -# PATCH-FIX-UPSTREAM linux-glibc-devel-if_pppox-includes.patch dimstar@opensuse.org -- Fixes userspace compilation error -Patch0: linux-glibc-devel-if_pppox-includes.patch %description This package provides Linux kernel headers, the kernel API description @@ -51,7 +49,6 @@ packages, instead. %prep %setup -q -n linux-glibc-devel-%{upstream_version} -%patch0 -p1 %build cat > version.h <<-BOGUS From 2e1994c1b593770c38061434a0d44299dc73233c8cce47d334a2a9340ad86a04 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Mon, 12 Oct 2015 15:21:37 +0000 Subject: [PATCH 3/4] Accepting request 338189 from home:k0da:branches:Base:System - Update to kernel headers 4.2 OBS-URL: https://build.opensuse.org/request/show/338189 OBS-URL: https://build.opensuse.org/package/show/Base:System/linux-glibc-devel?expand=0&rev=93 --- linux-glibc-devel-4.1.tar.xz | 3 --- linux-glibc-devel-4.2.tar.xz | 3 +++ linux-glibc-devel.changes | 5 +++++ linux-glibc-devel.spec | 4 ++-- 4 files changed, 10 insertions(+), 5 deletions(-) delete mode 100644 linux-glibc-devel-4.1.tar.xz create mode 100644 linux-glibc-devel-4.2.tar.xz diff --git a/linux-glibc-devel-4.1.tar.xz b/linux-glibc-devel-4.1.tar.xz deleted file mode 100644 index 8e87735..0000000 --- a/linux-glibc-devel-4.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:baf7ea79241dd2f48be74879c638219b722454990d5594dd76e5d6878c158aba -size 928240 diff --git a/linux-glibc-devel-4.2.tar.xz b/linux-glibc-devel-4.2.tar.xz new file mode 100644 index 0000000..d946498 --- /dev/null +++ b/linux-glibc-devel-4.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9890b076af53dda12983fb47d5625240701f62e626042b92db54c8b0de84add9 +size 925648 diff --git a/linux-glibc-devel.changes b/linux-glibc-devel.changes index a5d7339..81f1a84 100644 --- a/linux-glibc-devel.changes +++ b/linux-glibc-devel.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 12 14:56:38 UTC 2015 - dvaleev@suse.com + +- Update to kernel headers 4.2 + ------------------------------------------------------------------- Fri Jul 3 18:19:17 UTC 2015 - crrodriguez@opensuse.org diff --git a/linux-glibc-devel.spec b/linux-glibc-devel.spec index 6e23672..80f3c51 100644 --- a/linux-glibc-devel.spec +++ b/linux-glibc-devel.spec @@ -23,10 +23,10 @@ Group: Development/Libraries/C and C++ BuildArch: noarch # this confusing version number has no meaning, it's the version # of the Linux kernel where these headers come from -Version: 4.1 +Version: 4.2 Release: 0 # A "-" is not allowed in version -%define upstream_version 4.1 +%define upstream_version 4.2 Url: http://www.kernel.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes From ad5d7a58f7c3fe7daf03bf022600ef8f6654cf1584300443cbcede6de2371ac9 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Tue, 13 Oct 2015 16:18:13 +0000 Subject: [PATCH 4/4] Accepting request 338506 from home:k0da:branches:Base:System - package back i2c-dev.h the one from i2c-tools is outdated OBS-URL: https://build.opensuse.org/request/show/338506 OBS-URL: https://build.opensuse.org/package/show/Base:System/linux-glibc-devel?expand=0&rev=94 --- linux-glibc-devel.changes | 5 +++++ linux-glibc-devel.spec | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/linux-glibc-devel.changes b/linux-glibc-devel.changes index 81f1a84..8729bb9 100644 --- a/linux-glibc-devel.changes +++ b/linux-glibc-devel.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 13 16:03:38 UTC 2015 - dvaleev@suse.com + +- package back i2c-dev.h the one from i2c-tools is outdated + ------------------------------------------------------------------- Mon Oct 12 14:56:38 UTC 2015 - dvaleev@suse.com diff --git a/linux-glibc-devel.spec b/linux-glibc-devel.spec index 80f3c51..e9cea63 100644 --- a/linux-glibc-devel.spec +++ b/linux-glibc-devel.spec @@ -99,8 +99,6 @@ rm -rf $RPM_BUILD_ROOT mkdir $RPM_BUILD_ROOT cp -a usr $RPM_BUILD_ROOT cp -a version.h $RPM_BUILD_ROOT/usr/include/linux/ -# Temporarily exclude i2c header files, which are provided by i2c-tools instead -rm -fv $RPM_BUILD_ROOT/usr/include/linux/i2c-dev.h # resolve file conflict with glibc for now rm -fv $RPM_BUILD_ROOT//usr/include/scsi/scsi.h # Replace the directory /usr/include/asm with a symlink.