From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: multipart/mixed; boundary="===============5645678643643488216==" MIME-Version: 1.0 From: Ricardo Neri Subject: [PATCH 2/2] chipsec: bump to v1.3.1 Date: Wed, 05 Jul 2017 17:52:57 -0700 Message-ID: <1499302377-18722-3-git-send-email-ricardo.neri-calderon@linux.intel.com> In-Reply-To: <1499302377-18722-1-git-send-email-ricardo.neri-calderon@linux.intel.com> List-Id: To: chipsec@lists.01.org --===============5645678643643488216== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Now that a new version of CHIPSEC is out, update our recipe accordingly. Bumping to this version required a trivial update to one of the patches that we carry. Also, a new change in v1.3.1 buils the CHIPSEC Linux module based on the architecture of the host system. This prevents cross-compilation. Thus, revert such patch. Signed-off-by: Ricardo Neri --- ...issue-with-building-driver-on-32bit-syste.patch | 43 ++++++++++++++++++= ++++ .../chipsec/0001-chipsec-do-not-ship-manual.patch | 4 +- meta-luv/recipes-core/chipsec/chipsec_git.bb | 5 ++- 3 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 meta-luv/recipes-core/chipsec/chipsec/0001-Revert-fix-i= ssue-with-building-driver-on-32bit-syste.patch diff --git a/meta-luv/recipes-core/chipsec/chipsec/0001-Revert-fix-issue-wi= th-building-driver-on-32bit-syste.patch b/meta-luv/recipes-core/chipsec/chi= psec/0001-Revert-fix-issue-with-building-driver-on-32bit-syste.patch new file mode 100644 index 0000000..1511bfa --- /dev/null +++ b/meta-luv/recipes-core/chipsec/chipsec/0001-Revert-fix-issue-with-buil= ding-driver-on-32bit-syste.patch @@ -0,0 +1,43 @@ +From 24813411bf05b19e4a750be34f9d61833a8455e6 Mon Sep 17 00:00:00 2001 +From: Ricardo Neri +Date: Wed, 5 Jul 2017 15:03:24 -0700 +Subject: [PATCH] Revert "fix issue with building driver on 32bit system + (#203)" + +This reverts commit 1c09ea5adad8d18bdcd9161214984ae6efec5be9. + +This fix can only work if the host machine is also the target machine. +However, when cross-compiling, we cannot use uname to obtain the +target architecture. Insted, allow the Makefile to use an externally +defined variable. +--- + drivers/linux/Makefile | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +diff --git a/drivers/linux/Makefile b/drivers/linux/Makefile +index 69e90e2..0766cd9 100644 +--- a/drivers/linux/Makefile ++++ b/drivers/linux/Makefile +@@ -1,14 +1,12 @@ + KERNEL_SRC_DIR ?=3D /lib/modules/`uname -r`/build + #KERNEL_SRC_DIR =3D /usr/src/android/3.0-mid + = +-MACHINE ?=3D $(shell uname -m) +- +-ifeq (,$(filter %i686 %i386 %i586,$(MACHINE))) +- elf-size :=3D elf64 +- asm-path :=3D amd64 ++ifeq ($(ARCH),i386) ++elf-size :=3D elf32 ++asm-path :=3D i386 + else +- elf-size :=3D elf32 +- asm-path :=3D i386 ++elf-size :=3D elf64 ++asm-path :=3D amd64 + endif + = + chipsec-objs :=3D chipsec_km.o $(asm-path)/cpu.o +-- = +2.13.0 + diff --git a/meta-luv/recipes-core/chipsec/chipsec/0001-chipsec-do-not-ship= -manual.patch b/meta-luv/recipes-core/chipsec/chipsec/0001-chipsec-do-not-s= hip-manual.patch index 09fa941..f5659f3 100644 --- a/meta-luv/recipes-core/chipsec/chipsec/0001-chipsec-do-not-ship-manual= .patch +++ b/meta-luv/recipes-core/chipsec/chipsec/0001-chipsec-do-not-ship-manual= .patch @@ -25,10 +25,10 @@ index 89bcc91..fb0da43 100644 install_requires =3D [] extra_kw =3D {} = -@@ -155,7 +155,6 @@ if platform.system().lower() =3D=3D "windows": - elif platform.system().lower() =3D=3D "linux": +@@ -156,7 +156,6 @@ if platform.system().lower() =3D=3D "windows": compression_source_files =3D [] package_data["chipsec_tools.linux"] =3D ['*'] + package_data["chipsec_tools.compression"] =3D ["*.c","*.h"] - data_files =3D [(os.path.join("share","doc","chipsec"), ["chipsec-man= ual.pdf"])] for root, dir, path in os.walk( os.path.join( "chipsec_tools", "compr= ession" ) ): for f in path: diff --git a/meta-luv/recipes-core/chipsec/chipsec_git.bb b/meta-luv/recipe= s-core/chipsec/chipsec_git.bb index 75d6b4f..da1b77d 100644 --- a/meta-luv/recipes-core/chipsec/chipsec_git.bb +++ b/meta-luv/recipes-core/chipsec/chipsec_git.bb @@ -12,10 +12,11 @@ SRC_URI =3D "git://github.com/chipsec/chipsec.git \ file://0001-chipsec-building-for-32-bit-systems.patch \ file://0001-chipsec-do-not-ship-manual.patch \ file://0001-setup.py-give-CPU-architecture-to-the-driver-s-Makef.patch= \ + file://0001-Revert-fix-issue-with-building-driver-on-32bit-syste.patch= \ " = -SRCREV=3D"45603c15e5dd5728551162dbad54c844d5d11f7e" -PV=3D"1.3.0" +SRCREV=3D"a82209970012e7835dc16f73af4b377f9f5329d7" +PV=3D"1.3.1" = DEPENDS =3D "virtual/kernel python-core nasm-native python-setuptools-nati= ve" RDEPENDS_${PN} =3D "python python-shell python-stringold python-xml \ -- = 2.7.4 --===============5645678643643488216==--