Skip to contentSkip to conversation

acpica: upgrade to 20190215

PATCH New Ross Burton 1 participant 1 message Apr 23, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 acpica: upgrade to 20190215

Drop yy_scan_string patch, this only affects builds with flex 2.6.2. We currently have 2.6.0 and when we upgrade it will be to at least 2.6.3, which fixes the regression.

Drop manipulate_fds_instead-of-FILE.patch, the original problem was fix upstream in May 2015[1] so the 20170303 upgrade should have dropped this patch instead of rebasing.

Call the upstream install target with variables set appropriately, instead of hand-coding an install.

[1] https://github.com/acpica/acpica/commit/ecb91f4c3a151cbb280ee445166e7c6f4dc441a5

---
 .../{acpica_20180508.bb => acpica_20190215.bb}     | 25 ++++----
 .../files/manipulate-fds-instead-of-FILE.patch     | 71 ----------------------
 .../files/rename-yy_scan_string-manually.patch     | 64 -------------------
 3 files changed, 11 insertions(+), 149 deletions(-)
 rename meta/recipes-extended/acpica/{acpica_20180508.bb => acpica_20190215.bb} (58%)
 delete mode 100644 meta/recipes-extended/acpica/files/manipulate-fds-instead-of-FILE.patch
 delete mode 100644 meta/recipes-extended/acpica/files/rename-yy_scan_string-manually.patch
meta/recipes-extended/acpica/acpica_20190215.bb renamed from meta/recipes-extended/acpica/acpica_20180508.bb +11 -14
similarity index 58%
rename from meta/recipes-extended/acpica/acpica_20180508.bb
rename to meta/recipes-extended/acpica/acpica_20190215.bb
index b5c89fafc59..d4789df9335 100644
@@ -16,12 +16,9 @@ COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
 
 DEPENDS = "bison flex bison-native"
 
-SRC_URI = "https://acpica.org/sites/acpica/files/acpica-unix2-${PV}.tar.gz \
-           file://rename-yy_scan_string-manually.patch \
-           file://manipulate-fds-instead-of-FILE.patch \
-           "
-SRC_URI[md5sum] = "31691e2eb82b2064f78536a3423c18d6"
-SRC_URI[sha256sum] = "5d8fc9d9db9e04830d40bec9add04b21c05d466e0187d354815006fdd823cf15"
+SRC_URI = "https://acpica.org/sites/acpica/files/acpica-unix2-${PV}.tar.gz"
+SRC_URI[md5sum] = "0ea9047bf15dfdf3583f5266cc6da718"
+SRC_URI[sha256sum] = "8f939ad6130862e05853837496500b3fb93037530e5ea0ca0298458522ffc2c7"
 UPSTREAM_CHECK_URI = "https://acpica.org/downloads"
 
 S = "${WORKDIR}/acpica-unix2-${PV}"
@@ -31,16 +28,16 @@ inherit update-alternatives
 ALTERNATIVE_PRIORITY = "100"
 ALTERNATIVE_${PN} = "acpixtract"
 
-EXTRA_OEMAKE = "CC='${CC}' 'OPT_CFLAGS=-Wall'"
+EXTRA_OEMAKE = "CC='${CC}' \
+                OPT_CFLAGS=-Wall \
+                DESTDIR=${D} \
+                PREFIX=${prefix} \
+                INSTALLDIR=${bindir} \
+                INSTALLFLAGS= \
+                "
 
 do_install() {
-    install -D -p -m0755 generate/unix/bin*/iasl ${D}${bindir}/iasl
-    install -D -p -m0755 generate/unix/bin*/acpibin ${D}${bindir}/acpibin
-    install -D -p -m0755 generate/unix/bin*/acpiexec ${D}${bindir}/acpiexec
-    install -D -p -m0755 generate/unix/bin*/acpihelp ${D}${bindir}/acpihelp
-    install -D -p -m0755 generate/unix/bin*/acpinames ${D}${bindir}/acpinames
-    install -D -p -m0755 generate/unix/bin*/acpisrc ${D}${bindir}/acpisrc
-    install -D -p -m0755 generate/unix/bin*/acpixtract ${D}${bindir}/acpixtract
+    oe_runmake install
 }
 
 # iasl*.bb is a subset of this recipe, so RREPLACE it
meta/recipes-extended/acpica/files/manipulate-fds-instead-of-FILE.patch deleted +0 -71

71 lines not on this page · raw message

meta/recipes-extended/acpica/files/rename-yy_scan_string-manually.patch deleted +0 -64

64 lines not on this page · raw message

Signature · 1 line
2.11.0