![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package hwinfo checked in at Mon Sep 15 12:26:01 CEST 2008. -------- --- hwinfo/hwinfo.changes 2008-09-09 00:44:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/hwinfo/hwinfo.changes 2008-09-15 12:10:44.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 15 12:10:32 CEST 2008 - snwint@suse.de + +- use udevadm instead of udevinfo + +------------------------------------------------------------------- Old: ---- hwinfo-15.3.tar.bz2 hwinfo-2.6.27.patch hwinfo.ehea.patch New: ---- hwinfo-15.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.G23624/_old 2008-09-15 12:25:40.000000000 +0200 +++ /var/tmp/diff_new_pack.G23624/_new 2008-09-15 12:25:40.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package hwinfo (Version 15.3) +# spec file for package hwinfo (Version 15.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,11 +28,9 @@ PreReq: /sbin/ldconfig %insserv_prereq %fillup_prereq AutoReqProv: on Summary: Hardware Library -Version: 15.3 -Release: 32 -Source: hwinfo-15.3.tar.bz2 -Patch64: hwinfo.ehea.patch -Patch65: hwinfo-2.6.27.patch +Version: 15.4 +Release: 1 +Source: hwinfo-15.4.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -57,8 +55,6 @@ %prep %setup -%patch64 -p1 -%patch65 %build make static @@ -106,6 +102,8 @@ %doc doc/libhd/html %changelog +* Mon Sep 15 2008 snwint@suse.de +- use udevadm instead of udevinfo * Tue Sep 09 2008 ro@suse.de - fix build on x86 with 2.6.67 kernel includes * Fri Aug 08 2008 olh@suse.de ++++++ hwinfo-15.3.tar.bz2 -> hwinfo-15.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-15.3/Changelog new/hwinfo-15.4/Changelog --- old/hwinfo-15.3/Changelog 2008-07-22 10:54:16.000000000 +0200 +++ new/hwinfo-15.4/Changelog 2008-09-15 11:59:18.000000000 +0200 @@ -1,3 +1,8 @@ +15/9/2008: v15.4 + - fix build on x86 with 2.6.67 kernel includes + - add inital POWER6 ibmebus support for ehea network (bnc#394602 -LTC44938) + - use udevadm instead of udevinfo + 22/7/2008: v15.3 - fixed compiling on s390 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-15.3/src/hd/hd.c new/hwinfo-15.4/src/hd/hd.c --- old/hwinfo-15.3/src/hd/hd.c 2008-07-16 14:58:37.000000000 +0200 +++ new/hwinfo-15.4/src/hd/hd.c 2008-09-15 11:57:39.000000000 +0200 @@ -5692,7 +5692,8 @@ hd_udevinfo_t **uip, *ui; char *s = NULL, buf[256]; - udevinfo = read_file("| " PROG_UDEVINFO " -e 2>/dev/null", 0, 0); + udevinfo = read_file("| " PROG_UDEVADM " info -e 2>/dev/null", 0, 0); + if(!udevinfo) udevinfo = read_file("| " PROG_UDEVINFO " -e 2>/dev/null", 0, 0); ADD2LOG("----- udevinfo -----\n"); for(sl = udevinfo; sl; sl = sl->next) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-15.3/src/hd/hd.h new/hwinfo-15.4/src/hd/hd.h --- old/hwinfo-15.3/src/hd/hd.h 2008-07-21 12:04:25.000000000 +0200 +++ new/hwinfo-15.4/src/hd/hd.h 2008-09-15 11:58:31.000000000 +0200 @@ -294,7 +294,7 @@ /** outside the range of the PCI values */ bus_ps2 = 0x80, bus_serial, bus_parallel, bus_floppy, bus_scsi, bus_ide, bus_usb, bus_adb, bus_raid, bus_sbus, bus_i2o, bus_vio, bus_ccw, bus_iucv, bus_ps3_system_bus, - bus_virtio + bus_virtio, bus_ibmebus } hd_bus_types_t; /** @} */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-15.3/src/hd/hd_int.h new/hwinfo-15.4/src/hd/hd_int.h --- old/hwinfo-15.3/src/hd/hd_int.h 2008-03-17 16:04:54.000000000 +0100 +++ new/hwinfo-15.4/src/hd/hd_int.h 2008-09-15 11:56:07.000000000 +0200 @@ -42,6 +42,7 @@ #define PROG_RMMOD "/sbin/rmmod" #define PROG_CARDCTL "/sbin/cardctl" #define PROG_UDEVINFO "/usr/bin/udevinfo" +#define PROG_UDEVADM "/sbin/udevadm" #define KLOG_BOOT "/var/log/boot.msg" #define ISAPNP_CONF "/etc/isapnp.conf" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-15.3/src/hd/pci.c new/hwinfo-15.4/src/hd/pci.c --- old/hwinfo-15.3/src/hd/pci.c 2008-07-21 12:19:17.000000000 +0200 +++ new/hwinfo-15.4/src/hd/pci.c 2008-09-15 11:58:31.000000000 +0200 @@ -58,6 +58,7 @@ static void add_xen_network(hd_data_t *hd_data); static void add_xen_storage(hd_data_t *hd_data); static void hd_read_virtio(hd_data_t *hd_data); +static void hd_read_ibmebus(hd_data_t *hd_data); void hd_scan_sysfs_pci(hd_data_t *hd_data) { @@ -103,6 +104,9 @@ PROGRESS(10, 0, "virtio"); hd_read_virtio(hd_data); + + PROGRESS(11, 0, "ibmebus"); + hd_read_ibmebus(hd_data); } @@ -1085,6 +1089,80 @@ free_str_list(sf_bus); } +void hd_read_ibmebus(hd_data_t *hd_data) +{ + char *sf_dev, *s, *modalias; + str_list_t *sf_bus, *sf_bus_e; + hd_t *hd; + + sf_bus = reverse_str_list(read_dir("/sys/bus/ibmebus/devices", 'l')); + + if(!sf_bus) { + ADD2LOG("sysfs: no such bus: ibmebus\n"); + return; + } + for(sf_bus_e = sf_bus; sf_bus_e; sf_bus_e = sf_bus_e->next) { + sf_dev = new_str(hd_read_sysfs_link("/sys/bus/ibmebus/devices", sf_bus_e->str)); + + ADD2LOG( + " ibmebus device: name = %s\n path = %s\n", + sf_bus_e->str, + hd_sysfs_id(sf_dev) + ); + + if((modalias = get_sysfs_attr_by_path(sf_dev, "modalias"))) { + int len = strlen(modalias); + if (len > 0 && modalias[len - 1] == '\n') + modalias[len - 1] = '\0'; + + ADD2LOG(" modalias = \"%s\"\n", modalias); + + if(0); + else if(strstr(modalias, "Nlhea") && strstr(modalias, "CIBM,lhea")) { + /* ==> 23c00100.lhea/modalias <== + * of:NlheaT<NULL>CIBM,lhea + * ehea + */ + hd = add_hd_entry(hd_data, __LINE__, 0); + + hd->bus.id = bus_ibmebus; + hd->vendor.id = MAKE_ID(TAG_PCI, 0x1014); /* IBM */ + hd->base_class.id = bc_network; + hd->sub_class.id = 0; /* ethernet */ + str_printf(&hd->device.name, 0, "IBM Host Ethernet Adapter"); + + hd->modalias = new_str(modalias); + + hd->sysfs_id = new_str(hd_sysfs_id(sf_dev)); + hd->sysfs_bus_id = new_str(sf_bus_e->str); + s = hd_sysfs_find_driver(hd_data, hd->sysfs_id, 1); + if(s) add_str_list(&hd->drivers, s); + } + else if(strstr(modalias, "Nethernet") && strstr(modalias, "CIBM,lhea-ethernet")) { + /* ==> port1/modalias <== + * of:NethernetTnetworkCIBM,lhea-ethernet + * eth1 + */ + hd = add_hd_entry(hd_data, __LINE__, 0); + hd->modalias = new_str(modalias); + hd->sysfs_id = new_str(hd_sysfs_id(sf_dev)); + hd->sysfs_bus_id = new_str(sf_bus_e->str); + hd->vendor.id = MAKE_ID(TAG_PCI, 0x1014); /* IBM */ + hd->base_class.id = bc_network; + hd->sub_class.id = 0; /* ethernet */ + s = strpbrk(hd->sysfs_bus_id, "0123456789"); + if(s) { + hd->slot = strtol(s, NULL, 10); + str_printf(&hd->device.name, 0, "IBM Host Ethernet Adapter Port %d", hd->slot); + } + + s = hd_sysfs_find_driver(hd_data, hd->sysfs_id, 1); + if(s) add_str_list(&hd->drivers, s); + } + } + free_mem(sf_dev); + } +} /* * Get xen (network & storage) data from sysfs. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-15.3/src/hd/prom.c new/hwinfo-15.4/src/hd/prom.c --- old/hwinfo-15.3/src/hd/prom.c 2007-08-20 17:34:34.000000000 +0200 +++ new/hwinfo-15.4/src/hd/prom.c 2008-09-15 11:58:31.000000000 +0200 @@ -29,9 +29,6 @@ static void read_mem(char *path, char *name, unsigned char **mem, unsigned len); static void read_int(char *path, char *name, int *val); static void read_devtree(hd_data_t *hd_data); -static void add_legacy_prom_devices(hd_data_t *hd_data, devtree_t *dt); -static void add_prom_ehea(hd_data_t *hd_data, devtree_t *dt); -static void add_devices(hd_data_t *hd_data); static void dump_devtree_data(hd_data_t *hd_data); static unsigned veth_cnt, vscsi_cnt; @@ -373,7 +370,6 @@ fclose(f); } if(hd_data->debug) dump_devtree_data(hd_data); - add_devices(hd_data); PROGRESS(2, 0, "color"); @@ -542,80 +538,6 @@ } -void add_legacy_prom_devices(hd_data_t *hd_data, devtree_t *dt) -{ - if(dt->pci) return; - - add_prom_ehea(hd_data, dt); -} - -void add_prom_ehea(hd_data_t *hd_data, devtree_t *dt) -{ - hd_t *hd; - hd_res_t *res; - char *path = NULL; - unsigned char *hw_addr_bin = NULL; - char *hw_addr = NULL; - int slot; - - if( - dt->device_type && - dt->compatible && - !strcmp(dt->device_type, "network") && - !strcmp(dt->compatible, "IBM,lhea-ethernet") - ) { - str_printf(&path, 0, PROC_PROM "/%s", dt->path); - - ADD2LOG(" ehea: %s\n", path); - - hd = add_hd_entry(hd_data, __LINE__, 0); - hd->bus.id = bus_none; - hd->base_class.id = bc_network; - hd->sub_class.id = 0; /* ethernet */ - - hd->vendor.id = MAKE_ID(TAG_SPECIAL, 0x6001); - hd->device.id = MAKE_ID(TAG_SPECIAL, 0x1003); - hd->rom_id = new_str(dt->path); - - read_int(path, "ibm,hea-port-no", &slot); - hd->slot = slot; - - read_str(path, "ibm,fw-adapter-name", &hd->device.name); - if(!hd->device.name) { - hd->device.name = new_str("IBM Host Ethernet Adapter"); - } - - // "mac-address" or "local-mac-address" ? - read_mem(path, "local-mac-address", &hw_addr_bin, 6); - - if(hw_addr_bin) { - str_printf( - &hw_addr, 0, "%02x:%02x:%02x:%02x:%02x:%02x", - hw_addr_bin[0], hw_addr_bin[1], - hw_addr_bin[2], hw_addr_bin[3], - hw_addr_bin[4], hw_addr_bin[5] - ); - res = new_mem(sizeof *res); - res->hwaddr.type = res_hwaddr; - res->hwaddr.addr = new_str(hw_addr); - add_res_entry(&hd->res, res); - } - } - - free_mem(hw_addr_bin); - free_mem(hw_addr); - free_mem(path); -} - -void add_devices(hd_data_t *hd_data) -{ - devtree_t *dt; - - for(dt = hd_data->devtree; dt; dt = dt->next) { - if(!dt->pci) add_legacy_prom_devices(hd_data, dt); - } -} - void dump_devtree_data(hd_data_t *hd_data) { unsigned u; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-15.3/src/ids/src/special new/hwinfo-15.4/src/ids/src/special --- old/hwinfo-15.3/src/ids/src/special 2008-07-21 12:09:07.000000000 +0200 +++ new/hwinfo-15.4/src/ids/src/special 2008-09-15 11:58:32.000000000 +0200 @@ -623,12 +623,6 @@ &device.id special 0x3004 +device.name MyriCOM MyriNET Gigabit Ethernet -# IBM ehea - vendor.id special 0x6001 -&device.id special 0x1003 -+driver.module.modprobe ehea - - # UML veth vendor.id special 0x6010 +vendor.name UML diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-15.3/src/int10/i10_v86.c new/hwinfo-15.4/src/int10/i10_v86.c --- old/hwinfo-15.3/src/int10/i10_v86.c 2005-04-01 12:19:13.000000000 +0200 +++ new/hwinfo-15.4/src/int10/i10_v86.c 2008-09-15 11:58:23.000000000 +0200 @@ -34,6 +34,22 @@ #include "v86bios.h" #include "AsmMacros.h" +#ifndef IF_MASK +#define IF_MASK X86_EFLAGS_IF +#endif +#ifndef VIF_MASK +#define VIF_MASK X86_EFLAGS_VIF +#endif +#ifndef TF_MASK +#define TF_MASK X86_EFLAGS_TF +#endif +#ifndef VIP_MASK +#define VIP_MASK X86_EFLAGS_VIP +#endif +#ifndef NT_MASK +#define NT_MASK X86_EFLAGS_NT +#endif + extern int emu_vm86(struct vm86_struct *vm, unsigned debug); #define INT2PTR(a) ((a) + (unsigned char *) 0) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-15.3/VERSION new/hwinfo-15.4/VERSION --- old/hwinfo-15.3/VERSION 2008-07-22 10:53:40.000000000 +0200 +++ new/hwinfo-15.4/VERSION 2008-09-15 11:57:47.000000000 +0200 @@ -1 +1 @@ -15.3 +15.4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de