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

commit e3f5518526eb03faca598e189fe2cc69edbb783b

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Kernel:stable/kernel-source?expand=0&rev=577
This commit is contained in:
Michal Marek 2016-09-28 08:07:34 +00:00 committed by Git OBS Bridge
parent fb8367e507
commit ffd6d460f5
27 changed files with 417 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
kernel-64kb.changes
View File

@ -1,8 +1,16 @@
-------------------------------------------------------------------
Mon Sep 26 09:52:29 CEST 2016 - schwab@suse.de
- kernel-module-subpackage: Properly quote flavor in expressions
That fixes a parse error if the flavor starts with a digit or contains
other non-alphabetic characters.
- commit 19ba528
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 26 09:42:49 CEST 2016 - agraf@suse.de Mon Sep 26 09:42:49 CEST 2016 - agraf@suse.de
- rpm/package-descriptions: Add 64kb kernel flavor description - rpm/package-descriptions: Add 64kb kernel flavor description
- commit 8462c50 - commit 7d9e0ef
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Sep 25 12:39:49 CEST 2016 - bp@suse.de Sun Sep 25 12:39:49 CEST 2016 - bp@suse.de
@ -49,6 +57,24 @@ Wed Sep 21 16:15:46 CEST 2016 - jeffm@suse.com
a dir (bsc#999600). a dir (bsc#999600).
- commit cf44e6a - commit cf44e6a
-------------------------------------------------------------------
Wed Sep 21 11:52:48 CEST 2016 - mmarek@suse.com
- rpm/package-descriptions: pv has been merged into -default (fate#315712)
- commit 711ab33
-------------------------------------------------------------------
Wed Sep 21 11:26:42 CEST 2016 - jslaby@suse.cz
- rpm/package-descriptions: add kernel-syzkaller
- commit 620032b
-------------------------------------------------------------------
Wed Sep 21 10:58:48 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Build the -base package unconditionally (bsc#1000118)
- commit 1d8c576
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 20 18:29:38 CEST 2016 - agraf@suse.de Tue Sep 20 18:29:38 CEST 2016 - agraf@suse.de
@ -116,6 +142,12 @@ Wed Sep 7 09:38:58 CEST 2016 - jslaby@suse.cz
patches.fixes/aacraid-check-size-values-after-double-fetch-from-user.patch. patches.fixes/aacraid-check-size-values-after-double-fetch-from-user.patch.
- commit 2ecc7fe - commit 2ecc7fe
-------------------------------------------------------------------
Fri Sep 2 12:57:42 CEST 2016 - mmarek@suse.com
- rpm/mkspec: Read a default release string from rpm/config.sh (bsc997059)
- commit cf65a8d
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 29 22:56:22 CEST 2016 - tiwai@suse.de Mon Aug 29 22:56:22 CEST 2016 - tiwai@suse.de
@ -6248,7 +6280,7 @@ Tue Jan 27 18:19:54 CET 2015 - jslaby@suse.cz
Tue Jan 27 12:41:34 CET 2015 - jbeulich@suse.com Tue Jan 27 12:41:34 CET 2015 - jbeulich@suse.com
- rpm/package-descriptions: Describe kernel-pv (and correct kernel-ec2's). - rpm/package-descriptions: Describe kernel-pv (and correct kernel-ec2's).
- commit f7db992 - commit 6dd25c9
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 26 12:56:03 CET 2015 - mmarek@suse.cz Mon Jan 26 12:56:03 CET 2015 - mmarek@suse.cz

33
kernel-64kb.spec
View File

@ -46,10 +46,9 @@
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.) # defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB %define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y") %define split_extra (%CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
%define install_vdso 1 %define install_vdso 1
@ -63,7 +62,7 @@ License: GPL-2.0
Group: System/Kernel Group: System/Kernel
Version: 4.7.5 Version: 4.7.5
%if 0%{?is_kotd} %if 0%{?is_kotd}
Release: <RELEASE>.g02c4d35 Release: <RELEASE>.ge3f5518
%else %else
Release: 0 Release: 0
%endif %endif
@ -86,7 +85,6 @@ Provides: %name = %version-%source_rel
Provides: %name-%version-%source_rel Provides: %name-%version-%source_rel
Provides: %{name}_%_target_cpu = %version-%release Provides: %{name}_%_target_cpu = %version-%release
Provides: multiversion(kernel) Provides: multiversion(kernel)
%if %split_base
Provides: kernel-base = %version-%source_rel Provides: kernel-base = %version-%source_rel
# In SLE11, kernel-$flavor complemented kernel-$flavor-base. With SLE12, # In SLE11, kernel-$flavor complemented kernel-$flavor-base. With SLE12,
# kernel-$flavor itself contains all the needed files and kernel-$flavor-base # kernel-$flavor itself contains all the needed files and kernel-$flavor-base
@ -95,7 +93,6 @@ Provides: kernel-base = %version-%source_rel
# owned by multiple packages now. The dependency is not correct wrt openSUSE # owned by multiple packages now. The dependency is not correct wrt openSUSE
# 11.2 - 11.4, but we primarily care about the supported upgrade path. # 11.2 - 11.4, but we primarily care about the supported upgrade path.
Obsoletes: %name-base < 3.1 Obsoletes: %name-base < 3.1
%endif
# The following is copied to the -base subpackage as well # The following is copied to the -base subpackage as well
# BEGIN COMMON DEPS # BEGIN COMMON DEPS
Requires(pre): coreutils awk Requires(pre): coreutils awk
@ -776,7 +773,6 @@ if [ %CONFIG_MODULES = y ]; then
exit 1 exit 1
fi fi
%if %split_base
%_sourcedir/split-modules -d %buildroot \ %_sourcedir/split-modules -d %buildroot \
-o %my_builddir \ -o %my_builddir \
-b %kernel_build_dir \ -b %kernel_build_dir \
@ -790,12 +786,6 @@ if [ %CONFIG_MODULES = y ]; then
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif %endif
%else
( cd %buildroot
find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules
%endif
# The modules.dep file is sorted randomly which produces strange file # The modules.dep file is sorted randomly which produces strange file
# checksums. As the file is not included in the resulting RPM, it's # checksums. As the file is not included in the resulting RPM, it's
# pointless to rely on its contents. Replacing by zeros to make the # pointless to rely on its contents. Replacing by zeros to make the
@ -909,26 +899,20 @@ done | add_dirs_to_filelist >%my_builddir/kernel-devel.files
find etc/uefi/certs -type f -printf '/%%p\n' find etc/uefi/certs -type f -printf '/%%p\n'
fi fi
if test -d lib/firmware/%kernelrelease-%build_flavor; then if test -d lib/firmware/%kernelrelease-%build_flavor; then
%if %split_base
echo "%%dir /lib/firmware/%kernelrelease-%build_flavor" echo "%%dir /lib/firmware/%kernelrelease-%build_flavor"
cat %my_builddir/base-firmware cat %my_builddir/base-firmware
%else
echo "/lib/firmware/%kernelrelease-%build_flavor"
%endif
fi fi
if [ -e .%_docdir/%name ]; then if [ -e .%_docdir/%name ]; then
echo "%%doc %_docdir/%name" echo "%%doc %_docdir/%name"
fi fi
} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files } | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files
%if %split_base
{ {
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules}
if test -d %buildroot/lib/firmware/%kernelrelease-%build_flavor; then if test -d %buildroot/lib/firmware/%kernelrelease-%build_flavor; then
echo "/lib/firmware/%kernelrelease-%build_flavor" echo "/lib/firmware/%kernelrelease-%build_flavor"
fi fi
} > %my_builddir/kernel-main.files } > %my_builddir/kernel-main.files
%endif
%if %split_extra %if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%endif %endif
@ -951,15 +935,9 @@ done
%post -f post.sh %post -f post.sh
%if %split_base
%files -f kernel-main.files %files -f kernel-main.files
%defattr(-, root, root) %defattr(-, root, root)
%else
%files -f kernel-base.files
%defattr(-, root, root)
%endif
%package base %package base
Summary: The Linux Kernel - base modules Summary: The Linux Kernel - base modules
@ -1012,11 +990,8 @@ This package contains only the base modules, required in all installs.
%post base -f post-base.sh %post base -f post-base.sh
%if %split_base
%files base -f kernel-base.files %files base -f kernel-base.files
%defattr(-, root, root) %defattr(-, root, root)
%endif
%package extra %package extra
Summary: The Linux Kernel - Unsupported kernel modules Summary: The Linux Kernel - Unsupported kernel modules
@ -1138,8 +1113,6 @@ static, unlike the kgraft-patch-<kernel-version>-flavor package names.
%dir /lib/modules/%kernelrelease-%build_flavor %dir /lib/modules/%kernelrelease-%build_flavor
%endif %endif
%if %split_base
%endif
%changelog %changelog

31
kernel-binary.spec.in
View File

