OBS User unknown 2009-05-22 14:27:46 +00:00 committed by Git OBS Bridge
parent 0b79a6ce1b
commit d4ad2e2ea3
32 changed files with 746 additions and 55 deletions

View File

@ -1,16 +1,24 @@
#! /bin/sh
#! /bin/bash
export LANG=POSIX
if ! test -d patches.kernel.org; then
if test -e patches.kernel.org.tar.bz2; then
tar xjf patches.kernel.org.tar.bz2
trap 'rm -rf patches.kernel.org' EXIT
else
echo "Can't find patches.kernel.org" >&2
fi
path=(.)
while test $# -gt 0; do
case "$1" in
--patches)
path[${#path[@]}]=$2
shift 2
;;
*)
echo "Usage $0 [--patches <dir>]" >&2
exit 1
esac
done
if test "${path[*]}" = "."; then
path=(. ..)
fi
source $(dirname $0)/config.sh
set -- $(echo $SRCVERSION | sed -ne 's/\([0-9]\+\).\([0-9]\+\).\([0-9]\+\)\(.*\)/\1 \2 \3 \4/p')
@ -21,11 +29,39 @@ EXTRAVERSION=$4
EXTRA_SYMBOLS=$(set -- $([ -e $(dirname $0)/extra-symbols ] && cat $(dirname $0)/extra-symbols) ; echo $*)
series=$(mktemp)
tmp_files="$series"
trap 'rm -rf $tmp_files' EXIT
warned=false
while read patch; do
dir=${patch%/*}
for p in "${path[@]}"; do
if test -d "$p/$dir"; then
echo "$p/$patch"
continue 2
fi
done
for p in "${path[@]}"; do
if test -e "$p/$dir.tar.bz2"; then
echo "unpacking $p/$dir.tar.bz2" >&2
if ! $warned; then
echo "pass --patches <directory with unpacked tarballs> to avoid this" >&2
warned=true
fi
tmp_files="$tmp_files $dir"
tar xjf "$p/$dir.tar.bz2"
echo "$patch"
continue 2
fi
done
echo "Can't find $patch" >&2
exit 1
done >"$series" < <($(dirname $0)/guards $EXTRA_SYMBOLS <series.conf)
# Parse all the changes to KERNELRELEASE out of all patches and
# convert them to shell code that can be evaluated. Evaluate it.
eval "$(
$(dirname $0)/guards $EXTRA_SYMBOLS < series.conf | grep '^patches\.kernel\.org' \
| xargs awk '
<"$series" xargs awk '
/^--- |^+++ / \
{ M = match($2, /^[^\/]+\/Makefile( \t|$)/) }
M && /^+(VERSION|PATCHLEVEL|SUBLEVEL|EXTRAVERSION)/ \
@ -33,6 +69,4 @@ eval "$(
' \
| sed -e 's,^+,,' -e 's, *= *\(.*\),="\1",'
)"
KERNELRELEASE="$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION"
echo "$KERNELRELEASE"
echo "$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION"

View File

@ -1,9 +0,0 @@
#! /bin/sh
prefix=
suffix=
commit=4bf28205
[ -n "$suffix" ] || suffix=$2
while [ "$suffix" != "${suffix#[^0-9]*.}" ]; do
suffix=${suffix#[^0-9]*.}
done
echo $prefix$suffix${commit:+_}$commit

View File

@ -1,3 +1,39 @@
-------------------------------------------------------------------
Fri May 22 15:47:01 CEST 2009 - teheo@suse.de
- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
relocation.
-------------------------------------------------------------------
Fri May 22 12:42:36 CEST 2009 - mmarek@suse.cz
- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid
unpacking the patches tarballs in compute-PATCHVERSION.sh.
-------------------------------------------------------------------
Fri May 22 11:45:41 CEST 2009 - mmarek@suse.cz
- rpm/mkspec: add --release option to set a custom release string.
- scripts/tar-up.sh: revive -rs option.
-------------------------------------------------------------------
Wed May 20 16:05:07 CEST 2009 - mmarek@suse.cz
- patches.arch/acpi_thermal_passive_blacklist.patch,
patches.suse/devtmpfs.patch: fix patches to apply with git-apply.
-------------------------------------------------------------------
Tue May 19 21:42:45 CEST 2009 - sdietrich@suse.de
- patches.suse/stack-unwind-add-declaration.patch: Fix compile
error when CONFIG_STACK_UNWIND is not set.
-------------------------------------------------------------------
Tue May 19 18:24:46 CEST 2009 - jblunck@suse.de
- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move
mach-types.h to arch/include/asm.
-------------------------------------------------------------------
Tue May 19 18:03:44 CEST 2009 - jeffm@suse.com

View File

@ -62,7 +62,7 @@
Name: kernel-debug
Summary: A Debug Version of the Kernel
Version: 2.6.30
Release: 1
Release: 2
%if %using_buildservice
%else
%endif
@ -790,6 +790,24 @@ kernel module packages) against the -debug flavor of the kernel.
%endif
%changelog
* Fri May 22 2009 teheo@suse.de
- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
relocation.
* Fri May 22 2009 mmarek@suse.cz
- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid
unpacking the patches tarballs in compute-PATCHVERSION.sh.
* Fri May 22 2009 mmarek@suse.cz
- rpm/mkspec: add --release option to set a custom release string.
- scripts/tar-up.sh: revive -rs option.
* Wed May 20 2009 mmarek@suse.cz
- patches.arch/acpi_thermal_passive_blacklist.patch,
patches.suse/devtmpfs.patch: fix patches to apply with git-apply.
* Tue May 19 2009 sdietrich@suse.de
- patches.suse/stack-unwind-add-declaration.patch: Fix compile
error when CONFIG_STACK_UNWIND is not set.
* Tue May 19 2009 jblunck@suse.de
- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move
mach-types.h to arch/include/asm.
* Tue May 19 2009 jeffm@suse.com
- Set CONFIG_FRAMEBUFFER_CONSOLE=y
* Tue May 19 2009 jeffm@suse.com

View File

@ -1,3 +1,39 @@
-------------------------------------------------------------------
Fri May 22 15:47:01 CEST 2009 - teheo@suse.de
- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
relocation.
-------------------------------------------------------------------
Fri May 22 12:42:36 CEST 2009 - mmarek@suse.cz
- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid
unpacking the patches tarballs in compute-PATCHVERSION.sh.
-------------------------------------------------------------------
Fri May 22 11:45:41 CEST 2009 - mmarek@suse.cz
- rpm/mkspec: add --release option to set a custom release string.
- scripts/tar-up.sh: revive -rs option.
-------------------------------------------------------------------
Wed May 20 16:05:07 CEST 2009 - mmarek@suse.cz
- patches.arch/acpi_thermal_passive_blacklist.patch,
patches.suse/devtmpfs.patch: fix patches to apply with git-apply.
-------------------------------------------------------------------
Tue May 19 21:42:45 CEST 2009 - sdietrich@suse.de
- patches.suse/stack-unwind-add-declaration.patch: Fix compile
error when CONFIG_STACK_UNWIND is not set.
-------------------------------------------------------------------
Tue May 19 18:24:46 CEST 2009 - jblunck@suse.de
- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move
mach-types.h to arch/include/asm.
-------------------------------------------------------------------
Tue May 19 18:03:44 CEST 2009 - jeffm@suse.com

View File

@ -62,7 +62,7 @@
Name: kernel-default
Summary: The Standard Kernel
Version: 2.6.30
Release: 1
Release: 2
%if %using_buildservice
%else
%endif
@ -802,6 +802,24 @@ kernel module packages) against the -default flavor of the kernel.
%endif
%changelog
* Fri May 22 2009 teheo@suse.de
- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
relocation.
* Fri May 22 2009 mmarek@suse.cz
- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid
unpacking the patches tarballs in compute-PATCHVERSION.sh.
* Fri May 22 2009 mmarek@suse.cz
- rpm/mkspec: add --release option to set a custom release string.
- scripts/tar-up.sh: revive -rs option.
* Wed May 20 2009 mmarek@suse.cz
- patches.arch/acpi_thermal_passive_blacklist.patch,
patches.suse/devtmpfs.patch: fix patches to apply with git-apply.
* Tue May 19 2009 sdietrich@suse.de
- patches.suse/stack-unwind-add-declaration.patch: Fix compile
error when CONFIG_STACK_UNWIND is not set.
* Tue May 19 2009 jblunck@suse.de
- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move
mach-types.h to arch/include/asm.
* Tue May 19 2009 jeffm@suse.com
- Set CONFIG_FRAMEBUFFER_CONSOLE=y
* Tue May 19 2009 jeffm@suse.com

View File

@ -1,3 +1,39 @@
-------------------------------------------------------------------
Fri May 22 15:47:01 CEST 2009 - teheo@suse.de
- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
relocation.
-------------------------------------------------------------------
Fri May 22 12:42:36 CEST 2009 - mmarek@suse.cz
- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid
unpacking the patches tarballs in compute-PATCHVERSION.sh.
-------------------------------------------------------------------
Fri May 22 11:45:41 CEST 2009 - mmarek@suse.cz
- rpm/mkspec: add --release option to set a custom release string.
- scripts/tar-up.sh: revive -rs option.
-------------------------------------------------------------------
Wed May 20 16:05:07 CEST 2009 - mmarek@suse.cz
- patches.arch/acpi_thermal_passive_blacklist.patch,
patches.suse/devtmpfs.patch: fix patches to apply with git-apply.
-------------------------------------------------------------------
Tue May 19 21:42:45 CEST 2009 - sdietrich@suse.de
- patches.suse/stack-unwind-add-declaration.patch: Fix compile
error when CONFIG_STACK_UNWIND is not set.
-------------------------------------------------------------------
Tue May 19 18:24:46 CEST 2009 - jblunck@suse.de
- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move
mach-types.h to arch/include/asm.
-------------------------------------------------------------------
Tue May 19 18:03:44 CEST 2009 - jeffm@suse.com

View File

@ -62,7 +62,7 @@
Name: kernel-kdump
Summary: kernel for kdump
Version: 2.6.30
Release: 1
Release: 2
%if %using_buildservice
%else
%endif
@ -798,6 +798,24 @@ kernel module packages) against the -kdump flavor of the kernel.
%endif
%changelog
* Fri May 22 2009 teheo@suse.de
- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
relocation.
* Fri May 22 2009 mmarek@suse.cz
- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid
unpacking the patches tarballs in compute-PATCHVERSION.sh.
* Fri May 22 2009 mmarek@suse.cz
- rpm/mkspec: add --release option to set a custom release string.
- scripts/tar-up.sh: revive -rs option.
* Wed May 20 2009 mmarek@suse.cz
- patches.arch/acpi_thermal_passive_blacklist.patch,
patches.suse/devtmpfs.patch: fix patches to apply with git-apply.
* Tue May 19 2009 sdietrich@suse.de
- patches.suse/stack-unwind-add-declaration.patch: Fix compile
error when CONFIG_STACK_UNWIND is not set.
* Tue May 19 2009 jblunck@suse.de
- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move
mach-types.h to arch/include/asm.
* Tue May 19 2009 jeffm@suse.com
- Set CONFIG_FRAMEBUFFER_CONSOLE=y
* Tue May 19 2009 jeffm@suse.com

View File

@ -1,3 +1,39 @@
-------------------------------------------------------------------
Fri May 22 15:47:01 CEST 2009 - teheo@suse.de
- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
relocation.
-------------------------------------------------------------------
Fri May 22 12:42:36 CEST 2009 - mmarek@suse.cz
- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid
unpacking the patches tarballs in compute-PATCHVERSION.sh.
-------------------------------------------------------------------
Fri May 22 11:45:41 CEST 2009 - mmarek@suse.cz
- rpm/mkspec: add --release option to set a custom release string.
- scripts/tar-up.sh: revive -rs option.
-------------------------------------------------------------------
Wed May 20 16:05:07 CEST 2009 - mmarek@suse.cz
- patches.arch/acpi_thermal_passive_blacklist.patch,
patches.suse/devtmpfs.patch: fix patches to apply with git-apply.
-------------------------------------------------------------------
Tue May 19 21:42:45 CEST 2009 - sdietrich@suse.de
- patches.suse/stack-unwind-add-declaration.patch: Fix compile
error when CONFIG_STACK_UNWIND is not set.
-------------------------------------------------------------------
Tue May 19 18:24:46 CEST 2009 - jblunck@suse.de
- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move
mach-types.h to arch/include/asm.
-------------------------------------------------------------------
Tue May 19 18:03:44 CEST 2009 - jeffm@suse.com

View File

@ -62,7 +62,7 @@
Name: kernel-legacy
Summary: The Standard Kernel
Version: 2.6.30
Release: 1
Release: 2
%if %using_buildservice
%else
%endif
@ -659,7 +659,7 @@ done
%defattr(-, root, root)
%package base
Summary: Base Modules of the Standard Kernel
Summary: Base Modules of the Legacy Kernel
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
@ -674,7 +674,9 @@ Conflicts: libc.so.6()(64bit)
%endif
%description base
The standard kernel for both uniprocessor and multiprocessor systems.
The kernel for both uniprocessor and multiprocessor systems to run on
older hardware. It contains support for ISA devices and has the
Physical Addressing Extension (PAE) feature disabled.
This package contains only the base modules, required in all installs.
@ -695,7 +697,7 @@ This package contains only the base modules, required in all installs.
%endif
%package extra
Summary: Extra Modules for the Standard Kernel
Summary: Extra Modules for the Legacy Kernel
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
@ -713,7 +715,9 @@ Conflicts: libc.so.6()(64bit)
%endif
%description extra
The standard kernel for both uniprocessor and multiprocessor systems.
The kernel for both uniprocessor and multiprocessor systems to run on
older hardware. It contains support for ISA devices and has the
Physical Addressing Extension (PAE) feature disabled.
This package contains additional modules not supported by Novell.
@ -736,11 +740,13 @@ This package contains additional modules not supported by Novell.
%package man
License: GPL v2 only
Summary: The Standard Kernel
Summary: The Legacy Kernel
Group: System/Kernel
%description man
The standard kernel for both uniprocessor and multiprocessor systems.
The kernel for both uniprocessor and multiprocessor systems to run on
older hardware. It contains support for ISA devices and has the
Physical Addressing Extension (PAE) feature disabled.
@ -760,7 +766,7 @@ AutoReqProv: on
%description devel
This package contains files necessary for building kernel modules (and
kernel module packages) against the -default flavor of the kernel.
kernel module packages) against the -legacy flavor of the kernel.
@ -786,6 +792,24 @@ kernel module packages) against the -default flavor of the kernel.
%endif
%changelog
* Fri May 22 2009 teheo@suse.de
- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
relocation.
* Fri May 22 2009 mmarek@suse.cz
- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid
unpacking the patches tarballs in compute-PATCHVERSION.sh.
* Fri May 22 2009 mmarek@suse.cz
- rpm/mkspec: add --release option to set a custom release string.
- scripts/tar-up.sh: revive -rs option.
* Wed May 20 2009 mmarek@suse.cz
- patches.arch/acpi_thermal_passive_blacklist.patch,
patches.suse/devtmpfs.patch: fix patches to apply with git-apply.
* Tue May 19 2009 sdietrich@suse.de
- patches.suse/stack-unwind-add-declaration.patch: Fix compile
error when CONFIG_STACK_UNWIND is not set.
* Tue May 19 2009 jblunck@suse.de
- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move
mach-types.h to arch/include/asm.
* Tue May 19 2009 jeffm@suse.com
- Set CONFIG_FRAMEBUFFER_CONSOLE=y
* Tue May 19 2009 jeffm@suse.com

View File

@ -1,3 +1,39 @@
-------------------------------------------------------------------
Fri May 22 15:47:01 CEST 2009 - teheo@suse.de
- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
relocation.
-------------------------------------------------------------------
Fri May 22 12:42:36 CEST 2009 - mmarek@suse.cz
- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid
unpacking the patches tarballs in compute-PATCHVERSION.sh.
-------------------------------------------------------------------
Fri May 22 11:45:41 CEST 2009 - mmarek@suse.cz
- rpm/mkspec: add --release option to set a custom release string.
- scripts/tar-up.sh: revive -rs option.
-------------------------------------------------------------------
Wed May 20 16:05:07 CEST 2009 - mmarek@suse.cz
- patches.arch/acpi_thermal_passive_blacklist.patch,
patches.suse/devtmpfs.patch: fix patches to apply with git-apply.
-------------------------------------------------------------------
Tue May 19 21:42:45 CEST 2009 - sdietrich@suse.de
- patches.suse/stack-unwind-add-declaration.patch: Fix compile
error when CONFIG_STACK_UNWIND is not set.
-------------------------------------------------------------------
Tue May 19 18:24:46 CEST 2009 - jblunck@suse.de
- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move
mach-types.h to arch/include/asm.
-------------------------------------------------------------------
Tue May 19 18:03:44 CEST 2009 - jeffm@suse.com

View File

@ -62,7 +62,7 @@
Name: kernel-ppc64
Summary: Kernel for ppc64 Systems
Version: 2.6.30
Release: 1
Release: 2
%if %using_buildservice
%else
%endif
@ -853,6 +853,24 @@ Authors:
%endif
%changelog
* Fri May 22 2009 teheo@suse.de
- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
relocation.
* Fri May 22 2009 mmarek@suse.cz
- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid
unpacking the patches tarballs in compute-PATCHVERSION.sh.
* Fri May 22 2009 mmarek@suse.cz
- rpm/mkspec: add --release option to set a custom release string.
- scripts/tar-up.sh: revive -rs option.
* Wed May 20 2009 mmarek@suse.cz
- patches.arch/acpi_thermal_passive_blacklist.patch,
patches.suse/devtmpfs.patch: fix patches to apply with git-apply.
* Tue May 19 2009 sdietrich@suse.de
- patches.suse/stack-unwind-add-declaration.patch: Fix compile
error when CONFIG_STACK_UNWIND is not set.
* Tue May 19 2009 jblunck@suse.de
- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move
mach-types.h to arch/include/asm.
* Tue May 19 2009 jeffm@suse.com
- Set CONFIG_FRAMEBUFFER_CONSOLE=y
* Tue May 19 2009 jeffm@suse.com

View File

@ -1,3 +1,39 @@
-------------------------------------------------------------------
Fri May 22 15:47:01 CEST 2009 - teheo@suse.de
- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
relocation.
-------------------------------------------------------------------
Fri May 22 12:42:36 CEST 2009 - mmarek@suse.cz
- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid
unpacking the patches tarballs in compute-PATCHVERSION.sh.
-------------------------------------------------------------------
Fri May 22 11:45:41 CEST 2009 - mmarek@suse.cz
- rpm/mkspec: add --release option to set a custom release string.
- scripts/tar-up.sh: revive -rs option.
-------------------------------------------------------------------
Wed May 20 16:05:07 CEST 2009 - mmarek@suse.cz
- patches.arch/acpi_thermal_passive_blacklist.patch,
patches.suse/devtmpfs.patch: fix patches to apply with git-apply.
-------------------------------------------------------------------
Tue May 19 21:42:45 CEST 2009 - sdietrich@suse.de
- patches.suse/stack-unwind-add-declaration.patch: Fix compile
error when CONFIG_STACK_UNWIND is not set.
-------------------------------------------------------------------
Tue May 19 18:24:46 CEST 2009 - jblunck@suse.de
- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move
mach-types.h to arch/include/asm.
-------------------------------------------------------------------
Tue May 19 18:03:44 CEST 2009 - jeffm@suse.com

View File

@ -62,7 +62,7 @@
Name: kernel-ps3
Summary: kernel for ps3 bootloader
Version: 2.6.30
Release: 1
Release: 2
%if %using_buildservice
%else
%endif
@ -792,6 +792,24 @@ kernel module packages) against the -default flavor of the kernel.
%endif
%changelog
* Fri May 22 2009 teheo@suse.de
- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
relocation.
* Fri May 22 2009 mmarek@suse.cz
- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid
unpacking the patches tarballs in compute-PATCHVERSION.sh.
* Fri May 22 2009 mmarek@suse.cz
- rpm/mkspec: add --release option to set a custom release string.
- scripts/tar-up.sh: revive -rs option.
* Wed May 20 2009 mmarek@suse.cz
- patches.arch/acpi_thermal_passive_blacklist.patch,
patches.suse/devtmpfs.patch: fix patches to apply with git-apply.
* Tue May 19 2009 sdietrich@suse.de
- patches.suse/stack-unwind-add-declaration.patch: Fix compile
error when CONFIG_STACK_UNWIND is not set.
* Tue May 19 2009 jblunck@suse.de
- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move
mach-types.h to arch/include/asm.
* Tue May 19 2009 jeffm@suse.com
- Set CONFIG_FRAMEBUFFER_CONSOLE=y
* Tue May 19 2009 jeffm@suse.com

View File

@ -1,3 +1,39 @@
-------------------------------------------------------------------
Fri May 22 15:47:01 CEST 2009 - teheo@suse.de
- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
relocation.
-------------------------------------------------------------------
Fri May 22 12:42:36 CEST 2009 - mmarek@suse.cz
- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid
unpacking the patches tarballs in compute-PATCHVERSION.sh.
-------------------------------------------------------------------
Fri May 22 11:45:41 CEST 2009 - mmarek@suse.cz
- rpm/mkspec: add --release option to set a custom release string.
- scripts/tar-up.sh: revive -rs option.
-------------------------------------------------------------------
Wed May 20 16:05:07 CEST 2009 - mmarek@suse.cz
- patches.arch/acpi_thermal_passive_blacklist.patch,
patches.suse/devtmpfs.patch: fix patches to apply with git-apply.
-------------------------------------------------------------------
Tue May 19 21:42:45 CEST 2009 - sdietrich@suse.de
- patches.suse/stack-unwind-add-declaration.patch: Fix compile
error when CONFIG_STACK_UNWIND is not set.
-------------------------------------------------------------------
Tue May 19 18:24:46 CEST 2009 - jblunck@suse.de
- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move
mach-types.h to arch/include/asm.
-------------------------------------------------------------------
Tue May 19 18:03:44 CEST 2009 - jeffm@suse.com

View File

@ -62,7 +62,7 @@
Name: kernel-s390
Summary: The Standard Kernel
Version: 2.6.30
Release: 1
Release: 2
%if %using_buildservice
%else
%endif
@ -790,6 +790,24 @@ kernel module packages) against the -s390 flavor of the kernel.
%endif
%changelog
* Fri May 22 2009 teheo@suse.de
- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
relocation.
* Fri May 22 2009 mmarek@suse.cz
- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid
unpacking the patches tarballs in compute-PATCHVERSION.sh.
* Fri May 22 2009 mmarek@suse.cz
- rpm/mkspec: add --release option to set a custom release string.
- scripts/tar-up.sh: revive -rs option.
* Wed May 20 2009 mmarek@suse.cz
- patches.arch/acpi_thermal_passive_blacklist.patch,
patches.suse/devtmpfs.patch: fix patches to apply with git-apply.
* Tue May 19 2009 sdietrich@suse.de
- patches.suse/stack-unwind-add-declaration.patch: Fix compile
error when CONFIG_STACK_UNWIND is not set.
* Tue May 19 2009 jblunck@suse.de
- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move
mach-types.h to arch/include/asm.
* Tue May 19 2009 jeffm@suse.com
- Set CONFIG_FRAMEBUFFER_CONSOLE=y
* Tue May 19 2009 jeffm@suse.com

View File

@ -1,3 +1,39 @@
-------------------------------------------------------------------
Fri May 22 15:47:01 CEST 2009 - teheo@suse.de
- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
relocation.
-------------------------------------------------------------------
Fri May 22 12:42:36 CEST 2009 - mmarek@suse.cz
- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid
unpacking the patches tarballs in compute-PATCHVERSION.sh.
-------------------------------------------------------------------
Fri May 22 11:45:41 CEST 2009 - mmarek@suse.cz
- rpm/mkspec: add --release option to set a custom release string.
- scripts/tar-up.sh: revive -rs option.
-------------------------------------------------------------------
Wed May 20 16:05:07 CEST 2009 - mmarek@suse.cz
- patches.arch/acpi_thermal_passive_blacklist.patch,
patches.suse/devtmpfs.patch: fix patches to apply with git-apply.
-------------------------------------------------------------------
Tue May 19 21:42:45 CEST 2009 - sdietrich@suse.de
- patches.suse/stack-unwind-add-declaration.patch: Fix compile
error when CONFIG_STACK_UNWIND is not set.
-------------------------------------------------------------------
Tue May 19 18:24:46 CEST 2009 - jblunck@suse.de
- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move
mach-types.h to arch/include/asm.
-------------------------------------------------------------------
Tue May 19 18:03:44 CEST 2009 - jeffm@suse.com

View File

@ -42,7 +42,7 @@ Url: http://www.kernel.org/
Name: kernel-source
Summary: The Linux Kernel Sources
Version: 2.6.30
Release: 1
Release: 2
%if %using_buildservice
%else
%endif
@ -235,6 +235,24 @@ done
%endif
%changelog
* Fri May 22 2009 teheo@suse.de
- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
relocation.
* Fri May 22 2009 mmarek@suse.cz
- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid
unpacking the patches tarballs in compute-PATCHVERSION.sh.
* Fri May 22 2009 mmarek@suse.cz
- rpm/mkspec: add --release option to set a custom release string.
- scripts/tar-up.sh: revive -rs option.
* Wed May 20 2009 mmarek@suse.cz
- patches.arch/acpi_thermal_passive_blacklist.patch,
patches.suse/devtmpfs.patch: fix patches to apply with git-apply.
* Tue May 19 2009 sdietrich@suse.de
- patches.suse/stack-unwind-add-declaration.patch: Fix compile
error when CONFIG_STACK_UNWIND is not set.
* Tue May 19 2009 jblunck@suse.de
- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move
mach-types.h to arch/include/asm.
* Tue May 19 2009 jeffm@suse.com
- Set CONFIG_FRAMEBUFFER_CONSOLE=y
* Tue May 19 2009 jeffm@suse.com

View File

@ -1,3 +1,39 @@
-------------------------------------------------------------------
Fri May 22 15:47:01 CEST 2009 - teheo@suse.de
- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
relocation.
-------------------------------------------------------------------
Fri May 22 12:42:36 CEST 2009 - mmarek@suse.cz
- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid
unpacking the patches tarballs in compute-PATCHVERSION.sh.
-------------------------------------------------------------------
Fri May 22 11:45:41 CEST 2009 - mmarek@suse.cz
- rpm/mkspec: add --release option to set a custom release string.
- scripts/tar-up.sh: revive -rs option.
-------------------------------------------------------------------
Wed May 20 16:05:07 CEST 2009 - mmarek@suse.cz
- patches.arch/acpi_thermal_passive_blacklist.patch,
patches.suse/devtmpfs.patch: fix patches to apply with git-apply.
-------------------------------------------------------------------
Tue May 19 21:42:45 CEST 2009 - sdietrich@suse.de
- patches.suse/stack-unwind-add-declaration.patch: Fix compile
error when CONFIG_STACK_UNWIND is not set.
-------------------------------------------------------------------
Tue May 19 18:24:46 CEST 2009 - jblunck@suse.de
- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move
mach-types.h to arch/include/asm.
-------------------------------------------------------------------
Tue May 19 18:03:44 CEST 2009 - jeffm@suse.com

View File

@ -33,7 +33,7 @@ Url: http://www.kernel.org/
Name: kernel-syms
Summary: Kernel Symbol Versions (modversions)
Version: 2.6.30
Release: 1
Release: 2
%if %using_buildservice
%else
%define kernel_source_release %(LC_ALL=C rpm -q kernel-source%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0)
@ -102,6 +102,24 @@ install -m 644 -D %{SOURCE0} %buildroot/%_docdir/%name/README.SUSE
%_docdir/%name/README.SUSE
%changelog
* Fri May 22 2009 teheo@suse.de
- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
relocation.
* Fri May 22 2009 mmarek@suse.cz
- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid
unpacking the patches tarballs in compute-PATCHVERSION.sh.
* Fri May 22 2009 mmarek@suse.cz
- rpm/mkspec: add --release option to set a custom release string.
- scripts/tar-up.sh: revive -rs option.
* Wed May 20 2009 mmarek@suse.cz
- patches.arch/acpi_thermal_passive_blacklist.patch,
patches.suse/devtmpfs.patch: fix patches to apply with git-apply.
* Tue May 19 2009 sdietrich@suse.de
- patches.suse/stack-unwind-add-declaration.patch: Fix compile
error when CONFIG_STACK_UNWIND is not set.
* Tue May 19 2009 jblunck@suse.de
- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move
mach-types.h to arch/include/asm.
* Tue May 19 2009 jeffm@suse.com
- Set CONFIG_FRAMEBUFFER_CONSOLE=y
* Tue May 19 2009 jeffm@suse.com

View File

@ -1,3 +1,39 @@
-------------------------------------------------------------------
Fri May 22 15:47:01 CEST 2009 - teheo@suse.de
- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
relocation.
-------------------------------------------------------------------
Fri May 22 12:42:36 CEST 2009 - mmarek@suse.cz
- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid
unpacking the patches tarballs in compute-PATCHVERSION.sh.
-------------------------------------------------------------------
Fri May 22 11:45:41 CEST 2009 - mmarek@suse.cz
- rpm/mkspec: add --release option to set a custom release string.
- scripts/tar-up.sh: revive -rs option.
-------------------------------------------------------------------
Wed May 20 16:05:07 CEST 2009 - mmarek@suse.cz
- patches.arch/acpi_thermal_passive_blacklist.patch,
patches.suse/devtmpfs.patch: fix patches to apply with git-apply.
-------------------------------------------------------------------
Tue May 19 21:42:45 CEST 2009 - sdietrich@suse.de
- patches.suse/stack-unwind-add-declaration.patch: Fix compile
error when CONFIG_STACK_UNWIND is not set.
-------------------------------------------------------------------
Tue May 19 18:24:46 CEST 2009 - jblunck@suse.de
- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move
mach-types.h to arch/include/asm.
-------------------------------------------------------------------
Tue May 19 18:03:44 CEST 2009 - jeffm@suse.com

View File

@ -62,7 +62,7 @@
Name: kernel-trace
Summary: The Realtime Linux Kernel
Version: 2.6.30
Release: 1
Release: 2
%if %using_buildservice
%else
%endif
@ -812,6 +812,24 @@ Authors:
%endif
%changelog
* Fri May 22 2009 teheo@suse.de
- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
relocation.
* Fri May 22 2009 mmarek@suse.cz
- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid
unpacking the patches tarballs in compute-PATCHVERSION.sh.
* Fri May 22 2009 mmarek@suse.cz
- rpm/mkspec: add --release option to set a custom release string.
- scripts/tar-up.sh: revive -rs option.
* Wed May 20 2009 mmarek@suse.cz
- patches.arch/acpi_thermal_passive_blacklist.patch,
patches.suse/devtmpfs.patch: fix patches to apply with git-apply.
* Tue May 19 2009 sdietrich@suse.de
- patches.suse/stack-unwind-add-declaration.patch: Fix compile
error when CONFIG_STACK_UNWIND is not set.
* Tue May 19 2009 jblunck@suse.de
- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move
mach-types.h to arch/include/asm.
* Tue May 19 2009 jeffm@suse.com
- Set CONFIG_FRAMEBUFFER_CONSOLE=y
* Tue May 19 2009 jeffm@suse.com

View File

@ -1,3 +1,39 @@
-------------------------------------------------------------------
Fri May 22 15:47:01 CEST 2009 - teheo@suse.de
- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
relocation.
-------------------------------------------------------------------
Fri May 22 12:42:36 CEST 2009 - mmarek@suse.cz
- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid
unpacking the patches tarballs in compute-PATCHVERSION.sh.
-------------------------------------------------------------------
Fri May 22 11:45:41 CEST 2009 - mmarek@suse.cz
- rpm/mkspec: add --release option to set a custom release string.
- scripts/tar-up.sh: revive -rs option.
-------------------------------------------------------------------
Wed May 20 16:05:07 CEST 2009 - mmarek@suse.cz
- patches.arch/acpi_thermal_passive_blacklist.patch,
patches.suse/devtmpfs.patch: fix patches to apply with git-apply.
-------------------------------------------------------------------
Tue May 19 21:42:45 CEST 2009 - sdietrich@suse.de
- patches.suse/stack-unwind-add-declaration.patch: Fix compile
error when CONFIG_STACK_UNWIND is not set.
-------------------------------------------------------------------
Tue May 19 18:24:46 CEST 2009 - jblunck@suse.de
- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move
mach-types.h to arch/include/asm.
-------------------------------------------------------------------
Tue May 19 18:03:44 CEST 2009 - jeffm@suse.com

View File

@ -62,7 +62,7 @@
Name: kernel-vanilla
Summary: The Standard Kernel - without any SUSE patches
Version: 2.6.30
Release: 1
Release: 2
%if %using_buildservice
%else
%endif
@ -790,6 +790,24 @@ kernel module packages) against the -vanilla flavor of the kernel.
%endif
%changelog
* Fri May 22 2009 teheo@suse.de
- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
relocation.
* Fri May 22 2009 mmarek@suse.cz
- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid
unpacking the patches tarballs in compute-PATCHVERSION.sh.
* Fri May 22 2009 mmarek@suse.cz
- rpm/mkspec: add --release option to set a custom release string.
- scripts/tar-up.sh: revive -rs option.
* Wed May 20 2009 mmarek@suse.cz
- patches.arch/acpi_thermal_passive_blacklist.patch,
patches.suse/devtmpfs.patch: fix patches to apply with git-apply.
* Tue May 19 2009 sdietrich@suse.de
- patches.suse/stack-unwind-add-declaration.patch: Fix compile
error when CONFIG_STACK_UNWIND is not set.
* Tue May 19 2009 jblunck@suse.de
- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move
mach-types.h to arch/include/asm.
* Tue May 19 2009 jeffm@suse.com
- Set CONFIG_FRAMEBUFFER_CONSOLE=y
* Tue May 19 2009 jeffm@suse.com

View File

@ -1,3 +1,39 @@
-------------------------------------------------------------------
Fri May 22 15:47:01 CEST 2009 - teheo@suse.de
- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
relocation.
-------------------------------------------------------------------
Fri May 22 12:42:36 CEST 2009 - mmarek@suse.cz
- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid
unpacking the patches tarballs in compute-PATCHVERSION.sh.
-------------------------------------------------------------------
Fri May 22 11:45:41 CEST 2009 - mmarek@suse.cz
- rpm/mkspec: add --release option to set a custom release string.
- scripts/tar-up.sh: revive -rs option.
-------------------------------------------------------------------
Wed May 20 16:05:07 CEST 2009 - mmarek@suse.cz
- patches.arch/acpi_thermal_passive_blacklist.patch,
patches.suse/devtmpfs.patch: fix patches to apply with git-apply.
-------------------------------------------------------------------
Tue May 19 21:42:45 CEST 2009 - sdietrich@suse.de
- patches.suse/stack-unwind-add-declaration.patch: Fix compile
error when CONFIG_STACK_UNWIND is not set.
-------------------------------------------------------------------
Tue May 19 18:24:46 CEST 2009 - jblunck@suse.de
- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move
mach-types.h to arch/include/asm.
-------------------------------------------------------------------
Tue May 19 18:03:44 CEST 2009 - jeffm@suse.com

View File

@ -62,7 +62,7 @@
Name: kernel-xen
Summary: The Xen Kernel
Version: 2.6.30
Release: 1
Release: 2
%if %using_buildservice
%else
%endif
@ -798,6 +798,24 @@ kernel module packages) against the -xen flavor of the kernel.
%endif
%changelog
* Fri May 22 2009 teheo@suse.de
- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE
relocation.
* Fri May 22 2009 mmarek@suse.cz
- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid
unpacking the patches tarballs in compute-PATCHVERSION.sh.
* Fri May 22 2009 mmarek@suse.cz
- rpm/mkspec: add --release option to set a custom release string.
- scripts/tar-up.sh: revive -rs option.
* Wed May 20 2009 mmarek@suse.cz
- patches.arch/acpi_thermal_passive_blacklist.patch,
patches.suse/devtmpfs.patch: fix patches to apply with git-apply.
* Tue May 19 2009 sdietrich@suse.de
- patches.suse/stack-unwind-add-declaration.patch: Fix compile
error when CONFIG_STACK_UNWIND is not set.
* Tue May 19 2009 jblunck@suse.de
- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move
mach-types.h to arch/include/asm.
* Tue May 19 2009 jeffm@suse.com
- Set CONFIG_FRAMEBUFFER_CONSOLE=y
* Tue May 19 2009 jeffm@suse.com

21
mkspec
View File

@ -4,9 +4,16 @@ use strict;
use warnings;
use File::Copy;
use Data::Dumper;
use Getopt::Long;
my $dir = ".";
my $rpmrelease;
my $patches="";
GetOptions(
"patches=s" => \$patches,
"release=s" => \$rpmrelease
) or die "Usage: $0 [--release <release>] [--patches <dir>]\n";
# flavor -> [supported archs]
my %flavor_archs = parse_config_conf();
@ -24,15 +31,17 @@ my $changelog = convert_changes();
# package name -> [summary, description]
my %binary_descriptions = parse_descriptions();
my $patchversion = `$dir/compute-PATCHVERSION.sh`;
$patches="--patches $patches" if $patches;
my $patchversion = `$dir/compute-PATCHVERSION.sh $patches`;
chomp $patchversion;
my ($rpmversion, $rpmrelease) = split(/-/, $patchversion, 2);
my $rpmversion;
if (defined($rpmrelease)) {
$rpmrelease =~ s/-/./g;
$rpmrelease .= ".";
($rpmversion = $patchversion) =~ s/-.*//;
} else {
$rpmrelease = "";
($rpmversion, $rpmrelease) = (split(/-/, $patchversion, 2), "");
}
$rpmrelease =~ s/[^.]$/$&./;
$rpmrelease =~ s/-/./g;
my %macros = (
VARIANT => $variant,

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:abb7d19e1de0de7ca06554a0fe8cdb969d3c21c88042e23a66ee85639a1530c0
size 36556
oid sha256:ea4f114ec29c023d23721a5ae0123a25f81f1d2cbdfd1d660b89718bec141a56
size 36945

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3520cfcf829ed3eaa8d9fe1c20009d28581291e36a2132b71e41b7a36c2c5f2f
size 3601
oid sha256:10685279b7a3674bcf0c1f8d37865c8c2590f57a3fc58790f8983e6efd4af1c8
size 4128

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7a597c9afadfa0be7bceece53300644154973a2024d530be3392f1d4efb92bee
size 865991
oid sha256:536afd9276491ebbf8615d48a68a0be14c5c3ba4d8d2ff0f788bb41489327b54
size 865973

View File

@ -49,6 +49,7 @@
patches.kernel.org/arch-include-asm-fixes
patches.rpmify/spin_is_contended-fix
patches.kernel.org/staging-pci-deps
patches.rpmify/arm-arch_include_asm-fix.diff
########################################################
# kABI consistency patches
@ -585,8 +586,10 @@
########################################################
patches.suse/crasher-26.diff
patches.suse/stack-unwind
patches.suse/stack-unwind-add-declaration.patch
patches.suse/no-frame-pointer-select
patches.arch/x86_64-unwind-annotations
patches.arch/i586-unwind-quick-fix
########################################################
# Kdump

View File

@ -1,3 +1,3 @@
2009-05-19 18:03:55 +0200
GIT Revision: 15e77baed5e8a3bf8b01fe7e216779ce8fde3382
2009-05-22 15:47:06 +0200
GIT Revision: 004d7f8460e6b2588aae824b928acd18fdb74cb4
GIT Branch: master