Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.2

This commit is contained in:
Stephan Raue 2013-06-24 16:28:16 +02:00
commit 948b01fb87
5 changed files with 485 additions and 24 deletions

View File

@ -49,7 +49,7 @@ SED="sed -i"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS=""
PKG_PRIORITY="optional"
PKG_SECTION="misc"
PKG_SECTION=""
PKG_SHORTDESC="$1 (autogenerated)"
PKG_LONGDESC=""
PKG_IS_ADDON="no"
@ -64,7 +64,9 @@ SED="sed -i"
fi
[ -r $PKG_DIR/meta ] && . $PKG_DIR/meta
[ "$PKG_IS_ADDON" = "yes" ] && PKG_ADDON_ID="`echo $PKG_SECTION | sed 's,/,.,g'`.$PKG_NAME"
if [ "$PKG_IS_ADDON" = "yes" ] ; then
[ -z $PKG_SECTION ] && PKG_ADDON_ID="$PKG_NAME" || PKG_ADDON_ID="`echo $PKG_SECTION | sed 's,/,.,g'`.$PKG_NAME"
fi
[ -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION}`
[ -d $BUILD/${PKG_NAME}${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}${PKG_VERSION}`

View File

@ -0,0 +1,26 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
#
# This Program 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, or (at your option)
# any later version.
#
# This Program 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.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
cp -R $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="service.openelec.settings"
PKG_VERSION="0.1.22"
PKG_VERSION="0.1.23"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="prop."
@ -28,10 +28,10 @@ PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.zip"
PKG_DEPENDS="connman hd-idle"
PKG_BUILD_DEPENDS="toolchain python"
PKG_PRIORITY="optional"
PKG_SECTION="mediacenter"
PKG_SECTION=""
PKG_SHORTDESC="service.openelec.settings: Settings dialog for OpenELEC"
PKG_LONGDESC="service.openelec.settings: is a settings dialog for OpenELEC"
PKG_IS_ADDON="no"
PKG_IS_ADDON="yes"
PKG_AUTORECONF="no"

View File

