[meta-virtualization] [PATCH] iasl: remove iasl in favor of acpica in openembedded-core

Thu Oct 11 08:15:39 PDT 2018

From: Chris Patterson <pattersonc at ainfosec.com>

It is out of date, causes compilation errors, and is replacable
with acpica.  This commit removes the iasl recipe as well
as updating references within seabios and xen, even though
acpcica PROVIDES iasl.

Signed-off-by: Chris Patterson <pattersonc at ainfosec.com>
---
 .../iasl/iasl/Make-CC-definition-conditional.patch |  29 -----
 recipes-extended/iasl/iasl/iasl.1                  | 135 ---------------------
 recipes-extended/iasl/iasl_20160527.bb             |  36 ------
 recipes-extended/seabios/seabios_1.11.2.bb         |   2 +-
 recipes-extended/xen/xen.inc                       |   2 +-
 5 files changed, 2 insertions(+), 202 deletions(-)
 delete mode 100644 recipes-extended/iasl/iasl/Make-CC-definition-conditional.patch
 delete mode 100644 recipes-extended/iasl/iasl/iasl.1
 delete mode 100644 recipes-extended/iasl/iasl_20160527.bb

diff --git a/recipes-extended/iasl/iasl/Make-CC-definition-conditional.patch b/recipes-extended/iasl/iasl/Make-CC-definition-conditional.patch
deleted file mode 100644
index f69a36c..0000000
--- a/recipes-extended/iasl/iasl/Make-CC-definition-conditional.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-[PATCH] Make CC definition conditional
-
-Upstream-Status: pending
-
-By hardcoding CC's definition to gcc, make this packages unable to
-cross-compile. the -e options of make can not override the CC since
-it is not defined in Makefile, but in Makefile.config
-
-Signed-off-by: Roy.Li <rongqing.li at windriver.com>
----
- generate/unix/Makefile.config | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/generate/unix/Makefile.config b/generate/unix/Makefile.config
-index 8d41399..72d597d 100644
---- a/generate/unix/Makefile.config
-+++ b/generate/unix/Makefile.config
-@@ -35,7 +35,7 @@
- .SUFFIXES :
- PROGS = acpibin acpidump acpiexamples acpiexec acpihelp acpinames acpisrc acpixtract iasl
- HOST ?= _CYGWIN
--CC =    gcc
-+CC ?=    gcc
- 
- #
- # Common defines
--- 
-1.9.1
-
diff --git a/recipes-extended/iasl/iasl/iasl.1 b/recipes-extended/iasl/iasl/iasl.1
deleted file mode 100644
index 000a3b8..0000000
--- a/recipes-extended/iasl/iasl/iasl.1
+++ /dev/null
@@ -1,135 +0,0 @@
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH IASL 1 "October 14, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-iasl \- ACPI Source Language compiler/decompiler
-.SH SYNOPSIS
-.B iasl
-.RI [ options ]
-.RI [ "input file" ]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B iasl
-command. The option list is taken from the iasl interactive help.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-.B iasl
-is an ASL compiler and decompiler.
-
-.SH OPTIONS
-
-.PP
-.SS General Output
-.TP
-.B \-p <prefix>
-Specify filename prefix for all output files (including .aml)
-.TP
-.B \-vi
-Less verbose errors and warnings for use with IDEs
-.TP
-.B \-vo
-Enable optimization comments
-.TP
-.B \-vr
-Disable remarks
-.TP
-.B \-vs
-Disable signon
-
-.PP
-.SS AML Output Files
-.TP
-.B \-s<a|c>
-Create AML in assembler or C source file (*.asm or *.c)
-.TP
-.B \-i<a|c>
-Create assembler or C include file (*.inc or *.h)
-.TP
-.B \-t<a|c>
-Create AML in assembler or C hex table (*.hex)
-
-.PP
-.SS AML Code Generation
-.TP
-.B \-oa
-Disable all optimizations (compatibility mode)
-.TP
-.B \-of
-Disable constant folding
-.TP
-.B \-oi
-Disable integer optimization to Zero/One/Ones
-.TP
-.B \-on
-Disable named reference string optimization
-.TP
-.B \-r<Revision>
-Override table header Revision (1-255)
-
-.PP
-.SS Listings
-.TP
-.B \-l
-Create mixed listing file (ASL source and AML) (*.lst)
-.TP
-.B \-ln
-Create namespace file (*.nsp)
-.TP
-.B \-ls
-Create combined source file (expanded includes) (*.src)
-
-.PP
-.SS AML Disassembler
-.TP
-.B \-d  [file]
-Disassemble AML to ASL source code file (*.dsl)
-.TP
-.B \-dc [file]
-Disassemble AML and immediately compile it
-.br
-(Obtain DSDT from current system if no input file)
-.TP
-.B \-e
-Generate External() statements for unresolved symbols
-.TP
-.B \-g
-Get ACPI tables and write to files (*.dat)
-
-.PP
-.SS Miscellaneous
-.TP
-.B \-a
-Verify source file is entirely ASCII text (0x00-0x7F)
-
-.PP
-.SS Help
-.TP
-.B \-h
-Additional help and compiler debug options
-.TP
-.B \-hc
-Display operators allowed in constant expressions
-.TP
-.B \-hr
-Display ACPI reserved method names
-
-.SH AUTHOR
-iasl was written by Robert Moore <robert.moore at intel.com>.
-.PP
-This manual page was written by Mattia Dongili <malattia at debian.org>,
-for the Debian project (but may be used by others).
diff --git a/recipes-extended/iasl/iasl_20160527.bb b/recipes-extended/iasl/iasl_20160527.bb
deleted file mode 100644
index 62e83c4..0000000
--- a/recipes-extended/iasl/iasl_20160527.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-SUMMARY = "Intel ASL compiler/decompiler"
-DESCRIPTION = "This is a cross development C compiler, assembler and linker environment for the production of 8086 executables (Optionally MSDOS COM)"
-HOMEPAGE = "http://www.acpica.org/"
-LICENSE = "Intel-ACPI"
-LIC_FILES_CHKSUM = "file://source/compiler/aslcompiler.h;beginline=7;endline=114;md5=09f82edcd148ab4c8aa554bc3e9d0676"
-SECTION = "console/tools"
-
-DEPENDS = "bison-native flex-native"
-
-SRC_URI = "https://www.acpica.org/sites/acpica/files/acpica-unix-${PV}.tar.gz \
-           file://iasl.1 \
-           file://Make-CC-definition-conditional.patch \
-"
-
-SRC_URI[md5sum] = "be677fc358de9dadc036e1ea678a101b"
-SRC_URI[sha256sum] = "6b681732624de1eb58b2bcf1c7ef0744ba14ed35fcaa534d4421574782fbb848"
-
-S = "${WORKDIR}/acpica-unix-${PV}/"
-
-BBCLASSEXTEND = "native"
-CFLAGS += "-D_LINUX -DACPI_ASL_COMPILER -I../include -I../compiler"
-
-COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux"
-
-# By setting NOOPT we suppress forcing -O2 and setting _FORTIFY_SOURCE=2.  Let the
-# optimization and security cflags set them.
-#
-do_compile() {
-        oe_runmake iasl NOOPT=TRUE NOFORTIFY=TRUE
-}
-
-do_install() {
-	install -d ${D}${bindir} ${D}${mandir}/man1
-	install -m 0755 ${S}/generate/unix/bin/iasl ${D}${bindir}
-	install -m 0644 ${WORKDIR}/iasl.1 ${D}${mandir}/man1
-}
diff --git a/recipes-extended/seabios/seabios_1.11.2.bb b/recipes-extended/seabios/seabios_1.11.2.bb
index 4ea9eb7..81eaec9 100644
--- a/recipes-extended/seabios/seabios_1.11.2.bb
+++ b/recipes-extended/seabios/seabios_1.11.2.bb
@@ -18,7 +18,7 @@ SRC_URI[sha256sum] = "73e73c8e406d97265782f6c942b3c1d178ed4f4afc9f381b22336c3968
 
 FILES_${PN} = "/usr/share/firmware"
 
-DEPENDS = "util-linux-native file-native bison-native flex-native gettext-native iasl-native python-native"
+DEPENDS = "util-linux-native file-native bison-native flex-native gettext-native acpica-native python-native"
 
 TUNE_CCARGS = ""
 EXTRA_OEMAKE += "HOSTCC='${BUILD_CC}'"
diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
index 365f71d..7efc8df 100644
--- a/recipes-extended/xen/xen.inc
+++ b/recipes-extended/xen/xen.inc
@@ -30,7 +30,7 @@ DEPENDS = " \
     flex-native \
     file-native \
     gettext-native \
-    iasl-native \
+    acpica-native \
     ncurses-native \
     util-linux-native \
     xz-native \
-- 
2.1.4

