commit f973c870694f10ae9b91cfc899c4863972a44a98
OBS-URL: https://build.opensuse.org/package/show/Kernel:stable/kernel-source?expand=0&rev=290
This commit is contained in:
Michal Marek
Git OBS Bridge
parent
3422a29eb3
commit
14855d2f54
@ -28,10 +28,8 @@
|
|||||||
|
|
||||||
%define build_flavor @FLAVOR@
|
%define build_flavor @FLAVOR@
|
||||||
%define build_default (%build_flavor == "default")
|
%define build_default (%build_flavor == "default")
|
||||||
%define build_kdump (%build_flavor == "kdump")
|
|
||||||
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
|
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
|
||||||
%define build_vanilla (%build_flavor == "vanilla")
|
%define build_vanilla (%build_flavor == "vanilla")
|
||||||
%define build_ps3 (%build_flavor == "ps3")
|
|
||||||
|
|
||||||
%define build_src_dir %my_builddir/linux-%srcversion
|
%define build_src_dir %my_builddir/linux-%srcversion
|
||||||
%define src_install_dir /usr/src/linux-%kernelrelease%variant
|
%define src_install_dir /usr/src/linux-%kernelrelease%variant
|
||||||
@ -71,6 +69,7 @@ Url: http://www.kernel.org/
|
|||||||
BuildRequires: bc
|
BuildRequires: bc
|
||||||
BuildRequires: coreutils
|
BuildRequires: coreutils
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
|
BuildRequires: hmaccalc
|
||||||
BuildRequires: modutils
|
BuildRequires: modutils
|
||||||
BuildRequires: sparse
|
BuildRequires: sparse
|
||||||
# Used to sign the kernel in the buildservice
|
# Used to sign the kernel in the buildservice
|
||||||
@ -407,49 +406,34 @@ cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
|
|||||||
|
|
||||||
add_vmlinux()
|
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
|
cp vmlinux %buildroot/$vmlinux
|
||||||
>%my_builddir/vmlinux.debug.files
|
# make sure that find-debuginfo.sh picks it up. In the filelist, we
|
||||||
|
# mark the file 0644 again
|
||||||
|
chmod +x %buildroot/$vmlinux
|
||||||
|
if test $1 == "--compressed"; then
|
||||||
%if 0%{?__debug_package:1}
|
%if 0%{?__debug_package:1}
|
||||||
if $compressed; then
|
# split the debug information just to keep the compressed file
|
||||||
|
# reasonably small
|
||||||
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
|
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
|
||||||
mkdir -p $(dirname %buildroot/$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 \
|
objcopy --only-keep-debug \
|
||||||
%buildroot/$vmlinux \
|
%buildroot/$vmlinux \
|
||||||
%buildroot/$vmlinux_debug || :
|
%buildroot/$vmlinux_debug || :
|
||||||
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
|
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
|
||||||
--strip-debug \
|
--strip-debug \
|
||||||
%buildroot/$vmlinux || :
|
%buildroot/$vmlinux || :
|
||||||
mkdir -p %buildroot/usr/src/debug
|
# let find-debuginfo.sh do the real job
|
||||||
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
|
rm -f %buildroot/$vmlinux_debug
|
||||||
| ( 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)
|
|
||||||
chmod +x %buildroot/$vmlinux
|
|
||||||
fi
|
|
||||||
%endif
|
%endif
|
||||||
if $compressed; then
|
gzip -n -k -9 %buildroot/$vmlinux
|
||||||
gzip -n -9 %buildroot/$vmlinux
|
ghost_vmlinux=true
|
||||||
chmod a-x %buildroot/$vmlinux.gz
|
else
|
||||||
|
ghost_vmlinux=false
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
%if %build_kdump
|
|
||||||
add_vmlinux
|
|
||||||
image=vmlinux
|
|
||||||
%else
|
|
||||||
|
|
||||||
# architecture specifics
|
# architecture specifics
|
||||||
%ifarch %ix86 x86_64
|
%ifarch %ix86 x86_64
|
||||||
add_vmlinux --compressed
|
add_vmlinux --compressed
|
||||||
@ -515,8 +499,9 @@ add_vmlinux()
|
|||||||
cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor
|
cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# end of build_kdump
|
if test -x /usr/lib/rpm/pesign/gen-hmac; then
|
||||||
%endif
|
$_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor
|
||||||
|
fi
|
||||||
|
|
||||||
# Package the compiled-in certificates as DER files in /etc/uefi/certs
|
# Package the compiled-in certificates as DER files in /etc/uefi/certs
|
||||||
# and have mokutil enroll them when the kernel is installed
|
# and have mokutil enroll them when the kernel is installed
|
||||||
@ -572,7 +557,7 @@ for sub in '-base' '' '-extra'; do
|
|||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
|
||||||
%if %build_kdump || %build_xen || %build_vanilla || %build_ps3
|
%if %build_xen || %build_vanilla
|
||||||
# keep this -suffix list in sync with post.sh and postun.sh
|
# keep this -suffix list in sync with post.sh and postun.sh
|
||||||
suffix=-%build_flavor
|
suffix=-%build_flavor
|
||||||
%endif
|
%endif
|
||||||
@ -600,6 +585,8 @@ make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
|
|||||||
# space in /boot.
|
# space in /boot.
|
||||||
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
|
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
|
||||||
bs=1024 seek=2047 count=1
|
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
|
if [ %CONFIG_MODULES = y ]; then
|
||||||
mkdir -p %rpm_install_dir/%cpu_arch_flavor
|
mkdir -p %rpm_install_dir/%cpu_arch_flavor
|
||||||
@ -743,7 +730,7 @@ add_dirs_to_filelist() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Collect the file lists.
|
# Collect the file lists.
|
||||||
shopt -s nullglob
|
shopt -s nullglob dotglob
|
||||||
> %my_builddir/kernel-devel.files
|
> %my_builddir/kernel-devel.files
|
||||||
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
|
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
|
||||||
f=${file##%buildroot}
|
f=${file##%buildroot}
|
||||||
@ -751,22 +738,39 @@ for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; d
|
|||||||
done
|
done
|
||||||
|
|
||||||
{ cd %buildroot
|
{ cd %buildroot
|
||||||
find boot \
|
for f in boot/*; do
|
||||||
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
|
if test -L "$f"; then
|
||||||
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
|
echo "%%ghost /$f"
|
||||||
-type f -printf '/%%p\n'
|
continue
|
||||||
|
elif test ! -f "$f"; then
|
||||||
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
|
continue
|
||||||
# the file gets removed when uninstalling the kernel.
|
fi
|
||||||
echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump'
|
case "$f" in
|
||||||
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump
|
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
|
if [ %CONFIG_MODULES = y ]; then
|
||||||
find lib/modules/%kernelrelease-%build_flavor \
|
find lib/modules/%kernelrelease-%build_flavor \
|
||||||
-type d -o \
|
-type d -o \
|
||||||
\( -path '*/modules.*' ! -path '*/modules.order' \
|
\( -path '*/modules.*' ! -path '*/modules.order' \
|
||||||
! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \
|
! -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
|
cat %my_builddir/base-modules
|
||||||
fi
|
fi
|
||||||
if test %CONFIG_MODULE_SIG = "y"; then
|
if test %CONFIG_MODULE_SIG = "y"; then
|
||||||
@ -779,10 +783,7 @@ done
|
|||||||
if [ -e .%_docdir/%name ]; then
|
if [ -e .%_docdir/%name ]; then
|
||||||
echo "%%doc %_docdir/%name"
|
echo "%%doc %_docdir/%name"
|
||||||
fi
|
fi
|
||||||
} | sort -u >%my_builddir/tmp
|
} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files
|
||||||
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
|
|
||||||
|
|
||||||
%if %split_base
|
%if %split_base
|
||||||
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
|
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
|
||||||
@ -942,16 +943,4 @@ kernel module packages) against the %build_flavor flavor of the kernel.
|
|||||||
%endif
|
%endif
|
||||||
%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
|
%changelog
|
||||||
|
|||||||
@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jun 4 08:46:14 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
|
- Linux 3.14.5.
|
||||||
|
- commit 3ee48e0
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jun 2 13:07:44 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- Obsolete kernel-trace by kernel-default
|
||||||
|
- commit 1eb3f59
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri May 30 10:05:06 CEST 2014 - tiwai@suse.de
|
Fri May 30 10:05:06 CEST 2014 - tiwai@suse.de
|
||||||
|
|
||||||
@ -27,6 +39,26 @@ Mon May 12 18:28:31 CEST 2014 - tiwai@suse.de
|
|||||||
with 0 fbs (bnc#875687).
|
with 0 fbs (bnc#875687).
|
||||||
- commit b8d699a
|
- commit b8d699a
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 12 10:15:01 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Do not keep debug symbols in vmlinux-*.gz
|
||||||
|
(bnc#877267)
|
||||||
|
- commit f928d60
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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 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:00:14 CEST 2014 - tiwai@suse.de
|
Wed May 7 12:00:14 CEST 2014 - tiwai@suse.de
|
||||||
|
|
||||||
@ -39,6 +71,22 @@ Tue May 6 22:19:39 CEST 2014 - jslaby@suse.cz
|
|||||||
- Linux 3.14.3.
|
- Linux 3.14.3.
|
||||||
- commit 2a280a3
|
- commit 2a280a3
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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 10:24:08 CEST 2014 - jslaby@suse.cz
|
Mon May 5 10:24:08 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
@ -46,6 +94,18 @@ Mon May 5 10:24:08 CEST 2014 - jslaby@suse.cz
|
|||||||
(bnc#871252 bnc#875690 CVE-2014-0196).
|
(bnc#871252 bnc#875690 CVE-2014-0196).
|
||||||
- commit e72b790
|
- commit e72b790
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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
|
||||||
|
|
||||||
|
- rpm/kernel-obs-qa.spec.in: Use per-flavor path for the logfile
|
||||||
|
- commit 717e968
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Apr 27 14:16:13 CEST 2014 - jslaby@suse.cz
|
Sun Apr 27 14:16:13 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
@ -59,6 +119,31 @@ Thu Apr 24 17:02:34 CEST 2014 - jdelvare@suse.de
|
|||||||
NFC support makes little sense on server-class hardware.
|
NFC support makes little sense on server-class hardware.
|
||||||
- commit 5cbf723
|
- commit 5cbf723
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 24 00:37:16 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Do not store the buildroot in the .hmac file
|
||||||
|
- commit ce5bd7a
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 24 00:00:17 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Add hmaccalc to buildrequires
|
||||||
|
- commit 9cca2fa
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 23 22:45:04 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Generate a hmac singature for the kernel
|
||||||
|
(fate#316930, bnc#856310)
|
||||||
|
- commit 2659f6f
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 23 22:41:58 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Drop conditionals for -kdump and -ps3
|
||||||
|
- commit 01fab08
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Apr 23 16:22:27 CEST 2014 - adrian@suse.de
|
Wed Apr 23 16:22:27 CEST 2014 - adrian@suse.de
|
||||||
|
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
# needssslcertforbuild
|
# needssslcertforbuild
|
||||||
|
|
||||||
%define srcversion 3.14
|
%define srcversion 3.14
|
||||||
%define patchversion 3.14.4
|
%define patchversion 3.14.5
|
||||||
%define variant %{nil}
|
%define variant %{nil}
|
||||||
%define vanilla_only 0
|
%define vanilla_only 0
|
||||||
|
|
||||||
@ -28,10 +28,8 @@
|
|||||||
|
|
||||||
%define build_flavor debug
|
%define build_flavor debug
|
||||||
%define build_default (%build_flavor == "default")
|
%define build_default (%build_flavor == "default")
|
||||||
%define build_kdump (%build_flavor == "kdump")
|
|
||||||
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
|
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
|
||||||
%define build_vanilla (%build_flavor == "vanilla")
|
%define build_vanilla (%build_flavor == "vanilla")
|
||||||
%define build_ps3 (%build_flavor == "ps3")
|
|
||||||
|
|
||||||
%define build_src_dir %my_builddir/linux-%srcversion
|
%define build_src_dir %my_builddir/linux-%srcversion
|
||||||
%define src_install_dir /usr/src/linux-%kernelrelease%variant
|
%define src_install_dir /usr/src/linux-%kernelrelease%variant
|
||||||
@ -61,16 +59,17 @@ Name: kernel-debug
|
|||||||
Summary: A Debug Version of the Kernel
|
Summary: A Debug Version of the Kernel
|
||||||
License: GPL-2.0
|
License: GPL-2.0
|
||||||
Group: System/Kernel
|
Group: System/Kernel
|
||||||
Version: 3.14.4
|
Version: 3.14.5
|
||||||
%if 0%{?is_kotd}
|
%if 0%{?is_kotd}
|
||||||
Release: <RELEASE>.g0de0f93
|
Release: <RELEASE>.gf973c87
|
||||||
%else
|
%else
|
||||||
Release: <RELEASE>.g0de0f93
|
Release: <RELEASE>.gf973c87
|
||||||
%endif
|
%endif
|
||||||
Url: http://www.kernel.org/
|
Url: http://www.kernel.org/
|
||||||
BuildRequires: bc
|
BuildRequires: bc
|
||||||
BuildRequires: coreutils
|
BuildRequires: coreutils
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
|
BuildRequires: hmaccalc
|
||||||
BuildRequires: modutils
|
BuildRequires: modutils
|
||||||
BuildRequires: sparse
|
BuildRequires: sparse
|
||||||
# Used to sign the kernel in the buildservice
|
# Used to sign the kernel in the buildservice
|
||||||
@ -533,49 +532,34 @@ cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
|
|||||||
|
|
||||||
add_vmlinux()
|
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
|
cp vmlinux %buildroot/$vmlinux
|
||||||
>%my_builddir/vmlinux.debug.files
|
# make sure that find-debuginfo.sh picks it up. In the filelist, we
|
||||||
|
# mark the file 0644 again
|
||||||
|
chmod +x %buildroot/$vmlinux
|
||||||
|
if test $1 == "--compressed"; then
|
||||||
%if 0%{?__debug_package:1}
|
%if 0%{?__debug_package:1}
|
||||||
if $compressed; then
|
# split the debug information just to keep the compressed file
|
||||||
|
# reasonably small
|
||||||
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
|
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
|
||||||
mkdir -p $(dirname %buildroot/$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 \
|
objcopy --only-keep-debug \
|
||||||
%buildroot/$vmlinux \
|
%buildroot/$vmlinux \
|
||||||
%buildroot/$vmlinux_debug || :
|
%buildroot/$vmlinux_debug || :
|
||||||
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
|
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
|
||||||
--strip-debug \
|
--strip-debug \
|
||||||
%buildroot/$vmlinux || :
|
%buildroot/$vmlinux || :
|
||||||
mkdir -p %buildroot/usr/src/debug
|
# let find-debuginfo.sh do the real job
|
||||||
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
|
rm -f %buildroot/$vmlinux_debug
|
||||||
| ( 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)
|
|
||||||
chmod +x %buildroot/$vmlinux
|
|
||||||
fi
|
|
||||||
%endif
|
%endif
|
||||||
if $compressed; then
|
gzip -n -k -9 %buildroot/$vmlinux
|
||||||
gzip -n -9 %buildroot/$vmlinux
|
ghost_vmlinux=true
|
||||||
chmod a-x %buildroot/$vmlinux.gz
|
else
|
||||||
|
ghost_vmlinux=false
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
%if %build_kdump
|
|
||||||
add_vmlinux
|
|
||||||
image=vmlinux
|
|
||||||
%else
|
|
||||||
|
|
||||||
# architecture specifics
|
# architecture specifics
|
||||||
%ifarch %ix86 x86_64
|
%ifarch %ix86 x86_64
|
||||||
add_vmlinux --compressed
|
add_vmlinux --compressed
|
||||||
@ -641,8 +625,9 @@ add_vmlinux()
|
|||||||
cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor
|
cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# end of build_kdump
|
if test -x /usr/lib/rpm/pesign/gen-hmac; then
|
||||||
%endif
|
$_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor
|
||||||
|
fi
|
||||||
|
|
||||||
# Package the compiled-in certificates as DER files in /etc/uefi/certs
|
# Package the compiled-in certificates as DER files in /etc/uefi/certs
|
||||||
# and have mokutil enroll them when the kernel is installed
|
# and have mokutil enroll them when the kernel is installed
|
||||||
@ -698,7 +683,7 @@ for sub in '-base' '' '-extra'; do
|
|||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
|
||||||
%if %build_kdump || %build_xen || %build_vanilla || %build_ps3
|
%if %build_xen || %build_vanilla
|
||||||
# keep this -suffix list in sync with post.sh and postun.sh
|
# keep this -suffix list in sync with post.sh and postun.sh
|
||||||
suffix=-%build_flavor
|
suffix=-%build_flavor
|
||||||
%endif
|
%endif
|
||||||
@ -726,6 +711,8 @@ make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
|
|||||||
# space in /boot.
|
# space in /boot.
|
||||||
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
|
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
|
||||||
bs=1024 seek=2047 count=1
|
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
|
if [ %CONFIG_MODULES = y ]; then
|
||||||
mkdir -p %rpm_install_dir/%cpu_arch_flavor
|
mkdir -p %rpm_install_dir/%cpu_arch_flavor
|
||||||
@ -869,7 +856,7 @@ add_dirs_to_filelist() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Collect the file lists.
|
# Collect the file lists.
|
||||||
shopt -s nullglob
|
shopt -s nullglob dotglob
|
||||||
> %my_builddir/kernel-devel.files
|
> %my_builddir/kernel-devel.files
|
||||||
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
|
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
|
||||||
f=${file##%buildroot}
|
f=${file##%buildroot}
|
||||||
@ -877,22 +864,39 @@ for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; d
|
|||||||
done
|
done
|
||||||
|
|
||||||
{ cd %buildroot
|
{ cd %buildroot
|
||||||
find boot \
|
for f in boot/*; do
|
||||||
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
|
if test -L "$f"; then
|
||||||
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
|
echo "%%ghost /$f"
|
||||||
-type f -printf '/%%p\n'
|
continue
|
||||||
|
elif test ! -f "$f"; then
|
||||||
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
|
continue
|
||||||
# the file gets removed when uninstalling the kernel.
|
fi
|
||||||
echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump'
|
case "$f" in
|
||||||
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump
|
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
|
if [ %CONFIG_MODULES = y ]; then
|
||||||
find lib/modules/%kernelrelease-%build_flavor \
|
find lib/modules/%kernelrelease-%build_flavor \
|
||||||
-type d -o \
|
-type d -o \
|
||||||
\( -path '*/modules.*' ! -path '*/modules.order' \
|
\( -path '*/modules.*' ! -path '*/modules.order' \
|
||||||
! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \
|
! -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
|
cat %my_builddir/base-modules
|
||||||
fi
|
fi
|
||||||
if test %CONFIG_MODULE_SIG = "y"; then
|
if test %CONFIG_MODULE_SIG = "y"; then
|
||||||
@ -905,10 +909,7 @@ done
|
|||||||
if [ -e .%_docdir/%name ]; then
|
if [ -e .%_docdir/%name ]; then
|
||||||
echo "%%doc %_docdir/%name"
|
echo "%%doc %_docdir/%name"
|
||||||
fi
|
fi
|
||||||
} | sort -u >%my_builddir/tmp
|
} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files
|
||||||
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
|
|
||||||
|
|
||||||
%if %split_base
|
%if %split_base
|
||||||
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
|
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
|
||||||
@ -1070,16 +1071,4 @@ kernel module packages) against the %build_flavor flavor of the kernel.
|
|||||||
%endif
|
%endif
|
||||||
%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
|
%changelog
|
||||||
|
|||||||
@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jun 4 08:46:14 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
|
- Linux 3.14.5.
|
||||||
|
- commit 3ee48e0
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jun 2 13:07:44 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- Obsolete kernel-trace by kernel-default
|
||||||
|
- commit 1eb3f59
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri May 30 10:05:06 CEST 2014 - tiwai@suse.de
|
Fri May 30 10:05:06 CEST 2014 - tiwai@suse.de
|
||||||
|
|
||||||
@ -27,6 +39,26 @@ Mon May 12 18:28:31 CEST 2014 - tiwai@suse.de
|
|||||||
with 0 fbs (bnc#875687).
|
with 0 fbs (bnc#875687).
|
||||||
- commit b8d699a
|
- commit b8d699a
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 12 10:15:01 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Do not keep debug symbols in vmlinux-*.gz
|
||||||
|
(bnc#877267)
|
||||||
|
- commit f928d60
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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 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:00:14 CEST 2014 - tiwai@suse.de
|
Wed May 7 12:00:14 CEST 2014 - tiwai@suse.de
|
||||||
|
|
||||||
@ -39,6 +71,22 @@ Tue May 6 22:19:39 CEST 2014 - jslaby@suse.cz
|
|||||||
- Linux 3.14.3.
|
- Linux 3.14.3.
|
||||||
- commit 2a280a3
|
- commit 2a280a3
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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 10:24:08 CEST 2014 - jslaby@suse.cz
|
Mon May 5 10:24:08 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
@ -46,6 +94,18 @@ Mon May 5 10:24:08 CEST 2014 - jslaby@suse.cz
|
|||||||
(bnc#871252 bnc#875690 CVE-2014-0196).
|
(bnc#871252 bnc#875690 CVE-2014-0196).
|
||||||
- commit e72b790
|
- commit e72b790
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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
|
||||||
|
|
||||||
|
- rpm/kernel-obs-qa.spec.in: Use per-flavor path for the logfile
|
||||||
|
- commit 717e968
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Apr 27 14:16:13 CEST 2014 - jslaby@suse.cz
|
Sun Apr 27 14:16:13 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
@ -59,6 +119,31 @@ Thu Apr 24 17:02:34 CEST 2014 - jdelvare@suse.de
|
|||||||
NFC support makes little sense on server-class hardware.
|
NFC support makes little sense on server-class hardware.
|
||||||
- commit 5cbf723
|
- commit 5cbf723
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 24 00:37:16 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Do not store the buildroot in the .hmac file
|
||||||
|
- commit ce5bd7a
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 24 00:00:17 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Add hmaccalc to buildrequires
|
||||||
|
- commit 9cca2fa
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 23 22:45:04 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Generate a hmac singature for the kernel
|
||||||
|
(fate#316930, bnc#856310)
|
||||||
|
- commit 2659f6f
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 23 22:41:58 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Drop conditionals for -kdump and -ps3
|
||||||
|
- commit 01fab08
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Apr 23 16:22:27 CEST 2014 - adrian@suse.de
|
Wed Apr 23 16:22:27 CEST 2014 - adrian@suse.de
|
||||||
|
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
# needssslcertforbuild
|
# needssslcertforbuild
|
||||||
|
|
||||||
%define srcversion 3.14
|
%define srcversion 3.14
|
||||||
%define patchversion 3.14.4
|
%define patchversion 3.14.5
|
||||||
%define variant %{nil}
|
%define variant %{nil}
|
||||||
%define vanilla_only 0
|
%define vanilla_only 0
|
||||||
|
|
||||||
@ -28,10 +28,8 @@
|
|||||||
|
|
||||||
%define build_flavor default
|
%define build_flavor default
|
||||||
%define build_default (%build_flavor == "default")
|
%define build_default (%build_flavor == "default")
|
||||||
%define build_kdump (%build_flavor == "kdump")
|
|
||||||
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
|
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
|
||||||
%define build_vanilla (%build_flavor == "vanilla")
|
%define build_vanilla (%build_flavor == "vanilla")
|
||||||
%define build_ps3 (%build_flavor == "ps3")
|
|
||||||
|
|
||||||
%define build_src_dir %my_builddir/linux-%srcversion
|
%define build_src_dir %my_builddir/linux-%srcversion
|
||||||
%define src_install_dir /usr/src/linux-%kernelrelease%variant
|
%define src_install_dir /usr/src/linux-%kernelrelease%variant
|
||||||
@ -61,16 +59,17 @@ Name: kernel-default
|
|||||||
Summary: The Standard Kernel
|
Summary: The Standard Kernel
|
||||||
License: GPL-2.0
|
License: GPL-2.0
|
||||||
Group: System/Kernel
|
Group: System/Kernel
|
||||||
Version: 3.14.4
|
Version: 3.14.5
|
||||||
%if 0%{?is_kotd}
|
%if 0%{?is_kotd}
|
||||||
Release: <RELEASE>.g0de0f93
|
Release: <RELEASE>.gf973c87
|
||||||
%else
|
%else
|
||||||
Release: <RELEASE>.g0de0f93
|
Release: <RELEASE>.gf973c87
|
||||||
%endif
|
%endif
|
||||||
Url: http://www.kernel.org/
|
Url: http://www.kernel.org/
|
||||||
BuildRequires: bc
|
BuildRequires: bc
|
||||||
BuildRequires: coreutils
|
BuildRequires: coreutils
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
|
BuildRequires: hmaccalc
|
||||||
BuildRequires: modutils
|
BuildRequires: modutils
|
||||||
BuildRequires: sparse
|
BuildRequires: sparse
|
||||||
# Used to sign the kernel in the buildservice
|
# Used to sign the kernel in the buildservice
|
||||||
@ -150,14 +149,22 @@ Provides: kernel = %version-%source_rel
|
|||||||
%ifarch %ix86
|
%ifarch %ix86
|
||||||
Provides: kernel-smp = 2.6.17
|
Provides: kernel-smp = 2.6.17
|
||||||
Obsoletes: kernel-smp <= 2.6.17
|
Obsoletes: kernel-smp <= 2.6.17
|
||||||
|
Provides: kernel-trace = 3.13
|
||||||
|
Obsoletes: kernel-trace <= 3.13
|
||||||
%endif
|
%endif
|
||||||
%ifarch ppc64
|
%ifarch ppc64
|
||||||
Provides: kernel-kdump = 2.6.28
|
Provides: kernel-kdump = 2.6.28
|
||||||
Obsoletes: kernel-kdump <= 2.6.28
|
Obsoletes: kernel-kdump <= 2.6.28
|
||||||
%endif
|
%endif
|
||||||
|
%ifarch s390x
|
||||||
|
Provides: kernel-trace = 3.13
|
||||||
|
Obsoletes: kernel-trace <= 3.13
|
||||||
|
%endif
|
||||||
%ifarch x86_64
|
%ifarch x86_64
|
||||||
Provides: kernel-smp = 2.6.17
|
Provides: kernel-smp = 2.6.17
|
||||||
Obsoletes: kernel-smp <= 2.6.17
|
Obsoletes: kernel-smp <= 2.6.17
|
||||||
|
Provides: kernel-trace = 3.13
|
||||||
|
Obsoletes: kernel-trace <= 3.13
|
||||||
%endif
|
%endif
|
||||||
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz
|
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz
|
||||||
Source2: source-post.sh
|
Source2: source-post.sh
|
||||||
@ -540,49 +547,34 @@ cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
|
|||||||
|
|
||||||
add_vmlinux()
|
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
|
cp vmlinux %buildroot/$vmlinux
|
||||||
>%my_builddir/vmlinux.debug.files
|
# make sure that find-debuginfo.sh picks it up. In the filelist, we
|
||||||
|
# mark the file 0644 again
|
||||||
|
chmod +x %buildroot/$vmlinux
|
||||||
|
if test $1 == "--compressed"; then
|
||||||
%if 0%{?__debug_package:1}
|
%if 0%{?__debug_package:1}
|
||||||
if $compressed; then
|
# split the debug information just to keep the compressed file
|
||||||
|
# reasonably small
|
||||||
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
|
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
|
||||||
mkdir -p $(dirname %buildroot/$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 \
|
objcopy --only-keep-debug \
|
||||||
%buildroot/$vmlinux \
|
%buildroot/$vmlinux \
|
||||||
%buildroot/$vmlinux_debug || :
|
%buildroot/$vmlinux_debug || :
|
||||||
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
|
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
|
||||||
--strip-debug \
|
--strip-debug \
|
||||||
%buildroot/$vmlinux || :
|
%buildroot/$vmlinux || :
|
||||||
mkdir -p %buildroot/usr/src/debug
|
# let find-debuginfo.sh do the real job
|
||||||
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
|
rm -f %buildroot/$vmlinux_debug
|
||||||
| ( 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)
|
|
||||||
chmod +x %buildroot/$vmlinux
|
|
||||||
fi
|
|
||||||
%endif
|
%endif
|
||||||
if $compressed; then
|
gzip -n -k -9 %buildroot/$vmlinux
|
||||||
gzip -n -9 %buildroot/$vmlinux
|
ghost_vmlinux=true
|
||||||
chmod a-x %buildroot/$vmlinux.gz
|
else
|
||||||
|
ghost_vmlinux=false
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
%if %build_kdump
|
|
||||||
add_vmlinux
|
|
||||||
image=vmlinux
|
|
||||||
%else
|
|
||||||
|
|
||||||
# architecture specifics
|
# architecture specifics
|
||||||
%ifarch %ix86 x86_64
|
%ifarch %ix86 x86_64
|
||||||
add_vmlinux --compressed
|
add_vmlinux --compressed
|
||||||
@ -648,8 +640,9 @@ add_vmlinux()
|
|||||||
cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor
|
cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# end of build_kdump
|
if test -x /usr/lib/rpm/pesign/gen-hmac; then
|
||||||
%endif
|
$_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor
|
||||||
|
fi
|
||||||
|
|
||||||
# Package the compiled-in certificates as DER files in /etc/uefi/certs
|
# Package the compiled-in certificates as DER files in /etc/uefi/certs
|
||||||
# and have mokutil enroll them when the kernel is installed
|
# and have mokutil enroll them when the kernel is installed
|
||||||
@ -705,7 +698,7 @@ for sub in '-base' '' '-extra'; do
|
|||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
|
||||||
%if %build_kdump || %build_xen || %build_vanilla || %build_ps3
|
%if %build_xen || %build_vanilla
|
||||||
# keep this -suffix list in sync with post.sh and postun.sh
|
# keep this -suffix list in sync with post.sh and postun.sh
|
||||||
suffix=-%build_flavor
|
suffix=-%build_flavor
|
||||||
%endif
|
%endif
|
||||||
@ -733,6 +726,8 @@ make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
|
|||||||
# space in /boot.
|
# space in /boot.
|
||||||
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
|
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
|
||||||
bs=1024 seek=2047 count=1
|
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
|
if [ %CONFIG_MODULES = y ]; then
|
||||||
mkdir -p %rpm_install_dir/%cpu_arch_flavor
|
mkdir -p %rpm_install_dir/%cpu_arch_flavor
|
||||||
@ -876,7 +871,7 @@ add_dirs_to_filelist() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Collect the file lists.
|
# Collect the file lists.
|
||||||
shopt -s nullglob
|
shopt -s nullglob dotglob
|
||||||
> %my_builddir/kernel-devel.files
|
> %my_builddir/kernel-devel.files
|
||||||
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
|
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
|
||||||
f=${file##%buildroot}
|
f=${file##%buildroot}
|
||||||
@ -884,22 +879,39 @@ for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; d
|
|||||||
done
|
done
|
||||||
|
|
||||||
{ cd %buildroot
|
{ cd %buildroot
|
||||||
find boot \
|
for f in boot/*; do
|
||||||
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
|
if test -L "$f"; then
|
||||||
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
|
echo "%%ghost /$f"
|
||||||
-type f -printf '/%%p\n'
|
continue
|
||||||
|
elif test ! -f "$f"; then
|
||||||
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
|
continue
|
||||||
# the file gets removed when uninstalling the kernel.
|
fi
|
||||||
echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump'
|
case "$f" in
|
||||||
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump
|
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
|
if [ %CONFIG_MODULES = y ]; then
|
||||||
find lib/modules/%kernelrelease-%build_flavor \
|
find lib/modules/%kernelrelease-%build_flavor \
|
||||||
-type d -o \
|
-type d -o \
|
||||||
\( -path '*/modules.*' ! -path '*/modules.order' \
|
\( -path '*/modules.*' ! -path '*/modules.order' \
|
||||||
! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \
|
! -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
|
cat %my_builddir/base-modules
|
||||||
fi
|
fi
|
||||||
if test %CONFIG_MODULE_SIG = "y"; then
|
if test %CONFIG_MODULE_SIG = "y"; then
|
||||||
@ -912,10 +924,7 @@ done
|
|||||||
if [ -e .%_docdir/%name ]; then
|
if [ -e .%_docdir/%name ]; then
|
||||||
echo "%%doc %_docdir/%name"
|
echo "%%doc %_docdir/%name"
|
||||||
fi
|
fi
|
||||||
} | sort -u >%my_builddir/tmp
|
} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files
|
||||||
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
|
|
||||||
|
|
||||||
%if %split_base
|
%if %split_base
|
||||||
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
|
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
|
||||||
@ -1075,16 +1084,4 @@ kernel module packages) against the %build_flavor flavor of the kernel.
|
|||||||
%endif
|
%endif
|
||||||
%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
|
%changelog
|
||||||
|
|||||||
@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jun 4 08:46:14 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
|
- Linux 3.14.5.
|
||||||
|
- commit 3ee48e0
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jun 2 13:07:44 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- Obsolete kernel-trace by kernel-default
|
||||||
|
- commit 1eb3f59
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri May 30 10:05:06 CEST 2014 - tiwai@suse.de
|
Fri May 30 10:05:06 CEST 2014 - tiwai@suse.de
|
||||||
|
|
||||||
@ -27,6 +39,26 @@ Mon May 12 18:28:31 CEST 2014 - tiwai@suse.de
|
|||||||
with 0 fbs (bnc#875687).
|
with 0 fbs (bnc#875687).
|
||||||
- commit b8d699a
|
- commit b8d699a
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 12 10:15:01 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Do not keep debug symbols in vmlinux-*.gz
|
||||||
|
(bnc#877267)
|
||||||
|
- commit f928d60
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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 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:00:14 CEST 2014 - tiwai@suse.de
|
Wed May 7 12:00:14 CEST 2014 - tiwai@suse.de
|
||||||
|
|
||||||
@ -39,6 +71,22 @@ Tue May 6 22:19:39 CEST 2014 - jslaby@suse.cz
|
|||||||
- Linux 3.14.3.
|
- Linux 3.14.3.
|
||||||
- commit 2a280a3
|
- commit 2a280a3
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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 10:24:08 CEST 2014 - jslaby@suse.cz
|
Mon May 5 10:24:08 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
@ -46,6 +94,18 @@ Mon May 5 10:24:08 CEST 2014 - jslaby@suse.cz
|
|||||||
(bnc#871252 bnc#875690 CVE-2014-0196).
|
(bnc#871252 bnc#875690 CVE-2014-0196).
|
||||||
- commit e72b790
|
- commit e72b790
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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
|
||||||
|
|
||||||
|
- rpm/kernel-obs-qa.spec.in: Use per-flavor path for the logfile
|
||||||
|
- commit 717e968
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Apr 27 14:16:13 CEST 2014 - jslaby@suse.cz
|
Sun Apr 27 14:16:13 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
@ -59,6 +119,31 @@ Thu Apr 24 17:02:34 CEST 2014 - jdelvare@suse.de
|
|||||||
NFC support makes little sense on server-class hardware.
|
NFC support makes little sense on server-class hardware.
|
||||||
- commit 5cbf723
|
- commit 5cbf723
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 24 00:37:16 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Do not store the buildroot in the .hmac file
|
||||||
|
- commit ce5bd7a
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 24 00:00:17 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Add hmaccalc to buildrequires
|
||||||
|
- commit 9cca2fa
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 23 22:45:04 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Generate a hmac singature for the kernel
|
||||||
|
(fate#316930, bnc#856310)
|
||||||
|
- commit 2659f6f
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 23 22:41:58 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Drop conditionals for -kdump and -ps3
|
||||||
|
- commit 01fab08
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Apr 23 16:22:27 CEST 2014 - adrian@suse.de
|
Wed Apr 23 16:22:27 CEST 2014 - adrian@suse.de
|
||||||
|
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
# needssslcertforbuild
|
# needssslcertforbuild
|
||||||
|
|
||||||
%define srcversion 3.14
|
%define srcversion 3.14
|
||||||
%define patchversion 3.14.4
|
%define patchversion 3.14.5
|
||||||
%define variant %{nil}
|
%define variant %{nil}
|
||||||
%define vanilla_only 0
|
%define vanilla_only 0
|
||||||
|
|
||||||
@ -28,10 +28,8 @@
|
|||||||
|
|
||||||
%define build_flavor desktop
|
%define build_flavor desktop
|
||||||
%define build_default (%build_flavor == "default")
|
%define build_default (%build_flavor == "default")
|
||||||
%define build_kdump (%build_flavor == "kdump")
|
|
||||||
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
|
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
|
||||||
%define build_vanilla (%build_flavor == "vanilla")
|
%define build_vanilla (%build_flavor == "vanilla")
|
||||||
%define build_ps3 (%build_flavor == "ps3")
|
|
||||||
|
|
||||||
%define build_src_dir %my_builddir/linux-%srcversion
|
%define build_src_dir %my_builddir/linux-%srcversion
|
||||||
%define src_install_dir /usr/src/linux-%kernelrelease%variant
|
%define src_install_dir /usr/src/linux-%kernelrelease%variant
|
||||||
@ -61,16 +59,17 @@ Name: kernel-desktop
|
|||||||
Summary: Kernel optimized for the desktop
|
Summary: Kernel optimized for the desktop
|
||||||
License: GPL-2.0
|
License: GPL-2.0
|
||||||
Group: System/Kernel
|
Group: System/Kernel
|
||||||
Version: 3.14.4
|
Version: 3.14.5
|
||||||
%if 0%{?is_kotd}
|
%if 0%{?is_kotd}
|
||||||
Release: <RELEASE>.g0de0f93
|
Release: <RELEASE>.gf973c87
|
||||||
%else
|
%else
|
||||||
Release: <RELEASE>.g0de0f93
|
Release: <RELEASE>.gf973c87
|
||||||
%endif
|
%endif
|
||||||
Url: http://www.kernel.org/
|
Url: http://www.kernel.org/
|
||||||
BuildRequires: bc
|
BuildRequires: bc
|
||||||
BuildRequires: coreutils
|
BuildRequires: coreutils
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
|
BuildRequires: hmaccalc
|
||||||
BuildRequires: modutils
|
BuildRequires: modutils
|
||||||
BuildRequires: sparse
|
BuildRequires: sparse
|
||||||
# Used to sign the kernel in the buildservice
|
# Used to sign the kernel in the buildservice
|
||||||
@ -542,49 +541,34 @@ cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
|
|||||||
|
|
||||||
add_vmlinux()
|
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
|
cp vmlinux %buildroot/$vmlinux
|
||||||
>%my_builddir/vmlinux.debug.files
|
# make sure that find-debuginfo.sh picks it up. In the filelist, we
|
||||||
|
# mark the file 0644 again
|
||||||
|
chmod +x %buildroot/$vmlinux
|
||||||
|
if test $1 == "--compressed"; then
|
||||||
%if 0%{?__debug_package:1}
|
%if 0%{?__debug_package:1}
|
||||||
if $compressed; then
|
# split the debug information just to keep the compressed file
|
||||||
|
# reasonably small
|
||||||
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
|
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
|
||||||
mkdir -p $(dirname %buildroot/$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 \
|
objcopy --only-keep-debug \
|
||||||
%buildroot/$vmlinux \
|
%buildroot/$vmlinux \
|
||||||
%buildroot/$vmlinux_debug || :
|
%buildroot/$vmlinux_debug || :
|
||||||
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
|
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
|
||||||
--strip-debug \
|
--strip-debug \
|
||||||
%buildroot/$vmlinux || :
|
%buildroot/$vmlinux || :
|
||||||
mkdir -p %buildroot/usr/src/debug
|
# let find-debuginfo.sh do the real job
|
||||||
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
|
rm -f %buildroot/$vmlinux_debug
|
||||||
| ( 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)
|
|
||||||
chmod +x %buildroot/$vmlinux
|
|
||||||
fi
|
|
||||||
%endif
|
%endif
|
||||||
if $compressed; then
|
gzip -n -k -9 %buildroot/$vmlinux
|
||||||
gzip -n -9 %buildroot/$vmlinux
|
ghost_vmlinux=true
|
||||||
chmod a-x %buildroot/$vmlinux.gz
|
else
|
||||||
|
ghost_vmlinux=false
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
%if %build_kdump
|
|
||||||
add_vmlinux
|
|
||||||
image=vmlinux
|
|
||||||
%else
|
|
||||||
|
|
||||||
# architecture specifics
|
# architecture specifics
|
||||||
%ifarch %ix86 x86_64
|
%ifarch %ix86 x86_64
|
||||||
add_vmlinux --compressed
|
add_vmlinux --compressed
|
||||||
@ -650,8 +634,9 @@ add_vmlinux()
|
|||||||
cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor
|
cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# end of build_kdump
|
if test -x /usr/lib/rpm/pesign/gen-hmac; then
|
||||||
%endif
|
$_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor
|
||||||
|
fi
|
||||||
|
|
||||||
# Package the compiled-in certificates as DER files in /etc/uefi/certs
|
# Package the compiled-in certificates as DER files in /etc/uefi/certs
|
||||||
# and have mokutil enroll them when the kernel is installed
|
# and have mokutil enroll them when the kernel is installed
|
||||||
@ -707,7 +692,7 @@ for sub in '-base' '' '-extra'; do
|
|||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
|
||||||
%if %build_kdump || %build_xen || %build_vanilla || %build_ps3
|
%if %build_xen || %build_vanilla
|
||||||
# keep this -suffix list in sync with post.sh and postun.sh
|
# keep this -suffix list in sync with post.sh and postun.sh
|
||||||
suffix=-%build_flavor
|
suffix=-%build_flavor
|
||||||
%endif
|
%endif
|
||||||
@ -735,6 +720,8 @@ make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
|
|||||||
# space in /boot.
|
# space in /boot.
|
||||||
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
|
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
|
||||||
bs=1024 seek=2047 count=1
|
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
|
if [ %CONFIG_MODULES = y ]; then
|
||||||
mkdir -p %rpm_install_dir/%cpu_arch_flavor
|
mkdir -p %rpm_install_dir/%cpu_arch_flavor
|
||||||
@ -878,7 +865,7 @@ add_dirs_to_filelist() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Collect the file lists.
|
# Collect the file lists.
|
||||||
shopt -s nullglob
|
shopt -s nullglob dotglob
|
||||||
> %my_builddir/kernel-devel.files
|
> %my_builddir/kernel-devel.files
|
||||||
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
|
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
|
||||||
f=${file##%buildroot}
|
f=${file##%buildroot}
|
||||||
@ -886,22 +873,39 @@ for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; d
|
|||||||
done
|
done
|
||||||
|
|
||||||
{ cd %buildroot
|
{ cd %buildroot
|
||||||
find boot \
|
for f in boot/*; do
|
||||||
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
|
if test -L "$f"; then
|
||||||
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
|
echo "%%ghost /$f"
|
||||||
-type f -printf '/%%p\n'
|
continue
|
||||||
|
elif test ! -f "$f"; then
|
||||||
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
|
continue
|
||||||
# the file gets removed when uninstalling the kernel.
|
fi
|
||||||
echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump'
|
case "$f" in
|
||||||
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump
|
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
|
if [ %CONFIG_MODULES = y ]; then
|
||||||
find lib/modules/%kernelrelease-%build_flavor \
|
find lib/modules/%kernelrelease-%build_flavor \
|
||||||
-type d -o \
|
-type d -o \
|
||||||
\( -path '*/modules.*' ! -path '*/modules.order' \
|
\( -path '*/modules.*' ! -path '*/modules.order' \
|
||||||
! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \
|
! -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
|
cat %my_builddir/base-modules
|
||||||
fi
|
fi
|
||||||
if test %CONFIG_MODULE_SIG = "y"; then
|
if test %CONFIG_MODULE_SIG = "y"; then
|
||||||
@ -914,10 +918,7 @@ done
|
|||||||
if [ -e .%_docdir/%name ]; then
|
if [ -e .%_docdir/%name ]; then
|
||||||
echo "%%doc %_docdir/%name"
|
echo "%%doc %_docdir/%name"
|
||||||
fi
|
fi
|
||||||
} | sort -u >%my_builddir/tmp
|
} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files
|
||||||
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
|
|
||||||
|
|
||||||
%if %split_base
|
%if %split_base
|
||||||
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
|
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
|
||||||
@ -1103,16 +1104,4 @@ kernel module packages) against the %build_flavor flavor of the kernel.
|
|||||||
%endif
|
%endif
|
||||||
%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
|
%changelog
|
||||||
|
|||||||
@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jun 4 08:46:14 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
|
- Linux 3.14.5.
|
||||||
|
- commit 3ee48e0
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jun 2 13:07:44 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- Obsolete kernel-trace by kernel-default
|
||||||
|
- commit 1eb3f59
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri May 30 10:05:06 CEST 2014 - tiwai@suse.de
|
Fri May 30 10:05:06 CEST 2014 - tiwai@suse.de
|
||||||
|
|
||||||
@ -27,6 +39,26 @@ Mon May 12 18:28:31 CEST 2014 - tiwai@suse.de
|
|||||||
with 0 fbs (bnc#875687).
|
with 0 fbs (bnc#875687).
|
||||||
- commit b8d699a
|
- commit b8d699a
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 12 10:15:01 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Do not keep debug symbols in vmlinux-*.gz
|
||||||
|
(bnc#877267)
|
||||||
|
- commit f928d60
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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 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:00:14 CEST 2014 - tiwai@suse.de
|
Wed May 7 12:00:14 CEST 2014 - tiwai@suse.de
|
||||||
|
|
||||||
@ -39,6 +71,22 @@ Tue May 6 22:19:39 CEST 2014 - jslaby@suse.cz
|
|||||||
- Linux 3.14.3.
|
- Linux 3.14.3.
|
||||||
- commit 2a280a3
|
- commit 2a280a3
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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 10:24:08 CEST 2014 - jslaby@suse.cz
|
Mon May 5 10:24:08 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
@ -46,6 +94,18 @@ Mon May 5 10:24:08 CEST 2014 - jslaby@suse.cz
|
|||||||
(bnc#871252 bnc#875690 CVE-2014-0196).
|
(bnc#871252 bnc#875690 CVE-2014-0196).
|
||||||
- commit e72b790
|
- commit e72b790
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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
|
||||||
|
|
||||||
|
- rpm/kernel-obs-qa.spec.in: Use per-flavor path for the logfile
|
||||||
|
- commit 717e968
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Apr 27 14:16:13 CEST 2014 - jslaby@suse.cz
|
Sun Apr 27 14:16:13 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
@ -59,6 +119,31 @@ Thu Apr 24 17:02:34 CEST 2014 - jdelvare@suse.de
|
|||||||
NFC support makes little sense on server-class hardware.
|
NFC support makes little sense on server-class hardware.
|
||||||
- commit 5cbf723
|
- commit 5cbf723
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 24 00:37:16 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Do not store the buildroot in the .hmac file
|
||||||
|
- commit ce5bd7a
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 24 00:00:17 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Add hmaccalc to buildrequires
|
||||||
|
- commit 9cca2fa
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 23 22:45:04 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Generate a hmac singature for the kernel
|
||||||
|
(fate#316930, bnc#856310)
|
||||||
|
- commit 2659f6f
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 23 22:41:58 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Drop conditionals for -kdump and -ps3
|
||||||
|
- commit 01fab08
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Apr 23 16:22:27 CEST 2014 - adrian@suse.de
|
Wed Apr 23 16:22:27 CEST 2014 - adrian@suse.de
|
||||||
|
|
||||||
|
|||||||
@ -16,7 +16,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
%define patchversion 3.14.4
|
%define patchversion 3.14.5
|
||||||
%define variant %{nil}
|
%define variant %{nil}
|
||||||
|
|
||||||
%include %_sourcedir/kernel-spec-macros
|
%include %_sourcedir/kernel-spec-macros
|
||||||
@ -25,11 +25,11 @@ Name: kernel-docs
|
|||||||
Summary: Kernel Documentation
|
Summary: Kernel Documentation
|
||||||
License: GPL-2.0
|
License: GPL-2.0
|
||||||
Group: Documentation/Man
|
Group: Documentation/Man
|
||||||
Version: 3.14.4
|
Version: 3.14.5
|
||||||
%if 0%{?is_kotd}
|
%if 0%{?is_kotd}
|
||||||
Release: <RELEASE>.g0de0f93
|
Release: <RELEASE>.gf973c87
|
||||||
%else
|
%else
|
||||||
Release: <RELEASE>.g0de0f93
|
Release: <RELEASE>.gf973c87
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: docbook-toys
|
BuildRequires: docbook-toys
|
||||||
BuildRequires: docbook-utils
|
BuildRequires: docbook-utils
|
||||||
|
|||||||
@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jun 4 08:46:14 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
|
- Linux 3.14.5.
|
||||||
|
- commit 3ee48e0
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jun 2 13:07:44 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- Obsolete kernel-trace by kernel-default
|
||||||
|
- commit 1eb3f59
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri May 30 10:05:06 CEST 2014 - tiwai@suse.de
|
Fri May 30 10:05:06 CEST 2014 - tiwai@suse.de
|
||||||
|
|
||||||
@ -27,6 +39,26 @@ Mon May 12 18:28:31 CEST 2014 - tiwai@suse.de
|
|||||||
with 0 fbs (bnc#875687).
|
with 0 fbs (bnc#875687).
|
||||||
- commit b8d699a
|
- commit b8d699a
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 12 10:15:01 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Do not keep debug symbols in vmlinux-*.gz
|
||||||
|
(bnc#877267)
|
||||||
|
- commit f928d60
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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 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:00:14 CEST 2014 - tiwai@suse.de
|
Wed May 7 12:00:14 CEST 2014 - tiwai@suse.de
|
||||||
|
|
||||||
@ -39,6 +71,22 @@ Tue May 6 22:19:39 CEST 2014 - jslaby@suse.cz
|
|||||||
- Linux 3.14.3.
|
- Linux 3.14.3.
|
||||||
- commit 2a280a3
|
- commit 2a280a3
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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 10:24:08 CEST 2014 - jslaby@suse.cz
|
Mon May 5 10:24:08 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
@ -46,6 +94,18 @@ Mon May 5 10:24:08 CEST 2014 - jslaby@suse.cz
|
|||||||
(bnc#871252 bnc#875690 CVE-2014-0196).
|
(bnc#871252 bnc#875690 CVE-2014-0196).
|
||||||
- commit e72b790
|
- commit e72b790
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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
|
||||||
|
|
||||||
|
- rpm/kernel-obs-qa.spec.in: Use per-flavor path for the logfile
|
||||||
|
- commit 717e968
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Apr 27 14:16:13 CEST 2014 - jslaby@suse.cz
|
Sun Apr 27 14:16:13 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
@ -59,6 +119,31 @@ Thu Apr 24 17:02:34 CEST 2014 - jdelvare@suse.de
|
|||||||
NFC support makes little sense on server-class hardware.
|
NFC support makes little sense on server-class hardware.
|
||||||
- commit 5cbf723
|
- commit 5cbf723
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 24 00:37:16 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Do not store the buildroot in the .hmac file
|
||||||
|
- commit ce5bd7a
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 24 00:00:17 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Add hmaccalc to buildrequires
|
||||||
|
- commit 9cca2fa
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 23 22:45:04 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Generate a hmac singature for the kernel
|
||||||
|
(fate#316930, bnc#856310)
|
||||||
|
- commit 2659f6f
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 23 22:41:58 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Drop conditionals for -kdump and -ps3
|
||||||
|
- commit 01fab08
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Apr 23 16:22:27 CEST 2014 - adrian@suse.de
|
Wed Apr 23 16:22:27 CEST 2014 - adrian@suse.de
|
||||||
|
|
||||||
|
|||||||
125
kernel-ec2.spec
125
kernel-ec2.spec
@ -20,7 +20,7 @@
|
|||||||
# needssslcertforbuild
|
# needssslcertforbuild
|
||||||
|
|
||||||
%define srcversion 3.14
|
%define srcversion 3.14
|
||||||
%define patchversion 3.14.4
|
%define patchversion 3.14.5
|
||||||
%define variant %{nil}
|
%define variant %{nil}
|
||||||
%define vanilla_only 0
|
%define vanilla_only 0
|
||||||
|
|
||||||
@ -28,10 +28,8 @@
|
|||||||
|
|
||||||
%define build_flavor ec2
|
%define build_flavor ec2
|
||||||
%define build_default (%build_flavor == "default")
|
%define build_default (%build_flavor == "default")
|
||||||
%define build_kdump (%build_flavor == "kdump")
|
|
||||||
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
|
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
|
||||||
%define build_vanilla (%build_flavor == "vanilla")
|
%define build_vanilla (%build_flavor == "vanilla")
|
||||||
%define build_ps3 (%build_flavor == "ps3")
|
|
||||||
|
|
||||||
%define build_src_dir %my_builddir/linux-%srcversion
|
%define build_src_dir %my_builddir/linux-%srcversion
|
||||||
%define src_install_dir /usr/src/linux-%kernelrelease%variant
|
%define src_install_dir /usr/src/linux-%kernelrelease%variant
|
||||||
@ -61,16 +59,17 @@ Name: kernel-ec2
|
|||||||
Summary: The Amazon EC2 Xen Kernel
|
Summary: The Amazon EC2 Xen Kernel
|
||||||
License: GPL-2.0
|
License: GPL-2.0
|
||||||
Group: System/Kernel
|
Group: System/Kernel
|
||||||
Version: 3.14.4
|
Version: 3.14.5
|
||||||
%if 0%{?is_kotd}
|
%if 0%{?is_kotd}
|
||||||
Release: <RELEASE>.g0de0f93
|
Release: <RELEASE>.gf973c87
|
||||||
%else
|
%else
|
||||||
Release: <RELEASE>.g0de0f93
|
Release: <RELEASE>.gf973c87
|
||||||
%endif
|
%endif
|
||||||
Url: http://www.kernel.org/
|
Url: http://www.kernel.org/
|
||||||
BuildRequires: bc
|
BuildRequires: bc
|
||||||
BuildRequires: coreutils
|
BuildRequires: coreutils
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
|
BuildRequires: hmaccalc
|
||||||
BuildRequires: modutils
|
BuildRequires: modutils
|
||||||
BuildRequires: sparse
|
BuildRequires: sparse
|
||||||
# Used to sign the kernel in the buildservice
|
# Used to sign the kernel in the buildservice
|
||||||
@ -532,49 +531,34 @@ cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
|
|||||||
|
|
||||||
add_vmlinux()
|
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
|
cp vmlinux %buildroot/$vmlinux
|
||||||
>%my_builddir/vmlinux.debug.files
|
# make sure that find-debuginfo.sh picks it up. In the filelist, we
|
||||||
|
# mark the file 0644 again
|
||||||
|
chmod +x %buildroot/$vmlinux
|
||||||
|
if test $1 == "--compressed"; then
|
||||||
%if 0%{?__debug_package:1}
|
%if 0%{?__debug_package:1}
|
||||||
if $compressed; then
|
# split the debug information just to keep the compressed file
|
||||||
|
# reasonably small
|
||||||
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
|
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
|
||||||
mkdir -p $(dirname %buildroot/$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 \
|
objcopy --only-keep-debug \
|
||||||
%buildroot/$vmlinux \
|
%buildroot/$vmlinux \
|
||||||
%buildroot/$vmlinux_debug || :
|
%buildroot/$vmlinux_debug || :
|
||||||
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
|
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
|
||||||
--strip-debug \
|
--strip-debug \
|
||||||
%buildroot/$vmlinux || :
|
%buildroot/$vmlinux || :
|
||||||
mkdir -p %buildroot/usr/src/debug
|
# let find-debuginfo.sh do the real job
|
||||||
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
|
rm -f %buildroot/$vmlinux_debug
|
||||||
| ( 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)
|
|
||||||
chmod +x %buildroot/$vmlinux
|
|
||||||
fi
|
|
||||||
%endif
|
%endif
|
||||||
if $compressed; then
|
gzip -n -k -9 %buildroot/$vmlinux
|
||||||
gzip -n -9 %buildroot/$vmlinux
|
ghost_vmlinux=true
|
||||||
chmod a-x %buildroot/$vmlinux.gz
|
else
|
||||||
|
ghost_vmlinux=false
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
%if %build_kdump
|
|
||||||
add_vmlinux
|
|
||||||
image=vmlinux
|
|
||||||
%else
|
|
||||||
|
|
||||||
# architecture specifics
|
# architecture specifics
|
||||||
%ifarch %ix86 x86_64
|
%ifarch %ix86 x86_64
|
||||||
add_vmlinux --compressed
|
add_vmlinux --compressed
|
||||||
@ -640,8 +624,9 @@ add_vmlinux()
|
|||||||
cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor
|
cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# end of build_kdump
|
if test -x /usr/lib/rpm/pesign/gen-hmac; then
|
||||||
%endif
|
$_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor
|
||||||
|
fi
|
||||||
|
|
||||||
# Package the compiled-in certificates as DER files in /etc/uefi/certs
|
# Package the compiled-in certificates as DER files in /etc/uefi/certs
|
||||||
# and have mokutil enroll them when the kernel is installed
|
# and have mokutil enroll them when the kernel is installed
|
||||||
@ -697,7 +682,7 @@ for sub in '-base' '' '-extra'; do
|
|||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
|
||||||
%if %build_kdump || %build_xen || %build_vanilla || %build_ps3
|
%if %build_xen || %build_vanilla
|
||||||
# keep this -suffix list in sync with post.sh and postun.sh
|
# keep this -suffix list in sync with post.sh and postun.sh
|
||||||
suffix=-%build_flavor
|
suffix=-%build_flavor
|
||||||
%endif
|
%endif
|
||||||
@ -725,6 +710,8 @@ make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
|
|||||||
# space in /boot.
|
# space in /boot.
|
||||||
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
|
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
|
||||||
bs=1024 seek=2047 count=1
|
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
|
if [ %CONFIG_MODULES = y ]; then
|
||||||
mkdir -p %rpm_install_dir/%cpu_arch_flavor
|
mkdir -p %rpm_install_dir/%cpu_arch_flavor
|
||||||
@ -868,7 +855,7 @@ add_dirs_to_filelist() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Collect the file lists.
|
# Collect the file lists.
|
||||||
shopt -s nullglob
|
shopt -s nullglob dotglob
|
||||||
> %my_builddir/kernel-devel.files
|
> %my_builddir/kernel-devel.files
|
||||||
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
|
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
|
||||||
f=${file##%buildroot}
|
f=${file##%buildroot}
|
||||||
@ -876,22 +863,39 @@ for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; d
|
|||||||
done
|
done
|
||||||
|
|
||||||
{ cd %buildroot
|
{ cd %buildroot
|
||||||
find boot \
|
for f in boot/*; do
|
||||||
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
|
if test -L "$f"; then
|
||||||
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
|
echo "%%ghost /$f"
|
||||||
-type f -printf '/%%p\n'
|
continue
|
||||||
|
elif test ! -f "$f"; then
|
||||||
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
|
continue
|
||||||
# the file gets removed when uninstalling the kernel.
|
fi
|
||||||
echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump'
|
case "$f" in
|
||||||
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump
|
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
|
if [ %CONFIG_MODULES = y ]; then
|
||||||
find lib/modules/%kernelrelease-%build_flavor \
|
find lib/modules/%kernelrelease-%build_flavor \
|
||||||
-type d -o \
|
-type d -o \
|
||||||
\( -path '*/modules.*' ! -path '*/modules.order' \
|
\( -path '*/modules.*' ! -path '*/modules.order' \
|
||||||
! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \
|
! -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
|
cat %my_builddir/base-modules
|
||||||
fi
|
fi
|
||||||
if test %CONFIG_MODULE_SIG = "y"; then
|
if test %CONFIG_MODULE_SIG = "y"; then
|
||||||
@ -904,10 +908,7 @@ done
|
|||||||
if [ -e .%_docdir/%name ]; then
|
if [ -e .%_docdir/%name ]; then
|
||||||
echo "%%doc %_docdir/%name"
|
echo "%%doc %_docdir/%name"
|
||||||
fi
|
fi
|
||||||
} | sort -u >%my_builddir/tmp
|
} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files
|
||||||
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
|
|
||||||
|
|
||||||
%if %split_base
|
%if %split_base
|
||||||
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
|
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
|
||||||
@ -1073,16 +1074,4 @@ kernel module packages) against the %build_flavor flavor of the kernel.
|
|||||||
%endif
|
%endif
|
||||||
%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
|
%changelog
|
||||||
|
|||||||
@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jun 4 08:46:14 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
|
- Linux 3.14.5.
|
||||||
|
- commit 3ee48e0
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jun 2 13:07:44 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- Obsolete kernel-trace by kernel-default
|
||||||
|
- commit 1eb3f59
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri May 30 10:05:06 CEST 2014 - tiwai@suse.de
|
Fri May 30 10:05:06 CEST 2014 - tiwai@suse.de
|
||||||
|
|
||||||
@ -27,6 +39,26 @@ Mon May 12 18:28:31 CEST 2014 - tiwai@suse.de
|
|||||||
with 0 fbs (bnc#875687).
|
with 0 fbs (bnc#875687).
|
||||||
- commit b8d699a
|
- commit b8d699a
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 12 10:15:01 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Do not keep debug symbols in vmlinux-*.gz
|
||||||
|
(bnc#877267)
|
||||||
|
- commit f928d60
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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 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:00:14 CEST 2014 - tiwai@suse.de
|
Wed May 7 12:00:14 CEST 2014 - tiwai@suse.de
|
||||||
|
|
||||||
@ -39,6 +71,22 @@ Tue May 6 22:19:39 CEST 2014 - jslaby@suse.cz
|
|||||||
- Linux 3.14.3.
|
- Linux 3.14.3.
|
||||||
- commit 2a280a3
|
- commit 2a280a3
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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 10:24:08 CEST 2014 - jslaby@suse.cz
|
Mon May 5 10:24:08 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
@ -46,6 +94,18 @@ Mon May 5 10:24:08 CEST 2014 - jslaby@suse.cz
|
|||||||
(bnc#871252 bnc#875690 CVE-2014-0196).
|
(bnc#871252 bnc#875690 CVE-2014-0196).
|
||||||
- commit e72b790
|
- commit e72b790
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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
|
||||||
|
|
||||||
|
- rpm/kernel-obs-qa.spec.in: Use per-flavor path for the logfile
|
||||||
|
- commit 717e968
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Apr 27 14:16:13 CEST 2014 - jslaby@suse.cz
|
Sun Apr 27 14:16:13 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
@ -59,6 +119,31 @@ Thu Apr 24 17:02:34 CEST 2014 - jdelvare@suse.de
|
|||||||
NFC support makes little sense on server-class hardware.
|
NFC support makes little sense on server-class hardware.
|
||||||
- commit 5cbf723
|
- commit 5cbf723
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 24 00:37:16 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Do not store the buildroot in the .hmac file
|
||||||
|
- commit ce5bd7a
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 24 00:00:17 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Add hmaccalc to buildrequires
|
||||||
|
- commit 9cca2fa
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 23 22:45:04 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Generate a hmac singature for the kernel
|
||||||
|
(fate#316930, bnc#856310)
|
||||||
|
- commit 2659f6f
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 23 22:41:58 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Drop conditionals for -kdump and -ps3
|
||||||
|
- commit 01fab08
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Apr 23 16:22:27 CEST 2014 - adrian@suse.de
|
Wed Apr 23 16:22:27 CEST 2014 - adrian@suse.de
|
||||||
|
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
# needssslcertforbuild
|
# needssslcertforbuild
|
||||||
|
|
||||||
%define srcversion 3.14
|
%define srcversion 3.14
|
||||||
%define patchversion 3.14.4
|
%define patchversion 3.14.5
|
||||||
%define variant %{nil}
|
%define variant %{nil}
|
||||||
%define vanilla_only 0
|
%define vanilla_only 0
|
||||||
|
|
||||||
@ -28,10 +28,8 @@
|
|||||||
|
|
||||||
%define build_flavor exynos
|
%define build_flavor exynos
|
||||||
%define build_default (%build_flavor == "default")
|
%define build_default (%build_flavor == "default")
|
||||||
%define build_kdump (%build_flavor == "kdump")
|
|
||||||
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
|
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
|
||||||
%define build_vanilla (%build_flavor == "vanilla")
|
%define build_vanilla (%build_flavor == "vanilla")
|
||||||
%define build_ps3 (%build_flavor == "ps3")
|
|
||||||
|
|
||||||
%define build_src_dir %my_builddir/linux-%srcversion
|
%define build_src_dir %my_builddir/linux-%srcversion
|
||||||
%define src_install_dir /usr/src/linux-%kernelrelease%variant
|
%define src_install_dir /usr/src/linux-%kernelrelease%variant
|
||||||
@ -61,16 +59,17 @@ Name: kernel-exynos
|
|||||||
Summary: Kernel for Samsung's Exynos SoC
|
Summary: Kernel for Samsung's Exynos SoC
|
||||||
License: GPL-2.0
|
License: GPL-2.0
|
||||||
Group: System/Kernel
|
Group: System/Kernel
|
||||||
Version: 3.14.4
|
Version: 3.14.5
|
||||||
%if 0%{?is_kotd}
|
%if 0%{?is_kotd}
|
||||||
Release: <RELEASE>.g0de0f93
|
Release: <RELEASE>.gf973c87
|
||||||
%else
|
%else
|
||||||
Release: <RELEASE>.g0de0f93
|
Release: <RELEASE>.gf973c87
|
||||||
%endif
|
%endif
|
||||||
Url: http://www.kernel.org/
|
Url: http://www.kernel.org/
|
||||||
BuildRequires: bc
|
BuildRequires: bc
|
||||||
BuildRequires: coreutils
|
BuildRequires: coreutils
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
|
BuildRequires: hmaccalc
|
||||||
BuildRequires: modutils
|
BuildRequires: modutils
|
||||||
BuildRequires: sparse
|
BuildRequires: sparse
|
||||||
# Used to sign the kernel in the buildservice
|
# Used to sign the kernel in the buildservice
|
||||||
@ -529,49 +528,34 @@ cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
|
|||||||
|
|
||||||
add_vmlinux()
|
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
|
cp vmlinux %buildroot/$vmlinux
|
||||||
>%my_builddir/vmlinux.debug.files
|
# make sure that find-debuginfo.sh picks it up. In the filelist, we
|
||||||
|
# mark the file 0644 again
|
||||||
|
chmod +x %buildroot/$vmlinux
|
||||||
|
if test $1 == "--compressed"; then
|
||||||
%if 0%{?__debug_package:1}
|
%if 0%{?__debug_package:1}
|
||||||
if $compressed; then
|
# split the debug information just to keep the compressed file
|
||||||
|
# reasonably small
|
||||||
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
|
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
|
||||||
mkdir -p $(dirname %buildroot/$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 \
|
objcopy --only-keep-debug \
|
||||||
%buildroot/$vmlinux \
|
%buildroot/$vmlinux \
|
||||||
%buildroot/$vmlinux_debug || :
|
%buildroot/$vmlinux_debug || :
|
||||||
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
|
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
|
||||||
--strip-debug \
|
--strip-debug \
|
||||||
%buildroot/$vmlinux || :
|
%buildroot/$vmlinux || :
|
||||||
mkdir -p %buildroot/usr/src/debug
|
# let find-debuginfo.sh do the real job
|
||||||
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
|
rm -f %buildroot/$vmlinux_debug
|
||||||
| ( 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)
|
|
||||||
chmod +x %buildroot/$vmlinux
|
|
||||||
fi
|
|
||||||
%endif
|
%endif
|
||||||
if $compressed; then
|
gzip -n -k -9 %buildroot/$vmlinux
|
||||||
gzip -n -9 %buildroot/$vmlinux
|
ghost_vmlinux=true
|
||||||
chmod a-x %buildroot/$vmlinux.gz
|
else
|
||||||
|
ghost_vmlinux=false
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
%if %build_kdump
|
|
||||||
add_vmlinux
|
|
||||||
image=vmlinux
|
|
||||||
%else
|
|
||||||
|
|
||||||
# architecture specifics
|
# architecture specifics
|
||||||
%ifarch %ix86 x86_64
|
%ifarch %ix86 x86_64
|
||||||
add_vmlinux --compressed
|
add_vmlinux --compressed
|
||||||
@ -637,8 +621,9 @@ add_vmlinux()
|
|||||||
cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor
|
cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# end of build_kdump
|
if test -x /usr/lib/rpm/pesign/gen-hmac; then
|
||||||
%endif
|
$_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor
|
||||||
|
fi
|
||||||
|
|
||||||
# Package the compiled-in certificates as DER files in /etc/uefi/certs
|
# Package the compiled-in certificates as DER files in /etc/uefi/certs
|
||||||
# and have mokutil enroll them when the kernel is installed
|
# and have mokutil enroll them when the kernel is installed
|
||||||
@ -694,7 +679,7 @@ for sub in '-base' '' '-extra'; do
|
|||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
|
||||||
%if %build_kdump || %build_xen || %build_vanilla || %build_ps3
|
%if %build_xen || %build_vanilla
|
||||||
# keep this -suffix list in sync with post.sh and postun.sh
|
# keep this -suffix list in sync with post.sh and postun.sh
|
||||||
suffix=-%build_flavor
|
suffix=-%build_flavor
|
||||||
%endif
|
%endif
|
||||||
@ -722,6 +707,8 @@ make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
|
|||||||
# space in /boot.
|
# space in /boot.
|
||||||
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
|
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
|
||||||
bs=1024 seek=2047 count=1
|
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
|
if [ %CONFIG_MODULES = y ]; then
|
||||||
mkdir -p %rpm_install_dir/%cpu_arch_flavor
|
mkdir -p %rpm_install_dir/%cpu_arch_flavor
|
||||||
@ -865,7 +852,7 @@ add_dirs_to_filelist() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Collect the file lists.
|
# Collect the file lists.
|
||||||
shopt -s nullglob
|
shopt -s nullglob dotglob
|
||||||
> %my_builddir/kernel-devel.files
|
> %my_builddir/kernel-devel.files
|
||||||
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
|
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
|
||||||
f=${file##%buildroot}
|
f=${file##%buildroot}
|
||||||
@ -873,22 +860,39 @@ for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; d
|
|||||||
done
|
done
|
||||||
|
|
||||||
{ cd %buildroot
|
{ cd %buildroot
|
||||||
find boot \
|
for f in boot/*; do
|
||||||
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
|
if test -L "$f"; then
|
||||||
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
|
echo "%%ghost /$f"
|
||||||
-type f -printf '/%%p\n'
|
continue
|
||||||
|
elif test ! -f "$f"; then
|
||||||
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
|
continue
|
||||||
# the file gets removed when uninstalling the kernel.
|
fi
|
||||||
echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump'
|
case "$f" in
|
||||||
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump
|
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
|
if [ %CONFIG_MODULES = y ]; then
|
||||||
find lib/modules/%kernelrelease-%build_flavor \
|
find lib/modules/%kernelrelease-%build_flavor \
|
||||||
-type d -o \
|
-type d -o \
|
||||||
\( -path '*/modules.*' ! -path '*/modules.order' \
|
\( -path '*/modules.*' ! -path '*/modules.order' \
|
||||||
! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \
|
! -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
|
cat %my_builddir/base-modules
|
||||||
fi
|
fi
|
||||||
if test %CONFIG_MODULE_SIG = "y"; then
|
if test %CONFIG_MODULE_SIG = "y"; then
|
||||||
@ -901,10 +905,7 @@ done
|
|||||||
if [ -e .%_docdir/%name ]; then
|
if [ -e .%_docdir/%name ]; then
|
||||||
echo "%%doc %_docdir/%name"
|
echo "%%doc %_docdir/%name"
|
||||||
fi
|
fi
|
||||||
} | sort -u >%my_builddir/tmp
|
} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files
|
||||||
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
|
|
||||||
|
|
||||||
%if %split_base
|
%if %split_base
|
||||||
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
|
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
|
||||||
@ -1064,16 +1065,4 @@ kernel module packages) against the %build_flavor flavor of the kernel.
|
|||||||
%endif
|
%endif
|
||||||
%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
|
%changelog
|
||||||
|
|||||||
@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jun 4 08:46:14 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
|
- Linux 3.14.5.
|
||||||
|
- commit 3ee48e0
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jun 2 13:07:44 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- Obsolete kernel-trace by kernel-default
|
||||||
|
- commit 1eb3f59
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri May 30 10:05:06 CEST 2014 - tiwai@suse.de
|
Fri May 30 10:05:06 CEST 2014 - tiwai@suse.de
|
||||||
|
|
||||||
@ -27,6 +39,26 @@ Mon May 12 18:28:31 CEST 2014 - tiwai@suse.de
|
|||||||
with 0 fbs (bnc#875687).
|
with 0 fbs (bnc#875687).
|
||||||
- commit b8d699a
|
- commit b8d699a
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 12 10:15:01 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Do not keep debug symbols in vmlinux-*.gz
|
||||||
|
(bnc#877267)
|
||||||
|
- commit f928d60
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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 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:00:14 CEST 2014 - tiwai@suse.de
|
Wed May 7 12:00:14 CEST 2014 - tiwai@suse.de
|
||||||
|
|
||||||
@ -39,6 +71,22 @@ Tue May 6 22:19:39 CEST 2014 - jslaby@suse.cz
|
|||||||
- Linux 3.14.3.
|
- Linux 3.14.3.
|
||||||
- commit 2a280a3
|
- commit 2a280a3
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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 10:24:08 CEST 2014 - jslaby@suse.cz
|
Mon May 5 10:24:08 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
@ -46,6 +94,18 @@ Mon May 5 10:24:08 CEST 2014 - jslaby@suse.cz
|
|||||||
(bnc#871252 bnc#875690 CVE-2014-0196).
|
(bnc#871252 bnc#875690 CVE-2014-0196).
|
||||||
- commit e72b790
|
- commit e72b790
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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
|
||||||
|
|
||||||
|
- rpm/kernel-obs-qa.spec.in: Use per-flavor path for the logfile
|
||||||
|
- commit 717e968
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Apr 27 14:16:13 CEST 2014 - jslaby@suse.cz
|
Sun Apr 27 14:16:13 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
@ -59,6 +119,31 @@ Thu Apr 24 17:02:34 CEST 2014 - jdelvare@suse.de
|
|||||||
NFC support makes little sense on server-class hardware.
|
NFC support makes little sense on server-class hardware.
|
||||||
- commit 5cbf723
|
- commit 5cbf723
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 24 00:37:16 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Do not store the buildroot in the .hmac file
|
||||||
|
- commit ce5bd7a
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 24 00:00:17 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Add hmaccalc to buildrequires
|
||||||
|
- commit 9cca2fa
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 23 22:45:04 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Generate a hmac singature for the kernel
|
||||||
|
(fate#316930, bnc#856310)
|
||||||
|
- commit 2659f6f
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 23 22:41:58 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Drop conditionals for -kdump and -ps3
|
||||||
|
- commit 01fab08
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Apr 23 16:22:27 CEST 2014 - adrian@suse.de
|
Wed Apr 23 16:22:27 CEST 2014 - adrian@suse.de
|
||||||
|
|
||||||
|
|||||||
125
kernel-lpae.spec
125
kernel-lpae.spec
@ -20,7 +20,7 @@
|
|||||||
# needssslcertforbuild
|
# needssslcertforbuild
|
||||||
|
|
||||||
%define srcversion 3.14
|
%define srcversion 3.14
|
||||||
%define patchversion 3.14.4
|
%define patchversion 3.14.5
|
||||||
%define variant %{nil}
|
%define variant %{nil}
|
||||||
%define vanilla_only 0
|
%define vanilla_only 0
|
||||||
|
|
||||||
@ -28,10 +28,8 @@
|
|||||||
|
|
||||||
%define build_flavor lpae
|
%define build_flavor lpae
|
||||||
%define build_default (%build_flavor == "default")
|
%define build_default (%build_flavor == "default")
|
||||||
%define build_kdump (%build_flavor == "kdump")
|
|
||||||
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
|
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
|
||||||
%define build_vanilla (%build_flavor == "vanilla")
|
%define build_vanilla (%build_flavor == "vanilla")
|
||||||
%define build_ps3 (%build_flavor == "ps3")
|
|
||||||
|
|
||||||
%define build_src_dir %my_builddir/linux-%srcversion
|
%define build_src_dir %my_builddir/linux-%srcversion
|
||||||
%define src_install_dir /usr/src/linux-%kernelrelease%variant
|
%define src_install_dir /usr/src/linux-%kernelrelease%variant
|
||||||
@ -61,16 +59,17 @@ Name: kernel-lpae
|
|||||||
Summary: Kernel for LPAE enabled systems
|
Summary: Kernel for LPAE enabled systems
|
||||||
License: GPL-2.0
|
License: GPL-2.0
|
||||||
Group: System/Kernel
|
Group: System/Kernel
|
||||||
Version: 3.14.4
|
Version: 3.14.5
|
||||||
%if 0%{?is_kotd}
|
%if 0%{?is_kotd}
|
||||||
Release: <RELEASE>.g0de0f93
|
Release: <RELEASE>.gf973c87
|
||||||
%else
|
%else
|
||||||
Release: <RELEASE>.g0de0f93
|
Release: <RELEASE>.gf973c87
|
||||||
%endif
|
%endif
|
||||||
Url: http://www.kernel.org/
|
Url: http://www.kernel.org/
|
||||||
BuildRequires: bc
|
BuildRequires: bc
|
||||||
BuildRequires: coreutils
|
BuildRequires: coreutils
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
|
BuildRequires: hmaccalc
|
||||||
BuildRequires: modutils
|
BuildRequires: modutils
|
||||||
BuildRequires: sparse
|
BuildRequires: sparse
|
||||||
# Used to sign the kernel in the buildservice
|
# Used to sign the kernel in the buildservice
|
||||||
@ -530,49 +529,34 @@ cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
|
|||||||
|
|
||||||
add_vmlinux()
|
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
|
cp vmlinux %buildroot/$vmlinux
|
||||||
>%my_builddir/vmlinux.debug.files
|
# make sure that find-debuginfo.sh picks it up. In the filelist, we
|
||||||
|
# mark the file 0644 again
|
||||||
|
chmod +x %buildroot/$vmlinux
|
||||||
|
if test $1 == "--compressed"; then
|
||||||
%if 0%{?__debug_package:1}
|
%if 0%{?__debug_package:1}
|
||||||
if $compressed; then
|
# split the debug information just to keep the compressed file
|
||||||
|
# reasonably small
|
||||||
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
|
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
|
||||||
mkdir -p $(dirname %buildroot/$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 \
|
objcopy --only-keep-debug \
|
||||||
%buildroot/$vmlinux \
|
%buildroot/$vmlinux \
|
||||||
%buildroot/$vmlinux_debug || :
|
%buildroot/$vmlinux_debug || :
|
||||||
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
|
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
|
||||||
--strip-debug \
|
--strip-debug \
|
||||||
%buildroot/$vmlinux || :
|
%buildroot/$vmlinux || :
|
||||||
mkdir -p %buildroot/usr/src/debug
|
# let find-debuginfo.sh do the real job
|
||||||
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
|
rm -f %buildroot/$vmlinux_debug
|
||||||
| ( 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)
|
|
||||||
chmod +x %buildroot/$vmlinux
|
|
||||||
fi
|
|
||||||
%endif
|
%endif
|
||||||
if $compressed; then
|
gzip -n -k -9 %buildroot/$vmlinux
|
||||||
gzip -n -9 %buildroot/$vmlinux
|
ghost_vmlinux=true
|
||||||
chmod a-x %buildroot/$vmlinux.gz
|
else
|
||||||
|
ghost_vmlinux=false
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
%if %build_kdump
|
|
||||||
add_vmlinux
|
|
||||||
image=vmlinux
|
|
||||||
%else
|
|
||||||
|
|
||||||
# architecture specifics
|
# architecture specifics
|
||||||
%ifarch %ix86 x86_64
|
%ifarch %ix86 x86_64
|
||||||
add_vmlinux --compressed
|
add_vmlinux --compressed
|
||||||
@ -638,8 +622,9 @@ add_vmlinux()
|
|||||||
cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor
|
cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# end of build_kdump
|
if test -x /usr/lib/rpm/pesign/gen-hmac; then
|
||||||
%endif
|
$_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor
|
||||||
|
fi
|
||||||
|
|
||||||
# Package the compiled-in certificates as DER files in /etc/uefi/certs
|
# Package the compiled-in certificates as DER files in /etc/uefi/certs
|
||||||
# and have mokutil enroll them when the kernel is installed
|
# and have mokutil enroll them when the kernel is installed
|
||||||
@ -695,7 +680,7 @@ for sub in '-base' '' '-extra'; do
|
|||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
|
||||||
%if %build_kdump || %build_xen || %build_vanilla || %build_ps3
|
%if %build_xen || %build_vanilla
|
||||||
# keep this -suffix list in sync with post.sh and postun.sh
|
# keep this -suffix list in sync with post.sh and postun.sh
|
||||||
suffix=-%build_flavor
|
suffix=-%build_flavor
|
||||||
%endif
|
%endif
|
||||||
@ -723,6 +708,8 @@ make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
|
|||||||
# space in /boot.
|
# space in /boot.
|
||||||
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
|
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
|
||||||
bs=1024 seek=2047 count=1
|
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
|
if [ %CONFIG_MODULES = y ]; then
|
||||||
mkdir -p %rpm_install_dir/%cpu_arch_flavor
|
mkdir -p %rpm_install_dir/%cpu_arch_flavor
|
||||||
@ -866,7 +853,7 @@ add_dirs_to_filelist() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Collect the file lists.
|
# Collect the file lists.
|
||||||
shopt -s nullglob
|
shopt -s nullglob dotglob
|
||||||
> %my_builddir/kernel-devel.files
|
> %my_builddir/kernel-devel.files
|
||||||
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
|
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
|
||||||
f=${file##%buildroot}
|
f=${file##%buildroot}
|
||||||
@ -874,22 +861,39 @@ for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; d
|
|||||||
done
|
done
|
||||||
|
|
||||||
{ cd %buildroot
|
{ cd %buildroot
|
||||||
find boot \
|
for f in boot/*; do
|
||||||
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
|
if test -L "$f"; then
|
||||||
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
|
echo "%%ghost /$f"
|
||||||
-type f -printf '/%%p\n'
|
continue
|
||||||
|
elif test ! -f "$f"; then
|
||||||
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
|
continue
|
||||||
# the file gets removed when uninstalling the kernel.
|
fi
|
||||||
echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump'
|
case "$f" in
|
||||||
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump
|
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
|
if [ %CONFIG_MODULES = y ]; then
|
||||||
find lib/modules/%kernelrelease-%build_flavor \
|
find lib/modules/%kernelrelease-%build_flavor \
|
||||||
-type d -o \
|
-type d -o \
|
||||||
\( -path '*/modules.*' ! -path '*/modules.order' \
|
\( -path '*/modules.*' ! -path '*/modules.order' \
|
||||||
! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \
|
! -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
|
cat %my_builddir/base-modules
|
||||||
fi
|
fi
|
||||||
if test %CONFIG_MODULE_SIG = "y"; then
|
if test %CONFIG_MODULE_SIG = "y"; then
|
||||||
@ -902,10 +906,7 @@ done
|
|||||||
if [ -e .%_docdir/%name ]; then
|
if [ -e .%_docdir/%name ]; then
|
||||||
echo "%%doc %_docdir/%name"
|
echo "%%doc %_docdir/%name"
|
||||||
fi
|
fi
|
||||||
} | sort -u >%my_builddir/tmp
|
} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files
|
||||||
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
|
|
||||||
|
|
||||||
%if %split_base
|
%if %split_base
|
||||||
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
|
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
|
||||||
@ -1067,16 +1068,4 @@ kernel module packages) against the %build_flavor flavor of the kernel.
|
|||||||
%endif
|
%endif
|
||||||
%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
|
%changelog
|
||||||
|
|||||||
@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jun 4 08:46:14 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
|
- Linux 3.14.5.
|
||||||
|
- commit 3ee48e0
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jun 2 13:07:44 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- Obsolete kernel-trace by kernel-default
|
||||||
|
- commit 1eb3f59
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri May 30 10:05:06 CEST 2014 - tiwai@suse.de
|
Fri May 30 10:05:06 CEST 2014 - tiwai@suse.de
|
||||||
|
|
||||||
@ -27,6 +39,26 @@ Mon May 12 18:28:31 CEST 2014 - tiwai@suse.de
|
|||||||
with 0 fbs (bnc#875687).
|
with 0 fbs (bnc#875687).
|
||||||
- commit b8d699a
|
- commit b8d699a
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 12 10:15:01 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Do not keep debug symbols in vmlinux-*.gz
|
||||||
|
(bnc#877267)
|
||||||
|
- commit f928d60
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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 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:00:14 CEST 2014 - tiwai@suse.de
|
Wed May 7 12:00:14 CEST 2014 - tiwai@suse.de
|
||||||
|
|
||||||
@ -39,6 +71,22 @@ Tue May 6 22:19:39 CEST 2014 - jslaby@suse.cz
|
|||||||
- Linux 3.14.3.
|
- Linux 3.14.3.
|
||||||
- commit 2a280a3
|
- commit 2a280a3
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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 10:24:08 CEST 2014 - jslaby@suse.cz
|
Mon May 5 10:24:08 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
@ -46,6 +94,18 @@ Mon May 5 10:24:08 CEST 2014 - jslaby@suse.cz
|
|||||||
(bnc#871252 bnc#875690 CVE-2014-0196).
|
(bnc#871252 bnc#875690 CVE-2014-0196).
|
||||||
- commit e72b790
|
- commit e72b790
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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
|
||||||
|
|
||||||
|
- rpm/kernel-obs-qa.spec.in: Use per-flavor path for the logfile
|
||||||
|
- commit 717e968
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Apr 27 14:16:13 CEST 2014 - jslaby@suse.cz
|
Sun Apr 27 14:16:13 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
@ -59,6 +119,31 @@ Thu Apr 24 17:02:34 CEST 2014 - jdelvare@suse.de
|
|||||||
NFC support makes little sense on server-class hardware.
|
NFC support makes little sense on server-class hardware.
|
||||||
- commit 5cbf723
|
- commit 5cbf723
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 24 00:37:16 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Do not store the buildroot in the .hmac file
|
||||||
|
- commit ce5bd7a
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 24 00:00:17 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Add hmaccalc to buildrequires
|
||||||
|
- commit 9cca2fa
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 23 22:45:04 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Generate a hmac singature for the kernel
|
||||||
|
(fate#316930, bnc#856310)
|
||||||
|
- commit 2659f6f
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 23 22:41:58 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Drop conditionals for -kdump and -ps3
|
||||||
|
- commit 01fab08
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Apr 23 16:22:27 CEST 2014 - adrian@suse.de
|
Wed Apr 23 16:22:27 CEST 2014 - adrian@suse.de
|
||||||
|
|
||||||
|
|||||||
@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
#!BuildIgnore: post-build-checks
|
#!BuildIgnore: post-build-checks
|
||||||
|
|
||||||
%define patchversion 3.14.4
|
%define patchversion 3.14.5
|
||||||
%define variant %{nil}
|
%define variant %{nil}
|
||||||
|
|
||||||
%include %_sourcedir/kernel-spec-macros
|
%include %_sourcedir/kernel-spec-macros
|
||||||
@ -36,8 +36,8 @@ BuildRequires: kernel-xen
|
|||||||
ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc ppc64 ppc64le s390x x86_64
|
ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc ppc64 ppc64le s390x x86_64
|
||||||
%if 0%{?suse_version} < 1320
|
%if 0%{?suse_version} < 1320
|
||||||
# For SLE 11
|
# For SLE 11
|
||||||
BuildRequires: yast2-bootloader
|
|
||||||
BuildRequires: mkinitrd
|
BuildRequires: mkinitrd
|
||||||
|
BuildRequires: perl-Bootloader
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
%else
|
%else
|
||||||
BuildRequires: dracut
|
BuildRequires: dracut
|
||||||
@ -45,11 +45,11 @@ BuildRequires: dracut
|
|||||||
Summary: package kernel and initrd for OBS VM builds
|
Summary: package kernel and initrd for OBS VM builds
|
||||||
License: GPL-2.0
|
License: GPL-2.0
|
||||||
Group: SLES
|
Group: SLES
|
||||||
Version: 3.14.4
|
Version: 3.14.5
|
||||||
%if 0%{?is_kotd}
|
%if 0%{?is_kotd}
|
||||||
Release: <RELEASE>.g0de0f93
|
Release: <RELEASE>.gf973c87
|
||||||
%else
|
%else
|
||||||
Release: <RELEASE>.g0de0f93
|
Release: <RELEASE>.gf973c87
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%description
|
%description
|
||||||
|
|||||||
@ -36,8 +36,8 @@ BuildRequires: kernel-xen
|
|||||||
ExclusiveArch: @ARCHS@
|
ExclusiveArch: @ARCHS@
|
||||||
%if 0%{?suse_version} < 1320
|
%if 0%{?suse_version} < 1320
|
||||||
# For SLE 11
|
# For SLE 11
|
||||||
BuildRequires: yast2-bootloader
|
|
||||||
BuildRequires: mkinitrd
|
BuildRequires: mkinitrd
|
||||||
|
BuildRequires: perl-Bootloader
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
%else
|
%else
|
||||||
BuildRequires: dracut
|
BuildRequires: dracut
|
||||||
|
|||||||
@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jun 4 08:46:14 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
|
- Linux 3.14.5.
|
||||||
|
- commit 3ee48e0
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jun 2 13:07:44 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- Obsolete kernel-trace by kernel-default
|
||||||
|
- commit 1eb3f59
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri May 30 10:05:06 CEST 2014 - tiwai@suse.de
|
Fri May 30 10:05:06 CEST 2014 - tiwai@suse.de
|
||||||
|
|
||||||
@ -27,6 +39,26 @@ Mon May 12 18:28:31 CEST 2014 - tiwai@suse.de
|
|||||||
with 0 fbs (bnc#875687).
|
with 0 fbs (bnc#875687).
|
||||||
- commit b8d699a
|
- commit b8d699a
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 12 10:15:01 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Do not keep debug symbols in vmlinux-*.gz
|
||||||
|
(bnc#877267)
|
||||||
|
- commit f928d60
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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 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:00:14 CEST 2014 - tiwai@suse.de
|
Wed May 7 12:00:14 CEST 2014 - tiwai@suse.de
|
||||||
|
|
||||||
@ -39,6 +71,22 @@ Tue May 6 22:19:39 CEST 2014 - jslaby@suse.cz
|
|||||||
- Linux 3.14.3.
|
- Linux 3.14.3.
|
||||||
- commit 2a280a3
|
- commit 2a280a3
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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 10:24:08 CEST 2014 - jslaby@suse.cz
|
Mon May 5 10:24:08 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
@ -46,6 +94,18 @@ Mon May 5 10:24:08 CEST 2014 - jslaby@suse.cz
|
|||||||
(bnc#871252 bnc#875690 CVE-2014-0196).
|
(bnc#871252 bnc#875690 CVE-2014-0196).
|
||||||
- commit e72b790
|
- commit e72b790
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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
|
||||||
|
|
||||||
|
- rpm/kernel-obs-qa.spec.in: Use per-flavor path for the logfile
|
||||||
|
- commit 717e968
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Apr 27 14:16:13 CEST 2014 - jslaby@suse.cz
|
Sun Apr 27 14:16:13 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
@ -59,6 +119,31 @@ Thu Apr 24 17:02:34 CEST 2014 - jdelvare@suse.de
|
|||||||
NFC support makes little sense on server-class hardware.
|
NFC support makes little sense on server-class hardware.
|
||||||
- commit 5cbf723
|
- commit 5cbf723
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 24 00:37:16 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Do not store the buildroot in the .hmac file
|
||||||
|
- commit ce5bd7a
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 24 00:00:17 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Add hmaccalc to buildrequires
|
||||||
|
- commit 9cca2fa
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 23 22:45:04 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Generate a hmac singature for the kernel
|
||||||
|
(fate#316930, bnc#856310)
|
||||||
|
- commit 2659f6f
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 23 22:41:58 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Drop conditionals for -kdump and -ps3
|
||||||
|
- commit 01fab08
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Apr 23 16:22:27 CEST 2014 - adrian@suse.de
|
Wed Apr 23 16:22:27 CEST 2014 - adrian@suse.de
|
||||||
|
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
# needsrootforbuild
|
# needsrootforbuild
|
||||||
|
|
||||||
|
|
||||||
%define patchversion 3.14.4
|
%define patchversion 3.14.5
|
||||||
%define variant %{nil}
|
%define variant %{nil}
|
||||||
|
|
||||||
%include %_sourcedir/kernel-spec-macros
|
%include %_sourcedir/kernel-spec-macros
|
||||||
@ -36,11 +36,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|||||||
Summary: Basic QA tests for the kernel
|
Summary: Basic QA tests for the kernel
|
||||||
License: GPL-2.0
|
License: GPL-2.0
|
||||||
Group: SLES
|
Group: SLES
|
||||||
Version: 3.14.4
|
Version: 3.14.5
|
||||||
%if 0%{?is_kotd}
|
%if 0%{?is_kotd}
|
||||||
Release: <RELEASE>.g0de0f93
|
Release: <RELEASE>.gf973c87
|
||||||
%else
|
%else
|
||||||
Release: <RELEASE>.g0de0f93
|
Release: <RELEASE>.gf973c87
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -70,11 +70,11 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
mkdir -p %{buildroot}/usr/share/kernel-qa/
|
mkdir -p %{buildroot}/usr/share/%name
|
||||||
touch %{buildroot}/usr/share/kernel-qa/logfile
|
touch %{buildroot}/usr/share/%name/logfile
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
/usr/share/kernel-qa
|
/usr/share/%name
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
|||||||
@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jun 4 08:46:14 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
|
- Linux 3.14.5.
|
||||||
|
- commit 3ee48e0
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jun 2 13:07:44 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- Obsolete kernel-trace by kernel-default
|
||||||
|
- commit 1eb3f59
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri May 30 10:05:06 CEST 2014 - tiwai@suse.de
|
Fri May 30 10:05:06 CEST 2014 - tiwai@suse.de
|
||||||
|
|
||||||
@ -27,6 +39,26 @@ Mon May 12 18:28:31 CEST 2014 - tiwai@suse.de
|
|||||||
with 0 fbs (bnc#875687).
|
with 0 fbs (bnc#875687).
|
||||||
- commit b8d699a
|
- commit b8d699a
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 12 10:15:01 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Do not keep debug symbols in vmlinux-*.gz
|
||||||
|
(bnc#877267)
|
||||||
|
- commit f928d60
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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 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:00:14 CEST 2014 - tiwai@suse.de
|
Wed May 7 12:00:14 CEST 2014 - tiwai@suse.de
|
||||||
|
|
||||||
@ -39,6 +71,22 @@ Tue May 6 22:19:39 CEST 2014 - jslaby@suse.cz
|
|||||||
- Linux 3.14.3.
|
- Linux 3.14.3.
|
||||||
- commit 2a280a3
|
- commit 2a280a3
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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 10:24:08 CEST 2014 - jslaby@suse.cz
|
Mon May 5 10:24:08 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
@ -46,6 +94,18 @@ Mon May 5 10:24:08 CEST 2014 - jslaby@suse.cz
|
|||||||
(bnc#871252 bnc#875690 CVE-2014-0196).
|
(bnc#871252 bnc#875690 CVE-2014-0196).
|
||||||
- commit e72b790
|
- commit e72b790
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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
|
||||||
|
|
||||||
|
- rpm/kernel-obs-qa.spec.in: Use per-flavor path for the logfile
|
||||||
|
- commit 717e968
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Apr 27 14:16:13 CEST 2014 - jslaby@suse.cz
|
Sun Apr 27 14:16:13 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
@ -59,6 +119,31 @@ Thu Apr 24 17:02:34 CEST 2014 - jdelvare@suse.de
|
|||||||
NFC support makes little sense on server-class hardware.
|
NFC support makes little sense on server-class hardware.
|
||||||
- commit 5cbf723
|
- commit 5cbf723
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 24 00:37:16 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Do not store the buildroot in the .hmac file
|
||||||
|
- commit ce5bd7a
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 24 00:00:17 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Add hmaccalc to buildrequires
|
||||||
|
- commit 9cca2fa
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 23 22:45:04 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Generate a hmac singature for the kernel
|
||||||
|
(fate#316930, bnc#856310)
|
||||||
|
- commit 2659f6f
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 23 22:41:58 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Drop conditionals for -kdump and -ps3
|
||||||
|
- commit 01fab08
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Apr 23 16:22:27 CEST 2014 - adrian@suse.de
|
Wed Apr 23 16:22:27 CEST 2014 - adrian@suse.de
|
||||||
|
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
# needsrootforbuild
|
# needsrootforbuild
|
||||||
|
|
||||||
|
|
||||||
%define patchversion 3.14.4
|
%define patchversion 3.14.5
|
||||||
%define variant %{nil}
|
%define variant %{nil}
|
||||||
|
|
||||||
%include %_sourcedir/kernel-spec-macros
|
%include %_sourcedir/kernel-spec-macros
|
||||||
@ -36,11 +36,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|||||||
Summary: Basic QA tests for the kernel
|
Summary: Basic QA tests for the kernel
|
||||||
License: GPL-2.0
|
License: GPL-2.0
|
||||||
Group: SLES
|
Group: SLES
|
||||||
Version: 3.14.4
|
Version: 3.14.5
|
||||||
%if 0%{?is_kotd}
|
%if 0%{?is_kotd}
|
||||||
Release: <RELEASE>.g0de0f93
|
Release: <RELEASE>.gf973c87
|
||||||
%else
|
%else
|
||||||
Release: <RELEASE>.g0de0f93
|
Release: <RELEASE>.gf973c87
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -70,11 +70,11 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
mkdir -p %{buildroot}/usr/share/kernel-qa/
|
mkdir -p %{buildroot}/usr/share/%name
|
||||||
touch %{buildroot}/usr/share/kernel-qa/logfile
|
touch %{buildroot}/usr/share/%name/logfile
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
/usr/share/kernel-qa
|
/usr/share/%name
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
|||||||
@ -70,11 +70,11 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
mkdir -p %{buildroot}/usr/share/kernel-qa/
|
mkdir -p %{buildroot}/usr/share/%name
|
||||||
touch %{buildroot}/usr/share/kernel-qa/logfile
|
touch %{buildroot}/usr/share/%name/logfile
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
/usr/share/kernel-qa
|
/usr/share/%name
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
|||||||
@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jun 4 08:46:14 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
|
- Linux 3.14.5.
|
||||||
|
- commit 3ee48e0
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jun 2 13:07:44 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- Obsolete kernel-trace by kernel-default
|
||||||
|
- commit 1eb3f59
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri May 30 10:05:06 CEST 2014 - tiwai@suse.de
|
Fri May 30 10:05:06 CEST 2014 - tiwai@suse.de
|
||||||
|
|
||||||
@ -27,6 +39,26 @@ Mon May 12 18:28:31 CEST 2014 - tiwai@suse.de
|
|||||||
with 0 fbs (bnc#875687).
|
with 0 fbs (bnc#875687).
|
||||||
- commit b8d699a
|
- commit b8d699a
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 12 10:15:01 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Do not keep debug symbols in vmlinux-*.gz
|
||||||
|
(bnc#877267)
|
||||||
|
- commit f928d60
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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 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:00:14 CEST 2014 - tiwai@suse.de
|
Wed May 7 12:00:14 CEST 2014 - tiwai@suse.de
|
||||||
|
|
||||||
@ -39,6 +71,22 @@ Tue May 6 22:19:39 CEST 2014 - jslaby@suse.cz
|
|||||||
- Linux 3.14.3.
|
- Linux 3.14.3.
|
||||||
- commit 2a280a3
|
- commit 2a280a3
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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 10:24:08 CEST 2014 - jslaby@suse.cz
|
Mon May 5 10:24:08 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
@ -46,6 +94,18 @@ Mon May 5 10:24:08 CEST 2014 - jslaby@suse.cz
|
|||||||
(bnc#871252 bnc#875690 CVE-2014-0196).
|
(bnc#871252 bnc#875690 CVE-2014-0196).
|
||||||
- commit e72b790
|
- commit e72b790
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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
|
||||||
|
|
||||||
|
- rpm/kernel-obs-qa.spec.in: Use per-flavor path for the logfile
|
||||||
|
- commit 717e968
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Apr 27 14:16:13 CEST 2014 - jslaby@suse.cz
|
Sun Apr 27 14:16:13 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
@ -59,6 +119,31 @@ Thu Apr 24 17:02:34 CEST 2014 - jdelvare@suse.de
|
|||||||
NFC support makes little sense on server-class hardware.
|
NFC support makes little sense on server-class hardware.
|
||||||
- commit 5cbf723
|
- commit 5cbf723
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 24 00:37:16 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Do not store the buildroot in the .hmac file
|
||||||
|
- commit ce5bd7a
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 24 00:00:17 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Add hmaccalc to buildrequires
|
||||||
|
- commit 9cca2fa
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 23 22:45:04 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Generate a hmac singature for the kernel
|
||||||
|
(fate#316930, bnc#856310)
|
||||||
|
- commit 2659f6f
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 23 22:41:58 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Drop conditionals for -kdump and -ps3
|
||||||
|
- commit 01fab08
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Apr 23 16:22:27 CEST 2014 - adrian@suse.de
|
Wed Apr 23 16:22:27 CEST 2014 - adrian@suse.de
|
||||||
|
|
||||||
|
|||||||
125
kernel-pae.spec
125
kernel-pae.spec
@ -20,7 +20,7 @@
|
|||||||
# needssslcertforbuild
|
# needssslcertforbuild
|
||||||
|
|
||||||
%define srcversion 3.14
|
%define srcversion 3.14
|
||||||
%define patchversion 3.14.4
|
%define patchversion 3.14.5
|
||||||
%define variant %{nil}
|
%define variant %{nil}
|
||||||
%define vanilla_only 0
|
%define vanilla_only 0
|
||||||
|
|
||||||
@ -28,10 +28,8 @@
|
|||||||
|
|
||||||
%define build_flavor pae
|
%define build_flavor pae
|
||||||
%define build_default (%build_flavor == "default")
|
%define build_default (%build_flavor == "default")
|
||||||
%define build_kdump (%build_flavor == "kdump")
|
|
||||||
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
|
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
|
||||||
%define build_vanilla (%build_flavor == "vanilla")
|
%define build_vanilla (%build_flavor == "vanilla")
|
||||||
%define build_ps3 (%build_flavor == "ps3")
|
|
||||||
|
|
||||||
%define build_src_dir %my_builddir/linux-%srcversion
|
%define build_src_dir %my_builddir/linux-%srcversion
|
||||||
%define src_install_dir /usr/src/linux-%kernelrelease%variant
|
%define src_install_dir /usr/src/linux-%kernelrelease%variant
|
||||||
@ -61,16 +59,17 @@ Name: kernel-pae
|
|||||||
Summary: Kernel with PAE Support
|
Summary: Kernel with PAE Support
|
||||||
License: GPL-2.0
|
License: GPL-2.0
|
||||||
Group: System/Kernel
|
Group: System/Kernel
|
||||||
Version: 3.14.4
|
Version: 3.14.5
|
||||||
%if 0%{?is_kotd}
|
%if 0%{?is_kotd}
|
||||||
Release: <RELEASE>.g0de0f93
|
Release: <RELEASE>.gf973c87
|
||||||
%else
|
%else
|
||||||
Release: <RELEASE>.g0de0f93
|
Release: <RELEASE>.gf973c87
|
||||||
%endif
|
%endif
|
||||||
Url: http://www.kernel.org/
|
Url: http://www.kernel.org/
|
||||||
BuildRequires: bc
|
BuildRequires: bc
|
||||||
BuildRequires: coreutils
|
BuildRequires: coreutils
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
|
BuildRequires: hmaccalc
|
||||||
BuildRequires: modutils
|
BuildRequires: modutils
|
||||||
BuildRequires: sparse
|
BuildRequires: sparse
|
||||||
# Used to sign the kernel in the buildservice
|
# Used to sign the kernel in the buildservice
|
||||||
@ -541,49 +540,34 @@ cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
|
|||||||
|
|
||||||
add_vmlinux()
|
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
|
cp vmlinux %buildroot/$vmlinux
|
||||||
>%my_builddir/vmlinux.debug.files
|
# make sure that find-debuginfo.sh picks it up. In the filelist, we
|
||||||
|
# mark the file 0644 again
|
||||||
|
chmod +x %buildroot/$vmlinux
|
||||||
|
if test $1 == "--compressed"; then
|
||||||
%if 0%{?__debug_package:1}
|
%if 0%{?__debug_package:1}
|
||||||
if $compressed; then
|
# split the debug information just to keep the compressed file
|
||||||
|
# reasonably small
|
||||||
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
|
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
|
||||||
mkdir -p $(dirname %buildroot/$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 \
|
objcopy --only-keep-debug \
|
||||||
%buildroot/$vmlinux \
|
%buildroot/$vmlinux \
|
||||||
%buildroot/$vmlinux_debug || :
|
%buildroot/$vmlinux_debug || :
|
||||||
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
|
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
|
||||||
--strip-debug \
|
--strip-debug \
|
||||||
%buildroot/$vmlinux || :
|
%buildroot/$vmlinux || :
|
||||||
mkdir -p %buildroot/usr/src/debug
|
# let find-debuginfo.sh do the real job
|
||||||
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
|
rm -f %buildroot/$vmlinux_debug
|
||||||
| ( 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)
|
|
||||||
chmod +x %buildroot/$vmlinux
|
|
||||||
fi
|
|
||||||
%endif
|
%endif
|
||||||
if $compressed; then
|
gzip -n -k -9 %buildroot/$vmlinux
|
||||||
gzip -n -9 %buildroot/$vmlinux
|
ghost_vmlinux=true
|
||||||
chmod a-x %buildroot/$vmlinux.gz
|
else
|
||||||
|
ghost_vmlinux=false
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
%if %build_kdump
|
|
||||||
add_vmlinux
|
|
||||||
image=vmlinux
|
|
||||||
%else
|
|
||||||
|
|
||||||
# architecture specifics
|
# architecture specifics
|
||||||
%ifarch %ix86 x86_64
|
%ifarch %ix86 x86_64
|
||||||
add_vmlinux --compressed
|
add_vmlinux --compressed
|
||||||
@ -649,8 +633,9 @@ add_vmlinux()
|
|||||||
cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor
|
cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# end of build_kdump
|
if test -x /usr/lib/rpm/pesign/gen-hmac; then
|
||||||
%endif
|
$_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor
|
||||||
|
fi
|
||||||
|
|
||||||
# Package the compiled-in certificates as DER files in /etc/uefi/certs
|
# Package the compiled-in certificates as DER files in /etc/uefi/certs
|
||||||
# and have mokutil enroll them when the kernel is installed
|
# and have mokutil enroll them when the kernel is installed
|
||||||
@ -706,7 +691,7 @@ for sub in '-base' '' '-extra'; do
|
|||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
|
||||||
%if %build_kdump || %build_xen || %build_vanilla || %build_ps3
|
%if %build_xen || %build_vanilla
|
||||||
# keep this -suffix list in sync with post.sh and postun.sh
|
# keep this -suffix list in sync with post.sh and postun.sh
|
||||||
suffix=-%build_flavor
|
suffix=-%build_flavor
|
||||||
%endif
|
%endif
|
||||||
@ -734,6 +719,8 @@ make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
|
|||||||
# space in /boot.
|
# space in /boot.
|
||||||
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
|
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
|
||||||
bs=1024 seek=2047 count=1
|
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
|
if [ %CONFIG_MODULES = y ]; then
|
||||||
mkdir -p %rpm_install_dir/%cpu_arch_flavor
|
mkdir -p %rpm_install_dir/%cpu_arch_flavor
|
||||||
@ -877,7 +864,7 @@ add_dirs_to_filelist() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Collect the file lists.
|
# Collect the file lists.
|
||||||
shopt -s nullglob
|
shopt -s nullglob dotglob
|
||||||
> %my_builddir/kernel-devel.files
|
> %my_builddir/kernel-devel.files
|
||||||
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
|
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
|
||||||
f=${file##%buildroot}
|
f=${file##%buildroot}
|
||||||
@ -885,22 +872,39 @@ for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; d
|
|||||||
done
|
done
|
||||||
|
|
||||||
{ cd %buildroot
|
{ cd %buildroot
|
||||||
find boot \
|
for f in boot/*; do
|
||||||
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
|
if test -L "$f"; then
|
||||||
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
|
echo "%%ghost /$f"
|
||||||
-type f -printf '/%%p\n'
|
continue
|
||||||
|
elif test ! -f "$f"; then
|
||||||
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
|
continue
|
||||||
# the file gets removed when uninstalling the kernel.
|
fi
|
||||||
echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump'
|
case "$f" in
|
||||||
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump
|
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
|
if [ %CONFIG_MODULES = y ]; then
|
||||||
find lib/modules/%kernelrelease-%build_flavor \
|
find lib/modules/%kernelrelease-%build_flavor \
|
||||||
-type d -o \
|
-type d -o \
|
||||||
\( -path '*/modules.*' ! -path '*/modules.order' \
|
\( -path '*/modules.*' ! -path '*/modules.order' \
|
||||||
! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \
|
! -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
|
cat %my_builddir/base-modules
|
||||||
fi
|
fi
|
||||||
if test %CONFIG_MODULE_SIG = "y"; then
|
if test %CONFIG_MODULE_SIG = "y"; then
|
||||||
@ -913,10 +917,7 @@ done
|
|||||||
if [ -e .%_docdir/%name ]; then
|
if [ -e .%_docdir/%name ]; then
|
||||||
echo "%%doc %_docdir/%name"
|
echo "%%doc %_docdir/%name"
|
||||||
fi
|
fi
|
||||||
} | sort -u >%my_builddir/tmp
|
} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files
|
||||||
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
|
|
||||||
|
|
||||||
%if %split_base
|
%if %split_base
|
||||||
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
|
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
|
||||||
@ -1093,16 +1094,4 @@ kernel module packages) against the %build_flavor flavor of the kernel.
|
|||||||
%endif
|
%endif
|
||||||
%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
|
%changelog
|
||||||
|
|||||||
@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jun 4 08:46:14 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
|
- Linux 3.14.5.
|
||||||
|
- commit 3ee48e0
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jun 2 13:07:44 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- Obsolete kernel-trace by kernel-default
|
||||||
|
- commit 1eb3f59
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri May 30 10:05:06 CEST 2014 - tiwai@suse.de
|
Fri May 30 10:05:06 CEST 2014 - tiwai@suse.de
|
||||||
|
|
||||||
@ -27,6 +39,26 @@ Mon May 12 18:28:31 CEST 2014 - tiwai@suse.de
|
|||||||
with 0 fbs (bnc#875687).
|
with 0 fbs (bnc#875687).
|
||||||
- commit b8d699a
|
- commit b8d699a
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 12 10:15:01 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Do not keep debug symbols in vmlinux-*.gz
|
||||||
|
(bnc#877267)
|
||||||
|
- commit f928d60
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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 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:00:14 CEST 2014 - tiwai@suse.de
|
Wed May 7 12:00:14 CEST 2014 - tiwai@suse.de
|
||||||
|
|
||||||
@ -39,6 +71,22 @@ Tue May 6 22:19:39 CEST 2014 - jslaby@suse.cz
|
|||||||
- Linux 3.14.3.
|
- Linux 3.14.3.
|
||||||
- commit 2a280a3
|
- commit 2a280a3
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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 10:24:08 CEST 2014 - jslaby@suse.cz
|
Mon May 5 10:24:08 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
@ -46,6 +94,18 @@ Mon May 5 10:24:08 CEST 2014 - jslaby@suse.cz
|
|||||||
(bnc#871252 bnc#875690 CVE-2014-0196).
|
(bnc#871252 bnc#875690 CVE-2014-0196).
|
||||||
- commit e72b790
|
- commit e72b790
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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
|
||||||
|
|
||||||
|
- rpm/kernel-obs-qa.spec.in: Use per-flavor path for the logfile
|
||||||
|
- commit 717e968
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Apr 27 14:16:13 CEST 2014 - jslaby@suse.cz
|
Sun Apr 27 14:16:13 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
@ -59,6 +119,31 @@ Thu Apr 24 17:02:34 CEST 2014 - jdelvare@suse.de
|
|||||||
NFC support makes little sense on server-class hardware.
|
NFC support makes little sense on server-class hardware.
|
||||||
- commit 5cbf723
|
- commit 5cbf723
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 24 00:37:16 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Do not store the buildroot in the .hmac file
|
||||||
|
- commit ce5bd7a
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 24 00:00:17 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Add hmaccalc to buildrequires
|
||||||
|
- commit 9cca2fa
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 23 22:45:04 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Generate a hmac singature for the kernel
|
||||||
|
(fate#316930, bnc#856310)
|
||||||
|
- commit 2659f6f
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 23 22:41:58 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Drop conditionals for -kdump and -ps3
|
||||||
|
- commit 01fab08
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Apr 23 16:22:27 CEST 2014 - adrian@suse.de
|
Wed Apr 23 16:22:27 CEST 2014 - adrian@suse.de
|
||||||
|
|
||||||
|
|||||||
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
|
|
||||||
%define srcversion 3.14
|
%define srcversion 3.14
|
||||||
%define patchversion 3.14.4
|
%define patchversion 3.14.5
|
||||||
%define variant %{nil}
|
%define variant %{nil}
|
||||||
%define vanilla_only 0
|
%define vanilla_only 0
|
||||||
|
|
||||||
@ -30,11 +30,11 @@ Name: kernel-source
|
|||||||
Summary: The Linux Kernel Sources
|
Summary: The Linux Kernel Sources
|
||||||
License: GPL-2.0
|
License: GPL-2.0
|
||||||
Group: Development/Sources
|
Group: Development/Sources
|
||||||
Version: 3.14.4
|
Version: 3.14.5
|
||||||
%if 0%{?is_kotd}
|
%if 0%{?is_kotd}
|
||||||
Release: <RELEASE>.g0de0f93
|
Release: <RELEASE>.gf973c87
|
||||||
%else
|
%else
|
||||||
Release: <RELEASE>.g0de0f93
|
Release: <RELEASE>.gf973c87
|
||||||
%endif
|
%endif
|
||||||
Url: http://www.kernel.org/
|
Url: http://www.kernel.org/
|
||||||
AutoReqProv: off
|
AutoReqProv: off
|
||||||
|
|||||||
@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jun 4 08:46:14 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
|
- Linux 3.14.5.
|
||||||
|
- commit 3ee48e0
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jun 2 13:07:44 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- Obsolete kernel-trace by kernel-default
|
||||||
|
- commit 1eb3f59
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri May 30 10:05:06 CEST 2014 - tiwai@suse.de
|
Fri May 30 10:05:06 CEST 2014 - tiwai@suse.de
|
||||||
|
|
||||||
@ -27,6 +39,26 @@ Mon May 12 18:28:31 CEST 2014 - tiwai@suse.de
|
|||||||
with 0 fbs (bnc#875687).
|
with 0 fbs (bnc#875687).
|
||||||
- commit b8d699a
|
- commit b8d699a
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 12 10:15:01 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Do not keep debug symbols in vmlinux-*.gz
|
||||||
|
(bnc#877267)
|
||||||
|
- commit f928d60
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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 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:00:14 CEST 2014 - tiwai@suse.de
|
Wed May 7 12:00:14 CEST 2014 - tiwai@suse.de
|
||||||
|
|
||||||
@ -39,6 +71,22 @@ Tue May 6 22:19:39 CEST 2014 - jslaby@suse.cz
|
|||||||
- Linux 3.14.3.
|
- Linux 3.14.3.
|
||||||
- commit 2a280a3
|
- commit 2a280a3
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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 10:24:08 CEST 2014 - jslaby@suse.cz
|
Mon May 5 10:24:08 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
@ -46,6 +94,18 @@ Mon May 5 10:24:08 CEST 2014 - jslaby@suse.cz
|
|||||||
(bnc#871252 bnc#875690 CVE-2014-0196).
|
(bnc#871252 bnc#875690 CVE-2014-0196).
|
||||||
- commit e72b790
|
- commit e72b790
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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
|
||||||
|
|
||||||
|
- rpm/kernel-obs-qa.spec.in: Use per-flavor path for the logfile
|
||||||
|
- commit 717e968
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Apr 27 14:16:13 CEST 2014 - jslaby@suse.cz
|
Sun Apr 27 14:16:13 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
@ -59,6 +119,31 @@ Thu Apr 24 17:02:34 CEST 2014 - jdelvare@suse.de
|
|||||||
NFC support makes little sense on server-class hardware.
|
NFC support makes little sense on server-class hardware.
|
||||||
- commit 5cbf723
|
- commit 5cbf723
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 24 00:37:16 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Do not store the buildroot in the .hmac file
|
||||||
|
- commit ce5bd7a
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 24 00:00:17 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Add hmaccalc to buildrequires
|
||||||
|
- commit 9cca2fa
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 23 22:45:04 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Generate a hmac singature for the kernel
|
||||||
|
(fate#316930, bnc#856310)
|
||||||
|
- commit 2659f6f
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 23 22:41:58 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Drop conditionals for -kdump and -ps3
|
||||||
|
- commit 01fab08
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Apr 23 16:22:27 CEST 2014 - adrian@suse.de
|
Wed Apr 23 16:22:27 CEST 2014 - adrian@suse.de
|
||||||
|
|
||||||
|
|||||||
@ -24,12 +24,12 @@ Name: kernel-syms
|
|||||||
Summary: Kernel Symbol Versions (modversions)
|
Summary: Kernel Symbol Versions (modversions)
|
||||||
License: GPL-2.0
|
License: GPL-2.0
|
||||||
Group: Development/Sources
|
Group: Development/Sources
|
||||||
Version: 3.14.4
|
Version: 3.14.5
|
||||||
%if %using_buildservice
|
%if %using_buildservice
|
||||||
%if 0%{?is_kotd}
|
%if 0%{?is_kotd}
|
||||||
Release: <RELEASE>.g0de0f93
|
Release: <RELEASE>.gf973c87
|
||||||
%else
|
%else
|
||||||
Release: <RELEASE>.g0de0f93
|
Release: <RELEASE>.gf973c87
|
||||||
%endif
|
%endif
|
||||||
%else
|
%else
|
||||||
%define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0)
|
%define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0)
|
||||||
|
|||||||
@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jun 4 08:46:14 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
|
- Linux 3.14.5.
|
||||||
|
- commit 3ee48e0
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jun 2 13:07:44 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- Obsolete kernel-trace by kernel-default
|
||||||
|
- commit 1eb3f59
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri May 30 10:05:06 CEST 2014 - tiwai@suse.de
|
Fri May 30 10:05:06 CEST 2014 - tiwai@suse.de
|
||||||
|
|
||||||
@ -27,6 +39,26 @@ Mon May 12 18:28:31 CEST 2014 - tiwai@suse.de
|
|||||||
with 0 fbs (bnc#875687).
|
with 0 fbs (bnc#875687).
|
||||||
- commit b8d699a
|
- commit b8d699a
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 12 10:15:01 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Do not keep debug symbols in vmlinux-*.gz
|
||||||
|
(bnc#877267)
|
||||||
|
- commit f928d60
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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 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:00:14 CEST 2014 - tiwai@suse.de
|
Wed May 7 12:00:14 CEST 2014 - tiwai@suse.de
|
||||||
|
|
||||||
@ -39,6 +71,22 @@ Tue May 6 22:19:39 CEST 2014 - jslaby@suse.cz
|
|||||||
- Linux 3.14.3.
|
- Linux 3.14.3.
|
||||||
- commit 2a280a3
|
- commit 2a280a3
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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 10:24:08 CEST 2014 - jslaby@suse.cz
|
Mon May 5 10:24:08 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
@ -46,6 +94,18 @@ Mon May 5 10:24:08 CEST 2014 - jslaby@suse.cz
|
|||||||
(bnc#871252 bnc#875690 CVE-2014-0196).
|
(bnc#871252 bnc#875690 CVE-2014-0196).
|
||||||
- commit e72b790
|
- commit e72b790
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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
|
||||||
|
|
||||||
|
- rpm/kernel-obs-qa.spec.in: Use per-flavor path for the logfile
|
||||||
|
- commit 717e968
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Apr 27 14:16:13 CEST 2014 - jslaby@suse.cz
|
Sun Apr 27 14:16:13 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
@ -59,6 +119,31 @@ Thu Apr 24 17:02:34 CEST 2014 - jdelvare@suse.de
|
|||||||
NFC support makes little sense on server-class hardware.
|
NFC support makes little sense on server-class hardware.
|
||||||
- commit 5cbf723
|
- commit 5cbf723
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 24 00:37:16 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Do not store the buildroot in the .hmac file
|
||||||
|
- commit ce5bd7a
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 24 00:00:17 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Add hmaccalc to buildrequires
|
||||||
|
- commit 9cca2fa
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 23 22:45:04 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Generate a hmac singature for the kernel
|
||||||
|
(fate#316930, bnc#856310)
|
||||||
|
- commit 2659f6f
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 23 22:41:58 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Drop conditionals for -kdump and -ps3
|
||||||
|
- commit 01fab08
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Apr 23 16:22:27 CEST 2014 - adrian@suse.de
|
Wed Apr 23 16:22:27 CEST 2014 - adrian@suse.de
|
||||||
|
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
# needssslcertforbuild
|
# needssslcertforbuild
|
||||||
|
|
||||||
%define srcversion 3.14
|
%define srcversion 3.14
|
||||||
%define patchversion 3.14.4
|
%define patchversion 3.14.5
|
||||||
%define variant %{nil}
|
%define variant %{nil}
|
||||||
%define vanilla_only 0
|
%define vanilla_only 0
|
||||||
|
|
||||||
@ -28,10 +28,8 @@
|
|||||||
|
|
||||||
%define build_flavor vanilla
|
%define build_flavor vanilla
|
||||||
%define build_default (%build_flavor == "default")
|
%define build_default (%build_flavor == "default")
|
||||||
%define build_kdump (%build_flavor == "kdump")
|
|
||||||
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
|
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
|
||||||
%define build_vanilla (%build_flavor == "vanilla")
|
%define build_vanilla (%build_flavor == "vanilla")
|
||||||
%define build_ps3 (%build_flavor == "ps3")
|
|
||||||
|
|
||||||
%define build_src_dir %my_builddir/linux-%srcversion
|
%define build_src_dir %my_builddir/linux-%srcversion
|
||||||
%define src_install_dir /usr/src/linux-%kernelrelease%variant
|
%define src_install_dir /usr/src/linux-%kernelrelease%variant
|
||||||
@ -61,16 +59,17 @@ Name: kernel-vanilla
|
|||||||
Summary: The Standard Kernel - without any SUSE patches
|
Summary: The Standard Kernel - without any SUSE patches
|
||||||
License: GPL-2.0
|
License: GPL-2.0
|
||||||
Group: System/Kernel
|
Group: System/Kernel
|
||||||
Version: 3.14.4
|
Version: 3.14.5
|
||||||
%if 0%{?is_kotd}
|
%if 0%{?is_kotd}
|
||||||
Release: <RELEASE>.g0de0f93
|
Release: <RELEASE>.gf973c87
|
||||||
%else
|
%else
|
||||||
Release: <RELEASE>.g0de0f93
|
Release: <RELEASE>.gf973c87
|
||||||
%endif
|
%endif
|
||||||
Url: http://www.kernel.org/
|
Url: http://www.kernel.org/
|
||||||
BuildRequires: bc
|
BuildRequires: bc
|
||||||
BuildRequires: coreutils
|
BuildRequires: coreutils
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
|
BuildRequires: hmaccalc
|
||||||
BuildRequires: modutils
|
BuildRequires: modutils
|
||||||
BuildRequires: sparse
|
BuildRequires: sparse
|
||||||
# Used to sign the kernel in the buildservice
|
# Used to sign the kernel in the buildservice
|
||||||
@ -529,49 +528,34 @@ cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
|
|||||||
|
|
||||||
add_vmlinux()
|
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
|
cp vmlinux %buildroot/$vmlinux
|
||||||
>%my_builddir/vmlinux.debug.files
|
# make sure that find-debuginfo.sh picks it up. In the filelist, we
|
||||||
|
# mark the file 0644 again
|
||||||
|
chmod +x %buildroot/$vmlinux
|
||||||
|
if test $1 == "--compressed"; then
|
||||||
%if 0%{?__debug_package:1}
|
%if 0%{?__debug_package:1}
|
||||||
if $compressed; then
|
# split the debug information just to keep the compressed file
|
||||||
|
# reasonably small
|
||||||
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
|
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
|
||||||
mkdir -p $(dirname %buildroot/$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 \
|
objcopy --only-keep-debug \
|
||||||
%buildroot/$vmlinux \
|
%buildroot/$vmlinux \
|
||||||
%buildroot/$vmlinux_debug || :
|
%buildroot/$vmlinux_debug || :
|
||||||
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
|
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
|
||||||
--strip-debug \
|
--strip-debug \
|
||||||
%buildroot/$vmlinux || :
|
%buildroot/$vmlinux || :
|
||||||
mkdir -p %buildroot/usr/src/debug
|
# let find-debuginfo.sh do the real job
|
||||||
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
|
rm -f %buildroot/$vmlinux_debug
|
||||||
| ( 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)
|
|
||||||
chmod +x %buildroot/$vmlinux
|
|
||||||
fi
|
|
||||||
%endif
|
%endif
|
||||||
if $compressed; then
|
gzip -n -k -9 %buildroot/$vmlinux
|
||||||
gzip -n -9 %buildroot/$vmlinux
|
ghost_vmlinux=true
|
||||||
chmod a-x %buildroot/$vmlinux.gz
|
else
|
||||||
|
ghost_vmlinux=false
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
%if %build_kdump
|
|
||||||
add_vmlinux
|
|
||||||
image=vmlinux
|
|
||||||
%else
|
|
||||||
|
|
||||||
# architecture specifics
|
# architecture specifics
|
||||||
%ifarch %ix86 x86_64
|
%ifarch %ix86 x86_64
|
||||||
add_vmlinux --compressed
|
add_vmlinux --compressed
|
||||||
@ -637,8 +621,9 @@ add_vmlinux()
|
|||||||
cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor
|
cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# end of build_kdump
|
if test -x /usr/lib/rpm/pesign/gen-hmac; then
|
||||||
%endif
|
$_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor
|
||||||
|
fi
|
||||||
|
|
||||||
# Package the compiled-in certificates as DER files in /etc/uefi/certs
|
# Package the compiled-in certificates as DER files in /etc/uefi/certs
|
||||||
# and have mokutil enroll them when the kernel is installed
|
# and have mokutil enroll them when the kernel is installed
|
||||||
@ -694,7 +679,7 @@ for sub in '-base' '' '-extra'; do
|
|||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
|
||||||
%if %build_kdump || %build_xen || %build_vanilla || %build_ps3
|
%if %build_xen || %build_vanilla
|
||||||
# keep this -suffix list in sync with post.sh and postun.sh
|
# keep this -suffix list in sync with post.sh and postun.sh
|
||||||
suffix=-%build_flavor
|
suffix=-%build_flavor
|
||||||
%endif
|
%endif
|
||||||
@ -722,6 +707,8 @@ make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
|
|||||||
# space in /boot.
|
# space in /boot.
|
||||||
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
|
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
|
||||||
bs=1024 seek=2047 count=1
|
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
|
if [ %CONFIG_MODULES = y ]; then
|
||||||
mkdir -p %rpm_install_dir/%cpu_arch_flavor
|
mkdir -p %rpm_install_dir/%cpu_arch_flavor
|
||||||
@ -865,7 +852,7 @@ add_dirs_to_filelist() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Collect the file lists.
|
# Collect the file lists.
|
||||||
shopt -s nullglob
|
shopt -s nullglob dotglob
|
||||||
> %my_builddir/kernel-devel.files
|
> %my_builddir/kernel-devel.files
|
||||||
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
|
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
|
||||||
f=${file##%buildroot}
|
f=${file##%buildroot}
|
||||||
@ -873,22 +860,39 @@ for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; d
|
|||||||
done
|
done
|
||||||
|
|
||||||
{ cd %buildroot
|
{ cd %buildroot
|
||||||
find boot \
|
for f in boot/*; do
|
||||||
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
|
if test -L "$f"; then
|
||||||
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
|
echo "%%ghost /$f"
|
||||||
-type f -printf '/%%p\n'
|
continue
|
||||||
|
elif test ! -f "$f"; then
|
||||||
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
|
continue
|
||||||
# the file gets removed when uninstalling the kernel.
|
fi
|
||||||
echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump'
|
case "$f" in
|
||||||
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump
|
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
|
if [ %CONFIG_MODULES = y ]; then
|
||||||
find lib/modules/%kernelrelease-%build_flavor \
|
find lib/modules/%kernelrelease-%build_flavor \
|
||||||
-type d -o \
|
-type d -o \
|
||||||
\( -path '*/modules.*' ! -path '*/modules.order' \
|
\( -path '*/modules.*' ! -path '*/modules.order' \
|
||||||
! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \
|
! -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
|
cat %my_builddir/base-modules
|
||||||
fi
|
fi
|
||||||
if test %CONFIG_MODULE_SIG = "y"; then
|
if test %CONFIG_MODULE_SIG = "y"; then
|
||||||
@ -901,10 +905,7 @@ done
|
|||||||
if [ -e .%_docdir/%name ]; then
|
if [ -e .%_docdir/%name ]; then
|
||||||
echo "%%doc %_docdir/%name"
|
echo "%%doc %_docdir/%name"
|
||||||
fi
|
fi
|
||||||
} | sort -u >%my_builddir/tmp
|
} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files
|
||||||
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
|
|
||||||
|
|
||||||
%if %split_base
|
%if %split_base
|
||||||
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
|
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
|
||||||
@ -1064,16 +1065,4 @@ kernel module packages) against the %build_flavor flavor of the kernel.
|
|||||||
%endif
|
%endif
|
||||||
%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
|
%changelog
|
||||||
|
|||||||
@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jun 4 08:46:14 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
|
- Linux 3.14.5.
|
||||||
|
- commit 3ee48e0
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jun 2 13:07:44 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- Obsolete kernel-trace by kernel-default
|
||||||
|
- commit 1eb3f59
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri May 30 10:05:06 CEST 2014 - tiwai@suse.de
|
Fri May 30 10:05:06 CEST 2014 - tiwai@suse.de
|
||||||
|
|
||||||
@ -27,6 +39,26 @@ Mon May 12 18:28:31 CEST 2014 - tiwai@suse.de
|
|||||||
with 0 fbs (bnc#875687).
|
with 0 fbs (bnc#875687).
|
||||||
- commit b8d699a
|
- commit b8d699a
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 12 10:15:01 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Do not keep debug symbols in vmlinux-*.gz
|
||||||
|
(bnc#877267)
|
||||||
|
- commit f928d60
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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 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:00:14 CEST 2014 - tiwai@suse.de
|
Wed May 7 12:00:14 CEST 2014 - tiwai@suse.de
|
||||||
|
|
||||||
@ -39,6 +71,22 @@ Tue May 6 22:19:39 CEST 2014 - jslaby@suse.cz
|
|||||||
- Linux 3.14.3.
|
- Linux 3.14.3.
|
||||||
- commit 2a280a3
|
- commit 2a280a3
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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 10:24:08 CEST 2014 - jslaby@suse.cz
|
Mon May 5 10:24:08 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
@ -46,6 +94,18 @@ Mon May 5 10:24:08 CEST 2014 - jslaby@suse.cz
|
|||||||
(bnc#871252 bnc#875690 CVE-2014-0196).
|
(bnc#871252 bnc#875690 CVE-2014-0196).
|
||||||
- commit e72b790
|
- commit e72b790
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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
|
||||||
|
|
||||||
|
- rpm/kernel-obs-qa.spec.in: Use per-flavor path for the logfile
|
||||||
|
- commit 717e968
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Apr 27 14:16:13 CEST 2014 - jslaby@suse.cz
|
Sun Apr 27 14:16:13 CEST 2014 - jslaby@suse.cz
|
||||||
|
|
||||||
@ -59,6 +119,31 @@ Thu Apr 24 17:02:34 CEST 2014 - jdelvare@suse.de
|
|||||||
NFC support makes little sense on server-class hardware.
|
NFC support makes little sense on server-class hardware.
|
||||||
- commit 5cbf723
|
- commit 5cbf723
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 24 00:37:16 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Do not store the buildroot in the .hmac file
|
||||||
|
- commit ce5bd7a
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 24 00:00:17 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Add hmaccalc to buildrequires
|
||||||
|
- commit 9cca2fa
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 23 22:45:04 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Generate a hmac singature for the kernel
|
||||||
|
(fate#316930, bnc#856310)
|
||||||
|
- commit 2659f6f
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 23 22:41:58 CEST 2014 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- rpm/kernel-binary.spec.in: Drop conditionals for -kdump and -ps3
|
||||||
|
- commit 01fab08
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Apr 23 16:22:27 CEST 2014 - adrian@suse.de
|
Wed Apr 23 16:22:27 CEST 2014 - adrian@suse.de
|
||||||
|
|
||||||
|
|||||||
125
kernel-xen.spec
125
kernel-xen.spec
@ -20,7 +20,7 @@
|
|||||||
# needssslcertforbuild
|
# needssslcertforbuild
|
||||||
|
|
||||||
%define srcversion 3.14
|
%define srcversion 3.14
|
||||||
%define patchversion 3.14.4
|
%define patchversion 3.14.5
|
||||||
%define variant %{nil}
|
%define variant %{nil}
|
||||||
%define vanilla_only 0
|
%define vanilla_only 0
|
||||||
|
|
||||||
@ -28,10 +28,8 @@
|
|||||||
|
|
||||||
%define build_flavor xen
|
%define build_flavor xen
|
||||||
%define build_default (%build_flavor == "default")
|
%define build_default (%build_flavor == "default")
|
||||||
%define build_kdump (%build_flavor == "kdump")
|
|
||||||
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
|
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
|
||||||
%define build_vanilla (%build_flavor == "vanilla")
|
%define build_vanilla (%build_flavor == "vanilla")
|
||||||
%define build_ps3 (%build_flavor == "ps3")
|
|
||||||
|
|
||||||
%define build_src_dir %my_builddir/linux-%srcversion
|
%define build_src_dir %my_builddir/linux-%srcversion
|
||||||
%define src_install_dir /usr/src/linux-%kernelrelease%variant
|
%define src_install_dir /usr/src/linux-%kernelrelease%variant
|
||||||
@ -61,16 +59,17 @@ Name: kernel-xen
|
|||||||
Summary: The Xen Kernel
|
Summary: The Xen Kernel
|
||||||
License: GPL-2.0
|
License: GPL-2.0
|
||||||
Group: System/Kernel
|
Group: System/Kernel
|
||||||
Version: 3.14.4
|
Version: 3.14.5
|
||||||
%if 0%{?is_kotd}
|
%if 0%{?is_kotd}
|
||||||
Release: <RELEASE>.g0de0f93
|
Release: <RELEASE>.gf973c87
|
||||||
%else
|
%else
|
||||||
Release: <RELEASE>.g0de0f93
|
Release: <RELEASE>.gf973c87
|
||||||
%endif
|
%endif
|
||||||
Url: http://www.kernel.org/
|
Url: http://www.kernel.org/
|
||||||
BuildRequires: bc
|
BuildRequires: bc
|
||||||
BuildRequires: coreutils
|
BuildRequires: coreutils
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
|
BuildRequires: hmaccalc
|
||||||
BuildRequires: modutils
|
BuildRequires: modutils
|
||||||
BuildRequires: sparse
|
BuildRequires: sparse
|
||||||
# Used to sign the kernel in the buildservice
|
# Used to sign the kernel in the buildservice
|
||||||
@ -535,49 +534,34 @@ cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
|
|||||||
|
|
||||||
add_vmlinux()
|
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
|
cp vmlinux %buildroot/$vmlinux
|
||||||
>%my_builddir/vmlinux.debug.files
|
# make sure that find-debuginfo.sh picks it up. In the filelist, we
|
||||||
|
# mark the file 0644 again
|
||||||
|
chmod +x %buildroot/$vmlinux
|
||||||
|
if test $1 == "--compressed"; then
|
||||||
%if 0%{?__debug_package:1}
|
%if 0%{?__debug_package:1}
|
||||||
if $compressed; then
|
# split the debug information just to keep the compressed file
|
||||||
|
# reasonably small
|
||||||
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
|
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
|
||||||
mkdir -p $(dirname %buildroot/$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 \
|
objcopy --only-keep-debug \
|
||||||
%buildroot/$vmlinux \
|
%buildroot/$vmlinux \
|
||||||
%buildroot/$vmlinux_debug || :
|
%buildroot/$vmlinux_debug || :
|
||||||
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
|
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
|
||||||
--strip-debug \
|
--strip-debug \
|
||||||
%buildroot/$vmlinux || :
|
%buildroot/$vmlinux || :
|
||||||
mkdir -p %buildroot/usr/src/debug
|
# let find-debuginfo.sh do the real job
|
||||||
LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
|
rm -f %buildroot/$vmlinux_debug
|
||||||
| ( 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)
|
|
||||||
chmod +x %buildroot/$vmlinux
|
|
||||||
fi
|
|
||||||
%endif
|
%endif
|
||||||
if $compressed; then
|
gzip -n -k -9 %buildroot/$vmlinux
|
||||||
gzip -n -9 %buildroot/$vmlinux
|
ghost_vmlinux=true
|
||||||
chmod a-x %buildroot/$vmlinux.gz
|
else
|
||||||
|
ghost_vmlinux=false
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
%if %build_kdump
|
|
||||||
add_vmlinux
|
|
||||||
image=vmlinux
|
|
||||||
%else
|
|
||||||
|
|
||||||
# architecture specifics
|
# architecture specifics
|
||||||
%ifarch %ix86 x86_64
|
%ifarch %ix86 x86_64
|
||||||
add_vmlinux --compressed
|
add_vmlinux --compressed
|
||||||
@ -643,8 +627,9 @@ add_vmlinux()
|
|||||||
cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor
|
cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# end of build_kdump
|
if test -x /usr/lib/rpm/pesign/gen-hmac; then
|
||||||
%endif
|
$_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor
|
||||||
|
fi
|
||||||
|
|
||||||
# Package the compiled-in certificates as DER files in /etc/uefi/certs
|
# Package the compiled-in certificates as DER files in /etc/uefi/certs
|
||||||
# and have mokutil enroll them when the kernel is installed
|
# and have mokutil enroll them when the kernel is installed
|
||||||
@ -700,7 +685,7 @@ for sub in '-base' '' '-extra'; do
|
|||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
|
||||||
%if %build_kdump || %build_xen || %build_vanilla || %build_ps3
|
%if %build_xen || %build_vanilla
|
||||||
# keep this -suffix list in sync with post.sh and postun.sh
|
# keep this -suffix list in sync with post.sh and postun.sh
|
||||||
suffix=-%build_flavor
|
suffix=-%build_flavor
|
||||||
%endif
|
%endif
|
||||||
@ -728,6 +713,8 @@ make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
|
|||||||
# space in /boot.
|
# space in /boot.
|
||||||
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
|
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
|
||||||
bs=1024 seek=2047 count=1
|
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
|
if [ %CONFIG_MODULES = y ]; then
|
||||||
mkdir -p %rpm_install_dir/%cpu_arch_flavor
|
mkdir -p %rpm_install_dir/%cpu_arch_flavor
|
||||||
@ -871,7 +858,7 @@ add_dirs_to_filelist() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Collect the file lists.
|
# Collect the file lists.
|
||||||
shopt -s nullglob
|
shopt -s nullglob dotglob
|
||||||
> %my_builddir/kernel-devel.files
|
> %my_builddir/kernel-devel.files
|
||||||
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
|
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
|
||||||
f=${file##%buildroot}
|
f=${file##%buildroot}
|
||||||
@ -879,22 +866,39 @@ for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; d
|
|||||||
done
|
done
|
||||||
|
|
||||||
{ cd %buildroot
|
{ cd %buildroot
|
||||||
find boot \
|
for f in boot/*; do
|
||||||
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
|
if test -L "$f"; then
|
||||||
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
|
echo "%%ghost /$f"
|
||||||
-type f -printf '/%%p\n'
|
continue
|
||||||
|
elif test ! -f "$f"; then
|
||||||
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
|
continue
|
||||||
# the file gets removed when uninstalling the kernel.
|
fi
|
||||||
echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump'
|
case "$f" in
|
||||||
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump
|
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
|
if [ %CONFIG_MODULES = y ]; then
|
||||||
find lib/modules/%kernelrelease-%build_flavor \
|
find lib/modules/%kernelrelease-%build_flavor \
|
||||||
-type d -o \
|
-type d -o \
|
||||||
\( -path '*/modules.*' ! -path '*/modules.order' \
|
\( -path '*/modules.*' ! -path '*/modules.order' \
|
||||||
! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \
|
! -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
|
cat %my_builddir/base-modules
|
||||||
fi
|
fi
|
||||||
if test %CONFIG_MODULE_SIG = "y"; then
|
if test %CONFIG_MODULE_SIG = "y"; then
|
||||||
@ -907,10 +911,7 @@ done
|
|||||||
if [ -e .%_docdir/%name ]; then
|
if [ -e .%_docdir/%name ]; then
|
||||||
echo "%%doc %_docdir/%name"
|
echo "%%doc %_docdir/%name"
|
||||||
fi
|
fi
|
||||||
} | sort -u >%my_builddir/tmp
|
} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files
|
||||||
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
|
|
||||||
|
|
||||||
%if %split_base
|
%if %split_base
|
||||||
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
|
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
|
||||||
@ -1076,16 +1077,4 @@ kernel module packages) against the %build_flavor flavor of the kernel.
|
|||||||
%endif
|
%endif
|
||||||
%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
|
%changelog
|
||||||
|
|||||||
@ -28,5 +28,9 @@ ppc64/trace kdump 2.6.28
|
|||||||
i386/pae vmi 2.6.38
|
i386/pae vmi 2.6.38
|
||||||
i386/pae-base vmi-base 2.6.38
|
i386/pae-base vmi-base 2.6.38
|
||||||
|
|
||||||
|
# SLES 11 SP3 / openSUSE 13.1
|
||||||
|
i386/default trace 3.13
|
||||||
|
x86_64/default trace 3.13
|
||||||
|
s390x/default trace 3.13
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -90,11 +90,6 @@ The Standard Kernel
|
|||||||
|
|
||||||
The standard kernel.
|
The standard kernel.
|
||||||
|
|
||||||
=== kernel-trace ===
|
|
||||||
The Standard Kernel with Tracing Features
|
|
||||||
|
|
||||||
This kernel has different tracing features enabled (e.g. utrace, ftrace).
|
|
||||||
|
|
||||||
=== kernel-vanilla ===
|
=== kernel-vanilla ===
|
||||||
The Standard Kernel - without any SUSE patches
|
The Standard Kernel - without any SUSE patches
|
||||||
|
|
||||||
|
|||||||
@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:a6230cb1bb1c69cda627d394391f06da95f779b556ba43f0c7c8a68c81617eed
|
oid sha256:632393df32d7ccf5afad69558f93936075f3ec02a4c05b35e3960f6c8910bf0b
|
||||||
size 110840
|
size 157883
|
||||||
|
|||||||
@ -31,6 +31,7 @@
|
|||||||
patches.kernel.org/patch-3.14.1-2
|
patches.kernel.org/patch-3.14.1-2
|
||||||
patches.kernel.org/patch-3.14.2-3
|
patches.kernel.org/patch-3.14.2-3
|
||||||
patches.kernel.org/patch-3.14.3-4
|
patches.kernel.org/patch-3.14.3-4
|
||||||
|
patches.kernel.org/patch-3.14.4-5
|
||||||
|
|
||||||
########################################################
|
########################################################
|
||||||
# Build fixes that apply to the vanilla kernel too.
|
# Build fixes that apply to the vanilla kernel too.
|
||||||
|
|||||||
@ -1,3 +1,3 @@
|
|||||||
2014-05-30 10:05:06 +0200
|
2014-06-04 14:14:16 +0200
|
||||||
GIT Revision: 0de0f932ada2ba15cd77eb64e18991e54e72ff3b
|
GIT Revision: f973c870694f10ae9b91cfc899c4863972a44a98
|
||||||
GIT Branch: stable
|
GIT Branch: stable
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user