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

commit ee3dc2b4ca7c838e2ef68be73c8b803d69b770d5

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-source?expand=0&rev=7800
This commit is contained in:
Michal Marek 2014-05-08 06:01:32 +00:00 committed by Git OBS Bridge
parent dff0ace028
commit 35008ac8e5
27 changed files with 754 additions and 372 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bdd441c9530cf4b02d9953a6aaad019f0d878bb4122b536ab17a3bf88741dcd9
size 176695
oid sha256:1ed6c64f7abf52e9210b192b5b5066e995969e7c0a1cb20d3a114b3419f82981
size 176774

98
kernel-binary.spec.in
View File

@ -406,41 +406,17 @@ cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
if test $1 == "--compressed"; then
compressed=true
fi
cp vmlinux %buildroot/$vmlinux
>%my_builddir/vmlinux.debug.files
%if 0%{?__debug_package:1}
if $compressed; then
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
mkdir -p %buildroot/usr/src/debug
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
else
# make vmlinux executable so that find-debuginfo.sh picks it up
# (TODO: fix find-debuginfo.sh instead)
# make sure that find-debuginfo.sh picks it up. In the filelist, we
# mark the file 0644 again
chmod +x %buildroot/$vmlinux
fi
%endif
if $compressed; then
gzip -n -9 %buildroot/$vmlinux
chmod a-x %buildroot/$vmlinux.gz
if test $1 == "--compressed"; then
gzip -n -k -9 %buildroot/$vmlinux
ghost_vmlinux=true
else
ghost_vmlinux=false
fi
}
@ -595,6 +571,8 @@ make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
# space in /boot.
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
# Also reserve some space for the kdump initrd
cp %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump}
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
@ -738,7 +716,7 @@ add_dirs_to_filelist() {
}
# Collect the file lists.
shopt -s nullglob
shopt -s nullglob dotglob
> %my_builddir/kernel-devel.files
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
@ -746,22 +724,39 @@ for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; d
done
{ cd %buildroot
find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
-type f -printf '/%%p\n'
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump'
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump
for f in boot/*; do
if test -L "$f"; then
echo "%%ghost /$f"
continue
elif test ! -f "$f"; then
continue
fi
case "$f" in
boot/initrd-*)
echo "%%ghost /$f"
continue
;;
boot/vmlinux-*.gz)
;;
boot/vmlinux-*)
if $ghost_vmlinux; then
echo "%%ghost /$f"
continue
fi
;;
boot/symtypes*)
continue
;;
esac
echo "%%attr(0644, root, root) /$f"
done
if [ %CONFIG_MODULES = y ]; then
find lib/modules/%kernelrelease-%build_flavor \
-type d -o \
\( -path '*/modules.*' ! -path '*/modules.order' \
! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \
-o -name '*.ko' -prune -o -printf '/%%p\n'
-o -name '*.ko' -prune -o -type f -printf '/%%p\n'
cat %my_builddir/base-modules
fi
if test %CONFIG_MODULE_SIG = "y"; then
@ -774,10 +769,7 @@ done
if [ -e .%_docdir/%name ]; then
echo "%%doc %_docdir/%name"
fi
} | sort -u >%my_builddir/tmp
cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
add_dirs_to_filelist >%my_builddir/kernel-base.files
rm %my_builddir/tmp
} | 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} \
@ -937,16 +929,4 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%endif
%endif
%package devel-debuginfo
# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
Summary: Debug information for package %name-devel
Group: Development/Debug
%description devel-debuginfo
Debug information for package %name-devel
%source_timestamp
%files devel-debuginfo -f vmlinux.debug.files
%changelog

50
kernel-debug.changes
View File