@ -46,10 +46,9 @@
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.) # defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB %define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y") %define split_extra (%CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
%define install_vdso 1 %define install_vdso 1
@ -86,7 +85,6 @@ Provides: %name = %version-%source_rel
Provides: %name-%version-%source_rel Provides: %name-%version-%source_rel
Provides: %{name}_%_target_cpu = %version-%release Provides: %{name}_%_target_cpu = %version-%release
Provides: multiversion(kernel) Provides: multiversion(kernel)
%if %split_base
Provides: kernel-base = %version-%source_rel Provides: kernel-base = %version-%source_rel
# In SLE11, kernel-$flavor complemented kernel-$flavor-base. With SLE12, # In SLE11, kernel-$flavor complemented kernel-$flavor-base. With SLE12,
# kernel-$flavor itself contains all the needed files and kernel-$flavor-base # kernel-$flavor itself contains all the needed files and kernel-$flavor-base
@ -95,7 +93,6 @@ Provides: kernel-base = %version-%source_rel
# owned by multiple packages now. The dependency is not correct wrt openSUSE # owned by multiple packages now. The dependency is not correct wrt openSUSE
# 11.2 - 11.4, but we primarily care about the supported upgrade path. # 11.2 - 11.4, but we primarily care about the supported upgrade path.
Obsoletes: %name-base < 3.1 Obsoletes: %name-base < 3.1
%endif
# The following is copied to the -base subpackage as well # The following is copied to the -base subpackage as well
# BEGIN COMMON DEPS # BEGIN COMMON DEPS
Requires(pre): coreutils awk Requires(pre): coreutils awk
@ -650,7 +647,6 @@ if [ %CONFIG_MODULES = y ]; then
exit 1 exit 1
fi fi
%if %split_base
%_sourcedir/split-modules -d %buildroot \ %_sourcedir/split-modules -d %buildroot \
-o %my_builddir \ -o %my_builddir \
-b %kernel_build_dir \ -b %kernel_build_dir \
@ -664,12 +660,6 @@ if [ %CONFIG_MODULES = y ]; then
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif %endif
%else
( cd %buildroot
find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules
%endif
# The modules.dep file is sorted randomly which produces strange file # The modules.dep file is sorted randomly which produces strange file
# checksums. As the file is not included in the resulting RPM, it's # checksums. As the file is not included in the resulting RPM, it's
# pointless to rely on its contents. Replacing by zeros to make the # pointless to rely on its contents. Replacing by zeros to make the
@ -783,26 +773,20 @@ done | add_dirs_to_filelist >%my_builddir/kernel-devel.files
find etc/uefi/certs -type f -printf '/%%p\n' find etc/uefi/certs -type f -printf '/%%p\n'
fi fi
if test -d lib/firmware/%kernelrelease-%build_flavor; then if test -d lib/firmware/%kernelrelease-%build_flavor; then
%if %split_base
echo "%%dir /lib/firmware/%kernelrelease-%build_flavor" echo "%%dir /lib/firmware/%kernelrelease-%build_flavor"
cat %my_builddir/base-firmware cat %my_builddir/base-firmware
%else
echo "/lib/firmware/%kernelrelease-%build_flavor"
%endif
fi fi
if [ -e .%_docdir/%name ]; then if [ -e .%_docdir/%name ]; then
echo "%%doc %_docdir/%name" echo "%%doc %_docdir/%name"
fi fi
} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files } | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files
%if %split_base
{ {
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules}
if test -d %buildroot/lib/firmware/%kernelrelease-%build_flavor; then if test -d %buildroot/lib/firmware/%kernelrelease-%build_flavor; then
echo "/lib/firmware/%kernelrelease-%build_flavor" echo "/lib/firmware/%kernelrelease-%build_flavor"
fi fi
} > %my_builddir/kernel-main.files } > %my_builddir/kernel-main.files
%endif
%if %split_extra %if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%endif %endif
@ -825,15 +809,9 @@ done
%post -f post.sh %post -f post.sh
%if %split_base
%files -f kernel-main.files %files -f kernel-main.files
%defattr(-, root, root) %defattr(-, root, root)
%else
%files -f kernel-base.files
%defattr(-, root, root)
%endif
%package base %package base
Summary: @SUMMARY@ - base modules Summary: @SUMMARY@ - base modules
@ -864,11 +842,8 @@ This package contains only the base modules, required in all installs.
%post base -f post-base.sh %post base -f post-base.sh
%if %split_base
%files base -f kernel-base.files %files base -f kernel-base.files
%defattr(-, root, root) %defattr(-, root, root)
%endif
%package extra %package extra
Summary: @SUMMARY@ - Unsupported kernel modules Summary: @SUMMARY@ - Unsupported kernel modules
@ -990,7 +965,6 @@ static, unlike the kgraft-patch-<kernel-version>-flavor package names.
%dir /lib/modules/%kernelrelease-%build_flavor %dir /lib/modules/%kernelrelease-%build_flavor
%endif %endif
%if %split_base
# BEGIN KMP # BEGIN KMP
%package -n @KMP_NAME@-%build_flavor %package -n @KMP_NAME@-%build_flavor
Summary: @KMP_SUMMARY@ Summary: @KMP_SUMMARY@
@ -1033,6 +1007,5 @@ rm -f "/var/run/rpm-$nvr-modules"
%defattr(-, root, root) %defattr(-, root, root)
# END KMP # END KMP
%endif
%changelog %changelog

36
kernel-debug.changes
View File

@ -1,8 +1,16 @@
-------------------------------------------------------------------
Mon Sep 26 09:52:29 CEST 2016 - schwab@suse.de
- kernel-module-subpackage: Properly quote flavor in expressions
That fixes a parse error if the flavor starts with a digit or contains
other non-alphabetic characters.
- commit 19ba528
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 26 09:42:49 CEST 2016 - agraf@suse.de Mon Sep 26 09:42:49 CEST 2016 - agraf@suse.de
- rpm/package-descriptions: Add 64kb kernel flavor description - rpm/package-descriptions: Add 64kb kernel flavor description
- commit 8462c50 - commit 7d9e0ef
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Sep 25 12:39:49 CEST 2016 - bp@suse.de Sun Sep 25 12:39:49 CEST 2016 - bp@suse.de
@ -49,6 +57,24 @@ Wed Sep 21 16:15:46 CEST 2016 - jeffm@suse.com
a dir (bsc#999600). a dir (bsc#999600).
- commit cf44e6a - commit cf44e6a
-------------------------------------------------------------------
Wed Sep 21 11:52:48 CEST 2016 - mmarek@suse.com
- rpm/package-descriptions: pv has been merged into -default (fate#315712)
- commit 711ab33
-------------------------------------------------------------------
Wed Sep 21 11:26:42 CEST 2016 - jslaby@suse.cz
- rpm/package-descriptions: add kernel-syzkaller
- commit 620032b
-------------------------------------------------------------------
Wed Sep 21 10:58:48 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Build the -base package unconditionally (bsc#1000118)
- commit 1d8c576
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 20 18:29:38 CEST 2016 - agraf@suse.de Tue Sep 20 18:29:38 CEST 2016 - agraf@suse.de
@ -116,6 +142,12 @@ Wed Sep 7 09:38:58 CEST 2016 - jslaby@suse.cz
patches.fixes/aacraid-check-size-values-after-double-fetch-from-user.patch. patches.fixes/aacraid-check-size-values-after-double-fetch-from-user.patch.
- commit 2ecc7fe - commit 2ecc7fe
-------------------------------------------------------------------
Fri Sep 2 12:57:42 CEST 2016 - mmarek@suse.com
- rpm/mkspec: Read a default release string from rpm/config.sh (bsc997059)
- commit cf65a8d
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 29 22:56:22 CEST 2016 - tiwai@suse.de Mon Aug 29 22:56:22 CEST 2016 - tiwai@suse.de
@ -6248,7 +6280,7 @@ Tue Jan 27 18:19:54 CET 2015 - jslaby@suse.cz
Tue Jan 27 12:41:34 CET 2015 - jbeulich@suse.com Tue Jan 27 12:41:34 CET 2015 - jbeulich@suse.com
- rpm/package-descriptions: Describe kernel-pv (and correct kernel-ec2's). - rpm/package-descriptions: Describe kernel-pv (and correct kernel-ec2's).
- commit f7db992 - commit 6dd25c9
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 26 12:56:03 CET 2015 - mmarek@suse.cz Mon Jan 26 12:56:03 CET 2015 - mmarek@suse.cz

33
kernel-debug.spec
View File

@ -46,10 +46,9 @@
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.) # defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB %define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y") %define split_extra (%CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
%define install_vdso 1 %define install_vdso 1
@ -63,7 +62,7 @@ License: GPL-2.0
Group: System/Kernel Group: System/Kernel
Version: 4.7.5 Version: 4.7.5
%if 0%{?is_kotd} %if 0%{?is_kotd}
Release: <RELEASE>.g02c4d35 Release: <RELEASE>.ge3f5518
%else %else
Release: 0 Release: 0
%endif %endif
@ -86,7 +85,6 @@ Provides: %name = %version-%source_rel
Provides: %name-%version-%source_rel Provides: %name-%version-%source_rel
Provides: %{name}_%_target_cpu = %version-%release Provides: %{name}_%_target_cpu = %version-%release
Provides: multiversion(kernel) Provides: multiversion(kernel)
%if %split_base
Provides: kernel-base = %version-%source_rel Provides: kernel-base = %version-%source_rel
# In SLE11, kernel-$flavor complemented kernel-$flavor-base. With SLE12, # In SLE11, kernel-$flavor complemented kernel-$flavor-base. With SLE12,
# kernel-$flavor itself contains all the needed files and kernel-$flavor-base # kernel-$flavor itself contains all the needed files and kernel-$flavor-base
@ -95,7 +93,6 @@ Provides: kernel-base = %version-%source_rel
# owned by multiple packages now. The dependency is not correct wrt openSUSE # owned by multiple packages now. The dependency is not correct wrt openSUSE
# 11.2 - 11.4, but we primarily care about the supported upgrade path. # 11.2 - 11.4, but we primarily care about the supported upgrade path.
Obsoletes: %name-base < 3.1 Obsoletes: %name-base < 3.1
%endif
# The following is copied to the -base subpackage as well # The following is copied to the -base subpackage as well
# BEGIN COMMON DEPS # BEGIN COMMON DEPS
Requires(pre): coreutils awk Requires(pre): coreutils awk
@ -783,7 +780,6 @@ if [ %CONFIG_MODULES = y ]; then
exit 1 exit 1
fi fi
%if %split_base
%_sourcedir/split-modules -d %buildroot \ %_sourcedir/split-modules -d %buildroot \
-o %my_builddir \ -o %my_builddir \
-b %kernel_build_dir \ -b %kernel_build_dir \
@ -797,12 +793,6 @@ if [ %CONFIG_MODULES = y ]; then
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif %endif
%else
( cd %buildroot
find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules
%endif
# The modules.dep file is sorted randomly which produces strange file # The modules.dep file is sorted randomly which produces strange file
# checksums. As the file is not included in the resulting RPM, it's # checksums. As the file is not included in the resulting RPM, it's
# pointless to rely on its contents. Replacing by zeros to make the # pointless to rely on its contents. Replacing by zeros to make the
@ -916,26 +906,20 @@ done | add_dirs_to_filelist >%my_builddir/kernel-devel.files
find etc/uefi/certs -type f -printf '/%%p\n' find etc/uefi/certs -type f -printf '/%%p\n'
fi fi
if test -d lib/firmware/%kernelrelease-%build_flavor; then if test -d lib/firmware/%kernelrelease-%build_flavor; then
%if %split_base
echo "%%dir /lib/firmware/%kernelrelease-%build_flavor" echo "%%dir /lib/firmware/%kernelrelease-%build_flavor"
cat %my_builddir/base-firmware cat %my_builddir/base-firmware
%else
echo "/lib/firmware/%kernelrelease-%build_flavor"
%endif
fi fi
if [ -e .%_docdir/%name ]; then if [ -e .%_docdir/%name ]; then
echo "%%doc %_docdir/%name" echo "%%doc %_docdir/%name"
fi fi
} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files } | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files
%if %split_base
{ {
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules}
if test -d %buildroot/lib/firmware/%kernelrelease-%build_flavor; then if test -d %buildroot/lib/firmware/%kernelrelease-%build_flavor; then
echo "/lib/firmware/%kernelrelease-%build_flavor" echo "/lib/firmware/%kernelrelease-%build_flavor"
fi fi
} > %my_builddir/kernel-main.files } > %my_builddir/kernel-main.files
%endif
%if %split_extra %if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%endif %endif
@ -958,15 +942,9 @@ done
%post -f post.sh %post -f post.sh
%if %split_base
%files -f kernel-main.files %files -f kernel-main.files
%defattr(-, root, root) %defattr(-, root, root)
%else
%files -f kernel-base.files
%defattr(-, root, root)
%endif
%package base %package base
Summary: A Debug Version of the Kernel - base modules Summary: A Debug Version of the Kernel - base modules
@ -1023,11 +1001,8 @@ This package contains only the base modules, required in all installs.
%post base -f post-base.sh %post base -f post-base.sh
%if %split_base
%files base -f kernel-base.files %files base -f kernel-base.files
%defattr(-, root, root) %defattr(-, root, root)
%endif
%package extra %package extra
Summary: A Debug Version of the Kernel - Unsupported kernel modules Summary: A Debug Version of the Kernel - Unsupported kernel modules
@ -1156,8 +1131,6 @@ static, unlike the kgraft-patch-<kernel-version>-flavor package names.
%dir /lib/modules/%kernelrelease-%build_flavor %dir /lib/modules/%kernelrelease-%build_flavor
%endif %endif
%if %split_base
%endif
%changelog %changelog

