summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorIru Cai2018-06-27 14:38:59 +0800
committerIru Cai2018-06-27 14:43:05 +0800
commit851868ba8f45924ba3822650e82ccaa1824c1833 (patch)
treeeae7c3903befc11701bafcc60356c7260ab47c8e
parent219c71d43516b5de2235ed1c0785e15b76f495e6 (diff)
downloadaur-851868ba8f45924ba3822650e82ccaa1824c1833.tar.gz
Update
- Use bundled me_cleaner - Patch the tools path in autoport
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD8
-rw-r--r--autoport-tool-paths.patch17
3 files changed, 24 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 47615f6b4c7e..cd542facfd64 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = coreboot-utils-git
pkgdesc = Tools and utilities to work with coreboot firmware
- pkgver = 4.8.r448.g6985a7b7d63
+ pkgver = 4.8.r627.gc3bc6cbe9de
pkgrel = 1
url = https://www.coreboot.org/
arch = i686
@@ -12,11 +12,11 @@ pkgbase = coreboot-utils-git
optdepends = python: me_cleaner support
source = git+https://review.coreboot.org/coreboot
source = git+https://review.coreboot.org/vboot
- source = https://raw.githubusercontent.com/corna/me_cleaner/312ef02714dcab806c9d9bfee07f51002dc61e08/me_cleaner.py
+ source = autoport-tool-paths.patch
source = buff_size_fix.patch
sha256sums = SKIP
sha256sums = SKIP
- sha256sums = f27ddd0fa26c121221dc8f76b71bf308d6d7c48fdc4d84968580d04c5dc2e42e
+ sha256sums = 5136f8ae6c690501b483243a33b91dc978971cf23bcf48c27bdca845db53bdb1
sha256sums = 0ab673cf5cfba4678cf7a7d567745742121cd921c4ab86081d4a9583ed679753
pkgname = coreboot-utils-git
diff --git a/PKGBUILD b/PKGBUILD
index 48e8424674e9..3d17fd92d401 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Iru Cai <mytbk920423@gmail.com>
pkgname=coreboot-utils-git
-pkgver=4.8.r448.g6985a7b7d63
+pkgver=4.8.r627.gc3bc6cbe9de
pkgrel=1
pkgdesc='Tools and utilities to work with coreboot firmware'
url='https://www.coreboot.org/'
@@ -14,11 +14,11 @@ makedepends=(git)
source=(git+https://review.coreboot.org/coreboot
# vboot provides vb2_api.h needed by cbfstool
git+https://review.coreboot.org/vboot
- https://raw.githubusercontent.com/corna/me_cleaner/312ef02714dcab806c9d9bfee07f51002dc61e08/me_cleaner.py
+ autoport-tool-paths.patch
buff_size_fix.patch)
sha256sums=('SKIP'
'SKIP'
- 'f27ddd0fa26c121221dc8f76b71bf308d6d7c48fdc4d84968580d04c5dc2e42e'
+ '5136f8ae6c690501b483243a33b91dc978971cf23bcf48c27bdca845db53bdb1'
'0ab673cf5cfba4678cf7a7d567745742121cd921c4ab86081d4a9583ed679753')
BUILD_AUTOPORT=y
@@ -65,7 +65,7 @@ package() {
cd coreboot/util
install -m755 -d "$pkgdir/usr/bin" "$pkgdir/usr/share/man/man8"
install -m755 -t "$pkgdir/usr/bin" cbfstool/{cbfstool,rmodtool} ifdtool/ifdtool nvramtool/nvramtool inteltool/inteltool superiotool/superiotool cbmem/cbmem romcc/romcc ectool/ectool intelmetool/intelmetool
- install -m755 "$srcdir/me_cleaner.py" "$pkgdir/usr/bin/me_cleaner"
+ install -m755 "me_cleaner/me_cleaner.py" "$pkgdir/usr/bin/me_cleaner"
if [ "$BUILD_AUTOPORT" == y ]; then
install -m755 -t "$pkgdir/usr/bin" autoport/autoport
fi
diff --git a/autoport-tool-paths.patch b/autoport-tool-paths.patch
new file mode 100644
index 000000000000..47d19a9623ad
--- /dev/null
+++ b/autoport-tool-paths.patch
@@ -0,0 +1,17 @@
+diff --git a/util/autoport/log_maker.go b/util/autoport/log_maker.go
+index 08b35d2195..c3ce81e57a 100644
+--- a/util/autoport/log_maker.go
++++ b/util/autoport/log_maker.go
+@@ -93,9 +93,9 @@ func MakeLogs(outDir string) {
+ inteltoolArgs += "f"
+ }
+
+- RunAndSave(outDir+"/inteltool.log", "../inteltool/inteltool", inteltoolArgs)
+- RunAndSave(outDir+"/ectool.log", "../ectool/ectool", "-pd")
+- RunAndSave(outDir+"/superiotool.log", "../superiotool/superiotool", "-ade")
++ RunAndSave(outDir+"/inteltool.log", "inteltool", inteltoolArgs)
++ RunAndSave(outDir+"/ectool.log", "ectool", "-pd")
++ RunAndSave(outDir+"/superiotool.log", "superiotool", "-ade")
+
+ SysDir := "/sys/class/sound/card0/"
+ files, _ := ioutil.ReadDir(SysDir)