Hello community, here is the log from the commit of package efibootmgr checked in at Wed Dec 20 02:22:32 CET 2006. -------- --- arch/ia64/efibootmgr/efibootmgr.changes 2006-01-25 21:44:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/efibootmgr/efibootmgr.changes 2006-12-20 00:11:32.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Dec 20 00:07:46 CET 2006 - rw@suse.de + +- Use '&' instead of '&&' to mask bits. [#219735] +- Fix compilation for STABLE. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ efibootmgr.spec ++++++ --- /var/tmp/diff_new_pack.5DyUy8/_old 2006-12-20 02:22:24.000000000 +0100 +++ /var/tmp/diff_new_pack.5DyUy8/_new 2006-12-20 02:22:24.000000000 +0100 @@ -1,11 +1,11 @@ # # spec file for package efibootmgr (Version 0.5.3) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -14,9 +14,9 @@ URL: http://linux.dell.com/efibootmgr/ Summary: EFI Boot Manager Version: 0.5.3 -Release: 1 +Release: 4 Group: System/Boot -License: GPL +License: GNU General Public License (GPL) Source: http://linux.dell.com/efibootmgr/efibootmgr-%{version}.tar.gz Patch: %{name}-%{version}.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -35,7 +35,7 @@ %prep %setup -%patch +%patch -p1 chmod +x tools/install.pl %build @@ -57,6 +57,9 @@ %{_mandir}/man8/*.gz %changelog -n efibootmgr +* Wed Dec 20 2006 - rw@suse.de +- Use '&' instead of '&&' to mask bits. [#219735] +- Fix compilation for STABLE. * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Wed Nov 09 2005 - schwab@suse.de ++++++ efibootmgr-0.5.3.diff ++++++ --- /var/tmp/diff_new_pack.5DyUy8/_old 2006-12-20 02:22:24.000000000 +0100 +++ /var/tmp/diff_new_pack.5DyUy8/_new 2006-12-20 02:22:24.000000000 +0100 @@ -1,10 +1,35 @@ ---- src/lib/efi.c -+++ src/lib/efi.c -@@ -37,6 +37,7 @@ +diff -ur efibootmgr-0.5.3/src/efibootmgr/module.mk efibootmgr-0.5.3-4/src/efibootmgr/module.mk +--- efibootmgr-0.5.3/src/efibootmgr/module.mk 2004-06-09 23:45:42.000000000 +0200 ++++ efibootmgr-0.5.3-4/src/efibootmgr/module.mk 2006-12-20 00:00:01.000000000 +0100 +@@ -11,7 +11,7 @@ + efibootmgr_LIBDIR := src/lib + efibootmgr_FULLLIB := \ + $(patsubst %,$(efibootmgr_LIBDIR)/%,$(efibootmgr_LIBS)) +-LIBS = -lpci ++LIBS = -lpci -lgz + + ALLDEPS += $(efibootmgr_FULLTARGET) + CLEANLIST += $(efibootmgr_FULLTARGET) +diff -ur efibootmgr-0.5.3/src/lib/disk.c efibootmgr-0.5.3-4/src/lib/disk.c +--- efibootmgr-0.5.3/src/lib/disk.c 2005-08-10 07:25:48.000000000 +0200 ++++ efibootmgr-0.5.3-4/src/lib/disk.c 2006-12-19 23:51:38.000000000 +0100 +@@ -55,7 +55,7 @@ + return 1; + } + major = buf.st_dev >> 8; +- minor = buf.st_dev && 0xFF; ++ minor = buf.st_dev & 0xFF; + + /* IDE disks can have up to 64 partitions, or 6 bits worth, + * and have one bit for the disk number. +diff -ur efibootmgr-0.5.3/src/lib/efi.c efibootmgr-0.5.3-4/src/lib/efi.c +--- efibootmgr-0.5.3/src/lib/efi.c 2005-08-10 17:58:13.000000000 +0200 ++++ efibootmgr-0.5.3-4/src/lib/efi.c 2006-12-19 23:52:21.000000000 +0100 +@@ -35,6 +35,7 @@ #include <linux/sockios.h> #include <net/if.h> #include <pci/pci.h> -+#define u64 uint64_t ++#include <linux/types.h> #include <linux/ethtool.h> #include "efi.h" #include "efichar.h" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org