diff options
| -rw-r--r-- | meta-linaro/recipes-extra/acpica/acpica_20140114.bb (renamed from meta-linaro/recipes-extra/acpica/acpica_20131218.bb) | 6 | ||||
| -rw-r--r-- | meta-linaro/recipes-extra/acpica/files/aapits-ld.patch | 12 | ||||
| -rw-r--r-- | meta-linaro/recipes-extra/acpica/files/add-testing.patch | 2 | ||||
| -rw-r--r-- | meta-linaro/recipes-extra/acpica/files/examples-makefile.patch | 152 |
4 files changed, 16 insertions, 156 deletions
diff --git a/meta-linaro/recipes-extra/acpica/acpica_20131218.bb b/meta-linaro/recipes-extra/acpica/acpica_20140114.bb index 651efc51..31f660b8 100644 --- a/meta-linaro/recipes-extra/acpica/acpica_20131218.bb +++ b/meta-linaro/recipes-extra/acpica/acpica_20140114.bb @@ -10,8 +10,8 @@ SECTION = "console/tools" LICENSE = "BSD | GPLv2" LIC_FILES_CHKSUM = "file://generate/unix/readme.txt;md5=204407e197c1a01154a48f6c6280c3aa" DEPENDS = "bison flex" -SRCREV = "ecc630773260cb10f5202ab3273e447ffd0d1b13" -PV = "20131218+git${SRCPV}" +SRCREV = "f0e837ae76fd7e89081f477b447f599218b9599b" +PV = "20140114+git${SRCPV}" SRC_URI = "git://git.linaro.org/people/al.stone/acpica-tools.git \ file://fix_ftbfs_debian-kfreebsd.patch \ @@ -21,7 +21,7 @@ SRC_URI = "git://git.linaro.org/people/al.stone/acpica-tools.git \ file://add-testing.patch \ file://name-miscompare.patch \ file://aapits-linux.patch \ - file://examples-makefile.patch \ + file://aapits-ld.patch \ file://no-werror.patch \ " diff --git a/meta-linaro/recipes-extra/acpica/files/aapits-ld.patch b/meta-linaro/recipes-extra/acpica/files/aapits-ld.patch new file mode 100644 index 00000000..88748e88 --- /dev/null +++ b/meta-linaro/recipes-extra/acpica/files/aapits-ld.patch @@ -0,0 +1,12 @@ +diff -urN acpica-unix-20140114/tests/aapits/Makefile acpica-unix-20140114.patch/tests/aapits/Makefile +--- acpica-unix-20140114/tests/aapits/Makefile 2014-01-14 15:02:45.000000000 -0700 ++++ acpica-unix-20140114.patch/tests/aapits/Makefile 2014-01-23 16:07:50.124972105 -0700 +@@ -29,6 +29,7 @@ + ../../source/components/debugger/dbmethod.c \ + ../../source/components/debugger/dbnames.c \ + ../../source/components/debugger/dbstats.c \ ++ ../../source/components/debugger/dbtest.c \ + ../../source/components/debugger/dbutils.c \ + ../../source/components/debugger/dbxface.c \ + ../../source/components/disassembler/dmbuffer.c \ + diff --git a/meta-linaro/recipes-extra/acpica/files/add-testing.patch b/meta-linaro/recipes-extra/acpica/files/add-testing.patch index 9d525417..f846a3f7 100644 --- a/meta-linaro/recipes-extra/acpica/files/add-testing.patch +++ b/meta-linaro/recipes-extra/acpica/files/add-testing.patch @@ -15,7 +15,7 @@ Index: acpica-unix/Makefile + $(CURDIR)/debian/run-aapits.sh $(CURDIR)/tests/aapits $(CURDIR)/generate/unix/bin + + # misc tests -+ $(CURDIR)/debian/run-misc-tests.sh $(CURDIR) 20131218 ++ $(CURDIR)/debian/run-misc-tests.sh $(CURDIR) 20140114 + + # Template tests + cd $(CURDIR)/tests/templates diff --git a/meta-linaro/recipes-extra/acpica/files/examples-makefile.patch b/meta-linaro/recipes-extra/acpica/files/examples-makefile.patch deleted file mode 100644 index e435a199..00000000 --- a/meta-linaro/recipes-extra/acpica/files/examples-makefile.patch +++ /dev/null @@ -1,152 +0,0 @@ -diff -urN acpica-unix-20131218/generate/unix/acpiexamples/Makefile acpica-unix-20131218-patch/generate/unix/acpiexamples/Makefile ---- acpica-unix-20131218/generate/unix/acpiexamples/Makefile 1969-12-31 17:00:00.000000000 -0700 -+++ acpica-unix-20131218-patch/generate/unix/acpiexamples/Makefile 2014-01-06 19:40:59.042080873 -0700 -@@ -0,0 +1,148 @@ -+# -+# acpiexamples - Example ACPICA initialization code and control -+# method execution. -+# -+ -+# -+# Note: This makefile is intended to be used from within the native -+# ACPICA directory structure, from under generate/unix. It specifically -+# places all object files in a generate/unix subdirectory, not within -+# the various ACPICA source directories. This prevents collisions -+# between different compilations of the same source file with different -+# compile options, and prevents pollution of the source code. -+# -+include ../Makefile.config -+FINAL_PROG = ../$(BINDIR)/acpiexamples -+PROG = $(OBJDIR)/acpiexamples -+ -+# -+# Search paths for source files -+# -+vpath %.c \ -+ $(ACPIEXAMPLES)\ -+ $(ACPICA_DEBUGGER)\ -+ $(ACPICA_DISPATCHER)\ -+ $(ACPICA_EXECUTER)\ -+ $(ACPICA_NAMESPACE)\ -+ $(ACPICA_PARSER)\ -+ $(ACPICA_TABLES)\ -+ $(ACPICA_UTILITIES)\ -+ $(ACPICA_COMMON)\ -+ $(ACPICA_OSL) -+ -+HEADERS = \ -+ $(wildcard $(ACPIEXAMPLES)/*.h) -+ -+OBJECTS = \ -+ $(OBJDIR)/examples.o\ -+ $(OBJDIR)/exstubs.o\ -+ $(OBJDIR)/extables.o\ -+ $(OBJDIR)/dsargs.o\ -+ $(OBJDIR)/dscontrol.o\ -+ $(OBJDIR)/dsfield.o\ -+ $(OBJDIR)/dsinit.o\ -+ $(OBJDIR)/dsmethod.o\ -+ $(OBJDIR)/dsmthdat.o\ -+ $(OBJDIR)/dsobject.o\ -+ $(OBJDIR)/dsopcode.o\ -+ $(OBJDIR)/dsutils.o\ -+ $(OBJDIR)/dswexec.o\ -+ $(OBJDIR)/dswload.o\ -+ $(OBJDIR)/dswload2.o\ -+ $(OBJDIR)/dswscope.o\ -+ $(OBJDIR)/dswstate.o\ -+ $(OBJDIR)/exconfig.o\ -+ $(OBJDIR)/exconvrt.o\ -+ $(OBJDIR)/excreate.o\ -+ $(OBJDIR)/exdebug.o\ -+ $(OBJDIR)/exdump.o\ -+ $(OBJDIR)/exfield.o\ -+ $(OBJDIR)/exfldio.o\ -+ $(OBJDIR)/exmisc.o\ -+ $(OBJDIR)/exmutex.o\ -+ $(OBJDIR)/exnames.o\ -+ $(OBJDIR)/exoparg1.o\ -+ $(OBJDIR)/exoparg2.o\ -+ $(OBJDIR)/exoparg3.o\ -+ $(OBJDIR)/exoparg6.o\ -+ $(OBJDIR)/exprep.o\ -+ $(OBJDIR)/exregion.o\ -+ $(OBJDIR)/exresnte.o\ -+ $(OBJDIR)/exresolv.o\ -+ $(OBJDIR)/exresop.o\ -+ $(OBJDIR)/exstore.o\ -+ $(OBJDIR)/exstoren.o\ -+ $(OBJDIR)/exstorob.o\ -+ $(OBJDIR)/exsystem.o\ -+ $(OBJDIR)/exutils.o\ -+ $(OBJDIR)/nsaccess.o\ -+ $(OBJDIR)/nsalloc.o\ -+ $(OBJDIR)/nsconvert.o\ -+ $(OBJDIR)/nsdump.o\ -+ $(OBJDIR)/nseval.o\ -+ $(OBJDIR)/nsinit.o\ -+ $(OBJDIR)/nsload.o\ -+ $(OBJDIR)/nsnames.o\ -+ $(OBJDIR)/nsobject.o\ -+ $(OBJDIR)/nsparse.o\ -+ $(OBJDIR)/nssearch.o\ -+ $(OBJDIR)/nsutils.o\ -+ $(OBJDIR)/nswalk.o\ -+ $(OBJDIR)/nsxfeval.o\ -+ $(OBJDIR)/nsxfname.o\ -+ $(OBJDIR)/nsxfobj.o\ -+ $(OBJDIR)/osunixxf.o\ -+ $(OBJDIR)/psargs.o\ -+ $(OBJDIR)/psloop.o\ -+ $(OBJDIR)/psobject.o\ -+ $(OBJDIR)/psopcode.o\ -+ $(OBJDIR)/psopinfo.o\ -+ $(OBJDIR)/psparse.o\ -+ $(OBJDIR)/psscope.o\ -+ $(OBJDIR)/pstree.o\ -+ $(OBJDIR)/psutils.o\ -+ $(OBJDIR)/pswalk.o\ -+ $(OBJDIR)/psxface.o\ -+ $(OBJDIR)/tbfadt.o\ -+ $(OBJDIR)/tbfind.o\ -+ $(OBJDIR)/tbinstal.o\ -+ $(OBJDIR)/tbprint.o\ -+ $(OBJDIR)/tbutils.o\ -+ $(OBJDIR)/tbxface.o\ -+ $(OBJDIR)/tbxfload.o\ -+ $(OBJDIR)/tbxfroot.o\ -+ $(OBJDIR)/utaddress.o\ -+ $(OBJDIR)/utalloc.o\ -+ $(OBJDIR)/utbuffer.o\ -+ $(OBJDIR)/utcache.o\ -+ $(OBJDIR)/utcopy.o\ -+ $(OBJDIR)/utdebug.o\ -+ $(OBJDIR)/utdecode.o\ -+ $(OBJDIR)/utdelete.o\ -+ $(OBJDIR)/uterror.o\ -+ $(OBJDIR)/utexcep.o\ -+ $(OBJDIR)/utglobal.o\ -+ $(OBJDIR)/utlock.o\ -+ $(OBJDIR)/utmath.o\ -+ $(OBJDIR)/utmisc.o\ -+ $(OBJDIR)/utmutex.o\ -+ $(OBJDIR)/utobject.o\ -+ $(OBJDIR)/utosi.o\ -+ $(OBJDIR)/utownerid.o\ -+ $(OBJDIR)/utstate.o\ -+ $(OBJDIR)/utstring.o\ -+ $(OBJDIR)/utxface.o\ -+ $(OBJDIR)/utxferror.o\ -+ $(OBJDIR)/utxfinit.o -+ -+# -+# Flags specific to acpinames utility -+# -+CFLAGS += \ -+ -DACPI_EXAMPLE_APP\ -+ -I$(EXAMPLES) -+ -+# -+# Common Rules -+# -+include ../Makefile.rules |