36
kernel-default.changes
View File

@ -1,8 +1,16 @@
-------------------------------------------------------------------
Mon Sep 26 09:52:29 CEST 2016 - schwab@suse.de
- kernel-module-subpackage: Properly quote flavor in expressions
That fixes a parse error if the flavor starts with a digit or contains
other non-alphabetic characters.
- commit 19ba528
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 26 09:42:49 CEST 2016 - agraf@suse.de Mon Sep 26 09:42:49 CEST 2016 - agraf@suse.de
- rpm/package-descriptions: Add 64kb kernel flavor description - rpm/package-descriptions: Add 64kb kernel flavor description
- commit 8462c50 - commit 7d9e0ef
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Sep 25 12:39:49 CEST 2016 - bp@suse.de Sun Sep 25 12:39:49 CEST 2016 - bp@suse.de
@ -49,6 +57,24 @@ Wed Sep 21 16:15:46 CEST 2016 - jeffm@suse.com
a dir (bsc#999600). a dir (bsc#999600).
- commit cf44e6a - commit cf44e6a
-------------------------------------------------------------------
Wed Sep 21 11:52:48 CEST 2016 - mmarek@suse.com
- rpm/package-descriptions: pv has been merged into -default (fate#315712)
- commit 711ab33
-------------------------------------------------------------------
Wed Sep 21 11:26:42 CEST 2016 - jslaby@suse.cz
- rpm/package-descriptions: add kernel-syzkaller
- commit 620032b
-------------------------------------------------------------------
Wed Sep 21 10:58:48 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Build the -base package unconditionally (bsc#1000118)
- commit 1d8c576
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 20 18:29:38 CEST 2016 - agraf@suse.de Tue Sep 20 18:29:38 CEST 2016 - agraf@suse.de
@ -116,6 +142,12 @@ Wed Sep 7 09:38:58 CEST 2016 - jslaby@suse.cz
patches.fixes/aacraid-check-size-values-after-double-fetch-from-user.patch. patches.fixes/aacraid-check-size-values-after-double-fetch-from-user.patch.
- commit 2ecc7fe - commit 2ecc7fe
-------------------------------------------------------------------
Fri Sep 2 12:57:42 CEST 2016 - mmarek@suse.com
- rpm/mkspec: Read a default release string from rpm/config.sh (bsc997059)
- commit cf65a8d
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 29 22:56:22 CEST 2016 - tiwai@suse.de Mon Aug 29 22:56:22 CEST 2016 - tiwai@suse.de
@ -6248,7 +6280,7 @@ Tue Jan 27 18:19:54 CET 2015 - jslaby@suse.cz
Tue Jan 27 12:41:34 CET 2015 - jbeulich@suse.com Tue Jan 27 12:41:34 CET 2015 - jbeulich@suse.com
- rpm/package-descriptions: Describe kernel-pv (and correct kernel-ec2's). - rpm/package-descriptions: Describe kernel-pv (and correct kernel-ec2's).
- commit f7db992 - commit 6dd25c9
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 26 12:56:03 CET 2015 - mmarek@suse.cz Mon Jan 26 12:56:03 CET 2015 - mmarek@suse.cz

33
kernel-default.spec
View File

@ -46,10 +46,9 @@
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.) # defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB %define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y") %define split_extra (%CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
%define install_vdso 1 %define install_vdso 1
@ -63,7 +62,7 @@ License: GPL-2.0
Group: System/Kernel Group: System/Kernel
Version: 4.7.5 Version: 4.7.5
%if 0%{?is_kotd} %if 0%{?is_kotd}
Release: <RELEASE>.g02c4d35 Release: <RELEASE>.ge3f5518
%else %else
Release: 0 Release: 0
%endif %endif
@ -86,7 +85,6 @@ Provides: %name = %version-%source_rel
Provides: %name-%version-%source_rel Provides: %name-%version-%source_rel
Provides: %{name}_%_target_cpu = %version-%release Provides: %{name}_%_target_cpu = %version-%release
Provides: multiversion(kernel) Provides: multiversion(kernel)
%if %split_base
Provides: kernel-base = %version-%source_rel Provides: kernel-base = %version-%source_rel
# In SLE11, kernel-$flavor complemented kernel-$flavor-base. With SLE12, # In SLE11, kernel-$flavor complemented kernel-$flavor-base. With SLE12,
# kernel-$flavor itself contains all the needed files and kernel-$flavor-base # kernel-$flavor itself contains all the needed files and kernel-$flavor-base
@ -95,7 +93,6 @@ Provides: kernel-base = %version-%source_rel
# owned by multiple packages now. The dependency is not correct wrt openSUSE # owned by multiple packages now. The dependency is not correct wrt openSUSE
# 11.2 - 11.4, but we primarily care about the supported upgrade path. # 11.2 - 11.4, but we primarily care about the supported upgrade path.
Obsoletes: %name-base < 3.1 Obsoletes: %name-base < 3.1
%endif
# The following is copied to the -base subpackage as well # The following is copied to the -base subpackage as well
# BEGIN COMMON DEPS # BEGIN COMMON DEPS
Requires(pre): coreutils awk Requires(pre): coreutils awk
@ -826,7 +823,6 @@ if [ %CONFIG_MODULES = y ]; then
exit 1 exit 1
fi fi
%if %split_base
%_sourcedir/split-modules -d %buildroot \ %_sourcedir/split-modules -d %buildroot \
-o %my_builddir \ -o %my_builddir \
-b %kernel_build_dir \ -b %kernel_build_dir \
@ -840,12 +836,6 @@ if [ %CONFIG_MODULES = y ]; then
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif %endif
%else
( cd %buildroot
find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules
%endif
# The modules.dep file is sorted randomly which produces strange file # The modules.dep file is sorted randomly which produces strange file
# checksums. As the file is not included in the resulting RPM, it's # checksums. As the file is not included in the resulting RPM, it's
# pointless to rely on its contents. Replacing by zeros to make the # pointless to rely on its contents. Replacing by zeros to make the
@ -959,26 +949,20 @@ done | add_dirs_to_filelist >%my_builddir/kernel-devel.files
find etc/uefi/certs -type f -printf '/%%p\n' find etc/uefi/certs -type f -printf '/%%p\n'
fi fi
if test -d lib/firmware/%kernelrelease-%build_flavor; then if test -d lib/firmware/%kernelrelease-%build_flavor; then
%if %split_base
echo "%%dir /lib/firmware/%kernelrelease-%build_flavor" echo "%%dir /lib/firmware/%kernelrelease-%build_flavor"
cat %my_builddir/base-firmware cat %my_builddir/base-firmware
%else
echo "/lib/firmware/%kernelrelease-%build_flavor"
%endif
fi fi
if [ -e .%_docdir/%name ]; then if [ -e .%_docdir/%name ]; then
echo "%%doc %_docdir/%name" echo "%%doc %_docdir/%name"
fi fi
} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files } | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files
%if %split_base
{ {
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules}
if test -d %buildroot/lib/firmware/%kernelrelease-%build_flavor; then if test -d %buildroot/lib/firmware/%kernelrelease-%build_flavor; then
echo "/lib/firmware/%kernelrelease-%build_flavor" echo "/lib/firmware/%kernelrelease-%build_flavor"
fi fi
} > %my_builddir/kernel-main.files } > %my_builddir/kernel-main.files
%endif
%if %split_extra %if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%endif %endif
@ -1001,15 +985,9 @@ done
%post -f post.sh %post -f post.sh
%if %split_base
%files -f kernel-main.files %files -f kernel-main.files
%defattr(-, root, root) %defattr(-, root, root)
%else
%files -f kernel-base.files
%defattr(-, root, root)
%endif
%package base %package base
Summary: The Standard Kernel - base modules Summary: The Standard Kernel - base modules
@ -1085,11 +1063,8 @@ This package contains only the base modules, required in all installs.
%post base -f post-base.sh %post base -f post-base.sh
%if %split_base
%files base -f kernel-base.files %files base -f kernel-base.files
%defattr(-, root, root) %defattr(-, root, root)
%endif
%package extra %package extra
Summary: The Standard Kernel - Unsupported kernel modules Summary: The Standard Kernel - Unsupported kernel modules
@ -1257,8 +1232,6 @@ static, unlike the kgraft-patch-<kernel-version>-flavor package names.
%dir /lib/modules/%kernelrelease-%build_flavor %dir /lib/modules/%kernelrelease-%build_flavor
%endif %endif
%if %split_base
%endif
%changelog %changelog