@ -1,3 +1,47 @@
-------------------------------------------------------------------
Wed May 7 15:45:30 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Package .vmlinuz-*.hmac as well
- commit 3375bd7
-------------------------------------------------------------------
Wed May 7 14:48:12 CEST 2014 - jdelvare@suse.de
- Update x86 config files: Disable unused CAN drivers
Disable platform, grcan and tscan1 CAN drivers. Disable ISA and EG20T
CAN drivers on x86_64. These are believed to be useless, and will
only be enabled upon explicit request.
- commit dab25a2
-------------------------------------------------------------------
Wed May 7 13:56:06 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Exclude /boot/symtypes* from the base/main package
Also, get rid of the comparison of the base and devel filelist.
- commit f1e303f
-------------------------------------------------------------------
Wed May 7 12:02:52 CEST 2014 - tiwai@suse.de
- ALSA: hda - Add dock pin setups for Thinkpad T440 (bnc#876699).
- commit efc8676
-------------------------------------------------------------------
Tue May 6 18:12:01 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix packaging of vmlinux debuginfo
(bnc#875946)
Add the uncompressed vmlinux image as ghost file to the main package, so
that the vmlinux debuginfo generated by rpm natively and put into the
right package.
- commit 26b7a64
-------------------------------------------------------------------
Tue May 6 17:29:41 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Simplify filelist for files in /boot
- commit ef040ff
-------------------------------------------------------------------
Mon May 5 13:42:10 CEST 2014 - mmarek@suse.cz
@ -62,6 +106,12 @@ Mon Apr 28 15:04:49 CEST 2014 - jeffm@suse.com
This fixes a build failure introduced in 3.15-rc1.
- commit 66cfb7b
-------------------------------------------------------------------
Mon Apr 28 13:12:23 CEST 2014 - mmarek@suse.cz
- rpm/kernel-obs-build.spec.in: Require only perl-Bootloader
- commit 573fc1b
-------------------------------------------------------------------
Mon Apr 28 10:43:14 CEST 2014 - mmarek@suse.cz

100
kernel-debug.spec
View File

@ -61,7 +61,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 3.15.rc3
%if 0%{?is_kotd}
Release: <RELEASE>.g403ada2
Release: <RELEASE>.gee3dc2b
%else
Release: 0
%endif
@ -532,41 +532,17 @@ cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
if test $1 == "--compressed"; then
compressed=true
fi
cp vmlinux %buildroot/$vmlinux
>%my_builddir/vmlinux.debug.files
%if 0%{?__debug_package:1}
if $compressed; then
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
mkdir -p %buildroot/usr/src/debug
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
else
# make vmlinux executable so that find-debuginfo.sh picks it up
# (TODO: fix find-debuginfo.sh instead)
# make sure that find-debuginfo.sh picks it up. In the filelist, we
# mark the file 0644 again
chmod +x %buildroot/$vmlinux
fi
%endif
if $compressed; then
gzip -n -9 %buildroot/$vmlinux
chmod a-x %buildroot/$vmlinux.gz
if test $1 == "--compressed"; then
gzip -n -k -9 %buildroot/$vmlinux
ghost_vmlinux=true
else
ghost_vmlinux=false
fi
}
@ -721,6 +697,8 @@ make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
# space in /boot.
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
# Also reserve some space for the kdump initrd
cp %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump}
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
@ -864,7 +842,7 @@ add_dirs_to_filelist() {
}
# Collect the file lists.
shopt -s nullglob
shopt -s nullglob dotglob
> %my_builddir/kernel-devel.files
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
@ -872,22 +850,39 @@ for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; d
done
{ cd %buildroot
find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
-type f -printf '/%%p\n'
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump'
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump
for f in boot/*; do
if test -L "$f"; then
echo "%%ghost /$f"
continue
elif test ! -f "$f"; then
continue
fi
case "$f" in
boot/initrd-*)
echo "%%ghost /$f"
continue
;;
boot/vmlinux-*.gz)
;;
boot/vmlinux-*)
if $ghost_vmlinux; then
echo "%%ghost /$f"
continue
fi
;;
boot/symtypes*)
continue
;;
esac
echo "%%attr(0644, root, root) /$f"
done
if [ %CONFIG_MODULES = y ]; then
find lib/modules/%kernelrelease-%build_flavor \
-type d -o \
\( -path '*/modules.*' ! -path '*/modules.order' \
! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \
-o -name '*.ko' -prune -o -printf '/%%p\n'
-o -name '*.ko' -prune -o -type f -printf '/%%p\n'
cat %my_builddir/base-modules
fi
if test %CONFIG_MODULE_SIG = "y"; then
@ -900,10 +895,7 @@ done
if [ -e .%_docdir/%name ]; then
echo "%%doc %_docdir/%name"
fi
} | sort -u >%my_builddir/tmp
cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
add_dirs_to_filelist >%my_builddir/kernel-base.files
rm %my_builddir/tmp
} | 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} \
@ -1065,16 +1057,4 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%endif
%endif
%package devel-debuginfo
# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
Summary: Debug information for package %name-devel
Group: Development/Debug
%description devel-debuginfo
Debug information for package %name-devel
%source_timestamp
%files devel-debuginfo -f vmlinux.debug.files
%changelog

50
kernel-default.changes
View File

