commit firmwarekit

Hello community, here is the log from the commit of package firmwarekit checked in at Thu Jun 5 17:24:39 CEST 2008. -------- --- arch/i386/firmwarekit/firmwarekit.changes 2007-05-30 15:26:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/firmwarekit/firmwarekit.changes 2008-06-04 23:18:34.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jun 04 23:17:31 CEST 2008 - bwalle@suse.de + +- update to version 3 (bnc#385898) + +------------------------------------------------------------------- Old: ---- acpi_compile_cleanup.patch check_plugin_results.patch chk_hpet_cleanup.patch cpufreq_cleanup.patch debug.patch ebda_cleanup.patch fan_cleanup.patch firmwarekit-2.tar.bz2 libstandalone_soname.patch maxreadreq_cleanup.patch suspend_cleanup.patch virt_cleanup.patch New: ---- firmwarekit-dmidecode-detail firmwarekit-fix-rpmlint.patch firmwarekit-outputdir firmwarekit-overwrite-cflags.patch firmwarekit-r3.tar.bz2 firmwarekit-use-external-powertop.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ firmwarekit.spec ++++++ --- /var/tmp/diff_new_pack.Rn4146/_old 2008-06-05 17:24:27.000000000 +0200 +++ /var/tmp/diff_new_pack.Rn4146/_new 2008-06-05 17:24:27.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package firmwarekit (Version 2) +# spec file for package firmwarekit (Version 3) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 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. # @@ -10,21 +10,25 @@ # norootforbuild + Name: firmwarekit -BuildRequires: bash coreutils dhclient dhcp-client findutils gawk gdb glib2 glib2-devel glibc grep iproute2 libacl libattr module-init-tools ncurses newt newt-devel pciutils pcre perl pkgconfig pmtools sed sharutils slang slang-devel sysvinit termcap util-linux wget xorg-x11-util-devel -URL: http://www.linuxfirmwarekit.org +BuildRequires: bash coreutils dhclient dhcp-client findutils gawk gdb glib2-devel +BuildRequires: grep iproute2 libacl libattr module-init-tools ncurses-devel newt newt-devel +BuildRequires: pciutils perl pkgconfig pmtools sed sharutils slang-devel sysvinit +BuildRequires: termcap util-linux wget xorg-x11-util-devel +Url: http://www.linuxfirmwarekit.org Summary: BIOS checker that validates ACPI and other parts for x86 and x86_64 machines -Version: 2 +Version: 3 Release: 1 -License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) +License: LGPL v2.1 or later Group: System/Boot -Autoreqprov: on +AutoReqProv: on PreReq: gzip -Requires: pmtools hwinfo util-linux +Requires: pmtools hwinfo util-linux powertop Summary: BIOS checker that validates ACPI and other parts for x86 and x86_64 machines BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ia64 -Source0: %{name}-%{version}.tar.bz2 +Source0: %{name}-r%{version}.tar.bz2 Patch0: adjust_paths.patch Patch1: biostest_sh.patch Patch2: rip_out_unneeded_stuff.patch @@ -35,16 +39,11 @@ Patch7: path_environment.patch Patch8: dmesg_adjust.patch Patch9: colors.patch -Patch10: libstandalone_soname.patch -Patch11: acpi_compile_cleanup.patch -Patch12: cpufreq_cleanup.patch -Patch13: chk_hpet_cleanup.patch -Patch14: fan_cleanup.patch -Patch15: suspend_cleanup.patch -Patch16: virt_cleanup.patch -Patch17: maxreadreq_cleanup.patch -Patch18: ebda_cleanup.patch -Patch19: debug.patch +Patch10: %{name}-use-external-powertop.patch +Patch11: %{name}-overwrite-cflags.patch +Patch12: %{name}-fix-rpmlint.patch +Patch13: %{name}-outputdir +Patch14: %{name}-dmidecode-detail %description This tool, developed by Intel, is meant for vendors to validate and @@ -59,7 +58,7 @@ Intel %prep -%setup -q -n %{name} +%setup -q -n linuxfirmwarekit %patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -75,11 +74,6 @@ %patch12 -p1 %patch13 -p1 %patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 # This is arch specific stuff, put all in /usr/lib/firmwarekit %define location /usr/lib/%{name} @@ -89,8 +83,7 @@ %install install -D -m 744 biostest.sh %{buildroot}/usr/sbin/biostest.sh install -d -m 755 %{buildroot}/var/log/%{name} -install -D -m 644 initramfs/results.css %{buildroot}/var/log/%{name}/results.css -install -D -m 644 initramfs/resources.css %{buildroot}/var/log/%{name}/resources.css +install -D -m 644 results/resources.css %{buildroot}/var/log/%{name}/results.css install -D -m 744 biostest %{buildroot}/%{location}/biostest install -D -m 755 shelltools/start_test %{buildroot}/%{location}/bin/start_test ln -s start_test %{buildroot}/%{location}/bin/announce_resource @@ -105,12 +98,11 @@ gzip biostest.1 install -D -m 644 biostest.1.gz %{buildroot}/%{_mandir}/man1/biostest.1.gz chmod 644 %{buildroot}/%{_mandir}/man1/biostest.1.gz +echo %{version} > %{buildroot}/%{location}/version -%post -%run_ldconfig +%post -p /sbin/ldconfig -%postun -%run_ldconfig +%postun -p /sbin/ldconfig %files %defattr(-,root,root) @@ -123,7 +115,9 @@ %{_mandir}/man1/biostest.1.gz %changelog -* Wed May 30 2007 - trenn@suse.de +* Thu Jun 05 2008 bwalle@suse.de +- update to version 3 (bnc#385898) +* Wed May 30 2007 trenn@suse.de - also build for ia64 - use "$@" to pass args correctly from biostest.sh to biostest - move from /usr/share to /usr/lib @@ -133,35 +127,35 @@ half way correctly (plugin specifc things to fix) now. I will wait until next version with patches applied comes out to get out of patch nightmare. -* Wed Dec 06 2006 - dmueller@suse.de +* Wed Dec 06 2006 dmueller@suse.de - don't build as root -* Fri Nov 24 2006 - trenn@suse.de +* Fri Nov 24 2006 trenn@suse.de - removed quotation marks to properly pass params from /usr/bin/biostest.sh wrapper to /usr/share/firmwarekit -* Tue Nov 14 2006 - trenn@suse.de +* Tue Nov 14 2006 trenn@suse.de - upgrade to svn rev 102 (new tests: os2gap, maxreadreq, thermal_trip, apicedge(experimental)) - modified color style being more suse like - fixed scp copy and some other minor things -* Thu Oct 26 2006 - trenn@suse.de +* Thu Oct 26 2006 trenn@suse.de - Added manpage moved to svn repository and cleaned up patches added svn version to package version use /var/log/boot.msg to gain dmesg output -* Mon Oct 09 2006 - trenn@suse.de +* Mon Oct 09 2006 trenn@suse.de - moved output to /var/log/firmwarekit fixed double free in SSDT test add scp save (graphical and as param) option -* Fri Sep 29 2006 - ro@suse.de +* Fri Sep 29 2006 ro@suse.de - remove empty pre/post scripts -* Thu Sep 28 2006 - trenn@suse.de +* Thu Sep 28 2006 trenn@suse.de - Added SSDTs test -> iasl compiler is not really ready for that I probably have to remove that again at some BETA phase... Get rid of lmbench stuff -> too much overhead, doubt it's needed currently. Make use of CFLAGS of build system, some cleanups... -* Wed Sep 27 2006 - snwint@suse.de +* Wed Sep 27 2006 snwint@suse.de - removed 'Requires' line -* Fri Sep 22 2006 - trenn@suse.de +* Fri Sep 22 2006 trenn@suse.de - Initial checkin. Known problems: hpet test misses dsdt.aml (works on second attempt) and dmesg output seems to get cleared. ++++++ adjust_paths.patch ++++++ --- /var/tmp/diff_new_pack.Rn4146/_old 2008-06-05 17:24:27.000000000 +0200 +++ /var/tmp/diff_new_pack.Rn4146/_new 2008-06-05 17:24:27.000000000 +0200 @@ -1,37 +1,22 @@ --- - tests.c | 4 ++-- + tests.c | 12 ++++++------ usb.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) + 2 files changed, 7 insertions(+), 7 deletions(-) -Index: firmwarekit/usb.c -=================================================================== ---- firmwarekit.orig/usb.c -+++ firmwarekit/usb.c -@@ -82,7 +82,7 @@ void save_on_usb(void) - if (system(buffer)!=0) - continue; - } -- system("/bin/cp results/* /usbkey &> /dev/null"); -+ system("/bin/cp -rf /var/log/firmwarekit /usbkey &> /dev/null"); - system("/bin/cp acpi.dump /usbkey &> /dev/null"); - system("/bin/cp DSDT.* /usbkey &> /dev/null"); - system("/bin/umount /usbkey &> /dev/null"); -Index: firmwarekit/tests.c -=================================================================== ---- firmwarekit.orig/tests.c -+++ firmwarekit/tests.c -@@ -199,15 +199,17 @@ void sort_results(void) +--- a/tests.c ++++ b/tests.c +@@ -199,16 +199,16 @@ void sort_results(void) void dump_results(void) { -- dump_xml(all_tests, "results/results.xml"); +- system("mkdir -p results"); +- system("rm -rf results/*.xml results/*.txt"); - dump_text(all_tests, "results/results.txt"); - dump_xml_resources("results/resources.xml"); -+ dump_xml(all_tests, "/var/log/firmwarekit/results.xml"); -+ dump_xml_resources("/var/log/firmwarekit/resources.xml"); ++ system("mkdir -p /var/log/firmwarekit"); ++ system("rm -rf /var/log/firmwarekit/*.xml /var/log/firmwarekit/*.txt"); + dump_text(all_tests, "/var/log/firmwarekit/results.txt"); + dump_xml_resources("/var/log/firmwarekit/resources.xml"); -+ show_results_ui(all_tests); } void dump_xml_results(void) @@ -43,3 +28,14 @@ } void show_results(void) +--- a/usb.c ++++ b/usb.c +@@ -82,7 +82,7 @@ void save_on_usb(void) + if (system(buffer)!=0) + continue; + } +- system("/bin/cp results/* /usbkey &> /dev/null"); ++ system("/bin/cp -rf /var/log/firmwarekit /usbkey &> /dev/null"); + system("/bin/cp acpi.dump /usbkey &> /dev/null"); + system("/bin/cp DSDT.* /usbkey &> /dev/null"); + system("/bin/cp *.log /usbkey &> /dev/null"); ++++++ biostest_sh.patch ++++++ --- /var/tmp/diff_new_pack.Rn4146/_old 2008-06-05 17:24:28.000000000 +0200 +++ /var/tmp/diff_new_pack.Rn4146/_new 2008-06-05 17:24:28.000000000 +0200 @@ -10,7 +10,7 @@ +#!/bin/bash + +DIR="/usr/lib/firmwarekit" -+OUTPUT_DIR="/var/log/firmwarekit" ++export OUTPUT_DIR="/var/log/firmwarekit" + +if [ ! -d "$DIR" ];then + echo "Could not find directory $DIR" ++++++ colors.patch ++++++ --- /var/tmp/diff_new_pack.Rn4146/_old 2008-06-05 17:24:28.000000000 +0200 +++ /var/tmp/diff_new_pack.Rn4146/_new 2008-06-05 17:24:28.000000000 +0200 @@ -3,30 +3,8 @@ ui.c | 2 + 2 files changed, 87 insertions(+) -Index: firmwarekit/ui.c -=================================================================== ---- firmwarekit.orig/ui.c -+++ firmwarekit/ui.c -@@ -29,6 +29,7 @@ - #include - - #include "biostest.h" -+#include "colors.h" - - - static int myProgressWin=-1; -@@ -66,6 +67,7 @@ void init_results_ui(void) - { - int myHelloWin; - newtComponent myHelloText, myHelloForm; -+ newtSetColors(newtDefaultColorPalette); - newtInit(); - newtCls(); - newtDrawRootText(0,0, " Linux-ready Firmware Developer Kit - Release 2 - (C) 2007 Intel Corporation"); -Index: firmwarekit/colors.h -=================================================================== --- /dev/null -+++ firmwarekit/colors.h ++++ b/colors.h @@ -0,0 +1,85 @@ +#include + @@ -113,3 +91,21 @@ + SLtt_set_color(NEWT_COLORSET_SELLISTBOX, "", colors.selListboxFg, + colors.selListboxBg); +} +--- a/ui.c ++++ b/ui.c +@@ -29,6 +29,7 @@ + #include + + #include "biostest.h" ++#include "colors.h" + + + static int myProgressWin=-1; +@@ -71,6 +72,7 @@ void init_results_ui(void) + sprintf(TitleText, " Linux-ready Firmware Developer Kit - Release %s - (C) 2007 Intel Corporation", + get_lfdk_ver()); + newtComponent myHelloText, myHelloForm; ++ newtSetColors(newtDefaultColorPalette); + newtInit(); + newtCls(); + newtDrawRootText(0,0,TitleText); ++++++ firmwarekit-fix-rpmlint.patch ++++++ --- dmar/dmar.c | 4 +++- virt/virt.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) --- a/dmar/dmar.c +++ b/dmar/dmar.c @@ -241,6 +241,8 @@ static int acpi_parse_one_rmrr(struct ac ((void*)rmrr) + header->length, rmrr->segment); } +extern char *copy_acpi_table(void *address, char *name); + static int dmar_acpi_table_check(void) { unsigned long address; @@ -261,7 +263,7 @@ static int dmar_acpi_table_check(void) goto out; } - table_ptr = copy_acpi_table(address, "DMAR"); + table_ptr = copy_acpi_table((void *)address, "DMAR"); if (table_ptr == NULL) { report_result("DMAR", FAIL, "Invalid DMAR ACPI table size", NULL, NULL); goto out; --- a/virt/virt.c +++ b/virt/virt.c @@ -77,6 +77,8 @@ int main(int argc, char **argv) else if (is_intel()) { return do_virt_check_vmx(); } + + return 0; } ++++++ firmwarekit-overwrite-cflags.patch ++++++ --- dmar/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/dmar/Makefile +++ b/dmar/Makefile @@ -1,4 +1,4 @@ -CFLAGS = -Wall -W -Os -D_FORTIFY_SOURCE=2 `pkg-config --cflags glib-2.0` -fPIC -g -I.. +override CFLAGS += `pkg-config --cflags glib-2.0` -I.. -fPIC LDFLAGS = `pkg-config --libs glib-2.0` ++++++ firmwarekit-use-external-powertop.patch ++++++ --- powertop/Makefile | 2 +- powertop/powertop.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- a/powertop/Makefile +++ b/powertop/Makefile @@ -2,7 +2,7 @@ override CFLAGS += `pkg-config --cflags LDFLAGS = `pkg-config --libs glib-2.0` -all: .depend powertop.so powertop_install +all: .depend powertop.so powertop-1.8.tar.gz: wget http://www.linuxpowertop.org/download/powertop-1.8.tar.gz --- a/powertop/powertop.c +++ b/powertop/powertop.c @@ -89,7 +89,7 @@ static void do_powertop(void) "Press 'Q' to return to the firmware test kit\n" "++++++++++++++++++++++++++++++++++++++++++++++++++\n\n"); - system("./plugins/powertop_install/powertop"); + system("powertop"); newtResume(); newtRefresh(); ++++++ path_environment.patch ++++++ --- /var/tmp/diff_new_pack.Rn4146/_old 2008-06-05 17:24:28.000000000 +0200 +++ /var/tmp/diff_new_pack.Rn4146/_new 2008-06-05 17:24:28.000000000 +0200 @@ -2,10 +2,8 @@ main.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) -Index: firmwarekit/main.c -=================================================================== ---- firmwarekit.orig/main.c -+++ firmwarekit/main.c +--- a/main.c ++++ b/main.c @@ -33,6 +33,7 @@ #include "biostest.h" @@ -41,7 +39,7 @@ int main(int argc, char **argv) { int ret; -@@ -207,6 +228,8 @@ int main(int argc, char **argv) +@@ -210,6 +231,8 @@ int main(int argc, char **argv) /* register e820 resource */ e820_register_resource(); ++++++ rip_out_unneeded_stuff.patch ++++++ --- /var/tmp/diff_new_pack.Rn4146/_old 2008-06-05 17:24:28.000000000 +0200 +++ /var/tmp/diff_new_pack.Rn4146/_new 2008-06-05 17:24:28.000000000 +0200 @@ -1,64 +1,61 @@ --- - Makefile | 16 ++++++++-------- + Makefile | 16 +++++----------- acpicompile/Makefile | 2 +- - 2 files changed, 9 insertions(+), 9 deletions(-) + 2 files changed, 6 insertions(+), 12 deletions(-) -Index: firmwarekit/acpicompile/Makefile -=================================================================== ---- firmwarekit.orig/acpicompile/Makefile -+++ firmwarekit/acpicompile/Makefile -@@ -2,7 +2,7 @@ override CFLAGS += -I.. `pkg-config --cf - LDFLAGS = `pkg-config --libs glib-2.0` -L.. -lstandalone - - --all: acpicompile.exe iasl acpixtract acpidump -+all: acpicompile.exe - - acpicompile.exe: acpicompile.o .depend - gcc acpicompile.o $(LDFLAGS) -o acpicompile.exe -Index: firmwarekit/Makefile -=================================================================== ---- firmwarekit.orig/Makefile -+++ firmwarekit/Makefile -@@ -3,16 +3,18 @@ override CFLAGS += `pkg-config --cflags - #LDFLAGS = -nodefaultlibs -Linitramfs/data/lib -Linitramfs/data/usr/lib -export-dynamic -lc -ldl `pkg-config --libs glib-2.0` -lnewt -lslang +--- a/Makefile ++++ b/Makefile +@@ -4,15 +4,14 @@ override CFLAGS += `pkg-config --cflags LDFLAGS = -nostdlibs -Linitramfs/data/lib -Linitramfs/data/usr/lib -export-dynamic -lc -ldl `pkg-config --libs glib-2.0` -lnewt -lslang -- --SUBDIRS = acpiinfo pciresource acpicompile cpufreq ethernet edd battery msrpoke pcipoke usbports tonetest bashshell mcfg lmbench mtrr shelltools fan fadt chk_hpet suspend thermal_trip microcode dmi os2gap apicedge maxreadreq virt ebda SUN + +-SUBDIRS = acpiinfo pciresource acpicompile cpufreq ethernet edd battery msrpoke pcipoke usbports tonetest bashshell powertop lmbench mtrr shelltools fan chk_hpet suspend thermal_trip microcode dmi os2gap apicedge maxreadreq virt ebda SUN dmar +# Rip out lmbench, our package is in no good shape... +# Rip out ethernet, this might mess up network in a running system and needs more SUSE adjustance... -+SUBDIRS = acpiinfo pciresource acpicompile cpufreq edd battery msrpoke pcipoke usbports tonetest bashshell mcfg mtrr shelltools fan fadt chk_hpet suspend thermal_trip microcode dmi os2gap apicedge maxreadreq virt ebda SUN - LIBS = dmesg.o main.o tests.o plugins.o ui.o uri.o dumpxml.o usb.o serial.o lib.o acpitable.o dsdt.o e820.o ssh.o ++SUBDIRS = acpiinfo pciresource acpicompile cpufreq edd battery msrpoke pcipoke usbports tonetest bashshell powertop mtrr shelltools fan chk_hpet suspend thermal_trip microcode dmi os2gap apicedge maxreadreq virt ebda SUN dmar + LIBS = dmesg.o main.o tests.o plugins.o ui.o uri.o dumpresults.o usb.o serial.o lib.o acpitable.o dsdt.o e820.o ssh.o all: libstandalone.so biostest subdirs - # if arch is i*86 (i386, i686, etc.) +-# if arch is i*86 (i386, i686, etc.) -ifeq ($(shell uname -m | cut -c1,3,4), i86) -LIBC = initramfs/data/usr/lib/libc.so -else -+#ifeq ($(shell uname -m | cut -c1,3,4), i86) -+#LIBC = initramfs/data/usr/lib/libc.so -+#else +ifeq ($(shell uname -m), ia64) SUBDIRS += ia64_mce_inject endif -@@ -22,13 +24,13 @@ subdirs: $(SUBDIRS) - +@@ -23,13 +22,9 @@ subdirs: $(SUBDIRS) $(SUBDIRS): $(MAKE) -C $@ -- cd initramfs/kernel ; make -+# cd initramfs/kernel ; make -biostest: $(LIBS) biostest.h .depend $(LIBC) +biostest: $(LIBS) biostest.h .depend gcc $(LIBS) $(LDFLAGS) -o biostest -initramfs/data/usr/lib/libc.so: -- cd initramfs ; sh create_initramfs.sh -+#initramfs/data/usr/lib/libc.so: -+# cd initramfs ; sh create_initramfs.sh +- mkdir -p initramfs/data/usr/lib +- cp initramfs/libc.so initramfs/data/usr/lib/libc.so +- + libstandalone.so: $(LIBS) biostest.h .depend libstandalone.o + gcc --shared libstandalone.o lib.o acpitable.o e820.o -Wl,-soname=libstandalone.so -o libstandalone.so + +@@ -52,7 +47,6 @@ clean_kernels: clean + rm -rf initramfs/data + cd initramfs/rpms ; make clean + cd initramfs/srpms ; make clean +- cd initramfs/kernel ; make clean + + install: all + cp -a biostest results plugins initramfs/data/root/ +--- a/acpicompile/Makefile ++++ b/acpicompile/Makefile +@@ -2,7 +2,7 @@ override CFLAGS += -I.. `pkg-config --cf + LDFLAGS = `pkg-config --libs glib-2.0` -L.. -lstandalone + - libstandalone.so: $(LIBS) biostest.h .depend libstandalone.o - gcc --shared libstandalone.o lib.o -o libstandalone.so +-all: acpicompile.exe iasl acpixtract acpidump ++all: acpicompile.exe + + acpicompile.exe: acpicompile.o .depend + gcc acpicompile.o $(LDFLAGS) -o acpicompile.exe ++++++ use_external_pmtool_bins.patch ++++++ --- /var/tmp/diff_new_pack.Rn4146/_old 2008-06-05 17:24:28.000000000 +0200 +++ /var/tmp/diff_new_pack.Rn4146/_new 2008-06-05 17:24:28.000000000 +0200 @@ -1,14 +1,11 @@ --- - acpicompile/acpicompile.c | 22 +++++++++++----------- - chk_hpet/chk_hpet.c | 2 +- - main.c | 4 ++-- - 3 files changed, 14 insertions(+), 14 deletions(-) + acpicompile/acpicompile.c | 4 ++++ + acpitable.c | 15 +++++---------- + 2 files changed, 9 insertions(+), 10 deletions(-) -Index: firmwarekit/acpicompile/acpicompile.c -=================================================================== ---- firmwarekit.orig/acpicompile/acpicompile.c -+++ firmwarekit/acpicompile/acpicompile.c -@@ -83,10 +83,14 @@ static void do_table(char *filename) +--- a/acpicompile/acpicompile.c ++++ b/acpicompile/acpicompile.c +@@ -83,10 +83,14 @@ static void do_table(char *filename) int errlineno; /* Compile the dsdt or ssdt .dsl with iasl */ @@ -23,56 +20,57 @@ /* analyse output of the iasl compiler */ -Index: firmwarekit/dsdt.c -=================================================================== ---- firmwarekit.orig/dsdt.c -+++ firmwarekit/dsdt.c -@@ -55,13 +55,13 @@ void extract_dsdt_ssdts() - int ret; - - /* create hex-dump format of all acpi tables in file 'acpidump' */ -- system("plugins/acpidump > acpi.dump &> /dev/null"); -+ system("/usr/sbin/acpidump > acpi.dump 2> /dev/null"); - if (access("acpi.dump", R_OK)) - fprintf(stderr,"WARN (acpidump): failed to create acpi.dump.\n"); +--- a/acpitable.c ++++ b/acpitable.c +@@ -173,7 +173,6 @@ out: + void extract_acpi_tables(void) + { + int ret, i; +- char cmd_prefix[1024]; + char ssdt_filename[1024]; + char command[4096]; + +@@ -181,20 +180,16 @@ void extract_acpi_tables(void) + * are located (should exist after compiling "acpicompile" plugin). + * Since we're standalone, we could be called from a few different + * places. */ +- if (access("plugins", R_OK)) +- sprintf(cmd_prefix, "../plugins/"); +- else +- sprintf(cmd_prefix, "plugins/"); + + /* create hex-dump format of all acpi tables in file 'acpi.dump' */ +- sprintf(command, "%sacpidump -o acpi.dump 2> /dev/null", cmd_prefix); ++ sprintf(command, "/usr/sbin/acpidump -o acpi.dump 2> /dev/null"); + ret=system(command); + if (access("acpi.dump", R_OK)) + fprintf(stderr,"WARN (acpidump): failed to create acpi.dump.\n"); - /* use 'acpidump' file to extract dsdt and ssdt tables - * in binary format, creates DSDT.dat and SSDT*.dat */ -- system("plugins/acpixtract acpi.dump &> /dev/null"); -+ system("/usr/bin/acpixtract acpi.dump &> /dev/null"); - if (access("DSDT.dat", R_OK)) { - ret = system("cat /proc/acpi/dsdt > DSDT.dat"); - if (ret != EXIT_SUCCESS) { -@@ -71,21 +71,21 @@ void extract_dsdt_ssdts() - } - - /* Disassemble DSDT.dat with iasl, will create DSDT.dsl */ -- system("plugins/iasl -d DSDT.dat &>/dev/null"); -+ system("/usr/bin/iasl -d DSDT.dat &>/dev/null"); - if (access("DSDT.dsl", R_OK)) - fprintf(stderr,"WARN (iasl): failed to create DSDT.dsl.\n"); - - /* Include ACPI table for external symbol resolution (if they exist) */ -- system("plugins/iasl -d -e DSDT.dat SSDT.dat &>/dev/null"); -- system("plugins/iasl -d -e DSDT.dat SSDT1.dat &>/dev/null"); -- system("plugins/iasl -d -e DSDT.dat SSDT2.dat &>/dev/null"); -- system("plugins/iasl -d -e DSDT.dat SSDT3.dat &>/dev/null"); -- system("plugins/iasl -d -e DSDT.dat SSDT4.dat &>/dev/null"); -- system("plugins/iasl -d -e DSDT.dat SSDT5.dat &>/dev/null"); -- system("plugins/iasl -d -e DSDT.dat SSDT6.dat &>/dev/null"); -- system("plugins/iasl -d -e DSDT.dat SSDT7.dat &>/dev/null"); -- system("plugins/iasl -d -e DSDT.dat SSDT8.dat &>/dev/null"); -- system("plugins/iasl -d -e DSDT.dat SSDT9.dat &>/dev/null"); -+ system("/usr/bin/iasl -d -e DSDT.dat SSDT.dat &>/dev/null"); -+ system("/usr/bin/iasl -d -e DSDT.dat SSDT1.dat &>/dev/null"); -+ system("/usr/bin/iasl -d -e DSDT.dat SSDT2.dat &>/dev/null"); -+ system("/usr/bin/iasl -d -e DSDT.dat SSDT3.dat &>/dev/null"); -+ system("/usr/bin/iasl -d -e DSDT.dat SSDT4.dat &>/dev/null"); -+ system("/usr/bin/iasl -d -e DSDT.dat SSDT5.dat &>/dev/null"); -+ system("/usr/bin/iasl -d -e DSDT.dat SSDT6.dat &>/dev/null"); -+ system("/usr/bin/iasl -d -e DSDT.dat SSDT7.dat &>/dev/null"); -+ system("/usr/bin/iasl -d -e DSDT.dat SSDT8.dat &>/dev/null"); -+ system("/usr/bin/iasl -d -e DSDT.dat SSDT9.dat &>/dev/null"); + /* use 'acpidump' file to extract tables + * in binary format, <table>.dat */ +- sprintf(command, "%sacpixtract -a acpi.dump > /dev/null 2> /dev/null", cmd_prefix); ++ sprintf(command, "/usr/bin/acpixtract -a acpi.dump > /dev/null 2> /dev/null"); + ret=system(command); + if (access("DSDT.dat", R_OK)) { + ret = system("cat /proc/acpi/dsdt > DSDT.dat"); +@@ -205,17 +200,17 @@ void extract_acpi_tables(void) + } + + /* Disassemble DSDT.dat with iasl, will create DSDT.dsl */ +- sprintf(command, "%siasl -d DSDT.dat > /dev/null 2> /dev/null", cmd_prefix); ++ sprintf(command, "/usr/bin/iasl -d DSDT.dat > /dev/null 2> /dev/null"); + ret = system(command); + + /* Include ACPI table for external symbol resolution (if they exist) */ +- sprintf(command, "%siasl -d -e DSDT.dat SSDT.dat > /dev/null 2> /dev/null", cmd_prefix); ++ sprintf(command, "/usr/bin/iasl -d -e DSDT.dat SSDT.dat > /dev/null 2> /dev/null"); + ret=system(command); - /* current iasl has an issue with arugment counts in SSDT's, work around this */ - system("sed -i -e \"s/^ACPI Error.*Argument count mismatch for method.*//g\" SSDT*.dsl &> /dev/null"); + for (i = 1;i<10;i++) { + sprintf(ssdt_filename, "SSDT%d.dat", i); + if (!access(ssdt_filename, R_OK)) { +- sprintf(command, "%siasl -d -e DSDT.dat %s > /dev/null 2> /dev/null", cmd_prefix, ssdt_filename); ++ sprintf(command, "/usr/bin/iasl -d -e DSDT.dat %s > /dev/null 2> /dev/null", ssdt_filename); + ret = system(command); + /* current iasl has an issue with arugment counts in SSDT's, work around this */ + ret=system("sed -i -e \"s/^ACPI Error.*Argument count mismatch for method.*//g\" SSDT*.dsl"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org