Your message dated Thu, 10 Mar 2005 11:48:32 -0700
with message-id <[EMAIL PROTECTED]>
and subject line fixed
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--------------------------------------
Received: (at submit) by bugs.debian.org; 28 Aug 2004 01:52:10 +0000
>From [EMAIL PROTECTED] Fri Aug 27 18:52:10 2004
Return-path: <[EMAIL PROTECTED]>
Received: from atlrel9.hp.com [156.153.255.214]
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1C0sO2-0003zS-00; Fri, 27 Aug 2004 18:52:10 -0700
Received: from smtp1.fc.hp.com (smtp.fc.hp.com [15.11.136.119])
by atlrel9.hp.com (Postfix) with ESMTP id 263C9C272
for <[EMAIL PROTECTED]>; Fri, 27 Aug 2004 21:52:09 -0400 (EDT)
Received: from ldl.fc.hp.com (ldl.fc.hp.com [15.11.146.30])
by smtp1.fc.hp.com (Postfix) with ESMTP
id 2EE193822F; Fri, 27 Aug 2004 19:52:03 -0600 (MDT)
Received: from localhost (localhost [127.0.0.1])
by ldl.fc.hp.com (Postfix) with ESMTP id 698161340F2;
Fri, 27 Aug 2004 19:52:03 -0600 (MDT)
Received: from ldl.fc.hp.com ([127.0.0.1])
by localhost (ldl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP
id 07855-01; Fri, 27 Aug 2004 19:52:02 -0600 (MDT)
Received: from krebs (krebs.dannf [10.8.0.7])
by ldl.fc.hp.com (Postfix) with ESMTP id 275591340D4;
Fri, 27 Aug 2004 19:52:02 -0600 (MDT)
Received: by krebs (Postfix, from userid 20800)
id C90E93B7186; Fri, 27 Aug 2004 19:52:54 -0600 (MDT)
Content-Type: multipart/mixed; boundary="===============1400580822197704898=="
MIME-Version: 1.0
From: dann frazier <[EMAIL PROTECTED]>
To: Debian Bug Tracking System <[EMAIL PROTECTED]>
Subject: efibootmgr: base package added dependency during freeze
X-Mailer: reportbug 2.64
Date: Fri, 27 Aug 2004 19:52:54 -0600
Message-Id: <[EMAIL PROTECTED]>
X-Virus-Scanned: by amavisd-new-20030616-p10 (Debian) at ldl.fc.hp.com
Delivered-To: [EMAIL PROTECTED]
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-8.0 required=4.0 tests=BAYES_00,HAS_PACKAGE
autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level:
This is a multi-part MIME message sent by reportbug.
--===============1400580822197704898==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Package: efibootmgr
Version: 0.4.9-1
Severity: grave
Tags: patch
efibootmgr was updated during the freeze so we can support a linux-2.6 d-i
flavor. However, the new release we moved to added a dependency on pciutils.
Base Package + New Dependency + Freeze == Bad
This patch backs out the code that pulls in the pciutils dependency, but
leaves in the sysfs support.
-- System Information:
Debian Release: 3.1
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: ia64
Kernel: Linux 2.6.7-1-mckinley
Locale: LANG=C, LC_CTYPE=C
Versions of packages efibootmgr depends on:
ii libc6.1 2.3.2.ds1-16 GNU C Library: Shared libraries an
ii pciutils 1:2.1.11-15 Linux PCI Utilities
-- no debconf information
--===============1400580822197704898==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="rm-pciutils-dep.patch"
diff -urN efibootmgr-0.4.9/AUTHORS
efibootmgr-0.5.0-test3+readbootorderfix/AUTHORS
--- efibootmgr-0.4.9/AUTHORS 2004-06-09 15:39:43.000000000 -0600
+++ efibootmgr-0.5.0-test3+readbootorderfix/AUTHORS 2003-07-31
09:12:59.000000000 -0600
@@ -13,6 +13,3 @@
- Patches to efibootmgr.c
- network boot entry creation in efi.c
-Joshua Giles <[EMAIL PROTECTED]>
-- walk the PCI path inserting parent bridge device path components for
- network boot and EDD30 entries.
diff -urN efibootmgr-0.4.9/Makefile
efibootmgr-0.5.0-test3+readbootorderfix/Makefile
--- efibootmgr-0.4.9/Makefile 2004-06-09 15:46:18.000000000 -0600
+++ efibootmgr-0.5.0-test3+readbootorderfix/Makefile 2004-04-24
09:17:09.000000000 -0600
@@ -1,10 +1,10 @@
default: all
- RELEASE_DATE := "09-Jun-2004"
+ RELEASE_DATE := "24-Feb-2004"
RELEASE_MAJOR := 0
RELEASE_MINOR := 5
RELEASE_SUBLEVEL := 0
- RELEASE_EXTRALEVEL := -test4
+ RELEASE_EXTRALEVEL := -test3
RELEASE_NAME := efibootmgr
RELEASE_STRING :=
$(RELEASE_NAME)-$(RELEASE_MAJOR).$(RELEASE_MINOR).$(RELEASE_SUBLEVEL)$(RELEASE_EXTRALEVEL)
diff -urN efibootmgr-0.4.9/debian/changelog
efibootmgr-0.5.0-test3+readbootorderfix/debian/changelog
--- efibootmgr-0.4.9/debian/changelog 2004-08-27 19:36:43.976260131 -0600
+++ efibootmgr-0.5.0-test3+readbootorderfix/debian/changelog 2004-08-27
19:44:57.862972831 -0600
@@ -1,3 +1,11 @@
+efibootmgr (0.4.9-2) unstable; urgency=high
+
+ * Base dependencies are frozen; this release reverts the test4 changes
+ that required a dependency on pciutils. (To do this, I reverted to
+ test3, then added the bug fix from test4 - see the upstream changelog).
+
+ -- dannf frazier <[EMAIL PROTECTED]> Fri, 27 Aug 2004 19:42:46 -0600
+
efibootmgr (0.4.9-1) unstable; urgency=high
* new upstream version. This is actually 0.5.0-test4, renumbered to avoid
diff -urN efibootmgr-0.4.9/debian/control
efibootmgr-0.5.0-test3+readbootorderfix/debian/control
--- efibootmgr-0.4.9/debian/control 2004-08-27 19:36:43.976260131 -0600
+++ efibootmgr-0.5.0-test3+readbootorderfix/debian/control 2004-08-27
19:38:38.115907171 -0600
@@ -2,7 +2,7 @@
Section: admin
Priority: optional
Maintainer: Bdale Garbee <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 3.0.0), docbook-to-man, pciutils-dev
+Build-Depends: debhelper (>> 3.0.0), docbook-to-man
Standards-Version: 3.6.1.0
Package: efibootmgr
diff -urN efibootmgr-0.4.9/doc/ChangeLog
efibootmgr-0.5.0-test3+readbootorderfix/doc/ChangeLog
--- efibootmgr-0.4.9/doc/ChangeLog 2004-06-09 15:47:17.000000000 -0600
+++ efibootmgr-0.5.0-test3+readbootorderfix/doc/ChangeLog 2004-04-24
09:16:55.000000000 -0600
@@ -1,14 +1,3 @@
-* Wed Jun 07 2004 Matt Domsch <[EMAIL PROTECTED]>
-- Fixed bug where read_boot_order() would wrongly return EFI_NOT_FOUND
- when it needed to create a new BootOrder variable. Reported by Micah
Parrish.
-- Added code to recursively walk the PCI bus putting parent PCI bridges
- in. This is necessary for Dell PowerEdge 3250 and 7250 servers and
- Intel Tiger2 and Tiger4 platforms when creating PXE boot entries for
- the onboard NICs, and if creating EDD30 boot path entries. Work by Matt
- and Joshua Giles.
- - Note, efibootmgr now requires libpci for building.
-- Released v0.5.0-test4
-
* Sat Apr 24 2004 Matt Domsch <[EMAIL PROTECTED]>
- Fixed reversed logic of create_or_edit_variable which prevented object
creation or editing on sysfs.
diff -urN efibootmgr-0.4.9/src/efibootmgr/module.mk
efibootmgr-0.5.0-test3+readbootorderfix/src/efibootmgr/module.mk
--- efibootmgr-0.4.9/src/efibootmgr/module.mk 2004-06-09 15:45:42.000000000
-0600
+++ efibootmgr-0.5.0-test3+readbootorderfix/src/efibootmgr/module.mk
2003-09-04 13:13:21.000000000 -0600
@@ -11,7 +11,6 @@
efibootmgr_LIBDIR := src/lib
efibootmgr_FULLLIB := \
$(patsubst %,$(efibootmgr_LIBDIR)/%,$(efibootmgr_LIBS))
-LIBS = -lpci
ALLDEPS += $(efibootmgr_FULLTARGET)
CLEANLIST += $(efibootmgr_FULLTARGET)
@@ -20,5 +19,4 @@
$(efibootmgr_FULLTARGET): \
$(efibootmgr_FULLOBJECT) \
- $(efibootmgr_FULLLIB) \
- $(LIBS)
+ $(efibootmgr_FULLLIB)
diff -urN efibootmgr-0.4.9/src/lib/efi.c
efibootmgr-0.5.0-test3+readbootorderfix/src/lib/efi.c
--- efibootmgr-0.4.9/src/lib/efi.c 2004-08-27 19:36:43.978213256 -0600
+++ efibootmgr-0.5.0-test3+readbootorderfix/src/lib/efi.c 2004-08-27
19:37:45.208681256 -0600
@@ -35,8 +35,12 @@
#include <sys/ioctl.h>
#include <linux/sockios.h>
#include <net/if.h>
-#include <pci/pci.h>
-typedef __u64 u64;
+
+typedef unsigned long long u64; /* hack, so we may include kernel's ethtool.h
*/
+typedef __uint32_t u32; /* ditto */
+typedef __uint16_t u16; /* ditto */
+typedef __uint8_t u8; /* ditto */
+
#include <linux/ethtool.h>
#include "efi.h"
#include "efichar.h"
@@ -45,7 +49,6 @@
#include "efibootmgr.h"
#include "efivars_procfs.h"
#include "efivars_sysfs.h"
-#include "list.h"
static struct efivar_kernel_calls *fs_kernel_calls;
@@ -295,55 +298,8 @@
return p.length;
}
-struct device
-{
- struct pci_dev *pci_dev;
- struct list_head node;
-};
-
-static struct device *
-is_parent_bridge(struct pci_dev *p, unsigned int target_bus)
-{
- struct device *d;
- unsigned int primary, secondary;
-
- if ( (pci_read_word(p, PCI_HEADER_TYPE) & 0x7f) !=
PCI_HEADER_TYPE_BRIDGE)
- return NULL;
-
- primary=pci_read_byte(p, PCI_PRIMARY_BUS);
- secondary=pci_read_byte(p, PCI_SECONDARY_BUS);
-
-
- if (secondary != target_bus)
- return NULL;
-
- d = malloc(sizeof(struct device));
- if (!d)
- return NULL;
- memset(d, 0, sizeof(*d));
- INIT_LIST_HEAD(&d->node);
-
- d->pci_dev = p;
-
- return d;
-}
-
-static struct device *
-find_parent(struct pci_access *pacc, unsigned int target_bus)
-{
- struct device *dev;
- struct pci_dev *p;
-
- for (p=pacc->devices; p; p=p->next) {
- dev = is_parent_bridge(p, target_bus);
- if (dev)
- return dev;
- }
- return NULL;
-}
-
static uint16_t
-make_one_pci_device_path(void *dest, uint8_t device, uint8_t function)
+make_pci_device_path(void *dest, uint8_t device, uint8_t function)
{
PCI_DEVICE_PATH p;
memset(&p, 0, sizeof(p));
@@ -357,47 +313,6 @@
}
static uint16_t
-make_pci_device_path(void *dest, uint8_t bus, uint8_t device, uint8_t function)
-{
- struct device *dev;
- struct pci_access *pacc;
- struct list_head *pos, *n;
- LIST_HEAD(pci_parent_list);
- char *p = dest;
-
- pacc = pci_alloc();
- if (!pacc)
- return 0;
-
- pci_init(pacc);
- pci_scan_bus(pacc);
-
- do {
- dev = find_parent(pacc, bus);
- if (dev) {
- list_add(&pci_parent_list, &dev->node);
- bus = dev->pci_dev->bus;
- }
- } while (dev && bus);
-
-
- list_for_each_safe(pos, n, &pci_parent_list) {
- dev = list_entry(pos, struct device, node);
- p += make_one_pci_device_path(p,
- dev->pci_dev->dev,
- dev->pci_dev->func);
- list_del(&dev->node);
- free(dev);
- }
-
- p += make_one_pci_device_path(p, device, function);
-
- pci_cleanup(pacc);
-
- return ((void *)p - dest);
-}
-
-static uint16_t
make_scsi_device_path(void *dest, uint16_t id, uint16_t lun)
{
SCSI_DEVICE_PATH p;
@@ -473,7 +388,7 @@
idlun_to_components(&idlun, &host, &channel, &id, &lun);
p += make_acpi_device_path (p, EISAID_PNP0A03, bus);
- p += make_pci_device_path (p, bus, device, function);
+ p += make_pci_device_path (p, device, function);
p += make_scsi_device_path (p, id, lun);
return ((void *)p - buffer);
}
@@ -548,7 +463,7 @@
char *make_net_load_option(char *p, char *iface)
{
/* copied pretty much verbatim from the ethtool source */
- int fd = 0, err;
+ int fd = 0, err;
int bus, slot, func;
struct ifreq ifr;
struct ethtool_drvinfo drvinfo;
@@ -567,14 +482,13 @@
perror("Cannot get driver information");
}
-
err = sscanf(drvinfo.bus_info, "%2x:%2x.%x", &bus, &slot, &func);
if (err == 0) {
perror("Couldn't parse device location string.");
}
p += make_acpi_device_path(p, opts.acpi_hid, opts.acpi_uid);
- p += make_pci_device_path(p, bus, (uint8_t)slot, (uint8_t)func);
+ p += make_pci_device_path(p, (uint8_t)slot, (uint8_t)func);
err = ioctl(fd, SIOCGIFHWADDR, &ifr);
if (err < 0) {
@@ -583,6 +497,7 @@
p += make_mac_addr_device_path(p, ifr.ifr_ifru.ifru_hwaddr.sa_data, 0);
p += make_end_device_path (p);
+
return(p);
}
--===============1400580822197704898==--
---------------------------------------
Received: (at 268490-done) by bugs.debian.org; 10 Mar 2005 18:48:45 +0000
>From [EMAIL PROTECTED] Thu Mar 10 10:48:44 2005
Return-path: <[EMAIL PROTECTED]>
Received: from winfree.gag.com [192.133.104.8]
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1D9SiC-00060S-00; Thu, 10 Mar 2005 10:48:44 -0800
Received: from localhost (localhost [127.0.0.1])
by winfree.gag.com (Postfix) with ESMTP id E3966C112
for <[EMAIL PROTECTED]>; Thu, 10 Mar 2005 11:48:43 -0700 (MST)
Received: from winfree.gag.com ([127.0.0.1])
by localhost (winfree [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id 09699-03 for <[EMAIL PROTECTED]>;
Thu, 10 Mar 2005 11:48:39 -0700 (MST)
Received: from rover.gag.com (localhost [127.0.0.1])
by winfree.gag.com (Postfix) with ESMTP id 10221C034
for <[EMAIL PROTECTED]>; Thu, 10 Mar 2005 11:48:39 -0700 (MST)
Received: by rover.gag.com (Postfix, from userid 1000)
id 29F19823BC; Thu, 10 Mar 2005 11:48:32 -0700 (MST)
To: [EMAIL PROTECTED]
Subject: fixed
From: Bdale Garbee <[EMAIL PROTECTED]>
Date: Thu, 10 Mar 2005 11:48:32 -0700
Message-ID: <[EMAIL PROTECTED]>
User-Agent: Gnus/5.1007 (Gnus v5.10.7) Emacs/21.3 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Virus-Scanned: by amavisd-new-20030616-p10 (Debian) at gag.com
Delivered-To: [EMAIL PROTECTED]
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-2.0 required=4.0 tests=BAYES_00,ONEWORD autolearn=no
version=2.60-bugs.debian.org_2005_01_02
X-Spam-Level:
The current situation is that a version of efibootmgr with suitable deps for
sarge is in sarge, fresh efibootmgr is in sid, config files in the d-i build
tree handle the difference just fine, and the version in sid shouldn't promote
to sarge without manual intervention since it's part of what is already
frozen for release.
So I'm closing this bug with no further action taken.
Bdale
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
