pool/kernel-source
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit 7f10552a62403b7b74c81df0fc6c71777493019b

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Kernel:stable/kernel-source?expand=0&rev=494
This commit is contained in:
Michal Marek 2016-04-05 06:04:36 +00:00 committed by Git OBS Bridge
parent 8dedfb7201
commit 8393bffb90
30 changed files with 1374 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e2e4530d1b08b8c60c1f53c9a3c201851c248e96cbc4217e1afc5ebd8bf20538
size 309055
oid sha256:460022db593fb279158fabf4e3db674789fbf5e4dabd7538c684b2badd94dfc5
size 309547

86
kernel-binary.spec.in
View File

@ -79,6 +79,8 @@ BuildRequires: modutils
# Used to sign the kernel in the buildservice
BuildRequires: openssl
BuildRequires: pesign-obs-integration
# for objtool
BuildRequires: libelf-devel
Provides: %name = %version-%source_rel
# bnc#901925
Provides: %name-%version-%source_rel
@ -258,15 +260,11 @@ mkdir -p %kernel_build_dir
# Generate a list of modules with their support status marking
%_sourcedir/guards --list --with-guards <%_sourcedir/supported.conf | \
awk '
/^\+(base|yes) / {
print $(NF);
next;
}
/^\+external / {
/\+external / {
print $(NF) " external";
next;
}
/^[-+]/ {
/^-/ {
print $(NF) " no";
next;
}
@ -274,8 +272,11 @@ awk '
print $(NF);
}
' >%kernel_build_dir/Module.supported
%_sourcedir/guards --default=0 base < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u >%kernel_build_dir/Module.base
for package in base @KMPS@; do
%_sourcedir/guards --default=0 "$package" \
<%_sourcedir/supported.conf | sed 's,.*/,,; s,\.ko$,,' | \
sort -u >%kernel_build_dir/Module."$package"
done
cd linux-%srcversion
@ -640,7 +641,7 @@ if [ %CONFIG_MODULES = y ]; then
%if %split_base
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir/Module.base \
-b %kernel_build_dir \
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
-e \
%endif
@ -785,6 +786,11 @@ done | add_dirs_to_filelist >%my_builddir/kernel-devel.files
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%endif
for f in %my_builddir/*-kmp-modules; do
f2=${f%%-modules}.files
add_dirs_to_filelist "$f" >"$f2"
done
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
# much, but it keeps rpmlint from breaking the package build. Note that we skip
@ -943,4 +949,66 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%endif
%endif
%if %CONFIG_MODULES == "y"
%package kgraft
Summary: Metapackage to pull in matching kgraft-patch package
Group: System/Kernel
Requires: kgraft-patch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor
Provides: multiversion(kernel)
%description kgraft
This is a metapackage that pulls in the matching kgraft-patch package for a
given kernel version. The advantage of the metapackage is that its name is
static, unlike the kgraft-patch-<kernel-version>-flavor package names.
%files kgraft
# rpmlint complains about empty packages, so lets own something
%defattr(-, root, root)
%dir /lib/modules/%kernelrelease-%build_flavor
%endif
%if %split_base
# BEGIN KMP
%package -n @KMP_NAME@-%build_flavor
Summary: @KMP_SUMMARY@
Group: System/Kernel
Requires: %name = %version-%release
Provides: multiversion(kernel)
# tell weak-modules2 to ignore this package
Provides: kmp_in_kernel
Requires(post): suse-module-tools >= 12.4
%description -n @KMP_NAME@-%build_flavor
@KMP_DESCRIPTION@
%post -n @KMP_NAME@-%build_flavor
wm2=/usr/lib/module-init-tools/weak-modules2
nvr=@KMP_NAME@-%build_flavor-%version-%release
if test -x "$wm2"; then
rpm -ql "$nvr" | INITRD_IN_POSTTRANS=1 /bin/bash -${-/e/} "$wm2" \
--add-kernel-modules %kernelrelease-%build_flavor
fi
%posttrans -n @KMP_NAME@-%build_flavor
%{?regenerate_initrd_posttrans}
%preun -n @KMP_NAME@-%build_flavor
nvr=@KMP_NAME@-%build_flavor-%version-%release
rpm -ql "$nvr" | grep '\.ko$' > "/var/run/rpm-$nvr-modules"
%postun -n @KMP_NAME@-%build_flavor
wm2=/usr/lib/module-init-tools/weak-modules2
nvr=@KMP_NAME@-%build_flavor-%version-%release
if test -x "$wm2"; then
/bin/bash -${-/e/} "$wm2" < "/var/run/rpm-$nvr-modules" \
--remove-kernel-modules %kernelrelease-%build_flavor
fi
rm -f "/var/run/rpm-$nvr-modules"
%files -n @KMP_NAME@-%build_flavor -f @KMP_NAME@.files
%defattr(-, root, root)
# END KMP
%endif
%changelog

101
kernel-debug.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Apr 3 12:33:45 CEST 2016 - jslaby@suse.cz
- Update config files.
Set SERIAL_8250_SHARE_IRQ (bnc#973748).
- commit 606f94a
-------------------------------------------------------------------
Sat Apr 2 10:18:27 CEST 2016 - tiwai@suse.de
@ -5,6 +12,68 @@ Sat Apr 2 10:18:27 CEST 2016 - tiwai@suse.de
via _OSC (bsc#969870).
- commit f6eec7e
-------------------------------------------------------------------
Fri Apr 1 15:41:27 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Only build the -kgraft package for modular kernels (fate#320268)
- commit 9bab96f
-------------------------------------------------------------------
Fri Apr 1 15:39:13 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Only build KMPs if CONFIG_SPLIT_PACKAGE=y (fate#319339)
- commit def905b
-------------------------------------------------------------------
Fri Apr 1 13:34:49 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Tag KMPs so that weak-modules2 ignores them
Also require a suse-module-tools version that can handle this (fate#319339).
- commit 58d21f9
-------------------------------------------------------------------
Fri Apr 1 12:49:52 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Add rpm scriptlets for KMPs (fate#319339)
Use the --{add,remove}-kernel-modules options of weak-modules2 instead
of --{add,remove}-kmp, because we do not want any symlinks to be created
for these KMPs.
- commit 95f8b94
-------------------------------------------------------------------
Thu Mar 31 13:23:55 CEST 2016 - mmarek@suse.com
- rpm/split-modules: Split modules into KMPs defined in supported.conf (fate#319339)
- commit 39da39b
-------------------------------------------------------------------
Thu Mar 31 13:22:48 CEST 2016 - mmarek@suse.com
- rpm/mkspec: Generate KMP subpackage sections from a template (fate#319339)
The KMPs are defined in the supported.conf file using a +<name>-kmp
guard.
- commit 09cb6b1
-------------------------------------------------------------------
Thu Mar 31 00:35:33 CEST 2016 - dvaleev@suse.com
- rpm/kernel-obs-build.spec.in:add e1000 and ibmveth
Those modules are required in order to have --vm-telnet option
working
- commit 1e87b6d
-------------------------------------------------------------------
Wed Mar 30 16:52:55 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Simplify parsing of supported.conf (fate#319339)
- commit 006b146
-------------------------------------------------------------------
Wed Mar 30 15:10:55 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Introduce a kernel-default-kgraft metapackage (fate#320268)
- commit 0439a47
-------------------------------------------------------------------
Mon Mar 28 09:27:57 CEST 2016 - tiwai@suse.de
@ -19,6 +88,25 @@ Thu Mar 24 13:50:11 CET 2016 - rgoldwyn@suse.com
- nfs: use file_dentry() (fate#318900).
- commit ede6caf
-------------------------------------------------------------------
Thu Mar 24 10:31:48 CET 2016 - tiwai@suse.de
- drm/radeon: rework fbdev handling on chips with no connectors
(boo#971853).
- commit af68ff6
-------------------------------------------------------------------
Wed Mar 23 21:55:21 CET 2016 - rgoldwyn@suse.com
- fs: add file_dentry() (bsc#963490,fate#318900).
- commit 66ef336
-------------------------------------------------------------------
Wed Mar 23 21:54:42 CET 2016 - rgoldwyn@suse.com
- nfs: use file_dentry() (fate#318900).
- commit 69a3e57
-------------------------------------------------------------------
Fri Mar 18 21:35:24 CET 2016 - tiwai@suse.de
@ -196,6 +284,13 @@ Fri Mar 4 08:54:21 CET 2016 - jslaby@suse.cz
Update upstream status.
- commit 859059c
-------------------------------------------------------------------
Thu Mar 3 15:35:27 CET 2016 - dsterba@suse.com
- Add build dependency for objtool
objtool requires libelf development headers.
- commit 16f65f2
-------------------------------------------------------------------
Thu Mar 3 09:18:25 CET 2016 - ohering@suse.de
@ -263,6 +358,12 @@ Tue Mar 1 19:14:25 CET 2016 - dmueller@suse.com
Device tree chosen output.
- commit ad7dbb8
-------------------------------------------------------------------
Tue Mar 1 11:20:31 CET 2016 - mmarek@suse.com
- rpm/kernel-module-subpackage: Fix obsoleting dropped flavors (bsc#968253)
- commit 5295c19
-------------------------------------------------------------------
Mon Feb 29 17:27:00 CET 2016 - mmarek@suse.com

48
kernel-debug.spec
View File

@ -63,7 +63,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 4.5.0
%if 0%{?is_kotd}
Release: <RELEASE>.g6682f99
Release: <RELEASE>.g7f10552
%else
Release: 0
%endif
@ -79,6 +79,8 @@ BuildRequires: modutils
# Used to sign the kernel in the buildservice
BuildRequires: openssl
BuildRequires: pesign-obs-integration
# for objtool
BuildRequires: libelf-devel
Provides: %name = %version-%source_rel
# bnc#901925
Provides: %name-%version-%source_rel
@ -389,15 +391,11 @@ mkdir -p %kernel_build_dir
# Generate a list of modules with their support status marking
%_sourcedir/guards --list --with-guards <%_sourcedir/supported.conf | \
awk '
/^\+(base|yes) / {
print $(NF);
next;
}
/^\+external / {
/\+external / {
print $(NF) " external";
next;
}
/^[-+]/ {
/^-/ {
print $(NF) " no";
next;
}
@ -405,8 +403,11 @@ awk '
print $(NF);
}
' >%kernel_build_dir/Module.supported
%_sourcedir/guards --default=0 base < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u >%kernel_build_dir/Module.base
for package in base ; do
%_sourcedir/guards --default=0 "$package" \
<%_sourcedir/supported.conf | sed 's,.*/,,; s,\.ko$,,' | \
sort -u >%kernel_build_dir/Module."$package"
done
cd linux-%srcversion
@ -771,7 +772,7 @@ if [ %CONFIG_MODULES = y ]; then
%if %split_base
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir/Module.base \
-b %kernel_build_dir \
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
-e \
%endif
@ -916,6 +917,11 @@ done | add_dirs_to_filelist >%my_builddir/kernel-devel.files
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%endif
for f in %my_builddir/*-kmp-modules; do
f2=${f%%-modules}.files
add_dirs_to_filelist "$f" >"$f2"
done
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
# much, but it keeps rpmlint from breaking the package build. Note that we skip
@ -1107,4 +1113,26 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%endif
%endif
%if %CONFIG_MODULES == "y"
%package kgraft
Summary: Metapackage to pull in matching kgraft-patch package
Group: System/Kernel
Requires: kgraft-patch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor
Provides: multiversion(kernel)
%description kgraft
This is a metapackage that pulls in the matching kgraft-patch package for a
given kernel version. The advantage of the metapackage is that its name is
static, unlike the kgraft-patch-<kernel-version>-flavor package names.
%files kgraft
# rpmlint complains about empty packages, so lets own something
%defattr(-, root, root)
%dir /lib/modules/%kernelrelease-%build_flavor
%endif
%if %split_base
%endif
%changelog

101
kernel-default.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Apr 3 12:33:45 CEST 2016 - jslaby@suse.cz
- Update config files.
Set SERIAL_8250_SHARE_IRQ (bnc#973748).
- commit 606f94a
-------------------------------------------------------------------
Sat Apr 2 10:18:27 CEST 2016 - tiwai@suse.de
@ -5,6 +12,68 @@ Sat Apr 2 10:18:27 CEST 2016 - tiwai@suse.de
via _OSC (bsc#969870).
- commit f6eec7e
-------------------------------------------------------------------
Fri Apr 1 15:41:27 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Only build the -kgraft package for modular kernels (fate#320268)
- commit 9bab96f
-------------------------------------------------------------------
Fri Apr 1 15:39:13 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Only build KMPs if CONFIG_SPLIT_PACKAGE=y (fate#319339)
- commit def905b
-------------------------------------------------------------------
Fri Apr 1 13:34:49 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Tag KMPs so that weak-modules2 ignores them
Also require a suse-module-tools version that can handle this (fate#319339).
- commit 58d21f9
-------------------------------------------------------------------
Fri Apr 1 12:49:52 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Add rpm scriptlets for KMPs (fate#319339)
Use the --{add,remove}-kernel-modules options of weak-modules2 instead
of --{add,remove}-kmp, because we do not want any symlinks to be created
for these KMPs.
- commit 95f8b94
-------------------------------------------------------------------
Thu Mar 31 13:23:55 CEST 2016 - mmarek@suse.com
- rpm/split-modules: Split modules into KMPs defined in supported.conf (fate#319339)
- commit 39da39b
-------------------------------------------------------------------
Thu Mar 31 13:22:48 CEST 2016 - mmarek@suse.com
- rpm/mkspec: Generate KMP subpackage sections from a template (fate#319339)
The KMPs are defined in the supported.conf file using a +<name>-kmp
guard.
- commit 09cb6b1
-------------------------------------------------------------------
Thu Mar 31 00:35:33 CEST 2016 - dvaleev@suse.com
- rpm/kernel-obs-build.spec.in:add e1000 and ibmveth
Those modules are required in order to have --vm-telnet option
working
- commit 1e87b6d
-------------------------------------------------------------------
Wed Mar 30 16:52:55 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Simplify parsing of supported.conf (fate#319339)
- commit 006b146
-------------------------------------------------------------------
Wed Mar 30 15:10:55 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Introduce a kernel-default-kgraft metapackage (fate#320268)
- commit 0439a47
-------------------------------------------------------------------
Mon Mar 28 09:27:57 CEST 2016 - tiwai@suse.de
@ -19,6 +88,25 @@ Thu Mar 24 13:50:11 CET 2016 - rgoldwyn@suse.com
- nfs: use file_dentry() (fate#318900).
- commit ede6caf
-------------------------------------------------------------------
Thu Mar 24 10:31:48 CET 2016 - tiwai@suse.de
- drm/radeon: rework fbdev handling on chips with no connectors
(boo#971853).
- commit af68ff6
-------------------------------------------------------------------
Wed Mar 23 21:55:21 CET 2016 - rgoldwyn@suse.com
- fs: add file_dentry() (bsc#963490,fate#318900).
- commit 66ef336
-------------------------------------------------------------------
Wed Mar 23 21:54:42 CET 2016 - rgoldwyn@suse.com
- nfs: use file_dentry() (fate#318900).
- commit 69a3e57
-------------------------------------------------------------------
Fri Mar 18 21:35:24 CET 2016 - tiwai@suse.de
@ -196,6 +284,13 @@ Fri Mar 4 08:54:21 CET 2016 - jslaby@suse.cz
Update upstream status.
- commit 859059c
-------------------------------------------------------------------
Thu Mar 3 15:35:27 CET 2016 - dsterba@suse.com
- Add build dependency for objtool
objtool requires libelf development headers.
- commit 16f65f2
-------------------------------------------------------------------
Thu Mar 3 09:18:25 CET 2016 - ohering@suse.de
@ -263,6 +358,12 @@ Tue Mar 1 19:14:25 CET 2016 - dmueller@suse.com
Device tree chosen output.
- commit ad7dbb8
-------------------------------------------------------------------
Tue Mar 1 11:20:31 CET 2016 - mmarek@suse.com
- rpm/kernel-module-subpackage: Fix obsoleting dropped flavors (bsc#968253)
- commit 5295c19
-------------------------------------------------------------------
Mon Feb 29 17:27:00 CET 2016 - mmarek@suse.com

48
kernel-default.spec
View File

@ -63,7 +63,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 4.5.0
%if 0%{?is_kotd}
Release: <RELEASE>.g6682f99
Release: <RELEASE>.g7f10552
%else
Release: 0
%endif
@ -79,6 +79,8 @@ BuildRequires: modutils
# Used to sign the kernel in the buildservice
BuildRequires: openssl
BuildRequires: pesign-obs-integration
# for objtool
BuildRequires: libelf-devel
Provides: %name = %version-%source_rel
# bnc#901925
Provides: %name-%version-%source_rel
@ -432,15 +434,11 @@ mkdir -p %kernel_build_dir
# Generate a list of modules with their support status marking
%_sourcedir/guards --list --with-guards <%_sourcedir/supported.conf | \
awk '
/^\+(base|yes) / {
print $(NF);
next;
}
/^\+external / {
/\+external / {
print $(NF) " external";
next;
}
/^[-+]/ {
/^-/ {
print $(NF) " no";
next;
}
@ -448,8 +446,11 @@ awk '
print $(NF);
}
' >%kernel_build_dir/Module.supported
%_sourcedir/guards --default=0 base < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u >%kernel_build_dir/Module.base
for package in base ; do
%_sourcedir/guards --default=0 "$package" \
<%_sourcedir/supported.conf | sed 's,.*/,,; s,\.ko$,,' | \
sort -u >%kernel_build_dir/Module."$package"
done
cd linux-%srcversion
@ -814,7 +815,7 @@ if [ %CONFIG_MODULES = y ]; then
%if %split_base
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir/Module.base \
-b %kernel_build_dir \
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
-e \
%endif
@ -959,6 +960,11 @@ done | add_dirs_to_filelist >%my_builddir/kernel-devel.files
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%endif
for f in %my_builddir/*-kmp-modules; do
f2=${f%%-modules}.files
add_dirs_to_filelist "$f" >"$f2"
done
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
# much, but it keeps rpmlint from breaking the package build. Note that we skip
@ -1208,4 +1214,26 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%endif
%endif
%if %CONFIG_MODULES == "y"
%package kgraft
Summary: Metapackage to pull in matching kgraft-patch package
Group: System/Kernel
Requires: kgraft-patch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor
Provides: multiversion(kernel)
%description kgraft
This is a metapackage that pulls in the matching kgraft-patch package for a
given kernel version. The advantage of the metapackage is that its name is
static, unlike the kgraft-patch-<kernel-version>-flavor package names.
%files kgraft
# rpmlint complains about empty packages, so lets own something
%defattr(-, root, root)
%dir /lib/modules/%kernelrelease-%build_flavor
%endif
%if %split_base
%endif
%changelog

101
kernel-docs.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Apr 3 12:33:45 CEST 2016 - jslaby@suse.cz
- Update config files.
Set SERIAL_8250_SHARE_IRQ (bnc#973748).
- commit 606f94a
-------------------------------------------------------------------
Sat Apr 2 10:18:27 CEST 2016 - tiwai@suse.de
@ -5,6 +12,68 @@ Sat Apr 2 10:18:27 CEST 2016 - tiwai@suse.de
via _OSC (bsc#969870).
- commit f6eec7e
-------------------------------------------------------------------
Fri Apr 1 15:41:27 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Only build the -kgraft package for modular kernels (fate#320268)
- commit 9bab96f
-------------------------------------------------------------------
Fri Apr 1 15:39:13 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Only build KMPs if CONFIG_SPLIT_PACKAGE=y (fate#319339)
- commit def905b
-------------------------------------------------------------------
Fri Apr 1 13:34:49 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Tag KMPs so that weak-modules2 ignores them
Also require a suse-module-tools version that can handle this (fate#319339).
- commit 58d21f9
-------------------------------------------------------------------
Fri Apr 1 12:49:52 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Add rpm scriptlets for KMPs (fate#319339)
Use the --{add,remove}-kernel-modules options of weak-modules2 instead
of --{add,remove}-kmp, because we do not want any symlinks to be created
for these KMPs.
- commit 95f8b94
-------------------------------------------------------------------
Thu Mar 31 13:23:55 CEST 2016 - mmarek@suse.com
- rpm/split-modules: Split modules into KMPs defined in supported.conf (fate#319339)
- commit 39da39b
-------------------------------------------------------------------
Thu Mar 31 13:22:48 CEST 2016 - mmarek@suse.com
- rpm/mkspec: Generate KMP subpackage sections from a template (fate#319339)
The KMPs are defined in the supported.conf file using a +<name>-kmp
guard.
- commit 09cb6b1
-------------------------------------------------------------------
Thu Mar 31 00:35:33 CEST 2016 - dvaleev@suse.com
- rpm/kernel-obs-build.spec.in:add e1000 and ibmveth
Those modules are required in order to have --vm-telnet option
working
- commit 1e87b6d
-------------------------------------------------------------------
Wed Mar 30 16:52:55 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Simplify parsing of supported.conf (fate#319339)
- commit 006b146
-------------------------------------------------------------------
Wed Mar 30 15:10:55 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Introduce a kernel-default-kgraft metapackage (fate#320268)
- commit 0439a47
-------------------------------------------------------------------
Mon Mar 28 09:27:57 CEST 2016 - tiwai@suse.de
@ -19,6 +88,25 @@ Thu Mar 24 13:50:11 CET 2016 - rgoldwyn@suse.com
- nfs: use file_dentry() (fate#318900).
- commit ede6caf
-------------------------------------------------------------------
Thu Mar 24 10:31:48 CET 2016 - tiwai@suse.de
- drm/radeon: rework fbdev handling on chips with no connectors
(boo#971853).
- commit af68ff6
-------------------------------------------------------------------
Wed Mar 23 21:55:21 CET 2016 - rgoldwyn@suse.com
- fs: add file_dentry() (bsc#963490,fate#318900).
- commit 66ef336
-------------------------------------------------------------------
Wed Mar 23 21:54:42 CET 2016 - rgoldwyn@suse.com
- nfs: use file_dentry() (fate#318900).
- commit 69a3e57
-------------------------------------------------------------------
Fri Mar 18 21:35:24 CET 2016 - tiwai@suse.de
@ -196,6 +284,13 @@ Fri Mar 4 08:54:21 CET 2016 - jslaby@suse.cz
Update upstream status.
- commit 859059c
-------------------------------------------------------------------
Thu Mar 3 15:35:27 CET 2016 - dsterba@suse.com
- Add build dependency for objtool
objtool requires libelf development headers.
- commit 16f65f2
-------------------------------------------------------------------
Thu Mar 3 09:18:25 CET 2016 - ohering@suse.de
@ -263,6 +358,12 @@ Tue Mar 1 19:14:25 CET 2016 - dmueller@suse.com
Device tree chosen output.
- commit ad7dbb8
-------------------------------------------------------------------
Tue Mar 1 11:20:31 CET 2016 - mmarek@suse.com
- rpm/kernel-module-subpackage: Fix obsoleting dropped flavors (bsc#968253)
- commit 5295c19
-------------------------------------------------------------------
Mon Feb 29 17:27:00 CET 2016 - mmarek@suse.com

2
kernel-docs.spec
View File

@ -29,7 +29,7 @@ License: GPL-2.0
Group: Documentation/Man
Version: 4.5.0
%if 0%{?is_kotd}
Release: <RELEASE>.g6682f99
Release: <RELEASE>.g7f10552
%else
Release: 0
%endif

101
kernel-lpae.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Apr 3 12:33:45 CEST 2016 - jslaby@suse.cz
- Update config files.
Set SERIAL_8250_SHARE_IRQ (bnc#973748).
- commit 606f94a
-------------------------------------------------------------------
Sat Apr 2 10:18:27 CEST 2016 - tiwai@suse.de
@ -5,6 +12,68 @@ Sat Apr 2 10:18:27 CEST 2016 - tiwai@suse.de
via _OSC (bsc#969870).
- commit f6eec7e
-------------------------------------------------------------------
Fri Apr 1 15:41:27 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Only build the -kgraft package for modular kernels (fate#320268)
- commit 9bab96f
-------------------------------------------------------------------
Fri Apr 1 15:39:13 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Only build KMPs if CONFIG_SPLIT_PACKAGE=y (fate#319339)
- commit def905b
-------------------------------------------------------------------
Fri Apr 1 13:34:49 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Tag KMPs so that weak-modules2 ignores them
Also require a suse-module-tools version that can handle this (fate#319339).
- commit 58d21f9
-------------------------------------------------------------------
Fri Apr 1 12:49:52 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Add rpm scriptlets for KMPs (fate#319339)
Use the --{add,remove}-kernel-modules options of weak-modules2 instead
of --{add,remove}-kmp, because we do not want any symlinks to be created
for these KMPs.
- commit 95f8b94
-------------------------------------------------------------------
Thu Mar 31 13:23:55 CEST 2016 - mmarek@suse.com
- rpm/split-modules: Split modules into KMPs defined in supported.conf (fate#319339)
- commit 39da39b
-------------------------------------------------------------------
Thu Mar 31 13:22:48 CEST 2016 - mmarek@suse.com
- rpm/mkspec: Generate KMP subpackage sections from a template (fate#319339)
The KMPs are defined in the supported.conf file using a +<name>-kmp
guard.
- commit 09cb6b1
-------------------------------------------------------------------
Thu Mar 31 00:35:33 CEST 2016 - dvaleev@suse.com
- rpm/kernel-obs-build.spec.in:add e1000 and ibmveth
Those modules are required in order to have --vm-telnet option
working
- commit 1e87b6d
-------------------------------------------------------------------
Wed Mar 30 16:52:55 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Simplify parsing of supported.conf (fate#319339)
- commit 006b146
-------------------------------------------------------------------
Wed Mar 30 15:10:55 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Introduce a kernel-default-kgraft metapackage (fate#320268)
- commit 0439a47
-------------------------------------------------------------------
Mon Mar 28 09:27:57 CEST 2016 - tiwai@suse.de
@ -19,6 +88,25 @@ Thu Mar 24 13:50:11 CET 2016 - rgoldwyn@suse.com
- nfs: use file_dentry() (fate#318900).
- commit ede6caf
-------------------------------------------------------------------
Thu Mar 24 10:31:48 CET 2016 - tiwai@suse.de
- drm/radeon: rework fbdev handling on chips with no connectors
(boo#971853).
- commit af68ff6
-------------------------------------------------------------------
Wed Mar 23 21:55:21 CET 2016 - rgoldwyn@suse.com
- fs: add file_dentry() (bsc#963490,fate#318900).
- commit 66ef336
-------------------------------------------------------------------
Wed Mar 23 21:54:42 CET 2016 - rgoldwyn@suse.com
- nfs: use file_dentry() (fate#318900).
- commit 69a3e57
-------------------------------------------------------------------
Fri Mar 18 21:35:24 CET 2016 - tiwai@suse.de
@ -196,6 +284,13 @@ Fri Mar 4 08:54:21 CET 2016 - jslaby@suse.cz
Update upstream status.
- commit 859059c
-------------------------------------------------------------------
Thu Mar 3 15:35:27 CET 2016 - dsterba@suse.com
- Add build dependency for objtool
objtool requires libelf development headers.
- commit 16f65f2
-------------------------------------------------------------------
Thu Mar 3 09:18:25 CET 2016 - ohering@suse.de
@ -263,6 +358,12 @@ Tue Mar 1 19:14:25 CET 2016 - dmueller@suse.com
Device tree chosen output.
- commit ad7dbb8
-------------------------------------------------------------------
Tue Mar 1 11:20:31 CET 2016 - mmarek@suse.com
- rpm/kernel-module-subpackage: Fix obsoleting dropped flavors (bsc#968253)
- commit 5295c19
-------------------------------------------------------------------
Mon Feb 29 17:27:00 CET 2016 - mmarek@suse.com

48
kernel-lpae.spec
View File

@ -63,7 +63,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 4.5.0
%if 0%{?is_kotd}
Release: <RELEASE>.g6682f99
Release: <RELEASE>.g7f10552
%else
Release: 0
%endif
@ -79,6 +79,8 @@ BuildRequires: modutils
# Used to sign the kernel in the buildservice
BuildRequires: openssl
BuildRequires: pesign-obs-integration
# for objtool
BuildRequires: libelf-devel
Provides: %name = %version-%source_rel
# bnc#901925
Provides: %name-%version-%source_rel
@ -383,15 +385,11 @@ mkdir -p %kernel_build_dir
# Generate a list of modules with their support status marking
%_sourcedir/guards --list --with-guards <%_sourcedir/supported.conf | \
awk '
/^\+(base|yes) / {
print $(NF);
next;
}
/^\+external / {
/\+external / {
print $(NF) " external";
next;
}
/^[-+]/ {
/^-/ {
print $(NF) " no";
next;
}
@ -399,8 +397,11 @@ awk '
print $(NF);
}
' >%kernel_build_dir/Module.supported
%_sourcedir/guards --default=0 base < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u >%kernel_build_dir/Module.base
for package in base ; do
%_sourcedir/guards --default=0 "$package" \
<%_sourcedir/supported.conf | sed 's,.*/,,; s,\.ko$,,' | \
sort -u >%kernel_build_dir/Module."$package"
done
cd linux-%srcversion
@ -765,7 +766,7 @@ if [ %CONFIG_MODULES = y ]; then
%if %split_base
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir/Module.base \
-b %kernel_build_dir \
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
-e \
%endif
@ -910,6 +911,11 @@ done | add_dirs_to_filelist >%my_builddir/kernel-devel.files
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%endif
for f in %my_builddir/*-kmp-modules; do
f2=${f%%-modules}.files
add_dirs_to_filelist "$f" >"$f2"
done
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
# much, but it keeps rpmlint from breaking the package build. Note that we skip
@ -1092,4 +1098,26 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%endif
%endif
%if %CONFIG_MODULES == "y"
%package kgraft
Summary: Metapackage to pull in matching kgraft-patch package
Group: System/Kernel
Requires: kgraft-patch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor
Provides: multiversion(kernel)
%description kgraft
This is a metapackage that pulls in the matching kgraft-patch package for a
given kernel version. The advantage of the metapackage is that its name is
static, unlike the kgraft-patch-<kernel-version>-flavor package names.
%files kgraft
# rpmlint complains about empty packages, so lets own something
%defattr(-, root, root)
%dir /lib/modules/%kernelrelease-%build_flavor
%endif
%if %split_base
%endif
%changelog

10
kernel-module-subpackage
View File

@ -27,19 +27,19 @@ Requires: coreutils grep
%{-c:Requires: %{-n*}-ueficert}
Enhances: kernel-%1
%if %1 == "default"
Obsoletes: %{-n*}-trace
Obsoletes: %{-n*}-kmp-trace
%ifarch %ix86
Obsoletes: %{-n*}-vmi
Obsoletes: %{-n*}-kmp-vmi
%endif
%ifarch x86_64
Obsoletes: %{-n*}-desktop
Obsoletes: %{-n*}-kmp-desktop
%endif
%ifarch %ix86 x86_64
Obsoletes: %{-n*}-xen
Obsoletes: %{-n*}-kmp-xen
%endif
%endif
%if %1 == "pae"
Obsoletes: %{-n*}-desktop
Obsoletes: %{-n*}-kmp-desktop
%endif
AutoReqProv: on
%{-p:%{expand:%(cd %_sourcedir; cat %{-p*})}}

101
kernel-obs-build.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Apr 3 12:33:45 CEST 2016 - jslaby@suse.cz
- Update config files.
Set SERIAL_8250_SHARE_IRQ (bnc#973748).
- commit 606f94a
-------------------------------------------------------------------
Sat Apr 2 10:18:27 CEST 2016 - tiwai@suse.de
@ -5,6 +12,68 @@ Sat Apr 2 10:18:27 CEST 2016 - tiwai@suse.de
via _OSC (bsc#969870).
- commit f6eec7e
-------------------------------------------------------------------
Fri Apr 1 15:41:27 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Only build the -kgraft package for modular kernels (fate#320268)
- commit 9bab96f
-------------------------------------------------------------------
Fri Apr 1 15:39:13 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Only build KMPs if CONFIG_SPLIT_PACKAGE=y (fate#319339)
- commit def905b
-------------------------------------------------------------------
Fri Apr 1 13:34:49 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Tag KMPs so that weak-modules2 ignores them
Also require a suse-module-tools version that can handle this (fate#319339).
- commit 58d21f9
-------------------------------------------------------------------
Fri Apr 1 12:49:52 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Add rpm scriptlets for KMPs (fate#319339)
Use the --{add,remove}-kernel-modules options of weak-modules2 instead
of --{add,remove}-kmp, because we do not want any symlinks to be created
for these KMPs.
- commit 95f8b94
-------------------------------------------------------------------
Thu Mar 31 13:23:55 CEST 2016 - mmarek@suse.com
- rpm/split-modules: Split modules into KMPs defined in supported.conf (fate#319339)
- commit 39da39b
-------------------------------------------------------------------
Thu Mar 31 13:22:48 CEST 2016 - mmarek@suse.com
- rpm/mkspec: Generate KMP subpackage sections from a template (fate#319339)
The KMPs are defined in the supported.conf file using a +<name>-kmp
guard.
- commit 09cb6b1
-------------------------------------------------------------------
Thu Mar 31 00:35:33 CEST 2016 - dvaleev@suse.com
- rpm/kernel-obs-build.spec.in:add e1000 and ibmveth
Those modules are required in order to have --vm-telnet option
working
- commit 1e87b6d
-------------------------------------------------------------------
Wed Mar 30 16:52:55 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Simplify parsing of supported.conf (fate#319339)
- commit 006b146
-------------------------------------------------------------------
Wed Mar 30 15:10:55 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Introduce a kernel-default-kgraft metapackage (fate#320268)
- commit 0439a47
-------------------------------------------------------------------
Mon Mar 28 09:27:57 CEST 2016 - tiwai@suse.de
@ -19,6 +88,25 @@ Thu Mar 24 13:50:11 CET 2016 - rgoldwyn@suse.com
- nfs: use file_dentry() (fate#318900).
- commit ede6caf
-------------------------------------------------------------------
Thu Mar 24 10:31:48 CET 2016 - tiwai@suse.de
- drm/radeon: rework fbdev handling on chips with no connectors
(boo#971853).
- commit af68ff6
-------------------------------------------------------------------
Wed Mar 23 21:55:21 CET 2016 - rgoldwyn@suse.com
- fs: add file_dentry() (bsc#963490,fate#318900).
- commit 66ef336
-------------------------------------------------------------------
Wed Mar 23 21:54:42 CET 2016 - rgoldwyn@suse.com
- nfs: use file_dentry() (fate#318900).
- commit 69a3e57
-------------------------------------------------------------------
Fri Mar 18 21:35:24 CET 2016 - tiwai@suse.de
@ -196,6 +284,13 @@ Fri Mar 4 08:54:21 CET 2016 - jslaby@suse.cz
Update upstream status.
- commit 859059c
-------------------------------------------------------------------
Thu Mar 3 15:35:27 CET 2016 - dsterba@suse.com
- Add build dependency for objtool
objtool requires libelf development headers.
- commit 16f65f2
-------------------------------------------------------------------
Thu Mar 3 09:18:25 CET 2016 - ohering@suse.de
@ -263,6 +358,12 @@ Tue Mar 1 19:14:25 CET 2016 - dmueller@suse.com
Device tree chosen output.
- commit ad7dbb8
-------------------------------------------------------------------
Tue Mar 1 11:20:31 CET 2016 - mmarek@suse.com
- rpm/kernel-module-subpackage: Fix obsoleting dropped flavors (bsc#968253)
- commit 5295c19
-------------------------------------------------------------------
Mon Feb 29 17:27:00 CET 2016 - mmarek@suse.com

4
kernel-obs-build.spec
View File

@ -53,7 +53,7 @@ License: GPL-2.0
Group: SLES
Version: 4.5.0
%if 0%{?is_kotd}
Release: <RELEASE>.g6682f99
Release: <RELEASE>.g7f10552
%else
Release: 0
%endif
@ -103,7 +103,7 @@ echo "DefaultTasksAccounting=no" >> /etc/systemd/system.conf
# a longer list to have them also available for qemu cross builds where x86_64 kernel runs in eg. arm env.
# this list of modules where available on build workers of build.opensuse.org, so we stay compatible.
export KERNEL_MODULES="loop dm-mod dm-snapshot binfmt-misc fuse kqemu squashfs ext2 ext3 ext4 reiserfs btrfs nf_conntrack_ipv6 binfmt_misc virtio_pci virtio_mmio virtio_blk virtio_rng fat vfat nls_cp437 nls_iso8859-1 ibmvscsi sd_mod"
export KERNEL_MODULES="loop dm-mod dm-snapshot binfmt-misc fuse kqemu squashfs ext2 ext3 ext4 reiserfs btrfs nf_conntrack_ipv6 binfmt_misc virtio_pci virtio_mmio virtio_blk virtio_rng fat vfat nls_cp437 nls_iso8859-1 ibmvscsi sd_mod e1000 ibmveth"
# manually load all modules to make sure they're available
for i in $KERNEL_MODULES; do

2
kernel-obs-build.spec.in
View File

@ -103,7 +103,7 @@ echo "DefaultTasksAccounting=no" >> /etc/systemd/system.conf
# a longer list to have them also available for qemu cross builds where x86_64 kernel runs in eg. arm env.
# this list of modules where available on build workers of build.opensuse.org, so we stay compatible.
export KERNEL_MODULES="loop dm-mod dm-snapshot binfmt-misc fuse kqemu squashfs ext2 ext3 ext4 reiserfs btrfs nf_conntrack_ipv6 binfmt_misc virtio_pci virtio_mmio virtio_blk virtio_rng fat vfat nls_cp437 nls_iso8859-1 ibmvscsi sd_mod"
export KERNEL_MODULES="loop dm-mod dm-snapshot binfmt-misc fuse kqemu squashfs ext2 ext3 ext4 reiserfs btrfs nf_conntrack_ipv6 binfmt_misc virtio_pci virtio_mmio virtio_blk virtio_rng fat vfat nls_cp437 nls_iso8859-1 ibmvscsi sd_mod e1000 ibmveth"
# manually load all modules to make sure they're available
for i in $KERNEL_MODULES; do

101
kernel-obs-qa.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Apr 3 12:33:45 CEST 2016 - jslaby@suse.cz
- Update config files.
Set SERIAL_8250_SHARE_IRQ (bnc#973748).
- commit 606f94a
-------------------------------------------------------------------
Sat Apr 2 10:18:27 CEST 2016 - tiwai@suse.de
@ -5,6 +12,68 @@ Sat Apr 2 10:18:27 CEST 2016 - tiwai@suse.de
via _OSC (bsc#969870).
- commit f6eec7e
-------------------------------------------------------------------
Fri Apr 1 15:41:27 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Only build the -kgraft package for modular kernels (fate#320268)
- commit 9bab96f
-------------------------------------------------------------------
Fri Apr 1 15:39:13 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Only build KMPs if CONFIG_SPLIT_PACKAGE=y (fate#319339)
- commit def905b
-------------------------------------------------------------------
Fri Apr 1 13:34:49 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Tag KMPs so that weak-modules2 ignores them
Also require a suse-module-tools version that can handle this (fate#319339).
- commit 58d21f9
-------------------------------------------------------------------
Fri Apr 1 12:49:52 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Add rpm scriptlets for KMPs (fate#319339)
Use the --{add,remove}-kernel-modules options of weak-modules2 instead
of --{add,remove}-kmp, because we do not want any symlinks to be created
for these KMPs.
- commit 95f8b94
-------------------------------------------------------------------
Thu Mar 31 13:23:55 CEST 2016 - mmarek@suse.com
- rpm/split-modules: Split modules into KMPs defined in supported.conf (fate#319339)
- commit 39da39b
-------------------------------------------------------------------
Thu Mar 31 13:22:48 CEST 2016 - mmarek@suse.com
- rpm/mkspec: Generate KMP subpackage sections from a template (fate#319339)
The KMPs are defined in the supported.conf file using a +<name>-kmp
guard.
- commit 09cb6b1
-------------------------------------------------------------------
Thu Mar 31 00:35:33 CEST 2016 - dvaleev@suse.com
- rpm/kernel-obs-build.spec.in:add e1000 and ibmveth
Those modules are required in order to have --vm-telnet option
working
- commit 1e87b6d
-------------------------------------------------------------------
Wed Mar 30 16:52:55 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Simplify parsing of supported.conf (fate#319339)
- commit 006b146
-------------------------------------------------------------------
Wed Mar 30 15:10:55 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Introduce a kernel-default-kgraft metapackage (fate#320268)
- commit 0439a47
-------------------------------------------------------------------
Mon Mar 28 09:27:57 CEST 2016 - tiwai@suse.de
@ -19,6 +88,25 @@ Thu Mar 24 13:50:11 CET 2016 - rgoldwyn@suse.com
- nfs: use file_dentry() (fate#318900).
- commit ede6caf
-------------------------------------------------------------------
Thu Mar 24 10:31:48 CET 2016 - tiwai@suse.de
- drm/radeon: rework fbdev handling on chips with no connectors
(boo#971853).
- commit af68ff6
-------------------------------------------------------------------
Wed Mar 23 21:55:21 CET 2016 - rgoldwyn@suse.com
- fs: add file_dentry() (bsc#963490,fate#318900).
- commit 66ef336
-------------------------------------------------------------------
Wed Mar 23 21:54:42 CET 2016 - rgoldwyn@suse.com
- nfs: use file_dentry() (fate#318900).
- commit 69a3e57
-------------------------------------------------------------------
Fri Mar 18 21:35:24 CET 2016 - tiwai@suse.de
@ -196,6 +284,13 @@ Fri Mar 4 08:54:21 CET 2016 - jslaby@suse.cz
Update upstream status.
- commit 859059c
-------------------------------------------------------------------
Thu Mar 3 15:35:27 CET 2016 - dsterba@suse.com
- Add build dependency for objtool
objtool requires libelf development headers.
- commit 16f65f2
-------------------------------------------------------------------
Thu Mar 3 09:18:25 CET 2016 - ohering@suse.de
@ -263,6 +358,12 @@ Tue Mar 1 19:14:25 CET 2016 - dmueller@suse.com
Device tree chosen output.
- commit ad7dbb8
-------------------------------------------------------------------
Tue Mar 1 11:20:31 CET 2016 - mmarek@suse.com
- rpm/kernel-module-subpackage: Fix obsoleting dropped flavors (bsc#968253)
- commit 5295c19
-------------------------------------------------------------------
Mon Feb 29 17:27:00 CET 2016 - mmarek@suse.com

2
kernel-obs-qa.spec
View File

@ -38,7 +38,7 @@ License: GPL-2.0
Group: SLES
Version: 4.5.0
%if 0%{?is_kotd}
Release: <RELEASE>.g6682f99
Release: <RELEASE>.g7f10552
%else
Release: 0
%endif

101
kernel-pae.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Apr 3 12:33:45 CEST 2016 - jslaby@suse.cz
- Update config files.
Set SERIAL_8250_SHARE_IRQ (bnc#973748).
- commit 606f94a
-------------------------------------------------------------------
Sat Apr 2 10:18:27 CEST 2016 - tiwai@suse.de
@ -5,6 +12,68 @@ Sat Apr 2 10:18:27 CEST 2016 - tiwai@suse.de
via _OSC (bsc#969870).
- commit f6eec7e
-------------------------------------------------------------------
Fri Apr 1 15:41:27 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Only build the -kgraft package for modular kernels (fate#320268)
- commit 9bab96f
-------------------------------------------------------------------
Fri Apr 1 15:39:13 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Only build KMPs if CONFIG_SPLIT_PACKAGE=y (fate#319339)
- commit def905b
-------------------------------------------------------------------
Fri Apr 1 13:34:49 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Tag KMPs so that weak-modules2 ignores them
Also require a suse-module-tools version that can handle this (fate#319339).
- commit 58d21f9
-------------------------------------------------------------------
Fri Apr 1 12:49:52 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Add rpm scriptlets for KMPs (fate#319339)
Use the --{add,remove}-kernel-modules options of weak-modules2 instead
of --{add,remove}-kmp, because we do not want any symlinks to be created
for these KMPs.
- commit 95f8b94
-------------------------------------------------------------------
Thu Mar 31 13:23:55 CEST 2016 - mmarek@suse.com
- rpm/split-modules: Split modules into KMPs defined in supported.conf (fate#319339)
- commit 39da39b
-------------------------------------------------------------------
Thu Mar 31 13:22:48 CEST 2016 - mmarek@suse.com
- rpm/mkspec: Generate KMP subpackage sections from a template (fate#319339)
The KMPs are defined in the supported.conf file using a +<name>-kmp
guard.
- commit 09cb6b1
-------------------------------------------------------------------
Thu Mar 31 00:35:33 CEST 2016 - dvaleev@suse.com
- rpm/kernel-obs-build.spec.in:add e1000 and ibmveth
Those modules are required in order to have --vm-telnet option
working
- commit 1e87b6d
-------------------------------------------------------------------
Wed Mar 30 16:52:55 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Simplify parsing of supported.conf (fate#319339)
- commit 006b146
-------------------------------------------------------------------
Wed Mar 30 15:10:55 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Introduce a kernel-default-kgraft metapackage (fate#320268)
- commit 0439a47
-------------------------------------------------------------------
Mon Mar 28 09:27:57 CEST 2016 - tiwai@suse.de
@ -19,6 +88,25 @@ Thu Mar 24 13:50:11 CET 2016 - rgoldwyn@suse.com
- nfs: use file_dentry() (fate#318900).
- commit ede6caf
-------------------------------------------------------------------
Thu Mar 24 10:31:48 CET 2016 - tiwai@suse.de
- drm/radeon: rework fbdev handling on chips with no connectors
(boo#971853).
- commit af68ff6
-------------------------------------------------------------------
Wed Mar 23 21:55:21 CET 2016 - rgoldwyn@suse.com
- fs: add file_dentry() (bsc#963490,fate#318900).
- commit 66ef336
-------------------------------------------------------------------
Wed Mar 23 21:54:42 CET 2016 - rgoldwyn@suse.com
- nfs: use file_dentry() (fate#318900).
- commit 69a3e57
-------------------------------------------------------------------
Fri Mar 18 21:35:24 CET 2016 - tiwai@suse.de
@ -196,6 +284,13 @@ Fri Mar 4 08:54:21 CET 2016 - jslaby@suse.cz
Update upstream status.
- commit 859059c
-------------------------------------------------------------------
Thu Mar 3 15:35:27 CET 2016 - dsterba@suse.com
- Add build dependency for objtool
objtool requires libelf development headers.
- commit 16f65f2
-------------------------------------------------------------------
Thu Mar 3 09:18:25 CET 2016 - ohering@suse.de
@ -263,6 +358,12 @@ Tue Mar 1 19:14:25 CET 2016 - dmueller@suse.com
Device tree chosen output.
- commit ad7dbb8
-------------------------------------------------------------------
Tue Mar 1 11:20:31 CET 2016 - mmarek@suse.com
- rpm/kernel-module-subpackage: Fix obsoleting dropped flavors (bsc#968253)
- commit 5295c19
-------------------------------------------------------------------
Mon Feb 29 17:27:00 CET 2016 - mmarek@suse.com

48
kernel-pae.spec
View File

@ -63,7 +63,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 4.5.0
%if 0%{?is_kotd}
Release: <RELEASE>.g6682f99
Release: <RELEASE>.g7f10552
%else
Release: 0
%endif
@ -79,6 +79,8 @@ BuildRequires: modutils
# Used to sign the kernel in the buildservice
BuildRequires: openssl
BuildRequires: pesign-obs-integration
# for objtool
BuildRequires: libelf-devel
Provides: %name = %version-%source_rel
# bnc#901925
Provides: %name-%version-%source_rel
@ -409,15 +411,11 @@ mkdir -p %kernel_build_dir
# Generate a list of modules with their support status marking
%_sourcedir/guards --list --with-guards <%_sourcedir/supported.conf | \
awk '
/^\+(base|yes) / {
print $(NF);
next;
}
/^\+external / {
/\+external / {
print $(NF) " external";
next;
}
/^[-+]/ {
/^-/ {
print $(NF) " no";
next;
}
@ -425,8 +423,11 @@ awk '
print $(NF);
}
' >%kernel_build_dir/Module.supported
%_sourcedir/guards --default=0 base < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u >%kernel_build_dir/Module.base
for package in base ; do
%_sourcedir/guards --default=0 "$package" \
<%_sourcedir/supported.conf | sed 's,.*/,,; s,\.ko$,,' | \
sort -u >%kernel_build_dir/Module."$package"
done
cd linux-%srcversion
@ -791,7 +792,7 @@ if [ %CONFIG_MODULES = y ]; then
%if %split_base
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir/Module.base \
-b %kernel_build_dir \
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
-e \
%endif
@ -936,6 +937,11 @@ done | add_dirs_to_filelist >%my_builddir/kernel-devel.files
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%endif
for f in %my_builddir/*-kmp-modules; do
f2=${f%%-modules}.files
add_dirs_to_filelist "$f" >"$f2"
done
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
# much, but it keeps rpmlint from breaking the package build. Note that we skip
@ -1157,4 +1163,26 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%endif
%endif
%if %CONFIG_MODULES == "y"
%package kgraft
Summary: Metapackage to pull in matching kgraft-patch package
Group: System/Kernel
Requires: kgraft-patch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor
Provides: multiversion(kernel)
%description kgraft
This is a metapackage that pulls in the matching kgraft-patch package for a
given kernel version. The advantage of the metapackage is that its name is
static, unlike the kgraft-patch-<kernel-version>-flavor package names.
%files kgraft
# rpmlint complains about empty packages, so lets own something
%defattr(-, root, root)
%dir /lib/modules/%kernelrelease-%build_flavor
%endif
%if %split_base
%endif
%changelog

101
kernel-source.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Apr 3 12:33:45 CEST 2016 - jslaby@suse.cz
- Update config files.
Set SERIAL_8250_SHARE_IRQ (bnc#973748).
- commit 606f94a
-------------------------------------------------------------------
Sat Apr 2 10:18:27 CEST 2016 - tiwai@suse.de
@ -5,6 +12,68 @@ Sat Apr 2 10:18:27 CEST 2016 - tiwai@suse.de
via _OSC (bsc#969870).
- commit f6eec7e
-------------------------------------------------------------------
Fri Apr 1 15:41:27 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Only build the -kgraft package for modular kernels (fate#320268)
- commit 9bab96f
-------------------------------------------------------------------
Fri Apr 1 15:39:13 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Only build KMPs if CONFIG_SPLIT_PACKAGE=y (fate#319339)
- commit def905b
-------------------------------------------------------------------
Fri Apr 1 13:34:49 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Tag KMPs so that weak-modules2 ignores them
Also require a suse-module-tools version that can handle this (fate#319339).
- commit 58d21f9
-------------------------------------------------------------------
Fri Apr 1 12:49:52 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Add rpm scriptlets for KMPs (fate#319339)
Use the --{add,remove}-kernel-modules options of weak-modules2 instead
of --{add,remove}-kmp, because we do not want any symlinks to be created
for these KMPs.
- commit 95f8b94
-------------------------------------------------------------------
Thu Mar 31 13:23:55 CEST 2016 - mmarek@suse.com
- rpm/split-modules: Split modules into KMPs defined in supported.conf (fate#319339)
- commit 39da39b
-------------------------------------------------------------------
Thu Mar 31 13:22:48 CEST 2016 - mmarek@suse.com
- rpm/mkspec: Generate KMP subpackage sections from a template (fate#319339)
The KMPs are defined in the supported.conf file using a +<name>-kmp
guard.
- commit 09cb6b1
-------------------------------------------------------------------
Thu Mar 31 00:35:33 CEST 2016 - dvaleev@suse.com
- rpm/kernel-obs-build.spec.in:add e1000 and ibmveth
Those modules are required in order to have --vm-telnet option
working
- commit 1e87b6d
-------------------------------------------------------------------
Wed Mar 30 16:52:55 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Simplify parsing of supported.conf (fate#319339)
- commit 006b146
-------------------------------------------------------------------
Wed Mar 30 15:10:55 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Introduce a kernel-default-kgraft metapackage (fate#320268)
- commit 0439a47
-------------------------------------------------------------------
Mon Mar 28 09:27:57 CEST 2016 - tiwai@suse.de
@ -19,6 +88,25 @@ Thu Mar 24 13:50:11 CET 2016 - rgoldwyn@suse.com
- nfs: use file_dentry() (fate#318900).
- commit ede6caf
-------------------------------------------------------------------
Thu Mar 24 10:31:48 CET 2016 - tiwai@suse.de
- drm/radeon: rework fbdev handling on chips with no connectors
(boo#971853).
- commit af68ff6
-------------------------------------------------------------------
Wed Mar 23 21:55:21 CET 2016 - rgoldwyn@suse.com
- fs: add file_dentry() (bsc#963490,fate#318900).
- commit 66ef336
-------------------------------------------------------------------
Wed Mar 23 21:54:42 CET 2016 - rgoldwyn@suse.com
- nfs: use file_dentry() (fate#318900).
- commit 69a3e57
-------------------------------------------------------------------
Fri Mar 18 21:35:24 CET 2016 - tiwai@suse.de
@ -196,6 +284,13 @@ Fri Mar 4 08:54:21 CET 2016 - jslaby@suse.cz
Update upstream status.
- commit 859059c
-------------------------------------------------------------------
Thu Mar 3 15:35:27 CET 2016 - dsterba@suse.com
- Add build dependency for objtool
objtool requires libelf development headers.
- commit 16f65f2
-------------------------------------------------------------------
Thu Mar 3 09:18:25 CET 2016 - ohering@suse.de
@ -263,6 +358,12 @@ Tue Mar 1 19:14:25 CET 2016 - dmueller@suse.com
Device tree chosen output.
- commit ad7dbb8
-------------------------------------------------------------------
Tue Mar 1 11:20:31 CET 2016 - mmarek@suse.com
- rpm/kernel-module-subpackage: Fix obsoleting dropped flavors (bsc#968253)
- commit 5295c19
-------------------------------------------------------------------
Mon Feb 29 17:27:00 CET 2016 - mmarek@suse.com

2
kernel-source.spec
View File

@ -32,7 +32,7 @@ License: GPL-2.0
Group: Development/Sources
Version: 4.5.0
%if 0%{?is_kotd}
Release: <RELEASE>.g6682f99
Release: <RELEASE>.g7f10552
%else
Release: 0
%endif

101
kernel-syms.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Apr 3 12:33:45 CEST 2016 - jslaby@suse.cz
- Update config files.
Set SERIAL_8250_SHARE_IRQ (bnc#973748).
- commit 606f94a
-------------------------------------------------------------------
Sat Apr 2 10:18:27 CEST 2016 - tiwai@suse.de
@ -5,6 +12,68 @@ Sat Apr 2 10:18:27 CEST 2016 - tiwai@suse.de
via _OSC (bsc#969870).
- commit f6eec7e
-------------------------------------------------------------------
Fri Apr 1 15:41:27 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Only build the -kgraft package for modular kernels (fate#320268)
- commit 9bab96f
-------------------------------------------------------------------
Fri Apr 1 15:39:13 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Only build KMPs if CONFIG_SPLIT_PACKAGE=y (fate#319339)
- commit def905b
-------------------------------------------------------------------
Fri Apr 1 13:34:49 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Tag KMPs so that weak-modules2 ignores them
Also require a suse-module-tools version that can handle this (fate#319339).
- commit 58d21f9
-------------------------------------------------------------------
Fri Apr 1 12:49:52 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Add rpm scriptlets for KMPs (fate#319339)
Use the --{add,remove}-kernel-modules options of weak-modules2 instead
of --{add,remove}-kmp, because we do not want any symlinks to be created
for these KMPs.
- commit 95f8b94
-------------------------------------------------------------------
Thu Mar 31 13:23:55 CEST 2016 - mmarek@suse.com
- rpm/split-modules: Split modules into KMPs defined in supported.conf (fate#319339)
- commit 39da39b
-------------------------------------------------------------------
Thu Mar 31 13:22:48 CEST 2016 - mmarek@suse.com
- rpm/mkspec: Generate KMP subpackage sections from a template (fate#319339)
The KMPs are defined in the supported.conf file using a +<name>-kmp
guard.
- commit 09cb6b1
-------------------------------------------------------------------
Thu Mar 31 00:35:33 CEST 2016 - dvaleev@suse.com
- rpm/kernel-obs-build.spec.in:add e1000 and ibmveth
Those modules are required in order to have --vm-telnet option
working
- commit 1e87b6d
-------------------------------------------------------------------
Wed Mar 30 16:52:55 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Simplify parsing of supported.conf (fate#319339)
- commit 006b146
-------------------------------------------------------------------
Wed Mar 30 15:10:55 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Introduce a kernel-default-kgraft metapackage (fate#320268)
- commit 0439a47
-------------------------------------------------------------------
Mon Mar 28 09:27:57 CEST 2016 - tiwai@suse.de
@ -19,6 +88,25 @@ Thu Mar 24 13:50:11 CET 2016 - rgoldwyn@suse.com
- nfs: use file_dentry() (fate#318900).
- commit ede6caf
-------------------------------------------------------------------
Thu Mar 24 10:31:48 CET 2016 - tiwai@suse.de
- drm/radeon: rework fbdev handling on chips with no connectors
(boo#971853).
- commit af68ff6
-------------------------------------------------------------------
Wed Mar 23 21:55:21 CET 2016 - rgoldwyn@suse.com
- fs: add file_dentry() (bsc#963490,fate#318900).
- commit 66ef336
-------------------------------------------------------------------
Wed Mar 23 21:54:42 CET 2016 - rgoldwyn@suse.com
- nfs: use file_dentry() (fate#318900).
- commit 69a3e57
-------------------------------------------------------------------
Fri Mar 18 21:35:24 CET 2016 - tiwai@suse.de
@ -196,6 +284,13 @@ Fri Mar 4 08:54:21 CET 2016 - jslaby@suse.cz
Update upstream status.
- commit 859059c
-------------------------------------------------------------------
Thu Mar 3 15:35:27 CET 2016 - dsterba@suse.com
- Add build dependency for objtool
objtool requires libelf development headers.
- commit 16f65f2
-------------------------------------------------------------------
Thu Mar 3 09:18:25 CET 2016 - ohering@suse.de
@ -263,6 +358,12 @@ Tue Mar 1 19:14:25 CET 2016 - dmueller@suse.com
Device tree chosen output.
- commit ad7dbb8
-------------------------------------------------------------------
Tue Mar 1 11:20:31 CET 2016 - mmarek@suse.com
- rpm/kernel-module-subpackage: Fix obsoleting dropped flavors (bsc#968253)
- commit 5295c19
-------------------------------------------------------------------
Mon Feb 29 17:27:00 CET 2016 - mmarek@suse.com

2
kernel-syms.spec
View File

@ -27,7 +27,7 @@ Group: Development/Sources
Version: 4.5.0
%if %using_buildservice
%if 0%{?is_kotd}
Release: <RELEASE>.g6682f99
Release: <RELEASE>.g7f10552
%else
Release: 0
%endif

101
kernel-vanilla.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Apr 3 12:33:45 CEST 2016 - jslaby@suse.cz
- Update config files.
Set SERIAL_8250_SHARE_IRQ (bnc#973748).
- commit 606f94a
-------------------------------------------------------------------
Sat Apr 2 10:18:27 CEST 2016 - tiwai@suse.de
@ -5,6 +12,68 @@ Sat Apr 2 10:18:27 CEST 2016 - tiwai@suse.de
via _OSC (bsc#969870).
- commit f6eec7e
-------------------------------------------------------------------
Fri Apr 1 15:41:27 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Only build the -kgraft package for modular kernels (fate#320268)
- commit 9bab96f
-------------------------------------------------------------------
Fri Apr 1 15:39:13 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Only build KMPs if CONFIG_SPLIT_PACKAGE=y (fate#319339)
- commit def905b
-------------------------------------------------------------------
Fri Apr 1 13:34:49 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Tag KMPs so that weak-modules2 ignores them
Also require a suse-module-tools version that can handle this (fate#319339).
- commit 58d21f9
-------------------------------------------------------------------
Fri Apr 1 12:49:52 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Add rpm scriptlets for KMPs (fate#319339)
Use the --{add,remove}-kernel-modules options of weak-modules2 instead
of --{add,remove}-kmp, because we do not want any symlinks to be created
for these KMPs.
- commit 95f8b94
-------------------------------------------------------------------
Thu Mar 31 13:23:55 CEST 2016 - mmarek@suse.com
- rpm/split-modules: Split modules into KMPs defined in supported.conf (fate#319339)
- commit 39da39b
-------------------------------------------------------------------
Thu Mar 31 13:22:48 CEST 2016 - mmarek@suse.com
- rpm/mkspec: Generate KMP subpackage sections from a template (fate#319339)
The KMPs are defined in the supported.conf file using a +<name>-kmp
guard.
- commit 09cb6b1
-------------------------------------------------------------------
Thu Mar 31 00:35:33 CEST 2016 - dvaleev@suse.com
- rpm/kernel-obs-build.spec.in:add e1000 and ibmveth
Those modules are required in order to have --vm-telnet option
working
- commit 1e87b6d
-------------------------------------------------------------------
Wed Mar 30 16:52:55 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Simplify parsing of supported.conf (fate#319339)
- commit 006b146
-------------------------------------------------------------------
Wed Mar 30 15:10:55 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Introduce a kernel-default-kgraft metapackage (fate#320268)
- commit 0439a47
-------------------------------------------------------------------
Mon Mar 28 09:27:57 CEST 2016 - tiwai@suse.de
@ -19,6 +88,25 @@ Thu Mar 24 13:50:11 CET 2016 - rgoldwyn@suse.com
- nfs: use file_dentry() (fate#318900).
- commit ede6caf
-------------------------------------------------------------------
Thu Mar 24 10:31:48 CET 2016 - tiwai@suse.de
- drm/radeon: rework fbdev handling on chips with no connectors
(boo#971853).
- commit af68ff6
-------------------------------------------------------------------
Wed Mar 23 21:55:21 CET 2016 - rgoldwyn@suse.com
- fs: add file_dentry() (bsc#963490,fate#318900).
- commit 66ef336
-------------------------------------------------------------------
Wed Mar 23 21:54:42 CET 2016 - rgoldwyn@suse.com
- nfs: use file_dentry() (fate#318900).
- commit 69a3e57
-------------------------------------------------------------------
Fri Mar 18 21:35:24 CET 2016 - tiwai@suse.de
@ -196,6 +284,13 @@ Fri Mar 4 08:54:21 CET 2016 - jslaby@suse.cz
Update upstream status.
- commit 859059c
-------------------------------------------------------------------
Thu Mar 3 15:35:27 CET 2016 - dsterba@suse.com
- Add build dependency for objtool
objtool requires libelf development headers.
- commit 16f65f2
-------------------------------------------------------------------
Thu Mar 3 09:18:25 CET 2016 - ohering@suse.de
@ -263,6 +358,12 @@ Tue Mar 1 19:14:25 CET 2016 - dmueller@suse.com
Device tree chosen output.
- commit ad7dbb8
-------------------------------------------------------------------
Tue Mar 1 11:20:31 CET 2016 - mmarek@suse.com
- rpm/kernel-module-subpackage: Fix obsoleting dropped flavors (bsc#968253)
- commit 5295c19
-------------------------------------------------------------------
Mon Feb 29 17:27:00 CET 2016 - mmarek@suse.com

48
kernel-vanilla.spec
View File

@ -63,7 +63,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 4.5.0
%if 0%{?is_kotd}
Release: <RELEASE>.g6682f99
Release: <RELEASE>.g7f10552
%else
Release: 0
%endif
@ -79,6 +79,8 @@ BuildRequires: modutils
# Used to sign the kernel in the buildservice
BuildRequires: openssl
BuildRequires: pesign-obs-integration
# for objtool
BuildRequires: libelf-devel
Provides: %name = %version-%source_rel
# bnc#901925
Provides: %name-%version-%source_rel
@ -382,15 +384,11 @@ mkdir -p %kernel_build_dir
# Generate a list of modules with their support status marking
%_sourcedir/guards --list --with-guards <%_sourcedir/supported.conf | \
awk '
/^\+(base|yes) / {
print $(NF);
next;
}
/^\+external / {
/\+external / {
print $(NF) " external";
next;
}
/^[-+]/ {
/^-/ {
print $(NF) " no";
next;
}
@ -398,8 +396,11 @@ awk '
print $(NF);
}
' >%kernel_build_dir/Module.supported
%_sourcedir/guards --default=0 base < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u >%kernel_build_dir/Module.base
for package in base ; do
%_sourcedir/guards --default=0 "$package" \
<%_sourcedir/supported.conf | sed 's,.*/,,; s,\.ko$,,' | \
sort -u >%kernel_build_dir/Module."$package"
done
cd linux-%srcversion
@ -764,7 +765,7 @@ if [ %CONFIG_MODULES = y ]; then
%if %split_base
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir/Module.base \
-b %kernel_build_dir \
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
-e \
%endif
@ -909,6 +910,11 @@ done | add_dirs_to_filelist >%my_builddir/kernel-devel.files
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%endif
for f in %my_builddir/*-kmp-modules; do
f2=${f%%-modules}.files
add_dirs_to_filelist "$f" >"$f2"
done
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
# much, but it keeps rpmlint from breaking the package build. Note that we skip
@ -1089,4 +1095,26 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%endif
%endif
%if %CONFIG_MODULES == "y"
%package kgraft
Summary: Metapackage to pull in matching kgraft-patch package
Group: System/Kernel
Requires: kgraft-patch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor
Provides: multiversion(kernel)
%description kgraft
This is a metapackage that pulls in the matching kgraft-patch package for a
given kernel version. The advantage of the metapackage is that its name is
static, unlike the kgraft-patch-<kernel-version>-flavor package names.
%files kgraft
# rpmlint complains about empty packages, so lets own something
%defattr(-, root, root)
%dir /lib/modules/%kernelrelease-%build_flavor
%endif
%if %split_base
%endif
%changelog

57
mkspec
View File

@ -23,6 +23,8 @@ my %syms_flavor_archs = parse_config_conf("syms");
# template name -> template body
my %templates = read_spec_templates();
my @kmps = read_kmps();
# config.sh variables
my %vars = parse_config_sh();
my ($srcversion, $variant, $vanilla_only) =
@ -88,6 +90,23 @@ my %macros = (
);
# binary spec files
my $kmp_definitions = "";
for my $kmp (@kmps) {
my ($summary, $description);
if (!exists($binary_descriptions{$kmp})) {
print STDERR "warning: no description for $kmp found\n";
($summary = $kmp) =~ s/-kmp$//;
$summary .= " kernel modules";
$description = "$summary.";
} else {
$summary = $binary_descriptions{$kmp}->[0];
$description = $binary_descriptions{$kmp}->[1];
}
$kmp_definitions .= expand_template("kmp",
KMP_NAME => $kmp,
KMP_SUMMARY => $summary,
KMP_DESCRIPTION => $description);
}
for my $flavor (sort keys(%flavor_archs)) {
my ($summary, $description);
if (!exists($binary_descriptions{"kernel-$flavor"})) {
@ -112,6 +131,8 @@ for my $flavor (sort keys(%flavor_archs)) {
DESCRIPTION => $description,
ARCHS => join(" ", arch2rpm(@{$flavor_archs{$flavor}})),
COMMON_DEPS => $templates{common_deps},
KMPS => join(" ", @kmps),
KMP_DEFINITIONS => $kmp_definitions,
%obsolete_macros
);
}
@ -216,6 +237,12 @@ sub read_spec_templates {
print STDERR "warning: Expected # BEGIN COMMON DEPS in kernel-binary.spec.in\n";
$res{common_deps} = "";
}
if ($res{$template} =~ s/^# BEGIN KMP\n?(.*)^# END KMP/\@KMP_DEFINITIONS\@/ms) {
$res{kmp} = $1;
} else {
print STDERR "warning: Expected # BEGIN KMP in kernel-binary.spec.in\n";
$res{kmp} = "";
}
}
{
xopen(my $fh, '<', "$dir/constraints.in");
@ -290,6 +317,24 @@ sub parse_descriptions {
return %res;
}
sub read_kmps {
my %res;
open(my $fh, '-|', "$dir/guards", "--list", "--with-guards",
"-c", "$dir/supported.conf") or die "Error running guards: $!\n";
while (<$fh>) {
my @guards = split(' ');
pop(@guards);
for my $g (@guards) {
if ($g =~ /^\+(.*-kmp)$/) {
$res{$1} = 1;
}
}
}
close($fh) or die "Error running guards: $!\n";
return sort(keys(%res));
}
sub parse_old_flavors{
my %res;
@ -394,9 +439,8 @@ sub get_commit {
return $commit;
}
sub do_spec {
sub expand_template {
my $template = shift;
my $specfile = shift;
my %macros = @_;
my $text = $templates{$template};
@ -407,6 +451,15 @@ sub do_spec {
$text =~ s/\@$m\@/$macros{$m}/g;
}
} while ($prev_text ne $text);
return $text;
}
sub do_spec {
my $template = shift;
my $specfile = shift;
my %macros = @_;
my $text = expand_template($template, %macros);
print "$specfile\n";
xopen(my $fh, '>', "$dir/$specfile");
print $fh $text;

4
patches.drivers.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c4b4a74c84470654419922d7e9955e1470813830827e2882b12b5fe70b9cb12d
size 8499
oid sha256:17e61c6fc98165df95d25bf901db17d616ceadd62eccc32e679e9cfc4782b927
size 9338

4
patches.suse.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a5a326a1bf9f4d06b5a81c63217f04db4cb8ce03953c7da9ddd80c6a52d1e98c
size 57799
oid sha256:ec62b5f7495bcc87ae3056983d0a9c29405413f8680042c44a0272964dd9b939
size 57754

5
series.conf
View File

@ -229,7 +229,7 @@
########################################################
# NFS
########################################################
patches.suse/nfs-use-file_dentry.patch
patches.suse/nfs-use-file-dentry.patch
########################################################
# lockd + statd
@ -281,7 +281,7 @@
patches.drivers/pstore_disable_efi_backend_by_default.patch
patches.suse/pstore-backend-autoaction
patches.suse/fs-add-file_dentry.patch
patches.suse/fs_add_file_dentry.patch
########################################################
# Overlayfs
@ -330,6 +330,7 @@
########################################################
# DRM/Video
########################################################
patches.drivers/drm-radeon-rework-fbdev-handling-on-chips-with-no-co
########################################################
# video4linux

4
source-timestamp
View File

@ -1,3 +1,3 @@
2016-04-03 11:09:42 +0200
GIT Revision: 6682f99073b2667710fca95e8d41d3ba8ec9b303
2016-04-04 14:52:31 +0200
GIT Revision: 7f10552a62403b7b74c81df0fc6c71777493019b
GIT Branch: stable

27
split-modules
View File

@ -19,7 +19,7 @@ if test $? -ne 0; then
exit 1
fi
eval set -- "$options"
opt_base=
opt_builddir=
opt_out=.
opt_dir=.
opt_ignore_errors=false
@ -34,7 +34,7 @@ while test $# -gt 0; do
esac
case "$opt" in
-b)
opt_base=$arg ;;
opt_builddir=$arg ;;
-d)
opt_dir=$arg ;;
-o)
@ -50,7 +50,7 @@ while test $# -gt 0; do
exit 1
esac
done
if test -z "$opt_base"; then
if test -z "$opt_builddir"; then
usage >&2
exit 1
fi
@ -110,15 +110,26 @@ add_dependent_modules()
}
# base
sed 'y/-/_/' <"$opt_base" | add_dependent_modules >"$tmp/base"
sed 'y/-/_/' <"$opt_builddir/Module.base" | add_dependent_modules >"$tmp/base"
join -j 1 -o 2.2 "$tmp/base" "$tmp/all" >"$opt_out/base-modules"
# kmps
for f in "$opt_builddir"/Module.*-kmp; do
kmp=${f##*/Module.}
sed 'y/-/_/' <"$f" >"$tmp/$kmp"
join -j 1 -o 2.2 "$tmp/$kmp" "$tmp/all" >"$opt_out/$kmp-modules"
cat "$tmp/$kmp"
done | sort -u >"$tmp/kmp-all"
join -v1 "$tmp/supp" "$tmp/kmp-all" >"$tmp/supp-main"
# main
add_dependent_modules "$tmp/supp-explain" <"$tmp/supp" >"$tmp/supp-all"
if ! cmp -s "$tmp/supp" "$tmp/supp-all"; then
add_dependent_modules "$tmp/supp-explain" <"$tmp/supp-main" >"$tmp/supp-all"
if ! cmp -s "$tmp/supp-main" "$tmp/supp-all"; then
# FIXME: Error message not accurate if a supported KMP module is
# needed by a module in the main package
echo "The following unsupported modules are used by supported modules:" >&2
join -j1 -a2 <(sort "$tmp/supp-explain") \
<(join -v2 "$tmp/supp" "$tmp/supp-all") >&2
<(join -v2 "$tmp/supp-main" "$tmp/supp-all") >&2
echo "Please fix supported.conf." >&2
if ! $opt_ignore_errors; then
exit 1
@ -127,7 +138,7 @@ fi
join -j 1 -o 2.2 "$tmp/supp-all" "$tmp/all" >"$opt_out/main-modules"
# unsupported
join -j 1 -v 2 -o 2.2 "$tmp/supp-all" "$tmp/all" >"$opt_out/unsupported-modules"
join -j 1 -v 2 -o 2.2 <(sort -u "$tmp/supp-all" "$tmp/kmp-all") "$tmp/all" >"$opt_out/unsupported-modules"
exit 0