From 4044a52f1d29377e54c77a0a42aad16bf808c652 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Wed, 18 Nov 2020 20:21:05 +0100 Subject: [PATCH] rpi-tools: drop legacy camera tools, allow building for ARM Signed-off-by: Matthias Reichl --- packages/addons/tools/rpi-tools/changelog.txt | 3 +++ packages/addons/tools/rpi-tools/package.mk | 17 ++++------------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/packages/addons/tools/rpi-tools/changelog.txt b/packages/addons/tools/rpi-tools/changelog.txt index 15de6d6d61..9b3c8fe1de 100644 --- a/packages/addons/tools/rpi-tools/changelog.txt +++ b/packages/addons/tools/rpi-tools/changelog.txt @@ -1,3 +1,6 @@ +108 +- Remove legacy camera tools + 107 - Update RPi.GPIO to 0.7.0 diff --git a/packages/addons/tools/rpi-tools/package.mk b/packages/addons/tools/rpi-tools/package.mk index fb5b99c627..e07e882cc7 100644 --- a/packages/addons/tools/rpi-tools/package.mk +++ b/packages/addons/tools/rpi-tools/package.mk @@ -3,37 +3,28 @@ PKG_NAME="rpi-tools" PKG_VERSION="1.0" -PKG_REV="107" +PKG_REV="108" PKG_ARCH="arm" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv" PKG_URL="" -PKG_DEPENDS_TARGET="toolchain RPi.GPIO picamera gpiozero colorzero lan951x-led-ctl" +PKG_DEPENDS_TARGET="toolchain RPi.GPIO gpiozero lan951x-led-ctl" PKG_SECTION="virtual" PKG_SHORTDESC="A bundle of tools and programs for use on the Raspberry Pi" -PKG_LONGDESC="This bundle currently includes RPi.GPIO, picamera, gpiozero lan951x-led-ctl" +PKG_LONGDESC="This bundle currently includes RPi.GPIO, gpiozero and lan951x-led-ctl" PKG_DISCAIMER="Raspberry Pi is a trademark of the Raspberry Pi Foundation http://www.raspberrypi.org" PKG_IS_ADDON="yes" PKG_ADDON_NAME="Raspberry Pi Tools" PKG_ADDON_TYPE="xbmc.python.module" -PKG_ADDON_PROJECTS="RPi" +PKG_ADDON_PROJECTS="RPi ARM" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib/RPi/ cp -PR $(get_build_dir RPi.GPIO)/build/lib.linux-*/RPi/* $ADDON_BUILD/$PKG_ADDON_ID/lib/RPi - cp -PR $(get_build_dir picamera)/picamera $ADDON_BUILD/$PKG_ADDON_ID/lib/ cp -PR $(get_build_dir gpiozero)/gpiozero $ADDON_BUILD/$PKG_ADDON_ID/lib/ - cp -PR $(get_build_dir colorzero)/colorzero $ADDON_BUILD/$PKG_ADDON_ID/lib/ - BCM2835_DIR="$(get_build_dir bcm2835-driver)" mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/ - cp -P $BCM2835_DIR/hardfp/opt/vc/bin/raspistill $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $BCM2835_DIR/hardfp/opt/vc/bin/raspiyuv $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $BCM2835_DIR/hardfp/opt/vc/bin/raspivid $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $BCM2835_DIR/hardfp/opt/vc/bin/raspividyuv $ADDON_BUILD/$PKG_ADDON_ID/bin - - # lan951x-led-ctl cp -P $(get_build_dir lan951x-led-ctl)/lan951x-led-ctl $ADDON_BUILD/$PKG_ADDON_ID/bin }