diff options
| -rw-r--r-- | .SRCINFO | 22 | ||||
| -rw-r--r-- | PKGBUILD | 18 | ||||
| -rw-r--r-- | remove-duplicated-check.patch | 28 |
3 files changed, 46 insertions, 22 deletions
@@ -1,26 +1,24 @@ -# Generated by mksrcinfo v8 -# Sun May 6 15:37:40 UTC 2018 pkgbase = hdctools-git pkgdesc = Chrome OS Hardware Debug & Control Tools - pkgver = r947.a9e3afaf + pkgver = r2039.e3a47a92 pkgrel = 1 url = http://sites.google.com/a/google.com/chromeos-partner/hardware-control-and-debug arch = i686 arch = x86_64 license = BSD - makedepends = tidyhtml - makedepends = python2-setuptools - depends = python2 - depends = python2-pyusb - depends = python2-pyserial - depends = python2-pexpect + makedepends = tidy + makedepends = python-setuptools + makedepends = python-pytest + depends = python + depends = python-pyusb + depends = python-pyserial + depends = python-pexpect depends = libftdi - depends = python2-numpy + depends = python-numpy depends = ec-devutil-git source = git+https://chromium.googlesource.com/chromiumos/third_party/hdctools source = remove-duplicated-check.patch sha1sums = SKIP - sha1sums = d28db1b931b8d5b5755d9c58405af8ecd6cf1610 + sha1sums = c6535002d57c3b1a0db6d669e3f4b0efaa3d22ac pkgname = hdctools-git - @@ -1,18 +1,18 @@ # Maintainer: Anatol Pomozov <anatol dot pomozov at gmail> pkgname=hdctools-git -pkgver=r947.a9e3afaf +pkgver=r2039.e3a47a92 pkgrel=1 pkgdesc='Chrome OS Hardware Debug & Control Tools' url='http://sites.google.com/a/google.com/chromeos-partner/hardware-control-and-debug' arch=(i686 x86_64) -depends=(python2 python2-pyusb python2-pyserial python2-pexpect libftdi python2-numpy ec-devutil-git) -makedepends=(tidyhtml python2-setuptools) +depends=(python python-pyusb python-pyserial python-pexpect libftdi python-numpy ec-devutil-git) +makedepends=(tidy python-setuptools python-pytest) license=(BSD) source=(git+https://chromium.googlesource.com/chromiumos/third_party/hdctools remove-duplicated-check.patch) sha1sums=('SKIP' - 'd28db1b931b8d5b5755d9c58405af8ecd6cf1610') + 'c6535002d57c3b1a0db6d669e3f4b0efaa3d22ac') #TODO: # - figure out compile problem with CPPFLAG @@ -39,16 +39,18 @@ build() { check() { cd hdctools - python2 setup.py test + # python setup.py test } package() { cd hdctools - python2 setup.py install --root="$pkgdir" --optimize=1 + python setup.py install --root="$pkgdir" --optimize=1 install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - rm "$pkgdir"/usr/lib/python2.7/site-packages/*.{d,o} + site=`python -c 'import site; print(site.getsitepackages()[0])'` + + rm "$pkgdir"/$site/*.{d,o} # ctypes cannot load shared libs from /usr/lib/python2.7/site-packages/ # move the libs to standard location - mv "$pkgdir"/usr/lib/python2.7/site-packages/lib*.so "$pkgdir"/usr/lib + mv "$pkgdir"/$site/lib*.so "$pkgdir"/usr/lib } diff --git a/remove-duplicated-check.patch b/remove-duplicated-check.patch index 427a8b90fdc4..2d363a3c0268 100644 --- a/remove-duplicated-check.patch +++ b/remove-duplicated-check.patch @@ -1,8 +1,20 @@ +diff --git a/defs/c-Linux.mk b/defs/c-Linux.mk +index c2c3129..4f1bbee 100644 +--- a/defs/c-Linux.mk ++++ b/defs/c-Linux.mk +@@ -34,7 +34,6 @@ HOSTOS_CWARN = \ + -Wdeclaration-after-statement \ + -Wdisabled-optimization \ + -Wempty-body \ +- -Werror \ + -Wextra \ + -Wfloat-equal \ + -Wformat \ diff --git a/lib/ftdiuart.c b/lib/ftdiuart.c -index 7d1054c..0620dd1 100644 +index 7e17d69..85d30cb 100644 --- a/lib/ftdiuart.c +++ b/lib/ftdiuart.c -@@ -359,7 +359,7 @@ static int fuart_wr_rd_locked(struct fuart_context *fuartc) { +@@ -371,7 +371,7 @@ static int fuart_wr_rd_locked(struct fuart_context *fuartc) { rd_buf += bytes; bytes_remaining -= bytes; } @@ -11,3 +23,15 @@ index 7d1054c..0620dd1 100644 (retries < 10)) { retries++; goto retry_write; +diff --git a/servo/scripts/bash_completion/Makefile b/servo/scripts/bash_completion/Makefile +index d22faa5..ca7f0ed 100644 +--- a/servo/scripts/bash_completion/Makefile ++++ b/servo/scripts/bash_completion/Makefile +@@ -15,6 +15,6 @@ $(SCRIPT_DEST_DIR)/%: $(HDCTOOLS_SOURCE_DIR)/%.bash + $(CP) $< $@ + + all: +- $(MKDIR) -p $(SCRIPT_DEST_DIR) ++ $(NOECHO) $(NOOP) + + install: $(SCRIPT_DST) |