@ -1,3 +1,47 @@
-------------------------------------------------------------------
Wed May 7 15:45:30 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Package .vmlinuz-*.hmac as well
- commit 3375bd7
-------------------------------------------------------------------
Wed May 7 14:48:12 CEST 2014 - jdelvare@suse.de
- Update x86 config files: Disable unused CAN drivers
Disable platform, grcan and tscan1 CAN drivers. Disable ISA and EG20T
CAN drivers on x86_64. These are believed to be useless, and will
only be enabled upon explicit request.
- commit dab25a2
-------------------------------------------------------------------
Wed May 7 13:56:06 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Exclude /boot/symtypes* from the base/main package
Also, get rid of the comparison of the base and devel filelist.
- commit f1e303f
-------------------------------------------------------------------
Wed May 7 12:02:52 CEST 2014 - tiwai@suse.de
- ALSA: hda - Add dock pin setups for Thinkpad T440 (bnc#876699).
- commit efc8676
-------------------------------------------------------------------
Tue May 6 18:12:01 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix packaging of vmlinux debuginfo
(bnc#875946)
Add the uncompressed vmlinux image as ghost file to the main package, so
that the vmlinux debuginfo generated by rpm natively and put into the
right package.
- commit 26b7a64
-------------------------------------------------------------------
Tue May 6 17:29:41 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Simplify filelist for files in /boot
- commit ef040ff
-------------------------------------------------------------------
Mon May 5 13:42:10 CEST 2014 - mmarek@suse.cz
@ -62,6 +106,12 @@ Mon Apr 28 15:04:49 CEST 2014 - jeffm@suse.com
This fixes a build failure introduced in 3.15-rc1.
- commit 66cfb7b
-------------------------------------------------------------------
Mon Apr 28 13:12:23 CEST 2014 - mmarek@suse.cz
- rpm/kernel-obs-build.spec.in: Require only perl-Bootloader
- commit 573fc1b
-------------------------------------------------------------------
Mon Apr 28 10:43:14 CEST 2014 - mmarek@suse.cz

100
kernel-default.spec
View File

@ -61,7 +61,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 3.15.rc3
%if 0%{?is_kotd}
Release: <RELEASE>.g403ada2
Release: <RELEASE>.gee3dc2b
%else
Release: 0
%endif
@ -539,41 +539,17 @@ cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
if test $1 == "--compressed"; then
compressed=true
fi
cp vmlinux %buildroot/$vmlinux
>%my_builddir/vmlinux.debug.files
%if 0%{?__debug_package:1}
if $compressed; then
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
mkdir -p %buildroot/usr/src/debug
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
else
# make vmlinux executable so that find-debuginfo.sh picks it up
# (TODO: fix find-debuginfo.sh instead)
# make sure that find-debuginfo.sh picks it up. In the filelist, we
# mark the file 0644 again
chmod +x %buildroot/$vmlinux
fi
%endif
if $compressed; then
gzip -n -9 %buildroot/$vmlinux
chmod a-x %buildroot/$vmlinux.gz
if test $1 == "--compressed"; then
gzip -n -k -9 %buildroot/$vmlinux
ghost_vmlinux=true
else
ghost_vmlinux=false
fi
}
@ -728,6 +704,8 @@ make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
# space in /boot.
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
# Also reserve some space for the kdump initrd
cp %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump}
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
@ -871,7 +849,7 @@ add_dirs_to_filelist() {
}
# Collect the file lists.
shopt -s nullglob
shopt -s nullglob dotglob
> %my_builddir/kernel-devel.files
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
@ -879,22 +857,39 @@ for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; d
done
{ cd %buildroot
find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
-type f -printf '/%%p\n'
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump'
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump
for f in boot/*; do
if test -L "$f"; then
echo "%%ghost /$f"
continue
elif test ! -f "$f"; then
continue
fi
case "$f" in
boot/initrd-*)
echo "%%ghost /$f"
continue
;;
boot/vmlinux-*.gz)
;;
boot/vmlinux-*)
if $ghost_vmlinux; then
echo "%%ghost /$f"
continue
fi
;;
boot/symtypes*)
continue
;;
esac
echo "%%attr(0644, root, root) /$f"
done
if [ %CONFIG_MODULES = y ]; then
find lib/modules/%kernelrelease-%build_flavor \
-type d -o \
\( -path '*/modules.*' ! -path '*/modules.order' \
! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \
-o -name '*.ko' -prune -o -printf '/%%p\n'
-o -name '*.ko' -prune -o -type f -printf '/%%p\n'
cat %my_builddir/base-modules
fi
if test %CONFIG_MODULE_SIG = "y"; then
@ -907,10 +902,7 @@ done
if [ -e .%_docdir/%name ]; then
echo "%%doc %_docdir/%name"
fi
} | sort -u >%my_builddir/tmp
cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
add_dirs_to_filelist >%my_builddir/kernel-base.files
rm %my_builddir/tmp
} | 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} \
@ -1070,16 +1062,4 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%endif
%endif
%package devel-debuginfo
# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
Summary: Debug information for package %name-devel
Group: Development/Debug
%description devel-debuginfo
Debug information for package %name-devel
%source_timestamp
%files devel-debuginfo -f vmlinux.debug.files
%changelog

50
kernel-desktop.changes
View File