@ -1,19 +1,433 @@
diff -Naur xf86-video-fglrx-legacy-12.6/common/lib/modules/fglrx/build_mod/fglrxko_pci_ids.h xf86-video-fglrx-legacy-12.6.patch/common/lib/modules/fglrx/build_mod/fglrxko_pci_ids.h
--- xf86-video-fglrx-legacy-12.6/common/lib/modules/fglrx/build_mod/fglrxko_pci_ids.h 2012-07-18 17:58:01.000000000 +0200
+++ xf86-video-fglrx-legacy-12.6.patch/common/lib/modules/fglrx/build_mod/fglrxko_pci_ids.h 2013-06-06 23:56:41.440839811 +0200
@@ -89,7 +89,6 @@
FGL_ASIC_ID(0x677B),
FGL_ASIC_ID(0x6772),
FGL_ASIC_ID(0x6779),
@@ -12,325 +12,138 @@
* year of creation of the work.
*/
- FGL_ASIC_ID(0x9640),
- FGL_ASIC_ID(0x9641),
- FGL_ASIC_ID(0x9642),
- FGL_ASIC_ID(0x9643),
- FGL_ASIC_ID(0x9644),
- FGL_ASIC_ID(0x9645),
- FGL_ASIC_ID(0x9647),
- FGL_ASIC_ID(0x9648),
- FGL_ASIC_ID(0x9649),
- FGL_ASIC_ID(0x964A),
- FGL_ASIC_ID(0x964B),
- FGL_ASIC_ID(0x964C),
- FGL_ASIC_ID(0x964E),
- FGL_ASIC_ID(0x964F),
- FGL_ASIC_ID(0x9903),
- FGL_ASIC_ID(0x9904),
- FGL_ASIC_ID(0x990F),
- FGL_ASIC_ID(0x9905),
- FGL_ASIC_ID(0x9906),
- FGL_ASIC_ID(0x9907),
- FGL_ASIC_ID(0x9908),
- FGL_ASIC_ID(0x9909),
- FGL_ASIC_ID(0x9992),
- FGL_ASIC_ID(0x9993),
- FGL_ASIC_ID(0x9994),
- FGL_ASIC_ID(0x990A),
- FGL_ASIC_ID(0x9900),
- FGL_ASIC_ID(0x9901),
- FGL_ASIC_ID(0x9990),
- FGL_ASIC_ID(0x9991),
- FGL_ASIC_ID(0x9803),
- FGL_ASIC_ID(0x9804),
- FGL_ASIC_ID(0x9805),
- FGL_ASIC_ID(0x9802),
- FGL_ASIC_ID(0x9808),
- FGL_ASIC_ID(0x9809),
- FGL_ASIC_ID(0x9806),
- FGL_ASIC_ID(0x9807),
- FGL_ASIC_ID(0x9610),
- FGL_ASIC_ID(0x9611),
- FGL_ASIC_ID(0x9612),
- FGL_ASIC_ID(0x9613),
- FGL_ASIC_ID(0x9614),
- FGL_ASIC_ID(0x9615),
- FGL_ASIC_ID(0x9616),
- FGL_ASIC_ID(0x9710),
- FGL_ASIC_ID(0x9711),
- FGL_ASIC_ID(0x9712),
- FGL_ASIC_ID(0x9713),
- FGL_ASIC_ID(0x9714),
- FGL_ASIC_ID(0x9715),
- FGL_ASIC_ID(0x68F8),
- FGL_ASIC_ID(0x68F9),
- FGL_ASIC_ID(0x68FE),
- FGL_ASIC_ID(0x68FA),
- FGL_ASIC_ID(0x689B),
- FGL_ASIC_ID(0x689E),
- FGL_ASIC_ID(0x6898),
- FGL_ASIC_ID(0x6899),
- FGL_ASIC_ID(0x689C),
- FGL_ASIC_ID(0x689D),
- FGL_ASIC_ID(0x68B8),
- FGL_ASIC_ID(0x68B9),
- FGL_ASIC_ID(0x68BE),
- FGL_ASIC_ID(0x68BA),
- FGL_ASIC_ID(0x68BF),
- FGL_ASIC_ID(0x68DA),
- FGL_ASIC_ID(0x68D8),
- FGL_ASIC_ID(0x68D9),
- FGL_ASIC_ID(0x68DE),
- FGL_ASIC_ID(0x6738),
- FGL_ASIC_ID(0x6739),
- FGL_ASIC_ID(0x673E),
- FGL_ASIC_ID(0x6778),
- FGL_ASIC_ID(0x677B),
- FGL_ASIC_ID(0x6772),
- FGL_ASIC_ID(0x6779),
- FGL_ASIC_ID(0x6770),
FGL_ASIC_ID(0x671F),
FGL_ASIC_ID(0x6718),
FGL_ASIC_ID(0x6719),
@@ -193,7 +192,6 @@
FGL_ASIC_ID(0x68D1),
FGL_ASIC_ID(0x68C7),
FGL_ASIC_ID(0x68E0),
- FGL_ASIC_ID(0x671F),
- FGL_ASIC_ID(0x6718),
- FGL_ASIC_ID(0x6719),
- FGL_ASIC_ID(0x671C),
- FGL_ASIC_ID(0x671D),
- FGL_ASIC_ID(0x675F),
- FGL_ASIC_ID(0x6751),
- FGL_ASIC_ID(0x675B),
- FGL_ASIC_ID(0x675D),
- FGL_ASIC_ID(0x6758),
- FGL_ASIC_ID(0x6759),
- FGL_ASIC_ID(0x6750),
+ /* Those are all PC IDs that are not existing in the non legacy fglrx */
FGL_ASIC_ID(0x9400),
FGL_ASIC_ID(0x9401),
FGL_ASIC_ID(0x9402),
FGL_ASIC_ID(0x9403),
FGL_ASIC_ID(0x9405),
- FGL_ASIC_ID(0x950F),
- FGL_ASIC_ID(0x9513),
- FGL_ASIC_ID(0x9451),
+ FGL_ASIC_ID(0x940A),
+ FGL_ASIC_ID(0x940B),
+ FGL_ASIC_ID(0x940F),
+ FGL_ASIC_ID(0x9440),
FGL_ASIC_ID(0x9441),
+ FGL_ASIC_ID(0x9442),
FGL_ASIC_ID(0x9443),
+ FGL_ASIC_ID(0x9444),
+ FGL_ASIC_ID(0x9446),
+ FGL_ASIC_ID(0x9447),
+ FGL_ASIC_ID(0x944A),
+ FGL_ASIC_ID(0x944B),
+ FGL_ASIC_ID(0x944C),
+ FGL_ASIC_ID(0x944E),
+ FGL_ASIC_ID(0x944F),
+ FGL_ASIC_ID(0x9450),
+ FGL_ASIC_ID(0x9451),
+ FGL_ASIC_ID(0x9452),
+ FGL_ASIC_ID(0x9456),
+ FGL_ASIC_ID(0x945A),
+ FGL_ASIC_ID(0x945B),
+ FGL_ASIC_ID(0x945E),
+ FGL_ASIC_ID(0x9460),
+ FGL_ASIC_ID(0x9462),
+ FGL_ASIC_ID(0x946A),
+ FGL_ASIC_ID(0x946B),
+ FGL_ASIC_ID(0x947A),
+ FGL_ASIC_ID(0x947B),
+ FGL_ASIC_ID(0x9480),
+ FGL_ASIC_ID(0x9487),
+ FGL_ASIC_ID(0x9488),
+ FGL_ASIC_ID(0x9489),
+ FGL_ASIC_ID(0x948A),
+ FGL_ASIC_ID(0x948F),
+ FGL_ASIC_ID(0x9490),
+ FGL_ASIC_ID(0x9491),
+ FGL_ASIC_ID(0x9495),
+ FGL_ASIC_ID(0x9498),
+ FGL_ASIC_ID(0x949C),
+ FGL_ASIC_ID(0x949E),
+ FGL_ASIC_ID(0x949F),
+ FGL_ASIC_ID(0x94A0),
+ FGL_ASIC_ID(0x94A1),
+ FGL_ASIC_ID(0x94A3),
+ FGL_ASIC_ID(0x94B1),
+ FGL_ASIC_ID(0x94B3),
+ FGL_ASIC_ID(0x94B4),
+ FGL_ASIC_ID(0x94B5),
FGL_ASIC_ID(0x94C0),
- FGL_ASIC_ID(0x94C7),
- FGL_ASIC_ID(0x94C4),
- FGL_ASIC_ID(0x94C5),
FGL_ASIC_ID(0x94C1),
FGL_ASIC_ID(0x94C3),
- FGL_ASIC_ID(0x94CC),
+ FGL_ASIC_ID(0x94C4),
+ FGL_ASIC_ID(0x94C5),
FGL_ASIC_ID(0x94C6),
- FGL_ASIC_ID(0x95C0),
- FGL_ASIC_ID(0x95C5),
- FGL_ASIC_ID(0x95C7),
- FGL_ASIC_ID(0x95C9),
- FGL_ASIC_ID(0x95C6),
- FGL_ASIC_ID(0x958E),
- FGL_ASIC_ID(0x958A),
- FGL_ASIC_ID(0x9586),
- FGL_ASIC_ID(0x9587),
- FGL_ASIC_ID(0x9580),
- FGL_ASIC_ID(0x9588),
- FGL_ASIC_ID(0x9589),
- FGL_ASIC_ID(0x9590),
- FGL_ASIC_ID(0x9598),
- FGL_ASIC_ID(0x9599),
- FGL_ASIC_ID(0x9596),
- FGL_ASIC_ID(0x9597),
+ FGL_ASIC_ID(0x94C7),
+ FGL_ASIC_ID(0x94C8),
+ FGL_ASIC_ID(0x94C9),
+ FGL_ASIC_ID(0x94CB),
+ FGL_ASIC_ID(0x94CC),
FGL_ASIC_ID(0x9500),
- FGL_ASIC_ID(0x9515),
- FGL_ASIC_ID(0x9505),
FGL_ASIC_ID(0x9501),
+ FGL_ASIC_ID(0x9504),
+ FGL_ASIC_ID(0x9505),
+ FGL_ASIC_ID(0x9506),
FGL_ASIC_ID(0x9507),
- FGL_ASIC_ID(0x9519),
+ FGL_ASIC_ID(0x9508),
+ FGL_ASIC_ID(0x9509),
+ FGL_ASIC_ID(0x950F),
+ FGL_ASIC_ID(0x9511),
+ FGL_ASIC_ID(0x9513),
+ FGL_ASIC_ID(0x9515),
FGL_ASIC_ID(0x9517),
+ FGL_ASIC_ID(0x9519),
FGL_ASIC_ID(0x9540),
FGL_ASIC_ID(0x9541),
FGL_ASIC_ID(0x9542),
FGL_ASIC_ID(0x954E),
FGL_ASIC_ID(0x954F),
- FGL_ASIC_ID(0x9487),
- FGL_ASIC_ID(0x948F),
- FGL_ASIC_ID(0x9498),
- FGL_ASIC_ID(0x9490),
- FGL_ASIC_ID(0x9495),
- FGL_ASIC_ID(0x94B5),
- FGL_ASIC_ID(0x94B3),
- FGL_ASIC_ID(0x94B1),
- FGL_ASIC_ID(0x94B4),
- FGL_ASIC_ID(0x944C),
- FGL_ASIC_ID(0x9450),
- FGL_ASIC_ID(0x9452),
- FGL_ASIC_ID(0x9442),
- FGL_ASIC_ID(0x9440),
- FGL_ASIC_ID(0x944E),
- FGL_ASIC_ID(0x9460),
- FGL_ASIC_ID(0x9462),
- FGL_ASIC_ID(0x6838),
- FGL_ASIC_ID(0x6839),
- FGL_ASIC_ID(0x683B),
- FGL_ASIC_ID(0x683D),
- FGL_ASIC_ID(0x683F),
- FGL_ASIC_ID(0x6858),
- FGL_ASIC_ID(0x6859),
- FGL_ASIC_ID(0x6849),
- FGL_ASIC_ID(0x6850),
- FGL_ASIC_ID(0x6818),
- FGL_ASIC_ID(0x6819),
- FGL_ASIC_ID(0x6798),
- FGL_ASIC_ID(0x679A),
- FGL_ASIC_ID(0x6799),
- FGL_ASIC_ID(0x679E),
- FGL_ASIC_ID(0x68A0),
- FGL_ASIC_ID(0x68B0),
- FGL_ASIC_ID(0x68B1),
- FGL_ASIC_ID(0x68A1),
- FGL_ASIC_ID(0x68A8),
- FGL_ASIC_ID(0x6890),
- FGL_ASIC_ID(0x68C0),
- FGL_ASIC_ID(0x68C1),
- FGL_ASIC_ID(0x68D0),
- FGL_ASIC_ID(0x68D1),
- FGL_ASIC_ID(0x68C7),
- FGL_ASIC_ID(0x68E0),
- FGL_ASIC_ID(0x68E1),
FGL_ASIC_ID(0x68F0),
FGL_ASIC_ID(0x68F1),
FGL_ASIC_ID(0x68E4),
- FGL_ASIC_ID(0x68F0),
- FGL_ASIC_ID(0x68F1),
- FGL_ASIC_ID(0x68E4),
- FGL_ASIC_ID(0x68E5),
- FGL_ASIC_ID(0x94CB),
- FGL_ASIC_ID(0x94C9),
- FGL_ASIC_ID(0x94C8),
+ FGL_ASIC_ID(0x9552),
+ FGL_ASIC_ID(0x9553),
+ FGL_ASIC_ID(0x9555),
+ FGL_ASIC_ID(0x9557),
+ FGL_ASIC_ID(0x955F),
+ FGL_ASIC_ID(0x9580),
FGL_ASIC_ID(0x9581),
FGL_ASIC_ID(0x9583),
+ FGL_ASIC_ID(0x9586),
+ FGL_ASIC_ID(0x9587),
+ FGL_ASIC_ID(0x9588),
+ FGL_ASIC_ID(0x9589),
+ FGL_ASIC_ID(0x958A),
FGL_ASIC_ID(0x958B),
- FGL_ASIC_ID(0x95C4),
- FGL_ASIC_ID(0x95C2),
+ FGL_ASIC_ID(0x958C),
+ FGL_ASIC_ID(0x958D),
+ FGL_ASIC_ID(0x958E),
+ FGL_ASIC_ID(0x958F),
+ FGL_ASIC_ID(0x9590),
FGL_ASIC_ID(0x9591),
FGL_ASIC_ID(0x9593),
- FGL_ASIC_ID(0x9506),
- FGL_ASIC_ID(0x9508),
- FGL_ASIC_ID(0x9504),
- FGL_ASIC_ID(0x9509),
- FGL_ASIC_ID(0x9553),
- FGL_ASIC_ID(0x9552),
- FGL_ASIC_ID(0x955F),
- FGL_ASIC_ID(0x9555),
- FGL_ASIC_ID(0x9491),
- FGL_ASIC_ID(0x9480),
- FGL_ASIC_ID(0x9488),
- FGL_ASIC_ID(0x948A),
- FGL_ASIC_ID(0x94A0),
- FGL_ASIC_ID(0x94A1),
- FGL_ASIC_ID(0x945A),
- FGL_ASIC_ID(0x945B),
- FGL_ASIC_ID(0x945E),
- FGL_ASIC_ID(0x944A),
- FGL_ASIC_ID(0x944B),
- FGL_ASIC_ID(0x6720),
- FGL_ASIC_ID(0x6721),
- FGL_ASIC_ID(0x6724),
- FGL_ASIC_ID(0x6725),
- FGL_ASIC_ID(0x6764),
- FGL_ASIC_ID(0x6765),
- FGL_ASIC_ID(0x6763),
- FGL_ASIC_ID(0x6761),
- FGL_ASIC_ID(0x6760),
- FGL_ASIC_ID(0x6744),
- FGL_ASIC_ID(0x6745),
- FGL_ASIC_ID(0x6742),
- FGL_ASIC_ID(0x6743),
- FGL_ASIC_ID(0x6741),
- FGL_ASIC_ID(0x6740),
- FGL_ASIC_ID(0x6820),
- FGL_ASIC_ID(0x6821),
- FGL_ASIC_ID(0x6824),
- FGL_ASIC_ID(0x6825),
- FGL_ASIC_ID(0x6830),
- FGL_ASIC_ID(0x6827),
- FGL_ASIC_ID(0x682D),
- FGL_ASIC_ID(0x682F),
- FGL_ASIC_ID(0x6831),
- FGL_ASIC_ID(0x6823),
- FGL_ASIC_ID(0x6826),
- FGL_ASIC_ID(0x6843),
- FGL_ASIC_ID(0x6840),
- FGL_ASIC_ID(0x6841),
- FGL_ASIC_ID(0x6842),
- FGL_ASIC_ID(0x6800),
- FGL_ASIC_ID(0x6801),
- FGL_ASIC_ID(0x68F1),
- FGL_ASIC_ID(0x68E8),
- FGL_ASIC_ID(0x68E9),
- FGL_ASIC_ID(0x6888),
- FGL_ASIC_ID(0x6889),
- FGL_ASIC_ID(0x688A),
- FGL_ASIC_ID(0x688D),
- FGL_ASIC_ID(0x688C),
- FGL_ASIC_ID(0x68A9),
- FGL_ASIC_ID(0x6880),
- FGL_ASIC_ID(0x68C8),
- FGL_ASIC_ID(0x68C9),
- FGL_ASIC_ID(0x958F),
FGL_ASIC_ID(0x9595),
+ FGL_ASIC_ID(0x9596),
+ FGL_ASIC_ID(0x9597),
+ FGL_ASIC_ID(0x9598),
+ FGL_ASIC_ID(0x9599),
FGL_ASIC_ID(0x959B),
- FGL_ASIC_ID(0x9557),
- FGL_ASIC_ID(0x9489),
- FGL_ASIC_ID(0x94A3),
- FGL_ASIC_ID(0x947A),
- FGL_ASIC_ID(0x947B),
- FGL_ASIC_ID(0x946A),
- FGL_ASIC_ID(0x946B),
- FGL_ASIC_ID(0x6728),
- FGL_ASIC_ID(0x6729),
- FGL_ASIC_ID(0x6722),
- FGL_ASIC_ID(0x6723),
- FGL_ASIC_ID(0x6726),
- FGL_ASIC_ID(0x6727),
- FGL_ASIC_ID(0x6766),
- FGL_ASIC_ID(0x6767),
- FGL_ASIC_ID(0x6768),
- FGL_ASIC_ID(0x6762),
- FGL_ASIC_ID(0x6700),
- FGL_ASIC_ID(0x6701),
- FGL_ASIC_ID(0x6702),
- FGL_ASIC_ID(0x6703),
- FGL_ASIC_ID(0x6704),
- FGL_ASIC_ID(0x6705),
- FGL_ASIC_ID(0x6706),
- FGL_ASIC_ID(0x6707),
- FGL_ASIC_ID(0x6708),
- FGL_ASIC_ID(0x6709),
- FGL_ASIC_ID(0x674A),
- FGL_ASIC_ID(0x6746),
- FGL_ASIC_ID(0x6747),
- FGL_ASIC_ID(0x6748),
- FGL_ASIC_ID(0x6749),
- FGL_ASIC_ID(0x940F),
- FGL_ASIC_ID(0x940B),
- FGL_ASIC_ID(0x940A),
- FGL_ASIC_ID(0x944F),
- FGL_ASIC_ID(0x9447),
+ FGL_ASIC_ID(0x95C0),
+ FGL_ASIC_ID(0x95C2),
+ FGL_ASIC_ID(0x95C4),
+ FGL_ASIC_ID(0x95C5),
+ FGL_ASIC_ID(0x95C6),
+ FGL_ASIC_ID(0x95C7),
+ FGL_ASIC_ID(0x95C9),
FGL_ASIC_ID(0x95CC),
- FGL_ASIC_ID(0x958C),
- FGL_ASIC_ID(0x958D),
- FGL_ASIC_ID(0x9511),
- FGL_ASIC_ID(0x949C),
- FGL_ASIC_ID(0x949F),
- FGL_ASIC_ID(0x949E),
- FGL_ASIC_ID(0x9444),
- FGL_ASIC_ID(0x9456),
- FGL_ASIC_ID(0x9446),
- FGL_ASIC_ID(0x6828),
- FGL_ASIC_ID(0x6808),
- FGL_ASIC_ID(0x684C),
- FGL_ASIC_ID(0x6809),
- FGL_ASIC_ID(0x6780),
- FGL_ASIC_ID(0x6784),
- FGL_ASIC_ID(0x6788),
- FGL_ASIC_ID(0x678A),
- FGL_ASIC_ID(0x68F2),
FGL_ASIC_ID(0x95CD),
FGL_ASIC_ID(0x95CE),
FGL_ASIC_ID(0x95CF),
-
+ FGL_ASIC_ID(0x9610),
+ FGL_ASIC_ID(0x9611),
+ FGL_ASIC_ID(0x9612),
+ FGL_ASIC_ID(0x9613),
+ FGL_ASIC_ID(0x9614),
+ FGL_ASIC_ID(0x9615),
+ FGL_ASIC_ID(0x9616),
+ FGL_ASIC_ID(0x9710),
+ FGL_ASIC_ID(0x9711),
+ FGL_ASIC_ID(0x9712),
+ FGL_ASIC_ID(0x9713),
+ FGL_ASIC_ID(0x9714),
+ FGL_ASIC_ID(0x9715),

