6
0

Accepting request 643672 from home:Andreas_Schwab:Factory

- Update to kernel headers 4.19

OBS-URL: https://build.opensuse.org/request/show/643672
OBS-URL: https://build.opensuse.org/package/show/Base:System/linux-glibc-devel?expand=0&rev=133
This commit is contained in:
2018-10-22 09:28:04 +00:00
committed by Git OBS Bridge
parent 260fdcd46f
commit 7ea4d014d4
4 changed files with 19 additions and 14 deletions

View File

@@ -12,12 +12,12 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: linux-glibc-devel
Version: 4.18
Version: 4.19
Release: 0
Summary: Linux headers for userspace development
License: GPL-2.0-only
@@ -51,7 +51,7 @@ packages, instead.
cat > version.h <<\BOGUS
#ifdef __KERNEL__
#error "======================================================="
#error "You should not include /usr/include/{linux,asm}/ header"
#error "You should not include %{_includedir}/{linux,asm}/ header"
#error "files directly for the compilation of kernel modules."
#error ""
#error "glibc now uses kernel header files from a well-defined"
@@ -112,7 +112,7 @@ ln -sfn asm-dummy %{buildroot}%{_includedir}/asm
%postun
if test "$1" = 0
then
rm -f usr/include/asm
rm -f %{_includedir}/asm
fi
exit 0
@@ -132,22 +132,22 @@ case "$(uname -m)" in
riscv*) asm_link=riscv ;;
*) asm_link=x86 ;;
esac
if test -L usr/include/asm
if test -L %{_includedir}/asm
then
case "$(readlink usr/include/asm)" in
case "$(readlink %{_includedir}/asm)" in
*../src/linux/include*)
echo "%{_includedir}/asm points to kernel-source, waiting for triggerpostun to symlink to asm-$asm_link"
rm -fv usr/include/asm
rm -fv %{_includedir}/asm
exit 0
;;
esac
: symlink is ok, update it below in case of an arch change
elif test -d usr/include/asm
# symlink is ok, update it below in case of an arch change
elif test -d %{_includedir}/asm
then
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
ln -sfn arch-$asm_link/asm %{_includedir}/asm
exit 0
%triggerpostun -- linux-kernel-headers, glibc-devel < 2.5, libc < 2.2
@@ -166,7 +166,7 @@ case "$(uname -m)" in
riscv*) asm_link=riscv ;;
*) asm_link=x86 ;;
esac
ln -sfn arch-$asm_link/asm usr/include/asm
ln -sfn arch-$asm_link/asm %{_includedir}/asm
exit 0
%files