Home| summaryrefslogtreecommitdiff |
| author | Michal Marek <mmarek@suse.cz> | 2009-10-19 13:59:19 (GMT) |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2009-10-19 13:59:19 (GMT) |
| commit | 7e732753a986fbeabd916029a558425767329372 (patch) (side-by-side diff) | |
| tree | a1dbc6eb60f66bbc2afffdc39fff0c41f80d1c2c | |
| parent | f72434a5be5ad706eb048391da85574f13394436 (diff) | |
| parent | cf69b8f5d93978b30f6b5a2771e3fdef2b015eb9 (diff) | |
Merge branch 'master' into SLE11-SP1rpm-2.6.32-0.1
| -rw-r--r-- | kernel-source.changes | 6 | ||||
| -rw-r--r-- | rpm/kernel-binary.spec.in | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/kernel-source.changes b/kernel-source.changes index 81aada7..8b62d7e 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -5,6 +5,12 @@ Mon Oct 19 15:24:25 CEST 2009 - jeffm@suse.com failures (bnc#548119) ------------------------------------------------------------------- +Mon Oct 19 15:21:26 CEST 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: [s390x] ignore errors from + dwarfextract for now. + +------------------------------------------------------------------- Fri Oct 16 23:14:44 CEST 2009 - mmarek@suse.cz - Update config files: set CONFIG_ENTERPRISE_SUPPORT=y. diff --git a/rpm/kernel-binary.spec.in b/rpm/kernel-binary.spec.in index 5df9c06..1253b96 100644 --- a/rpm/kernel-binary.spec.in +++ b/rpm/kernel-binary.spec.in @@ -421,7 +421,7 @@ add_vmlinux() cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor image=image if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then - dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor + dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)" fi %if %CONFIG_KMSG_IDS == "y" mkdir -p %buildroot/usr/share/man/man9 @@ -499,7 +499,7 @@ if [ %CONFIG_MODULES = y ]; then if [ -x "$(which dwarfextract 2>/dev/null)" -a \ -f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then find %buildroot -name "*.ko" > kofiles.list - dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list + dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi %endif |