Merge pull request #4791 from OpenELEC/package-updates

Package updates and fixes
This commit is contained in:
Stephan Raue 2016-03-02 07:42:07 +01:00
commit 52b5fc5a4d
10 changed files with 78 additions and 9 deletions

View File

@ -6,5 +6,6 @@
"description": "@DESCRIPTION@", "description": "@DESCRIPTION@",
"username": "root", "username": "root",
"password": "@ROOT_PASSWORD@", "password": "@ROOT_PASSWORD@",
"supported_models": [@NOOBS_SUPPORTED_MODELS@],
"supported_hex_revisions": "@NOOBS_HEX@" "supported_hex_revisions": "@NOOBS_HEX@"
} }

View File

@ -38,15 +38,15 @@ if [ "$KODIPLAYER_DRIVER" = "bcm2835-driver" ]; then
fi fi
if [ "$KODIPLAYER_DRIVER" = "libfslvpuwrap" ]; then if [ "$KODIPLAYER_DRIVER" = "libfslvpuwrap" ]; then
EXTRA_CMAKE_OPTS="-DHAVE_IMX_API=1" EXTRA_CMAKE_OPTS="$EXTRA_CMAKE_OPTS -DHAVE_IMX_API=1"
else else
EXTRA_CMAKE_OPTS="-DHAVE_IMX_API=0" EXTRA_CMAKE_OPTS="$EXTRA_CMAKE_OPTS -DHAVE_IMX_API=0"
fi fi
if [ "$KODIPLAYER_DRIVER" = "libamcodec" ]; then if [ "$KODIPLAYER_DRIVER" = "libamcodec" ]; then
EXTRA_CMAKE_OPTS="-DHAVE_AMLOGIC_API=1" EXTRA_CMAKE_OPTS="$EXTRA_CMAKE_OPTS -DHAVE_AMLOGIC_API=1"
else else
EXTRA_CMAKE_OPTS="-DHAVE_AMLOGIC_API=0" EXTRA_CMAKE_OPTS="$EXTRA_CMAKE_OPTS -DHAVE_AMLOGIC_API=0"
fi fi
configure_target() { configure_target() {

View File

@ -0,0 +1,45 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
#
# OpenELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# OpenELEC is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################
PKG_NAME="brcmfmac_sdio-firmware-rpi"
PKG_VERSION="0.1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/OpenELEC/OpenELEC.tv"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS_TARGET="toolchain"
PKG_PRIORITY="optional"
PKG_SECTION="firmware"
PKG_SHORTDESC="brcmfmac_sdio-firmware: firmware for brcm bluetooth chips used on RaspberryPi devices"
PKG_LONGDESC="Firmware for Broadcom Bluetooth chips used on RaspberryPi devices, and brcm-patchram-plus that downloads a patchram files in the HCD format to the Bluetooth based silicon and combo chips and other utility functions."
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
make_target() {
: # nothing todo
}
makeinstall_target() {
DESTDIR=$INSTALL ./install
}
post_install() {
enable_service brcmfmac_sdio-firmware.service
}

View File

@ -0,0 +1,13 @@
[Unit]
Description=Broadcom sdio firmware update for BCM43430A1
ConditionPathExists=/dev/ttyAMA0
ConditionPathExists=/proc/device-tree/soc/gpio@7e200000/bt_pins
After=network.target
[Service]
Type=simple
RemainAfterExit=yes
ExecStart=/usr/bin/hciattach /dev/ttyAMA0 bcm43xx 921600 noflow -
[Install]
WantedBy=network.target

View File

@ -200,4 +200,7 @@ makeinstall_init() {
post_install() { post_install() {
mkdir -p $INSTALL/lib/firmware/ mkdir -p $INSTALL/lib/firmware/
ln -sf /storage/.config/firmware/ $INSTALL/lib/firmware/updates ln -sf /storage/.config/firmware/ $INSTALL/lib/firmware/updates
# bluez looks in /etc/firmware/
ln -sf /lib/firmware/ $INSTALL/etc/firmware
} }

View File

@ -17,7 +17,7 @@
################################################################################ ################################################################################
PKG_NAME="OpenELEC-settings" PKG_NAME="OpenELEC-settings"
PKG_VERSION="0.6.11" PKG_VERSION="0.6.12"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="prop." PKG_LICENSE="prop."

View File

@ -59,9 +59,12 @@
# default: default mainline kernel # default: default mainline kernel
LINUX="default" LINUX="default"
# NOOBS supported hex versions # NOOBS supported hex versions (legacy)
NOOBS_HEX="2,3,4,5,6,7,8,9,d,e,f,10,11,12,14,19" NOOBS_HEX="2,3,4,5,6,7,8,9,d,e,f,10,11,12,14,19"
# NOOBS supported model versions
NOOBS_SUPPORTED_MODELS="'Pi Model','Pi Zero'"
################################################################################ ################################################################################
# setup build defaults # setup build defaults
################################################################################ ################################################################################

View File

@ -59,8 +59,11 @@
# default: default mainline kernel # default: default mainline kernel
LINUX="default" LINUX="default"
# NOOBS supported hex versions # NOOBS supported hex versions (legacy)
NOOBS_HEX="1040,1041" NOOBS_HEX="1040,1041,2082"
# NOOBS supported model versions
NOOBS_SUPPORTED_MODELS="'Pi 2','Pi 3'"
################################################################################ ################################################################################
# setup build defaults # setup build defaults
@ -118,7 +121,7 @@
# additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware) # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
# Space separated list is supported, # Space separated list is supported,
# e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware" # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
FIRMWARE="misc-firmware wlan-firmware dvb-firmware" FIRMWARE="misc-firmware wlan-firmware dvb-firmware brcmfmac_sdio-firmware-rpi"
# build and install ATV IR remote support (yes / no) # build and install ATV IR remote support (yes / no)
ATVCLIENT_SUPPORT="no" ATVCLIENT_SUPPORT="no"

View File

@ -441,6 +441,7 @@ fi
-e "s%@KERNEL_VERSION@%$(kernel_version)%g" \ -e "s%@KERNEL_VERSION@%$(kernel_version)%g" \
-e "s%@DESCRIPTION@%$DESCRIPTION%g" \ -e "s%@DESCRIPTION@%$DESCRIPTION%g" \
-e "s%@ROOT_PASSWORD@%$ROOT_PASSWORD%g" \ -e "s%@ROOT_PASSWORD@%$ROOT_PASSWORD%g" \
-e "s%@NOOBS_SUPPORTED_MODELS@%$NOOBS_SUPPORTED_MODELS%g" \
-e "s%@NOOBS_HEX@%$NOOBS_HEX%g" \ -e "s%@NOOBS_HEX@%$NOOBS_HEX%g" \
-i $RELEASE_DIR/${DISTRONAME}_${PROJECT}/os.json -i $RELEASE_DIR/${DISTRONAME}_${PROJECT}/os.json