36
kernel-docs.changes
View File

@ -1,8 +1,16 @@
-------------------------------------------------------------------
Mon Sep 26 09:52:29 CEST 2016 - schwab@suse.de
- kernel-module-subpackage: Properly quote flavor in expressions
That fixes a parse error if the flavor starts with a digit or contains
other non-alphabetic characters.
- commit 19ba528
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 26 09:42:49 CEST 2016 - agraf@suse.de Mon Sep 26 09:42:49 CEST 2016 - agraf@suse.de
- rpm/package-descriptions: Add 64kb kernel flavor description - rpm/package-descriptions: Add 64kb kernel flavor description
- commit 8462c50 - commit 7d9e0ef
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Sep 25 12:39:49 CEST 2016 - bp@suse.de Sun Sep 25 12:39:49 CEST 2016 - bp@suse.de
@ -49,6 +57,24 @@ Wed Sep 21 16:15:46 CEST 2016 - jeffm@suse.com
a dir (bsc#999600). a dir (bsc#999600).
- commit cf44e6a - commit cf44e6a
-------------------------------------------------------------------
Wed Sep 21 11:52:48 CEST 2016 - mmarek@suse.com
- rpm/package-descriptions: pv has been merged into -default (fate#315712)
- commit 711ab33
-------------------------------------------------------------------
Wed Sep 21 11:26:42 CEST 2016 - jslaby@suse.cz
- rpm/package-descriptions: add kernel-syzkaller
- commit 620032b
-------------------------------------------------------------------
Wed Sep 21 10:58:48 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Build the -base package unconditionally (bsc#1000118)
- commit 1d8c576
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 20 18:29:38 CEST 2016 - agraf@suse.de Tue Sep 20 18:29:38 CEST 2016 - agraf@suse.de
@ -116,6 +142,12 @@ Wed Sep 7 09:38:58 CEST 2016 - jslaby@suse.cz
patches.fixes/aacraid-check-size-values-after-double-fetch-from-user.patch. patches.fixes/aacraid-check-size-values-after-double-fetch-from-user.patch.
- commit 2ecc7fe - commit 2ecc7fe
-------------------------------------------------------------------
Fri Sep 2 12:57:42 CEST 2016 - mmarek@suse.com
- rpm/mkspec: Read a default release string from rpm/config.sh (bsc997059)
- commit cf65a8d
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 29 22:56:22 CEST 2016 - tiwai@suse.de Mon Aug 29 22:56:22 CEST 2016 - tiwai@suse.de
@ -6248,7 +6280,7 @@ Tue Jan 27 18:19:54 CET 2015 - jslaby@suse.cz
Tue Jan 27 12:41:34 CET 2015 - jbeulich@suse.com Tue Jan 27 12:41:34 CET 2015 - jbeulich@suse.com
- rpm/package-descriptions: Describe kernel-pv (and correct kernel-ec2's). - rpm/package-descriptions: Describe kernel-pv (and correct kernel-ec2's).
- commit f7db992 - commit 6dd25c9
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 26 12:56:03 CET 2015 - mmarek@suse.cz Mon Jan 26 12:56:03 CET 2015 - mmarek@suse.cz

2
kernel-docs.spec
View File

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

36
kernel-lpae.changes
View File

@ -1,8 +1,16 @@
-------------------------------------------------------------------
Mon Sep 26 09:52:29 CEST 2016 - schwab@suse.de
- kernel-module-subpackage: Properly quote flavor in expressions
That fixes a parse error if the flavor starts with a digit or contains
other non-alphabetic characters.
- commit 19ba528
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 26 09:42:49 CEST 2016 - agraf@suse.de Mon Sep 26 09:42:49 CEST 2016 - agraf@suse.de
- rpm/package-descriptions: Add 64kb kernel flavor description - rpm/package-descriptions: Add 64kb kernel flavor description
- commit 8462c50 - commit 7d9e0ef
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Sep 25 12:39:49 CEST 2016 - bp@suse.de Sun Sep 25 12:39:49 CEST 2016 - bp@suse.de
@ -49,6 +57,24 @@ Wed Sep 21 16:15:46 CEST 2016 - jeffm@suse.com
a dir (bsc#999600). a dir (bsc#999600).
- commit cf44e6a - commit cf44e6a
-------------------------------------------------------------------
Wed Sep 21 11:52:48 CEST 2016 - mmarek@suse.com
- rpm/package-descriptions: pv has been merged into -default (fate#315712)
- commit 711ab33
-------------------------------------------------------------------
Wed Sep 21 11:26:42 CEST 2016 - jslaby@suse.cz
- rpm/package-descriptions: add kernel-syzkaller
- commit 620032b
-------------------------------------------------------------------
Wed Sep 21 10:58:48 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Build the -base package unconditionally (bsc#1000118)
- commit 1d8c576
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 20 18:29:38 CEST 2016 - agraf@suse.de Tue Sep 20 18:29:38 CEST 2016 - agraf@suse.de
@ -116,6 +142,12 @@ Wed Sep 7 09:38:58 CEST 2016 - jslaby@suse.cz
patches.fixes/aacraid-check-size-values-after-double-fetch-from-user.patch. patches.fixes/aacraid-check-size-values-after-double-fetch-from-user.patch.
- commit 2ecc7fe - commit 2ecc7fe
-------------------------------------------------------------------
Fri Sep 2 12:57:42 CEST 2016 - mmarek@suse.com
- rpm/mkspec: Read a default release string from rpm/config.sh (bsc997059)
- commit cf65a8d
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 29 22:56:22 CEST 2016 - tiwai@suse.de Mon Aug 29 22:56:22 CEST 2016 - tiwai@suse.de
@ -6248,7 +6280,7 @@ Tue Jan 27 18:19:54 CET 2015 - jslaby@suse.cz
Tue Jan 27 12:41:34 CET 2015 - jbeulich@suse.com Tue Jan 27 12:41:34 CET 2015 - jbeulich@suse.com
- rpm/package-descriptions: Describe kernel-pv (and correct kernel-ec2's). - rpm/package-descriptions: Describe kernel-pv (and correct kernel-ec2's).
- commit f7db992 - commit 6dd25c9
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 26 12:56:03 CET 2015 - mmarek@suse.cz Mon Jan 26 12:56:03 CET 2015 - mmarek@suse.cz

33
kernel-lpae.spec
View File

@ -46,10 +46,9 @@
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.) # defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB %define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y") %define split_extra (%CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
%define install_vdso 1 %define install_vdso 1
@ -63,7 +62,7 @@ License: GPL-2.0
Group: System/Kernel Group: System/Kernel
Version: 4.7.5 Version: 4.7.5
%if 0%{?is_kotd} %if 0%{?is_kotd}
Release: <RELEASE>.g02c4d35 Release: <RELEASE>.ge3f5518
%else %else
Release: 0 Release: 0
%endif %endif
@ -86,7 +85,6 @@ Provides: %name = %version-%source_rel
Provides: %name-%version-%source_rel Provides: %name-%version-%source_rel
Provides: %{name}_%_target_cpu = %version-%release Provides: %{name}_%_target_cpu = %version-%release
Provides: multiversion(kernel) Provides: multiversion(kernel)
%if %split_base
Provides: kernel-base = %version-%source_rel Provides: kernel-base = %version-%source_rel
# In SLE11, kernel-$flavor complemented kernel-$flavor-base. With SLE12, # In SLE11, kernel-$flavor complemented kernel-$flavor-base. With SLE12,
# kernel-$flavor itself contains all the needed files and kernel-$flavor-base # kernel-$flavor itself contains all the needed files and kernel-$flavor-base
@ -95,7 +93,6 @@ Provides: kernel-base = %version-%source_rel
# owned by multiple packages now. The dependency is not correct wrt openSUSE # owned by multiple packages now. The dependency is not correct wrt openSUSE
# 11.2 - 11.4, but we primarily care about the supported upgrade path. # 11.2 - 11.4, but we primarily care about the supported upgrade path.
Obsoletes: %name-base < 3.1 Obsoletes: %name-base < 3.1
%endif
# The following is copied to the -base subpackage as well # The following is copied to the -base subpackage as well
# BEGIN COMMON DEPS # BEGIN COMMON DEPS
Requires(pre): coreutils awk Requires(pre): coreutils awk
@ -777,7 +774,6 @@ if [ %CONFIG_MODULES = y ]; then
exit 1 exit 1
fi fi
%if %split_base
%_sourcedir/split-modules -d %buildroot \ %_sourcedir/split-modules -d %buildroot \
-o %my_builddir \ -o %my_builddir \
-b %kernel_build_dir \ -b %kernel_build_dir \
@ -791,12 +787,6 @@ if [ %CONFIG_MODULES = y ]; then
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif %endif
%else
( cd %buildroot
find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules
%endif
# The modules.dep file is sorted randomly which produces strange file # The modules.dep file is sorted randomly which produces strange file
# checksums. As the file is not included in the resulting RPM, it's # checksums. As the file is not included in the resulting RPM, it's
# pointless to rely on its contents. Replacing by zeros to make the # pointless to rely on its contents. Replacing by zeros to make the
@ -910,26 +900,20 @@ done | add_dirs_to_filelist >%my_builddir/kernel-devel.files
find etc/uefi/certs -type f -printf '/%%p\n' find etc/uefi/certs -type f -printf '/%%p\n'
fi fi
if test -d lib/firmware/%kernelrelease-%build_flavor; then if test -d lib/firmware/%kernelrelease-%build_flavor; then
%if %split_base
echo "%%dir /lib/firmware/%kernelrelease-%build_flavor" echo "%%dir /lib/firmware/%kernelrelease-%build_flavor"
cat %my_builddir/base-firmware cat %my_builddir/base-firmware
%else
echo "/lib/firmware/%kernelrelease-%build_flavor"
%endif
fi fi
if [ -e .%_docdir/%name ]; then if [ -e .%_docdir/%name ]; then
echo "%%doc %_docdir/%name" echo "%%doc %_docdir/%name"
fi fi
} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files } | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files
%if %split_base
{ {
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules}
if test -d %buildroot/lib/firmware/%kernelrelease-%build_flavor; then if test -d %buildroot/lib/firmware/%kernelrelease-%build_flavor; then
echo "/lib/firmware/%kernelrelease-%build_flavor" echo "/lib/firmware/%kernelrelease-%build_flavor"
fi fi
} > %my_builddir/kernel-main.files } > %my_builddir/kernel-main.files
%endif
%if %split_extra %if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%endif %endif
@ -952,15 +936,9 @@ done
%post -f post.sh %post -f post.sh
%if %split_base
%files -f kernel-main.files %files -f kernel-main.files
%defattr(-, root, root) %defattr(-, root, root)
%else
%files -f kernel-base.files
%defattr(-, root, root)
%endif
%package base %package base
Summary: Kernel for LPAE enabled systems - base modules Summary: Kernel for LPAE enabled systems - base modules
@ -1014,11 +992,8 @@ This package contains only the base modules, required in all installs.
%post base -f post-base.sh %post base -f post-base.sh
%if %split_base
%files base -f kernel-base.files %files base -f kernel-base.files
%defattr(-, root, root) %defattr(-, root, root)
%endif
%package extra %package extra
Summary: Kernel for LPAE enabled systems - Unsupported kernel modules Summary: Kernel for LPAE enabled systems - Unsupported kernel modules
@ -1141,8 +1116,6 @@ static, unlike the kgraft-patch-<kernel-version>-flavor package names.
%dir /lib/modules/%kernelrelease-%build_flavor %dir /lib/modules/%kernelrelease-%build_flavor
%endif %endif
%if %split_base
%endif
%changelog %changelog

4
kernel-module-subpackage
View File

@ -26,7 +26,7 @@ Provides: multiversion(kernel)
Requires: coreutils grep Requires: coreutils grep
%{-c:Requires: %{-n*}-ueficert} %{-c:Requires: %{-n*}-ueficert}
Enhances: kernel-%1 Enhances: kernel-%1
%if %1 == "default" %if "%1" == "default"
Obsoletes: %{-n*}-kmp-trace Obsoletes: %{-n*}-kmp-trace
%ifarch %ix86 %ifarch %ix86
Obsoletes: %{-n*}-kmp-vmi Obsoletes: %{-n*}-kmp-vmi
@ -38,7 +38,7 @@ Obsoletes: %{-n*}-kmp-desktop
Obsoletes: %{-n*}-kmp-xen Obsoletes: %{-n*}-kmp-xen
%endif %endif
%endif %endif
%if %1 == "pae" %if "%1" == "pae"
Obsoletes: %{-n*}-kmp-desktop Obsoletes: %{-n*}-kmp-desktop
%endif %endif
AutoReqProv: on AutoReqProv: on

36
kernel-obs-build.changes
View File

@ -1,8 +1,16 @@
-------------------------------------------------------------------
Mon Sep 26 09:52:29 CEST 2016 - schwab@suse.de
- kernel-module-subpackage: Properly quote flavor in expressions
That fixes a parse error if the flavor starts with a digit or contains
other non-alphabetic characters.
- commit 19ba528
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 26 09:42:49 CEST 2016 - agraf@suse.de Mon Sep 26 09:42:49 CEST 2016 - agraf@suse.de
- rpm/package-descriptions: Add 64kb kernel flavor description - rpm/package-descriptions: Add 64kb kernel flavor description
- commit 8462c50 - commit 7d9e0ef
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Sep 25 12:39:49 CEST 2016 - bp@suse.de Sun Sep 25 12:39:49 CEST 2016 - bp@suse.de
@ -49,6 +57,24 @@ Wed Sep 21 16:15:46 CEST 2016 - jeffm@suse.com
a dir (bsc#999600). a dir (bsc#999600).
- commit cf44e6a - commit cf44e6a
-------------------------------------------------------------------
Wed Sep 21 11:52:48 CEST 2016 - mmarek@suse.com
- rpm/package-descriptions: pv has been merged into -default (fate#315712)
- commit 711ab33
-------------------------------------------------------------------
Wed Sep 21 11:26:42 CEST 2016 - jslaby@suse.cz
- rpm/package-descriptions: add kernel-syzkaller
- commit 620032b
-------------------------------------------------------------------
Wed Sep 21 10:58:48 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Build the -base package unconditionally (bsc#1000118)
- commit 1d8c576
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 20 18:29:38 CEST 2016 - agraf@suse.de Tue Sep 20 18:29:38 CEST 2016 - agraf@suse.de
@ -116,6 +142,12 @@ Wed Sep 7 09:38:58 CEST 2016 - jslaby@suse.cz
patches.fixes/aacraid-check-size-values-after-double-fetch-from-user.patch. patches.fixes/aacraid-check-size-values-after-double-fetch-from-user.patch.
- commit 2ecc7fe - commit 2ecc7fe
-------------------------------------------------------------------
Fri Sep 2 12:57:42 CEST 2016 - mmarek@suse.com
- rpm/mkspec: Read a default release string from rpm/config.sh (bsc997059)
- commit cf65a8d
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 29 22:56:22 CEST 2016 - tiwai@suse.de Mon Aug 29 22:56:22 CEST 2016 - tiwai@suse.de
@ -6248,7 +6280,7 @@ Tue Jan 27 18:19:54 CET 2015 - jslaby@suse.cz
Tue Jan 27 12:41:34 CET 2015 - jbeulich@suse.com Tue Jan 27 12:41:34 CET 2015 - jbeulich@suse.com
- rpm/package-descriptions: Describe kernel-pv (and correct kernel-ec2's). - rpm/package-descriptions: Describe kernel-pv (and correct kernel-ec2's).
- commit f7db992 - commit 6dd25c9
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 26 12:56:03 CET 2015 - mmarek@suse.cz Mon Jan 26 12:56:03 CET 2015 - mmarek@suse.cz

2
kernel-obs-build.spec
View File

@ -53,7 +53,7 @@ License: GPL-2.0
Group: SLES Group: SLES
Version: 4.7.5 Version: 4.7.5
%if 0%{?is_kotd} %if 0%{?is_kotd}
Release: <RELEASE>.g02c4d35 Release: <RELEASE>.ge3f5518
%else %else
Release: 0 Release: 0
%endif %endif

36
kernel-obs-qa.changes
View File

@ -1,8 +1,16 @@
-------------------------------------------------------------------
Mon Sep 26 09:52:29 CEST 2016 - schwab@suse.de
- kernel-module-subpackage: Properly quote flavor in expressions
That fixes a parse error if the flavor starts with a digit or contains
other non-alphabetic characters.
- commit 19ba528
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 26 09:42:49 CEST 2016 - agraf@suse.de Mon Sep 26 09:42:49 CEST 2016 - agraf@suse.de
- rpm/package-descriptions: Add 64kb kernel flavor description - rpm/package-descriptions: Add 64kb kernel flavor description
- commit 8462c50 - commit 7d9e0ef
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Sep 25 12:39:49 CEST 2016 - bp@suse.de Sun Sep 25 12:39:49 CEST 2016 - bp@suse.de
@ -49,6 +57,24 @@ Wed Sep 21 16:15:46 CEST 2016 - jeffm@suse.com
a dir (bsc#999600). a dir (bsc#999600).
- commit cf44e6a - commit cf44e6a
-------------------------------------------------------------------
Wed Sep 21 11:52:48 CEST 2016 - mmarek@suse.com
- rpm/package-descriptions: pv has been merged into -default (fate#315712)
- commit 711ab33
-------------------------------------------------------------------
Wed Sep 21 11:26:42 CEST 2016 - jslaby@suse.cz
- rpm/package-descriptions: add kernel-syzkaller
- commit 620032b
-------------------------------------------------------------------
Wed Sep 21 10:58:48 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Build the -base package unconditionally (bsc#1000118)
- commit 1d8c576
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 20 18:29:38 CEST 2016 - agraf@suse.de Tue Sep 20 18:29:38 CEST 2016 - agraf@suse.de
@ -116,6 +142,12 @@ Wed Sep 7 09:38:58 CEST 2016 - jslaby@suse.cz
patches.fixes/aacraid-check-size-values-after-double-fetch-from-user.patch. patches.fixes/aacraid-check-size-values-after-double-fetch-from-user.patch.
- commit 2ecc7fe - commit 2ecc7fe
-------------------------------------------------------------------
Fri Sep 2 12:57:42 CEST 2016 - mmarek@suse.com
- rpm/mkspec: Read a default release string from rpm/config.sh (bsc997059)
- commit cf65a8d
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 29 22:56:22 CEST 2016 - tiwai@suse.de Mon Aug 29 22:56:22 CEST 2016 - tiwai@suse.de
@ -6248,7 +6280,7 @@ Tue Jan 27 18:19:54 CET 2015 - jslaby@suse.cz
Tue Jan 27 12:41:34 CET 2015 - jbeulich@suse.com Tue Jan 27 12:41:34 CET 2015 - jbeulich@suse.com
- rpm/package-descriptions: Describe kernel-pv (and correct kernel-ec2's). - rpm/package-descriptions: Describe kernel-pv (and correct kernel-ec2's).
- commit f7db992 - commit 6dd25c9
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 26 12:56:03 CET 2015 - mmarek@suse.cz Mon Jan 26 12:56:03 CET 2015 - mmarek@suse.cz

2
kernel-obs-qa.spec
View File

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

36
kernel-pae.changes
View File

@ -1,8 +1,16 @@
-------------------------------------------------------------------
Mon Sep 26 09:52:29 CEST 2016 - schwab@suse.de
- kernel-module-subpackage: Properly quote flavor in expressions
That fixes a parse error if the flavor starts with a digit or contains
other non-alphabetic characters.
- commit 19ba528
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 26 09:42:49 CEST 2016 - agraf@suse.de Mon Sep 26 09:42:49 CEST 2016 - agraf@suse.de
- rpm/package-descriptions: Add 64kb kernel flavor description - rpm/package-descriptions: Add 64kb kernel flavor description
- commit 8462c50 - commit 7d9e0ef
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Sep 25 12:39:49 CEST 2016 - bp@suse.de Sun Sep 25 12:39:49 CEST 2016 - bp@suse.de
@ -49,6 +57,24 @@ Wed Sep 21 16:15:46 CEST 2016 - jeffm@suse.com
a dir (bsc#999600). a dir (bsc#999600).
- commit cf44e6a - commit cf44e6a
-------------------------------------------------------------------
Wed Sep 21 11:52:48 CEST 2016 - mmarek@suse.com
- rpm/package-descriptions: pv has been merged into -default (fate#315712)
- commit 711ab33
-------------------------------------------------------------------
Wed Sep 21 11:26:42 CEST 2016 - jslaby@suse.cz
- rpm/package-descriptions: add kernel-syzkaller
- commit 620032b
-------------------------------------------------------------------
Wed Sep 21 10:58:48 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Build the -base package unconditionally (bsc#1000118)
- commit 1d8c576
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 20 18:29:38 CEST 2016 - agraf@suse.de Tue Sep 20 18:29:38 CEST 2016 - agraf@suse.de
@ -116,6 +142,12 @@ Wed Sep 7 09:38:58 CEST 2016 - jslaby@suse.cz
patches.fixes/aacraid-check-size-values-after-double-fetch-from-user.patch. patches.fixes/aacraid-check-size-values-after-double-fetch-from-user.patch.
- commit 2ecc7fe - commit 2ecc7fe
-------------------------------------------------------------------
Fri Sep 2 12:57:42 CEST 2016 - mmarek@suse.com
- rpm/mkspec: Read a default release string from rpm/config.sh (bsc997059)
- commit cf65a8d
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 29 22:56:22 CEST 2016 - tiwai@suse.de Mon Aug 29 22:56:22 CEST 2016 - tiwai@suse.de
@ -6248,7 +6280,7 @@ Tue Jan 27 18:19:54 CET 2015 - jslaby@suse.cz
Tue Jan 27 12:41:34 CET 2015 - jbeulich@suse.com Tue Jan 27 12:41:34 CET 2015 - jbeulich@suse.com
- rpm/package-descriptions: Describe kernel-pv (and correct kernel-ec2's). - rpm/package-descriptions: Describe kernel-pv (and correct kernel-ec2's).
- commit f7db992 - commit 6dd25c9
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 26 12:56:03 CET 2015 - mmarek@suse.cz Mon Jan 26 12:56:03 CET 2015 - mmarek@suse.cz

33
kernel-pae.spec
View File

@ -46,10 +46,9 @@
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.) # defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB %define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y") %define split_extra (%CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
%define install_vdso 1 %define install_vdso 1
@ -63,7 +62,7 @@ License: GPL-2.0
Group: System/Kernel Group: System/Kernel
Version: 4.7.5 Version: 4.7.5
%if 0%{?is_kotd} %if 0%{?is_kotd}
Release: <RELEASE>.g02c4d35 Release: <RELEASE>.ge3f5518
%else %else
Release: 0 Release: 0
%endif %endif
@ -86,7 +85,6 @@ Provides: %name = %version-%source_rel
Provides: %name-%version-%source_rel Provides: %name-%version-%source_rel
Provides: %{name}_%_target_cpu = %version-%release Provides: %{name}_%_target_cpu = %version-%release
Provides: multiversion(kernel) Provides: multiversion(kernel)
%if %split_base
Provides: kernel-base = %version-%source_rel Provides: kernel-base = %version-%source_rel
# In SLE11, kernel-$flavor complemented kernel-$flavor-base. With SLE12, # In SLE11, kernel-$flavor complemented kernel-$flavor-base. With SLE12,
# kernel-$flavor itself contains all the needed files and kernel-$flavor-base # kernel-$flavor itself contains all the needed files and kernel-$flavor-base
@ -95,7 +93,6 @@ Provides: kernel-base = %version-%source_rel
# owned by multiple packages now. The dependency is not correct wrt openSUSE # owned by multiple packages now. The dependency is not correct wrt openSUSE
# 11.2 - 11.4, but we primarily care about the supported upgrade path. # 11.2 - 11.4, but we primarily care about the supported upgrade path.
Obsoletes: %name-base < 3.1 Obsoletes: %name-base < 3.1
%endif
# The following is copied to the -base subpackage as well # The following is copied to the -base subpackage as well
# BEGIN COMMON DEPS # BEGIN COMMON DEPS
Requires(pre): coreutils awk Requires(pre): coreutils awk
@ -803,7 +800,6 @@ if [ %CONFIG_MODULES = y ]; then
exit 1 exit 1
fi fi
%if %split_base
%_sourcedir/split-modules -d %buildroot \ %_sourcedir/split-modules -d %buildroot \
-o %my_builddir \ -o %my_builddir \
-b %kernel_build_dir \ -b %kernel_build_dir \
@ -817,12 +813,6 @@ if [ %CONFIG_MODULES = y ]; then
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif %endif
%else
( cd %buildroot
find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules
%endif
# The modules.dep file is sorted randomly which produces strange file # The modules.dep file is sorted randomly which produces strange file
# checksums. As the file is not included in the resulting RPM, it's # checksums. As the file is not included in the resulting RPM, it's
# pointless to rely on its contents. Replacing by zeros to make the # pointless to rely on its contents. Replacing by zeros to make the
@ -936,26 +926,20 @@ done | add_dirs_to_filelist >%my_builddir/kernel-devel.files
find etc/uefi/certs -type f -printf '/%%p\n' find etc/uefi/certs -type f -printf '/%%p\n'
fi fi
if test -d lib/firmware/%kernelrelease-%build_flavor; then if test -d lib/firmware/%kernelrelease-%build_flavor; then
%if %split_base
echo "%%dir /lib/firmware/%kernelrelease-%build_flavor" echo "%%dir /lib/firmware/%kernelrelease-%build_flavor"
cat %my_builddir/base-firmware cat %my_builddir/base-firmware
%else
echo "/lib/firmware/%kernelrelease-%build_flavor"
%endif
fi fi
if [ -e .%_docdir/%name ]; then if [ -e .%_docdir/%name ]; then
echo "%%doc %_docdir/%name" echo "%%doc %_docdir/%name"
fi fi
} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files } | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files
%if %split_base
{ {
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules}
if test -d %buildroot/lib/firmware/%kernelrelease-%build_flavor; then if test -d %buildroot/lib/firmware/%kernelrelease-%build_flavor; then
echo "/lib/firmware/%kernelrelease-%build_flavor" echo "/lib/firmware/%kernelrelease-%build_flavor"
fi fi
} > %my_builddir/kernel-main.files } > %my_builddir/kernel-main.files
%endif
%if %split_extra %if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%endif %endif
@ -978,15 +962,9 @@ done
%post -f post.sh %post -f post.sh
%if %split_base
%files -f kernel-main.files %files -f kernel-main.files
%defattr(-, root, root) %defattr(-, root, root)
%else
%files -f kernel-base.files
%defattr(-, root, root)
%endif
%package base %package base
Summary: Kernel with PAE Support - base modules Summary: Kernel with PAE Support - base modules
@ -1055,11 +1033,8 @@ This package contains only the base modules, required in all installs.
%post base -f post-base.sh %post base -f post-base.sh
%if %split_base
%files base -f kernel-base.files %files base -f kernel-base.files
%defattr(-, root, root) %defattr(-, root, root)
%endif
%package extra %package extra
Summary: Kernel with PAE Support - Unsupported kernel modules Summary: Kernel with PAE Support - Unsupported kernel modules
@ -1206,8 +1181,6 @@ static, unlike the kgraft-patch-<kernel-version>-flavor package names.
%dir /lib/modules/%kernelrelease-%build_flavor %dir /lib/modules/%kernelrelease-%build_flavor
%endif %endif
%if %split_base
%endif
%changelog %changelog

36
kernel-source.changes
View File

@ -1,8 +1,16 @@
-------------------------------------------------------------------
Mon Sep 26 09:52:29 CEST 2016 - schwab@suse.de
- kernel-module-subpackage: Properly quote flavor in expressions
That fixes a parse error if the flavor starts with a digit or contains
other non-alphabetic characters.
- commit 19ba528
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 26 09:42:49 CEST 2016 - agraf@suse.de Mon Sep 26 09:42:49 CEST 2016 - agraf@suse.de
- rpm/package-descriptions: Add 64kb kernel flavor description - rpm/package-descriptions: Add 64kb kernel flavor description
- commit 8462c50 - commit 7d9e0ef
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Sep 25 12:39:49 CEST 2016 - bp@suse.de Sun Sep 25 12:39:49 CEST 2016 - bp@suse.de
@ -49,6 +57,24 @@ Wed Sep 21 16:15:46 CEST 2016 - jeffm@suse.com
a dir (bsc#999600). a dir (bsc#999600).
- commit cf44e6a - commit cf44e6a
-------------------------------------------------------------------
Wed Sep 21 11:52:48 CEST 2016 - mmarek@suse.com
- rpm/package-descriptions: pv has been merged into -default (fate#315712)
- commit 711ab33
-------------------------------------------------------------------
Wed Sep 21 11:26:42 CEST 2016 - jslaby@suse.cz
- rpm/package-descriptions: add kernel-syzkaller
- commit 620032b
-------------------------------------------------------------------
Wed Sep 21 10:58:48 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Build the -base package unconditionally (bsc#1000118)
- commit 1d8c576
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 20 18:29:38 CEST 2016 - agraf@suse.de Tue Sep 20 18:29:38 CEST 2016 - agraf@suse.de
@ -116,6 +142,12 @@ Wed Sep 7 09:38:58 CEST 2016 - jslaby@suse.cz
patches.fixes/aacraid-check-size-values-after-double-fetch-from-user.patch. patches.fixes/aacraid-check-size-values-after-double-fetch-from-user.patch.
- commit 2ecc7fe - commit 2ecc7fe
-------------------------------------------------------------------
Fri Sep 2 12:57:42 CEST 2016 - mmarek@suse.com
- rpm/mkspec: Read a default release string from rpm/config.sh (bsc997059)
- commit cf65a8d
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 29 22:56:22 CEST 2016 - tiwai@suse.de Mon Aug 29 22:56:22 CEST 2016 - tiwai@suse.de
@ -6248,7 +6280,7 @@ Tue Jan 27 18:19:54 CET 2015 - jslaby@suse.cz
Tue Jan 27 12:41:34 CET 2015 - jbeulich@suse.com Tue Jan 27 12:41:34 CET 2015 - jbeulich@suse.com
- rpm/package-descriptions: Describe kernel-pv (and correct kernel-ec2's). - rpm/package-descriptions: Describe kernel-pv (and correct kernel-ec2's).
- commit f7db992 - commit 6dd25c9
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 26 12:56:03 CET 2015 - mmarek@suse.cz Mon Jan 26 12:56:03 CET 2015 - mmarek@suse.cz

2
kernel-source.spec
View File

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

36
kernel-syms.changes
View File

@ -1,8 +1,16 @@
-------------------------------------------------------------------
Mon Sep 26 09:52:29 CEST 2016 - schwab@suse.de
- kernel-module-subpackage: Properly quote flavor in expressions
That fixes a parse error if the flavor starts with a digit or contains
other non-alphabetic characters.
- commit 19ba528
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 26 09:42:49 CEST 2016 - agraf@suse.de Mon Sep 26 09:42:49 CEST 2016 - agraf@suse.de
- rpm/package-descriptions: Add 64kb kernel flavor description - rpm/package-descriptions: Add 64kb kernel flavor description
- commit 8462c50 - commit 7d9e0ef
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Sep 25 12:39:49 CEST 2016 - bp@suse.de Sun Sep 25 12:39:49 CEST 2016 - bp@suse.de
@ -49,6 +57,24 @@ Wed Sep 21 16:15:46 CEST 2016 - jeffm@suse.com
a dir (bsc#999600). a dir (bsc#999600).
- commit cf44e6a - commit cf44e6a
-------------------------------------------------------------------
Wed Sep 21 11:52:48 CEST 2016 - mmarek@suse.com
- rpm/package-descriptions: pv has been merged into -default (fate#315712)
- commit 711ab33
-------------------------------------------------------------------
Wed Sep 21 11:26:42 CEST 2016 - jslaby@suse.cz
- rpm/package-descriptions: add kernel-syzkaller
- commit 620032b
-------------------------------------------------------------------
Wed Sep 21 10:58:48 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Build the -base package unconditionally (bsc#1000118)
- commit 1d8c576
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 20 18:29:38 CEST 2016 - agraf@suse.de Tue Sep 20 18:29:38 CEST 2016 - agraf@suse.de
@ -116,6 +142,12 @@ Wed Sep 7 09:38:58 CEST 2016 - jslaby@suse.cz
patches.fixes/aacraid-check-size-values-after-double-fetch-from-user.patch. patches.fixes/aacraid-check-size-values-after-double-fetch-from-user.patch.
- commit 2ecc7fe - commit 2ecc7fe
-------------------------------------------------------------------
Fri Sep 2 12:57:42 CEST 2016 - mmarek@suse.com
- rpm/mkspec: Read a default release string from rpm/config.sh (bsc997059)
- commit cf65a8d
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 29 22:56:22 CEST 2016 - tiwai@suse.de Mon Aug 29 22:56:22 CEST 2016 - tiwai@suse.de
@ -6248,7 +6280,7 @@ Tue Jan 27 18:19:54 CET 2015 - jslaby@suse.cz
Tue Jan 27 12:41:34 CET 2015 - jbeulich@suse.com Tue Jan 27 12:41:34 CET 2015 - jbeulich@suse.com
- rpm/package-descriptions: Describe kernel-pv (and correct kernel-ec2's). - rpm/package-descriptions: Describe kernel-pv (and correct kernel-ec2's).
- commit f7db992 - commit 6dd25c9
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 26 12:56:03 CET 2015 - mmarek@suse.cz Mon Jan 26 12:56:03 CET 2015 - mmarek@suse.cz

2
kernel-syms.spec
View File

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

36
kernel-vanilla.changes
View File

@ -1,8 +1,16 @@
-------------------------------------------------------------------
Mon Sep 26 09:52:29 CEST 2016 - schwab@suse.de
- kernel-module-subpackage: Properly quote flavor in expressions
That fixes a parse error if the flavor starts with a digit or contains
other non-alphabetic characters.
- commit 19ba528
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 26 09:42:49 CEST 2016 - agraf@suse.de Mon Sep 26 09:42:49 CEST 2016 - agraf@suse.de
- rpm/package-descriptions: Add 64kb kernel flavor description - rpm/package-descriptions: Add 64kb kernel flavor description
- commit 8462c50 - commit 7d9e0ef
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Sep 25 12:39:49 CEST 2016 - bp@suse.de Sun Sep 25 12:39:49 CEST 2016 - bp@suse.de
@ -49,6 +57,24 @@ Wed Sep 21 16:15:46 CEST 2016 - jeffm@suse.com
a dir (bsc#999600). a dir (bsc#999600).
- commit cf44e6a - commit cf44e6a
-------------------------------------------------------------------
Wed Sep 21 11:52:48 CEST 2016 - mmarek@suse.com
- rpm/package-descriptions: pv has been merged into -default (fate#315712)
- commit 711ab33
-------------------------------------------------------------------
Wed Sep 21 11:26:42 CEST 2016 - jslaby@suse.cz
- rpm/package-descriptions: add kernel-syzkaller
- commit 620032b
-------------------------------------------------------------------
Wed Sep 21 10:58:48 CEST 2016 - mmarek@suse.com
- rpm/kernel-binary.spec.in: Build the -base package unconditionally (bsc#1000118)
- commit 1d8c576
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 20 18:29:38 CEST 2016 - agraf@suse.de Tue Sep 20 18:29:38 CEST 2016 - agraf@suse.de
@ -116,6 +142,12 @@ Wed Sep 7 09:38:58 CEST 2016 - jslaby@suse.cz
patches.fixes/aacraid-check-size-values-after-double-fetch-from-user.patch. patches.fixes/aacraid-check-size-values-after-double-fetch-from-user.patch.
- commit 2ecc7fe - commit 2ecc7fe
-------------------------------------------------------------------
Fri Sep 2 12:57:42 CEST 2016 - mmarek@suse.com
- rpm/mkspec: Read a default release string from rpm/config.sh (bsc997059)
- commit cf65a8d
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 29 22:56:22 CEST 2016 - tiwai@suse.de Mon Aug 29 22:56:22 CEST 2016 - tiwai@suse.de
@ -6248,7 +6280,7 @@ Tue Jan 27 18:19:54 CET 2015 - jslaby@suse.cz
Tue Jan 27 12:41:34 CET 2015 - jbeulich@suse.com Tue Jan 27 12:41:34 CET 2015 - jbeulich@suse.com
- rpm/package-descriptions: Describe kernel-pv (and correct kernel-ec2's). - rpm/package-descriptions: Describe kernel-pv (and correct kernel-ec2's).
- commit f7db992 - commit 6dd25c9
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 26 12:56:03 CET 2015 - mmarek@suse.cz Mon Jan 26 12:56:03 CET 2015 - mmarek@suse.cz

33
kernel-vanilla.spec
View File

@ -46,10 +46,9 @@
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.) # defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB %define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y") %define split_extra (%CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
%define install_vdso 1 %define install_vdso 1
@ -63,7 +62,7 @@ License: GPL-2.0
Group: System/Kernel Group: System/Kernel
Version: 4.7.5 Version: 4.7.5
%if 0%{?is_kotd} %if 0%{?is_kotd}
Release: <RELEASE>.g02c4d35 Release: <RELEASE>.ge3f5518
%else %else
Release: 0 Release: 0
%endif %endif
@ -86,7 +85,6 @@ Provides: %name = %version-%source_rel
Provides: %name-%version-%source_rel Provides: %name-%version-%source_rel
Provides: %{name}_%_target_cpu = %version-%release Provides: %{name}_%_target_cpu = %version-%release
Provides: multiversion(kernel) Provides: multiversion(kernel)
%if %split_base
Provides: kernel-base = %version-%source_rel Provides: kernel-base = %version-%source_rel
# In SLE11, kernel-$flavor complemented kernel-$flavor-base. With SLE12, # In SLE11, kernel-$flavor complemented kernel-$flavor-base. With SLE12,
# kernel-$flavor itself contains all the needed files and kernel-$flavor-base # kernel-$flavor itself contains all the needed files and kernel-$flavor-base
@ -95,7 +93,6 @@ Provides: kernel-base = %version-%source_rel
# owned by multiple packages now. The dependency is not correct wrt openSUSE # owned by multiple packages now. The dependency is not correct wrt openSUSE
# 11.2 - 11.4, but we primarily care about the supported upgrade path. # 11.2 - 11.4, but we primarily care about the supported upgrade path.
Obsoletes: %name-base < 3.1 Obsoletes: %name-base < 3.1
%endif
# The following is copied to the -base subpackage as well # The following is copied to the -base subpackage as well
# BEGIN COMMON DEPS # BEGIN COMMON DEPS
Requires(pre): coreutils awk Requires(pre): coreutils awk
@ -776,7 +773,6 @@ if [ %CONFIG_MODULES = y ]; then
exit 1 exit 1
fi fi
%if %split_base
%_sourcedir/split-modules -d %buildroot \ %_sourcedir/split-modules -d %buildroot \
-o %my_builddir \ -o %my_builddir \
-b %kernel_build_dir \ -b %kernel_build_dir \
@ -790,12 +786,6 @@ if [ %CONFIG_MODULES = y ]; then
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif %endif
%else
( cd %buildroot
find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules
%endif
# The modules.dep file is sorted randomly which produces strange file # The modules.dep file is sorted randomly which produces strange file
# checksums. As the file is not included in the resulting RPM, it's # checksums. As the file is not included in the resulting RPM, it's
# pointless to rely on its contents. Replacing by zeros to make the # pointless to rely on its contents. Replacing by zeros to make the
@ -909,26 +899,20 @@ done | add_dirs_to_filelist >%my_builddir/kernel-devel.files
find etc/uefi/certs -type f -printf '/%%p\n' find etc/uefi/certs -type f -printf '/%%p\n'
fi fi
if test -d lib/firmware/%kernelrelease-%build_flavor; then if test -d lib/firmware/%kernelrelease-%build_flavor; then
%if %split_base
echo "%%dir /lib/firmware/%kernelrelease-%build_flavor" echo "%%dir /lib/firmware/%kernelrelease-%build_flavor"
cat %my_builddir/base-firmware cat %my_builddir/base-firmware
%else
echo "/lib/firmware/%kernelrelease-%build_flavor"
%endif
fi fi
if [ -e .%_docdir/%name ]; then if [ -e .%_docdir/%name ]; then
echo "%%doc %_docdir/%name" echo "%%doc %_docdir/%name"
fi fi
} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files } | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files
%if %split_base
{ {
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules}
if test -d %buildroot/lib/firmware/%kernelrelease-%build_flavor; then if test -d %buildroot/lib/firmware/%kernelrelease-%build_flavor; then
echo "/lib/firmware/%kernelrelease-%build_flavor" echo "/lib/firmware/%kernelrelease-%build_flavor"
fi fi
} > %my_builddir/kernel-main.files } > %my_builddir/kernel-main.files
%endif
%if %split_extra %if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%endif %endif
@ -951,15 +935,9 @@ done
%post -f post.sh %post -f post.sh
%if %split_base
%files -f kernel-main.files %files -f kernel-main.files
%defattr(-, root, root) %defattr(-, root, root)
%else
%files -f kernel-base.files
%defattr(-, root, root)
%endif
%package base %package base
Summary: The Standard Kernel - without any SUSE patches - base modules Summary: The Standard Kernel - without any SUSE patches - base modules
@ -1012,11 +990,8 @@ This package contains only the base modules, required in all installs.
%post base -f post-base.sh %post base -f post-base.sh
%if %split_base
%files base -f kernel-base.files %files base -f kernel-base.files
%defattr(-, root, root) %defattr(-, root, root)
%endif
%package extra %package extra
Summary: The Standard Kernel - without any SUSE patches - Unsupported kernel modules Summary: The Standard Kernel - without any SUSE patches - Unsupported kernel modules
@ -1138,8 +1113,6 @@ static, unlike the kgraft-patch-<kernel-version>-flavor package names.
%dir /lib/modules/%kernelrelease-%build_flavor %dir /lib/modules/%kernelrelease-%build_flavor
%endif %endif
%if %split_base
%endif
%changelog %changelog

9
mkspec
View File

@ -7,7 +7,7 @@ use File::Copy;
use Getopt::Long; use Getopt::Long;
my $dir = "."; my $dir = ".";
my $rpmrelease = 0; my $rpmrelease;
my $patches=""; my $patches="";
GetOptions( GetOptions(
@ -30,6 +30,9 @@ my %vars = parse_config_sh();
my ($srcversion, $variant, $vanilla_only) = my ($srcversion, $variant, $vanilla_only) =
($vars{'SRCVERSION'}, $vars{'VARIANT'}, $vars{'VANILLA_ONLY'}); ($vars{'SRCVERSION'}, $vars{'VARIANT'}, $vars{'VANILLA_ONLY'});
$vanilla_only ||= "0"; $vanilla_only ||= "0";
if (!defined ($rpmrelease)) {
$rpmrelease = $vars{'RELEASE'} || 0;
}
# package name -> [summary, description] # package name -> [summary, description]
my %binary_descriptions = parse_descriptions(); my %binary_descriptions = parse_descriptions();
@ -261,7 +264,9 @@ sub parse_config_sh {
while (<$fh>) { while (<$fh>) {
chomp; chomp;
if (/^\s*([A-Z_]+)=(.*)/) { if (/^\s*([A-Z_]+)=(.*)/) {
$res{$1} = $2; my ($key, $val) = ($1, $2);
$val =~ s/^"(.*)"$/$1/;
$res{$key} = $val;
} }
} }
close($fh); close($fh);

14
package-descriptions
View File

@ -53,13 +53,6 @@ The Linux kernel for Xen paravirtualization.
This kernel can only be used as an unprivileged ("xenU") kernel This kernel can only be used as an unprivileged ("xenU") kernel
(mainly, but not exclusively, for Amazon EC2). (mainly, but not exclusively, for Amazon EC2).
=== kernel-pv ===
The para-virtualized Kernel
The Linux kernel for Xen (and other) paravirtualization, using pv-ops
in the Xen/x86 case, in which case it can be used both as the domain0
("xen0") and as an unprivileged ("xenU") kernel.
=== kernel-64k === === kernel-64k ===
Kernel with 64kb PAGE_SIZE Kernel with 64kb PAGE_SIZE
@ -85,6 +78,13 @@ Kernel for Samsung's Exynos SoC
The standard kernel for Samsung's Exynos 4 & 5 SoC, as found in the Origen board. The standard kernel for Samsung's Exynos 4 & 5 SoC, as found in the Origen board.
=== kernel-syzkaller ===
Kernel used for fuzzing by syzkaller
The syzkaller kernel should be used solely in a virtual machine by
syzkaller only. It supports kernel coverage and enables a lot of slow
debugging options.
=== kernel-versatile === === kernel-versatile ===
Kernel for Versatile SoC Kernel for Versatile SoC

4
source-timestamp
View File

@ -1,3 +1,3 @@
2016-09-26 10:11:45 +0200 2016-09-27 10:04:48 +0200
GIT Revision: 02c4d354864c8d678437b715c2c0076de96eeb39 GIT Revision: e3f5518526eb03faca598e189fe2cc69edbb783b
GIT Branch: stable GIT Branch: stable