Hello community, here is the log from the commit of package acpica for openSUSE:Factory checked in at Wed May 25 09:26:25 CEST 2011.
-------- --- acpica/acpica.changes 2011-02-24 16:32:20.000000000 +0100 +++ /mounts/work_src_done/STABLE/acpica/acpica.changes 2011-04-29 17:48:04.000000000 +0200 @@ -1,0 +2,27 @@ +Wed Apr 27 09:32:02 UTC 2011 - [email protected] + +- Add acpica-unix-20110316-gcc46.patch: fix compilation with gcc 4.6 + +------------------------------------------------------------------- +Sun Apr 17 03:37:25 UTC 2011 - [email protected] + +- Disable both build dates in this package and in + the files it generates as it both trigger either unneeded + republish of itself or other bigger packages like virtualbox +- Provides: iasl too. + +------------------------------------------------------------------- +Wed Mar 30 16:15:29 UTC 2011 - [email protected] + +- Exchange selfmade patch with mainline one to fix build + +------------------------------------------------------------------- +Wed Mar 30 15:50:47 UTC 2011 - [email protected] + +- Updated to acpica version 20110316 + Changes are listed in /usr/share/doc/packages/acpica/changes.txt +- Fixed dynamic acpi table extract via acpidump/acpixtract + by reverting acpica commit baab09e6857a427944068c5e599ea2ffb84f765b +- Fixed compile issue and submitted it mainline + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- acpica-unix-20110112.tar.bz2 acpidump-20101221.tar.bz2 New: ---- acpica-no-compiletime.patch acpica-unix-20110316-gcc46.patch acpica-unix-20110316.tar.bz2 acpica_fix_acpixtract acpidump-20110323.tar.bz2 acpiexec_fix_build_missing_utdecode.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ acpica.spec ++++++ --- /var/tmp/diff_new_pack.bsNY9R/_old 2011-05-25 09:24:53.000000000 +0200 +++ /var/tmp/diff_new_pack.bsNY9R/_new 2011-05-25 09:24:53.000000000 +0200 @@ -20,21 +20,27 @@ Name: acpica Url: http://acpica.org -Version: 20110112 -Release: 6 -License: Intel ACPICA +Version: 20110316 +Release: 1 +License: Intel ACPI %define src_dir acpica-unix-%{version} -%define dmp_ver 20101221 +%define dmp_ver 20110323 Group: Development/Tools/Debuggers Summary: This is a set of tools to display and debug your BIOS ACPI tables Source: %{src_dir}.tar.bz2 Patch1: acpica-override-CFLAGS.diff Patch2: acpidump-override-CFLAGS.patch +Patch3: acpiexec_fix_build_missing_utdecode.patch +Patch4: acpica_fix_acpixtract +# PATCH-FIX-UPSTREAM acpica-unix-20110316-gcc46.patch [email protected] -- Fix compilation with gcc 4.6 +Patch5: acpica-unix-20110316-gcc46.patch +Patch6: acpica-no-compiletime.patch Source1: ec_access.c Source2: acpidump-%{dmp_ver}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 ia64 x86_64 BuildRequires: bison flex +Provides: iasl %description The included tools share the same code as it is used in the ACPI @@ -61,6 +67,10 @@ %setup -n %{src_dir} -a 2 %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 +%patch6 %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ++++++ acpica-no-compiletime.patch ++++++ --- compiler/aslcompile.c.orig +++ compiler/aslcompile.c @@ -274,8 +274,8 @@ AslCompilerFileHeader ( NewTime = localtime (&Aclock); FlPrintFile (FileId, - "%sCompilation of \"%s\" - %s%s\n", - Prefix, Gbl_Files[ASL_FILE_INPUT].Filename, asctime (NewTime), + "%sCompilation of \"%s\"\n", + Prefix, Gbl_Files[ASL_FILE_INPUT].Filename, Prefix); switch (FileId) --- compiler/aslutils.c.orig +++ compiler/aslutils.c @@ -567,8 +567,8 @@ UtDisplaySummary ( { /* Compiler name and version number */ - FlPrintFile (FileId, "%s version %X%s [%s]\n", - ASL_COMPILER_NAME, (UINT32) ACPI_CA_VERSION, ACPI_WIDTH, __DATE__); + FlPrintFile (FileId, "%s version %X%s\n", + ASL_COMPILER_NAME, (UINT32) ACPI_CA_VERSION, ACPI_WIDTH); } if (Gbl_FileType == ASL_INPUT_TYPE_ASCII_DATA) --- include/acapps.h.orig +++ include/acapps.h @@ -141,15 +141,15 @@ /* Macros for signons and file headers */ #define ACPI_COMMON_SIGNON(UtilityName) \ - "\n%s\n%s version %8.8X%s [%s]\n%s\n\n", \ + "\n%s\n%s version %8.8X%s\n%s\n\n", \ ACPICA_NAME, \ - UtilityName, ((UINT32) ACPI_CA_VERSION), ACPI_WIDTH, __DATE__, \ + UtilityName, ((UINT32) ACPI_CA_VERSION), ACPI_WIDTH, \ ACPICA_COPYRIGHT #define ACPI_COMMON_HEADER(UtilityName, Prefix) \ - "%s%s\n%s%s version %8.8X%s [%s]\n%s%s\n%s\n", \ + "%s%s\n%s%s version %8.8X%s\n%s%s\n%s\n", \ Prefix, ACPICA_NAME, \ - Prefix, UtilityName, ((UINT32) ACPI_CA_VERSION), ACPI_WIDTH, __DATE__, \ + Prefix, UtilityName, ((UINT32) ACPI_CA_VERSION), ACPI_WIDTH, \ Prefix, ACPICA_COPYRIGHT, \ Prefix ++++++ acpica-unix-20110316-gcc46.patch ++++++ --- compiler/aslcompiler.l 2011-03-16 17:28:12.000000000 +0100 +++ compiler/aslcompiler.l 2011-04-27 11:31:10.568989034 +0200 @@ -550,7 +550,6 @@ void) { ASL_FILE_NODE *Fnode; - FILE *InputFile = NULL; Fnode = InputStack; @@ -569,7 +568,6 @@ /* Update the top-of-stack */ InputStack = Fnode->Next; - InputFile = Fnode->File; /* Reset global line counter and filename */ ++++++ acpica-unix-20110112.tar.bz2 -> acpica-unix-20110316.tar.bz2 ++++++ ++++ 19007 lines of diff (skipped) ++++++ acpica_fix_acpixtract ++++++ acpica: Revert commit baab09e6857a427944068c5e599ea2ffb84f765b to fix dynamic SSDT table extract. Signed-off-by: Thomas Renninger <[email protected]> Index: source/tools/acpixtract/acpixtract.c =================================================================== --- source.orig/tools/acpixtract/acpixtract.c +++ source/tools/acpixtract/acpixtract.c @@ -122,11 +122,11 @@ /* Note: This is a 32-bit program only */ -#define VERSION 0x20110225 +#define VERSION 0x20100107 #define FIND_HEADER 0 #define EXTRACT_DATA 1 #define BUFFER_SIZE 256 -#define HEADER_LINE_LENGTH 17 /* strlen ("FACP @ 0x737e1000") */ + /* Local prototypes */ @@ -577,13 +577,6 @@ ExtractTables ( { case FIND_HEADER: - /* Ignore lines that are too short to be header lines */ - - if (strlen (Buffer) < HEADER_LINE_LENGTH) - { - continue; - } - /* Ignore empty lines and lines that start with a space */ if ((Buffer[0] == ' ') || @@ -591,15 +584,6 @@ ExtractTables ( { continue; } - - /* Ignore lines that are not of the form "ABCD @ " */ - - if ((Buffer[4] != ' ') || - (Buffer[5] != '@') || - (Buffer[6] != ' ')) - { - continue; - } NormalizeSignature (Buffer); strncpy (ThisSignature, Buffer, 4); ++++++ acpidump-20101221.tar.bz2 -> acpidump-20110323.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpidump/acpidump.c new/acpidump/acpidump.c --- old/acpidump/acpidump.c 2011-01-13 16:12:16.000000000 +0100 +++ new/acpidump/acpidump.c 2011-03-25 16:06:49.000000000 +0100 @@ -43,6 +43,8 @@ #include <unistd.h> #include <getopt.h> +#include <sys/types.h> +#include <dirent.h> #include <acpi/acconfig.h> #include <acpi/platform/acenv.h> @@ -311,6 +313,67 @@ return 1; } +#define DYNAMIC_SSDT "/sys/firmware/acpi/tables/dynamic" + +static void acpi_dump_dynamic_SSDT(int fd) +{ + struct stat file_stat; + char filename[256], *ptr; + DIR *tabledir; + struct dirent *entry; + FILE *fp; + int count, readcount, length; + struct acpi_table_header table_header, *ptable; + + if (stat(DYNAMIC_SSDT, &file_stat) == -1) { + /* The directory doesn't exist */ + return; + } + tabledir = opendir(DYNAMIC_SSDT); + if(!tabledir){ + /*can't open the directory */ + return; + } + + while ((entry = readdir(tabledir)) != 0){ + /* skip the file of . /.. */ + if (entry->d_name[0] == '.') + continue; + + sprintf(filename, "%s/%s", DYNAMIC_SSDT, entry->d_name); + fp = fopen(filename, "r"); + if (fp == NULL) { + fprintf(stderr, "Can't open the file of %s\n", + filename); + continue; + } + /* Read the Table header to parse the table length */ + count = fread(&table_header, 1, sizeof(struct acpi_table_header), fp); + if (count < sizeof(table_header)) { + /* the length is lessn than ACPI table header. skip it */ + fclose(fp); + continue; + } + length = table_header.length; + ptr = malloc(table_header.length); + fseek(fp, 0, SEEK_SET); + readcount = 0; + while(!feof(fp) && readcount < length) { + count = fread(ptr + readcount, 1, 256, fp); + readcount += count; + } + fclose(fp); + ptable = (struct acpi_table_header *) ptr; + if (checksum((u8 *) ptable, ptable->length)) + fprintf(stderr, "Wrong checksum " + "for dynamic SSDT table!\n"); + write_table(fd, ptable, 0); + free(ptr); + } + closedir(tabledir); + return; +} + static void usage(const char *progname) { puts("Usage:"); @@ -428,6 +491,7 @@ goto not_found; write(fd, raw, length); acpi_unmap_memory(raw, length); + close(fd); return 0; } @@ -465,8 +529,11 @@ buff[0] = '\n'; write(fd, buff, 1); } + acpi_dump_dynamic_SSDT(fd); + close(fd); return 0; not_found: + close(fd); fprintf(stderr, "ACPI tables were not found. If you know location " "of RSD PTR table (from dmesg, etc), " "supply it with either --addr or -a option\n"); ++++++ acpiexec_fix_build_missing_utdecode.patch ++++++ commit 8b3f242f8d97c961370012008a4d95a0707430eb Author: Robert Moore <[email protected]> Date: Tue Mar 22 08:15:19 2011 -0700 AcpiExec: Fix Linux makefile. Had two inclusions of utdebug.c diff --git a/tools/acpiexec/Makefile b/tools/acpiexec/Makefile index c7ede95..ec7b093 100644 --- a/tools/acpiexec/Makefile +++ b/tools/acpiexec/Makefile @@ -592,7 +592,7 @@ utcopy.o : $(ACPICA_CORE)/utilities/utcopy.c utdebug.o : $(ACPICA_CORE)/utilities/utdebug.c $(COMPILE) -utdebug.o : $(ACPICA_CORE)/utilities/utdebug.c +utdecode.o : $(ACPICA_CORE)/utilities/utdecode.c $(COMPILE) utdelete.o : $(ACPICA_CORE)/utilities/utdelete.c ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
