Hello community,
here is the log from the commit of package firmwarekit
checked in at Tue Nov 14 19:09:44 CET 2006.
--------
--- arch/i386/firmwarekit/firmwarekit.changes 2006-10-26 16:54:35.000000000 +0200
+++ /mounts/work_src_done/STABLE/firmwarekit/firmwarekit.changes 2006-11-14 17:24:47.000000000 +0100
@@ -1,0 +2,8 @@
+Tue Nov 14 17:20:40 CET 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
+
+-------------------------------------------------------------------
Old:
----
firmwarekit-r0.52.tar.bz2
fix_hpet_base_addr.patch
hwinfo_integration.patch
series
New:
----
busy_box_adjustment.patch
check_plugin_results.patch
colors.patch
compile_errors.patch
firmwarekit-r1.102.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ firmwarekit.spec ++++++
--- /var/tmp/diff_new_pack.XFeUEW/_old 2006-11-14 19:08:59.000000000 +0100
+++ /var/tmp/diff_new_pack.XFeUEW/_new 2006-11-14 19:08:59.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package firmwarekit (Version r0.52)
+# spec file for package firmwarekit (Version r1.102)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,7 +13,7 @@
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
Summary: BIOS checker that validates ACPI and other parts for x86 and x86_64 machines
-Version: r0.52
+Version: r1.102
Release: 1
License: GNU Library General Public License v. 2.0 and 2.1 (LGPL)
Group: System/Boot
@@ -33,7 +33,10 @@
Patch6: use_external_pmtool_bins.patch
Patch7: path_environment.patch
Patch8: dmesg_adjust.patch
-Patch9: fix_hpet_base_addr.patch
+Patch9: compile_errors.patch
+Patch10: colors.patch
+Patch11: check_plugin_results.patch
+Patch12: busy_box_adjustment.patch
%description
This tool, developed by Intel, is meant for vendors to validate and
@@ -59,9 +62,9 @@
%patch7 -p1
%patch8 -p1
%patch9 -p1
-#%patch10 -p1
-#%patch11 -p1
-#%patch12 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
%build
make -e CFLAGS="$RPM_OPT_FLAGS"
@@ -95,6 +98,11 @@
%{_mandir}/man1/biostest.1.gz
%changelog -n firmwarekit
+* 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
- Added manpage
moved to svn repository and cleaned up patches
++++++ adjust_doc.patch ++++++
--- /var/tmp/diff_new_pack.XFeUEW/_old 2006-11-14 19:08:59.000000000 +0100
+++ /var/tmp/diff_new_pack.XFeUEW/_new 2006-11-14 19:08:59.000000000 +0100
@@ -1,7 +1,7 @@
---
- Documentation/QUICKSTART.txt | 24 +++++++++----
- biostest.1 | 79 +++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 96 insertions(+), 7 deletions(-)
+ Documentation/QUICKSTART.txt | 24 ++++++++----
+ biostest.1 | 85 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 102 insertions(+), 7 deletions(-)
Index: firmwarekit/Documentation/QUICKSTART.txt
===================================================================
@@ -51,7 +51,7 @@
===================================================================
--- /dev/null
+++ firmwarekit/biostest.1
-@@ -0,0 +1,79 @@
+@@ -0,0 +1,85 @@
+.TH BIOSTEST 8 "Oct 2006" "Version r0"
+
+.SH NAME
@@ -91,6 +91,8 @@
+to pass a password to save the results away via scp) and also use the
+do_not_block option. This is only recommended in a trusted network environment,
+see ssh and ssh-keygen manpages.
++The results will then be saved into host:/dir/results_\"DATE_STRING\", where
++DATE_STRING is assembled from current hour,min and date.
+.TP
+.I console=ttySx,speed
+Use serial console for output/input. The parameter has the same syntax than the
@@ -119,9 +121,10 @@
+The linuxfirmwarekit has been released recently. If you find any bugs please
+report to the linuxfirmwarekit mailinglist which you find at the link below.
+.PP
-+If a plugin segfaults, it's not caught by the main program and the test may be
-+shown as passed even if it's not (that may get fixed soon, possibly already
-+is).
++The kernel's ring buffer will get emptied. Therefore dmesg will only report new
++kernel messages. All messages until biostest invokation will get lost. See
++/var/log/boot.msg for kernel messages during boot up or save dmesg output before
++invoking biostest manually.
+
+.SH AUTHOR
+.B linuxfirmwarekit
@@ -131,3 +134,6 @@
+This manpage has been written by Thomas Renninger
+.SH SEE ALSO
+http://www.linuxfirmwarekit.org
++.PP
++If you find bugs, please report them against the bugtracking system:
++http://bughost.org/firmwarekit/
++++++ adjust_paths.patch ++++++
--- /var/tmp/diff_new_pack.XFeUEW/_old 2006-11-14 19:08:59.000000000 +0100
+++ /var/tmp/diff_new_pack.XFeUEW/_new 2006-11-14 19:08:59.000000000 +0100
@@ -1,27 +1,26 @@
---
tests.c | 4 ++--
- usb.c | 3 +--
- 2 files changed, 3 insertions(+), 4 deletions(-)
+ usb.c | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
Index: firmwarekit/usb.c
===================================================================
--- firmwarekit.orig/usb.c
+++ firmwarekit/usb.c
-@@ -82,8 +82,7 @@ void save_on_usb(void)
+@@ -82,7 +82,7 @@ void save_on_usb(void)
if (system(buffer)!=0)
continue;
}
- system("/bin/cp results/* /usbkey &> /dev/null");
-- system("/bin/cp acpidump /usbkey &> /dev/null");
+ system("/bin/cp -rf /var/log/firmwarekit /usbkey &> /dev/null");
+ system("/bin/cp acpidump /usbkey &> /dev/null");
+ system("/bin/cp DSDT.* /usbkey &> /dev/null");
system("/bin/umount /usbkey &> /dev/null");
- devcount ++;
- } while (entry);
Index: firmwarekit/tests.c
===================================================================
--- firmwarekit.orig/tests.c
+++ firmwarekit/tests.c
-@@ -194,8 +194,8 @@ void sort_results(void)
+@@ -199,8 +199,8 @@ void sort_results(void)
void dump_results(void)
{
++++++ busy_box_adjustment.patch ++++++
---
thermal_trip/thermal_trip.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: firmwarekit/thermal_trip/thermal_trip.sh
===================================================================
--- firmwarekit.orig/thermal_trip/thermal_trip.sh
+++ firmwarekit/thermal_trip/thermal_trip.sh
@@ -26,8 +26,8 @@
#***************************************************************************/
export THERMALPATH="/proc/acpi/thermal_zone"
-export THROTTLINGPATH="$(echo /proc/acpi/processor/* |head -1)/throttling"
-export CPUFREQPATH="$(echo /sys/devices/system/cpu/* |head -1)/cpufreq"
+export THROTTLINGPATH="$(echo /proc/acpi/processor/* |head -n 1)/throttling"
+export CPUFREQPATH="$(echo /sys/devices/system/cpu/* |head -n 1)/cpufreq"
export OUTPUTTYPE="d"
function printhelp ()
++++++ check_plugin_results.patch ++++++
---
plugins.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
Index: firmwarekit/plugins.c
===================================================================
--- firmwarekit.orig/plugins.c
+++ firmwarekit/plugins.c
@@ -105,6 +105,7 @@ static void do_exe_plugin(char *filename
FILE *file;
char buffer[4096];
char *line;
+ int ret;
/* execute the file and return a pointer
* to the output stream */
@@ -228,7 +229,13 @@ repeat:
free(line);
}
- fclose(file);
+ ret = pclose(file);
+ if (ret){
+ sprintf(buffer, "Plugin %s exited with return value %d. "
+ "This probably is a hidden bug.",
+ filename, ret);
+ simple_ok_dialog(filename, buffer);
+ }
}
++++++ colors.patch ++++++
---
colors.h | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 0 - (C) 2006 Intel Corporation");
Index: firmwarekit/colors.h
===================================================================
--- /dev/null
+++ firmwarekit/colors.h
@@ -0,0 +1,85 @@
+#include
+
+/* available colors (from slang src/slvideo.c)
+ "black", "blue", "green", "cyan",
+ "red", "magenta", "brown", "lightgray",
+ "gray", "brightblue", "brightgreen", "brightcyan",
+ "brightred", "brightmagenta", "yellow", "white"
+*/
+
+const struct newtColors newtDefaultColorPalette = {
+// "red", "black", /* root fg, bg */
+ "white", "green", /* root fg, bg */
+ "black", "lightgray", /* border fg, bg */
+// "black", "green", /* window fg, bg */
+ "black", "lightgray", /* window fg, bg */
+ "white", "black", /* shadow fg, bg */
+ "black", "lightgray", /* title fg, bg */
+// "red", "lightgray", /* title fg, bg */
+ "lightgray", "red", /* button fg, bg */
+ "red", "lightgray", /* active button fg, bg */
+// "yellow", "blue", /* checkbox fg, bg */
+ "yellow", "green", /* checkbox fg, bg */
+ "blue", "brown", /* active checkbox fg, bg */
+// "yellow", "blue", /* entry box fg, bg */
+ "yellow", "green", /* entry box fg, bg */
+ "blue", "lightgray", /* label fg, bg */
+ "black", "lightgray", /* listbox fg, bg */
+ "yellow", "green", /* active listbox fg, bg */
+// "yellow", "blue", /* active listbox fg, bg */
+ "black", "lightgray", /* textbox fg, bg */
+ "lightgray", "black", /* active textbox fg, bg */
+// "white", "blue", /* help line */
+ "white", "green", /* help line */
+// "yellow", "blue", /* root text */
+ "black", "green", /* root text */
+ "green", /* scale full */
+// "blue", /* scale full */
+ "red", /* scale empty */
+ "blue", "lightgray", /* disabled entry fg, bg */
+ "white", "green", /* compact button fg, bg */
+// "white", "blue", /* compact button fg, bg */
+ "yellow", "red", /* active & sel listbox */
+ "black", "brown" /* selected listbox */
+};
+
+void newtSetColors(struct newtColors colors) {
+ SLtt_set_color(NEWT_COLORSET_ROOT, "", colors.rootFg, colors.rootBg);
+ SLtt_set_color(NEWT_COLORSET_BORDER, "", colors.borderFg, colors.borderBg);
+ SLtt_set_color(NEWT_COLORSET_WINDOW, "", colors.windowFg, colors.windowBg);
+ SLtt_set_color(NEWT_COLORSET_SHADOW, "", colors.shadowFg, colors.shadowBg);
+ SLtt_set_color(NEWT_COLORSET_TITLE, "", colors.titleFg, colors.titleBg);
+ SLtt_set_color(NEWT_COLORSET_BUTTON, "", colors.buttonFg, colors.buttonBg);
+ SLtt_set_color(NEWT_COLORSET_ACTBUTTON, "", colors.actButtonFg,
+ colors.actButtonBg);
+ SLtt_set_color(NEWT_COLORSET_CHECKBOX, "", colors.checkboxFg,
+ colors.checkboxBg);
+ SLtt_set_color(NEWT_COLORSET_ACTCHECKBOX, "", colors.actCheckboxFg,
+ colors.actCheckboxBg);
+ SLtt_set_color(NEWT_COLORSET_ENTRY, "", colors.entryFg, colors.entryBg);
+ SLtt_set_color(NEWT_COLORSET_LABEL, "", colors.labelFg, colors.labelBg);
+ SLtt_set_color(NEWT_COLORSET_LISTBOX, "", colors.listboxFg,
+ colors.listboxBg);
+ SLtt_set_color(NEWT_COLORSET_ACTLISTBOX, "", colors.actListboxFg,
+ colors.actListboxBg);
+ SLtt_set_color(NEWT_COLORSET_TEXTBOX, "", colors.textboxFg,
+ colors.textboxBg);
+ SLtt_set_color(NEWT_COLORSET_ACTTEXTBOX, "", colors.actTextboxFg,
+ colors.actTextboxBg);
+ SLtt_set_color(NEWT_COLORSET_HELPLINE, "", colors.helpLineFg,
+ colors.helpLineBg);
+ SLtt_set_color(NEWT_COLORSET_ROOTTEXT, "", colors.rootTextFg,
+ colors.rootTextBg);
+ SLtt_set_color(NEWT_COLORSET_EMPTYSCALE, "", "black",
+ colors.emptyScale);
+ SLtt_set_color(NEWT_COLORSET_FULLSCALE, "", "black",
+ colors.fullScale);
+ SLtt_set_color(NEWT_COLORSET_DISENTRY, "", colors.disabledEntryFg,
+ colors.disabledEntryBg);
+ SLtt_set_color(NEWT_COLORSET_COMPACTBUTTON, "", colors.compactButtonFg,
+ colors.compactButtonBg);
+ SLtt_set_color(NEWT_COLORSET_ACTSELLISTBOX, "", colors.actSelListboxFg,
+ colors.actSelListboxBg);
+ SLtt_set_color(NEWT_COLORSET_SELLISTBOX, "", colors.selListboxFg,
+ colors.selListboxBg);
+}
++++++ compile_errors.patch ++++++
---
apicedge/apicedge.c | 2 +-
dmi/dmi.c | 2 +-
maxreadreq/maxreadreq.c | 2 +-
microcode/microcode.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
Index: firmwarekit/dmi/dmi.c
===================================================================
--- firmwarekit.orig/dmi/dmi.c
+++ firmwarekit/dmi/dmi.c
@@ -85,7 +85,7 @@ int main(int argc, char **argv)
file = popen("/usr/sbin/dmidecode", "r");
if (!file)
- return;
+ return EXIT_FAILURE;
while (!feof(file)) {
char line[4096];
memset(line, 0, 4096);
Index: firmwarekit/microcode/microcode.c
===================================================================
--- firmwarekit.orig/microcode/microcode.c
+++ firmwarekit/microcode/microcode.c
@@ -72,7 +72,7 @@ static void find_add_cpu(struct cpu_micr
cpus = g_list_append(cpus, cpu);
}
-static gather_info(void)
+static void gather_info(void)
{
DIR *dir;
struct dirent *entry;
Index: firmwarekit/apicedge/apicedge.c
===================================================================
--- firmwarekit.orig/apicedge/apicedge.c
+++ firmwarekit/apicedge/apicedge.c
@@ -57,7 +57,7 @@ int main(int argc, char **argv)
file = fopen("/proc/interrupts", "r");
if (!file)
- return;
+ return EXIT_FAILURE;
while (!feof(file)) {
char line[4096];
int edge = -1;
Index: firmwarekit/maxreadreq/maxreadreq.c
===================================================================
--- firmwarekit.orig/maxreadreq/maxreadreq.c
+++ firmwarekit/maxreadreq/maxreadreq.c
@@ -55,7 +55,7 @@ int main(int argc, char **argv)
file = popen("/sbin/lspci -vvv", "r");
if (!file)
- return;
+ return EXIT_FAILURE;
while (!feof(file)) {
char line[4096];
int edge = -1;
++++++ dmesg_adjust.patch ++++++
--- /var/tmp/diff_new_pack.XFeUEW/_old 2006-11-14 19:09:00.000000000 +0100
+++ /var/tmp/diff_new_pack.XFeUEW/_new 2006-11-14 19:09:00.000000000 +0100
@@ -1,80 +1,86 @@
---
- chk_hpet/chk_hpet.c | 6 ++--
- dmesg.c | 71 ++++++++++++++++++++++++++++++++--------------------
- libstandalone.c | 9 +++++-
- 3 files changed, 55 insertions(+), 31 deletions(-)
+ dmesg.c | 74 ++++++++++++++++++++++++++++++--------------------------
+ libstandalone.c | 9 +++++-
+ 2 files changed, 47 insertions(+), 36 deletions(-)
Index: firmwarekit/dmesg.c
===================================================================
--- firmwarekit.orig/dmesg.c
+++ firmwarekit/dmesg.c
-@@ -68,47 +68,64 @@ static void check_this_line(gpointer dat
+@@ -67,22 +67,42 @@ static void check_this_line(gpointer dat
+ }
}
-
--
--
++#define DMESG_FILE "/var/log/boot.msg"
+ /* obtains demsg, cleans it up, and adds it to our resource list */
void get_dmesg_buffer(void)
{
char *dmesg;
-- char *c1, *c2;
+ char *c1, *c2;
- int linecount = 0;
-+ char *c1,*c2;
+- dmesg = malloc(DMESG_SIZE);
+ int linecount = 0, ret;
-+
- dmesg = malloc(DMESG_SIZE);
-- assert(dmesg!=NULL);
++ dmesg = malloc(DMESG_SIZE);
+ assert(dmesg!=NULL);
+ c1 = malloc(4096);
+ assert(dmesg!=NULL && c1!=NULL);
- system("/bin/dmesg -s 256000 > /tmp/boot_dmesg");
+ FILE *f_dmesg;
-- /* don't printk to the console; newt hates that */
-- klogctl (6, NULL, 0);
-+ if (access("/var/log/boot.msg", R_OK)){
-+ system("/bin/dmesg -s 256000 > /var/log/boot.msg");
-+ }
+ /* don't printk to the console; newt hates that */
+ klogctl (6, NULL, 0);
-- memset(dmesg, 0, DMESG_SIZE);
++ if (access(DMESG_FILE, R_OK)){
++ system("/bin/dmesg -s 256000 > "DMESG_FILE);
++ }
+ memset(dmesg, 0, DMESG_SIZE);
- klogctl (4, dmesg, DMESG_SIZE);
-+ /* don't printk to the console; newt hates that */
-
-- announce_resource("dmesg://", dmesg, NULL);
-+ /* We don't get ring buffer directly, we get it from
-+ /var/log/boot.msg. linuxrc empties ring buffer and writes
-+ stuff there, so this should work in ordinary booted and
-+ BiosTest booted environment
-+ */
++ memset(c1, 0, 4096);
+
-+ f_dmesg = fopen ("/var/log/boot.msg", "r");
++ /* Clear ring buffer, we only want to get up to date messages
++ in further calls... */
++ klogctl (5, NULL, 0);
++
++ f_dmesg = fopen (DMESG_FILE, "r");
+ if (f_dmesg == NULL){
-+ fprintf (stderr, "WARN: Could not open /var/log/boot.msg");
++ fprintf (stderr, "WARN: Could not open "DMESG_FILE);
+ free(dmesg);
+ free(c1);
+ return;
+ }
-+ /* Clear ring buffer, we only want to get up to date messages
-+ in further calls... */
++ ret = fread(dmesg, 1, DMESG_SIZE-1, f_dmesg);
++ dmesg[ret]='\0';
+
+ /* Add to our resource list that we keep. The user
+ * will have access to this when they look at the
+@@ -90,43 +110,29 @@ void get_dmesg_buffer(void)
+ * see uri.c for implementation */
+ announce_resource("dmesg://", dmesg, NULL);
- c1 = dmesg;
- while (c1) {
+- /* get next line from dmesg before '\n'
+- * and put into 'c1' */
- c2 = strchr(c1, '\n');
+-
+- /* break if we're at the end of dmesg */
- if (c2==NULL)
- break;
+-
+- /* take out extra \n from beginning */
- *c2 = 0;
- c2++;
+-
- /* skip the <4> that is in front of each line */
- if (strlen(c1)>3 && c1[0]=='<')
- c1+=3;
-+ klogctl (5, NULL, 0);
-
+-
+- /* now append the cleaned-up line to boot_dmesg */
- boot_dmesg = g_list_append(boot_dmesg, strdup(c1));
- linecount ++;
-+ ret = fread(dmesg, 1, DMESG_SIZE-1, f_dmesg);
-+ dmesg[ret]='\0';
-+ announce_resource("dmesg://", dmesg, NULL);
-
+-
+- /* put what's left of dmesg back into c1 */
- c1 = c2;
+ rewind(f_dmesg);
+ while (fgets(c1, 4095, f_dmesg)) {
@@ -84,22 +90,30 @@
+ */
+ c2=c1;
+ if (strlen(c1)>3 && c1[0]=='<' && c1[2]=='>'){
-+// c2+=3;
++ c2+=3;
+ boot_dmesg = g_list_append(boot_dmesg, strdup(c2));
+ linecount ++;
+ }
}
-
-- g_list_foreach(boot_dmesg, check_this_line, NULL);
+ fclose(f_dmesg);
+ free(c1);
- free(dmesg);
-+ g_list_foreach(boot_dmesg, check_this_line, NULL);
++ free(dmesg);
++
+ /* send boot_dmesg off to extract useful info */
+ g_list_foreach(boot_dmesg, check_this_line, NULL);
+-
+- free(dmesg);
e820_register_resource();
-
}
+-
+-
+ void match_dmesg_string(char *line, char *suggested_uri)
+ {
+ char dmesg_uri[1024];
Index: firmwarekit/libstandalone.c
===================================================================
--- firmwarekit.orig/libstandalone.c
@@ -108,7 +122,7 @@
static void local_get_dmesg_buffer(void)
{
char line [4096];
-+/* char *tmp; */
++ char *tmp;
FILE *file;
memset(line, 0, 4096);
@@ -123,42 +137,9 @@
- boot_dmesg = g_list_append(boot_dmesg, strdup(line));
+ /* only add real kernel messages in <4>msg format */
+ if (line[0] == '<' && line[2] == '>'){
-+/* tmp = &line[3]; */
++ tmp = &line[3];
+ boot_dmesg = g_list_append(boot_dmesg, strdup(line));
+ }
}
fclose(file);
}
-Index: firmwarekit/chk_hpet/chk_hpet.c
-===================================================================
---- firmwarekit.orig/chk_hpet/chk_hpet.c
-+++ firmwarekit/chk_hpet/chk_hpet.c
-@@ -113,7 +113,7 @@ static void check_hpet_base(gpointer dat
- char *line = (char *) data;
- char *val;
- if ((val = strstr(line, "ACPI: HPET id:")) != NULL) {
-- hpet_base_p = strtoul(strstr(val, "0xfed"), NULL, 0x10);
-+ hpet_base_p = strtoul(strstr(val, "0xfec"), NULL, 0x10);
- fprintf(stderr, "HPET base = 0x%08X\n",
- (unsigned int) hpet_base_p);
- *(unsigned int *) user_data = DMESG_BASE;
-@@ -152,6 +152,7 @@ int main(int argc, char ** argv)
- "This test checks the HPET PCI BAR for each timer block in the timer."
- "The base address is passed by the firmware via an ACPI table."
- "IRQ routing and initialization is also verified by the test.\n");
-+/*
- ret = system("cat /proc/acpi/dsdt > dsdt.dat");
- if (ret != EXIT_SUCCESS)
- return ret;
-@@ -159,9 +160,10 @@ int main(int argc, char ** argv)
- if (ret)
- printf("iasl returns %i \n", ret);
- report_testrun_progress(30);
-+*/
-
- memset(uri, 0, 1024);
-- load_boot_dmesg_buffer();
-+/* load_boot_dmesg_buffer(); */
-
- if (boot_dmesg != NULL)
- g_list_foreach(boot_dmesg, check_hpet_base, &hpet_status);
++++++ firmwarekit-r0.52.tar.bz2 -> firmwarekit-r1.102.tar.bz2 ++++++
++++ 3116 lines of diff (skipped)
++++++ own_params.patch ++++++
--- /var/tmp/diff_new_pack.XFeUEW/_old 2006-11-14 19:09:00.000000000 +0100
+++ /var/tmp/diff_new_pack.XFeUEW/_new 2006-11-14 19:09:00.000000000 +0100
@@ -1,6 +1,6 @@
---
- main.c | 29 +++++++++++++++++++++++++++++
- 1 file changed, 29 insertions(+)
+ main.c | 34 ++++++++++++++++++++++++++++++++--
+ 1 file changed, 32 insertions(+), 2 deletions(-)
Index: firmwarekit/main.c
===================================================================
@@ -14,12 +14,12 @@
+char ssh_dest[MAX_SSH_DEST_LEN] = "";
+
int safe_mode;
+ int interactive_mode = 1;
+
+@@ -84,6 +87,32 @@ static void parse_kernel_param(const cha
+ use_serial=1;
+ }
- int finished_tests = 0;
-@@ -79,6 +82,32 @@ static void parse_kernel_param(const cha
- /* parse safemode boot param */
- if (strstr(buffer, "safemode"))
- safe_mode=1;
+ /* Biostest got booted -> setup sshd */
+ if (strstr(buffer, "install=exec:run_biostest")){
+ }
@@ -33,7 +33,7 @@
+ }
+ else{
+ ret = sscanf(buffer, "ssh_save=%s", ssh_dest);
-+ fprintf(stdout, "ssh destination string set to: %s",
++ fprintf(stdout, "ssh destination string set to: %s\n",
+ ssh_dest);
+ }
+ }
@@ -41,11 +41,23 @@
+ do_not_block=1;
+
+ if (strstr(buffer, "-h") || strstr(buffer, "--help")){
-+ fprintf(stdout, "biostest [ -h ] [ safemode ] [ do_not_block ]"
++ fprintf(stdout, "biostest [ -h ] [ safemode ] [ noninteractive ] [ do_not_block ]"
+ " [ ssh_save=host:/dest ]\n");
+ exit(EXIT_SUCCESS);
+ }
+
- return;
+ /* parse safemode boot param */
+ if (strstr(buffer, "safemode"))
+ safe_mode=1;
+@@ -174,8 +203,9 @@ int main(int argc, char **argv)
+ * serial. This can also be set by fucn()
+ * parse_kernel_param if it's in the kernel
+ * cmdline options */
+- if (argc>1 && strstr(argv[1],"serial"))
+- use_serial = 1;
++ int x;
++ for (x = 1; x < argc; x++)
++ parse_kernel_param(argv[x]);
- bad_param:
+ /* initialize serial output (if enabled)
+ * (implemented in serial.c) */
++++++ path_environment.patch ++++++
--- /var/tmp/diff_new_pack.XFeUEW/_old 2006-11-14 19:09:00.000000000 +0100
+++ /var/tmp/diff_new_pack.XFeUEW/_new 2006-11-14 19:09:00.000000000 +0100
@@ -1,20 +1,20 @@
---
- main.c | 25 ++++++++++++++++++++++++-
- 1 file changed, 24 insertions(+), 1 deletion(-)
+ main.c | 23 +++++++++++++++++++++++
+ 1 file changed, 23 insertions(+)
Index: firmwarekit/main.c
===================================================================
--- firmwarekit.orig/main.c
+++ firmwarekit/main.c
-@@ -45,6 +45,7 @@ int safe_mode;
+@@ -33,6 +33,7 @@
- int finished_tests = 0;
+ #include "biostest.h"
+static char* path_env;
- static void extract_dsdt_ssdts()
- {
-@@ -159,6 +160,27 @@ static void parse_kernel_cmdline(void)
+ int use_serial;
+ static unsigned long serial_speed;
+@@ -194,6 +195,26 @@ static void parse_kernel_cmdline(void)
}
}
@@ -36,25 +36,17 @@
+ "variable to %s\n", new_path_env);
+ exit (EXIT_FAILURE);
+ }
-+ printf ("PATH set to: %s", getenv("PATH"));
+}
+
int main(int argc, char **argv)
{
- /* initialisation of core support routines */
-@@ -174,6 +196,8 @@ int main(int argc, char **argv)
-
+ int ret;
+@@ -226,6 +247,8 @@ int main(int argc, char **argv)
+ * (implemented in dmesg.c) */
get_dmesg_buffer();
+ set_path_env();
+
+ /* display welcome msg, init newt root window
+ * (implemented in ui.c) */
init_results_ui();
-
- execute_plugins("plugins/");
-@@ -204,6 +228,5 @@ int main(int argc, char **argv)
- dump_xml_results();
- show_results();
- }
--
- return EXIT_SUCCESS;
- }
++++++ rip_out_unneeded_stuff.patch ++++++
--- /var/tmp/diff_new_pack.XFeUEW/_old 2006-11-14 19:09:00.000000000 +0100
+++ /var/tmp/diff_new_pack.XFeUEW/_new 2006-11-14 19:09:00.000000000 +0100
@@ -20,26 +20,27 @@
===================================================================
--- firmwarekit.orig/Makefile
+++ firmwarekit/Makefile
-@@ -4,14 +4,14 @@ override CFLAGS += `pkg-config --cflags
+@@ -4,15 +4,15 @@ 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 cstates msrpoke pcipoke usbports tonetest bashshell mcfg lmbench mtrr shelltools shelltests amlpoke fan fadt chk_hpet suspend thermal_trip
-+SUBDIRS = acpiinfo pciresource acpicompile cpufreq ethernet edd battery cstates msrpoke pcipoke usbports tonetest bashshell mcfg mtrr shelltools shelltests amlpoke fan fadt chk_hpet suspend thermal_trip
+-SUBDIRS = acpiinfo pciresource acpicompile cpufreq ethernet edd battery msrpoke pcipoke usbports tonetest bashshell mcfg lmbench mtrr shelltools shelltests fan fadt chk_hpet suspend thermal_trip microcode dmi os2gap apicedge maxreadreq
++SUBDIRS = acpiinfo pciresource acpicompile cpufreq ethernet edd battery msrpoke pcipoke usbports tonetest bashshell mcfg mtrr shelltools shelltests fan fadt chk_hpet suspend thermal_trip microcode dmi os2gap apicedge maxreadreq
LIBS = dmesg.o main.o tests.o plugins.o ui.o uri.o dumpxml.o usb.o serial.o lib.o acpitable.o e820.o
all: libstandalone.so biostest subdirs
--ifeq ($(shell uname -m),i386)
+ # if arch is i*86 (i386, i686, etc.)
+-ifeq ($(shell uname -m | cut -c1,3,4), i86)
-LIBC = initramfs/data/usr/lib/libc.so
-endif
-+#ifeq ($(shell uname -m),i386)
++#ifeq ($(shell uname -m | cut -c1,3,4), i86)
+#LIBC = initramfs/data/usr/lib/libc.so
+#endif
.PHONY: subdirs $(SUBDIRS)
-@@ -20,13 +20,13 @@ subdirs: $(SUBDIRS)
+@@ -21,13 +21,13 @@ subdirs: $(SUBDIRS)
$(SUBDIRS):
$(MAKE) -C $@
cd shelltests ; make install
++++++ scp_save_results.patch ++++++
--- /var/tmp/diff_new_pack.XFeUEW/_old 2006-11-14 19:09:00.000000000 +0100
+++ /var/tmp/diff_new_pack.XFeUEW/_new 2006-11-14 19:09:00.000000000 +0100
@@ -1,17 +1,17 @@
---
- Makefile | 2 -
- biostest.h | 9 ++++
- main.c | 26 +++++++++++++
- ssh.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- tests.c | 7 ++-
- ui.c | 34 +++++++++++++----
- 6 files changed, 182 insertions(+), 13 deletions(-)
+ Makefile | 2
+ biostest.h | 10 +++-
+ main.c | 37 ++++++++++++++-
+ ssh.c | 150 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ tests.c | 7 ++
+ ui.c | 35 ++++++++++----
+ 6 files changed, 228 insertions(+), 13 deletions(-)
Index: firmwarekit/ssh.c
===================================================================
--- /dev/null
+++ firmwarekit/ssh.c
-@@ -0,0 +1,117 @@
+@@ -0,0 +1,150 @@
+
+#include
+#include
@@ -38,7 +38,7 @@
+ if (loc_time == NULL)
+ strcpy (date_str, "");
+ else
-+ sprintf(date_str, "%.2d_%.2d__%.2d_%.2d_%.2d", loc_time->tm_hour,
++ sprintf(date_str, "%.2d%.2d%.2d%.2d%.2d", loc_time->tm_hour,
+ loc_time->tm_min, loc_time->tm_mday, loc_time->tm_mon + 1,
+ loc_time->tm_year % 100);
+
@@ -61,26 +61,52 @@
+ return;
+}
+
-+int copy_via_ssh(const char *dest)
++int copy_via_ssh(const char *dest, int verbose)
+{
+ char command[4096];
+ char result_dir[1024];
-+ int ret;
++ int ret1, ret2;
+ setup_result_dir(result_dir, 1024);
+
-+ ret = snprintf (command, 4096,
-+ "mkdir /var/log/firmwarekit/%s;cp "
-+ "/var/log/firmwarekit/* /var/log/firmwarekit/%s/*;"
-+ "scp -r -o CheckHostIP=no -o StrictHostKeyChecking=no "
-+ "/var/log/firmwarekit %s/results &>/dev/null", dest, dest, dest);
-+
-+ if (ret >= 4096){
-+ fprintf (stderr, "WARN: ssh command succeeds max"
-+ " string length (%d > %d)\n", ret,
-+ MAX_SSH_COMMAND_LEN);
-+ return -1;
++ /* Check and create tmp dir */
++ snprintf (command, 4095, "/var/log/firmwarekit/%s", result_dir);
++ if (access(command, W_OK)){
++ ret1 = snprintf (command, 4095, "mkdir /var/log/firmwarekit/%s",
++ result_dir);
++ ret2 = system(command);
++ if (ret1 >= 4096 || ret2)
++ goto error;
++ }
++
++ /* Copy results into tmp dir */
++ ret1 = snprintf (command, 4096, "cp /var/log/firmwarekit/{results.css,"
++ "results.xml,resources.css,resources.xml,hwinfo.txt}"
++ " /var/log/firmwarekit/%s", result_dir);
++
++ ret2 = system(command);
++ if (ret1 >= 4096 || ret2)
++ goto error;
++
++ /* secure copy stuff away */
++ if (verbose){
++ ret1 = snprintf (command, 4096, "scp -v -r -o CheckHostIP=no -o "
++ "StrictHostKeyChecking=no /var/log/firmwarekit/%s"
++ " %s", result_dir, dest);
+ }
-+ return system(command);
++ else{
++ ret1 = snprintf (command, 4096, "scp -r -o CheckHostIP=no -o "
++ "StrictHostKeyChecking=no /var/log/firmwarekit/%s"
++ " %s &>/dev/null", result_dir, dest);
++ }
++
++ ret2 = system(command);
++ if (ret1 >= 4096 || ret2)
++ goto error;
++ return 0;
++ error:
++ fprintf (stderr, "WARN: ssh copying did not succeed. ret1: %d, "
++ "ret2: %d\n", ret1, ret2);
++ return 1;
+}
+
+void save_via_ssh(void)
@@ -103,7 +129,14 @@
+ myForm = newtForm(NULL,NULL,0);
+
+ newtFormAddComponent(myForm, newtLabel(2,2, "Destination"));
-+ mySCPDest = newtEntry(15, 2, "host:/target_dir", MAX_SSH_DEST_LEN, &destination, 0);
++ /* ssh_dest may got passed via ssh_save= param */
++ if (ssh_dest[0] != '\0')
++ mySCPDest = newtEntry(15, 2, "host:/target_dir",
++ MAX_SSH_DEST_LEN, &destination, 0);
++ else
++ mySCPDest = newtEntry(15, 2, ssh_dest,
++ MAX_SSH_DEST_LEN, &destination, 0);
++
+ newtFormAddComponent(myForm, mySCPDest);
+
+/* Password passing is not possible via scp...
@@ -119,7 +152,7 @@
+ resu = newtRunForm(myForm);
+ if (resu == mySave) {
+ newtCls();
-+ ret = copy_via_ssh(destination);
++ ret = copy_via_ssh(destination, 0);
+ if (ret)
+ simple_ok_dialog("SCP result", "ERROR: scp command did"
+ " not succeed");
@@ -133,7 +166,7 @@
===================================================================
--- firmwarekit.orig/biostest.h
+++ firmwarekit/biostest.h
-@@ -81,7 +81,8 @@ extern void check_dmesg_updates(char *ur
+@@ -82,7 +82,8 @@ extern void check_dmesg_updates(char *ur
/* tests.c */
@@ -143,7 +176,7 @@
extern void sort_results(void);
extern void register_interactive_test(char *name, voidvoidfunc *func);
-@@ -115,6 +116,12 @@ extern void dump_xml(GList *all_tests, c
+@@ -116,6 +117,13 @@ extern void dump_xml(GList *all_tests, c
/* usb.c */
extern void save_on_usb(void);
@@ -151,7 +184,8 @@
+#define MAX_SSH_DEST_LEN 64
+
+extern void save_via_ssh(void);
-+extern int copy_via_ssh(const char *dest);
++extern int copy_via_ssh(const char *dest, int verbose);
++extern char ssh_dest[MAX_SSH_DEST_LEN];
+
/* serial.c */
@@ -168,17 +202,46 @@
#include
-@@ -179,7 +180,30 @@ int main(int argc, char **argv)
+@@ -195,6 +196,7 @@ static void parse_kernel_cmdline(void)
+
+ int main(int argc, char **argv)
+ {
++ int ret;
+ /* initialisation of core support routines */
+
+ parse_kernel_cmdline();
+@@ -211,6 +213,12 @@ int main(int argc, char **argv)
+ * (implemented in serial.c) */
+ init_serial(use_serial, tty, serial_speed);
+
++ ret = system ("/usr/sbin/hwinfo --bios --pci --block --usb "
++ "--log=/var/log/firmwarekit/hwinfo.txt");
++ if (ret)
++ fprintf (stderr, "hwinfo did not succeed\n");
++
++
+ /* obtain dsdt and ssdt acpi tables in binary format */
+ extract_dsdt_ssdts();
+
+@@ -228,7 +236,34 @@ int main(int argc, char **argv)
finished_tests = 1;
- dump_results();
++ int ssh_ret;
+ if (do_not_block){
+ dump_xml_results();
++ newtRefresh();
++ newtPopWindow();
++ newtFinished();
++
+ if (ssh_dest[0] != '\0'){
-+ int x;
-+ x = copy_via_ssh(ssh_dest);
-+ if (x){
++ /* be more verbose in non_blocking mode,
++ windows do not matter, possiblity to track down
++ why secure copy might not work */
++ ssh_ret = copy_via_ssh(ssh_dest, 1);
++ if (ssh_ret){
++ /* print out error after newt stuff finished.*/
+ fprintf(stderr, "ERROR: scp copy to %s did"
+ " not succeed\n", ssh_dest);
+ return EXIT_FAILURE;
@@ -187,11 +250,7 @@
+ fprintf(stdout, "Copying data to %s "
+ "successfull\n", ssh_dest);
+ }
-+ /* try to exit graphic stuff gracefully */
+ }
-+ newtRefresh();
-+ newtPopWindow();
-+ newtFinished();
+ }
+ else{
+ dump_xml_results();
@@ -224,7 +283,15 @@
static int longest_string(char *str)
{
char *c;
-@@ -615,7 +628,7 @@ void show_results_ui(GList *all_tests)
+@@ -501,6 +514,7 @@ static void int_poke_dialog(char *title,
+ }
+
+ newtPopWindow();
++ newtFormDestroy(myForm);
+ }
+
+ static int nrtotal, nrpass, nrfail, nrwarn;
+@@ -623,7 +637,7 @@ void show_results_ui(GList *all_tests)
int win;
newtComponent myForm;
newtComponent myOkButton;
@@ -233,7 +300,7 @@
newtComponent myIntButton;
newtComponent myPokeButton;
newtComponent myHelpButton;
-@@ -654,18 +667,23 @@ void show_results_ui(GList *all_tests)
+@@ -662,18 +676,23 @@ void show_results_ui(GList *all_tests)
myOkButton = newtButton(2,H-8, "Exit");
newtFormAddComponent(myForm, myOkButton);
@@ -261,8 +328,8 @@
+ myHelpButton = newtButton(54,H-8, "Help");
newtFormAddComponent(myForm, myHelpButton);
- while (1) {
-@@ -678,8 +696,8 @@ void show_results_ui(GList *all_tests)
+ if (!interactive_mode) {
+@@ -688,8 +707,8 @@ void show_results_ui(GList *all_tests)
show_resource_info(result->devuri);
else
show_result(result);
@@ -277,7 +344,7 @@
===================================================================
--- firmwarekit.orig/tests.c
+++ firmwarekit/tests.c
-@@ -192,13 +192,16 @@ void sort_results(void)
+@@ -197,13 +197,16 @@ void sort_results(void)
}
@@ -303,7 +370,7 @@
@@ -5,7 +5,7 @@ LDFLAGS = -nostdlibs -Linitramfs/data/li
- SUBDIRS = acpiinfo pciresource acpicompile cpufreq ethernet edd battery cstates msrpoke pcipoke usbports tonetest bashshell mcfg mtrr shelltools shelltests amlpoke fan fadt chk_hpet suspend thermal_trip
+ SUBDIRS = acpiinfo pciresource acpicompile cpufreq ethernet edd battery msrpoke pcipoke usbports tonetest bashshell mcfg mtrr shelltools shelltests fan fadt chk_hpet suspend thermal_trip microcode dmi os2gap apicedge maxreadreq
-LIBS = dmesg.o main.o tests.o plugins.o ui.o uri.o dumpxml.o usb.o serial.o lib.o acpitable.o e820.o
+LIBS = dmesg.o main.o tests.o plugins.o ui.o uri.o dumpxml.o usb.o serial.o lib.o acpitable.o e820.o ssh.o
++++++ use_external_pmtool_bins.patch ++++++
--- /var/tmp/diff_new_pack.XFeUEW/_old 2006-11-14 19:09:00.000000000 +0100
+++ /var/tmp/diff_new_pack.XFeUEW/_new 2006-11-14 19:09:00.000000000 +0100
@@ -1,7 +1,8 @@
---
acpicompile/acpicompile.c | 22 +++++++++++-----------
+ chk_hpet/chk_hpet.c | 2 +-
main.c | 4 ++--
- 2 files changed, 13 insertions(+), 13 deletions(-)
+ 3 files changed, 14 insertions(+), 14 deletions(-)
Index: firmwarekit/acpicompile/acpicompile.c
===================================================================
@@ -50,14 +51,30 @@
===================================================================
--- firmwarekit.orig/main.c
+++ firmwarekit/main.c
-@@ -48,8 +48,8 @@ int finished_tests = 0;
-
+@@ -50,11 +50,11 @@ int finished_tests = 0;
static void extract_dsdt_ssdts()
{
+ /* create hex-dump format of all acpi tables in file 'acpidump' */
- system("plugins/acpidump > acpidump &> /dev/null");
-- system("plugins/acpixtract acpidump &> /dev/null");
+ system("/usr/sbin/acpidump > acpidump &> /dev/null");
+
+ /* use 'acpidump' file to extract dsdt and ssdt tables
+ * in binary format, creates DSDT.dat and SSDT.dat */
+- system("plugins/acpixtract acpidump &> /dev/null");
+ system("/usr/bin/acpixtract acpidump &> /dev/null");
}
- static void parse_kernel_param(const char *buffer)
+ /* Parse the kernel parameter we got from func() parse_kernel_cmdline.
+Index: firmwarekit/chk_hpet/chk_hpet.c
+===================================================================
+--- firmwarekit.orig/chk_hpet/chk_hpet.c
++++ firmwarekit/chk_hpet/chk_hpet.c
+@@ -159,7 +159,7 @@ int main(int argc, char ** argv)
+ ret = system("cat /proc/acpi/dsdt > DSDT.dat");
+ if (ret != EXIT_SUCCESS)
+ return ret;
+- ret = system("plugins/iasl -d DSDT.dat &>/dev/null");
++ ret = system("/usr/bin/iasl -d DSDT.dat &>/dev/null");
+ if (ret)
+ printf("iasl returns %i \n", ret);
+ report_testrun_progress(30);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org