From d461a15b016cc1be8f052b65f472d763c45fa55c Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 7 Sep 2015 22:35:02 +0200 Subject: [PATCH] update Dockerfile to F22 --- udev/dist/Dockerfile | 28 +++++----------------------- udev/dist/release.sh | 3 +-- 2 files changed, 6 insertions(+), 25 deletions(-) diff --git a/udev/dist/Dockerfile b/udev/dist/Dockerfile index 51c4a7bfe..03c172b3b 100644 --- a/udev/dist/Dockerfile +++ b/udev/dist/Dockerfile @@ -1,35 +1,17 @@ # initialize from the image -FROM fedora:21 +FROM fedora:22 # update package repositories -RUN yum install -y deltarpm yum-plugin-fastestmirror -RUN yum update -y +RUN dnf update -y # install tools -RUN yum install -y cmake make wget -RUN yum install -y gcc gcc-c++ git make patchutils pkgconfig wget +RUN dnf install -y cmake make wget +RUN dnf install -y gcc gcc-c++ git make patchutils pkgconfig wget # install dependencies for Linux packaging -RUN yum install -y ruby-devel rubygems rpm-build +RUN dnf install -y ruby-devel rubygems rpm-build RUN gem install fpm --no-document - -# install dependencies for Linux build - -#RUN yum install -y glibc-devel glibc-static libgcc libstdc++-static zlib-devel -#RUN yum install -y boost-static libusbx-devel protobuf-static - -#RUN yum install -y glibc-devel.i686 glibc-static.i686 libgcc.i686 libstdc++-static.i686 zlib-devel.i686 -#RUN yum install -y boost-static.i686 libusbx-devel.i686 protobuf-static.i686 - -# protobuf-static does not install protobuf-devel, workaround - -#RUN yum install -y protobuf-devel - -# install used networking libraries - -#RUN yum install -y libcurl-devel libmicrohttpd-devel -#RUN yum install -y libcurl-devel.i686 libmicrohttpd-devel.i686 diff --git a/udev/dist/release.sh b/udev/dist/release.sh index ec0144b38..54fd3730d 100755 --- a/udev/dist/release.sh +++ b/udev/dist/release.sh @@ -6,7 +6,6 @@ cd $(dirname $0) VERSION="1" - install -D -m 0644 ./trezor.rules ./lib/udev/rules.d/52-trezor-extension.rules NAME=trezor-udev @@ -22,7 +21,7 @@ for TYPE in "deb" "rpm"; do -v $VERSION \ --license "LGPL-3.0" \ --vendor "SatoshiLabs" \ - --description "Udev rules for using Bitcoin Trezor on Linux" \ + --description "Udev rules for TREZOR" \ --maintainer "SatoshiLabs " \ --url "http://bitcointrezor.com/" \ --category "Productivity/Security" \