Hello community, here is the log from the commit of package rpm checked in at Fri Oct 6 17:19:53 CEST 2006. -------- --- rpm/rpm.changes 2006-10-02 15:31:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/rpm/rpm.changes 2006-10-02 18:05:46.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Oct 2 18:02:21 CEST 2006 - agruen@suse.de + +- %suse_kernel_module_package: Abort when trying to build for a + kernel that doesn't have an associated /boot/symsets-$krel.tar.gz + file: we cannot generate the appropriate dependencies without. + +------------------------------------------------------------------- @@ -11 +18 @@ -- Make find-*.ksyms more robust (199474). +- Make find-*.ksyms more robust. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpm-python.spec ++++++ --- /var/tmp/diff_new_pack.XeJErB/_old 2006-10-06 17:19:36.000000000 +0200 +++ /var/tmp/diff_new_pack.XeJErB/_new 2006-10-06 17:19:36.000000000 +0200 @@ -17,7 +17,7 @@ Autoreqprov: on Summary: Python Bindings for Manipulating RPM Packages Version: 4.4.2 -Release: 54 +Release: 55 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.XeJErB/_old 2006-10-06 17:19:36.000000000 +0200 +++ /var/tmp/diff_new_pack.XeJErB/_new 2006-10-06 17:19:36.000000000 +0200 @@ -20,7 +20,7 @@ Autoreqprov: on Summary: The RPM Package Manager Version: 4.4.2 -Release: 56 +Release: 57 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -247,7 +247,7 @@ License: LGPL, Other License(s), see package Group: System/Libraries Version: 1.7 -Release: 284 +Release: 285 # %description -n popt @@ -270,7 +270,7 @@ License: LGPL, Other License(s), see package Group: System/Libraries Version: 1.7 -Release: 284 +Release: 285 Requires: popt = 1.7 Requires: glibc-devel @@ -309,6 +309,10 @@ %changelog -n rpm * Mon Oct 02 2006 - agruen@suse.de +- %%suse_kernel_module_package: Abort when trying to build for a + kernel that doesn't have an associated /boot/symsets-$krel.tar.gz + file: we cannot generate the appropriate dependencies without. +* Mon Oct 02 2006 - agruen@suse.de - Allow kernel modules in packages even when the dependencies between those packages and the matching kernel packages cannot be tracked (199474). ++++++ rpm-suse_macros ++++++ --- rpm/rpm-suse_macros 2006-09-19 11:57:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/rpm/rpm-suse_macros 2006-10-02 18:01:13.000000000 +0200 @@ -461,7 +461,11 @@ esac \ fi \ krel=$(make -s -C /usr/src/linux-obj/%_target_cpu/$flavor kernelrelease) \ - [ -e /boot/symsets-$krel.tar.gz ] || continue \ + if [ ! -e /boot/symsets-$krel.tar.gz ]; then \ + echo "%%{error:Cannot create dependencies for $krel kernel modules: /boot/symsets-$krel.tar.gz is missing. Make sure that kernel-syms is in BuildRequires.}" \ + echo "%%%%error above -- aborting" \ + echo "exit 1" \ + fi \ flavors_to_build="$flavors_to_build $flavor" \ echo "%%_suse_kernel_module_subpackage -n %{-n*}%{!-n:%name}-kmp -v %{-v*}%{!-v:%version} -r %{-r*}%{!-r:%release} %{-p} $flavor $krel $kver" \ done \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org