@ -1,3 +1,47 @@
-------------------------------------------------------------------
Wed May 7 15:45:30 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Package .vmlinuz-*.hmac as well
- commit 3375bd7
-------------------------------------------------------------------
Wed May 7 14:48:12 CEST 2014 - jdelvare@suse.de
- Update x86 config files: Disable unused CAN drivers
Disable platform, grcan and tscan1 CAN drivers. Disable ISA and EG20T
CAN drivers on x86_64. These are believed to be useless, and will
only be enabled upon explicit request.
- commit dab25a2
-------------------------------------------------------------------
Wed May 7 13:56:06 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Exclude /boot/symtypes* from the base/main package
Also, get rid of the comparison of the base and devel filelist.
- commit f1e303f
-------------------------------------------------------------------
Wed May 7 12:02:52 CEST 2014 - tiwai@suse.de
- ALSA: hda - Add dock pin setups for Thinkpad T440 (bnc#876699).
- commit efc8676
-------------------------------------------------------------------
Tue May 6 18:12:01 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix packaging of vmlinux debuginfo
(bnc#875946)
Add the uncompressed vmlinux image as ghost file to the main package, so
that the vmlinux debuginfo generated by rpm natively and put into the
right package.
- commit 26b7a64
-------------------------------------------------------------------
Tue May 6 17:29:41 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Simplify filelist for files in /boot
- commit ef040ff
-------------------------------------------------------------------
Mon May 5 13:42:10 CEST 2014 - mmarek@suse.cz
@ -62,6 +106,12 @@ Mon Apr 28 15:04:49 CEST 2014 - jeffm@suse.com
This fixes a build failure introduced in 3.15-rc1.
- commit 66cfb7b
-------------------------------------------------------------------
Mon Apr 28 13:12:23 CEST 2014 - mmarek@suse.cz
- rpm/kernel-obs-build.spec.in: Require only perl-Bootloader
- commit 573fc1b
-------------------------------------------------------------------
Mon Apr 28 10:43:14 CEST 2014 - mmarek@suse.cz

100
kernel-desktop.spec
View File

@ -61,7 +61,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 3.15.rc3
%if 0%{?is_kotd}
Release: <RELEASE>.g403ada2
Release: <RELEASE>.gee3dc2b
%else
Release: 0
%endif
@ -541,41 +541,17 @@ cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
if test $1 == "--compressed"; then
compressed=true
fi
cp vmlinux %buildroot/$vmlinux
>%my_builddir/vmlinux.debug.files
%if 0%{?__debug_package:1}
if $compressed; then
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
mkdir -p %buildroot/usr/src/debug
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
else
# make vmlinux executable so that find-debuginfo.sh picks it up
# (TODO: fix find-debuginfo.sh instead)
# make sure that find-debuginfo.sh picks it up. In the filelist, we
# mark the file 0644 again
chmod +x %buildroot/$vmlinux
fi
%endif
if $compressed; then
gzip -n -9 %buildroot/$vmlinux
chmod a-x %buildroot/$vmlinux.gz
if test $1 == "--compressed"; then
gzip -n -k -9 %buildroot/$vmlinux
ghost_vmlinux=true
else
ghost_vmlinux=false
fi
}
@ -730,6 +706,8 @@ make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
# space in /boot.
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
# Also reserve some space for the kdump initrd
cp %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump}
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
@ -873,7 +851,7 @@ add_dirs_to_filelist() {
}
# Collect the file lists.
shopt -s nullglob
shopt -s nullglob dotglob
> %my_builddir/kernel-devel.files
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
@ -881,22 +859,39 @@ for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; d
done
{ cd %buildroot
find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
-type f -printf '/%%p\n'
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump'
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump
for f in boot/*; do
if test -L "$f"; then
echo "%%ghost /$f"
continue
elif test ! -f "$f"; then
continue
fi
case "$f" in
boot/initrd-*)
echo "%%ghost /$f"
continue
;;
boot/vmlinux-*.gz)
;;
boot/vmlinux-*)
if $ghost_vmlinux; then
echo "%%ghost /$f"
continue
fi
;;
boot/symtypes*)
continue
;;
esac
echo "%%attr(0644, root, root) /$f"
done
if [ %CONFIG_MODULES = y ]; then
find lib/modules/%kernelrelease-%build_flavor \
-type d -o \
\( -path '*/modules.*' ! -path '*/modules.order' \
! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \
-o -name '*.ko' -prune -o -printf '/%%p\n'
-o -name '*.ko' -prune -o -type f -printf '/%%p\n'
cat %my_builddir/base-modules
fi
if test %CONFIG_MODULE_SIG = "y"; then
@ -909,10 +904,7 @@ done
if [ -e .%_docdir/%name ]; then
echo "%%doc %_docdir/%name"
fi
} | sort -u >%my_builddir/tmp
cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
add_dirs_to_filelist >%my_builddir/kernel-base.files
rm %my_builddir/tmp
} | 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} \
@ -1098,16 +1090,4 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%endif
%endif
%package devel-debuginfo
# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
Summary: Debug information for package %name-devel
Group: Development/Debug
%description devel-debuginfo
Debug information for package %name-devel
%source_timestamp
%files devel-debuginfo -f vmlinux.debug.files
%changelog

50
kernel-docs.changes
View File

