From 7b5a163e9a5cabf1b30ab5bac51f2a51195c4514 Mon Sep 17 00:00:00 2001 From: Simon John Date: Fri, 4 Apr 2014 21:54:26 +0100 Subject: [PATCH] simplified packaging by removing dependencies on python3/pyserial --- HISTORY.md | 1 + packaging/debian/README.md | 4 ++-- packaging/fedora/README.md | 2 +- packaging/fedora/arduino-mk.spec | 4 +++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 261d1e1..7c126da 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -18,6 +18,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it - Fix: Add BOOTLOADER_PARENT to `arduino-mk-vars.md` and fixed BOOTLOADER_PATH example. (https://github.com/sej7278) - Tweak: Replace perl reset script with Python script. (https://github.com/sej7278) - Tweak: Made choice of Python2/3 interpreter up to the OS. (https://github.com/peplin) +- Tweak: Simplified packaging dependencies. (https://github.com/sej7278) ### 1.3.1 (2014-02-04) - Fix: BUNDLED_AVR_TOOLS_DIR is now set properly when using only arduino-core and not the whole arduino package. (https://github.com/sej7278) diff --git a/packaging/debian/README.md b/packaging/debian/README.md index 6385780..44dcaa6 100644 --- a/packaging/debian/README.md +++ b/packaging/debian/README.md @@ -4,10 +4,10 @@ Use these instructions to build your own Deb package from your local sources. For the latest official packages go to [Debian](http://packages.debian.org/arduino-mk) or [Ubuntu](https://launchpad.net/ubuntu/+source/arduino-mk) or use apt. -First install the dependencies for building/running the package, as root: +First install the dependencies as root: apt-get build-dep arduino-mk - apt-get install arduino-core build-essential dpkg-dev fakeroot devscripts python-serial python3-serial + apt-get install arduino-core build-essential dpkg-dev fakeroot devscripts Fetch the Debian source: diff --git a/packaging/fedora/README.md b/packaging/fedora/README.md index 63117f9..86ec456 100644 --- a/packaging/fedora/README.md +++ b/packaging/fedora/README.md @@ -2,7 +2,7 @@ First install the dependencies as root: - yum install arduino-core rpm-build pyserial python3-pyserial + yum install arduino-core rpm-build From the top-level Arduino-Makefile directory you've checked out of github, run the following (as unprivileged user) to create a compressed tarball using the naming conventions required by rpmbuild: diff --git a/packaging/fedora/arduino-mk.spec b/packaging/fedora/arduino-mk.spec index 4958515..5fdbed7 100644 --- a/packaging/fedora/arduino-mk.spec +++ b/packaging/fedora/arduino-mk.spec @@ -10,7 +10,7 @@ License: LGPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: arduino-core pyserial -BuildRequires: arduino-core pyserial python3-pyserial +BuildRequires: arduino-core %description Arduino is an open-source electronics prototyping platform based on @@ -49,6 +49,8 @@ rm -rf %{buildroot} %{_docdir}/%{name}/examples %changelog +* Fri Apr 04 2014 Simon John +- Removed BuildRequires of python3/pyserial. * Wed Apr 02 2014 Simon John - Added BuildRequires of python3-pyserial. Need to look into Requires. * Mon Mar 24 2014 Simon John