commit 6b85c871b5c9cf6a13352c37f16e372f6474a521

OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-source?expand=0&rev=7526
This commit is contained in:
Michal Marek 2013-05-18 06:03:17 +00:00 committed by Git OBS Bridge
parent 70642f9665
commit c1b21a3e8b
32 changed files with 420 additions and 160 deletions

View File

@ -493,6 +493,9 @@ if test %CONFIG_MODULE_SIG = "y"; then
test -n "$h"
cert=/etc/uefi/certs/$(echo "$h" | \
sed -rn 's/^SHA1 Fingerprint=//; T; s/://g; s/(.{8}).*/\1/p').crt
if test -e %buildroot/"$cert"; then
continue
fi
mkdir -p %buildroot/etc/uefi/certs
cp "$f" %buildroot/"$cert"
certs=("${certs[@]}" "$cert")
@ -515,18 +518,20 @@ for sub in '-base' '' '-extra'; do
-e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \
-e "s:@SRCVARIANT@:%variant:g" \
%_sourcedir/$script.sh > %my_builddir/$script$sub.sh
if test "$base_package" -eq 0 -o "${#certs[@]}" -eq 0; then
continue
if test "$base_package" -eq 1 -a "${#certs[@]}" -gt 0; then
case "$script" in
preun | postun | post)
# Copy the respective scriptlet from kernel-cert-subpackage
sed "1,/^%%$script / d; /^%%[^%%]/,\$ d; s:@CERTS@:${certs[*]}:g" \
%_sourcedir/kernel-cert-subpackage \
>>"%my_builddir/$script$sub.sh"
esac
fi
case "$script" in
preun | postun | post)
;;
*)
continue
esac
# Copy the respective scriptlet from kernel-cert-subpackage
sed "1,/^%%$script / d; /^%%[^%%]/,\$ d; s:@CERTS@:${certs[*]}:g" \
%_sourcedir/kernel-cert-subpackage >>"%my_builddir/$script$sub.sh"
# Do an exit 0 at the end of each scriptlet. If the last real command
# in the scriptlet (e.g. update-bootloader call, see bnc#809617)
# returns an error, we do not want to amplify the damage by leaving
# the system in an inconsistent state.
echo "exit 0" >>"%my_builddir/$script$sub.sh"
done
done

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri May 17 15:24:18 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Avoid duplicates in the certifiate list.
- commit 9d687ad
-------------------------------------------------------------------
Fri May 17 15:20:53 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Do an exit 0 at the end of each scriptlet
(bnc#809617).
- commit 7d1a48f
-------------------------------------------------------------------
Thu May 16 12:08:22 CEST 2013 - mmarek@suse.cz

View File

@ -60,7 +60,7 @@
Name: kernel-cubox
Summary: Kernel for SolidRun Cubox
Version: 3.9.2
Release: <RELEASE>.g756ee56
Release: <RELEASE>.g6b85c87
License: GPL-2.0
Group: System/Kernel
Url: http://www.kernel.org/
@ -570,6 +570,9 @@ if test %CONFIG_MODULE_SIG = "y"; then
test -n "$h"
cert=/etc/uefi/certs/$(echo "$h" | \
sed -rn 's/^SHA1 Fingerprint=//; T; s/://g; s/(.{8}).*/\1/p').crt
if test -e %buildroot/"$cert"; then
continue
fi
mkdir -p %buildroot/etc/uefi/certs
cp "$f" %buildroot/"$cert"
certs=("${certs[@]}" "$cert")
@ -592,18 +595,20 @@ for sub in '-base' '' '-extra'; do
-e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \
-e "s:@SRCVARIANT@:%variant:g" \
%_sourcedir/$script.sh > %my_builddir/$script$sub.sh
if test "$base_package" -eq 0 -o "${#certs[@]}" -eq 0; then
continue
if test "$base_package" -eq 1 -a "${#certs[@]}" -gt 0; then
case "$script" in
preun | postun | post)
# Copy the respective scriptlet from kernel-cert-subpackage
sed "1,/^%%$script / d; /^%%[^%%]/,\$ d; s:@CERTS@:${certs[*]}:g" \
%_sourcedir/kernel-cert-subpackage \
>>"%my_builddir/$script$sub.sh"
esac
fi
case "$script" in
preun | postun | post)
;;
*)
continue
esac
# Copy the respective scriptlet from kernel-cert-subpackage
sed "1,/^%%$script / d; /^%%[^%%]/,\$ d; s:@CERTS@:${certs[*]}:g" \
%_sourcedir/kernel-cert-subpackage >>"%my_builddir/$script$sub.sh"
# Do an exit 0 at the end of each scriptlet. If the last real command
# in the scriptlet (e.g. update-bootloader call, see bnc#809617)
# returns an error, we do not want to amplify the damage by leaving
# the system in an inconsistent state.
echo "exit 0" >>"%my_builddir/$script$sub.sh"
done
done

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri May 17 15:24:18 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Avoid duplicates in the certifiate list.
- commit 9d687ad
-------------------------------------------------------------------
Fri May 17 15:20:53 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Do an exit 0 at the end of each scriptlet
(bnc#809617).
- commit 7d1a48f
-------------------------------------------------------------------
Thu May 16 12:08:22 CEST 2013 - mmarek@suse.cz

View File

@ -60,7 +60,7 @@
Name: kernel-debug
Summary: A Debug Version of the Kernel
Version: 3.9.2
Release: <RELEASE>.g756ee56
Release: <RELEASE>.g6b85c87
License: GPL-2.0
Group: System/Kernel
Url: http://www.kernel.org/
@ -573,6 +573,9 @@ if test %CONFIG_MODULE_SIG = "y"; then
test -n "$h"
cert=/etc/uefi/certs/$(echo "$h" | \
sed -rn 's/^SHA1 Fingerprint=//; T; s/://g; s/(.{8}).*/\1/p').crt
if test -e %buildroot/"$cert"; then
continue
fi
mkdir -p %buildroot/etc/uefi/certs
cp "$f" %buildroot/"$cert"
certs=("${certs[@]}" "$cert")
@ -595,18 +598,20 @@ for sub in '-base' '' '-extra'; do
-e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \
-e "s:@SRCVARIANT@:%variant:g" \
%_sourcedir/$script.sh > %my_builddir/$script$sub.sh
if test "$base_package" -eq 0 -o "${#certs[@]}" -eq 0; then
continue
if test "$base_package" -eq 1 -a "${#certs[@]}" -gt 0; then
case "$script" in
preun | postun | post)
# Copy the respective scriptlet from kernel-cert-subpackage
sed "1,/^%%$script / d; /^%%[^%%]/,\$ d; s:@CERTS@:${certs[*]}:g" \
%_sourcedir/kernel-cert-subpackage \
>>"%my_builddir/$script$sub.sh"
esac
fi
case "$script" in
preun | postun | post)
;;
*)
continue
esac
# Copy the respective scriptlet from kernel-cert-subpackage
sed "1,/^%%$script / d; /^%%[^%%]/,\$ d; s:@CERTS@:${certs[*]}:g" \
%_sourcedir/kernel-cert-subpackage >>"%my_builddir/$script$sub.sh"
# Do an exit 0 at the end of each scriptlet. If the last real command
# in the scriptlet (e.g. update-bootloader call, see bnc#809617)
# returns an error, we do not want to amplify the damage by leaving
# the system in an inconsistent state.
echo "exit 0" >>"%my_builddir/$script$sub.sh"
done
done

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri May 17 15:24:18 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Avoid duplicates in the certifiate list.
- commit 9d687ad
-------------------------------------------------------------------
Fri May 17 15:20:53 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Do an exit 0 at the end of each scriptlet
(bnc#809617).
- commit 7d1a48f
-------------------------------------------------------------------
Thu May 16 12:08:22 CEST 2013 - mmarek@suse.cz

View File

@ -60,7 +60,7 @@
Name: kernel-default
Summary: The Standard Kernel
Version: 3.9.2
Release: <RELEASE>.g756ee56
Release: <RELEASE>.g6b85c87
License: GPL-2.0
Group: System/Kernel
Url: http://www.kernel.org/
@ -580,6 +580,9 @@ if test %CONFIG_MODULE_SIG = "y"; then
test -n "$h"
cert=/etc/uefi/certs/$(echo "$h" | \
sed -rn 's/^SHA1 Fingerprint=//; T; s/://g; s/(.{8}).*/\1/p').crt
if test -e %buildroot/"$cert"; then
continue
fi
mkdir -p %buildroot/etc/uefi/certs
cp "$f" %buildroot/"$cert"
certs=("${certs[@]}" "$cert")
@ -602,18 +605,20 @@ for sub in '-base' '' '-extra'; do
-e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \
-e "s:@SRCVARIANT@:%variant:g" \
%_sourcedir/$script.sh > %my_builddir/$script$sub.sh
if test "$base_package" -eq 0 -o "${#certs[@]}" -eq 0; then
continue
if test "$base_package" -eq 1 -a "${#certs[@]}" -gt 0; then
case "$script" in
preun | postun | post)
# Copy the respective scriptlet from kernel-cert-subpackage
sed "1,/^%%$script / d; /^%%[^%%]/,\$ d; s:@CERTS@:${certs[*]}:g" \
%_sourcedir/kernel-cert-subpackage \
>>"%my_builddir/$script$sub.sh"
esac
fi
case "$script" in
preun | postun | post)
;;
*)
continue
esac
# Copy the respective scriptlet from kernel-cert-subpackage
sed "1,/^%%$script / d; /^%%[^%%]/,\$ d; s:@CERTS@:${certs[*]}:g" \
%_sourcedir/kernel-cert-subpackage >>"%my_builddir/$script$sub.sh"
# Do an exit 0 at the end of each scriptlet. If the last real command
# in the scriptlet (e.g. update-bootloader call, see bnc#809617)
# returns an error, we do not want to amplify the damage by leaving
# the system in an inconsistent state.
echo "exit 0" >>"%my_builddir/$script$sub.sh"
done
done

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri May 17 15:24:18 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Avoid duplicates in the certifiate list.
- commit 9d687ad
-------------------------------------------------------------------
Fri May 17 15:20:53 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Do an exit 0 at the end of each scriptlet
(bnc#809617).
- commit 7d1a48f
-------------------------------------------------------------------
Thu May 16 12:08:22 CEST 2013 - mmarek@suse.cz

View File

@ -60,7 +60,7 @@
Name: kernel-desktop
Summary: Kernel optimized for the desktop
Version: 3.9.2
Release: <RELEASE>.g756ee56
Release: <RELEASE>.g6b85c87
License: GPL-2.0
Group: System/Kernel
Url: http://www.kernel.org/
@ -582,6 +582,9 @@ if test %CONFIG_MODULE_SIG = "y"; then
test -n "$h"
cert=/etc/uefi/certs/$(echo "$h" | \
sed -rn 's/^SHA1 Fingerprint=//; T; s/://g; s/(.{8}).*/\1/p').crt
if test -e %buildroot/"$cert"; then
continue
fi
mkdir -p %buildroot/etc/uefi/certs
cp "$f" %buildroot/"$cert"
certs=("${certs[@]}" "$cert")
@ -604,18 +607,20 @@ for sub in '-base' '' '-extra'; do
-e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \
-e "s:@SRCVARIANT@:%variant:g" \
%_sourcedir/$script.sh > %my_builddir/$script$sub.sh
if test "$base_package" -eq 0 -o "${#certs[@]}" -eq 0; then
continue
if test "$base_package" -eq 1 -a "${#certs[@]}" -gt 0; then
case "$script" in
preun | postun | post)
# Copy the respective scriptlet from kernel-cert-subpackage
sed "1,/^%%$script / d; /^%%[^%%]/,\$ d; s:@CERTS@:${certs[*]}:g" \
%_sourcedir/kernel-cert-subpackage \
>>"%my_builddir/$script$sub.sh"
esac
fi
case "$script" in
preun | postun | post)
;;
*)
continue
esac
# Copy the respective scriptlet from kernel-cert-subpackage
sed "1,/^%%$script / d; /^%%[^%%]/,\$ d; s:@CERTS@:${certs[*]}:g" \
%_sourcedir/kernel-cert-subpackage >>"%my_builddir/$script$sub.sh"
# Do an exit 0 at the end of each scriptlet. If the last real command
# in the scriptlet (e.g. update-bootloader call, see bnc#809617)
# returns an error, we do not want to amplify the damage by leaving
# the system in an inconsistent state.
echo "exit 0" >>"%my_builddir/$script$sub.sh"
done
done

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri May 17 15:24:18 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Avoid duplicates in the certifiate list.
- commit 9d687ad
-------------------------------------------------------------------
Fri May 17 15:20:53 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Do an exit 0 at the end of each scriptlet
(bnc#809617).
- commit 7d1a48f
-------------------------------------------------------------------
Thu May 16 12:08:22 CEST 2013 - mmarek@suse.cz

View File

@ -25,7 +25,7 @@
Name: kernel-docs
Summary: Kernel Documentation
Version: 3.9.2
Release: <RELEASE>.g756ee56
Release: <RELEASE>.g6b85c87
BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel
BuildRequires: kernel-source%variant
Url: http://www.kernel.org/

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri May 17 15:24:18 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Avoid duplicates in the certifiate list.
- commit 9d687ad
-------------------------------------------------------------------
Fri May 17 15:20:53 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Do an exit 0 at the end of each scriptlet
(bnc#809617).
- commit 7d1a48f
-------------------------------------------------------------------
Thu May 16 12:08:22 CEST 2013 - mmarek@suse.cz

View File

@ -60,7 +60,7 @@
Name: kernel-ec2
Summary: The Amazon EC2 Xen Kernel
Version: 3.9.2
Release: <RELEASE>.g756ee56
Release: <RELEASE>.g6b85c87
License: GPL-2.0
Group: System/Kernel
Url: http://www.kernel.org/
@ -572,6 +572,9 @@ if test %CONFIG_MODULE_SIG = "y"; then
test -n "$h"
cert=/etc/uefi/certs/$(echo "$h" | \
sed -rn 's/^SHA1 Fingerprint=//; T; s/://g; s/(.{8}).*/\1/p').crt
if test -e %buildroot/"$cert"; then
continue
fi
mkdir -p %buildroot/etc/uefi/certs
cp "$f" %buildroot/"$cert"
certs=("${certs[@]}" "$cert")
@ -594,18 +597,20 @@ for sub in '-base' '' '-extra'; do
-e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \
-e "s:@SRCVARIANT@:%variant:g" \
%_sourcedir/$script.sh > %my_builddir/$script$sub.sh
if test "$base_package" -eq 0 -o "${#certs[@]}" -eq 0; then
continue
if test "$base_package" -eq 1 -a "${#certs[@]}" -gt 0; then
case "$script" in
preun | postun | post)
# Copy the respective scriptlet from kernel-cert-subpackage
sed "1,/^%%$script / d; /^%%[^%%]/,\$ d; s:@CERTS@:${certs[*]}:g" \
%_sourcedir/kernel-cert-subpackage \
>>"%my_builddir/$script$sub.sh"
esac
fi
case "$script" in
preun | postun | post)
;;
*)
continue
esac
# Copy the respective scriptlet from kernel-cert-subpackage
sed "1,/^%%$script / d; /^%%[^%%]/,\$ d; s:@CERTS@:${certs[*]}:g" \
%_sourcedir/kernel-cert-subpackage >>"%my_builddir/$script$sub.sh"
# Do an exit 0 at the end of each scriptlet. If the last real command
# in the scriptlet (e.g. update-bootloader call, see bnc#809617)
# returns an error, we do not want to amplify the damage by leaving
# the system in an inconsistent state.
echo "exit 0" >>"%my_builddir/$script$sub.sh"
done
done

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri May 17 15:24:18 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Avoid duplicates in the certifiate list.
- commit 9d687ad
-------------------------------------------------------------------
Fri May 17 15:20:53 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Do an exit 0 at the end of each scriptlet
(bnc#809617).
- commit 7d1a48f
-------------------------------------------------------------------
Thu May 16 12:08:22 CEST 2013 - mmarek@suse.cz

View File

@ -60,7 +60,7 @@
Name: kernel-exynos
Summary: Kernel for Samsung's Exynos SoC
Version: 3.9.2
Release: <RELEASE>.g756ee56
Release: <RELEASE>.g6b85c87
License: GPL-2.0
Group: System/Kernel
Url: http://www.kernel.org/
@ -569,6 +569,9 @@ if test %CONFIG_MODULE_SIG = "y"; then
test -n "$h"
cert=/etc/uefi/certs/$(echo "$h" | \
sed -rn 's/^SHA1 Fingerprint=//; T; s/://g; s/(.{8}).*/\1/p').crt
if test -e %buildroot/"$cert"; then
continue
fi
mkdir -p %buildroot/etc/uefi/certs
cp "$f" %buildroot/"$cert"
certs=("${certs[@]}" "$cert")
@ -591,18 +594,20 @@ for sub in '-base' '' '-extra'; do
-e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \
-e "s:@SRCVARIANT@:%variant:g" \
%_sourcedir/$script.sh > %my_builddir/$script$sub.sh
if test "$base_package" -eq 0 -o "${#certs[@]}" -eq 0; then
continue
if test "$base_package" -eq 1 -a "${#certs[@]}" -gt 0; then
case "$script" in
preun | postun | post)
# Copy the respective scriptlet from kernel-cert-subpackage
sed "1,/^%%$script / d; /^%%[^%%]/,\$ d; s:@CERTS@:${certs[*]}:g" \
%_sourcedir/kernel-cert-subpackage \
>>"%my_builddir/$script$sub.sh"
esac
fi
case "$script" in
preun | postun | post)
;;
*)
continue
esac
# Copy the respective scriptlet from kernel-cert-subpackage
sed "1,/^%%$script / d; /^%%[^%%]/,\$ d; s:@CERTS@:${certs[*]}:g" \
%_sourcedir/kernel-cert-subpackage >>"%my_builddir/$script$sub.sh"
# Do an exit 0 at the end of each scriptlet. If the last real command
# in the scriptlet (e.g. update-bootloader call, see bnc#809617)
# returns an error, we do not want to amplify the damage by leaving
# the system in an inconsistent state.
echo "exit 0" >>"%my_builddir/$script$sub.sh"
done
done

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri May 17 15:24:18 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Avoid duplicates in the certifiate list.
- commit 9d687ad
-------------------------------------------------------------------
Fri May 17 15:20:53 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Do an exit 0 at the end of each scriptlet
(bnc#809617).
- commit 7d1a48f
-------------------------------------------------------------------
Thu May 16 12:08:22 CEST 2013 - mmarek@suse.cz

View File

@ -60,7 +60,7 @@
Name: kernel-lpae
Summary: Kernel for LPAE enabled systems
Version: 3.9.2
Release: <RELEASE>.g756ee56
Release: <RELEASE>.g6b85c87
License: GPL-2.0
Group: System/Kernel
Url: http://www.kernel.org/
@ -570,6 +570,9 @@ if test %CONFIG_MODULE_SIG = "y"; then
test -n "$h"
cert=/etc/uefi/certs/$(echo "$h" | \
sed -rn 's/^SHA1 Fingerprint=//; T; s/://g; s/(.{8}).*/\1/p').crt
if test -e %buildroot/"$cert"; then
continue
fi
mkdir -p %buildroot/etc/uefi/certs
cp "$f" %buildroot/"$cert"
certs=("${certs[@]}" "$cert")
@ -592,18 +595,20 @@ for sub in '-base' '' '-extra'; do
-e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \
-e "s:@SRCVARIANT@:%variant:g" \
%_sourcedir/$script.sh > %my_builddir/$script$sub.sh
if test "$base_package" -eq 0 -o "${#certs[@]}" -eq 0; then
continue
if test "$base_package" -eq 1 -a "${#certs[@]}" -gt 0; then
case "$script" in
preun | postun | post)
# Copy the respective scriptlet from kernel-cert-subpackage
sed "1,/^%%$script / d; /^%%[^%%]/,\$ d; s:@CERTS@:${certs[*]}:g" \
%_sourcedir/kernel-cert-subpackage \
>>"%my_builddir/$script$sub.sh"
esac
fi
case "$script" in
preun | postun | post)
;;
*)
continue
esac
# Copy the respective scriptlet from kernel-cert-subpackage
sed "1,/^%%$script / d; /^%%[^%%]/,\$ d; s:@CERTS@:${certs[*]}:g" \
%_sourcedir/kernel-cert-subpackage >>"%my_builddir/$script$sub.sh"
# Do an exit 0 at the end of each scriptlet. If the last real command
# in the scriptlet (e.g. update-bootloader call, see bnc#809617)
# returns an error, we do not want to amplify the damage by leaving
# the system in an inconsistent state.
echo "exit 0" >>"%my_builddir/$script$sub.sh"
done
done

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri May 17 15:24:18 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Avoid duplicates in the certifiate list.
- commit 9d687ad
-------------------------------------------------------------------
Fri May 17 15:20:53 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Do an exit 0 at the end of each scriptlet
(bnc#809617).
- commit 7d1a48f
-------------------------------------------------------------------
Thu May 16 12:08:22 CEST 2013 - mmarek@suse.cz

View File

@ -60,7 +60,7 @@
Name: kernel-pae
Summary: Kernel with PAE Support
Version: 3.9.2
Release: <RELEASE>.g756ee56
Release: <RELEASE>.g6b85c87
License: GPL-2.0
Group: System/Kernel
Url: http://www.kernel.org/
@ -579,6 +579,9 @@ if test %CONFIG_MODULE_SIG = "y"; then
test -n "$h"
cert=/etc/uefi/certs/$(echo "$h" | \
sed -rn 's/^SHA1 Fingerprint=//; T; s/://g; s/(.{8}).*/\1/p').crt
if test -e %buildroot/"$cert"; then
continue
fi
mkdir -p %buildroot/etc/uefi/certs
cp "$f" %buildroot/"$cert"
certs=("${certs[@]}" "$cert")
@ -601,18 +604,20 @@ for sub in '-base' '' '-extra'; do
-e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \
-e "s:@SRCVARIANT@:%variant:g" \
%_sourcedir/$script.sh > %my_builddir/$script$sub.sh
if test "$base_package" -eq 0 -o "${#certs[@]}" -eq 0; then
continue
if test "$base_package" -eq 1 -a "${#certs[@]}" -gt 0; then
case "$script" in
preun | postun | post)
# Copy the respective scriptlet from kernel-cert-subpackage
sed "1,/^%%$script / d; /^%%[^%%]/,\$ d; s:@CERTS@:${certs[*]}:g" \
%_sourcedir/kernel-cert-subpackage \
>>"%my_builddir/$script$sub.sh"
esac
fi
case "$script" in
preun | postun | post)
;;
*)
continue
esac
# Copy the respective scriptlet from kernel-cert-subpackage
sed "1,/^%%$script / d; /^%%[^%%]/,\$ d; s:@CERTS@:${certs[*]}:g" \
%_sourcedir/kernel-cert-subpackage >>"%my_builddir/$script$sub.sh"
# Do an exit 0 at the end of each scriptlet. If the last real command
# in the scriptlet (e.g. update-bootloader call, see bnc#809617)
# returns an error, we do not want to amplify the damage by leaving
# the system in an inconsistent state.
echo "exit 0" >>"%my_builddir/$script$sub.sh"
done
done

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri May 17 15:24:18 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Avoid duplicates in the certifiate list.
- commit 9d687ad
-------------------------------------------------------------------
Fri May 17 15:20:53 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Do an exit 0 at the end of each scriptlet
(bnc#809617).
- commit 7d1a48f
-------------------------------------------------------------------
Thu May 16 12:08:22 CEST 2013 - mmarek@suse.cz

View File

@ -30,7 +30,7 @@
Name: kernel-source
Summary: The Linux Kernel Sources
Version: 3.9.2
Release: <RELEASE>.g756ee56
Release: <RELEASE>.g6b85c87
License: GPL-2.0
Group: Development/Sources
Url: http://www.kernel.org/

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri May 17 15:24:18 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Avoid duplicates in the certifiate list.
- commit 9d687ad
-------------------------------------------------------------------
Fri May 17 15:20:53 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Do an exit 0 at the end of each scriptlet
(bnc#809617).
- commit 7d1a48f
-------------------------------------------------------------------
Thu May 16 12:08:22 CEST 2013 - mmarek@suse.cz

View File

@ -25,7 +25,7 @@ Name: kernel-syms
Summary: Kernel Symbol Versions (modversions)
Version: 3.9.2
%if %using_buildservice
Release: <RELEASE>.g756ee56
Release: <RELEASE>.g6b85c87
%else
%define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0)
Release: %kernel_source_release

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri May 17 15:24:18 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Avoid duplicates in the certifiate list.
- commit 9d687ad
-------------------------------------------------------------------
Fri May 17 15:20:53 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Do an exit 0 at the end of each scriptlet
(bnc#809617).
- commit 7d1a48f
-------------------------------------------------------------------
Thu May 16 12:08:22 CEST 2013 - mmarek@suse.cz

View File

@ -60,7 +60,7 @@
Name: kernel-trace
Summary: The Standard Kernel with Tracing Features
Version: 3.9.2
Release: <RELEASE>.g756ee56
Release: <RELEASE>.g6b85c87
License: GPL-2.0
Group: System/Kernel
Url: http://www.kernel.org/
@ -572,6 +572,9 @@ if test %CONFIG_MODULE_SIG = "y"; then
test -n "$h"
cert=/etc/uefi/certs/$(echo "$h" | \
sed -rn 's/^SHA1 Fingerprint=//; T; s/://g; s/(.{8}).*/\1/p').crt
if test -e %buildroot/"$cert"; then
continue
fi
mkdir -p %buildroot/etc/uefi/certs
cp "$f" %buildroot/"$cert"
certs=("${certs[@]}" "$cert")
@ -594,18 +597,20 @@ for sub in '-base' '' '-extra'; do
-e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \
-e "s:@SRCVARIANT@:%variant:g" \
%_sourcedir/$script.sh > %my_builddir/$script$sub.sh
if test "$base_package" -eq 0 -o "${#certs[@]}" -eq 0; then
continue
if test "$base_package" -eq 1 -a "${#certs[@]}" -gt 0; then
case "$script" in
preun | postun | post)
# Copy the respective scriptlet from kernel-cert-subpackage
sed "1,/^%%$script / d; /^%%[^%%]/,\$ d; s:@CERTS@:${certs[*]}:g" \
%_sourcedir/kernel-cert-subpackage \
>>"%my_builddir/$script$sub.sh"
esac
fi
case "$script" in
preun | postun | post)
;;
*)
continue
esac
# Copy the respective scriptlet from kernel-cert-subpackage
sed "1,/^%%$script / d; /^%%[^%%]/,\$ d; s:@CERTS@:${certs[*]}:g" \
%_sourcedir/kernel-cert-subpackage >>"%my_builddir/$script$sub.sh"
# Do an exit 0 at the end of each scriptlet. If the last real command
# in the scriptlet (e.g. update-bootloader call, see bnc#809617)
# returns an error, we do not want to amplify the damage by leaving
# the system in an inconsistent state.
echo "exit 0" >>"%my_builddir/$script$sub.sh"
done
done

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri May 17 15:24:18 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Avoid duplicates in the certifiate list.
- commit 9d687ad
-------------------------------------------------------------------
Fri May 17 15:20:53 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Do an exit 0 at the end of each scriptlet
(bnc#809617).
- commit 7d1a48f
-------------------------------------------------------------------
Thu May 16 12:08:22 CEST 2013 - mmarek@suse.cz

View File

@ -60,7 +60,7 @@
Name: kernel-vanilla
Summary: The Standard Kernel - without any SUSE patches
Version: 3.9.2
Release: <RELEASE>.g756ee56
Release: <RELEASE>.g6b85c87
License: GPL-2.0
Group: System/Kernel
Url: http://www.kernel.org/
@ -569,6 +569,9 @@ if test %CONFIG_MODULE_SIG = "y"; then
test -n "$h"
cert=/etc/uefi/certs/$(echo "$h" | \
sed -rn 's/^SHA1 Fingerprint=//; T; s/://g; s/(.{8}).*/\1/p').crt
if test -e %buildroot/"$cert"; then
continue
fi
mkdir -p %buildroot/etc/uefi/certs
cp "$f" %buildroot/"$cert"
certs=("${certs[@]}" "$cert")
@ -591,18 +594,20 @@ for sub in '-base' '' '-extra'; do
-e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \
-e "s:@SRCVARIANT@:%variant:g" \
%_sourcedir/$script.sh > %my_builddir/$script$sub.sh
if test "$base_package" -eq 0 -o "${#certs[@]}" -eq 0; then
continue
if test "$base_package" -eq 1 -a "${#certs[@]}" -gt 0; then
case "$script" in
preun | postun | post)
# Copy the respective scriptlet from kernel-cert-subpackage
sed "1,/^%%$script / d; /^%%[^%%]/,\$ d; s:@CERTS@:${certs[*]}:g" \
%_sourcedir/kernel-cert-subpackage \
>>"%my_builddir/$script$sub.sh"
esac
fi
case "$script" in
preun | postun | post)
;;
*)
continue
esac
# Copy the respective scriptlet from kernel-cert-subpackage
sed "1,/^%%$script / d; /^%%[^%%]/,\$ d; s:@CERTS@:${certs[*]}:g" \
%_sourcedir/kernel-cert-subpackage >>"%my_builddir/$script$sub.sh"
# Do an exit 0 at the end of each scriptlet. If the last real command
# in the scriptlet (e.g. update-bootloader call, see bnc#809617)
# returns an error, we do not want to amplify the damage by leaving
# the system in an inconsistent state.
echo "exit 0" >>"%my_builddir/$script$sub.sh"
done
done

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri May 17 15:24:18 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Avoid duplicates in the certifiate list.
- commit 9d687ad
-------------------------------------------------------------------
Fri May 17 15:20:53 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Do an exit 0 at the end of each scriptlet
(bnc#809617).
- commit 7d1a48f
-------------------------------------------------------------------
Thu May 16 12:08:22 CEST 2013 - mmarek@suse.cz

View File

@ -60,7 +60,7 @@
Name: kernel-versatile
Summary: Kernel for Versatile SoC
Version: 3.9.2
Release: <RELEASE>.g756ee56
Release: <RELEASE>.g6b85c87
License: GPL-2.0
Group: System/Kernel
Url: http://www.kernel.org/
@ -569,6 +569,9 @@ if test %CONFIG_MODULE_SIG = "y"; then
test -n "$h"
cert=/etc/uefi/certs/$(echo "$h" | \
sed -rn 's/^SHA1 Fingerprint=//; T; s/://g; s/(.{8}).*/\1/p').crt
if test -e %buildroot/"$cert"; then
continue
fi
mkdir -p %buildroot/etc/uefi/certs
cp "$f" %buildroot/"$cert"
certs=("${certs[@]}" "$cert")
@ -591,18 +594,20 @@ for sub in '-base' '' '-extra'; do
-e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \
-e "s:@SRCVARIANT@:%variant:g" \
%_sourcedir/$script.sh > %my_builddir/$script$sub.sh
if test "$base_package" -eq 0 -o "${#certs[@]}" -eq 0; then
continue
if test "$base_package" -eq 1 -a "${#certs[@]}" -gt 0; then
case "$script" in
preun | postun | post)
# Copy the respective scriptlet from kernel-cert-subpackage
sed "1,/^%%$script / d; /^%%[^%%]/,\$ d; s:@CERTS@:${certs[*]}:g" \
%_sourcedir/kernel-cert-subpackage \
>>"%my_builddir/$script$sub.sh"
esac
fi
case "$script" in
preun | postun | post)
;;
*)
continue
esac
# Copy the respective scriptlet from kernel-cert-subpackage
sed "1,/^%%$script / d; /^%%[^%%]/,\$ d; s:@CERTS@:${certs[*]}:g" \
%_sourcedir/kernel-cert-subpackage >>"%my_builddir/$script$sub.sh"
# Do an exit 0 at the end of each scriptlet. If the last real command
# in the scriptlet (e.g. update-bootloader call, see bnc#809617)
# returns an error, we do not want to amplify the damage by leaving
# the system in an inconsistent state.
echo "exit 0" >>"%my_builddir/$script$sub.sh"
done
done

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri May 17 15:24:18 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Avoid duplicates in the certifiate list.
- commit 9d687ad
-------------------------------------------------------------------
Fri May 17 15:20:53 CEST 2013 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Do an exit 0 at the end of each scriptlet
(bnc#809617).
- commit 7d1a48f
-------------------------------------------------------------------
Thu May 16 12:08:22 CEST 2013 - mmarek@suse.cz

View File

@ -60,7 +60,7 @@
Name: kernel-xen
Summary: The Xen Kernel
Version: 3.9.2
Release: <RELEASE>.g756ee56
Release: <RELEASE>.g6b85c87
License: GPL-2.0
Group: System/Kernel
Url: http://www.kernel.org/
@ -572,6 +572,9 @@ if test %CONFIG_MODULE_SIG = "y"; then
test -n "$h"
cert=/etc/uefi/certs/$(echo "$h" | \
sed -rn 's/^SHA1 Fingerprint=//; T; s/://g; s/(.{8}).*/\1/p').crt
if test -e %buildroot/"$cert"; then
continue
fi
mkdir -p %buildroot/etc/uefi/certs
cp "$f" %buildroot/"$cert"
certs=("${certs[@]}" "$cert")
@ -594,18 +597,20 @@ for sub in '-base' '' '-extra'; do
-e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \
-e "s:@SRCVARIANT@:%variant:g" \
%_sourcedir/$script.sh > %my_builddir/$script$sub.sh
if test "$base_package" -eq 0 -o "${#certs[@]}" -eq 0; then
continue
if test "$base_package" -eq 1 -a "${#certs[@]}" -gt 0; then
case "$script" in
preun | postun | post)
# Copy the respective scriptlet from kernel-cert-subpackage
sed "1,/^%%$script / d; /^%%[^%%]/,\$ d; s:@CERTS@:${certs[*]}:g" \
%_sourcedir/kernel-cert-subpackage \
>>"%my_builddir/$script$sub.sh"
esac
fi
case "$script" in
preun | postun | post)
;;
*)
continue
esac
# Copy the respective scriptlet from kernel-cert-subpackage
sed "1,/^%%$script / d; /^%%[^%%]/,\$ d; s:@CERTS@:${certs[*]}:g" \
%_sourcedir/kernel-cert-subpackage >>"%my_builddir/$script$sub.sh"
# Do an exit 0 at the end of each scriptlet. If the last real command
# in the scriptlet (e.g. update-bootloader call, see bnc#809617)
# returns an error, we do not want to amplify the damage by leaving
# the system in an inconsistent state.
echo "exit 0" >>"%my_builddir/$script$sub.sh"
done
done

View File

@ -1,3 +1,3 @@
2013-05-16 12:08:22 +0200
GIT Revision: 756ee565dafb775e1980febb5015ebfa45d456ab
2013-05-17 16:11:04 +0200
GIT Revision: 6b85c871b5c9cf6a13352c37f16e372f6474a521
GIT Branch: master