diff --git a/kexec-tools-portability-issue b/kexec-tools-portability-issue index 0c911c2..4876c04 100644 --- a/kexec-tools-portability-issue +++ b/kexec-tools-portability-issue @@ -19,7 +19,7 @@ Signed-off-by: Bernhard Walle end = &sha256_regions[sizeof(sha256_regions)/sizeof(sha256_regions[0])]; for(ptr = sha256_regions; ptr < end; ptr++) { - sha256_update(&ctx, ptr->start, ptr->len); -+ sha256_update(&ctx, (uint8_t *)ptr->start, ptr->len); ++ sha256_update(&ctx, (uint8_t *)((uintptr_t)ptr->start), ptr->len); } sha256_finish(&ctx, digest); if (memcmp(digest, sha256_digest, sizeof(digest)) != 0) { diff --git a/kexec-tools-testing-20080221-rc.tar.bz2 b/kexec-tools-testing-20080221-rc.tar.bz2 deleted file mode 100644 index 4b8d1e8..0000000 --- a/kexec-tools-testing-20080221-rc.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:844b853c8a4ddfca15f5ca43a804454e2fd3881fb4b780c8df54e4a84024f5fa -size 207895 diff --git a/kexec-tools-testing-20080226-rc.tar.bz2 b/kexec-tools-testing-20080226-rc.tar.bz2 new file mode 100644 index 0000000..55c40d0 --- /dev/null +++ b/kexec-tools-testing-20080226-rc.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f9e461637e1c4f34021552bed7b440519a5271983cd3fc5f7bfd9e004ffc30ae +size 251799 diff --git a/kexec-tools.changes b/kexec-tools.changes index 586d529..73cd191 100644 --- a/kexec-tools.changes +++ b/kexec-tools.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Feb 26 08:58:47 CET 2008 - bwalle@suse.de + +- update to kexec-tools-testing v20080226-rc + o build: include configure and include/config.h.in in dist + tarball +- adjusted kexec-tools-portability-issue to build without warnings + on 32 bit systems + ------------------------------------------------------------------- Thu Feb 21 10:55:57 CET 2008 - bwalle@suse.de diff --git a/kexec-tools.spec b/kexec-tools.spec index 4558144..5aa257e 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -16,19 +16,19 @@ Name: kexec-tools %ifarch ppc BuildRequires: gcc-64bit glibc-devel-64bit %endif -%define package_version testing-20080221-rc +%define package_version testing-20080226-rc License: GPL v2 or later Group: System/Kernel Requires: %insserv_prereq %fillup_prereq AutoReqProv: on Summary: Tools for fast kernel loading Version: 1.101 -Release: 171 +Release: 174 Source: %{name}-%{package_version}.tar.bz2 Source1: README.SUSE Url: http://ftp.kernel.org/pub/linux/kernel/people/horms/kexec-tools/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: autoconf zlib-devel +BuildRequires: zlib-devel Patch1: kexec-tools.ppc32-64bit-purgatory.patch Patch2: kexec-tools.gcc-bug.patch Patch3: kexec-tools-portability-issue @@ -62,7 +62,6 @@ cp %{SOURCE1} . %ifarch ia64 RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-fstack-protector//') %endif -autoconf CFLAGS=$RPM_OPT_FLAGS ./configure \ --prefix=/ \ %ifarch ppc @@ -91,6 +90,12 @@ install -c -m 0644 kexec/kexec.8 $RPM_BUILD_ROOT%{_mandir}/man8 %endif %changelog +* Tue Feb 26 2008 bwalle@suse.de +- update to kexec-tools-testing v20080226-rc + o build: include configure and include/config.h.in in dist + tarball +- adjusted kexec-tools-portability-issue to build without warnings + on 32 bit systems * Thu Feb 21 2008 bwalle@suse.de - update to kexec-tools-testing v20080221-rc o Only include needed files in distribution tarball