Accepting request 74821 from Base:System
Update to 3.0 kernel headers OBS-URL: https://build.opensuse.org/request/show/74821 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/linux-glibc-devel?expand=0&rev=11
This commit is contained in:
Sascha Peilicke
Git OBS Bridge
commit
b6524c4ed9
@ -27,6 +27,8 @@ fi
|
||||
tar -xf $1
|
||||
pushd linux-${kernel_dir}
|
||||
cp Makefile $header_dir
|
||||
# header export for unicore32 in 2.6.39 is broken, disable it
|
||||
sed -i -e 's/cris/cris\|unicore32/' scripts/headers.sh
|
||||
/usr/bin/make O="$header_dir" headers_install_all
|
||||
# kvm.h and aout.h are only installed if SRCARCH is an architecture
|
||||
# that has support for them. As the package is noarch we need to make
|
||||
@ -50,6 +52,7 @@ for asm in \
|
||||
sh64 \
|
||||
v850 \
|
||||
xtensa \
|
||||
unicore32 \
|
||||
; do
|
||||
rm -rf usr/include/asm-$asm
|
||||
done
|
||||
@ -78,4 +81,5 @@ done
|
||||
popd
|
||||
du -sh "$header_dir/usr"
|
||||
tar -cjf "$header_dir.tar.bz2" "${header_dir##*/}"
|
||||
rm -rf $header_dir
|
||||
rm -rf $header_dir linux-${kernel_dir}
|
||||
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a8eb0c2f7f8656ca6877458818c366ecfd3becb5315dcdf9f09586ef7612aa71
|
||||
size 724035
|
||||
3
linux-glibc-devel-3.0.tar.bz2
Normal file
3
linux-glibc-devel-3.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e7f5582269ce485d58c81d7270820478dfe8ec193bbb8207fe51ba4709a64eb9
|
||||
size 757542
|
||||
@ -1,94 +0,0 @@
|
||||
---
|
||||
usr/include/asm-arm/ioctls.h | 1 +
|
||||
usr/include/asm-generic/ioctls.h | 1 +
|
||||
usr/include/asm-ia64/ioctls.h | 1 +
|
||||
usr/include/asm-parisc/ioctls.h | 1 +
|
||||
usr/include/asm-powerpc/ioctls.h | 1 +
|
||||
usr/include/asm-s390/ioctls.h | 1 +
|
||||
usr/include/asm-sparc/ioctls.h | 1 +
|
||||
7 files changed, 7 insertions(+)
|
||||
|
||||
Index: usr/include/asm-arm/ioctls.h
|
||||
===================================================================
|
||||
--- usr/include/asm-arm/ioctls.h.orig 2010-11-16 16:46:06.000000000 +0100
|
||||
+++ usr/include/asm-arm/ioctls.h 2010-11-16 17:24:29.381717929 +0100
|
||||
@@ -52,6 +52,7 @@
|
||||
#define TCSETSF2 _IOW('T',0x2D, struct termios2)
|
||||
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
|
||||
#define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */
|
||||
+#define TIOCGDEV _IOR('T',0x32, unsigned int) /* Get real dev no below /dev/console */
|
||||
#define TIOCSIG _IOW('T',0x36, int) /* Generate signal on Pty slave */
|
||||
|
||||
#define TIOCGRS485 0x542E
|
||||
Index: usr/include/asm-generic/ioctls.h
|
||||
===================================================================
|
||||
--- usr/include/asm-generic/ioctls.h.orig 2010-11-16 16:56:17.000000000 +0100
|
||||
+++ usr/include/asm-generic/ioctls.h 2010-11-16 17:23:50.110717582 +0100
|
||||
@@ -65,6 +65,7 @@
|
||||
#define TIOCSRS485 0x542F
|
||||
#define TIOCGPTN _IOR('T', 0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
|
||||
#define TIOCSPTLCK _IOW('T', 0x31, int) /* Lock/unlock Pty */
|
||||
+#define TIOCGDEV _IOR('T', 0x32, unsigned int) /* Get real dev no below /dev/console */
|
||||
#define TCGETX 0x5432 /* SYS5 TCGETX compatibility */
|
||||
#define TCSETX 0x5433
|
||||
#define TCSETXF 0x5434
|
||||
Index: usr/include/asm-ia64/ioctls.h
|
||||
===================================================================
|
||||
--- usr/include/asm-ia64/ioctls.h.orig 2010-11-16 16:48:56.000000000 +0100
|
||||
+++ usr/include/asm-ia64/ioctls.h 2010-11-16 17:24:51.373842894 +0100
|
||||
@@ -59,6 +59,7 @@
|
||||
#define TCSETSF2 _IOW('T',0x2D, struct termios2)
|
||||
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
|
||||
#define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */
|
||||
+#define TIOCGDEV _IOR('T',0x32, unsigned int) /* Get real dev no below /dev/console */
|
||||
#define TIOCSIG _IOW('T',0x36, int) /* Generate signal on Pty slave */
|
||||
|
||||
#define FIONCLEX 0x5450 /* these numbers need to be adjusted. */
|
||||
Index: usr/include/asm-parisc/ioctls.h
|
||||
===================================================================
|
||||
--- usr/include/asm-parisc/ioctls.h.orig 2010-11-16 16:51:44.000000000 +0100
|
||||
+++ usr/include/asm-parisc/ioctls.h 2010-11-16 17:25:14.147716950 +0100
|
||||
@@ -52,6 +52,7 @@
|
||||
#define TCSETSF2 _IOW('T',0x2D, struct termios2)
|
||||
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
|
||||
#define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */
|
||||
+#define TIOCGDEV _IOR('T',0x32, unsigned int) /* Get real dev no below /dev/console */
|
||||
#define TIOCSIG _IOW('T',0x36, int) /* Generate signal on Pty slave */
|
||||
|
||||
#define FIONCLEX 0x5450 /* these numbers need to be adjusted. */
|
||||
Index: usr/include/asm-powerpc/ioctls.h
|
||||
===================================================================
|
||||
--- usr/include/asm-powerpc/ioctls.h.orig 2010-11-16 16:52:12.000000000 +0100
|
||||
+++ usr/include/asm-powerpc/ioctls.h 2010-11-16 17:25:55.673718007 +0100
|
||||
@@ -94,6 +94,7 @@
|
||||
#define TIOCSRS485 0x542f
|
||||
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
|
||||
#define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */
|
||||
+#define TIOCGDEV _IOR('T',0x32, unsigned int) /* Get real dev no below /dev/console */
|
||||
#define TIOCSIG _IOW('T',0x36, int) /* Generate signal on Pty slave */
|
||||
|
||||
#define TIOCSERCONFIG 0x5453
|
||||
Index: usr/include/asm-s390/ioctls.h
|
||||
===================================================================
|
||||
--- usr/include/asm-s390/ioctls.h.orig 2010-11-16 16:52:44.000000000 +0100
|
||||
+++ usr/include/asm-s390/ioctls.h 2010-11-16 17:26:18.864718089 +0100
|
||||
@@ -60,6 +60,7 @@
|
||||
#define TCSETSF2 _IOW('T',0x2D, struct termios2)
|
||||
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
|
||||
#define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */
|
||||
+#define TIOCGDEV _IOR('T',0x32, unsigned int) /* Get real dev no below /dev/console */
|
||||
#define TIOCSIG _IOW('T',0x36, int) /* Generate signal on Pty slave */
|
||||
|
||||
#define FIONCLEX 0x5450 /* these numbers need to be adjusted. */
|
||||
Index: usr/include/asm-sparc/ioctls.h
|
||||
===================================================================
|
||||
--- usr/include/asm-sparc/ioctls.h.orig 2010-11-16 16:54:29.000000000 +0100
|
||||
+++ usr/include/asm-sparc/ioctls.h 2010-11-16 17:27:37.477717843 +0100
|
||||
@@ -43,6 +43,7 @@
|
||||
#define __TIOCSETX _IOW('t', 34, int) /* SunOS Specific */
|
||||
#define __TIOCGETX _IOR('t', 35, int) /* SunOS Specific */
|
||||
#define TIOCCONS _IO('t', 36)
|
||||
+#define TIOCGDEV _IOW('t', 0x32, unsigned int)
|
||||
#define TIOCGSOFTCAR _IOR('t', 100, int)
|
||||
#define TIOCSSOFTCAR _IOW('t', 101, int)
|
||||
#define __TIOCUCNTL _IOW('t', 102, int) /* SunOS Specific */
|
||||
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 29 07:51:04 UTC 2011 - aj@suse.de
|
||||
|
||||
- Update kernel headers to 3.0 (from 3.0-rc5).
|
||||
- Remove linux-glibc-devel.SuSE.TIOCGDEV.patch since it's upstream
|
||||
now.
|
||||
- Fix obsoletes.
|
||||
- Use fdupes.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 16 16:28:52 UTC 2010 - coolo@novell.com
|
||||
|
||||
|
||||
@ -17,24 +17,23 @@
|
||||
|
||||
# norootforbuild
|
||||
|
||||
|
||||
BuildRequires: fdupes
|
||||
Name: linux-glibc-devel
|
||||
License: GPLv2
|
||||
Summary: Linux headers for userspace development
|
||||
Group: Development/Libraries/C and C++
|
||||
BuildArch: noarch
|
||||
# this confusing version number has no meaning
|
||||
Version: 2.6.36
|
||||
Version: 3.0
|
||||
Release: 1
|
||||
Url: http://www.kernel.org/
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Provides: kernel-headers
|
||||
Provides: linux-kernel-headers = %{version}
|
||||
Obsoletes: linux-kernel-headers <= %{version}
|
||||
Obsoletes: linux-kernel-headers < %{version}
|
||||
PreReq: coreutils
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
Source1: install_all.sh
|
||||
Patch0: linux-glibc-devel.SuSE.TIOCGDEV.patch
|
||||
Patch1: linux-glibc-devel.SuSE.SO_BSDCOMPAT.patch
|
||||
|
||||
%description
|
||||
@ -48,7 +47,6 @@ packages, instead.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0
|
||||
%patch1
|
||||
|
||||
%build
|
||||
@ -87,7 +85,7 @@ cat > version.h <<-BOGUS
|
||||
#error "======================================================="
|
||||
#else
|
||||
#define UTS_RELEASE "%{version}"
|
||||
#define LINUX_VERSION_CODE `bash -c 'v="%{version}";read a b c d <<< "${v//./ }";echo "$(( (($a) << 16) + (($b) << 8) + ($c) ))"'`
|
||||
#define LINUX_VERSION_CODE `bash -c 'v="%{version}";c=0;read a b <<< "${v//./ }";echo "$(( (($a) << 16) + (($b) << 8) + ($c) ))"'`
|
||||
#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
|
||||
#endif
|
||||
BOGUS
|
||||
@ -110,9 +108,10 @@ rm -fv $RPM_BUILD_ROOT//usr/include/scsi/scsi*
|
||||
# The directory turned into a symlink in 10.3 (2.6.22)
|
||||
# rpm will remove obsolete files after the post install scripts
|
||||
# A trigger will run after the /usr/include/asm was removed
|
||||
# Create a dummy symlink now for rpmlint happiness, we %ghost this and create
|
||||
# a proper symlink during %post:
|
||||
# Create a dummy symlink now for rpmlint happiness, we %%ghost this and create
|
||||
# a proper symlink during %%post:
|
||||
ln -sfn asm-dummy $RPM_BUILD_ROOT/usr/include/asm
|
||||
%fdupes $RPM_BUILD_ROOT/usr/include
|
||||
|
||||
%postun
|
||||
if test "$1" = 0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user