@ -1,3 +1,47 @@
-------------------------------------------------------------------
Wed May 7 15:45:30 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Package .vmlinuz-*.hmac as well
- commit 3375bd7
-------------------------------------------------------------------
Wed May 7 14:48:12 CEST 2014 - jdelvare@suse.de
- Update x86 config files: Disable unused CAN drivers
Disable platform, grcan and tscan1 CAN drivers. Disable ISA and EG20T
CAN drivers on x86_64. These are believed to be useless, and will
only be enabled upon explicit request.
- commit dab25a2
-------------------------------------------------------------------
Wed May 7 13:56:06 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Exclude /boot/symtypes* from the base/main package
Also, get rid of the comparison of the base and devel filelist.
- commit f1e303f
-------------------------------------------------------------------
Wed May 7 12:02:52 CEST 2014 - tiwai@suse.de
- ALSA: hda - Add dock pin setups for Thinkpad T440 (bnc#876699).
- commit efc8676
-------------------------------------------------------------------
Tue May 6 18:12:01 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix packaging of vmlinux debuginfo
(bnc#875946)
Add the uncompressed vmlinux image as ghost file to the main package, so
that the vmlinux debuginfo generated by rpm natively and put into the
right package.
- commit 26b7a64
-------------------------------------------------------------------
Tue May 6 17:29:41 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Simplify filelist for files in /boot
- commit ef040ff
-------------------------------------------------------------------
Mon May 5 13:42:10 CEST 2014 - mmarek@suse.cz
@ -62,6 +106,12 @@ Mon Apr 28 15:04:49 CEST 2014 - jeffm@suse.com
This fixes a build failure introduced in 3.15-rc1.
- commit 66cfb7b
-------------------------------------------------------------------
Mon Apr 28 13:12:23 CEST 2014 - mmarek@suse.cz
- rpm/kernel-obs-build.spec.in: Require only perl-Bootloader
- commit 573fc1b
-------------------------------------------------------------------
Mon Apr 28 10:43:14 CEST 2014 - mmarek@suse.cz

2
kernel-docs.spec
View File

@ -27,7 +27,7 @@ License: GPL-2.0
Group: Documentation/Man
Version: 3.15.rc3
%if 0%{?is_kotd}
Release: <RELEASE>.g403ada2
Release: <RELEASE>.gee3dc2b
%else
Release: 0
%endif

50
kernel-obs-build.changes
View File

@ -1,3 +1,47 @@
-------------------------------------------------------------------
Wed May 7 15:45:30 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Package .vmlinuz-*.hmac as well
- commit 3375bd7
-------------------------------------------------------------------
Wed May 7 14:48:12 CEST 2014 - jdelvare@suse.de
- Update x86 config files: Disable unused CAN drivers
Disable platform, grcan and tscan1 CAN drivers. Disable ISA and EG20T
CAN drivers on x86_64. These are believed to be useless, and will
only be enabled upon explicit request.
- commit dab25a2
-------------------------------------------------------------------
Wed May 7 13:56:06 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Exclude /boot/symtypes* from the base/main package
Also, get rid of the comparison of the base and devel filelist.
- commit f1e303f
-------------------------------------------------------------------
Wed May 7 12:02:52 CEST 2014 - tiwai@suse.de
- ALSA: hda - Add dock pin setups for Thinkpad T440 (bnc#876699).
- commit efc8676
-------------------------------------------------------------------
Tue May 6 18:12:01 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix packaging of vmlinux debuginfo
(bnc#875946)
Add the uncompressed vmlinux image as ghost file to the main package, so
that the vmlinux debuginfo generated by rpm natively and put into the
right package.
- commit 26b7a64
-------------------------------------------------------------------
Tue May 6 17:29:41 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Simplify filelist for files in /boot
- commit ef040ff
-------------------------------------------------------------------
Mon May 5 13:42:10 CEST 2014 - mmarek@suse.cz
@ -62,6 +106,12 @@ Mon Apr 28 15:04:49 CEST 2014 - jeffm@suse.com
This fixes a build failure introduced in 3.15-rc1.
- commit 66cfb7b
-------------------------------------------------------------------
Mon Apr 28 13:12:23 CEST 2014 - mmarek@suse.cz
- rpm/kernel-obs-build.spec.in: Require only perl-Bootloader
- commit 573fc1b
-------------------------------------------------------------------
Mon Apr 28 10:43:14 CEST 2014 - mmarek@suse.cz

4
kernel-obs-build.spec
View File

@ -36,8 +36,8 @@ BuildRequires: kernel-xen
ExclusiveArch: %ix86 ppc ppc64 ppc64le s390x x86_64
%if 0%{?suse_version} < 1320
# For SLE 11
BuildRequires: yast2-bootloader
BuildRequires: mkinitrd
BuildRequires: perl-Bootloader
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%else
BuildRequires: dracut
@ -47,7 +47,7 @@ License: GPL-2.0
Group: SLES
Version: 3.15.rc3
%if 0%{?is_kotd}
Release: <RELEASE>.g403ada2
Release: <RELEASE>.gee3dc2b
%else
Release: 0
%endif

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

@ -36,8 +36,8 @@ BuildRequires: kernel-xen
ExclusiveArch: @ARCHS@
%if 0%{?suse_version} < 1320
# For SLE 11
BuildRequires: yast2-bootloader
BuildRequires: mkinitrd
BuildRequires: perl-Bootloader
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%else
BuildRequires: dracut

50
kernel-obs-qa.changes
View File

@ -1,3 +1,47 @@
-------------------------------------------------------------------
Wed May 7 15:45:30 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Package .vmlinuz-*.hmac as well
- commit 3375bd7
-------------------------------------------------------------------
Wed May 7 14:48:12 CEST 2014 - jdelvare@suse.de
- Update x86 config files: Disable unused CAN drivers
Disable platform, grcan and tscan1 CAN drivers. Disable ISA and EG20T
CAN drivers on x86_64. These are believed to be useless, and will
only be enabled upon explicit request.
- commit dab25a2
-------------------------------------------------------------------
Wed May 7 13:56:06 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Exclude /boot/symtypes* from the base/main package
Also, get rid of the comparison of the base and devel filelist.
- commit f1e303f
-------------------------------------------------------------------
Wed May 7 12:02:52 CEST 2014 - tiwai@suse.de
- ALSA: hda - Add dock pin setups for Thinkpad T440 (bnc#876699).
- commit efc8676
-------------------------------------------------------------------
Tue May 6 18:12:01 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix packaging of vmlinux debuginfo
(bnc#875946)
Add the uncompressed vmlinux image as ghost file to the main package, so
that the vmlinux debuginfo generated by rpm natively and put into the
right package.
- commit 26b7a64
-------------------------------------------------------------------
Tue May 6 17:29:41 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Simplify filelist for files in /boot
- commit ef040ff
-------------------------------------------------------------------
Mon May 5 13:42:10 CEST 2014 - mmarek@suse.cz
@ -62,6 +106,12 @@ Mon Apr 28 15:04:49 CEST 2014 - jeffm@suse.com
This fixes a build failure introduced in 3.15-rc1.
- commit 66cfb7b
-------------------------------------------------------------------
Mon Apr 28 13:12:23 CEST 2014 - mmarek@suse.cz
- rpm/kernel-obs-build.spec.in: Require only perl-Bootloader
- commit 573fc1b
-------------------------------------------------------------------
Mon Apr 28 10:43:14 CEST 2014 - mmarek@suse.cz

2
kernel-obs-qa.spec
View File

@ -38,7 +38,7 @@ License: GPL-2.0
Group: SLES
Version: 3.15.rc3
%if 0%{?is_kotd}
Release: <RELEASE>.g403ada2
Release: <RELEASE>.gee3dc2b
%else
Release: 0
%endif

50
kernel-pae.changes
View File

@ -1,3 +1,47 @@
-------------------------------------------------------------------
Wed May 7 15:45:30 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Package .vmlinuz-*.hmac as well
- commit 3375bd7
-------------------------------------------------------------------
Wed May 7 14:48:12 CEST 2014 - jdelvare@suse.de
- Update x86 config files: Disable unused CAN drivers
Disable platform, grcan and tscan1 CAN drivers. Disable ISA and EG20T
CAN drivers on x86_64. These are believed to be useless, and will
only be enabled upon explicit request.
- commit dab25a2
-------------------------------------------------------------------
Wed May 7 13:56:06 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Exclude /boot/symtypes* from the base/main package
Also, get rid of the comparison of the base and devel filelist.
- commit f1e303f
-------------------------------------------------------------------
Wed May 7 12:02:52 CEST 2014 - tiwai@suse.de
- ALSA: hda - Add dock pin setups for Thinkpad T440 (bnc#876699).
- commit efc8676
-------------------------------------------------------------------
Tue May 6 18:12:01 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix packaging of vmlinux debuginfo
(bnc#875946)
Add the uncompressed vmlinux image as ghost file to the main package, so
that the vmlinux debuginfo generated by rpm natively and put into the
right package.
- commit 26b7a64
-------------------------------------------------------------------
Tue May 6 17:29:41 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Simplify filelist for files in /boot
- commit ef040ff
-------------------------------------------------------------------
Mon May 5 13:42:10 CEST 2014 - mmarek@suse.cz
@ -62,6 +106,12 @@ Mon Apr 28 15:04:49 CEST 2014 - jeffm@suse.com
This fixes a build failure introduced in 3.15-rc1.
- commit 66cfb7b
-------------------------------------------------------------------
Mon Apr 28 13:12:23 CEST 2014 - mmarek@suse.cz
- rpm/kernel-obs-build.spec.in: Require only perl-Bootloader
- commit 573fc1b
-------------------------------------------------------------------
Mon Apr 28 10:43:14 CEST 2014 - mmarek@suse.cz

100
kernel-pae.spec
View File

@ -61,7 +61,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 3.15.rc3
%if 0%{?is_kotd}
Release: <RELEASE>.g403ada2
Release: <RELEASE>.gee3dc2b
%else
Release: 0
%endif
@ -540,41 +540,17 @@ cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
if test $1 == "--compressed"; then
compressed=true
fi
cp vmlinux %buildroot/$vmlinux
>%my_builddir/vmlinux.debug.files
%if 0%{?__debug_package:1}
if $compressed; then
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
mkdir -p %buildroot/usr/src/debug
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
else
# make vmlinux executable so that find-debuginfo.sh picks it up
# (TODO: fix find-debuginfo.sh instead)
# make sure that find-debuginfo.sh picks it up. In the filelist, we
# mark the file 0644 again
chmod +x %buildroot/$vmlinux
fi
%endif
if $compressed; then
gzip -n -9 %buildroot/$vmlinux
chmod a-x %buildroot/$vmlinux.gz
if test $1 == "--compressed"; then
gzip -n -k -9 %buildroot/$vmlinux
ghost_vmlinux=true
else
ghost_vmlinux=false
fi
}
@ -729,6 +705,8 @@ make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
# space in /boot.
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
# Also reserve some space for the kdump initrd
cp %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump}
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
@ -872,7 +850,7 @@ add_dirs_to_filelist() {
}
# Collect the file lists.
shopt -s nullglob
shopt -s nullglob dotglob
> %my_builddir/kernel-devel.files
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
@ -880,22 +858,39 @@ for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; d
done
{ cd %buildroot
find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
-type f -printf '/%%p\n'
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump'
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump
for f in boot/*; do
if test -L "$f"; then
echo "%%ghost /$f"
continue
elif test ! -f "$f"; then
continue
fi
case "$f" in
boot/initrd-*)
echo "%%ghost /$f"
continue
;;
boot/vmlinux-*.gz)
;;
boot/vmlinux-*)
if $ghost_vmlinux; then
echo "%%ghost /$f"
continue
fi
;;
boot/symtypes*)
continue
;;
esac
echo "%%attr(0644, root, root) /$f"
done
if [ %CONFIG_MODULES = y ]; then
find lib/modules/%kernelrelease-%build_flavor \
-type d -o \
\( -path '*/modules.*' ! -path '*/modules.order' \
! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \
-o -name '*.ko' -prune -o -printf '/%%p\n'
-o -name '*.ko' -prune -o -type f -printf '/%%p\n'
cat %my_builddir/base-modules
fi
if test %CONFIG_MODULE_SIG = "y"; then
@ -908,10 +903,7 @@ done
if [ -e .%_docdir/%name ]; then
echo "%%doc %_docdir/%name"
fi
} | sort -u >%my_builddir/tmp
cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
add_dirs_to_filelist >%my_builddir/kernel-base.files
rm %my_builddir/tmp
} | 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} \
@ -1088,16 +1080,4 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%endif
%endif
%package devel-debuginfo
# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
Summary: Debug information for package %name-devel
Group: Development/Debug
%description devel-debuginfo
Debug information for package %name-devel
%source_timestamp
%files devel-debuginfo -f vmlinux.debug.files
%changelog

50
kernel-source.changes
View File

@ -1,3 +1,47 @@
-------------------------------------------------------------------
Wed May 7 15:45:30 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Package .vmlinuz-*.hmac as well
- commit 3375bd7
-------------------------------------------------------------------
Wed May 7 14:48:12 CEST 2014 - jdelvare@suse.de
- Update x86 config files: Disable unused CAN drivers
Disable platform, grcan and tscan1 CAN drivers. Disable ISA and EG20T
CAN drivers on x86_64. These are believed to be useless, and will
only be enabled upon explicit request.
- commit dab25a2
-------------------------------------------------------------------
Wed May 7 13:56:06 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Exclude /boot/symtypes* from the base/main package
Also, get rid of the comparison of the base and devel filelist.
- commit f1e303f
-------------------------------------------------------------------
Wed May 7 12:02:52 CEST 2014 - tiwai@suse.de
- ALSA: hda - Add dock pin setups for Thinkpad T440 (bnc#876699).
- commit efc8676
-------------------------------------------------------------------
Tue May 6 18:12:01 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix packaging of vmlinux debuginfo
(bnc#875946)
Add the uncompressed vmlinux image as ghost file to the main package, so
that the vmlinux debuginfo generated by rpm natively and put into the
right package.
- commit 26b7a64
-------------------------------------------------------------------
Tue May 6 17:29:41 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Simplify filelist for files in /boot
- commit ef040ff
-------------------------------------------------------------------
Mon May 5 13:42:10 CEST 2014 - mmarek@suse.cz
@ -62,6 +106,12 @@ Mon Apr 28 15:04:49 CEST 2014 - jeffm@suse.com
This fixes a build failure introduced in 3.15-rc1.
- commit 66cfb7b
-------------------------------------------------------------------
Mon Apr 28 13:12:23 CEST 2014 - mmarek@suse.cz
- rpm/kernel-obs-build.spec.in: Require only perl-Bootloader
- commit 573fc1b
-------------------------------------------------------------------
Mon Apr 28 10:43:14 CEST 2014 - mmarek@suse.cz

2
kernel-source.spec
View File

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

50
kernel-syms.changes
View File

@ -1,3 +1,47 @@
-------------------------------------------------------------------
Wed May 7 15:45:30 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Package .vmlinuz-*.hmac as well
- commit 3375bd7
-------------------------------------------------------------------
Wed May 7 14:48:12 CEST 2014 - jdelvare@suse.de
- Update x86 config files: Disable unused CAN drivers
Disable platform, grcan and tscan1 CAN drivers. Disable ISA and EG20T
CAN drivers on x86_64. These are believed to be useless, and will
only be enabled upon explicit request.
- commit dab25a2
-------------------------------------------------------------------
Wed May 7 13:56:06 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Exclude /boot/symtypes* from the base/main package
Also, get rid of the comparison of the base and devel filelist.
- commit f1e303f
-------------------------------------------------------------------
Wed May 7 12:02:52 CEST 2014 - tiwai@suse.de
- ALSA: hda - Add dock pin setups for Thinkpad T440 (bnc#876699).
- commit efc8676
-------------------------------------------------------------------
Tue May 6 18:12:01 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix packaging of vmlinux debuginfo
(bnc#875946)
Add the uncompressed vmlinux image as ghost file to the main package, so
that the vmlinux debuginfo generated by rpm natively and put into the
right package.
- commit 26b7a64
-------------------------------------------------------------------
Tue May 6 17:29:41 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Simplify filelist for files in /boot
- commit ef040ff
-------------------------------------------------------------------
Mon May 5 13:42:10 CEST 2014 - mmarek@suse.cz
@ -62,6 +106,12 @@ Mon Apr 28 15:04:49 CEST 2014 - jeffm@suse.com
This fixes a build failure introduced in 3.15-rc1.
- commit 66cfb7b
-------------------------------------------------------------------
Mon Apr 28 13:12:23 CEST 2014 - mmarek@suse.cz
- rpm/kernel-obs-build.spec.in: Require only perl-Bootloader
- commit 573fc1b
-------------------------------------------------------------------
Mon Apr 28 10:43:14 CEST 2014 - mmarek@suse.cz

2
kernel-syms.spec
View File

@ -27,7 +27,7 @@ Group: Development/Sources
Version: 3.15.rc3
%if %using_buildservice
%if 0%{?is_kotd}
Release: <RELEASE>.g403ada2
Release: <RELEASE>.gee3dc2b
%else
Release: 0
%endif

50
kernel-vanilla.changes
View File

@ -1,3 +1,47 @@
-------------------------------------------------------------------
Wed May 7 15:45:30 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Package .vmlinuz-*.hmac as well
- commit 3375bd7
-------------------------------------------------------------------
Wed May 7 14:48:12 CEST 2014 - jdelvare@suse.de
- Update x86 config files: Disable unused CAN drivers
Disable platform, grcan and tscan1 CAN drivers. Disable ISA and EG20T
CAN drivers on x86_64. These are believed to be useless, and will
only be enabled upon explicit request.
- commit dab25a2
-------------------------------------------------------------------
Wed May 7 13:56:06 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Exclude /boot/symtypes* from the base/main package
Also, get rid of the comparison of the base and devel filelist.
- commit f1e303f
-------------------------------------------------------------------
Wed May 7 12:02:52 CEST 2014 - tiwai@suse.de
- ALSA: hda - Add dock pin setups for Thinkpad T440 (bnc#876699).
- commit efc8676
-------------------------------------------------------------------
Tue May 6 18:12:01 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Fix packaging of vmlinux debuginfo
(bnc#875946)
Add the uncompressed vmlinux image as ghost file to the main package, so
that the vmlinux debuginfo generated by rpm natively and put into the
right package.
- commit 26b7a64
-------------------------------------------------------------------
Tue May 6 17:29:41 CEST 2014 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Simplify filelist for files in /boot
- commit ef040ff
-------------------------------------------------------------------
Mon May 5 13:42:10 CEST 2014 - mmarek@suse.cz
@ -62,6 +106,12 @@ Mon Apr 28 15:04:49 CEST 2014 - jeffm@suse.com
This fixes a build failure introduced in 3.15-rc1.
- commit 66cfb7b
-------------------------------------------------------------------
Mon Apr 28 13:12:23 CEST 2014 - mmarek@suse.cz
- rpm/kernel-obs-build.spec.in: Require only perl-Bootloader
- commit 573fc1b
-------------------------------------------------------------------
Mon Apr 28 10:43:14 CEST 2014 - mmarek@suse.cz

100
kernel-vanilla.spec
View File

@ -61,7 +61,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 3.15.rc3
%if 0%{?is_kotd}
Release: <RELEASE>.g403ada2
Release: <RELEASE>.gee3dc2b
%else
Release: 0
%endif
@ -528,41 +528,17 @@ cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
if test $1 == "--compressed"; then
compressed=true
fi
cp vmlinux %buildroot/$vmlinux
>%my_builddir/vmlinux.debug.files
%if 0%{?__debug_package:1}
if $compressed; then
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
# FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
mkdir -p %buildroot/usr/src/debug
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
else
# make vmlinux executable so that find-debuginfo.sh picks it up
# (TODO: fix find-debuginfo.sh instead)
# make sure that find-debuginfo.sh picks it up. In the filelist, we
# mark the file 0644 again
chmod +x %buildroot/$vmlinux
fi
%endif
if $compressed; then
gzip -n -9 %buildroot/$vmlinux
chmod a-x %buildroot/$vmlinux.gz
if test $1 == "--compressed"; then
gzip -n -k -9 %buildroot/$vmlinux
ghost_vmlinux=true
else
ghost_vmlinux=false
fi
}
@ -717,6 +693,8 @@ make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
# space in /boot.
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
# Also reserve some space for the kdump initrd
cp %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump}
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
@ -860,7 +838,7 @@ add_dirs_to_filelist() {
}
# Collect the file lists.
shopt -s nullglob
shopt -s nullglob dotglob
> %my_builddir/kernel-devel.files
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
@ -868,22 +846,39 @@ for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; d
done
{ cd %buildroot
find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
-type f -printf '/%%p\n'
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump'
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump
for f in boot/*; do
if test -L "$f"; then
echo "%%ghost /$f"
continue
elif test ! -f "$f"; then
continue
fi
case "$f" in
boot/initrd-*)
echo "%%ghost /$f"
continue
;;
boot/vmlinux-*.gz)
;;
boot/vmlinux-*)
if $ghost_vmlinux; then
echo "%%ghost /$f"
continue
fi
;;
boot/symtypes*)
continue
;;
esac
echo "%%attr(0644, root, root) /$f"
done
if [ %CONFIG_MODULES = y ]; then
find lib/modules/%kernelrelease-%build_flavor \
-type d -o \
\( -path '*/modules.*' ! -path '*/modules.order' \
! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \
-o -name '*.ko' -prune -o -printf '/%%p\n'
-o -name '*.ko' -prune -o -type f -printf '/%%p\n'
cat %my_builddir/base-modules
fi
if test %CONFIG_MODULE_SIG = "y"; then
@ -896,10 +891,7 @@ done
if [ -e .%_docdir/%name ]; then
echo "%%doc %_docdir/%name"
fi
} | sort -u >%my_builddir/tmp
cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
add_dirs_to_filelist >%my_builddir/kernel-base.files
rm %my_builddir/tmp
} | 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} \
@ -1059,16 +1051,4 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%endif
%endif
%package devel-debuginfo
# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
Summary: Debug information for package %name-devel
Group: Development/Debug
%description devel-debuginfo
Debug information for package %name-devel
%source_timestamp
%files devel-debuginfo -f vmlinux.debug.files
%changelog

4
patches.drivers.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:64f02618264275483687b983d58a98e69eff25ce8a416a9420d12116f0ce552d
size 3132
oid sha256:fcb9b18dad7315fa64ef5d5decce766cbf62c3ab2badbf62956d624f9856b416
size 4148

1
series.conf
View File

@ -412,6 +412,7 @@
##########################################################
# Sound
##########################################################
patches.drivers/ALSA-hda-Add-dock-pin-setups-for-Thinkpad-T440
########################################################
# Char / serial

1
series.confe
View File

@ -412,6 +412,7 @@
##########################################################
# Sound
##########################################################
patches.drivers/ALSA-hda-Add-dock-pin-setups-for-Thinkpad-T440
########################################################
# Char / serial

4
source-timestamp
View File

@ -1,3 +1,3 @@
2014-05-05 13:42:10 +0200
GIT Revision: 403ada2f3a12e818fd63b9011bb9c72cf9405be0
2014-05-07 15:50:44 +0200
GIT Revision: ee3dc2b4ca7c838e2ef68be73c8b803d69b770d5
GIT Branch: master