From fc47645bfa065b06284897abf5a82b47815dc2896a3bd3290ec8e156d3324448 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 16 Mar 2012 11:40:16 +0000 Subject: [PATCH 1/2] Accepting request 109625 from home:a_jaeger:my-factory-packages Update version.h OBS-URL: https://build.opensuse.org/request/show/109625 OBS-URL: https://build.opensuse.org/package/show/Base:System/linux-glibc-devel?expand=0&rev=47 --- linux-glibc-devel.changes | 5 +++++ linux-glibc-devel.spec | 30 ++++++++++++++++-------------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/linux-glibc-devel.changes b/linux-glibc-devel.changes index dad3609..7c55bca 100644 --- a/linux-glibc-devel.changes +++ b/linux-glibc-devel.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 16 08:28:51 UTC 2012 - aj@suse.de + +- Update version.h text (bnc#751668). + ------------------------------------------------------------------- Thu Jan 5 15:15:12 CET 2012 - dmueller@suse.de diff --git a/linux-glibc-devel.spec b/linux-glibc-devel.spec index 35bc681..76d3417 100644 --- a/linux-glibc-devel.spec +++ b/linux-glibc-devel.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + BuildRequires: fdupes Name: linux-glibc-devel @@ -66,25 +67,26 @@ cat > version.h <<-BOGUS #error "programs should not directly include or" #error " as well." #error "" -#error "To build kernel modules please do the following:" +#error "Since Linux 2.6, the kernel module build process has been" +#error "updated such that users building modules should not typically" +#error "need to specify additional include directories at all." #error "" -#error " o Have the kernel sources installed" +#error "To build kernel modules, ensure you have the build environment " +#error "available either via the kernel-devel and kernel--devel " +#error "packages or a properly configured kernel source tree." #error "" -#error " o Make sure that the symbolic link" -#error " /lib/modules/\`uname -r\`/build exists and points to" -#error " the matching kernel source directory" +#error "Then, modules can be built using:" +#error "make -C M=$PWD" #error "" -#error " o When compiling, make sure to use the following" -#error " compiler option to use the correct include files:" +#error "For the currently running kernel there will be a symbolic " +#error "link pointing to the build environment located at " +#error "/lib/modules/$(uname -r)/build for use as ." #error "" -#error " -I/lib/modules/\`uname -r\`/build/include" +#error "If you are seeing this message, your environment is " +#error "not configured properly. " #error "" -#error " instead of" -#error "" -#error " -I/usr/include/linux" -#error "" -#error " Please adjust the Makefile accordingly." -#error "=======================================================" +#error "Please adjust the Makefile accordingly." +#error "======================================================= #else BOGUS # Get LINUX_VERSION_CODE and KERNEL_VERSION directly from kernel From fcb3a3029c4b917fd5d68f64ce09b2e3715a0ca6092c73077610a9afaf724fd6 Mon Sep 17 00:00:00 2001 From: Wolfgang Engel Date: Mon, 19 Mar 2012 12:30:50 +0000 Subject: [PATCH 2/2] Accepting request 109942 from home:a_jaeger:my-factory-packages Update to Linux 3.3 kernel headers OBS-URL: https://build.opensuse.org/request/show/109942 OBS-URL: https://build.opensuse.org/package/show/Base:System/linux-glibc-devel?expand=0&rev=48 --- linux-glibc-devel-3.2.tar.bz2 | 3 --- linux-glibc-devel-3.3.tar.bz2 | 3 +++ linux-glibc-devel.changes | 5 +++++ linux-glibc-devel.spec | 6 +++--- 4 files changed, 11 insertions(+), 6 deletions(-) delete mode 100644 linux-glibc-devel-3.2.tar.bz2 create mode 100644 linux-glibc-devel-3.3.tar.bz2 diff --git a/linux-glibc-devel-3.2.tar.bz2 b/linux-glibc-devel-3.2.tar.bz2 deleted file mode 100644 index 430b3a7..0000000 --- a/linux-glibc-devel-3.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ba23fdc5e7b74eae28d8c6996bb2287f46dec432ab467425034e78b398a6e55c -size 802878 diff --git a/linux-glibc-devel-3.3.tar.bz2 b/linux-glibc-devel-3.3.tar.bz2 new file mode 100644 index 0000000..84c7288 --- /dev/null +++ b/linux-glibc-devel-3.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:344067d9ea2a10b8e4f014d506010a21e7f4d52885a462a25575dbd4565c2b5c +size 810407 diff --git a/linux-glibc-devel.changes b/linux-glibc-devel.changes index 7c55bca..17e5a05 100644 --- a/linux-glibc-devel.changes +++ b/linux-glibc-devel.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 19 12:24:26 UTC 2012 - aj@suse.de + +- Update to Linux 3.3 headers. + ------------------------------------------------------------------- Fri Mar 16 08:28:51 UTC 2012 - aj@suse.de diff --git a/linux-glibc-devel.spec b/linux-glibc-devel.spec index 76d3417..32a1592 100644 --- a/linux-glibc-devel.spec +++ b/linux-glibc-devel.spec @@ -25,13 +25,13 @@ 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: 3.2.0 +Version: 3.3.0 Release: 0 # A "-" is not allowed in version -%define upstream_version 3.2 +%define upstream_version 3.3 Url: http://www.kernel.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Provides: kernel-headers +Provides: kernel-headers Provides: linux-kernel-headers = %{version} Obsoletes: linux-kernel-headers < %{version} PreReq: coreutils