Accepting request 628866 from home:Andreas_Schwab:Factory

- Update to kernel headers 4.18

OBS-URL: https://build.opensuse.org/request/show/628866
OBS-URL: https://build.opensuse.org/package/show/Base:System/linux-glibc-devel?expand=0&rev=131
This commit is contained in:
Andreas Schwab 2018-08-13 08:13:04 +00:00 committed by Git OBS Bridge
parent 15e1531647
commit 260fdcd46f
5 changed files with 27 additions and 27 deletions

View File

@ -50,7 +50,7 @@ for asm in \
; do
rm -rf usr/include/arch-$asm
done
rm Makefile .cache.mk
rm -f Makefile .cache.mk
find -type f -name "..install.cmd" -exec rm {} +
find -type f -name ".install" -exec rm {} +
#-------------------------------------------------------------------

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1d735c6354ffc056ed7e79e944765bef4c524db3a815ee0bfb646fa40c7e714a
size 1065180

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6a4206a0542023b8189a7621834d0fa0fcd3ad61b1c604ebee2769c21cc5d575
size 1083844

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Aug 13 07:41:51 UTC 2018 - schwab@suse.de
- Update to kernel headers 4.18
-------------------------------------------------------------------
Mon Jul 16 08:00:26 UTC 2018 - schwab@suse.de

View File

@ -17,26 +17,25 @@
Name: linux-glibc-devel
Version: 4.18
Release: 0
Summary: Linux headers for userspace development
License: GPL-2.0-only
Group: Development/Libraries/C and C++
BuildArch: noarch
Version: 4.17
Release: 0
Url: http://www.kernel.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
URL: http://www.kernel.org/
Source: %{name}-%{version}.tar.xz
Source1: install_all.sh
BuildRequires: fdupes
BuildRequires: xz
Provides: kernel-headers
Provides: linux-kernel-headers = %{version}
Obsoletes: linux-kernel-headers < %{version}
# rpm-build requires gettext-tools; ignore this, in order to shorten cycles (we have no translations)
#!BuildIgnore: gettext-tools
# glibc-devel requires linux-kernel-headers, which we are in progress of building
#!BuildIgnore: linux-kernel-headers
PreReq: coreutils
Source: %{name}-%{version}.tar.xz
Source1: install_all.sh
Provides: kernel-headers
Provides: linux-kernel-headers = %{version}
Obsoletes: linux-kernel-headers < %{version}
BuildArch: noarch
%description
This package provides Linux kernel headers, the kernel API description
@ -45,8 +44,6 @@ interface; compiling external kernel modules requires
kernel-(flavor)-devel, or kernel-syms to pull in all kernel-*-devel,
packages, instead.
%prep
%setup -q -n linux-glibc-devel-%{version}
@ -95,12 +92,10 @@ BOGUS
cat version.h
%install
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/
cp -a usr %{buildroot}/
cp -a version.h %{buildroot}%{_includedir}/linux/
# resolve file conflict with glibc for now
rm -fv $RPM_BUILD_ROOT//usr/include/scsi/scsi.h
rm -fv %{buildroot}/%{_includedir}/scsi/scsi.h
# Replace the directory /usr/include/asm with a symlink.
# libc contained a symlink /usr/include/asm into kernel-source up to 7.0 (2.1.3)
# glibc-devel contained a symlink /usr/include/asm into kernel-source in 7.1 (2.2)
@ -111,8 +106,8 @@ rm -fv $RPM_BUILD_ROOT//usr/include/scsi/scsi.h
# 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:
ln -sfn asm-dummy $RPM_BUILD_ROOT/usr/include/asm
%fdupes $RPM_BUILD_ROOT/usr/include
ln -sfn asm-dummy %{buildroot}%{_includedir}/asm
%fdupes %{buildroot}%{_includedir}
%postun
if test "$1" = 0
@ -141,7 +136,7 @@ if test -L usr/include/asm
then
case "$(readlink usr/include/asm)" in
*../src/linux/include*)
echo "/usr/include/asm points to kernel-source, waiting for triggerpostun to symlink to asm-$asm_link"
echo "%{_includedir}/asm points to kernel-source, waiting for triggerpostun to symlink to asm-$asm_link"
rm -fv usr/include/asm
exit 0
;;
@ -149,7 +144,7 @@ then
: symlink is ok, update it below in case of an arch change
elif test -d usr/include/asm
then
echo "/usr/include/asm is a directory, waiting for triggerpostun to symlink to asm-$asm_link"
echo "%{_includedir}/asm is a directory, waiting for triggerpostun to symlink to asm-$asm_link"
exit 0
fi
ln -sfn arch-$asm_link/asm usr/include/asm
@ -176,7 +171,7 @@ exit 0
%files
%defattr(-,root,root)
%{_prefix}/include/*
%ghost %{_prefix}/include/asm
%{_includedir}/*
%ghost %{_includedir}/asm
%changelog