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

Accepting request 202357 from Kernel:openSUSE-13.1

Browse Source 
commit ac1d7bee28a9b1ecbf2a9138685dfab7ad0c44f0

OBS-URL: https://build.opensuse.org/request/show/202357
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kernel-source?expand=0&rev=210
This commit is contained in:
Tomáš Chvátal 2013-10-05 18:59:00 +00:00 committed by Git OBS Bridge
parent 6197165868
commit 48fcd73412
33 changed files with 932 additions and 362 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
check-supported-list
View File

@ -1,36 +0,0 @@
#! /bin/sh
sourcedir=$1
modpath=$2
# Check for modules not listed in supported.conf: First, for each module
# in the list, set mod_$module=1
for module in $($sourcedir/guards --list < $sourcedir/supported.conf \
| sed -e 's,.*/,,'); do
m=${module##*/}
m=${m%.ko}
eval mod_${m//-/_}=1
done
# Check if any installed module was not listed
status=
cd $modpath
for module in $(find . -name '*.ko' | sort); do
case "$module" in
./kernel/drivers/staging/* | ./kernel/Documentation/*)
continue ;;
esac
module=${module%.ko}
m=${module##*/}
m=${m//-/_}
m="mod_$m"
if [ -z "${!m}" ]; then
if [ -z "$status" ]; then
echo "Modules not listed in supported.conf:"
status=1
fi
echo ${module#./}
fi
done
exit $status

51
kernel-binary.spec.in
View File

@ -46,10 +46,10 @@
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT CONFIG_EFI_STUB
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE 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)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%ifarch %ix86 x86_64
%define install_vdso 1
@ -240,16 +240,27 @@ fi
mkdir -p %kernel_build_dir
supported_conf() {
%_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
# Generate the list of modules to be marked as supported
{ supported_conf base
supported_conf --default=0 external | sed 's/$/ external/'
} > %kernel_build_dir/Module.supported
supported_conf --default=0 base >%kernel_build_dir/Module.base
# 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 / {
print $(NF) " external";
next;
}
/^[-+]/ {
print $(NF) " no";
next;
}
{
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
cd linux-%srcversion
@ -594,14 +605,6 @@ if [ %CONFIG_MODULES = y ]; then
make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
if ! %_sourcedir/check-supported-list \
%_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then
%if %supported_modules_check
exit 1
%endif
echo "Consistency check error: please update supported.conf."
fi
%ifarch s390 s390x
if test -e arch/s390/boot/kerntypes.o; then
:
@ -654,10 +657,12 @@ if [ %CONFIG_MODULES = y ]; then
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir/Module.base \
%if ! %supported_modules_check
-i \
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
-e \
%endif
%if ! %supported_modules_check
-i
%endif
-s %kernel_build_dir/Module.supported
%if ! %split_extra
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif

38
kernel-cubox.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Fri Oct 4 13:04:43 CEST 2013 - mmarek@suse.cz
- rpm/split-modules: Check module support only if the -extra package is requested
- commit add86bf
-------------------------------------------------------------------
Fri Oct 4 13:02:48 CEST 2013 - mmarek@suse.cz
- rpm/split-modules: Remove unused options
- commit 3736315
-------------------------------------------------------------------
Fri Oct 4 12:57:44 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix creating the kernel-*-extra package
CONFIG_ENTERPRISE_SUPPORT has been renamed to CONFIG_SUSE_KERNEL_SUPPORTED
- commit 9e5b6fe
-------------------------------------------------------------------
Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz
@ -4959,6 +4978,25 @@ Mon Sep 26 10:01:25 CEST 2011 - jeffm@suse.com
- Update to 3.1-rc7.
- commit ee8cc90
-------------------------------------------------------------------
Thu Sep 22 11:18:31 CEST 2011 - mmarek@suse.cz
- rpm/split-modules: Print the full path for modules missing in supported.conf
- commit e55e4c6
-------------------------------------------------------------------
Wed Sep 21 16:33:53 CEST 2011 - mmarek@suse.cz
- Add support for wildcards in supported.conf
- rpm/kernel-binary.spec.in: Generate Module.supported with all
lines from supported conf, unsupported modules are marked as "no"
- rpm/split-modules: Use the supported flag in modules, instead of
parsing the Module.supported file and report modules that have no
supported marking.
- rpm/check-supported-list: Delete, this is done by split-modules
now.
- commit edfdc2a
-------------------------------------------------------------------
Wed Sep 21 13:20:35 CEST 2011 - trenn@suse.de

56
kernel-cubox.spec
View File

@ -39,17 +39,17 @@
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT CONFIG_EFI_STUB
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE 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)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%ifarch %ix86 x86_64
%define install_vdso 1
@ -61,7 +61,7 @@ Name: kernel-cubox
Summary: Kernel for SolidRun Cubox
Version: 3.11.3
%if 0%{?is_kotd}
Release: <RELEASE>.g485f0d1
Release: <RELEASE>.gac1d7be
%else
Release: 0
%endif
@ -161,7 +161,6 @@ Source17: apply-patches
Source21: config.conf
Source23: supported.conf
Source33: check-for-config-changes
Source34: check-supported-list
Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
@ -317,16 +316,27 @@ fi
mkdir -p %kernel_build_dir
supported_conf() {
%_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
# Generate the list of modules to be marked as supported
{ supported_conf base
supported_conf --default=0 external | sed 's/$/ external/'
} > %kernel_build_dir/Module.supported
supported_conf --default=0 base >%kernel_build_dir/Module.base
# 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 / {
print $(NF) " external";
next;
}
/^[-+]/ {
print $(NF) " no";
next;
}
{
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
cd linux-%srcversion
@ -671,14 +681,6 @@ if [ %CONFIG_MODULES = y ]; then
make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
if ! %_sourcedir/check-supported-list \
%_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then
%if %supported_modules_check
exit 1
%endif
echo "Consistency check error: please update supported.conf."
fi
%ifarch s390 s390x
if test -e arch/s390/boot/kerntypes.o; then
:
@ -731,10 +733,12 @@ if [ %CONFIG_MODULES = y ]; then
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir/Module.base \
%if ! %supported_modules_check
-i \
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
-e \
%endif
%if ! %supported_modules_check
-i
%endif
-s %kernel_build_dir/Module.supported
%if ! %split_extra
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif

38
kernel-debug.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Fri Oct 4 13:04:43 CEST 2013 - mmarek@suse.cz
- rpm/split-modules: Check module support only if the -extra package is requested
- commit add86bf
-------------------------------------------------------------------
Fri Oct 4 13:02:48 CEST 2013 - mmarek@suse.cz
- rpm/split-modules: Remove unused options
- commit 3736315
-------------------------------------------------------------------
Fri Oct 4 12:57:44 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix creating the kernel-*-extra package
CONFIG_ENTERPRISE_SUPPORT has been renamed to CONFIG_SUSE_KERNEL_SUPPORTED
- commit 9e5b6fe
-------------------------------------------------------------------
Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz
@ -4959,6 +4978,25 @@ Mon Sep 26 10:01:25 CEST 2011 - jeffm@suse.com
- Update to 3.1-rc7.
- commit ee8cc90
-------------------------------------------------------------------
Thu Sep 22 11:18:31 CEST 2011 - mmarek@suse.cz
- rpm/split-modules: Print the full path for modules missing in supported.conf
- commit e55e4c6
-------------------------------------------------------------------
Wed Sep 21 16:33:53 CEST 2011 - mmarek@suse.cz
- Add support for wildcards in supported.conf
- rpm/kernel-binary.spec.in: Generate Module.supported with all
lines from supported conf, unsupported modules are marked as "no"
- rpm/split-modules: Use the supported flag in modules, instead of
parsing the Module.supported file and report modules that have no
supported marking.
- rpm/check-supported-list: Delete, this is done by split-modules
now.
- commit edfdc2a
-------------------------------------------------------------------
Wed Sep 21 13:20:35 CEST 2011 - trenn@suse.de

56
kernel-debug.spec
View File

@ -39,17 +39,17 @@
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT CONFIG_EFI_STUB
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE 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)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%ifarch %ix86 x86_64
%define install_vdso 1
@ -61,7 +61,7 @@ Name: kernel-debug
Summary: A Debug Version of the Kernel
Version: 3.11.3
%if 0%{?is_kotd}
Release: <RELEASE>.g485f0d1
Release: <RELEASE>.gac1d7be
%else
Release: 0
%endif
@ -164,7 +164,6 @@ Source17: apply-patches
Source21: config.conf
Source23: supported.conf
Source33: check-for-config-changes
Source34: check-supported-list
Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
@ -320,16 +319,27 @@ fi
mkdir -p %kernel_build_dir
supported_conf() {
%_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
# Generate the list of modules to be marked as supported
{ supported_conf base
supported_conf --default=0 external | sed 's/$/ external/'
} > %kernel_build_dir/Module.supported
supported_conf --default=0 base >%kernel_build_dir/Module.base
# 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 / {
print $(NF) " external";
next;
}
/^[-+]/ {
print $(NF) " no";
next;
}
{
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
cd linux-%srcversion
@ -674,14 +684,6 @@ if [ %CONFIG_MODULES = y ]; then
make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
if ! %_sourcedir/check-supported-list \
%_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then
%if %supported_modules_check
exit 1
%endif
echo "Consistency check error: please update supported.conf."
fi
%ifarch s390 s390x
if test -e arch/s390/boot/kerntypes.o; then
:
@ -734,10 +736,12 @@ if [ %CONFIG_MODULES = y ]; then
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir/Module.base \
%if ! %supported_modules_check
-i \
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
-e \
%endif
%if ! %supported_modules_check
-i
%endif
-s %kernel_build_dir/Module.supported
%if ! %split_extra
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif

38
kernel-default.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Fri Oct 4 13:04:43 CEST 2013 - mmarek@suse.cz
- rpm/split-modules: Check module support only if the -extra package is requested
- commit add86bf
-------------------------------------------------------------------
Fri Oct 4 13:02:48 CEST 2013 - mmarek@suse.cz
- rpm/split-modules: Remove unused options
- commit 3736315
-------------------------------------------------------------------
Fri Oct 4 12:57:44 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix creating the kernel-*-extra package
CONFIG_ENTERPRISE_SUPPORT has been renamed to CONFIG_SUSE_KERNEL_SUPPORTED
- commit 9e5b6fe
-------------------------------------------------------------------
Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz
@ -4959,6 +4978,25 @@ Mon Sep 26 10:01:25 CEST 2011 - jeffm@suse.com
- Update to 3.1-rc7.
- commit ee8cc90
-------------------------------------------------------------------
Thu Sep 22 11:18:31 CEST 2011 - mmarek@suse.cz
- rpm/split-modules: Print the full path for modules missing in supported.conf
- commit e55e4c6
-------------------------------------------------------------------
Wed Sep 21 16:33:53 CEST 2011 - mmarek@suse.cz
- Add support for wildcards in supported.conf
- rpm/kernel-binary.spec.in: Generate Module.supported with all
lines from supported conf, unsupported modules are marked as "no"
- rpm/split-modules: Use the supported flag in modules, instead of
parsing the Module.supported file and report modules that have no
supported marking.
- rpm/check-supported-list: Delete, this is done by split-modules
now.
- commit edfdc2a
-------------------------------------------------------------------
Wed Sep 21 13:20:35 CEST 2011 - trenn@suse.de

56
kernel-default.spec
View File

@ -39,17 +39,17 @@
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT CONFIG_EFI_STUB
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE 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)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%ifarch %ix86 x86_64
%define install_vdso 1
@ -61,7 +61,7 @@ Name: kernel-default
Summary: The Standard Kernel
Version: 3.11.3
%if 0%{?is_kotd}
Release: <RELEASE>.g485f0d1
Release: <RELEASE>.gac1d7be
%else
Release: 0
%endif
@ -176,7 +176,6 @@ Source17: apply-patches
Source21: config.conf
Source23: supported.conf
Source33: check-for-config-changes
Source34: check-supported-list
Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
@ -331,16 +330,27 @@ fi
mkdir -p %kernel_build_dir
supported_conf() {
%_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
# Generate the list of modules to be marked as supported
{ supported_conf base
supported_conf --default=0 external | sed 's/$/ external/'
} > %kernel_build_dir/Module.supported
supported_conf --default=0 base >%kernel_build_dir/Module.base
# 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 / {
print $(NF) " external";
next;
}
/^[-+]/ {
print $(NF) " no";
next;
}
{
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
cd linux-%srcversion
@ -685,14 +695,6 @@ if [ %CONFIG_MODULES = y ]; then
make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
if ! %_sourcedir/check-supported-list \
%_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then
%if %supported_modules_check
exit 1
%endif
echo "Consistency check error: please update supported.conf."
fi
%ifarch s390 s390x
if test -e arch/s390/boot/kerntypes.o; then
:
@ -745,10 +747,12 @@ if [ %CONFIG_MODULES = y ]; then
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir/Module.base \
%if ! %supported_modules_check
-i \
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
-e \
%endif
%if ! %supported_modules_check
-i
%endif
-s %kernel_build_dir/Module.supported
%if ! %split_extra
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif

38
kernel-desktop.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Fri Oct 4 13:04:43 CEST 2013 - mmarek@suse.cz
- rpm/split-modules: Check module support only if the -extra package is requested
- commit add86bf
-------------------------------------------------------------------
Fri Oct 4 13:02:48 CEST 2013 - mmarek@suse.cz
- rpm/split-modules: Remove unused options
- commit 3736315
-------------------------------------------------------------------
Fri Oct 4 12:57:44 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix creating the kernel-*-extra package
CONFIG_ENTERPRISE_SUPPORT has been renamed to CONFIG_SUSE_KERNEL_SUPPORTED
- commit 9e5b6fe
-------------------------------------------------------------------
Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz
@ -4959,6 +4978,25 @@ Mon Sep 26 10:01:25 CEST 2011 - jeffm@suse.com
- Update to 3.1-rc7.
- commit ee8cc90
-------------------------------------------------------------------
Thu Sep 22 11:18:31 CEST 2011 - mmarek@suse.cz
- rpm/split-modules: Print the full path for modules missing in supported.conf
- commit e55e4c6
-------------------------------------------------------------------
Wed Sep 21 16:33:53 CEST 2011 - mmarek@suse.cz
- Add support for wildcards in supported.conf
- rpm/kernel-binary.spec.in: Generate Module.supported with all
lines from supported conf, unsupported modules are marked as "no"
- rpm/split-modules: Use the supported flag in modules, instead of
parsing the Module.supported file and report modules that have no
supported marking.
- rpm/check-supported-list: Delete, this is done by split-modules
now.
- commit edfdc2a
-------------------------------------------------------------------
Wed Sep 21 13:20:35 CEST 2011 - trenn@suse.de

56
kernel-desktop.spec
View File

@ -39,17 +39,17 @@
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT CONFIG_EFI_STUB
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE 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)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%ifarch %ix86 x86_64
%define install_vdso 1
@ -61,7 +61,7 @@ Name: kernel-desktop
Summary: Kernel optimized for the desktop
Version: 3.11.3
%if 0%{?is_kotd}
Release: <RELEASE>.g485f0d1
Release: <RELEASE>.gac1d7be
%else
Release: 0
%endif
@ -161,7 +161,6 @@ Source17: apply-patches
Source21: config.conf
Source23: supported.conf
Source33: check-for-config-changes
Source34: check-supported-list
Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
@ -329,16 +328,27 @@ fi
mkdir -p %kernel_build_dir
supported_conf() {
%_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
# Generate the list of modules to be marked as supported
{ supported_conf base
supported_conf --default=0 external | sed 's/$/ external/'
} > %kernel_build_dir/Module.supported
supported_conf --default=0 base >%kernel_build_dir/Module.base
# 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 / {
print $(NF) " external";
next;
}
/^[-+]/ {
print $(NF) " no";
next;
}
{
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
cd linux-%srcversion
@ -683,14 +693,6 @@ if [ %CONFIG_MODULES = y ]; then
make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
if ! %_sourcedir/check-supported-list \
%_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then
%if %supported_modules_check
exit 1
%endif
echo "Consistency check error: please update supported.conf."
fi
%ifarch s390 s390x
if test -e arch/s390/boot/kerntypes.o; then
:
@ -743,10 +745,12 @@ if [ %CONFIG_MODULES = y ]; then
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir/Module.base \
%if ! %supported_modules_check
-i \
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
-e \
%endif
%if ! %supported_modules_check
-i
%endif
-s %kernel_build_dir/Module.supported
%if ! %split_extra
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif

38
kernel-docs.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Fri Oct 4 13:04:43 CEST 2013 - mmarek@suse.cz
- rpm/split-modules: Check module support only if the -extra package is requested
- commit add86bf
-------------------------------------------------------------------
Fri Oct 4 13:02:48 CEST 2013 - mmarek@suse.cz
- rpm/split-modules: Remove unused options
- commit 3736315
-------------------------------------------------------------------
Fri Oct 4 12:57:44 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix creating the kernel-*-extra package
CONFIG_ENTERPRISE_SUPPORT has been renamed to CONFIG_SUSE_KERNEL_SUPPORTED
- commit 9e5b6fe
-------------------------------------------------------------------
Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz
@ -4959,6 +4978,25 @@ Mon Sep 26 10:01:25 CEST 2011 - jeffm@suse.com
- Update to 3.1-rc7.
- commit ee8cc90
-------------------------------------------------------------------
Thu Sep 22 11:18:31 CEST 2011 - mmarek@suse.cz
- rpm/split-modules: Print the full path for modules missing in supported.conf
- commit e55e4c6
-------------------------------------------------------------------
Wed Sep 21 16:33:53 CEST 2011 - mmarek@suse.cz
- Add support for wildcards in supported.conf
- rpm/kernel-binary.spec.in: Generate Module.supported with all
lines from supported conf, unsupported modules are marked as "no"
- rpm/split-modules: Use the supported flag in modules, instead of
parsing the Module.supported file and report modules that have no
supported marking.
- rpm/check-supported-list: Delete, this is done by split-modules
now.
- commit edfdc2a
-------------------------------------------------------------------
Wed Sep 21 13:20:35 CEST 2011 - trenn@suse.de

2
kernel-docs.spec
View File

@ -26,7 +26,7 @@ Name: kernel-docs
Summary: Kernel Documentation
Version: 3.11.3
%if 0%{?is_kotd}
Release: <RELEASE>.g485f0d1
Release: <RELEASE>.gac1d7be
%else
Release: 0
%endif

38
kernel-ec2.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Fri Oct 4 13:04:43 CEST 2013 - mmarek@suse.cz
- rpm/split-modules: Check module support only if the -extra package is requested
- commit add86bf
-------------------------------------------------------------------
Fri Oct 4 13:02:48 CEST 2013 - mmarek@suse.cz
- rpm/split-modules: Remove unused options
- commit 3736315
-------------------------------------------------------------------
Fri Oct 4 12:57:44 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix creating the kernel-*-extra package
CONFIG_ENTERPRISE_SUPPORT has been renamed to CONFIG_SUSE_KERNEL_SUPPORTED
- commit 9e5b6fe
-------------------------------------------------------------------
Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz
@ -4959,6 +4978,25 @@ Mon Sep 26 10:01:25 CEST 2011 - jeffm@suse.com
- Update to 3.1-rc7.
- commit ee8cc90
-------------------------------------------------------------------
Thu Sep 22 11:18:31 CEST 2011 - mmarek@suse.cz
- rpm/split-modules: Print the full path for modules missing in supported.conf
- commit e55e4c6
-------------------------------------------------------------------
Wed Sep 21 16:33:53 CEST 2011 - mmarek@suse.cz
- Add support for wildcards in supported.conf
- rpm/kernel-binary.spec.in: Generate Module.supported with all
lines from supported conf, unsupported modules are marked as "no"
- rpm/split-modules: Use the supported flag in modules, instead of
parsing the Module.supported file and report modules that have no
supported marking.
- rpm/check-supported-list: Delete, this is done by split-modules
now.
- commit edfdc2a
-------------------------------------------------------------------
Wed Sep 21 13:20:35 CEST 2011 - trenn@suse.de

56
kernel-ec2.spec
View File

@ -39,17 +39,17 @@
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT CONFIG_EFI_STUB
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE 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)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%ifarch %ix86 x86_64
%define install_vdso 1
@ -61,7 +61,7 @@ Name: kernel-ec2
Summary: The Amazon EC2 Xen Kernel
Version: 3.11.3
%if 0%{?is_kotd}
Release: <RELEASE>.g485f0d1
Release: <RELEASE>.gac1d7be
%else
Release: 0
%endif
@ -161,7 +161,6 @@ Source17: apply-patches
Source21: config.conf
Source23: supported.conf
Source33: check-for-config-changes
Source34: check-supported-list
Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
@ -319,16 +318,27 @@ fi
mkdir -p %kernel_build_dir
supported_conf() {
%_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
# Generate the list of modules to be marked as supported
{ supported_conf base
supported_conf --default=0 external | sed 's/$/ external/'
} > %kernel_build_dir/Module.supported
supported_conf --default=0 base >%kernel_build_dir/Module.base
# 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 / {
print $(NF) " external";
next;
}
/^[-+]/ {
print $(NF) " no";
next;
}
{
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
cd linux-%srcversion
@ -673,14 +683,6 @@ if [ %CONFIG_MODULES = y ]; then
make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
if ! %_sourcedir/check-supported-list \
%_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then
%if %supported_modules_check
exit 1
%endif
echo "Consistency check error: please update supported.conf."
fi
%ifarch s390 s390x
if test -e arch/s390/boot/kerntypes.o; then
:
@ -733,10 +735,12 @@ if [ %CONFIG_MODULES = y ]; then
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir/Module.base \
%if ! %supported_modules_check
-i \
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
-e \
%endif
%if ! %supported_modules_check
-i
%endif
-s %kernel_build_dir/Module.supported
%if ! %split_extra
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif

38
kernel-exynos.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Fri Oct 4 13:04:43 CEST 2013 - mmarek@suse.cz
- rpm/split-modules: Check module support only if the -extra package is requested
- commit add86bf
-------------------------------------------------------------------
Fri Oct 4 13:02:48 CEST 2013 - mmarek@suse.cz
- rpm/split-modules: Remove unused options
- commit 3736315
-------------------------------------------------------------------
Fri Oct 4 12:57:44 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix creating the kernel-*-extra package
CONFIG_ENTERPRISE_SUPPORT has been renamed to CONFIG_SUSE_KERNEL_SUPPORTED
- commit 9e5b6fe
-------------------------------------------------------------------
Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz
@ -4959,6 +4978,25 @@ Mon Sep 26 10:01:25 CEST 2011 - jeffm@suse.com
- Update to 3.1-rc7.
- commit ee8cc90
-------------------------------------------------------------------
Thu Sep 22 11:18:31 CEST 2011 - mmarek@suse.cz
- rpm/split-modules: Print the full path for modules missing in supported.conf
- commit e55e4c6
-------------------------------------------------------------------
Wed Sep 21 16:33:53 CEST 2011 - mmarek@suse.cz
- Add support for wildcards in supported.conf
- rpm/kernel-binary.spec.in: Generate Module.supported with all
lines from supported conf, unsupported modules are marked as "no"
- rpm/split-modules: Use the supported flag in modules, instead of
parsing the Module.supported file and report modules that have no
supported marking.
- rpm/check-supported-list: Delete, this is done by split-modules
now.
- commit edfdc2a
-------------------------------------------------------------------
Wed Sep 21 13:20:35 CEST 2011 - trenn@suse.de

56
kernel-exynos.spec
View File

@ -39,17 +39,17 @@
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT CONFIG_EFI_STUB
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE 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)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%ifarch %ix86 x86_64
%define install_vdso 1
@ -61,7 +61,7 @@ Name: kernel-exynos
Summary: Kernel for Samsung's Exynos SoC
Version: 3.11.3
%if 0%{?is_kotd}
Release: <RELEASE>.g485f0d1
Release: <RELEASE>.gac1d7be
%else
Release: 0
%endif
@ -161,7 +161,6 @@ Source17: apply-patches
Source21: config.conf
Source23: supported.conf
Source33: check-for-config-changes
Source34: check-supported-list
Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
@ -316,16 +315,27 @@ fi
mkdir -p %kernel_build_dir
supported_conf() {
%_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
# Generate the list of modules to be marked as supported
{ supported_conf base
supported_conf --default=0 external | sed 's/$/ external/'
} > %kernel_build_dir/Module.supported
supported_conf --default=0 base >%kernel_build_dir/Module.base
# 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 / {
print $(NF) " external";
next;
}
/^[-+]/ {
print $(NF) " no";
next;
}
{
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
cd linux-%srcversion
@ -670,14 +680,6 @@ if [ %CONFIG_MODULES = y ]; then
make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
if ! %_sourcedir/check-supported-list \
%_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then
%if %supported_modules_check
exit 1
%endif
echo "Consistency check error: please update supported.conf."
fi
%ifarch s390 s390x
if test -e arch/s390/boot/kerntypes.o; then
:
@ -730,10 +732,12 @@ if [ %CONFIG_MODULES = y ]; then
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir/Module.base \
%if ! %supported_modules_check
-i \
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
-e \
%endif
%if ! %supported_modules_check
-i
%endif
-s %kernel_build_dir/Module.supported
%if ! %split_extra
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif

38
kernel-lpae.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Fri Oct 4 13:04:43 CEST 2013 - mmarek@suse.cz
- rpm/split-modules: Check module support only if the -extra package is requested
- commit add86bf
-------------------------------------------------------------------
Fri Oct 4 13:02:48 CEST 2013 - mmarek@suse.cz
- rpm/split-modules: Remove unused options
- commit 3736315
-------------------------------------------------------------------
Fri Oct 4 12:57:44 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix creating the kernel-*-extra package
CONFIG_ENTERPRISE_SUPPORT has been renamed to CONFIG_SUSE_KERNEL_SUPPORTED
- commit 9e5b6fe
-------------------------------------------------------------------
Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz
@ -4959,6 +4978,25 @@ Mon Sep 26 10:01:25 CEST 2011 - jeffm@suse.com
- Update to 3.1-rc7.
- commit ee8cc90
-------------------------------------------------------------------
Thu Sep 22 11:18:31 CEST 2011 - mmarek@suse.cz
- rpm/split-modules: Print the full path for modules missing in supported.conf
- commit e55e4c6
-------------------------------------------------------------------
Wed Sep 21 16:33:53 CEST 2011 - mmarek@suse.cz
- Add support for wildcards in supported.conf
- rpm/kernel-binary.spec.in: Generate Module.supported with all
lines from supported conf, unsupported modules are marked as "no"
- rpm/split-modules: Use the supported flag in modules, instead of
parsing the Module.supported file and report modules that have no
supported marking.
- rpm/check-supported-list: Delete, this is done by split-modules
now.
- commit edfdc2a
-------------------------------------------------------------------
Wed Sep 21 13:20:35 CEST 2011 - trenn@suse.de

56
kernel-lpae.spec
View File

@ -39,17 +39,17 @@
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT CONFIG_EFI_STUB
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE 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)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%ifarch %ix86 x86_64
%define install_vdso 1
@ -61,7 +61,7 @@ Name: kernel-lpae
Summary: Kernel for LPAE enabled systems
Version: 3.11.3
%if 0%{?is_kotd}
Release: <RELEASE>.g485f0d1
Release: <RELEASE>.gac1d7be
%else
Release: 0
%endif
@ -161,7 +161,6 @@ Source17: apply-patches
Source21: config.conf
Source23: supported.conf
Source33: check-for-config-changes
Source34: check-supported-list
Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
@ -317,16 +316,27 @@ fi
mkdir -p %kernel_build_dir
supported_conf() {
%_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
# Generate the list of modules to be marked as supported
{ supported_conf base
supported_conf --default=0 external | sed 's/$/ external/'
} > %kernel_build_dir/Module.supported
supported_conf --default=0 base >%kernel_build_dir/Module.base
# 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 / {
print $(NF) " external";
next;
}
/^[-+]/ {
print $(NF) " no";
next;
}
{
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
cd linux-%srcversion
@ -671,14 +681,6 @@ if [ %CONFIG_MODULES = y ]; then
make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
if ! %_sourcedir/check-supported-list \
%_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then
%if %supported_modules_check
exit 1
%endif
echo "Consistency check error: please update supported.conf."
fi
%ifarch s390 s390x
if test -e arch/s390/boot/kerntypes.o; then
:
@ -731,10 +733,12 @@ if [ %CONFIG_MODULES = y ]; then
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir/Module.base \
%if ! %supported_modules_check
-i \
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
-e \
%endif
%if ! %supported_modules_check
-i
%endif
-s %kernel_build_dir/Module.supported
%if ! %split_extra
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif

38
kernel-pae.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Fri Oct 4 13:04:43 CEST 2013 - mmarek@suse.cz
- rpm/split-modules: Check module support only if the -extra package is requested
- commit add86bf
-------------------------------------------------------------------
Fri Oct 4 13:02:48 CEST 2013 - mmarek@suse.cz
- rpm/split-modules: Remove unused options
- commit 3736315
-------------------------------------------------------------------
Fri Oct 4 12:57:44 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix creating the kernel-*-extra package
CONFIG_ENTERPRISE_SUPPORT has been renamed to CONFIG_SUSE_KERNEL_SUPPORTED
- commit 9e5b6fe
-------------------------------------------------------------------
Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz
@ -4959,6 +4978,25 @@ Mon Sep 26 10:01:25 CEST 2011 - jeffm@suse.com
- Update to 3.1-rc7.
- commit ee8cc90
-------------------------------------------------------------------
Thu Sep 22 11:18:31 CEST 2011 - mmarek@suse.cz
- rpm/split-modules: Print the full path for modules missing in supported.conf
- commit e55e4c6
-------------------------------------------------------------------
Wed Sep 21 16:33:53 CEST 2011 - mmarek@suse.cz
- Add support for wildcards in supported.conf
- rpm/kernel-binary.spec.in: Generate Module.supported with all
lines from supported conf, unsupported modules are marked as "no"
- rpm/split-modules: Use the supported flag in modules, instead of
parsing the Module.supported file and report modules that have no
supported marking.
- rpm/check-supported-list: Delete, this is done by split-modules
now.
- commit edfdc2a
-------------------------------------------------------------------
Wed Sep 21 13:20:35 CEST 2011 - trenn@suse.de

56
kernel-pae.spec
View File

@ -39,17 +39,17 @@
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT CONFIG_EFI_STUB
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE 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)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%ifarch %ix86 x86_64
%define install_vdso 1
@ -61,7 +61,7 @@ Name: kernel-pae
Summary: Kernel with PAE Support
Version: 3.11.3
%if 0%{?is_kotd}
Release: <RELEASE>.g485f0d1
Release: <RELEASE>.gac1d7be
%else
Release: 0
%endif
@ -166,7 +166,6 @@ Source17: apply-patches
Source21: config.conf
Source23: supported.conf
Source33: check-for-config-changes
Source34: check-supported-list
Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
@ -328,16 +327,27 @@ fi
mkdir -p %kernel_build_dir
supported_conf() {
%_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
# Generate the list of modules to be marked as supported
{ supported_conf base
supported_conf --default=0 external | sed 's/$/ external/'
} > %kernel_build_dir/Module.supported
supported_conf --default=0 base >%kernel_build_dir/Module.base
# 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 / {
print $(NF) " external";
next;
}
/^[-+]/ {
print $(NF) " no";
next;
}
{
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
cd linux-%srcversion
@ -682,14 +692,6 @@ if [ %CONFIG_MODULES = y ]; then
make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
if ! %_sourcedir/check-supported-list \
%_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then
%if %supported_modules_check
exit 1
%endif
echo "Consistency check error: please update supported.conf."
fi
%ifarch s390 s390x
if test -e arch/s390/boot/kerntypes.o; then
:
@ -742,10 +744,12 @@ if [ %CONFIG_MODULES = y ]; then
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir/Module.base \
%if ! %supported_modules_check
-i \
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
-e \
%endif
%if ! %supported_modules_check
-i
%endif
-s %kernel_build_dir/Module.supported
%if ! %split_extra
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif

38
kernel-source.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Fri Oct 4 13:04:43 CEST 2013 - mmarek@suse.cz
- rpm/split-modules: Check module support only if the -extra package is requested
- commit add86bf
-------------------------------------------------------------------
Fri Oct 4 13:02:48 CEST 2013 - mmarek@suse.cz
- rpm/split-modules: Remove unused options
- commit 3736315
-------------------------------------------------------------------
Fri Oct 4 12:57:44 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix creating the kernel-*-extra package
CONFIG_ENTERPRISE_SUPPORT has been renamed to CONFIG_SUSE_KERNEL_SUPPORTED
- commit 9e5b6fe
-------------------------------------------------------------------
Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz
@ -4959,6 +4978,25 @@ Mon Sep 26 10:01:25 CEST 2011 - jeffm@suse.com
- Update to 3.1-rc7.
- commit ee8cc90
-------------------------------------------------------------------
Thu Sep 22 11:18:31 CEST 2011 - mmarek@suse.cz
- rpm/split-modules: Print the full path for modules missing in supported.conf
- commit e55e4c6
-------------------------------------------------------------------
Wed Sep 21 16:33:53 CEST 2011 - mmarek@suse.cz
- Add support for wildcards in supported.conf
- rpm/kernel-binary.spec.in: Generate Module.supported with all
lines from supported conf, unsupported modules are marked as "no"
- rpm/split-modules: Use the supported flag in modules, instead of
parsing the Module.supported file and report modules that have no
supported marking.
- rpm/check-supported-list: Delete, this is done by split-modules
now.
- commit edfdc2a
-------------------------------------------------------------------
Wed Sep 21 13:20:35 CEST 2011 - trenn@suse.de

5
kernel-source.spec
View File

@ -31,7 +31,7 @@ Name: kernel-source
Summary: The Linux Kernel Sources
Version: 3.11.3
%if 0%{?is_kotd}
Release: <RELEASE>.g485f0d1
Release: <RELEASE>.gac1d7be
%else
Release: 0
%endif
@ -60,7 +60,6 @@ Source17: apply-patches
Source21: config.conf
Source23: supported.conf
Source33: check-for-config-changes
Source34: check-supported-list
Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
@ -111,7 +110,7 @@ Prefix: /usr/src
# Source is only complete with devel files.
Requires: kernel-devel = %version-%release
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%define symbols %(set -- $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
%define variant_symbols %(case %name in (*-rt) echo "RT" ;; esac)

1
kernel-source.spec.in
View File

@ -60,7 +60,6 @@ Source17: apply-patches
Source21: config.conf
Source23: supported.conf
Source33: check-for-config-changes
Source34: check-supported-list
Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS

38
kernel-syms.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Fri Oct 4 13:04:43 CEST 2013 - mmarek@suse.cz
- rpm/split-modules: Check module support only if the -extra package is requested
- commit add86bf
-------------------------------------------------------------------
Fri Oct 4 13:02:48 CEST 2013 - mmarek@suse.cz
- rpm/split-modules: Remove unused options
- commit 3736315
-------------------------------------------------------------------
Fri Oct 4 12:57:44 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix creating the kernel-*-extra package
CONFIG_ENTERPRISE_SUPPORT has been renamed to CONFIG_SUSE_KERNEL_SUPPORTED
- commit 9e5b6fe
-------------------------------------------------------------------
Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz
@ -4959,6 +4978,25 @@ Mon Sep 26 10:01:25 CEST 2011 - jeffm@suse.com
- Update to 3.1-rc7.
- commit ee8cc90
-------------------------------------------------------------------
Thu Sep 22 11:18:31 CEST 2011 - mmarek@suse.cz
- rpm/split-modules: Print the full path for modules missing in supported.conf
- commit e55e4c6
-------------------------------------------------------------------
Wed Sep 21 16:33:53 CEST 2011 - mmarek@suse.cz
- Add support for wildcards in supported.conf
- rpm/kernel-binary.spec.in: Generate Module.supported with all
lines from supported conf, unsupported modules are marked as "no"
- rpm/split-modules: Use the supported flag in modules, instead of
parsing the Module.supported file and report modules that have no
supported marking.
- rpm/check-supported-list: Delete, this is done by split-modules
now.
- commit edfdc2a
-------------------------------------------------------------------
Wed Sep 21 13:20:35 CEST 2011 - trenn@suse.de

2
kernel-syms.spec
View File

@ -26,7 +26,7 @@ Summary: Kernel Symbol Versions (modversions)
Version: 3.11.3
%if %using_buildservice
%if 0%{?is_kotd}
Release: <RELEASE>.g485f0d1
Release: <RELEASE>.gac1d7be
%else
Release: 0
%endif

38
kernel-trace.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Fri Oct 4 13:04:43 CEST 2013 - mmarek@suse.cz
- rpm/split-modules: Check module support only if the -extra package is requested
- commit add86bf
-------------------------------------------------------------------
Fri Oct 4 13:02:48 CEST 2013 - mmarek@suse.cz
- rpm/split-modules: Remove unused options
- commit 3736315
-------------------------------------------------------------------
Fri Oct 4 12:57:44 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix creating the kernel-*-extra package
CONFIG_ENTERPRISE_SUPPORT has been renamed to CONFIG_SUSE_KERNEL_SUPPORTED
- commit 9e5b6fe
-------------------------------------------------------------------
Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz
@ -4959,6 +4978,25 @@ Mon Sep 26 10:01:25 CEST 2011 - jeffm@suse.com
- Update to 3.1-rc7.
- commit ee8cc90
-------------------------------------------------------------------
Thu Sep 22 11:18:31 CEST 2011 - mmarek@suse.cz
- rpm/split-modules: Print the full path for modules missing in supported.conf
- commit e55e4c6
-------------------------------------------------------------------
Wed Sep 21 16:33:53 CEST 2011 - mmarek@suse.cz
- Add support for wildcards in supported.conf
- rpm/kernel-binary.spec.in: Generate Module.supported with all
lines from supported conf, unsupported modules are marked as "no"
- rpm/split-modules: Use the supported flag in modules, instead of
parsing the Module.supported file and report modules that have no
supported marking.
- rpm/check-supported-list: Delete, this is done by split-modules
now.
- commit edfdc2a
-------------------------------------------------------------------
Wed Sep 21 13:20:35 CEST 2011 - trenn@suse.de

56
kernel-trace.spec
View File

@ -39,17 +39,17 @@
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT CONFIG_EFI_STUB
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE 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)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%ifarch %ix86 x86_64
%define install_vdso 1
@ -61,7 +61,7 @@ Name: kernel-trace
Summary: The Standard Kernel with Tracing Features
Version: 3.11.3
%if 0%{?is_kotd}
Release: <RELEASE>.g485f0d1
Release: <RELEASE>.gac1d7be
%else
Release: 0
%endif
@ -164,7 +164,6 @@ Source17: apply-patches
Source21: config.conf
Source23: supported.conf
Source33: check-for-config-changes
Source34: check-supported-list
Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
@ -319,16 +318,27 @@ fi
mkdir -p %kernel_build_dir
supported_conf() {
%_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
# Generate the list of modules to be marked as supported
{ supported_conf base
supported_conf --default=0 external | sed 's/$/ external/'
} > %kernel_build_dir/Module.supported
supported_conf --default=0 base >%kernel_build_dir/Module.base
# 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 / {
print $(NF) " external";
next;
}
/^[-+]/ {
print $(NF) " no";
next;
}
{
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
cd linux-%srcversion
@ -673,14 +683,6 @@ if [ %CONFIG_MODULES = y ]; then
make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
if ! %_sourcedir/check-supported-list \
%_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then
%if %supported_modules_check
exit 1
%endif
echo "Consistency check error: please update supported.conf."
fi
%ifarch s390 s390x
if test -e arch/s390/boot/kerntypes.o; then
:
@ -733,10 +735,12 @@ if [ %CONFIG_MODULES = y ]; then
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir/Module.base \
%if ! %supported_modules_check
-i \
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
-e \
%endif
%if ! %supported_modules_check
-i
%endif
-s %kernel_build_dir/Module.supported
%if ! %split_extra
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif

38
kernel-vanilla.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Fri Oct 4 13:04:43 CEST 2013 - mmarek@suse.cz
- rpm/split-modules: Check module support only if the -extra package is requested
- commit add86bf
-------------------------------------------------------------------
Fri Oct 4 13:02:48 CEST 2013 - mmarek@suse.cz
- rpm/split-modules: Remove unused options
- commit 3736315
-------------------------------------------------------------------
Fri Oct 4 12:57:44 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix creating the kernel-*-extra package
CONFIG_ENTERPRISE_SUPPORT has been renamed to CONFIG_SUSE_KERNEL_SUPPORTED
- commit 9e5b6fe
-------------------------------------------------------------------
Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz
@ -4959,6 +4978,25 @@ Mon Sep 26 10:01:25 CEST 2011 - jeffm@suse.com
- Update to 3.1-rc7.
- commit ee8cc90
-------------------------------------------------------------------
Thu Sep 22 11:18:31 CEST 2011 - mmarek@suse.cz
- rpm/split-modules: Print the full path for modules missing in supported.conf
- commit e55e4c6
-------------------------------------------------------------------
Wed Sep 21 16:33:53 CEST 2011 - mmarek@suse.cz
- Add support for wildcards in supported.conf
- rpm/kernel-binary.spec.in: Generate Module.supported with all
lines from supported conf, unsupported modules are marked as "no"
- rpm/split-modules: Use the supported flag in modules, instead of
parsing the Module.supported file and report modules that have no
supported marking.
- rpm/check-supported-list: Delete, this is done by split-modules
now.
- commit edfdc2a
-------------------------------------------------------------------
Wed Sep 21 13:20:35 CEST 2011 - trenn@suse.de

56
kernel-vanilla.spec
View File

@ -39,17 +39,17 @@
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT CONFIG_EFI_STUB
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE 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)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%ifarch %ix86 x86_64
%define install_vdso 1
@ -61,7 +61,7 @@ Name: kernel-vanilla
Summary: The Standard Kernel - without any SUSE patches
Version: 3.11.3
%if 0%{?is_kotd}
Release: <RELEASE>.g485f0d1
Release: <RELEASE>.gac1d7be
%else
Release: 0
%endif
@ -161,7 +161,6 @@ Source17: apply-patches
Source21: config.conf
Source23: supported.conf
Source33: check-for-config-changes
Source34: check-supported-list
Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
@ -316,16 +315,27 @@ fi
mkdir -p %kernel_build_dir
supported_conf() {
%_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
# Generate the list of modules to be marked as supported
{ supported_conf base
supported_conf --default=0 external | sed 's/$/ external/'
} > %kernel_build_dir/Module.supported
supported_conf --default=0 base >%kernel_build_dir/Module.base
# 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 / {
print $(NF) " external";
next;
}
/^[-+]/ {
print $(NF) " no";
next;
}
{
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
cd linux-%srcversion
@ -670,14 +680,6 @@ if [ %CONFIG_MODULES = y ]; then
make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
if ! %_sourcedir/check-supported-list \
%_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then
%if %supported_modules_check
exit 1
%endif
echo "Consistency check error: please update supported.conf."
fi
%ifarch s390 s390x
if test -e arch/s390/boot/kerntypes.o; then
:
@ -730,10 +732,12 @@ if [ %CONFIG_MODULES = y ]; then
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir/Module.base \
%if ! %supported_modules_check
-i \
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
-e \
%endif
%if ! %supported_modules_check
-i
%endif
-s %kernel_build_dir/Module.supported
%if ! %split_extra
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif

38
kernel-xen.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Fri Oct 4 13:04:43 CEST 2013 - mmarek@suse.cz
- rpm/split-modules: Check module support only if the -extra package is requested
- commit add86bf
-------------------------------------------------------------------
Fri Oct 4 13:02:48 CEST 2013 - mmarek@suse.cz
- rpm/split-modules: Remove unused options
- commit 3736315
-------------------------------------------------------------------
Fri Oct 4 12:57:44 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix creating the kernel-*-extra package
CONFIG_ENTERPRISE_SUPPORT has been renamed to CONFIG_SUSE_KERNEL_SUPPORTED
- commit 9e5b6fe
-------------------------------------------------------------------
Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz
@ -4959,6 +4978,25 @@ Mon Sep 26 10:01:25 CEST 2011 - jeffm@suse.com
- Update to 3.1-rc7.
- commit ee8cc90
-------------------------------------------------------------------
Thu Sep 22 11:18:31 CEST 2011 - mmarek@suse.cz
- rpm/split-modules: Print the full path for modules missing in supported.conf
- commit e55e4c6
-------------------------------------------------------------------
Wed Sep 21 16:33:53 CEST 2011 - mmarek@suse.cz
- Add support for wildcards in supported.conf
- rpm/kernel-binary.spec.in: Generate Module.supported with all
lines from supported conf, unsupported modules are marked as "no"
- rpm/split-modules: Use the supported flag in modules, instead of
parsing the Module.supported file and report modules that have no
supported marking.
- rpm/check-supported-list: Delete, this is done by split-modules
now.
- commit edfdc2a
-------------------------------------------------------------------
Wed Sep 21 13:20:35 CEST 2011 - trenn@suse.de

56
kernel-xen.spec
View File

@ -39,17 +39,17 @@
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT CONFIG_EFI_STUB
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE 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)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%ifarch %ix86 x86_64
%define install_vdso 1
@ -61,7 +61,7 @@ Name: kernel-xen
Summary: The Xen Kernel
Version: 3.11.3
%if 0%{?is_kotd}
Release: <RELEASE>.g485f0d1
Release: <RELEASE>.gac1d7be
%else
Release: 0
%endif
@ -164,7 +164,6 @@ Source17: apply-patches
Source21: config.conf
Source23: supported.conf
Source33: check-for-config-changes
Source34: check-supported-list
Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
@ -322,16 +321,27 @@ fi
mkdir -p %kernel_build_dir
supported_conf() {
%_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
# Generate the list of modules to be marked as supported
{ supported_conf base
supported_conf --default=0 external | sed 's/$/ external/'
} > %kernel_build_dir/Module.supported
supported_conf --default=0 base >%kernel_build_dir/Module.base
# 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 / {
print $(NF) " external";
next;
}
/^[-+]/ {
print $(NF) " no";
next;
}
{
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
cd linux-%srcversion
@ -676,14 +686,6 @@ if [ %CONFIG_MODULES = y ]; then
make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
if ! %_sourcedir/check-supported-list \
%_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then
%if %supported_modules_check
exit 1
%endif
echo "Consistency check error: please update supported.conf."
fi
%ifarch s390 s390x
if test -e arch/s390/boot/kerntypes.o; then
:
@ -736,10 +738,12 @@ if [ %CONFIG_MODULES = y ]; then
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir/Module.base \
%if ! %supported_modules_check
-i \
%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
-e \
%endif
%if ! %supported_modules_check
-i
%endif
-s %kernel_build_dir/Module.supported
%if ! %split_extra
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif

4
source-timestamp
View File

@ -1,3 +1,3 @@
2013-10-02 07:54:02 +0200
GIT Revision: 485f0d128ebc47c0d72393c99edb2b304f7cf487
2013-10-04 14:14:40 +0200
GIT Revision: ac1d7bee28a9b1ecbf2a9138685dfab7ad0c44f0
GIT Branch: openSUSE-13.1

45
split-modules
View File

@ -1,6 +1,6 @@
#!/bin/bash
#
# given a Module.supported, Module.base and modules.dep, generate list
# given a Module.base and modules.dep, generate list
# of base / supported / unsupported modules
set -e
@ -8,39 +8,41 @@ export LC_COLLATE=C
usage()
{
echo "Usage: ${0##*/} -b Module.base -s Module.supported [-d dir] [-i] [-o outdir]"
echo "Usage: ${0##*/} -b Module.base [-d dir] [-i] [-e] [-o outdir]"
echo " -i Ignore supported.conf errors"
echo " -e Create the -extra filelist (otherwise, treat all modules as supported)"
}
options=$(getopt -o b:s:d:o:i -- "$@")
options=$(getopt -o b:d:o:ie -- "$@")
if test $? -ne 0; then
usage >&2
exit 1
fi
eval set -- "$options"
opt_base=
opt_supp=
opt_out=.
opt_dir=.
opt_ignore_errors=false
opt_extra=false
while test $# -gt 0; do
opt=$1
shift
case "$opt" in
-b | -s | -d | -o | -D)
-b | -d | -o)
arg=$1
shift
esac
case "$opt" in
-b)
opt_base=$arg ;;
-s)
opt_supp=$arg ;;
-d)
opt_dir=$arg ;;
-o)
opt_out=$arg ;;
-i)
opt_ignore_errors=true ;;
-e)
opt_extra=true ;;
--)
break ;;
*)
@ -48,7 +50,7 @@ while test $# -gt 0; do
exit 1
esac
done
if test -z "$opt_base" -o -z "$opt_supp"; then
if test -z "$opt_base"; then
usage >&2
exit 1
fi
@ -61,6 +63,32 @@ find "$opt_dir" -type f -name '*.ko' -printf '/%P\n' | \
awk -F/ '{ n=$NF; gsub(/-/, "_", n); sub(/\.ko$/, "", n); print n " " $0; }' | \
sort >"$tmp/all"
err=false
while read mod path; do
if $opt_extra; then
support=$(/sbin/modinfo -F supported "$opt_dir/$path")
else
support=yes
fi
case "$support" in
yes | external)
echo "$mod"
;;
no)
;;
"")
echo "warning: ${path#/lib/modules/*/kernel/} not listed in supported.conf" >&2
;;
*)
echo "error: invalid support flag for $mod: $support" >&2
err=true
;;
esac
done <"$tmp/all" | sort -u >"$tmp/supp"
if $err; then
exit 1
fi
modules_dep=$(find "$opt_dir" -type f -name modules.dep)
if test -z "$modules_dep"; then
echo "Cannot find modules.dep in $opt_dir" >&2
@ -86,7 +114,6 @@ sed 'y/-/_/' <"$opt_base" | add_dependent_modules >"$tmp/base"
join -j 1 -o 2.2 "$tmp/base" "$tmp/all" >"$opt_out/base-modules"
# main
sed 's/ .*//; y/-/_/' "$opt_supp" | sort -u >"$tmp/supp"
add_dependent_modules "$tmp/supp-explain" <"$tmp/supp" >"$tmp/supp-all"
if ! cmp -s "$tmp/supp" "$tmp/supp-all"; then
echo "The following unsupported modules are used by supported modules:" >&2