View File

@ -55,9 +55,10 @@ if [ -f $PKG_DIR/addon ]; then
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
if [ ! -f $ADDON_BUILD/$PKG_ADDON_ID/addon.xml ]; then
cp config/addon/addon.xml $ADDON_BUILD/$PKG_ADDON_ID
CUST_ADDON_VERSION="$ADDON_VERSION.$PKG_REV"
$SED -e "s|@PKG_ADDON_ID@|$PKG_ADDON_ID|g" \
-e "s|@PKG_NAME@|$PKG_NAME|g" \
-e "s|@ADDON_VERSION@|$ADDON_VERSION.$PKG_REV|g" \
-e "s|@ADDON_VERSION@|$CUST_ADDON_VERSION|g" \
-e "s|@PKG_ADDON_TYPE@|$PKG_ADDON_TYPE|g" \
-e "s|@REQUIRES@|$REQUIRES|g" \
-e "s|@PKG_SHORTDESC@|$PKG_SHORTDESC|g" \
@ -65,6 +66,8 @@ if [ -f $PKG_DIR/addon ]; then
-e "s|@PKG_LONGDESC@|$PKG_LONGDESC|g" \
-e "s|@PKG_DISCLAIMER@|$PKG_DISCLAIMER|g" \
-i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml
else
CUST_ADDON_VERSION="$PKG_VERSION"
fi
if [ -f $PKG_DIR/source/default.py ]; then
@ -75,12 +78,18 @@ if [ -f $PKG_DIR/addon ]; then
if [ -f $PKG_DIR/icon/icon.png ]; then
cp $PKG_DIR/icon/icon.png $ADDON_BUILD/$PKG_ADDON_ID
elif [ -f $PKG_BUILD/icon/icon.png ]; then
cp $PKG_BUILD/icon/icon.png $ADDON_BUILD/$PKG_ADDON_ID
elif [ -f $PKG_BUILD/icon.png ]; then
cp $PKG_BUILD/icon.png $ADDON_BUILD/$PKG_ADDON_ID
else
echo "*** WARNING: It's recommended to have a $PKG_DIR/icon/icon.png file ***"
fi
if [ -f $PKG_DIR/changelog.txt ]; then
cp $PKG_DIR/changelog.txt $ADDON_BUILD/$PKG_ADDON_ID
elif [ -f $PKG_BUILD/changelog.txt ]; then
cp $PKG_BUILD/changelog.txt $ADDON_BUILD/$PKG_ADDON_ID
else
echo "*** WARNING: It's recommended to have a $PKG_DIR/changelog.txt file ***"
fi
@ -91,11 +100,21 @@ if [ -f $PKG_DIR/addon ]; then
cd $ADDON_BUILD
echo "*** compressing Addon $PKG_ADDON_ID ... ***"
zip -rq $PKG_ADDON_ID-$ADDON_VERSION.$PKG_REV.zip $PKG_ADDON_ID;
zip -rq $PKG_ADDON_ID-$CUST_ADDON_VERSION.zip $PKG_ADDON_ID;
cd -
mkdir -p $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID
cp $ADDON_BUILD/$PKG_ADDON_ID-$ADDON_VERSION.$PKG_REV.zip $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID
cp $PKG_DIR/changelog.txt $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/changelog-$ADDON_VERSION.$PKG_REV.txt
cp $PKG_DIR/icon/icon.png $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/icon.png
cp $ADDON_BUILD/$PKG_ADDON_ID-$CUST_ADDON_VERSION.zip $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID
if [ -f $PKG_DIR/changelog.txt ]; then
cp $PKG_DIR/changelog.txt $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/changelog-$CUST_ADDON_VERSION.txt
elif [ -f $PKG_BUILD/changelog.txt ]; then
cp $PKG_BUILD/changelog.txt $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/changelog-$CUST_ADDON_VERSION.txt
fi
if [ -f $PKG_DIR/icon/icon.png ]; then
cp $PKG_DIR/icon/icon.png $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/icon.png
elif [ -f $PKG_BUILD/icon/icon.png ]; then
cp $PKG_BUILD/icon/icon.png $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/icon.png
elif [ -f $PKG_BUILD/icon.png ]; then
cp $PKG_BUILD/icon.png $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/icon.png
fi
fi