From 4c4d2121ce85c7d7f214fa2120ece13103ad1094 Mon Sep 17 00:00:00 2001 From: Pietro Date: Tue, 5 Jun 2018 17:57:03 +0200 Subject: [PATCH] [ci]: recompile hidapi-0.8.0_rc1 package for alpine stable --- scripts/ci/create_docker_image.minimal.sh | 11 +++++- scripts/ci/create_docker_image.opam.sh | 13 ++++++- scripts/ci/hidapi-0.8.0_rc1.APKBUILD | 47 +++++++++++++++++++++++ scripts/version.sh | 1 + 4 files changed, 69 insertions(+), 3 deletions(-) create mode 100644 scripts/ci/hidapi-0.8.0_rc1.APKBUILD diff --git a/scripts/ci/create_docker_image.minimal.sh b/scripts/ci/create_docker_image.minimal.sh index 05886077c..358715a65 100755 --- a/scripts/ci/create_docker_image.minimal.sh +++ b/scripts/ci/create_docker_image.minimal.sh @@ -25,11 +25,16 @@ cleanup () { trap cleanup EXIT INT "$ci_dir"/create_apk.leveldb.sh +"$ci_dir"/create_apk.hidapi.sh cp -a "$build_dir"/leveldb-$leveldb_version-r0.apk \ "$build_dir"/keys/ \ "$tmp_dir" +cp -a "$build_dir"/hidapi-$hidapi_version-r0.apk \ + "$build_dir"/keys/ \ + "$tmp_dir" + mkdir -p "$tmp_dir"/bin mkdir -p "$tmp_dir"/scripts container=$(docker create $build_image_name) @@ -53,10 +58,12 @@ LABEL distro_style="apk" distro="alpine" distro_long="alpine-$alpine_version" ar COPY keys /etc/apk/keys/ COPY leveldb-$leveldb_version-r0.apk . +COPY hidapi-$hidapi_version-r0.apk . RUN apk --no-cache add \ - libev gmp vim leveldb-1.18-r0.apk && \ - rm leveldb-$leveldb_version-r0.apk + libev gmp vim leveldb-$leveldb_version-r0.apk hidapi-$hidapi_version-r0.apk && \ + rm leveldb-$leveldb_version-r0.apk && \ + rm hidapi-$hidapi_version-r0.apk COPY bin/* /usr/local/bin/ diff --git a/scripts/ci/create_docker_image.opam.sh b/scripts/ci/create_docker_image.opam.sh index 2d2ed304c..21ea052f8 100755 --- a/scripts/ci/create_docker_image.opam.sh +++ b/scripts/ci/create_docker_image.opam.sh @@ -20,6 +20,7 @@ cleanup () { trap cleanup EXIT INT "$ci_dir"/create_apk.leveldb.sh +"$ci_dir"/create_apk.hidapi.sh "$ci_dir"/create_binary.opam.sh "$ci_dir"/create_opam_repository.tezos_deps.sh @@ -35,6 +36,11 @@ cp -a "$build_dir"/leveldb-$leveldb_version-r0.apk \ "$build_dir"/keys/ \ "$tmp_dir" +cp -a "$build_dir"/hidapi-$hidapi_version-r0.apk \ + "$build_dir"/hidapi-dev-$hidapi_version-r0.apk \ + "$build_dir"/keys/ \ + "$tmp_dir" + cp "$build_dir"/opam-$opam_tag "$tmp_dir/opam" cp "$build_dir"/opam-installer-$opam_tag "$tmp_dir/opam-installer" @@ -49,6 +55,9 @@ COPY opam-installer /usr/bin/opam-installer COPY keys /etc/apk/keys/ COPY leveldb-$leveldb_version-r0.apk . COPY leveldb-dev-$leveldb_version-r0.apk . +COPY hidapi-$hidapi_version-r0.apk . +COPY hidapi-dev-$hidapi_version-r0.apk . + RUN apk --no-cache add \ build-base bash perl xz m4 git curl tar rsync patch sudo jq \ @@ -56,7 +65,9 @@ RUN apk --no-cache add \ pcre-dev zlib-dev \ snappy snappy-dev \ leveldb-$leveldb_version-r0.apk \ - leveldb-dev-$leveldb_version-r0.apk && \ + leveldb-dev-$leveldb_version-r0.apk \ + hidapi-$hidapi_version-r0.apk \ + hidapi-dev-$hidapi_version-r0.apk && \ adduser -S opam && \ echo 'opam ALL=(ALL:ALL) NOPASSWD:ALL' > /etc/sudoers.d/opam && \ chmod 440 /etc/sudoers.d/opam && \ diff --git a/scripts/ci/hidapi-0.8.0_rc1.APKBUILD b/scripts/ci/hidapi-0.8.0_rc1.APKBUILD new file mode 100644 index 000000000..6397d367b --- /dev/null +++ b/scripts/ci/hidapi-0.8.0_rc1.APKBUILD @@ -0,0 +1,47 @@ +# Contributor: Sören Tempel +# Maintainer: +pkgname=hidapi +pkgver=0.8.0_rc1 +_relver="$(echo "$pkgver" | sed s/_/-/)" +pkgrel=0 +pkgdesc="Simple library for communicating with USB and Bluetooth HID devices" +url="http://www.signal11.us/oss/hidapi/" +arch="all" +license="custom" +depends="" +depends_dev="" +options="!check" +makedepends="libusb-dev libtool eudev-dev linux-headers autoconf automake" +install="" +subpackages="$pkgname-dev $pkgname-doc" +source="$pkgname-$pkgver.tar.gz::https://github.com/signal11/$pkgname/archive/$pkgname-${_relver}.tar.gz" +builddir="$srcdir/$pkgname-$pkgname-$_relver" + +prepare() { + default_prepare + cd "$builddir" + ./bootstrap +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + + mkdir -p "$pkgdir"/usr/share/licenses/$pkgname + mv "$pkgdir"/usr/share/doc/$pkgname/LICENSE* \ + "$pkgdir"/usr/share/licenses/$pkgname +} + +sha512sums="4529d74e715c47d788b533d94bf0ef35fa773240c9a59558d30c5ecc78cf46961de368f9385f5d84d378eaf8d4e941d553341e839674e562ccfcf52726620a65 hidapi-0.8.0_rc1.tar.gz" diff --git a/scripts/version.sh b/scripts/version.sh index 3129f08f3..08562a6fe 100644 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -6,5 +6,6 @@ alpine_version=3.6 ocaml_version=4.06.1 leveldb_version=1.18 +hidapi_version=0.8.0_rc1 opam_version=2.0.0~rc opam_tag=2.0.0-rc