mirror of
https://github.com/LibreELEC/LibreELEC.tv
synced 2025-09-24 19:46:01 +07:00
Compare commits
359 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fd52ff9d08 | ||
|
|
ff687b3a06 | ||
|
|
4bbf6d1014 | ||
|
|
0b046eab86 | ||
|
|
f90472fb77 | ||
|
|
5377342718 | ||
|
|
a32fad3798 | ||
|
|
dccedfda07 | ||
|
|
74239e3027 | ||
|
|
5fb72aad8e | ||
|
|
42c4095dd8 | ||
|
|
5703f68b55 | ||
|
|
1c35a56e09 | ||
|
|
3abecdba4e | ||
|
|
85d63c456c | ||
|
|
0c2f2be1be | ||
|
|
978f075594 | ||
|
|
4779966a0b | ||
|
|
380874e25d | ||
|
|
6ba6413f36 | ||
|
|
a6d3963612 | ||
|
|
a06e99326f | ||
|
|
ab64766ae3 | ||
|
|
b50d88c0e4 | ||
|
|
d8f7fa4436 | ||
|
|
8ddba4bb59 | ||
|
|
86c9c6a247 | ||
|
|
5b81e398ef | ||
|
|
21a07a9916 | ||
|
|
4255bdb097 | ||
|
|
f2b6c64d7b | ||
|
|
43962c6ad8 | ||
|
|
a43572a1c8 | ||
|
|
928493f5c7 | ||
|
|
ad20131a7f | ||
|
|
4ea7a41f34 | ||
|
|
f03ad928a1 | ||
|
|
cba2a6afca | ||
|
|
33cbe49b72 | ||
|
|
8b5d773907 | ||
|
|
e20cd276a3 | ||
|
|
9f2144c0bf | ||
|
|
80a29987bb | ||
|
|
93640b7b2d | ||
|
|
3d8bd55620 | ||
|
|
b614c3c3fb | ||
|
|
eaf8130edb | ||
|
|
cf17e70fba | ||
|
|
2d5fdb1dea | ||
|
|
112ee117ec | ||
|
|
740f99ee3f | ||
|
|
160ba624a0 | ||
|
|
2996125367 | ||
|
|
4321dd3c85 | ||
|
|
547024253c | ||
|
|
5a5f5118be | ||
|
|
d2a87bf701 | ||
|
|
d2e52db7f9 | ||
|
|
15d7e8992f | ||
|
|
7dc54ed090 | ||
|
|
c67cdd49af | ||
|
|
5d00b37172 | ||
|
|
342921f171 | ||
|
|
bf3611a25d | ||
|
|
af985cdd7d | ||
|
|
a031de2ba1 | ||
|
|
13ac425381 | ||
|
|
a7094bf4ac | ||
|
|
6dee65a10a | ||
|
|
b228b28e9a | ||
|
|
6f7387a45f | ||
|
|
5dc342162a | ||
|
|
708b4f9e2f | ||
|
|
6c2e76d7c1 | ||
|
|
f769ae2642 | ||
|
|
296123b07c | ||
|
|
666f798123 | ||
|
|
2ef5492e90 | ||
|
|
4beff3ef6f | ||
|
|
3cd530914d | ||
|
|
3b493a0938 | ||
|
|
40cfd9986c | ||
|
|
61f17d8a6e | ||
|
|
4078cf05c7 | ||
|
|
c4ac5bccd3 | ||
|
|
fc71e3fef1 | ||
|
|
d9a65ad23f | ||
|
|
1853a14d93 | ||
|
|
785af56130 | ||
|
|
7f4b374d8b | ||
|
|
88fe4fb6a5 | ||
|
|
a1c59e1d9d | ||
|
|
c47a69f488 | ||
|
|
867882f5b6 | ||
|
|
664c907253 | ||
|
|
ab19e13cf6 | ||
|
|
52d1097cd0 | ||
|
|
8fd6d9f9d2 | ||
|
|
79d38dcf9f | ||
|
|
f043441788 | ||
|
|
afe74301c7 | ||
|
|
b965e71859 | ||
|
|
f58570de26 | ||
|
|
fa1adb3a60 | ||
|
|
d684c9420a | ||
|
|
7153f791b4 | ||
|
|
4dc0de73b1 | ||
|
|
9ff681c139 | ||
|
|
22a42a2927 | ||
|
|
9790e80d41 | ||
|
|
7756397876 | ||
|
|
0ef5e46416 | ||
|
|
080804cb0e | ||
|
|
29f1dc2555 | ||
|
|
a1ac9c51a5 | ||
|
|
3b3a2fcb94 | ||
|
|
4063daaef4 | ||
|
|
245b20e959 | ||
|
|
d3c504786d | ||
|
|
c4a3fb41cf | ||
|
|
8c5da501a9 | ||
|
|
1d3c298803 | ||
|
|
145937ebcc | ||
|
|
5038ab0d1f | ||
|
|
deec530914 | ||
|
|
3918637dd8 | ||
|
|
24ea5ab8a4 | ||
|
|
f71eb4e042 | ||
|
|
7975fa1d1e | ||
|
|
44f6afd2ec | ||
|
|
0b11523b09 | ||
|
|
6b4084ffa6 | ||
|
|
ec67d04f99 | ||
|
|
4bb042ee13 | ||
|
|
00c2004d1a | ||
|
|
e486a19f89 | ||
|
|
2b8b7cdee3 | ||
|
|
385b41cad1 | ||
|
|
0edc046f1b | ||
|
|
5c2342f64b | ||
|
|
77514cb8a3 | ||
|
|
549bc75e1c | ||
|
|
2d45ef07de | ||
|
|
866c635d44 | ||
|
|
671f55afef | ||
|
|
f4a58d4b14 | ||
|
|
25bf0a9381 | ||
|
|
cdb75b0e83 | ||
|
|
da58897544 | ||
|
|
b9ad07f793 | ||
|
|
45d9551fa2 | ||
|
|
41e7553762 | ||
|
|
59e057eed8 | ||
|
|
2e72cf036a | ||
|
|
c67ade7017 | ||
|
|
de7ddab5e6 | ||
|
|
6efdb1e75e | ||
|
|
91de6a70c0 | ||
|
|
265568da70 | ||
|
|
98bb6e8957 | ||
|
|
b86ee200ec | ||
|
|
bdaceee408 | ||
|
|
16573216de | ||
|
|
e83618d39c | ||
|
|
b03f058f73 | ||
|
|
e4cee7c88f | ||
|
|
4adbf4f08e | ||
|
|
ffbc33a64a | ||
|
|
62c2b52a0c | ||
|
|
3c0eaec162 | ||
|
|
022ca91a6e | ||
|
|
54c9505cb4 | ||
|
|
512c595e88 | ||
|
|
b00e8011f4 | ||
|
|
89ee8cc204 | ||
|
|
a2b61f7c1c | ||
|
|
0a80bf3131 | ||
|
|
2cddc473ee | ||
|
|
25c9b41d0b | ||
|
|
3f28eaef94 | ||
|
|
1dcb88e1c2 | ||
|
|
8b85b8345d | ||
|
|
428cddc4ea | ||
|
|
ecd049c42a | ||
|
|
0fad3c88e4 | ||
|
|
31552a2169 | ||
|
|
1b89dae25d | ||
|
|
5e57bf92bf | ||
|
|
50ecbe0b50 | ||
|
|
cd9c15bc2c | ||
|
|
2ec8b1bc94 | ||
|
|
998146fc2d | ||
|
|
9c02a8dd2b | ||
|
|
a29c5fba5e | ||
|
|
93267e3e28 | ||
|
|
cc0cae480a | ||
|
|
85721b2b0b | ||
|
|
e701d06a52 | ||
|
|
a847567948 | ||
|
|
beb7ba7faf | ||
|
|
694cb782dc | ||
|
|
e4408091ad | ||
|
|
f15e666c8b | ||
|
|
65880ff902 | ||
|
|
cb4c45ae66 | ||
|
|
5b78d785ea | ||
|
|
cda8078ad7 | ||
|
|
a2b7aefff6 | ||
|
|
4a6689da57 | ||
|
|
6c4eea25e3 | ||
|
|
29f6fbe958 | ||
|
|
e820574a12 | ||
|
|
aec1da246c | ||
|
|
56592bf95e | ||
|
|
42a5476386 | ||
|
|
043e532bb9 | ||
|
|
68d6051696 | ||
|
|
86df4d695a | ||
|
|
09b28bb171 | ||
|
|
2d6fa0cef8 | ||
|
|
9828485c47 | ||
|
|
ee81551b11 | ||
|
|
1d5b082907 | ||
|
|
fd13a921a6 | ||
|
|
c08f4a5fc6 | ||
|
|
ad5f45de0c | ||
|
|
54126994c3 | ||
|
|
a725f3e11d | ||
|
|
0a78159c94 | ||
|
|
30f1853321 | ||
|
|
0adfa62f70 | ||
|
|
fdab1262bf | ||
|
|
f9bfc5f916 | ||
|
|
2e770ba9f4 | ||
|
|
c7aa19e3ba | ||
|
|
de188e8cfd | ||
|
|
b0e1d29cac | ||
|
|
06df6fd2ac | ||
|
|
ea4e3d8240 | ||
|
|
10126efe5c | ||
|
|
f07e60233c | ||
|
|
1ff8736146 | ||
|
|
4c264fa0af | ||
|
|
c8113901e5 | ||
|
|
03e09eff66 | ||
|
|
ee7f996b38 | ||
|
|
cb33cc5e35 | ||
|
|
c5ba98fcd7 | ||
|
|
aac56ddf36 | ||
|
|
80f22e4c11 | ||
|
|
62716648d6 | ||
|
|
3920d4e15d | ||
|
|
69be6f1e71 | ||
|
|
bf6eae1e4b | ||
|
|
04a58d139b | ||
|
|
703b50e051 | ||
|
|
dad9226ad2 | ||
|
|
da3414e4dc | ||
|
|
4a7674e9a0 | ||
|
|
4c26ac03cd | ||
|
|
a4311e1310 | ||
|
|
af943fd39f | ||
|
|
f4480b7ed6 | ||
|
|
058c9ab61b | ||
|
|
9d438da095 | ||
|
|
20f47fe3ed | ||
|
|
400327862e | ||
|
|
b05b850443 | ||
|
|
822dff55c4 | ||
|
|
26ba8822bd | ||
|
|
c4eb30e2c3 | ||
|
|
8fdee1dfef | ||
|
|
261855b09e | ||
|
|
81010268c8 | ||
|
|
774f9d51f8 | ||
|
|
2980d9ad03 | ||
|
|
e87f98f1f8 | ||
|
|
c3cf0ef3b4 | ||
|
|
651372d503 | ||
|
|
afd05eed2c | ||
|
|
5b9bb12894 | ||
|
|
4f18d6c536 | ||
|
|
9b8715ec57 | ||
|
|
91785e09fb | ||
|
|
77cf33ca92 | ||
|
|
0eabe8d2ac | ||
|
|
c4d708cb69 | ||
|
|
d9b91c7a1e | ||
|
|
542ec5a67b | ||
|
|
9de0e6f614 | ||
|
|
f6ccd7a44b | ||
|
|
d2fb9ec8ea | ||
|
|
b59a02a51a | ||
|
|
839a03fdcd | ||
|
|
99380b68ae | ||
|
|
c158f374bd | ||
|
|
7b81850c50 | ||
|
|
c4309ed2c7 | ||
|
|
2b9fa76413 | ||
|
|
ce7acbd33e | ||
|
|
58f13d591c | ||
|
|
b9dc833ceb | ||
|
|
982f94d84e | ||
|
|
6727205fce | ||
|
|
ccbab20fbf | ||
|
|
959da55bdf | ||
|
|
a29909a816 | ||
|
|
4c2a944928 | ||
|
|
dee56e767f | ||
|
|
29a02d71e9 | ||
|
|
8f75ede7de | ||
|
|
b653fc80be | ||
|
|
af458da091 | ||
|
|
ff34f71f2c | ||
|
|
dfd2d26ba4 | ||
|
|
e78b94daa7 | ||
|
|
a0206ba829 | ||
|
|
e3a821a1df | ||
|
|
656142fad5 | ||
|
|
2e2705c1f9 | ||
|
|
ffb291cf48 | ||
|
|
ec2a339fce | ||
|
|
6e9e7869ff | ||
|
|
727e267a67 | ||
|
|
5a82523ae1 | ||
|
|
b62d98c82a | ||
|
|
77884ecbcb | ||
|
|
8fa76b050f | ||
|
|
f884e001af | ||
|
|
30b16a37fd | ||
|
|
2abad30bbc | ||
|
|
88e8443d9f | ||
|
|
d59526e9af | ||
|
|
345024e40a | ||
|
|
f7d216ae10 | ||
|
|
02b19de50e | ||
|
|
fa6cd55383 | ||
|
|
35c991c604 | ||
|
|
bee7e1edac | ||
|
|
e6af4972b5 | ||
|
|
87c0aee3f3 | ||
|
|
3e89fa35db | ||
|
|
550add0500 | ||
|
|
3af07bbf04 | ||
|
|
df1ee6ee19 | ||
|
|
dd56a8f658 | ||
|
|
f76cb9a6dd | ||
|
|
37dc490d20 | ||
|
|
a8e9261c81 | ||
|
|
c22581f948 | ||
|
|
01ade933db | ||
|
|
156e6d86d0 | ||
|
|
28430fe379 | ||
|
|
b58d4c2db7 | ||
|
|
7c9945c983 | ||
|
|
efbcdb6087 | ||
|
|
00ab9d1574 | ||
|
|
2ff789c071 | ||
|
|
9df93e241a |
@@ -40,14 +40,14 @@ get_graphicdrivers() {
|
||||
DRI_DRIVERS="$DRI_DRIVERS,i915"
|
||||
XORG_DRIVERS="$XORG_DRIVERS intel"
|
||||
COMPOSITE_SUPPORT="yes"
|
||||
LIBVA="$LIBVA libva-driver-intel"
|
||||
LIBVA="$LIBVA libva-intel-driver"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "i965" ]; then
|
||||
DRI_DRIVERS="$DRI_DRIVERS,i965"
|
||||
XORG_DRIVERS="$XORG_DRIVERS intel"
|
||||
COMPOSITE_SUPPORT="yes"
|
||||
LIBVA="$LIBVA libva-driver-intel"
|
||||
LIBVA="$LIBVA libva-intel-driver"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "nouveau" ]; then
|
||||
|
||||
@@ -3,9 +3,9 @@
|
||||
{
|
||||
"label": "System",
|
||||
"filesystem_type": "FAT",
|
||||
"partition_size_nominal": 128,
|
||||
"partition_size_nominal": 160,
|
||||
"want_maximised": false,
|
||||
"uncompressed_tarball_size": 110,
|
||||
"uncompressed_tarball_size": 120,
|
||||
"mkfs_options": ""
|
||||
},
|
||||
{
|
||||
|
||||
@@ -4,17 +4,17 @@ if [ "$OPTIMIZATIONS" = normal ];then
|
||||
fi
|
||||
|
||||
if [ "$OPTIMIZATIONS" = size ];then
|
||||
GCC_OPTIM="-Os -fexcess-precision=fast -ffast-math"
|
||||
GCC_OPTIM="-Os -fexcess-precision=fast"
|
||||
LD_OPTIM="-Wl,--as-needed"
|
||||
fi
|
||||
|
||||
if [ "$LTO_SUPPORT" = yes ];then
|
||||
GCC_OPTIM="$GCC_OPTIM -flto"
|
||||
LD_OPTIM="$LD_OPTIM -fuse-linker-plugin -flto"
|
||||
GCC_OPTIM_LTO="-flto -ffat-lto-objects"
|
||||
LD_OPTIM_LTO="-fuse-linker-plugin -flto"
|
||||
fi
|
||||
|
||||
if [ "$GOLD_SUPPORT" = yes ];then
|
||||
LD_OPTIM="$LD_OPTIM -fuse-ld=gold"
|
||||
LD_OPTIM_GOLD="-fuse-ld=gold"
|
||||
fi
|
||||
|
||||
if [ "$DEBUG" = yes ]; then
|
||||
@@ -28,9 +28,9 @@ else
|
||||
fi
|
||||
|
||||
TARGET_CPPFLAGS=
|
||||
TARGET_CFLAGS="$TARGET_CFLAGS -Wall -pipe $GCC_OPTIM $PROJECT_CFLAGS"
|
||||
TARGET_CFLAGS="$TARGET_CFLAGS -Wall -pipe $GCC_OPTIM $GCC_OPTIM_LTO $PROJECT_CFLAGS"
|
||||
TARGET_CXXFLAGS="$TARGET_CFLAGS"
|
||||
TARGET_LDFLAGS="$TARGET_LDFLAGS $LD_OPTIM $GCC_OPTIM"
|
||||
TARGET_LDFLAGS="$TARGET_LDFLAGS $LD_OPTIM $LD_OPTIM_GOLD $LD_OPTIM_LTO $GCC_OPTIM"
|
||||
TARGET_LIBDIR="$SYSROOT_PREFIX/lib $SYSROOT_PREFIX/usr/lib"
|
||||
TARGET_INCDIR="$SYSROOT_PREFIX/include $SYSROOT_PREFIX/usr/include"
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# VERSION: set full version, use "devel" for development version
|
||||
OPENELEC_VERSION="3.95.5"
|
||||
OPENELEC_VERSION="4.0.6"
|
||||
|
||||
# OS_VERSION: OS Version
|
||||
OS_VERSION="4.0"
|
||||
|
||||
@@ -129,6 +129,7 @@ VDR_ARG="$VDR_ARG -P $PVR_PLUGIN"
|
||||
|
||||
cd $ADDON_DIR/config
|
||||
mkdir -p $ADDON_CONFIG_DIR
|
||||
mkdir -p "$VDR_VIDEO_DIR"
|
||||
|
||||
for dir in `find . -type d`; do
|
||||
mkdir -p $ADDON_CONFIG_DIR/$dir
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="alsa-lib"
|
||||
PKG_VERSION="1.0.27.2"
|
||||
PKG_VERSION="1.0.28"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="alsa-utils"
|
||||
PKG_VERSION="1.0.27.2"
|
||||
PKG_VERSION="1.0.28"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@@ -37,101 +37,95 @@ if [ -f $HOME/.config/sound.conf ]; then
|
||||
|
||||
else
|
||||
|
||||
# get card num
|
||||
card=`echo $1 | sed 's/[^0-9]*//g'`
|
||||
|
||||
# set common mixer params
|
||||
mixer 0 Master 100%
|
||||
mixer 0 Front 100%
|
||||
mixer 0 PCM 100%
|
||||
mixer 0 Synth 100%
|
||||
mixer $card Master 100%
|
||||
mixer $card Front 100%
|
||||
mixer $card PCM 100%
|
||||
mixer $card Synth 100%
|
||||
|
||||
# mute CD, since using digital audio instead
|
||||
mixer 0 CD 0% mute
|
||||
mixer $card CD 0% mute
|
||||
|
||||
# Only unmute Line and Aux if they are possibly used.
|
||||
# mixer 0 Line 100%
|
||||
# mixer 0 Aux 100%
|
||||
# mixer $card Line 100%
|
||||
# mixer $card Aux 100%
|
||||
|
||||
# mute mic
|
||||
mixer 0 Mic 0% mute
|
||||
mixer $card Mic 0% mute
|
||||
|
||||
# ESS 1969 chipset has 2 PCM channels
|
||||
mixer 0 PCM,1 100%
|
||||
mixer $card PCM,1 100%
|
||||
|
||||
# Trident/YMFPCI/emu10k1
|
||||
mixer 0 Wave 100%
|
||||
mixer 0 Music 100%
|
||||
mixer 0 AC97 100%
|
||||
mixer 0 Surround 90%
|
||||
mixer 0 'Surround Digital' 90%
|
||||
mixer 0 'Wave Surround' 90%
|
||||
mixer 0 'Duplicate Front' 90%
|
||||
mixer 0 'Sigmatel 4-Speaker Stereo' 90%
|
||||
mixer $card Wave 100%
|
||||
mixer $card Music 100%
|
||||
mixer $card AC97 100%
|
||||
mixer $card Surround 90%
|
||||
mixer $card 'Surround Digital' 90%
|
||||
mixer $card 'Wave Surround' 90%
|
||||
mixer $card 'Duplicate Front' 90%
|
||||
mixer $card 'Sigmatel 4-Speaker Stereo' 90%
|
||||
|
||||
# CS4237B chipset:
|
||||
mixer 0 'Master Digital' 100%
|
||||
mixer $card 'Master Digital' 100%
|
||||
|
||||
# DRC
|
||||
mixer 0 'Dynamic Range Compression' 90%
|
||||
mixer $card 'Dynamic Range Compression' 90%
|
||||
|
||||
# Envy24 chips with analog outs
|
||||
mixer 0 DAC 100%
|
||||
mixer 0 DAC,0 100%
|
||||
mixer 0 DAC,1 100%
|
||||
mixer $card DAC 100%
|
||||
mixer $card DAC,0 100%
|
||||
mixer $card DAC,1 100%
|
||||
|
||||
# some notebooks use headphone instead of master
|
||||
mixer 0 Headphone 100%
|
||||
mixer 0 Speaker 100%
|
||||
mixer 0 'Internal Speaker' 0% mute
|
||||
mixer 0 Playback 100%
|
||||
mixer 1 Headphone 100%
|
||||
mixer 1 Speaker 100%
|
||||
|
||||
mixer 0 Center 100%
|
||||
mixer 0 LFE 100%
|
||||
mixer 0 Center/LFE 100%
|
||||
mixer $card Headphone 100%
|
||||
mixer $card Speaker 100%
|
||||
mixer $card 'Internal Speaker' 0% mute
|
||||
mixer $card Playback 100%
|
||||
mixer $card Headphone 100%
|
||||
mixer $card Speaker 100%
|
||||
mixer $card Center 100%
|
||||
mixer $card LFE 100%
|
||||
mixer $card Center/LFE 100%
|
||||
|
||||
# Intel P4P800-MX (Ubuntu bug #5813)
|
||||
mixer 0 'Master Playback Switch' on
|
||||
mixer $card 'Master Playback Switch' on
|
||||
|
||||
# set digital output mixer params
|
||||
mixer 0 'IEC958' 100% on
|
||||
mixer 0 'IEC958 Output' 100%
|
||||
mixer 0 'IEC958 Coaxial' 100%
|
||||
mixer 0 'IEC958 LiveDrive' 100%
|
||||
mixer 0 'IEC958 Optical Raw' 100%
|
||||
mixer 0 'SPDIF Out' 100%
|
||||
mixer 0 'SPDIF Front' 100%
|
||||
mixer 0 'SPDIF Rear' 100%
|
||||
mixer 0 'SPDIF Center/LFE' 100%
|
||||
mixer 0 'Master Digital' 100%
|
||||
mixer $card 'IEC958' 100% on
|
||||
mixer $card 'IEC958 Output' 100%
|
||||
mixer $card 'IEC958 Coaxial' 100%
|
||||
mixer $card 'IEC958 LiveDrive' 100%
|
||||
mixer $card 'IEC958 Optical Raw' 100%
|
||||
mixer $card 'SPDIF Out' 100%
|
||||
mixer $card 'SPDIF Front' 100%
|
||||
mixer $card 'SPDIF Rear' 100%
|
||||
mixer $card 'SPDIF Center/LFE' 100%
|
||||
mixer $card 'Master Digital' 100%
|
||||
|
||||
mixer 0 'Analog Front' 100%
|
||||
mixer 0 'Analog Rear' 100%
|
||||
mixer 0 'Analog Center/LFE' 100%
|
||||
mixer $card 'Analog Front' 100%
|
||||
mixer $card 'Analog Rear' 100%
|
||||
mixer $card 'Analog Center/LFE' 100%
|
||||
|
||||
# ASRock ION 330 (and perhaps others) has 2 IEC958 channels
|
||||
mixer 0 IEC958,0 on
|
||||
mixer 0 IEC958,1 on
|
||||
mixer $card IEC958,0 on
|
||||
mixer $card IEC958,1 on
|
||||
|
||||
# some ION2 has much more IEC958 channels ...
|
||||
mixer 0 IEC958,2 on
|
||||
mixer 0 IEC958,3 on
|
||||
|
||||
# ... or "simply" more soundchips
|
||||
mixer 1 IEC958,0 on
|
||||
mixer 1 IEC958,1 on
|
||||
mixer 1 IEC958,2 on
|
||||
mixer 1 IEC958,3 on
|
||||
mixer $card IEC958,2 on
|
||||
mixer $card IEC958,3 on
|
||||
|
||||
# ASRock ION 330 has Master Front set to 0
|
||||
mixer 0 'Master Front' 100%
|
||||
mixer $card 'Master Front' 100%
|
||||
|
||||
# Shuttle XS35GT needs this too
|
||||
mixer 0 'Master',0 100% on
|
||||
mixer $card 'Master',0 100% on
|
||||
|
||||
# and this for various Fusion devices like Zotac ZBOX
|
||||
mixer 1 'Master',0 100% on
|
||||
mixer 1 'Front',0 100% on
|
||||
|
||||
mixer $card 'Front',0 100% on
|
||||
fi
|
||||
|
||||
exit 0
|
||||
|
||||
@@ -17,4 +17,4 @@
|
||||
################################################################################
|
||||
|
||||
# When a sound device is detected, restore the volume settings
|
||||
KERNEL=="controlC[0-9]*", NAME="snd/%k", ACTION=="add", RUN+="soundconfig"
|
||||
KERNEL=="controlC[0-9]*", NAME="snd/%k", ACTION=="add", RUN+="soundconfig %k"
|
||||
|
||||
@@ -49,11 +49,6 @@ else
|
||||
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-sse"
|
||||
fi
|
||||
|
||||
pre_configure_target() {
|
||||
# flac-1.3.0 fails to build with LTO support
|
||||
strip_lto
|
||||
}
|
||||
|
||||
post_makeinstall_target() {
|
||||
rm -rf $INSTALL/usr/bin
|
||||
}
|
||||
|
||||
@@ -25,7 +25,6 @@ PKG_SITE="http://www.zlib.net"
|
||||
PKG_URL="http://www.zlib.net/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_DEPENDS_HOST=""
|
||||
PKG_DEPENDS_INIT="toolchain"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="compress"
|
||||
PKG_SHORTDESC="zlib: A general purpose (ZIP) data compression library"
|
||||
@@ -36,7 +35,6 @@ PKG_AUTORECONF="no"
|
||||
|
||||
TARGET_CONFIGURE_OPTS="--prefix=/usr"
|
||||
HOST_CONFIGURE_OPTS="--prefix=$ROOT/$TOOLCHAIN"
|
||||
INIT_CONFIGURE_OPTS="--prefix=/"
|
||||
|
||||
pre_build_target() {
|
||||
mkdir -p $PKG_BUILD/.$TARGET_NAME
|
||||
@@ -47,8 +45,3 @@ pre_build_host() {
|
||||
mkdir -p $PKG_BUILD/.$HOST_NAME
|
||||
cp -RP $PKG_BUILD/* $PKG_BUILD/.$HOST_NAME
|
||||
}
|
||||
|
||||
pre_build_init() {
|
||||
mkdir -p $PKG_BUILD/.$TARGET_NAME-init
|
||||
cp -RP $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME-init
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="sqlite"
|
||||
PKG_VERSION="autoconf-3080403"
|
||||
PKG_VERSION="autoconf-3080500"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="PublicDomain"
|
||||
|
||||
62
packages/devel/autoconf-2.64/package.mk
vendored
62
packages/devel/autoconf-2.64/package.mk
vendored
@@ -1,62 +0,0 @@
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# Copyright (C) 2009-2014 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="autoconf-2.64"
|
||||
PKG_VERSION="legacy"
|
||||
PKG_SOURCE_DIR="$PKG_NAME"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://sources.redhat.com/autoconf/"
|
||||
PKG_URL="http://ftp.gnu.org/gnu/autoconf/$PKG_NAME.tar.bz2"
|
||||
PKG_SOURCE_DIR="$PKG_NAME"
|
||||
PKG_DEPENDS_HOST="ccache:host m4:host"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="devel"
|
||||
PKG_SHORTDESC="autoconf: A GNU tool for automatically configuring source code"
|
||||
PKG_LONGDESC="Autoconf is an extensible package of m4 macros that produce shell scripts to automatically configure software source code packages. These scripts can adapt the packages to many kinds of UNIX-like systems without manual user intervention. Autoconf creates a configuration script for a package from a template file that lists the operating system features that the package can use, in the form of m4 macro calls."
|
||||
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="no"
|
||||
|
||||
PKG_CONFIGURE_OPTS_HOST="EMACS=no \
|
||||
ac_cv_path_M4=$ROOT/$TOOLCHAIN/bin/m4 \
|
||||
ac_cv_prog_gnu_m4_gnu=no \
|
||||
--target=$TARGET_NAME \
|
||||
--program-suffix=-2.64"
|
||||
|
||||
make_host() {
|
||||
: # nothing todo
|
||||
}
|
||||
|
||||
makeinstall_host() {
|
||||
make install \
|
||||
prefix=$ROOT/$TOOLCHAIN \
|
||||
pkgdatadir=$ROOT/$TOOLCHAIN/share/$PKG_NAME \
|
||||
pkgdatadir=$ROOT/$TOOLCHAIN/lib/$PKG_NAME \
|
||||
pkgdatadir=$ROOT/$TOOLCHAIN/include/$PKG_NAME \
|
||||
install
|
||||
|
||||
make clean
|
||||
make install \
|
||||
prefix=$SYSROOT_PREFIX/usr \
|
||||
pkgdatadir=$SYSROOT_PREFIX/usr/share/$PKG_NAME \
|
||||
pkgdatadir=$SYSROOT_PREFIX/usr/lib/$PKG_NAME \
|
||||
pkgdatadir=$SYSROOT_PREFIX/usr/include/$PKG_NAME \
|
||||
install
|
||||
}
|
||||
62
packages/devel/autoconf-2.68/package.mk
vendored
62
packages/devel/autoconf-2.68/package.mk
vendored
@@ -1,62 +0,0 @@
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# Copyright (C) 2009-2014 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="autoconf-2.68"
|
||||
PKG_VERSION="legacy"
|
||||
PKG_SOURCE_DIR="$PKG_NAME"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://sources.redhat.com/autoconf/"
|
||||
PKG_URL="http://ftp.gnu.org/gnu/autoconf/$PKG_NAME.tar.bz2"
|
||||
PKG_SOURCE_DIR="$PKG_NAME"
|
||||
PKG_DEPENDS_HOST="ccache:host m4:host"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="devel"
|
||||
PKG_SHORTDESC="autoconf: A GNU tool for automatically configuring source code"
|
||||
PKG_LONGDESC="Autoconf is an extensible package of m4 macros that produce shell scripts to automatically configure software source code packages. These scripts can adapt the packages to many kinds of UNIX-like systems without manual user intervention. Autoconf creates a configuration script for a package from a template file that lists the operating system features that the package can use, in the form of m4 macro calls."
|
||||
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="no"
|
||||
|
||||
PKG_CONFIGURE_OPTS_HOST="EMACS=no \
|
||||
ac_cv_path_M4=$ROOT/$TOOLCHAIN/bin/m4 \
|
||||
ac_cv_prog_gnu_m4_gnu=no \
|
||||
--target=$TARGET_NAME \
|
||||
--program-suffix=-2.68"
|
||||
|
||||
make_host() {
|
||||
: # nothing todo
|
||||
}
|
||||
|
||||
makeinstall_host() {
|
||||
make install \
|
||||
prefix=$ROOT/$TOOLCHAIN \
|
||||
pkgdatadir=$ROOT/$TOOLCHAIN/share/$PKG_NAME \
|
||||
pkgdatadir=$ROOT/$TOOLCHAIN/lib/$PKG_NAME \
|
||||
pkgdatadir=$ROOT/$TOOLCHAIN/include/$PKG_NAME \
|
||||
install
|
||||
|
||||
make clean
|
||||
make install \
|
||||
prefix=$SYSROOT_PREFIX/usr \
|
||||
pkgdatadir=$SYSROOT_PREFIX/usr/share/$PKG_NAME \
|
||||
pkgdatadir=$SYSROOT_PREFIX/usr/lib/$PKG_NAME \
|
||||
pkgdatadir=$SYSROOT_PREFIX/usr/include/$PKG_NAME \
|
||||
install
|
||||
}
|
||||
@@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="cloog"
|
||||
PKG_VERSION="0.18.0"
|
||||
PKG_VERSION="0.18.2"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="LGPL"
|
||||
|
||||
26
packages/devel/cloog/patches/cloog-buildfix.patch
Normal file
26
packages/devel/cloog/patches/cloog-buildfix.patch
Normal file
@@ -0,0 +1,26 @@
|
||||
diff -Naur cloog-0.18.2/Makefile.am cloog-0.18.2.patch/Makefile.am
|
||||
--- cloog-0.18.2/Makefile.am 2013-12-18 13:27:49.000000000 +0100
|
||||
+++ cloog-0.18.2.patch/Makefile.am 2014-06-22 17:51:19.285392908 +0200
|
||||
@@ -147,9 +147,7 @@
|
||||
@test -z "$(pkgconfig_libdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfig_libdir)"
|
||||
$(INSTALL_DATA) $(pkgconfig_libfile) "$(DESTDIR)$(pkgconfig_libdir)/$(pkgconfig_libfile)"
|
||||
@test -z "$(DESTDIR)$(libdir)/isl" || $(mkdir_p) "$(DESTDIR)$(libdir)/isl"
|
||||
- $(INSTALL_DATA) "$(top_srcdir)/cmake/isl-config.cmake" "$(DESTDIR)$(libdir)/isl/"
|
||||
@test -z "$(DESTDIR)$(libdir)/$(PACKAGE_NAME)" || $(mkdir_p) "$(DESTDIR)$(libdir)/$(PACKAGE_NAME)"
|
||||
- $(INSTALL_DATA) "$(top_srcdir)/cmake/cloog-isl-config.cmake" "$(DESTDIR)$(libdir)/$(PACKAGE_NAME)/"
|
||||
|
||||
uninstall-local:
|
||||
rm -f "$(DESTDIR)$(pkgconfig_libdir)/$(pkgconfig_libfile)"
|
||||
diff -Naur cloog-0.18.2/Makefile.in cloog-0.18.2.patch/Makefile.in
|
||||
--- cloog-0.18.2/Makefile.in 2013-12-18 13:36:08.000000000 +0100
|
||||
+++ cloog-0.18.2.patch/Makefile.in 2014-06-22 17:51:27.580413087 +0200
|
||||
@@ -1342,9 +1342,7 @@
|
||||
@test -z "$(pkgconfig_libdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfig_libdir)"
|
||||
$(INSTALL_DATA) $(pkgconfig_libfile) "$(DESTDIR)$(pkgconfig_libdir)/$(pkgconfig_libfile)"
|
||||
@test -z "$(DESTDIR)$(libdir)/isl" || $(mkdir_p) "$(DESTDIR)$(libdir)/isl"
|
||||
- $(INSTALL_DATA) "$(top_srcdir)/cmake/isl-config.cmake" "$(DESTDIR)$(libdir)/isl/"
|
||||
@test -z "$(DESTDIR)$(libdir)/$(PACKAGE_NAME)" || $(mkdir_p) "$(DESTDIR)$(libdir)/$(PACKAGE_NAME)"
|
||||
- $(INSTALL_DATA) "$(top_srcdir)/cmake/cloog-isl-config.cmake" "$(DESTDIR)$(libdir)/$(PACKAGE_NAME)/"
|
||||
|
||||
uninstall-local:
|
||||
rm -f "$(DESTDIR)$(pkgconfig_libdir)/$(pkgconfig_libfile)"
|
||||
@@ -48,6 +48,10 @@ PKG_CONFIGURE_OPTS_HOST="--disable-tests \
|
||||
--disable-bash-completion \
|
||||
--enable-asserts=yes"
|
||||
|
||||
pre_configure_target() {
|
||||
CFLAGS="$CFLAGS -fPIC -DPIC"
|
||||
}
|
||||
|
||||
post_makeinstall_target() {
|
||||
rm -rf $INSTALL/usr/bin/dbus-binding-tool
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@ PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.eglibc.org/"
|
||||
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_DEPENDS_TARGET="ccache:host autotools:host autoconf-2.68:host linux:host gcc:bootstrap"
|
||||
PKG_DEPENDS_TARGET="ccache:host autotools:host autoconf:host linux:host gcc:bootstrap"
|
||||
PKG_DEPENDS_INIT="eglibc"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="toolchain/devel"
|
||||
@@ -70,7 +70,7 @@ EGLIBC_EXCLUDE_BIN="$EGLIBC_EXCLUDE_BIN xtrace zdump zic"
|
||||
pre_build_target() {
|
||||
cd $PKG_BUILD
|
||||
aclocal --force --verbose
|
||||
autoconf-2.68 --force --verbose
|
||||
autoconf --force --verbose
|
||||
cd -
|
||||
}
|
||||
|
||||
@@ -200,7 +200,6 @@ makeinstall_init() {
|
||||
mkdir -p $INSTALL/lib
|
||||
cp -PR $ROOT/$PKG_BUILD/.$TARGET_NAME/elf/ld*.so* $INSTALL/lib
|
||||
cp $ROOT/$PKG_BUILD/.$TARGET_NAME/libc.so.6 $INSTALL/lib
|
||||
cp $ROOT/$PKG_BUILD/.$TARGET_NAME/math/libm.so.6 $INSTALL/lib
|
||||
cp $ROOT/$PKG_BUILD/.$TARGET_NAME/nptl/libpthread.so.0 $INSTALL/lib
|
||||
|
||||
if [ "$TARGET_ARCH" = "arm" -a "$TARGET_FLOAT" = "hard" ]; then
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
From b702bd4fdb4aaebb6aadb3ce773bcc9eea8d2dc8 Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Saraev <stefan@saraev.ca>
|
||||
Date: Thu, 24 Apr 2014 22:05:37 +0300
|
||||
Subject: [PATCH] allow newer autoconf
|
||||
|
||||
---
|
||||
aclocal.m4 | 5 -----
|
||||
1 files changed, 0 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/aclocal.m4 b/aclocal.m4
|
||||
index bc48586..0e3c7f4 100644
|
||||
--- a/aclocal.m4
|
||||
+++ b/aclocal.m4
|
||||
@@ -2,11 +2,6 @@ dnl We require that everyone use exactly the same Autoconf version so that
|
||||
dnl the internal functions defined and used by the main configure script
|
||||
dnl match those expected by the fragments.
|
||||
m4_define([GLIBC_AUTOCONF_VERSION], [2.68])
|
||||
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), GLIBC_AUTOCONF_VERSION, [],
|
||||
- [m4_fatal(m4_flatten(
|
||||
-Exactly version GLIBC_AUTOCONF_VERSION of Autoconf is required but you have
|
||||
-m4_defn([AC_AUTOCONF_VERSION])
|
||||
-), [63])])dnl
|
||||
dnl
|
||||
dnl We define the macro GLIBC_PROVIDES to do an AC_PROVIDE for each macro
|
||||
dnl which appears in configure.ac before the sysdep configure scripts are run.
|
||||
--
|
||||
1.7.2.5
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="elfutils"
|
||||
PKG_VERSION="0.155"
|
||||
PKG_VERSION="0.158"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
@@ -32,16 +32,14 @@ PKG_LONGDESC="Elfutils is a collection of utilities, including eu-ld (a linker),
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="yes"
|
||||
|
||||
PKG_CONFIGURE_OPTS_TARGET="--disable-werror \
|
||||
PKG_CONFIGURE_OPTS_TARGET="utrace_cv_cc_biarch=false \
|
||||
--disable-werror \
|
||||
--disable-progs \
|
||||
--with-zlib \
|
||||
--without-bzlib \
|
||||
--without-lzma"
|
||||
|
||||
pre_configure_target() {
|
||||
# elfutils fails to build with LTO support
|
||||
strip_lto
|
||||
|
||||
export CFLAGS="$CFLAGS -fPIC -DPIC"
|
||||
}
|
||||
|
||||
|
||||
@@ -1,92 +0,0 @@
|
||||
Allow the usage of an external implementation of the argp functions
|
||||
|
||||
uClibc lack the argp family of functions that glibc has. Therefore, we
|
||||
add a check in the configure script to see if argp_parse is available
|
||||
in the C library. If not, we look if it is available in the additional
|
||||
'argp' library. If so, we link against that library. If not, we error
|
||||
out.
|
||||
|
||||
This allows to build elfutils against uClibc with an external argp
|
||||
library.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
|
||||
Index: b/configure.ac
|
||||
===================================================================
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -269,6 +269,13 @@
|
||||
enable_progs=yes)
|
||||
AM_CONDITIONAL(ENABLE_PROGS, test "$enable_progs" = yes)
|
||||
|
||||
+AC_CHECK_FUNC([argp_parse])
|
||||
+if test "$ac_cv_func_argp_parse" != yes; then
|
||||
+ AC_CHECK_LIB([argp],[argp_parse],ARGP_LIBS=-largp,
|
||||
+ AC_MSG_ERROR([No argp_parse function available.]))
|
||||
+fi
|
||||
+AC_SUBST(ARGP_LIBS)
|
||||
+
|
||||
dnl Test for zlib and bzlib, gives ZLIB/BZLIB .am
|
||||
dnl conditional and config.h USE_ZLIB/USE_BZLIB #define.
|
||||
save_LIBS="$LIBS"
|
||||
Index: b/src/Makefile.am
|
||||
===================================================================
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -98,26 +98,29 @@
|
||||
# Buggy old compilers.
|
||||
readelf_no_Werror = yes
|
||||
|
||||
-readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
|
||||
+readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \
|
||||
+ $(ARGP_LIBS)
|
||||
nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \
|
||||
- $(demanglelib)
|
||||
-size_LDADD = $(libelf) $(libeu) $(libmudflap)
|
||||
-strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
|
||||
-ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
|
||||
+ $(demanglelib) $(ARGP_LIBS)
|
||||
+size_LDADD = $(libelf) $(libeu) $(libmudflap) $(ARGP_LIBS)
|
||||
+strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl $(ARGP_LIBS)
|
||||
+ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl $(ARGP_LIBS)
|
||||
if NATIVE_LD
|
||||
# -ldl is always needed for libebl.
|
||||
ld_LDADD += libld_elf.a
|
||||
endif
|
||||
ld_LDFLAGS = -rdynamic
|
||||
-elflint_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
|
||||
-findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap)
|
||||
-addr2line_LDADD = $(libdw) $(libelf) $(libmudflap)
|
||||
-elfcmp_LDADD = $(libebl) $(libelf) $(libmudflap) -ldl
|
||||
-objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
|
||||
-ranlib_LDADD = libar.a $(libelf) $(libeu) $(libmudflap)
|
||||
-strings_LDADD = $(libelf) $(libeu) $(libmudflap)
|
||||
-ar_LDADD = libar.a $(libelf) $(libeu) $(libmudflap)
|
||||
-unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) -ldl
|
||||
+elflint_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl $(ARGP_LIBS)
|
||||
+findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap) $(ARGP_LIBS)
|
||||
+addr2line_LDADD = $(libdw) $(libelf) $(libmudflap) $(ARGP_LIBS)
|
||||
+elfcmp_LDADD = $(libebl) $(libelf) $(libmudflap) -ldl $(ARGP_LIBS)
|
||||
+objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \
|
||||
+ $(ARGP_LIBS)
|
||||
+ranlib_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) $(ARGP_LIBS)
|
||||
+strings_LDADD = $(libelf) $(libeu) $(libmudflap) $(ARGP_LIBS)
|
||||
+ar_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) $(ARGP_LIBS)
|
||||
+unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) -ldl \
|
||||
+ $(ARGP_LIBS)
|
||||
|
||||
ldlex.o: ldscript.c
|
||||
ldlex_no_Werror = yes
|
||||
Index: b/libdw/Makefile.am
|
||||
===================================================================
|
||||
--- a/libdw/Makefile.am
|
||||
+++ b/libdw/Makefile.am
|
||||
@@ -111,7 +111,7 @@
|
||||
-Wl,--enable-new-dtags,-rpath,$(pkglibdir) \
|
||||
-Wl,--version-script,$<,--no-undefined \
|
||||
-Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\
|
||||
- -ldl $(zip_LIBS)
|
||||
+ -ldl $(zip_LIBS) $(ARGP_LIBS)
|
||||
if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
|
||||
ln -fs $@ $@.$(VERSION)
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
Provide a compatibility alias __memcpy
|
||||
|
||||
For some reason, libelf uses the internal glibc alias __memcpy, which
|
||||
doesn't exist in uClibc. Add a manual alias so that the build can
|
||||
proceed with uClibc.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
|
||||
Index: b/libelf/libelf.h
|
||||
===================================================================
|
||||
--- a/libelf/libelf.h
|
||||
+++ b/libelf/libelf.h
|
||||
@@ -34,6 +34,11 @@
|
||||
/* Get the ELF types. */
|
||||
#include <elf.h>
|
||||
|
||||
+#ifndef _LIBC
|
||||
+#ifndef __mempcpy
|
||||
+#define __mempcpy mempcpy
|
||||
+#endif
|
||||
+#endif
|
||||
|
||||
/* Known translation types. */
|
||||
typedef enum
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,28 @@
|
||||
commit 7f1eec317db79627b473c5b149a22a1b20d1f68f
|
||||
Author: Mark Wielaard <mjw@redhat.com>
|
||||
Date: Wed Apr 9 11:33:23 2014 +0200
|
||||
|
||||
CVE-2014-0172 Check for overflow before calling malloc to uncompress data.
|
||||
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1085663
|
||||
|
||||
Reported-by: Florian Weimer <fweimer@redhat.com>
|
||||
Signed-off-by: Mark Wielaard <mjw@redhat.com>
|
||||
|
||||
diff --git a/libdw/dwarf_begin_elf.c b/libdw/dwarf_begin_elf.c
|
||||
index 79daeac..34ea373 100644
|
||||
--- a/libdw/dwarf_begin_elf.c
|
||||
+++ b/libdw/dwarf_begin_elf.c
|
||||
@@ -282,6 +282,12 @@ check_section (Dwarf *result, GElf_Ehdr *ehdr, Elf_Scn *scn, bool inscngrp)
|
||||
memcpy (&size, data->d_buf + 4, sizeof size);
|
||||
size = be64toh (size);
|
||||
|
||||
+ /* Check for unsigned overflow so malloc always allocated
|
||||
+ enough memory for both the Elf_Data header and the
|
||||
+ uncompressed section data. */
|
||||
+ if (unlikely (sizeof (Elf_Data) + size < size))
|
||||
+ break;
|
||||
+
|
||||
Elf_Data *zdata = malloc (sizeof (Elf_Data) + size);
|
||||
if (unlikely (zdata == NULL))
|
||||
break;
|
||||
@@ -0,0 +1,62 @@
|
||||
commit 65cefbd0793c0f9e90a326d7bebf0a47c93294ad
|
||||
Author: Josh Stone <jistone@redhat.com>
|
||||
Date: Tue Mar 11 10:19:28 2014 -0700
|
||||
|
||||
libdwfl: dwfl_module_getdwarf.c (open_elf) only (re)set mod->e_type once.
|
||||
|
||||
As noted in https://sourceware.org/bugzilla/show_bug.cgi?id=16676#c2 for
|
||||
systemtap, the heuristic used by open_elf to set the kernel Dwfl_Module
|
||||
type to ET_DYN, even if the underlying ELF file e_type was set to
|
||||
ET_EXEC, could trigger erroneously for non-kernel/non-main (debug or
|
||||
aux) files. Make sure we only set the e_type of the module once when
|
||||
processing the main file (when the phdrs can be trusted).
|
||||
|
||||
diff --git a/libdwfl/dwfl_module_getdwarf.c b/libdwfl/dwfl_module_getdwarf.c
|
||||
index c4bd739..f8de80b 100644
|
||||
--- a/libdwfl/dwfl_module_getdwarf.c
|
||||
+++ b/libdwfl/dwfl_module_getdwarf.c
|
||||
@@ -1,5 +1,5 @@
|
||||
/* Find debugging and symbol information for a module in libdwfl.
|
||||
- Copyright (C) 2005-2012 Red Hat, Inc.
|
||||
+ Copyright (C) 2005-2012, 2014 Red Hat, Inc.
|
||||
This file is part of elfutils.
|
||||
|
||||
This file is free software; you can redistribute it and/or modify
|
||||
@@ -77,7 +77,7 @@ open_elf (Dwfl_Module *mod, struct dwfl_file *file)
|
||||
return DWFL_E (LIBELF, elf_errno ());
|
||||
}
|
||||
|
||||
- if (mod->e_type != ET_REL)
|
||||
+ if (ehdr->e_type != ET_REL)
|
||||
{
|
||||
/* In any non-ET_REL file, we compute the "synchronization address".
|
||||
|
||||
@@ -131,11 +131,24 @@ open_elf (Dwfl_Module *mod, struct dwfl_file *file)
|
||||
}
|
||||
}
|
||||
|
||||
- mod->e_type = ehdr->e_type;
|
||||
+ /* We only want to set the module e_type explictly once, derived from
|
||||
+ the main ELF file. (It might be changed for the kernel, because
|
||||
+ that is special - see below.) open_elf is always called first for
|
||||
+ the main ELF file, because both find_dw and find_symtab call
|
||||
+ __libdwfl_getelf first to open the main file. So don't let debug
|
||||
+ or aux files override the module e_type. The kernel heuristic
|
||||
+ below could otherwise trigger for non-kernel/non-main files, since
|
||||
+ their phdrs might not match the actual load addresses. */
|
||||
+ if (file == &mod->main)
|
||||
+ {
|
||||
+ mod->e_type = ehdr->e_type;
|
||||
|
||||
- /* Relocatable Linux kernels are ET_EXEC but act like ET_DYN. */
|
||||
- if (mod->e_type == ET_EXEC && file->vaddr != mod->low_addr)
|
||||
- mod->e_type = ET_DYN;
|
||||
+ /* Relocatable Linux kernels are ET_EXEC but act like ET_DYN. */
|
||||
+ if (mod->e_type == ET_EXEC && file->vaddr != mod->low_addr)
|
||||
+ mod->e_type = ET_DYN;
|
||||
+ }
|
||||
+ else
|
||||
+ assert (mod->main.elf != NULL);
|
||||
|
||||
return DWFL_E_NOERROR;
|
||||
}
|
||||
@@ -1,77 +0,0 @@
|
||||
diff -Naur elfutils-0.155/libasm/Makefile.am elfutils-0.155.patch/libasm/Makefile.am
|
||||
--- elfutils-0.155/libasm/Makefile.am 2012-08-27 20:27:31.000000000 +0200
|
||||
+++ elfutils-0.155.patch/libasm/Makefile.am 2013-03-05 18:11:43.841545009 +0100
|
||||
@@ -69,7 +69,6 @@
|
||||
-Wl,--version-script,$(srcdir)/libasm.map,--no-undefined \
|
||||
-Wl,--soname,$@.$(VERSION) \
|
||||
../libebl/libebl.a ../libelf/libelf.so $(libasm_so_LDLIBS)
|
||||
- if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
|
||||
ln -fs $@ $@.$(VERSION)
|
||||
|
||||
install: install-am libasm.so
|
||||
diff -Naur elfutils-0.155/libasm/Makefile.in elfutils-0.155.patch/libasm/Makefile.in
|
||||
--- elfutils-0.155/libasm/Makefile.in 2012-08-27 20:29:45.000000000 +0200
|
||||
+++ elfutils-0.155.patch/libasm/Makefile.in 2013-03-05 18:12:05.604432305 +0100
|
||||
@@ -654,7 +654,6 @@
|
||||
@MUDFLAP_FALSE@ -Wl,--version-script,$(srcdir)/libasm.map,--no-undefined \
|
||||
@MUDFLAP_FALSE@ -Wl,--soname,$@.$(VERSION) \
|
||||
@MUDFLAP_FALSE@ ../libebl/libebl.a ../libelf/libelf.so $(libasm_so_LDLIBS)
|
||||
-@MUDFLAP_FALSE@ if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
|
||||
@MUDFLAP_FALSE@ ln -fs $@ $@.$(VERSION)
|
||||
|
||||
@MUDFLAP_FALSE@install: install-am libasm.so
|
||||
diff -Naur elfutils-0.155/libdw/Makefile.am elfutils-0.155.patch/libdw/Makefile.am
|
||||
--- elfutils-0.155/libdw/Makefile.am 2012-08-27 20:27:31.000000000 +0200
|
||||
+++ elfutils-0.155.patch/libdw/Makefile.am 2013-03-05 18:12:26.753322780 +0100
|
||||
@@ -112,7 +112,6 @@
|
||||
-Wl,--version-script,$<,--no-undefined \
|
||||
-Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\
|
||||
-ldl $(zip_LIBS)
|
||||
- if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
|
||||
ln -fs $@ $@.$(VERSION)
|
||||
|
||||
install: install-am libdw.so
|
||||
diff -Naur elfutils-0.155/libdw/Makefile.in elfutils-0.155.patch/libdw/Makefile.in
|
||||
--- elfutils-0.155/libdw/Makefile.in 2012-08-27 20:29:45.000000000 +0200
|
||||
+++ elfutils-0.155.patch/libdw/Makefile.in 2013-03-05 18:12:41.272246520 +0100
|
||||
@@ -844,7 +844,6 @@
|
||||
@MUDFLAP_FALSE@ -Wl,--version-script,$<,--no-undefined \
|
||||
@MUDFLAP_FALSE@ -Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\
|
||||
@MUDFLAP_FALSE@ -ldl $(zip_LIBS)
|
||||
-@MUDFLAP_FALSE@ if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
|
||||
@MUDFLAP_FALSE@ ln -fs $@ $@.$(VERSION)
|
||||
|
||||
@MUDFLAP_FALSE@install: install-am libdw.so
|
||||
diff -Naur elfutils-0.155/libelf/Makefile.am elfutils-0.155.patch/libelf/Makefile.am
|
||||
--- elfutils-0.155/libelf/Makefile.am 2012-08-27 20:27:31.000000000 +0200
|
||||
+++ elfutils-0.155.patch/libelf/Makefile.am 2013-03-05 18:13:23.328024851 +0100
|
||||
@@ -106,7 +106,6 @@
|
||||
$(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
|
||||
-Wl,--version-script,$(srcdir)/libelf.map,--no-undefined \
|
||||
-Wl,--soname,$@.$(VERSION),-z,defs,-z,relro $(libelf_so_LDLIBS)
|
||||
- if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
|
||||
ln -fs $@ $@.$(VERSION)
|
||||
|
||||
install: install-am libelf.so
|
||||
diff -Naur elfutils-0.155/libelf/Makefile.in elfutils-0.155.patch/libelf/Makefile.in
|
||||
--- elfutils-0.155/libelf/Makefile.in 2012-08-27 20:29:45.000000000 +0200
|
||||
+++ elfutils-0.155.patch/libelf/Makefile.in 2013-03-05 18:13:37.270951393 +0100
|
||||
@@ -830,7 +830,6 @@
|
||||
@MUDFLAP_FALSE@ $(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
|
||||
@MUDFLAP_FALSE@ -Wl,--version-script,$(srcdir)/libelf.map,--no-undefined \
|
||||
@MUDFLAP_FALSE@ -Wl,--soname,$@.$(VERSION),-z,defs,-z,relro $(libelf_so_LDLIBS)
|
||||
-@MUDFLAP_FALSE@ if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
|
||||
@MUDFLAP_FALSE@ ln -fs $@ $@.$(VERSION)
|
||||
|
||||
@MUDFLAP_FALSE@install: install-am libelf.so
|
||||
diff -Naur elfutils-0.155/src/Makefile.in elfutils-0.155.patch/src/Makefile.in
|
||||
--- elfutils-0.155/src/Makefile.in 2012-08-27 20:29:46.000000000 +0200
|
||||
+++ elfutils-0.155.patch/src/Makefile.in 2013-03-05 18:14:22.361713943 +0100
|
||||
@@ -867,7 +867,6 @@
|
||||
@NATIVE_LD_FALSE@ $(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
|
||||
@NATIVE_LD_FALSE@ $(libelf) $(libeu) \
|
||||
@NATIVE_LD_FALSE@ -Wl,--version-script,$(srcdir)/libld_elf_i386.map
|
||||
-@NATIVE_LD_FALSE@ $(textrel_check)
|
||||
|
||||
# Special rule to make it possible to define libld_elf_a_SOURCES as we do.
|
||||
# Otherwise make would complain.
|
||||
@@ -1,26 +0,0 @@
|
||||
diff -Naur elfutils-0.155/Makefile.am elfutils-0.155.patch/Makefile.am
|
||||
--- elfutils-0.155/Makefile.am 2012-08-27 20:27:31.000000000 +0200
|
||||
+++ elfutils-0.155.patch/Makefile.am 2013-03-05 18:38:47.565095550 +0100
|
||||
@@ -23,8 +23,7 @@
|
||||
pkginclude_HEADERS = version.h
|
||||
|
||||
# Add doc back when we have some real content.
|
||||
-SUBDIRS = config m4 lib libelf libebl libdwfl libdw libcpu libasm backends \
|
||||
- src po tests
|
||||
+SUBDIRS = config m4 lib libelf libebl libdwfl libdw
|
||||
|
||||
EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \
|
||||
COPYING COPYING-GPLV2 COPYING-LGPLV3
|
||||
diff -Naur elfutils-0.155/Makefile.in elfutils-0.155.patch/Makefile.in
|
||||
--- elfutils-0.155/Makefile.in 2012-08-27 20:29:45.000000000 +0200
|
||||
+++ elfutils-0.155.patch/Makefile.in 2013-03-05 18:39:11.176974119 +0100
|
||||
@@ -256,8 +256,7 @@
|
||||
pkginclude_HEADERS = version.h
|
||||
|
||||
# Add doc back when we have some real content.
|
||||
-SUBDIRS = config m4 lib libelf libebl libdwfl libdw libcpu libasm backends \
|
||||
- src po tests
|
||||
+SUBDIRS = config m4 lib libelf libebl libdwfl libdw
|
||||
|
||||
EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \
|
||||
COPYING COPYING-GPLV2 COPYING-LGPLV3
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
||||
--- elfutils/libdwfl/ChangeLog
|
||||
+++ elfutils/libdwfl/ChangeLog
|
||||
@@ -52,6 +52,11 @@
|
||||
@@ -680,6 +680,11 @@
|
||||
* dwfl_module_getdwarf.c (open_elf): Clear errno before CBFAIL.
|
||||
Reported by Kurt Roeckx <kurt@roeckx.be>.
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
This file is part of elfutils.
|
||||
|
||||
This file is free software; you can redistribute it and/or modify
|
||||
@@ -457,7 +457,10 @@ relocate_section (Dwfl_Module *mod, Elf
|
||||
@@ -456,7 +456,10 @@ relocate_section (Dwfl_Module *mod, Elf
|
||||
}
|
||||
}
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
size_t complete = 0;
|
||||
if (shdr->sh_type == SHT_REL)
|
||||
for (size_t relidx = 0; !result && relidx < nrels; ++relidx)
|
||||
@@ -559,7 +562,7 @@ relocate_section (Dwfl_Module *mod, Elf
|
||||
@@ -558,7 +561,7 @@ relocate_section (Dwfl_Module *mod, Elf
|
||||
nrels = next;
|
||||
}
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
|
||||
--- elfutils/libelf/ChangeLog
|
||||
+++ elfutils/libelf/ChangeLog
|
||||
@@ -703,10 +703,53 @@
|
||||
@@ -754,10 +754,53 @@
|
||||
If section content hasn't been read yet, do it before looking for the
|
||||
block size. If no section data present, infer size of section header.
|
||||
|
||||
@@ -253,7 +253,7 @@
|
||||
|
||||
--- elfutils/libelf/elf_getarsym.c
|
||||
+++ elfutils/libelf/elf_getarsym.c
|
||||
@@ -181,6 +181,9 @@ elf_getarsym (elf, ptr)
|
||||
@@ -183,6 +183,9 @@ elf_getarsym (elf, ptr)
|
||||
size_t index_size = atol (tmpbuf);
|
||||
|
||||
if (SARMAG + sizeof (struct ar_hdr) + index_size > elf->maximum_size
|
||||
@@ -902,7 +902,7 @@
|
||||
#endif /* libelfP.h */
|
||||
--- elfutils/src/ChangeLog
|
||||
+++ elfutils/src/ChangeLog
|
||||
@@ -344,6 +344,12 @@
|
||||
@@ -702,6 +702,12 @@
|
||||
|
||||
* readelf.c (dwarf_attr_string): Grok DW_AT_GNU_odr_signature.
|
||||
|
||||
@@ -915,7 +915,7 @@
|
||||
2011-02-11 Roland McGrath <roland@redhat.com>
|
||||
|
||||
* elfcmp.c (verbose): New variable.
|
||||
@@ -2056,6 +2062,16 @@
|
||||
@@ -2414,6 +2420,16 @@
|
||||
object symbols or symbols with unknown type.
|
||||
(check_rel): Likewise.
|
||||
|
||||
@@ -932,7 +932,7 @@
|
||||
2005-06-08 Roland McGrath <roland@redhat.com>
|
||||
|
||||
* readelf.c (print_ops): Add consts.
|
||||
@@ -2101,6 +2117,19 @@
|
||||
@@ -2459,6 +2475,19 @@
|
||||
|
||||
* readelf.c (dwarf_tag_string): Add new tags.
|
||||
|
||||
@@ -1027,7 +1027,7 @@
|
||||
}
|
||||
|
||||
if (sym->st_shndx == SHN_XINDEX)
|
||||
@@ -1032,9 +1042,11 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e
|
||||
@@ -1040,9 +1050,11 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e
|
||||
{
|
||||
GElf_Shdr rcshdr_mem;
|
||||
const GElf_Shdr *rcshdr = gelf_getshdr (scn, &rcshdr_mem);
|
||||
@@ -1041,7 +1041,7 @@
|
||||
{
|
||||
/* Found the dynamic section. Look through it. */
|
||||
Elf_Data *d = elf_getdata (scn, NULL);
|
||||
@@ -1044,7 +1056,9 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e
|
||||
@@ -1052,7 +1064,9 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e
|
||||
{
|
||||
GElf_Dyn dyn_mem;
|
||||
GElf_Dyn *dyn = gelf_getdyn (d, cnt, &dyn_mem);
|
||||
@@ -1052,7 +1052,7 @@
|
||||
|
||||
if (dyn->d_tag == DT_RELCOUNT)
|
||||
{
|
||||
@@ -1058,7 +1072,9 @@ section [%2d] '%s': DT_RELCOUNT used for
|
||||
@@ -1066,7 +1080,9 @@ section [%2d] '%s': DT_RELCOUNT used for
|
||||
/* Does the number specified number of relative
|
||||
relocations exceed the total number of
|
||||
relocations? */
|
||||
@@ -1063,7 +1063,7 @@
|
||||
ERROR (gettext ("\
|
||||
section [%2d] '%s': DT_RELCOUNT value %d too high for this section\n"),
|
||||
idx, section_name (ebl, idx),
|
||||
@@ -1218,7 +1234,8 @@ section [%2d] '%s': no relocations for m
|
||||
@@ -1226,7 +1242,8 @@ section [%2d] '%s': no relocations for m
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1073,7 +1073,7 @@
|
||||
ERROR (gettext (reltype == ELF_T_RELA ? "\
|
||||
section [%2d] '%s': section entry size does not match ElfXX_Rela\n" : "\
|
||||
section [%2d] '%s': section entry size does not match ElfXX_Rel\n"),
|
||||
@@ -1441,7 +1458,8 @@ check_rela (Ebl *ebl, GElf_Ehdr *ehdr, G
|
||||
@@ -1449,7 +1466,8 @@ check_rela (Ebl *ebl, GElf_Ehdr *ehdr, G
|
||||
Elf_Data *symdata = elf_getdata (symscn, NULL);
|
||||
enum load_state state = state_undecided;
|
||||
|
||||
@@ -1083,7 +1083,7 @@
|
||||
{
|
||||
GElf_Rela rela_mem;
|
||||
GElf_Rela *rela = gelf_getrela (data, cnt, &rela_mem);
|
||||
@@ -1491,7 +1509,8 @@ check_rel (Ebl *ebl, GElf_Ehdr *ehdr, GE
|
||||
@@ -1499,7 +1517,8 @@ check_rel (Ebl *ebl, GElf_Ehdr *ehdr, GE
|
||||
Elf_Data *symdata = elf_getdata (symscn, NULL);
|
||||
enum load_state state = state_undecided;
|
||||
|
||||
@@ -1093,7 +1093,7 @@
|
||||
{
|
||||
GElf_Rel rel_mem;
|
||||
GElf_Rel *rel = gelf_getrel (data, cnt, &rel_mem);
|
||||
@@ -1590,7 +1609,8 @@ section [%2d] '%s': referenced as string
|
||||
@@ -1598,7 +1617,8 @@ section [%2d] '%s': referenced as string
|
||||
shdr->sh_link, section_name (ebl, shdr->sh_link),
|
||||
idx, section_name (ebl, idx));
|
||||
|
||||
@@ -1103,7 +1103,7 @@
|
||||
ERROR (gettext ("\
|
||||
section [%2d] '%s': section entry size does not match ElfXX_Dyn\n"),
|
||||
idx, section_name (ebl, idx));
|
||||
@@ -1600,7 +1620,7 @@ section [%2d] '%s': section entry size d
|
||||
@@ -1608,7 +1628,7 @@ section [%2d] '%s': section entry size d
|
||||
idx, section_name (ebl, idx));
|
||||
|
||||
bool non_null_warned = false;
|
||||
@@ -1112,7 +1112,7 @@
|
||||
{
|
||||
GElf_Dyn dyn_mem;
|
||||
GElf_Dyn *dyn = gelf_getdyn (data, cnt, &dyn_mem);
|
||||
@@ -1872,6 +1892,8 @@ section [%2d] '%s': entry size does not
|
||||
@@ -1880,6 +1900,8 @@ section [%2d] '%s': entry size does not
|
||||
idx, section_name (ebl, idx));
|
||||
|
||||
if (symshdr != NULL
|
||||
@@ -1121,7 +1121,7 @@
|
||||
&& (shdr->sh_size / shdr->sh_entsize
|
||||
< symshdr->sh_size / symshdr->sh_entsize))
|
||||
ERROR (gettext ("\
|
||||
@@ -1898,6 +1920,12 @@ section [%2d] '%s': extended section ind
|
||||
@@ -1906,6 +1928,12 @@ section [%2d] '%s': extended section ind
|
||||
}
|
||||
|
||||
Elf_Data *data = elf_getdata (elf_getscn (ebl->elf, idx), NULL);
|
||||
@@ -1134,7 +1134,7 @@
|
||||
|
||||
if (*((Elf32_Word *) data->d_buf) != 0)
|
||||
ERROR (gettext ("symbol 0 should have zero extended section index\n"));
|
||||
@@ -1940,7 +1968,7 @@ section [%2d] '%s': hash table section i
|
||||
@@ -1948,7 +1976,7 @@ section [%2d] '%s': hash table section i
|
||||
|
||||
size_t maxidx = nchain;
|
||||
|
||||
@@ -1143,7 +1143,7 @@
|
||||
{
|
||||
size_t symsize = symshdr->sh_size / symshdr->sh_entsize;
|
||||
|
||||
@@ -1951,18 +1979,28 @@ section [%2d] '%s': hash table section i
|
||||
@@ -1959,18 +1987,28 @@ section [%2d] '%s': hash table section i
|
||||
maxidx = symsize;
|
||||
}
|
||||
|
||||
@@ -1174,7 +1174,7 @@
|
||||
}
|
||||
|
||||
|
||||
@@ -1992,18 +2030,28 @@ section [%2d] '%s': hash table section i
|
||||
@@ -2000,18 +2038,28 @@ section [%2d] '%s': hash table section i
|
||||
maxidx = symsize;
|
||||
}
|
||||
|
||||
@@ -1206,7 +1206,7 @@
|
||||
}
|
||||
|
||||
|
||||
@@ -2028,7 +2076,7 @@ section [%2d] '%s': bitmask size not pow
|
||||
@@ -2036,7 +2084,7 @@ section [%2d] '%s': bitmask size not pow
|
||||
if (shdr->sh_size < (4 + bitmask_words + nbuckets) * sizeof (Elf32_Word))
|
||||
{
|
||||
ERROR (gettext ("\
|
||||
@@ -1215,7 +1215,7 @@
|
||||
idx, section_name (ebl, idx), (long int) shdr->sh_size,
|
||||
(long int) ((4 + bitmask_words + nbuckets) * sizeof (Elf32_Word)));
|
||||
return;
|
||||
@@ -2700,8 +2748,9 @@ section [%2d] '%s' refers in sh_link to
|
||||
@@ -2708,8 +2756,9 @@ section [%2d] '%s' refers in sh_link to
|
||||
|
||||
/* The number of elements in the version symbol table must be the
|
||||
same as the number of symbols. */
|
||||
@@ -1229,7 +1229,7 @@
|
||||
idx, section_name (ebl, idx),
|
||||
--- elfutils/src/readelf.c
|
||||
+++ elfutils/src/readelf.c
|
||||
@@ -1189,6 +1189,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
|
||||
@@ -1364,6 +1364,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
|
||||
Elf32_Word *grpref = (Elf32_Word *) data->d_buf;
|
||||
|
||||
GElf_Sym sym_mem;
|
||||
@@ -1238,7 +1238,7 @@
|
||||
printf ((grpref[0] & GRP_COMDAT)
|
||||
? ngettext ("\
|
||||
\nCOMDAT section group [%2zu] '%s' with signature '%s' contains %zu entry:\n",
|
||||
@@ -1201,8 +1203,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
|
||||
@@ -1376,8 +1378,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
|
||||
data->d_size / sizeof (Elf32_Word) - 1),
|
||||
elf_ndxscn (scn),
|
||||
elf_strptr (ebl->elf, shstrndx, shdr->sh_name),
|
||||
@@ -1249,7 +1249,7 @@
|
||||
?: gettext ("<INVALID SYMBOL>"),
|
||||
data->d_size / sizeof (Elf32_Word) - 1);
|
||||
|
||||
@@ -1353,10 +1355,12 @@ static void
|
||||
@@ -1528,10 +1530,12 @@ static void
|
||||
handle_dynamic (Ebl *ebl, Elf_Scn *scn, GElf_Shdr *shdr)
|
||||
{
|
||||
int class = gelf_getclass (ebl->elf);
|
||||
@@ -1263,7 +1263,7 @@
|
||||
|
||||
/* Get the data of the section. */
|
||||
data = elf_getdata (scn, NULL);
|
||||
@@ -1368,21 +1372,26 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn,
|
||||
@@ -1543,21 +1547,26 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn,
|
||||
error (EXIT_FAILURE, 0,
|
||||
gettext ("cannot get section header string table index"));
|
||||
|
||||
@@ -1296,7 +1296,7 @@
|
||||
{
|
||||
GElf_Dyn dynmem;
|
||||
GElf_Dyn *dyn = gelf_getdyn (data, cnt, &dynmem);
|
||||
@@ -1531,7 +1540,8 @@ static void
|
||||
@@ -1706,7 +1715,8 @@ static void
|
||||
handle_relocs_rel (Ebl *ebl, GElf_Ehdr *ehdr, Elf_Scn *scn, GElf_Shdr *shdr)
|
||||
{
|
||||
int class = gelf_getclass (ebl->elf);
|
||||
@@ -1306,7 +1306,7 @@
|
||||
|
||||
/* Get the data of the section. */
|
||||
Elf_Data *data = elf_getdata (scn, NULL);
|
||||
@@ -1717,7 +1727,8 @@ static void
|
||||
@@ -1892,7 +1902,8 @@ static void
|
||||
handle_relocs_rela (Ebl *ebl, GElf_Ehdr *ehdr, Elf_Scn *scn, GElf_Shdr *shdr)
|
||||
{
|
||||
int class = gelf_getclass (ebl->elf);
|
||||
@@ -1316,7 +1316,7 @@
|
||||
|
||||
/* Get the data of the section. */
|
||||
Elf_Data *data = elf_getdata (scn, NULL);
|
||||
@@ -1964,6 +1975,13 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
|
||||
@@ -2139,6 +2150,13 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
|
||||
error (EXIT_FAILURE, 0,
|
||||
gettext ("cannot get section header string table index"));
|
||||
|
||||
@@ -1330,7 +1330,7 @@
|
||||
/* Now we can compute the number of entries in the section. */
|
||||
unsigned int nsyms = data->d_size / (class == ELFCLASS32
|
||||
? sizeof (Elf32_Sym)
|
||||
@@ -1974,15 +1992,12 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
|
||||
@@ -2149,15 +2167,12 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
|
||||
nsyms),
|
||||
(unsigned int) elf_ndxscn (scn),
|
||||
elf_strptr (ebl->elf, shstrndx, shdr->sh_name), nsyms);
|
||||
@@ -1347,7 +1347,7 @@
|
||||
|
||||
fputs_unlocked (class == ELFCLASS32
|
||||
? gettext ("\
|
||||
@@ -2218,7 +2233,13 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn,
|
||||
@@ -2393,7 +2408,13 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn,
|
||||
error (EXIT_FAILURE, 0,
|
||||
gettext ("cannot get section header string table index"));
|
||||
|
||||
@@ -1362,7 +1362,7 @@
|
||||
printf (ngettext ("\
|
||||
\nVersion needs section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n",
|
||||
"\
|
||||
@@ -2229,9 +2250,7 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn,
|
||||
@@ -2404,9 +2425,7 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn,
|
||||
class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
|
||||
shdr->sh_offset,
|
||||
(unsigned int) shdr->sh_link,
|
||||
@@ -1373,7 +1373,7 @@
|
||||
|
||||
unsigned int offset = 0;
|
||||
for (int cnt = shdr->sh_info; --cnt >= 0; )
|
||||
@@ -2284,8 +2303,14 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
|
||||
@@ -2459,8 +2478,14 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
|
||||
error (EXIT_FAILURE, 0,
|
||||
gettext ("cannot get section header string table index"));
|
||||
|
||||
@@ -1389,7 +1389,7 @@
|
||||
printf (ngettext ("\
|
||||
\nVersion definition section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n",
|
||||
"\
|
||||
@@ -2297,9 +2322,7 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
|
||||
@@ -2472,9 +2497,7 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
|
||||
class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
|
||||
shdr->sh_offset,
|
||||
(unsigned int) shdr->sh_link,
|
||||
@@ -1400,7 +1400,7 @@
|
||||
|
||||
unsigned int offset = 0;
|
||||
for (int cnt = shdr->sh_info; --cnt >= 0; )
|
||||
@@ -2561,25 +2584,30 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G
|
||||
@@ -2736,25 +2759,30 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G
|
||||
filename = NULL;
|
||||
}
|
||||
|
||||
@@ -1438,7 +1438,7 @@
|
||||
{
|
||||
if (cnt % 2 == 0)
|
||||
printf ("\n %4d:", cnt);
|
||||
@@ -2628,7 +2656,17 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,
|
||||
@@ -2803,7 +2831,17 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,
|
||||
for (Elf32_Word cnt = 0; cnt < nbucket; ++cnt)
|
||||
++counts[lengths[cnt]];
|
||||
|
||||
@@ -1457,7 +1457,7 @@
|
||||
printf (ngettext ("\
|
||||
\nHistogram for bucket list length in section [%2u] '%s' (total of %d bucket):\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n",
|
||||
"\
|
||||
@@ -2641,9 +2679,7 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,
|
||||
@@ -2816,9 +2854,7 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,
|
||||
shdr->sh_addr,
|
||||
shdr->sh_offset,
|
||||
(unsigned int) shdr->sh_link,
|
||||
@@ -1468,7 +1468,7 @@
|
||||
|
||||
if (extrastr != NULL)
|
||||
fputs (extrastr, stdout);
|
||||
@@ -2903,7 +2939,8 @@ print_liblist (Ebl *ebl)
|
||||
@@ -3078,7 +3114,8 @@ print_liblist (Ebl *ebl)
|
||||
|
||||
if (shdr != NULL && shdr->sh_type == SHT_GNU_LIBLIST)
|
||||
{
|
||||
@@ -1478,7 +1478,7 @@
|
||||
printf (ngettext ("\
|
||||
\nLibrary list section [%2zu] '%s' at offset %#0" PRIx64 " contains %d entry:\n",
|
||||
"\
|
||||
@@ -4164,6 +4201,16 @@ print_debug_aranges_section (Dwfl_Module
|
||||
@@ -4398,6 +4435,16 @@ print_decoded_aranges_section (Ebl *ebl,
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1497,7 +1497,7 @@
|
||||
"\
|
||||
--- elfutils/src/strip.c
|
||||
+++ elfutils/src/strip.c
|
||||
@@ -564,6 +564,11 @@ handle_elf (int fd, Elf *elf, const char
|
||||
@@ -565,6 +565,11 @@ handle_elf (int fd, Elf *elf, const char
|
||||
goto fail_close;
|
||||
}
|
||||
|
||||
@@ -1509,7 +1509,7 @@
|
||||
/* Storage for section information. We leave room for two more
|
||||
entries since we unconditionally create a section header string
|
||||
table. Maybe some weird tool created an ELF file without one.
|
||||
@@ -585,7 +590,7 @@ handle_elf (int fd, Elf *elf, const char
|
||||
@@ -586,7 +591,7 @@ handle_elf (int fd, Elf *elf, const char
|
||||
{
|
||||
/* This should always be true (i.e., there should not be any
|
||||
holes in the numbering). */
|
||||
@@ -1518,7 +1518,7 @@
|
||||
|
||||
shdr_info[cnt].scn = scn;
|
||||
|
||||
@@ -598,6 +603,7 @@ handle_elf (int fd, Elf *elf, const char
|
||||
@@ -599,6 +604,7 @@ handle_elf (int fd, Elf *elf, const char
|
||||
shdr_info[cnt].shdr.sh_name);
|
||||
if (shdr_info[cnt].name == NULL)
|
||||
{
|
||||
@@ -1526,7 +1526,7 @@
|
||||
error (0, 0, gettext ("illformed file '%s'"), fname);
|
||||
goto fail_close;
|
||||
}
|
||||
@@ -607,6 +613,8 @@ handle_elf (int fd, Elf *elf, const char
|
||||
@@ -608,6 +614,8 @@ handle_elf (int fd, Elf *elf, const char
|
||||
|
||||
/* Remember the shdr.sh_link value. */
|
||||
shdr_info[cnt].old_sh_link = shdr_info[cnt].shdr.sh_link;
|
||||
@@ -1535,7 +1535,7 @@
|
||||
|
||||
/* Sections in files other than relocatable object files which
|
||||
are not loaded can be freely moved by us. In relocatable
|
||||
@@ -619,7 +627,7 @@ handle_elf (int fd, Elf *elf, const char
|
||||
@@ -620,7 +628,7 @@ handle_elf (int fd, Elf *elf, const char
|
||||
appropriate reference. */
|
||||
if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_SYMTAB_SHNDX))
|
||||
{
|
||||
@@ -1544,7 +1544,7 @@
|
||||
shdr_info[shdr_info[cnt].shdr.sh_link].symtab_idx = cnt;
|
||||
}
|
||||
else if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_GROUP))
|
||||
@@ -636,7 +644,12 @@ handle_elf (int fd, Elf *elf, const char
|
||||
@@ -637,7 +645,12 @@ handle_elf (int fd, Elf *elf, const char
|
||||
for (inner = 1;
|
||||
inner < shdr_info[cnt].data->d_size / sizeof (Elf32_Word);
|
||||
++inner)
|
||||
@@ -1557,7 +1557,7 @@
|
||||
|
||||
if (inner == 1 || (inner == 2 && (grpref[0] & GRP_COMDAT) == 0))
|
||||
/* If the section group contains only one element and this
|
||||
@@ -647,7 +660,7 @@ handle_elf (int fd, Elf *elf, const char
|
||||
@@ -648,7 +661,7 @@ handle_elf (int fd, Elf *elf, const char
|
||||
}
|
||||
else if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_GNU_versym))
|
||||
{
|
||||
@@ -1566,7 +1566,7 @@
|
||||
shdr_info[shdr_info[cnt].shdr.sh_link].version_idx = cnt;
|
||||
}
|
||||
|
||||
@@ -655,7 +668,7 @@ handle_elf (int fd, Elf *elf, const char
|
||||
@@ -656,7 +669,7 @@ handle_elf (int fd, Elf *elf, const char
|
||||
discarded right away. */
|
||||
if ((shdr_info[cnt].shdr.sh_flags & SHF_GROUP) != 0)
|
||||
{
|
||||
@@ -1575,7 +1575,7 @@
|
||||
|
||||
if (shdr_info[shdr_info[cnt].group_idx].idx == 0)
|
||||
{
|
||||
@@ -731,10 +744,14 @@ handle_elf (int fd, Elf *elf, const char
|
||||
@@ -732,10 +745,14 @@ handle_elf (int fd, Elf *elf, const char
|
||||
{
|
||||
/* If a relocation section is marked as being removed make
|
||||
sure the section it is relocating is removed, too. */
|
||||
@@ -1593,7 +1593,7 @@
|
||||
|
||||
/* If a group section is marked as being removed make
|
||||
sure all the sections it contains are being removed, too. */
|
||||
@@ -778,7 +795,7 @@ handle_elf (int fd, Elf *elf, const char
|
||||
@@ -779,7 +796,7 @@ handle_elf (int fd, Elf *elf, const char
|
||||
if (shdr_info[cnt].symtab_idx != 0
|
||||
&& shdr_info[shdr_info[cnt].symtab_idx].data == NULL)
|
||||
{
|
||||
@@ -1602,7 +1602,7 @@
|
||||
|
||||
shdr_info[shdr_info[cnt].symtab_idx].data
|
||||
= elf_getdata (shdr_info[shdr_info[cnt].symtab_idx].scn,
|
||||
@@ -818,6 +835,9 @@ handle_elf (int fd, Elf *elf, const char
|
||||
@@ -819,6 +836,9 @@ handle_elf (int fd, Elf *elf, const char
|
||||
else if (scnidx == SHN_XINDEX)
|
||||
scnidx = xndx;
|
||||
|
||||
@@ -1612,7 +1612,7 @@
|
||||
if (shdr_info[scnidx].idx == 0)
|
||||
/* This symbol table has a real symbol in
|
||||
a discarded section. So preserve the
|
||||
@@ -848,12 +868,16 @@ handle_elf (int fd, Elf *elf, const char
|
||||
@@ -849,12 +869,16 @@ handle_elf (int fd, Elf *elf, const char
|
||||
}
|
||||
|
||||
/* Handle references through sh_info. */
|
||||
@@ -1631,7 +1631,7 @@
|
||||
|
||||
/* Mark the section as investigated. */
|
||||
shdr_info[cnt].idx = 2;
|
||||
@@ -994,7 +1018,7 @@ handle_elf (int fd, Elf *elf, const char
|
||||
@@ -995,7 +1019,7 @@ handle_elf (int fd, Elf *elf, const char
|
||||
error (EXIT_FAILURE, 0, gettext ("while generating output file: %s"),
|
||||
elf_errmsg (-1));
|
||||
|
||||
@@ -1640,7 +1640,7 @@
|
||||
|
||||
/* Add this name to the section header string table. */
|
||||
shdr_info[cnt].se = ebl_strtabadd (shst, shdr_info[cnt].name, 0);
|
||||
@@ -1031,7 +1055,7 @@ handle_elf (int fd, Elf *elf, const char
|
||||
@@ -1032,7 +1056,7 @@ handle_elf (int fd, Elf *elf, const char
|
||||
error (EXIT_FAILURE, 0,
|
||||
gettext ("while create section header section: %s"),
|
||||
elf_errmsg (-1));
|
||||
@@ -1649,7 +1649,7 @@
|
||||
|
||||
shdr_info[cnt].data = elf_newdata (shdr_info[cnt].newscn);
|
||||
if (shdr_info[cnt].data == NULL)
|
||||
@@ -1087,7 +1111,7 @@ handle_elf (int fd, Elf *elf, const char
|
||||
@@ -1089,7 +1113,7 @@ handle_elf (int fd, Elf *elf, const char
|
||||
error (EXIT_FAILURE, 0,
|
||||
gettext ("while create section header section: %s"),
|
||||
elf_errmsg (-1));
|
||||
@@ -1658,7 +1658,7 @@
|
||||
|
||||
/* Finalize the string table and fill in the correct indices in the
|
||||
section headers. */
|
||||
@@ -1177,20 +1201,20 @@ handle_elf (int fd, Elf *elf, const char
|
||||
@@ -1179,20 +1203,20 @@ handle_elf (int fd, Elf *elf, const char
|
||||
shndxdata = elf_getdata (shdr_info[shdr_info[cnt].symtab_idx].scn,
|
||||
NULL);
|
||||
|
||||
@@ -1682,7 +1682,7 @@
|
||||
>= shdr_info[cnt].data->d_size / elsize);
|
||||
}
|
||||
|
||||
@@ -1245,7 +1269,7 @@ handle_elf (int fd, Elf *elf, const char
|
||||
@@ -1247,7 +1271,7 @@ handle_elf (int fd, Elf *elf, const char
|
||||
sec = shdr_info[sym->st_shndx].idx;
|
||||
else
|
||||
{
|
||||
@@ -1691,7 +1691,7 @@
|
||||
|
||||
sec = shdr_info[xshndx].idx;
|
||||
}
|
||||
@@ -1266,7 +1290,7 @@ handle_elf (int fd, Elf *elf, const char
|
||||
@@ -1268,7 +1292,7 @@ handle_elf (int fd, Elf *elf, const char
|
||||
nxshndx = sec;
|
||||
}
|
||||
|
||||
@@ -1700,7 +1700,7 @@
|
||||
|
||||
if ((inner != destidx || nshndx != sym->st_shndx
|
||||
|| (shndxdata != NULL && nxshndx != xshndx))
|
||||
@@ -1293,9 +1317,11 @@ handle_elf (int fd, Elf *elf, const char
|
||||
@@ -1295,9 +1319,11 @@ handle_elf (int fd, Elf *elf, const char
|
||||
{
|
||||
size_t sidx = (sym->st_shndx != SHN_XINDEX
|
||||
? sym->st_shndx : xshndx);
|
||||
@@ -1715,7 +1715,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1483,11 +1509,11 @@ handle_elf (int fd, Elf *elf, const char
|
||||
@@ -1485,11 +1511,11 @@ handle_elf (int fd, Elf *elf, const char
|
||||
{
|
||||
GElf_Sym sym_mem;
|
||||
GElf_Sym *sym = gelf_getsym (symd, inner, &sym_mem);
|
||||
@@ -1729,7 +1729,7 @@
|
||||
size_t hidx = elf_hash (name) % nbucket;
|
||||
|
||||
if (bucket[hidx] == 0)
|
||||
@@ -1506,8 +1532,8 @@ handle_elf (int fd, Elf *elf, const char
|
||||
@@ -1508,8 +1534,8 @@ handle_elf (int fd, Elf *elf, const char
|
||||
else
|
||||
{
|
||||
/* Alpha and S390 64-bit use 64-bit SHT_HASH entries. */
|
||||
@@ -1740,7 +1740,7 @@
|
||||
|
||||
Elf64_Xword *bucket = (Elf64_Xword *) hashd->d_buf;
|
||||
|
||||
@@ -1537,11 +1563,11 @@ handle_elf (int fd, Elf *elf, const char
|
||||
@@ -1539,11 +1565,11 @@ handle_elf (int fd, Elf *elf, const char
|
||||
{
|
||||
GElf_Sym sym_mem;
|
||||
GElf_Sym *sym = gelf_getsym (symd, inner, &sym_mem);
|
||||
@@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="file"
|
||||
PKG_VERSION="5.18"
|
||||
PKG_VERSION="5.19"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="BSD"
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="gettext"
|
||||
PKG_VERSION="0.18.3.1"
|
||||
PKG_VERSION="0.18.3.2"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
@@ -32,6 +32,8 @@ PKG_LONGDESC="This is the GNU gettext package. It is interesting for authors or
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="no"
|
||||
|
||||
PKG_CONFIGURE_SCRIPT="gettext-tools/configure"
|
||||
|
||||
PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared \
|
||||
--disable-rpath \
|
||||
--with-gnu-ld \
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
diff -Naur gettext-0.19.1/gettext-tools/Makefile.am gettext-0.19.1.patch/gettext-tools/Makefile.am
|
||||
--- gettext-0.19.1/gettext-tools/Makefile.am 2014-05-01 11:37:33.000000000 +0200
|
||||
+++ gettext-0.19.1.patch/gettext-tools/Makefile.am 2014-06-23 16:06:15.225426222 +0200
|
||||
@@ -19,7 +19,7 @@
|
||||
AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
|
||||
ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
|
||||
|
||||
-SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples
|
||||
+SUBDIRS = intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests
|
||||
|
||||
EXTRA_DIST = misc/DISCLAIM
|
||||
MOSTLYCLEANFILES = core *.stackdump
|
||||
diff -Naur gettext-0.19.1/gettext-tools/Makefile.in gettext-0.19.1.patch/gettext-tools/Makefile.in
|
||||
--- gettext-0.19.1/gettext-tools/Makefile.in 2014-06-10 07:42:48.000000000 +0200
|
||||
+++ gettext-0.19.1.patch/gettext-tools/Makefile.in 2014-06-23 16:06:32.453461116 +0200
|
||||
@@ -1556,7 +1556,7 @@
|
||||
top_srcdir = @top_srcdir@
|
||||
AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
|
||||
ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
|
||||
-SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples
|
||||
+SUBDIRS = intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests
|
||||
|
||||
# Allow users to use "gnulib-tool --update".
|
||||
|
||||
@@ -78,11 +78,6 @@ pre_configure_host() {
|
||||
export LIBFFI_LIBS="-L$ROOT/$TOOLCHAIN/lib -lffi"
|
||||
}
|
||||
|
||||
pre_configure_target() {
|
||||
# glib segfaults with LTO optimization
|
||||
strip_lto
|
||||
}
|
||||
|
||||
post_makeinstall_host() {
|
||||
cp -f gobject/.libs/glib-genmarshal $ROOT/$TOOLCHAIN/bin
|
||||
cp -f gobject/glib-mkenums $ROOT/$TOOLCHAIN/bin
|
||||
|
||||
@@ -52,8 +52,6 @@ else
|
||||
fi
|
||||
|
||||
if [ "$XBMCPLAYER_DRIVER" = "libfslvpuwrap" ]; then
|
||||
PKG_DEPENDS_TARGET="$PKG_DEPENDS"
|
||||
|
||||
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-imx6"
|
||||
else
|
||||
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-imx6"
|
||||
|
||||
@@ -41,6 +41,10 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_path_HAVELIBUSB=$ROOT/$TOOLCHAIN/bin/libusb-con
|
||||
--without-examples \
|
||||
--without-docs"
|
||||
|
||||
pre_configure_target() {
|
||||
CFLAGS="$CFLAGS -fPIC -DPIC"
|
||||
}
|
||||
|
||||
post_makeinstall_target() {
|
||||
rm -rf $INSTALL/usr/bin
|
||||
}
|
||||
|
||||
@@ -34,6 +34,10 @@ PKG_AUTORECONF="yes"
|
||||
|
||||
PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"
|
||||
|
||||
pre_configure_target() {
|
||||
CFLAGS="$CFLAGS -fPIC -DPIC"
|
||||
}
|
||||
|
||||
post_makeinstall_target() {
|
||||
rm -rf $INSTALL/usr
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="mpc"
|
||||
PKG_VERSION="1.0.1"
|
||||
PKG_VERSION="1.0.2"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="LGPL"
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="Mesa"
|
||||
PKG_VERSION="10.1.0"
|
||||
PKG_VERSION="10.1.6"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://www.mesa3d.org/"
|
||||
PKG_URL="ftp://freedesktop.org/pub/mesa/10.1/MesaLib-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS_TARGET="toolchain Python:host makedepend:host libxml2:host expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11 systemd dri3proto libxshmfence"
|
||||
PKG_URL="ftp://freedesktop.org/pub/mesa/$PKG_VERSION/MesaLib-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS_TARGET="toolchain Python:host makedepend:host libxml2:host expat glproto dri2proto presentproto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11 systemd dri3proto libxshmfence"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="graphics"
|
||||
PKG_SHORTDESC="mesa: 3-D graphics library with OpenGL API"
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
From 92e543c45da4581b1940178a94e6f2d66c749367 Mon Sep 17 00:00:00 2001
|
||||
From: Christian König <christian.koenig@amd.com>
|
||||
Date: Sat, 22 Mar 2014 20:30:07 +0000
|
||||
Subject: st/mesa: recreate sampler view on context change v3
|
||||
|
||||
With shared glx contexts it is possible that a texture is create and used
|
||||
in one context and then used in another one resulting in incorrect
|
||||
sampler view usage.
|
||||
|
||||
v2: avoid template copy
|
||||
v3: add XXX comment
|
||||
|
||||
Signed-off-by: Christian König <christian.koenig@amd.com>
|
||||
Cc: "10.0 10.1" <mesa-stable@lists.freedesktop.org>
|
||||
Reviewed-by: Brian Paul <brianp@vmware.com>
|
||||
---
|
||||
diff --git a/src/mesa/state_tracker/st_atom_texture.c b/src/mesa/state_tracker/st_atom_texture.c
|
||||
index 3557a3f..75e6fac 100644
|
||||
--- a/src/mesa/state_tracker/st_atom_texture.c
|
||||
+++ b/src/mesa/state_tracker/st_atom_texture.c
|
||||
@@ -198,6 +198,16 @@ st_get_texture_sampler_view_from_stobj(struct st_texture_object *stObj,
|
||||
if (!stObj->sampler_view) {
|
||||
stObj->sampler_view =
|
||||
st_create_texture_sampler_view_from_stobj(pipe, stObj, samp, format);
|
||||
+
|
||||
+ } else if (stObj->sampler_view->context != pipe) {
|
||||
+ /* Recreate view in correct context, use existing view as template */
|
||||
+ /* XXX: This isn't optimal, we should try to use more than one view.
|
||||
+ Otherwise we create/destroy the view all the time
|
||||
+ */
|
||||
+ struct pipe_sampler_view *sv =
|
||||
+ pipe->create_sampler_view(pipe, stObj->pt, stObj->sampler_view);
|
||||
+ pipe_sampler_view_reference(&stObj->sampler_view, NULL);
|
||||
+ stObj->sampler_view = sv;
|
||||
}
|
||||
|
||||
return stObj->sampler_view;
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
||||
@@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="bcm2835-driver"
|
||||
PKG_VERSION="3ade415"
|
||||
PKG_VERSION="462f3e3"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="nonfree"
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="gpu-viv-bin-mx6q"
|
||||
PKG_VERSION="3.5.7-1.0.0"
|
||||
PKG_VERSION="3.10.17-1.0.0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="arm"
|
||||
PKG_LICENSE="nonfree"
|
||||
@@ -53,6 +53,7 @@ makeinstall_target() {
|
||||
$FLOAT/usr/lib/libGLES_CM.so \
|
||||
$FLOAT/usr/lib/libGLESv1_CL.so* \
|
||||
$FLOAT/usr/lib/libGLESv1_CM.so* \
|
||||
$FLOAT/usr/lib/libGLESv2-fb.so \
|
||||
$FLOAT/usr/lib/libGLESv2.so* \
|
||||
$FLOAT/usr/lib/libGAL-fb.so \
|
||||
$FLOAT/usr/lib/libGAL.so* \
|
||||
@@ -68,6 +69,7 @@ makeinstall_target() {
|
||||
$FLOAT/usr/lib/libGLES_CM.so \
|
||||
$FLOAT/usr/lib/libGLESv1_CL.so* \
|
||||
$FLOAT/usr/lib/libGLESv1_CM.so* \
|
||||
$FLOAT/usr/lib/libGLESv2-fb.so \
|
||||
$FLOAT/usr/lib/libGLESv2.so* \
|
||||
$FLOAT/usr/lib/libGLSLC.so* \
|
||||
$FLOAT/usr/lib/libGAL-fb.so \
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libdrm"
|
||||
PKG_VERSION="2.4.52"
|
||||
PKG_VERSION="2.4.54"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libpng"
|
||||
PKG_VERSION="1.6.10"
|
||||
PKG_VERSION="1.6.12"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
|
||||
@@ -17,15 +17,15 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="gcc"
|
||||
PKG_VERSION="4.8.2"
|
||||
PKG_VERSION="4.9.0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://gcc.gnu.org/"
|
||||
PKG_URL="ftp://ftp.gnu.org/gnu/gcc/$PKG_NAME-$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS_BOOTSTRAP="ccache:host autoconf-2.64:host binutils:host gmp:host mpfr:host mpc:host cloog:host ppl:host"
|
||||
PKG_DEPENDS_BOOTSTRAP="ccache:host autoconf:host binutils:host gmp:host mpfr:host mpc:host cloog:host ppl:host"
|
||||
PKG_DEPENDS_TARGET="gcc:host"
|
||||
PKG_DEPENDS_HOST="ccache:host autoconf-2.64:host binutils:host gmp:host mpfr:host mpc:host cloog:host ppl:host eglibc"
|
||||
PKG_DEPENDS_HOST="ccache:host autoconf:host binutils:host gmp:host mpfr:host mpc:host cloog:host ppl:host eglibc"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="lang"
|
||||
PKG_SHORTDESC="gcc: The GNU Compiler Collection Version 4 (aka GNU C Compiler)"
|
||||
@@ -52,6 +52,8 @@ BOOTSTRAP_CONFIGURE_OPTS="--host=$HOST_NAME \
|
||||
--disable-libada \
|
||||
--disable-libmudflap \
|
||||
--disable-libatomic \
|
||||
--disable-libitm \
|
||||
--disable-libsanitizer \
|
||||
--enable-gold \
|
||||
--enable-ld=default \
|
||||
--enable-plugin \
|
||||
@@ -68,7 +70,8 @@ BOOTSTRAP_CONFIGURE_OPTS="--host=$HOST_NAME \
|
||||
--disable-decimal-float \
|
||||
$GCC_OPTS \
|
||||
--disable-nls \
|
||||
--disable-cloog-version-check"
|
||||
--disable-cloog-version-check \
|
||||
--enable-checking=release"
|
||||
|
||||
PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME \
|
||||
--with-sysroot=$SYSROOT_PREFIX \
|
||||
@@ -96,14 +99,17 @@ PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME \
|
||||
--enable-cloog-backend=isl \
|
||||
--enable-tls \
|
||||
--enable-shared \
|
||||
--disable-static \
|
||||
--enable-c99 \
|
||||
--enable-long-long \
|
||||
--enable-threads=posix \
|
||||
--disable-libstdcxx-pch \
|
||||
--enable-libstdcxx-time \
|
||||
--enable-clocale=gnu \
|
||||
$GCC_OPTS \
|
||||
--disable-nls \
|
||||
--disable-cloog-version-check"
|
||||
--disable-cloog-version-check \
|
||||
--enable-checking=release"
|
||||
|
||||
pre_configure_bootstrap() {
|
||||
setup_toolchain host
|
||||
@@ -129,7 +135,7 @@ post_make_host() {
|
||||
post_makeinstall_host() {
|
||||
cp -PR $TARGET_NAME/libstdc++-v3/src/.libs/libstdc++.so* $SYSROOT_PREFIX/usr/lib
|
||||
|
||||
GCC_VERSION=`$ROOT/$TOOLCHAIN/$TARGET_NAME/bin/gcc -dumpversion`
|
||||
GCC_VERSION=`$ROOT/$TOOLCHAIN/bin/${TARGET_NAME}-gcc -dumpversion`
|
||||
DATE="0501`echo $GCC_VERSION | sed 's/\([0-9]\)/0\1/g' | sed 's/\.//g'`"
|
||||
CROSS_CC=$TARGET_CC-$GCC_VERSION
|
||||
CROSS_CXX=$TARGET_CXX-$GCC_VERSION
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
--- a/gcc/config/arm/arm.c
|
||||
+++ a/gcc/config/arm/arm.c
|
||||
@@ -26547,6 +26547,7 @@ arm_expand_epilogue_apcs_frame (bool really_return)
|
||||
num_regs = bit_count (saved_regs_mask);
|
||||
if ((offsets->outgoing_args != (1 + num_regs)) || cfun->calls_alloca)
|
||||
{
|
||||
+ emit_insn (gen_blockage ());
|
||||
/* Unwind the stack to just below the saved registers. */
|
||||
emit_insn (gen_addsi3 (stack_pointer_rtx,
|
||||
hard_frame_pointer_rtx,
|
||||
@@ -1,60 +0,0 @@
|
||||
diff -Naur gcc-4.8.2/gcc/config/i386/linux64.h gcc-4.8.2.patch/gcc/config/i386/linux64.h
|
||||
--- gcc-4.8.2/gcc/config/i386/linux64.h 2013-01-10 21:38:27.000000000 +0100
|
||||
+++ gcc-4.8.2.patch/gcc/config/i386/linux64.h 2014-01-25 00:09:27.179269461 +0100
|
||||
@@ -28,5 +28,5 @@
|
||||
#define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
|
||||
|
||||
#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
|
||||
-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
|
||||
-#define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
|
||||
+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
|
||||
+#define GLIBC_DYNAMIC_LINKERX32 "/lib/ld-linux-x32.so.2"
|
||||
diff -Naur gcc-4.8.2/gcc/config/mips/linux64.h gcc-4.8.2.patch/gcc/config/mips/linux64.h
|
||||
--- gcc-4.8.2/gcc/config/mips/linux64.h 2013-01-10 21:38:27.000000000 +0100
|
||||
+++ gcc-4.8.2.patch/gcc/config/mips/linux64.h 2014-01-25 00:09:31.217263893 +0100
|
||||
@@ -23,9 +23,9 @@
|
||||
#define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32"
|
||||
|
||||
#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
|
||||
-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
|
||||
-#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
|
||||
-#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
|
||||
+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1"
|
||||
+#define GLIBC_DYNAMIC_LINKERN32 "/lib/ld.so.1"
|
||||
+#define UCLIBC_DYNAMIC_LINKERN32 "/lib/ld-uClibc.so.0"
|
||||
#define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
|
||||
#define GNU_USER_DYNAMIC_LINKERN32 \
|
||||
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
|
||||
diff -Naur gcc-4.8.2/gcc/config/rs6000/linux64.h gcc-4.8.2.patch/gcc/config/rs6000/linux64.h
|
||||
--- gcc-4.8.2/gcc/config/rs6000/linux64.h 2013-06-19 03:18:38.000000000 +0200
|
||||
+++ gcc-4.8.2.patch/gcc/config/rs6000/linux64.h 2014-01-25 00:09:31.217263893 +0100
|
||||
@@ -351,7 +351,7 @@
|
||||
#define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
|
||||
|
||||
#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
|
||||
-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
|
||||
+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
|
||||
#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
|
||||
#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
|
||||
#if DEFAULT_LIBC == LIBC_UCLIBC
|
||||
diff -Naur gcc-4.8.2/gcc/config/sparc/linux64.h gcc-4.8.2.patch/gcc/config/sparc/linux64.h
|
||||
--- gcc-4.8.2/gcc/config/sparc/linux64.h 2013-01-10 21:38:27.000000000 +0100
|
||||
+++ gcc-4.8.2.patch/gcc/config/sparc/linux64.h 2014-01-25 00:09:31.217263893 +0100
|
||||
@@ -93,7 +93,7 @@
|
||||
done. */
|
||||
|
||||
#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
|
||||
-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
|
||||
+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2"
|
||||
|
||||
#ifdef SPARC_BI_ARCH
|
||||
|
||||
@@ -201,7 +201,7 @@
|
||||
#else /* !SPARC_BI_ARCH */
|
||||
|
||||
#undef LINK_SPEC
|
||||
-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
|
||||
+#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib %{shared:-shared} \
|
||||
%{!shared: \
|
||||
%{!static: \
|
||||
%{rdynamic:-export-dynamic} \
|
||||
100
packages/lang/gcc/patches/gcc-4.9-PR60902-1.patch
Normal file
100
packages/lang/gcc/patches/gcc-4.9-PR60902-1.patch
Normal file
@@ -0,0 +1,100 @@
|
||||
From 0c5e8ed4943e302f6154e07368c0831e14c24187 Mon Sep 17 00:00:00 2001
|
||||
From: law <law@138bc75d-0d04-0410-961f-82ee72b054a4>
|
||||
Date: Tue, 13 May 2014 20:26:30 +0000
|
||||
Subject: [PATCH] PR tree-optimization/60902
|
||||
* tree-ssa-threadedge.c
|
||||
(record_temporary_equivalences_from_stmts_at_dest): Make sure to
|
||||
invalidate outputs from statements that do not produce useful
|
||||
outputs for threading.
|
||||
|
||||
PR tree-optimization/60902
|
||||
* gcc.target/i386/pr60902.c: New test.
|
||||
|
||||
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_9-branch@210398 138bc75d-0d04-0410-961f-82ee72b054a4
|
||||
---
|
||||
gcc/testsuite/gcc.target/i386/pr60902.c | 32 +++++++++++++++++++++++++++++++
|
||||
gcc/tree-ssa-threadedge.c | 29 +++++++++++++++++++++++++++-
|
||||
4 files changed, 79 insertions(+), 1 deletions(-)
|
||||
create mode 100644 gcc/testsuite/gcc.target/i386/pr60902.c
|
||||
|
||||
diff --git a/gcc/testsuite/gcc.target/i386/pr60902.c b/gcc/testsuite/gcc.target/i386/pr60902.c
|
||||
new file mode 100644
|
||||
index 0000000..b81dcd7
|
||||
--- /dev/null
|
||||
+++ b/gcc/testsuite/gcc.target/i386/pr60902.c
|
||||
@@ -0,0 +1,32 @@
|
||||
+/* { dg-do run } */
|
||||
+/* { dg-options "-O2" } */
|
||||
+extern void abort ();
|
||||
+extern void exit (int);
|
||||
+
|
||||
+int x;
|
||||
+
|
||||
+foo()
|
||||
+{
|
||||
+ static int count;
|
||||
+ count++;
|
||||
+ if (count > 1)
|
||||
+ abort ();
|
||||
+}
|
||||
+
|
||||
+static inline int
|
||||
+frob ()
|
||||
+{
|
||||
+ int a;
|
||||
+ __asm__ ("mov %1, %0\n\t" : "=r" (a) : "m" (x));
|
||||
+ x++;
|
||||
+ return a;
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+main ()
|
||||
+{
|
||||
+ int i;
|
||||
+ for (i = 0; i < 10 && frob () == 0; i++)
|
||||
+ foo();
|
||||
+ exit (0);
|
||||
+}
|
||||
diff --git a/gcc/tree-ssa-threadedge.c b/gcc/tree-ssa-threadedge.c
|
||||
index c447b72..8a0103b 100644
|
||||
--- a/gcc/tree-ssa-threadedge.c
|
||||
+++ b/gcc/tree-ssa-threadedge.c
|
||||
@@ -387,7 +387,34 @@ record_temporary_equivalences_from_stmts_at_dest (edge e,
|
||||
&& (gimple_code (stmt) != GIMPLE_CALL
|
||||
|| gimple_call_lhs (stmt) == NULL_TREE
|
||||
|| TREE_CODE (gimple_call_lhs (stmt)) != SSA_NAME))
|
||||
- continue;
|
||||
+ {
|
||||
+ /* STMT might still have DEFS and we need to invalidate any known
|
||||
+ equivalences for them.
|
||||
+
|
||||
+ Consider if STMT is a GIMPLE_ASM with one or more outputs that
|
||||
+ feeds a conditional inside a loop. We might derive an equivalence
|
||||
+ due to the conditional. */
|
||||
+ tree op;
|
||||
+ ssa_op_iter iter;
|
||||
+
|
||||
+ if (backedge_seen)
|
||||
+ FOR_EACH_SSA_TREE_OPERAND (op, stmt, iter, SSA_OP_ALL_DEFS)
|
||||
+ {
|
||||
+ /* This call only invalidates equivalences created by
|
||||
+ PHI nodes. This is by design to keep the cost of
|
||||
+ of invalidation reasonable. */
|
||||
+ invalidate_equivalences (op, stack, src_map, dst_map);
|
||||
+
|
||||
+ /* However, conditionals can imply values for real
|
||||
+ operands as well. And those won't be recorded in the
|
||||
+ maps. In fact, those equivalences may be recorded totally
|
||||
+ outside the threading code. We can just create a new
|
||||
+ temporary NULL equivalence here. */
|
||||
+ record_temporary_equivalence (op, NULL_TREE, stack);
|
||||
+ }
|
||||
+
|
||||
+ continue;
|
||||
+ }
|
||||
|
||||
/* The result of __builtin_object_size depends on all the arguments
|
||||
of a phi node. Temporarily using only one edge produces invalid
|
||||
--
|
||||
1.7.1
|
||||
|
||||
30
packages/lang/gcc/patches/gcc-4.9-PR60902-2.patch
Normal file
30
packages/lang/gcc/patches/gcc-4.9-PR60902-2.patch
Normal file
@@ -0,0 +1,30 @@
|
||||
From 4de76fa443ab107e4542bbdba242f0ed467cfecf Mon Sep 17 00:00:00 2001
|
||||
From: law <law@138bc75d-0d04-0410-961f-82ee72b054a4>
|
||||
Date: Tue, 13 May 2014 20:26:41 +0000
|
||||
Subject: [PATCH] PR tree-optimization/60902
|
||||
* tree-ssa-threadedge.c
|
||||
(record_temporary_equivalences_from_stmts_at_dest): Only iterate
|
||||
over real defs when invalidating outputs from statements that do not
|
||||
produce useful outputs for threading.
|
||||
|
||||
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_9-branch@210399 138bc75d-0d04-0410-961f-82ee72b054a4
|
||||
---
|
||||
gcc/tree-ssa-threadedge.c | 2 +-
|
||||
2 files changed, 10 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/gcc/tree-ssa-threadedge.c b/gcc/tree-ssa-threadedge.c
|
||||
index 8a0103b..7621348 100644
|
||||
--- a/gcc/tree-ssa-threadedge.c
|
||||
+++ b/gcc/tree-ssa-threadedge.c
|
||||
@@ -398,7 +398,7 @@ record_temporary_equivalences_from_stmts_at_dest (edge e,
|
||||
ssa_op_iter iter;
|
||||
|
||||
if (backedge_seen)
|
||||
- FOR_EACH_SSA_TREE_OPERAND (op, stmt, iter, SSA_OP_ALL_DEFS)
|
||||
+ FOR_EACH_SSA_TREE_OPERAND (op, stmt, iter, SSA_OP_DEF)
|
||||
{
|
||||
/* This call only invalidates equivalences created by
|
||||
PHI nodes. This is by design to keep the cost of
|
||||
--
|
||||
1.7.1
|
||||
|
||||
32
packages/lang/gcc/patches/gcc-allow-newer-autoconf.patch
Normal file
32
packages/lang/gcc/patches/gcc-allow-newer-autoconf.patch
Normal file
@@ -0,0 +1,32 @@
|
||||
From c611cd5416ff1042a4adec0e1b12c71e307b508d Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Saraev <stefan@saraev.ca>
|
||||
Date: Thu, 24 Apr 2014 22:33:27 +0300
|
||||
Subject: [PATCH] allow newer autoconf
|
||||
|
||||
---
|
||||
config/override.m4 | 9 ---------
|
||||
1 files changed, 0 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/config/override.m4 b/config/override.m4
|
||||
index 52bd1c3..6c39656 100644
|
||||
--- a/config/override.m4
|
||||
+++ b/config/override.m4
|
||||
@@ -38,15 +38,6 @@ dnl m4_define([_GCC_AUTOCONF_VERSION], [X.Y])
|
||||
dnl in configure.ac before AC_INIT,
|
||||
dnl without rewriting this file.
|
||||
dnl Or for updating the whole tree at once with the definition above.
|
||||
-AC_DEFUN([_GCC_AUTOCONF_VERSION_CHECK],
|
||||
-[m4_if(m4_defn([_GCC_AUTOCONF_VERSION]),
|
||||
- m4_defn([m4_PACKAGE_VERSION]), [],
|
||||
- [m4_fatal([Please use exactly Autoconf ]_GCC_AUTOCONF_VERSION[ instead of ]m4_defn([m4_PACKAGE_VERSION])[.])])
|
||||
-])
|
||||
-m4_define([AC_INIT], m4_defn([AC_INIT])[
|
||||
-_GCC_AUTOCONF_VERSION_CHECK
|
||||
-])
|
||||
-
|
||||
|
||||
dnl Ensure we do not use a buggy M4.
|
||||
m4_if(m4_index([..wi.d.], [.d.]), [-1],
|
||||
--
|
||||
1.7.2.5
|
||||
|
||||
71
packages/lang/gcc/patches/gcc-dynamic_linker.patch
Normal file
71
packages/lang/gcc/patches/gcc-dynamic_linker.patch
Normal file
@@ -0,0 +1,71 @@
|
||||
diff -Naur gcc-4.9.0/gcc/config/i386/linux64.h gcc-4.9.0.patch/gcc/config/i386/linux64.h
|
||||
--- gcc-4.9.0/gcc/config/i386/linux64.h 2014-01-02 23:23:26.000000000 +0100
|
||||
+++ gcc-4.9.0.patch/gcc/config/i386/linux64.h 2014-04-22 20:27:05.853832561 +0200
|
||||
@@ -28,5 +28,5 @@
|
||||
#define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
|
||||
|
||||
#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
|
||||
-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
|
||||
-#define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
|
||||
+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
|
||||
+#define GLIBC_DYNAMIC_LINKERX32 "/lib/ld-linux-x32.so.2"
|
||||
diff -Naur gcc-4.9.0/gcc/config/mips/linux64.h gcc-4.9.0.patch/gcc/config/mips/linux64.h
|
||||
--- gcc-4.9.0/gcc/config/mips/linux64.h 2014-01-02 23:23:26.000000000 +0100
|
||||
+++ gcc-4.9.0.patch/gcc/config/mips/linux64.h 2014-04-22 20:28:54.699515966 +0200
|
||||
@@ -25,9 +25,9 @@
|
||||
#define GLIBC_DYNAMIC_LINKER32 \
|
||||
"%{mnan=2008:/lib/ld-linux-mipsn8.so.1;:/lib/ld.so.1}"
|
||||
#define GLIBC_DYNAMIC_LINKER64 \
|
||||
- "%{mnan=2008:/lib64/ld-linux-mipsn8.so.1;:/lib64/ld.so.1}"
|
||||
+ "%{mnan=2008:/lib64/ld-linux-mipsn8.so.1;:/lib/ld.so.1}"
|
||||
#define GLIBC_DYNAMIC_LINKERN32 \
|
||||
- "%{mnan=2008:/lib32/ld-linux-mipsn8.so.1;:/lib32/ld.so.1}"
|
||||
+ "%{mnan=2008:/lib32/ld-linux-mipsn8.so.1;:/lib/ld.so.1}"
|
||||
|
||||
#undef UCLIBC_DYNAMIC_LINKER32
|
||||
#define UCLIBC_DYNAMIC_LINKER32 \
|
||||
@@ -36,7 +36,7 @@
|
||||
#define UCLIBC_DYNAMIC_LINKER64 \
|
||||
"%{mnan=2008:/lib/ld64-uClibc-mipsn8.so.0;:/lib/ld64-uClibc.so.0}"
|
||||
#define UCLIBC_DYNAMIC_LINKERN32 \
|
||||
- "%{mnan=2008:/lib32/ld-uClibc-mipsn8.so.0;:/lib32/ld-uClibc.so.0}"
|
||||
+ "%{mnan=2008:/lib32/ld-uClibc-mipsn8.so.0;:/lib/ld-uClibc.so.0}"
|
||||
|
||||
#define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
|
||||
#define GNU_USER_DYNAMIC_LINKERN32 \
|
||||
diff -Naur gcc-4.9.0/gcc/config/rs6000/linux64.h gcc-4.9.0.patch/gcc/config/rs6000/linux64.h
|
||||
--- gcc-4.9.0/gcc/config/rs6000/linux64.h 2014-01-02 23:23:26.000000000 +0100
|
||||
+++ gcc-4.9.0.patch/gcc/config/rs6000/linux64.h 2014-04-22 20:30:39.567210839 +0200
|
||||
@@ -369,9 +369,9 @@
|
||||
|
||||
#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
|
||||
#ifdef LINUX64_DEFAULT_ABI_ELFv2
|
||||
-#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv1:/lib64/ld64.so.1;:/lib64/ld64.so.2}"
|
||||
+#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv1:/lib/ld64.so.1;:/lib/ld64.so.2}"
|
||||
#else
|
||||
-#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv2:/lib64/ld64.so.2;:/lib64/ld64.so.1}"
|
||||
+#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv2:/lib/ld64.so.2;:/lib/ld64.so.1}"
|
||||
#endif
|
||||
#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
|
||||
#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
|
||||
diff -Naur gcc-4.9.0/gcc/config/sparc/linux64.h gcc-4.9.0.patch/gcc/config/sparc/linux64.h
|
||||
--- gcc-4.9.0/gcc/config/sparc/linux64.h 2014-01-02 23:23:26.000000000 +0100
|
||||
+++ gcc-4.9.0.patch/gcc/config/sparc/linux64.h 2014-04-22 20:27:05.854832558 +0200
|
||||
@@ -93,7 +93,7 @@
|
||||
done. */
|
||||
|
||||
#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
|
||||
-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
|
||||
+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2"
|
||||
|
||||
#ifdef SPARC_BI_ARCH
|
||||
|
||||
@@ -201,7 +201,7 @@
|
||||
#else /* !SPARC_BI_ARCH */
|
||||
|
||||
#undef LINK_SPEC
|
||||
-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
|
||||
+#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib %{shared:-shared} \
|
||||
%{!shared: \
|
||||
%{!static: \
|
||||
%{rdynamic:-export-dynamic} \
|
||||
@@ -1,118 +0,0 @@
|
||||
Date: Tue, 18 Jun 2013 16:42:13 +0100
|
||||
From: Julian Brown <julian at codesourcery dot com>
|
||||
To: <gcc-patches at gcc dot gnu dot org>, Richard Earnshaw <Richard dot Earnshaw at arm dot com>, Ramana Radhakrishnan <ramrad01 at arm dot com>
|
||||
Subject: [PATCH, ARM] Reintroduce minipool ranges for zero-extension insn patterns
|
||||
|
||||
Hi,
|
||||
|
||||
The following patch removed pool_range/neg_pool_range attributes from
|
||||
several instructions as a cleanup, which I believe to have been
|
||||
incorrect:
|
||||
|
||||
http://gcc.gnu.org/ml/gcc-patches/2010-07/msg01036.html
|
||||
|
||||
On a Mentor-local branch, this caused problems with instructions like:
|
||||
|
||||
(insn 77 53 87 (set (reg:SI 8 r8 [orig:197 s.4 ] [197])
|
||||
(zero_extend:SI (mem/u/c:HI (symbol_ref/u:SI ("*.LC0") [flags 0x2]) [7 S2 A16]))) [...] 161 {*arm_zero_extendhisi2_v6}
|
||||
(nil))
|
||||
|
||||
The reasoning behind the cleanup was that the instructions in question
|
||||
have no immediate constraints -- but the minipool code is used for more
|
||||
than just immediates, e.g. in the above case where a symbol reference
|
||||
("m") is loaded.
|
||||
|
||||
I don't have a test case for the problem on mainline at present, but I
|
||||
believe it is still a latent bug. Tested with the default multilibs (ARM
|
||||
& Thumb mode) on arm-none-eabi, with no regressions. (The patch has
|
||||
also been tested with more multilibs on our local branches for a while,
|
||||
and I did ensure previously that it did not adversely affect Bernd's
|
||||
patch linked above.)
|
||||
|
||||
OK to apply?
|
||||
|
||||
Thanks,
|
||||
|
||||
Julian
|
||||
|
||||
ChangeLog
|
||||
|
||||
gcc/
|
||||
* arm.md (*thumb1_zero_extendhisi2, *arm_zero_extendhisi2)
|
||||
(*arm_zero_extendhisi2_v6, *thumb1_zero_extendqisi2)
|
||||
(*thumb1_zero_extendqisi2_v6, *arm_zero_extendqisi2)
|
||||
(*arm_zero_extendqisi2_v6): Add pool_range, neg_pool_range
|
||||
attributes.
|
||||
|
||||
|
||||
Index: gcc/config/arm/arm.md
|
||||
===================================================================
|
||||
--- a/gcc/config/arm/arm.md (revision 200171)
|
||||
+++ b/gcc/config/arm/arm.md (working copy)
|
||||
@@ -5313,7 +5313,8 @@
|
||||
[(if_then_else (eq_attr "is_arch6" "yes")
|
||||
(const_int 2) (const_int 4))
|
||||
(const_int 4)])
|
||||
- (set_attr "type" "simple_alu_shift, load_byte")]
|
||||
+ (set_attr "type" "simple_alu_shift, load_byte")
|
||||
+ (set_attr "pool_range" "*,60")]
|
||||
)
|
||||
|
||||
(define_insn "*arm_zero_extendhisi2"
|
||||
@@ -5324,7 +5325,9 @@
|
||||
#
|
||||
ldr%(h%)\\t%0, %1"
|
||||
[(set_attr "type" "alu_shift,load_byte")
|
||||
- (set_attr "predicable" "yes")]
|
||||
+ (set_attr "predicable" "yes")
|
||||
+ (set_attr "pool_range" "*,256")
|
||||
+ (set_attr "neg_pool_range" "*,244")]
|
||||
)
|
||||
|
||||
(define_insn "*arm_zero_extendhisi2_v6"
|
||||
@@ -5335,7 +5338,9 @@
|
||||
uxth%?\\t%0, %1
|
||||
ldr%(h%)\\t%0, %1"
|
||||
[(set_attr "predicable" "yes")
|
||||
- (set_attr "type" "simple_alu_shift,load_byte")]
|
||||
+ (set_attr "type" "simple_alu_shift,load_byte")
|
||||
+ (set_attr "pool_range" "*,256")
|
||||
+ (set_attr "neg_pool_range" "*,244")]
|
||||
)
|
||||
|
||||
(define_insn "*arm_zero_extendhisi2addsi"
|
||||
@@ -5405,7 +5410,8 @@
|
||||
uxtb\\t%0, %1
|
||||
ldrb\\t%0, %1"
|
||||
[(set_attr "length" "2")
|
||||
- (set_attr "type" "simple_alu_shift,load_byte")]
|
||||
+ (set_attr "type" "simple_alu_shift,load_byte")
|
||||
+ (set_attr "pool_range" "*,32")]
|
||||
)
|
||||
|
||||
(define_insn "*arm_zero_extendqisi2"
|
||||
@@ -5417,7 +5423,9 @@
|
||||
ldr%(b%)\\t%0, %1\\t%@ zero_extendqisi2"
|
||||
[(set_attr "length" "8,4")
|
||||
(set_attr "type" "alu_shift,load_byte")
|
||||
- (set_attr "predicable" "yes")]
|
||||
+ (set_attr "predicable" "yes")
|
||||
+ (set_attr "pool_range" "*,4096")
|
||||
+ (set_attr "neg_pool_range" "*,4084")]
|
||||
)
|
||||
|
||||
(define_insn "*arm_zero_extendqisi2_v6"
|
||||
@@ -5428,7 +5436,9 @@
|
||||
uxtb%(%)\\t%0, %1
|
||||
ldr%(b%)\\t%0, %1\\t%@ zero_extendqisi2"
|
||||
[(set_attr "type" "simple_alu_shift,load_byte")
|
||||
- (set_attr "predicable" "yes")]
|
||||
+ (set_attr "predicable" "yes")
|
||||
+ (set_attr "pool_range" "*,4096")
|
||||
+ (set_attr "neg_pool_range" "*,4084")]
|
||||
)
|
||||
|
||||
(define_insn "*arm_zero_extendqisi2addsi"
|
||||
|
||||
--MP_/ERKB4.gCWGZVf9oWJO6IZSe--
|
||||
|
||||
@@ -17,12 +17,13 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="llvm"
|
||||
PKG_VERSION="3.4"
|
||||
PKG_VERSION="3.4.2"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://llvm.org/"
|
||||
PKG_URL="http://llvm.org/releases/3.4/${PKG_NAME}-${PKG_VERSION}.src.tar.gz"
|
||||
PKG_URL="http://llvm.org/releases/$PKG_VERSION/${PKG_NAME}-${PKG_VERSION}.src.tar.gz"
|
||||
PKG_SOURCE_DIR="${PKG_NAME}-${PKG_VERSION}.src"
|
||||
PKG_DEPENDS_HOST=""
|
||||
PKG_DEPENDS_TARGET="toolchain llvm:host"
|
||||
PKG_PRIORITY="optional"
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
diff -Naur RTL8188EU-fcc9034/os_dep/usb_intf.c RTL8188EU-fcc9034.patch/os_dep/usb_intf.c
|
||||
--- RTL8188EU-fcc9034/os_dep/usb_intf.c 2014-03-25 15:05:52.000000000 +0100
|
||||
+++ RTL8188EU-fcc9034.patch/os_dep/usb_intf.c 2014-04-28 17:42:46.059538024 +0200
|
||||
@@ -865,7 +865,6 @@
|
||||
RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+rtw_drv_entry\n"));
|
||||
|
||||
DBG_88E(DRV_NAME " driver version=%s\n", DRIVERVERSION);
|
||||
- DBG_88E("build time: %s %s\n", __DATE__, __TIME__);
|
||||
|
||||
rtw_suspend_lock_init();
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur RTL8192CU-v4.0.2_9000.20130911/os_dep/linux/usb_intf.c RTL8192CU-v4.0.2_9000.20130911.patch/os_dep/linux/usb_intf.c
|
||||
--- RTL8192CU-v4.0.2_9000.20130911/os_dep/linux/usb_intf.c 2013-09-11 05:56:55.000000000 +0200
|
||||
+++ RTL8192CU-v4.0.2_9000.20130911.patch/os_dep/linux/usb_intf.c 2014-04-01 20:21:56.601914791 +0200
|
||||
+++ RTL8192CU-v4.0.2_9000.20130911.patch/os_dep/linux/usb_intf.c 2014-06-08 15:44:13.239381855 +0200
|
||||
@@ -96,6 +96,7 @@
|
||||
{USB_DEVICE(0x2019, 0xED17)},/* PCI - Edimax */ \
|
||||
{USB_DEVICE(0x0DF6, 0x0052)},/* Sitecom - Edimax */ \
|
||||
@@ -9,3 +9,14 @@ diff -Naur RTL8192CU-v4.0.2_9000.20130911/os_dep/linux/usb_intf.c RTL8192CU-v4.0
|
||||
{USB_DEVICE(0x07B8, 0x8189)},/* Abocom - Abocom */ \
|
||||
{USB_DEVICE(0x0EB0, 0x9071)},/* NO Brand - Etop */ \
|
||||
{USB_DEVICE(0x06F8, 0xE033)},/* Hercules - Edimax */ \
|
||||
@@ -144,8 +145,10 @@
|
||||
{USB_DEVICE(0x07B8, 0x8178)},/* Abocom - Abocom */ \
|
||||
{USB_DEVICE(0x07AA, 0x0056)},/* ATKK - Gemtek */ \
|
||||
{USB_DEVICE(0x4855, 0x0091)},/* - Feixun */ \
|
||||
+ {USB_DEVICE(0x050D, 0x11F2)},/* Belkin - Edimax */ \
|
||||
{USB_DEVICE(0x050D, 0x2102)},/* Belkin - Sercomm */ \
|
||||
{USB_DEVICE(0x050D, 0x2103)},/* Belkin - Edimax */ \
|
||||
+ {USB_DEVICE(0x050D, 0x21F2)},/* Belkin - Edimax */ \
|
||||
{USB_DEVICE(0x20F4, 0x624D)},/* TRENDnet */ \
|
||||
{USB_DEVICE(0x0DF6, 0x0061)},/* Sitecom - Edimax */ \
|
||||
{USB_DEVICE(0x0B05, 0x17AB)},/* ASUS - Edimax */ \
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
diff -Naur RTL8192CU-v4.0.2_9000.20130911/os_dep/linux/pci_intf.c RTL8192CU-v4.0.2_9000.20130911.patch/os_dep/linux/pci_intf.c
|
||||
--- RTL8192CU-v4.0.2_9000.20130911/os_dep/linux/pci_intf.c 2013-09-11 05:56:55.000000000 +0200
|
||||
+++ RTL8192CU-v4.0.2_9000.20130911.patch/os_dep/linux/pci_intf.c 2014-04-22 23:25:02.082908033 +0200
|
||||
@@ -1963,7 +1963,6 @@
|
||||
|
||||
RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+rtw_drv_entry\n"));
|
||||
DBG_871X("rtw driver version=%s\n", DRIVERVERSION);
|
||||
- DBG_871X("Build at: %s %s\n", __DATE__, __TIME__);
|
||||
pci_drvpriv.drv_registered = _TRUE;
|
||||
|
||||
rtw_suspend_lock_init();
|
||||
diff -Naur RTL8192CU-v4.0.2_9000.20130911/os_dep/linux/usb_intf.c RTL8192CU-v4.0.2_9000.20130911.patch/os_dep/linux/usb_intf.c
|
||||
--- RTL8192CU-v4.0.2_9000.20130911/os_dep/linux/usb_intf.c 2013-09-11 05:56:55.000000000 +0200
|
||||
+++ RTL8192CU-v4.0.2_9000.20130911.patch/os_dep/linux/usb_intf.c 2014-04-22 23:25:21.337862827 +0200
|
||||
@@ -1577,7 +1577,6 @@
|
||||
RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+rtw_drv_entry\n"));
|
||||
|
||||
DBG_871X(DRV_NAME " driver version=%s\n", DRIVERVERSION);
|
||||
- DBG_871X("build time: %s %s\n", __DATE__, __TIME__);
|
||||
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
|
||||
//console_suspend_enabled=0;
|
||||
@@ -0,0 +1,12 @@
|
||||
diff -Naur RTL8192DU-085e206/os_dep/usb_intf.c RTL8192DU-085e206.patch/os_dep/usb_intf.c
|
||||
--- RTL8192DU-085e206/os_dep/usb_intf.c 2014-03-25 15:48:57.000000000 +0100
|
||||
+++ RTL8192DU-085e206.patch/os_dep/usb_intf.c 2014-04-11 09:23:12.097223906 +0200
|
||||
@@ -137,7 +137,7 @@
|
||||
{USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8194)},/* 8192DU-VS */ \
|
||||
{USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8111)},/* Realtek 5G dongle for WiFi Display */ \
|
||||
{USB_DEVICE(USB_VENDER_ID_REALTEK, 0x0193)},/* 8192DE-VAU */ \
|
||||
- {USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8171)},/* 8192DU-VC */ \
|
||||
+/* {USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8171)}, 8192DU-VC overlaps with in-kernel rtl8192se */ \
|
||||
/*=== Customer ID ===*/ \
|
||||
/****** 8192DU-VC ********/ \
|
||||
{USB_DEVICE(0x2019, 0xAB2C)},/* PCI - Abocm */ \
|
||||
@@ -16,19 +16,19 @@
|
||||
# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>.
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="RTL8723AU"
|
||||
PKG_VERSION="9af1588"
|
||||
PKG_NAME="RTL8812AU"
|
||||
PKG_VERSION="b22cbdf"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://github.com/lwfinger/rtl8723au"
|
||||
PKG_SITE="git@github.com:wuzzeb/rtl8812AU_8821AU_linux.git"
|
||||
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_DEPENDS_TARGET="toolchain linux"
|
||||
PKG_NEED_UNPACK="$LINUX_DEPENDS"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="driver"
|
||||
PKG_SHORTDESC="Realtek RTL8723AU Linux 3.x driver"
|
||||
PKG_LONGDESC="Realtek RTL8723AU Linux 3.x driver"
|
||||
PKG_SHORTDESC="Realtek RTL8812AU Linux 3.x driver"
|
||||
PKG_LONGDESC="Realtek RTL8812AU Linux 3.x driver"
|
||||
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="no"
|
||||
@@ -1,8 +1,7 @@
|
||||
diff --git a/x86-32/src/wl/sys/wl_linux.c b/x86-32/src/wl/sys/wl_linux.c
|
||||
index 9ee69e1..409bda7 100644
|
||||
--- a/x86-32/src/wl/sys/wl_linux.c
|
||||
+++ b/x86-32/src/wl/sys/wl_linux.c
|
||||
@@ -2693,7 +2693,7 @@ wl_tkip_keyset(wl_info_t *wl, wsec_key_t *key)
|
||||
diff -Naur bcm_sta-6.20.155.1/x86-32/src/wl/sys/wl_linux.c bcm_sta-6.20.155.1.patch/x86-32/src/wl/sys/wl_linux.c
|
||||
--- bcm_sta-6.20.155.1/x86-32/src/wl/sys/wl_linux.c 2013-04-14 23:10:38.000000000 +0200
|
||||
+++ bcm_sta-6.20.155.1.patch/x86-32/src/wl/sys/wl_linux.c 2014-05-14 21:47:59.249976234 +0200
|
||||
@@ -2681,7 +2681,7 @@
|
||||
void
|
||||
wl_tkip_printstats(wl_info_t *wl, bool group_key)
|
||||
{
|
||||
@@ -11,7 +10,7 @@ index 9ee69e1..409bda7 100644
|
||||
char debug_buf[512];
|
||||
int idx;
|
||||
if (wl->tkipmodops) {
|
||||
@@ -2855,6 +2855,7 @@ wl_linux_watchdog(void *ctx)
|
||||
@@ -2843,6 +2843,7 @@
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -19,7 +18,7 @@ index 9ee69e1..409bda7 100644
|
||||
static int
|
||||
wl_proc_read(char *buffer, char **start, off_t offset, int length, int *eof, void *data)
|
||||
{
|
||||
@@ -2909,18 +2910,89 @@ wl_proc_write(struct file *filp, const char *buff, unsigned long length, void *d
|
||||
@@ -2897,18 +2898,89 @@
|
||||
return length;
|
||||
}
|
||||
|
||||
@@ -99,7 +98,7 @@ index 9ee69e1..409bda7 100644
|
||||
+ wl->proc_entry->read_proc = wl_proc_read;
|
||||
+ wl->proc_entry->write_proc = wl_proc_write;
|
||||
+ wl->proc_entry->data = wl;
|
||||
+ }
|
||||
+ }
|
||||
+#else
|
||||
+ wl->proc_entry = proc_create_data(tmp, 0644, NULL, &wl_proc_fops, wl);
|
||||
+#endif
|
||||
@@ -113,24 +112,10 @@ index 9ee69e1..409bda7 100644
|
||||
- wl->proc_entry->data = wl;
|
||||
return 0;
|
||||
}
|
||||
diff --git a/x86-32/src/wl/sys/wl_linux.c.orig b/x86-32/src/wl/sys/wl_linux.c.orig
|
||||
index 38206ab..9ee69e1 100644
|
||||
--- a/x86-32/src/wl/sys/wl_linux.c.orig
|
||||
+++ b/x86-32/src/wl/sys/wl_linux.c.orig
|
||||
@@ -219,7 +219,7 @@ module_param(nompc, int, 0);
|
||||
#define quote_str(s) to_str(s)
|
||||
|
||||
#ifndef BRCM_WLAN_IFNAME
|
||||
-#define BRCM_WLAN_IFNAME eth%d
|
||||
+#define BRCM_WLAN_IFNAME wlan%d
|
||||
#endif
|
||||
|
||||
static char intf_name[IFNAMSIZ] = quote_str(BRCM_WLAN_IFNAME);
|
||||
diff --git a/x86-64/src/wl/sys/wl_linux.c b/x86-64/src/wl/sys/wl_linux.c
|
||||
index 9ee69e1..409bda7 100644
|
||||
--- a/x86-64/src/wl/sys/wl_linux.c
|
||||
+++ b/x86-64/src/wl/sys/wl_linux.c
|
||||
@@ -2693,7 +2693,7 @@ wl_tkip_keyset(wl_info_t *wl, wsec_key_t *key)
|
||||
diff -Naur bcm_sta-6.20.155.1/x86-64/src/wl/sys/wl_linux.c bcm_sta-6.20.155.1.patch/x86-64/src/wl/sys/wl_linux.c
|
||||
--- bcm_sta-6.20.155.1/x86-64/src/wl/sys/wl_linux.c 2013-04-14 23:10:38.000000000 +0200
|
||||
+++ bcm_sta-6.20.155.1.patch/x86-64/src/wl/sys/wl_linux.c 2014-05-14 21:48:16.002975186 +0200
|
||||
@@ -2681,7 +2681,7 @@
|
||||
void
|
||||
wl_tkip_printstats(wl_info_t *wl, bool group_key)
|
||||
{
|
||||
@@ -139,7 +124,7 @@ index 9ee69e1..409bda7 100644
|
||||
char debug_buf[512];
|
||||
int idx;
|
||||
if (wl->tkipmodops) {
|
||||
@@ -2855,6 +2855,7 @@ wl_linux_watchdog(void *ctx)
|
||||
@@ -2843,6 +2843,7 @@
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -147,7 +132,7 @@ index 9ee69e1..409bda7 100644
|
||||
static int
|
||||
wl_proc_read(char *buffer, char **start, off_t offset, int length, int *eof, void *data)
|
||||
{
|
||||
@@ -2909,18 +2910,89 @@ wl_proc_write(struct file *filp, const char *buff, unsigned long length, void *d
|
||||
@@ -2897,18 +2898,89 @@
|
||||
return length;
|
||||
}
|
||||
|
||||
@@ -227,7 +212,7 @@ index 9ee69e1..409bda7 100644
|
||||
+ wl->proc_entry->read_proc = wl_proc_read;
|
||||
+ wl->proc_entry->write_proc = wl_proc_write;
|
||||
+ wl->proc_entry->data = wl;
|
||||
+ }
|
||||
+ }
|
||||
+#else
|
||||
+ wl->proc_entry = proc_create_data(tmp, 0644, NULL, &wl_proc_fops, wl);
|
||||
+#endif
|
||||
@@ -241,16 +226,3 @@ index 9ee69e1..409bda7 100644
|
||||
- wl->proc_entry->data = wl;
|
||||
return 0;
|
||||
}
|
||||
diff --git a/x86-64/src/wl/sys/wl_linux.c.orig b/x86-64/src/wl/sys/wl_linux.c.orig
|
||||
index 38206ab..9ee69e1 100644
|
||||
--- a/x86-64/src/wl/sys/wl_linux.c.orig
|
||||
+++ b/x86-64/src/wl/sys/wl_linux.c.orig
|
||||
@@ -219,7 +219,7 @@ module_param(nompc, int, 0);
|
||||
#define quote_str(s) to_str(s)
|
||||
|
||||
#ifndef BRCM_WLAN_IFNAME
|
||||
-#define BRCM_WLAN_IFNAME eth%d
|
||||
+#define BRCM_WLAN_IFNAME wlan%d
|
||||
#endif
|
||||
|
||||
static char intf_name[IFNAMSIZ] = quote_str(BRCM_WLAN_IFNAME);
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
--- a/x86-32/src/wl/sys/wl_linux.c
|
||||
+++ b/x86-32/src/wl/sys/wl_linux.c
|
||||
@@ -1773,8 +1773,8 @@
|
||||
void
|
||||
wl_dump_ver(wl_info_t *wl, struct bcmstrbuf *b)
|
||||
{
|
||||
- bcm_bprintf(b, "wl%d: %s %s version %s\n", wl->pub->unit,
|
||||
- __DATE__, __TIME__, EPI_VERSION_STR);
|
||||
+ bcm_bprintf(b, "wl%d: version %s\n", wl->pub->unit,
|
||||
+ EPI_VERSION_STR);
|
||||
}
|
||||
|
||||
#if defined(BCMDBG)
|
||||
|
||||
--- a/x86-64/src/wl/sys/wl_linux.c
|
||||
+++b/x86-64/src/wl/sys/wl_linux.c
|
||||
@@ -1773,8 +1773,8 @@
|
||||
void
|
||||
wl_dump_ver(wl_info_t *wl, struct bcmstrbuf *b)
|
||||
{
|
||||
- bcm_bprintf(b, "wl%d: %s %s version %s\n", wl->pub->unit,
|
||||
- __DATE__, __TIME__, EPI_VERSION_STR);
|
||||
+ bcm_bprintf(b, "wl%d: version %s\n", wl->pub->unit,
|
||||
+ EPI_VERSION_STR);
|
||||
}
|
||||
|
||||
#if defined(BCMDBG)
|
||||
@@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="dvb-firmware"
|
||||
PKG_VERSION="0.0.38"
|
||||
PKG_VERSION="0.0.41"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="Free-to-use"
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="misc-firmware"
|
||||
PKG_VERSION="0.0.9"
|
||||
PKG_VERSION="0.0.11"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="Free-to-use"
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="wlan-firmware"
|
||||
PKG_VERSION="0.0.18"
|
||||
PKG_VERSION="0.0.23"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="Free-to-use"
|
||||
|
||||
BIN
packages/linux/firmware/radeon/BONAIRE_mc2.bin
Normal file
BIN
packages/linux/firmware/radeon/BONAIRE_mc2.bin
Normal file
Binary file not shown.
BIN
packages/linux/firmware/radeon/BONAIRE_vce.bin
Normal file
BIN
packages/linux/firmware/radeon/BONAIRE_vce.bin
Normal file
Binary file not shown.
BIN
packages/linux/firmware/radeon/HAINAN_mc2.bin
Normal file
BIN
packages/linux/firmware/radeon/HAINAN_mc2.bin
Normal file
Binary file not shown.
BIN
packages/linux/firmware/radeon/HAWAII_ce.bin
Normal file
BIN
packages/linux/firmware/radeon/HAWAII_ce.bin
Normal file
Binary file not shown.
BIN
packages/linux/firmware/radeon/HAWAII_mc.bin
Normal file
BIN
packages/linux/firmware/radeon/HAWAII_mc.bin
Normal file
Binary file not shown.
BIN
packages/linux/firmware/radeon/HAWAII_mc2.bin
Normal file
BIN
packages/linux/firmware/radeon/HAWAII_mc2.bin
Normal file
Binary file not shown.
BIN
packages/linux/firmware/radeon/HAWAII_me.bin
Normal file
BIN
packages/linux/firmware/radeon/HAWAII_me.bin
Normal file
Binary file not shown.
BIN
packages/linux/firmware/radeon/HAWAII_mec.bin
Normal file
BIN
packages/linux/firmware/radeon/HAWAII_mec.bin
Normal file
Binary file not shown.
BIN
packages/linux/firmware/radeon/HAWAII_pfp.bin
Normal file
BIN
packages/linux/firmware/radeon/HAWAII_pfp.bin
Normal file
Binary file not shown.
BIN
packages/linux/firmware/radeon/HAWAII_rlc.bin
Normal file
BIN
packages/linux/firmware/radeon/HAWAII_rlc.bin
Normal file
Binary file not shown.
BIN
packages/linux/firmware/radeon/HAWAII_sdma.bin
Normal file
BIN
packages/linux/firmware/radeon/HAWAII_sdma.bin
Normal file
Binary file not shown.
BIN
packages/linux/firmware/radeon/HAWAII_smc.bin
Normal file
BIN
packages/linux/firmware/radeon/HAWAII_smc.bin
Normal file
Binary file not shown.
BIN
packages/linux/firmware/radeon/MULLINS_ce.bin
Normal file
BIN
packages/linux/firmware/radeon/MULLINS_ce.bin
Normal file
Binary file not shown.
BIN
packages/linux/firmware/radeon/MULLINS_me.bin
Normal file
BIN
packages/linux/firmware/radeon/MULLINS_me.bin
Normal file
Binary file not shown.
BIN
packages/linux/firmware/radeon/MULLINS_mec.bin
Normal file
BIN
packages/linux/firmware/radeon/MULLINS_mec.bin
Normal file
Binary file not shown.
BIN
packages/linux/firmware/radeon/MULLINS_pfp.bin
Normal file
BIN
packages/linux/firmware/radeon/MULLINS_pfp.bin
Normal file
Binary file not shown.
BIN
packages/linux/firmware/radeon/MULLINS_rlc.bin
Normal file
BIN
packages/linux/firmware/radeon/MULLINS_rlc.bin
Normal file
Binary file not shown.
BIN
packages/linux/firmware/radeon/MULLINS_sdma.bin
Normal file
BIN
packages/linux/firmware/radeon/MULLINS_sdma.bin
Normal file
Binary file not shown.
BIN
packages/linux/firmware/radeon/OLAND_mc2.bin
Normal file
BIN
packages/linux/firmware/radeon/OLAND_mc2.bin
Normal file
Binary file not shown.
BIN
packages/linux/firmware/radeon/PITCAIRN_mc2.bin
Normal file
BIN
packages/linux/firmware/radeon/PITCAIRN_mc2.bin
Normal file
Binary file not shown.
BIN
packages/linux/firmware/radeon/TAHITI_mc2.bin
Normal file
BIN
packages/linux/firmware/radeon/TAHITI_mc2.bin
Normal file
Binary file not shown.
BIN
packages/linux/firmware/radeon/VERDE_mc2.bin
Normal file
BIN
packages/linux/firmware/radeon/VERDE_mc2.bin
Normal file
Binary file not shown.
@@ -19,15 +19,11 @@
|
||||
PKG_NAME="linux"
|
||||
case "$LINUX" in
|
||||
imx6)
|
||||
PKG_VERSION="imx_3.0.35_4.1.0-5c73417"
|
||||
PKG_VERSION="cuboxi-592b2d9"
|
||||
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
;;
|
||||
3.13)
|
||||
PKG_VERSION="3.13.7"
|
||||
PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
;;
|
||||
*)
|
||||
PKG_VERSION="3.14"
|
||||
PKG_VERSION="3.14.8"
|
||||
PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
;;
|
||||
esac
|
||||
@@ -175,9 +171,9 @@ make_target() {
|
||||
|
||||
makeinstall_target() {
|
||||
if [ "$BOOTLOADER" = "u-boot" ]; then
|
||||
mkdir -p $INSTALL/usr/share/u-boot
|
||||
mkdir -p $INSTALL/usr/share/bootloader
|
||||
for dtb in arch/arm/boot/dts/*.dtb; do
|
||||
cp $dtb $INSTALL/usr/share/u-boot
|
||||
cp $dtb $INSTALL/usr/share/bootloader
|
||||
done
|
||||
fi
|
||||
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
diff -Naur linux-3.13-rc1/drivers/media/usb/dvb-usb-v2/rtl28xxu.c linux-3.13-rc1.patch/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
|
||||
--- linux-3.13-rc1/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2013-11-22 20:30:55.000000000 +0100
|
||||
+++ linux-3.13-rc1.patch/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2013-11-24 19:44:45.617201463 +0100
|
||||
@@ -1427,6 +1427,8 @@
|
||||
&rtl2832u_props, "Leadtek WinFast DTV Dongle mini", NULL) },
|
||||
{ DVB_USB_DEVICE(USB_VID_GTEK, USB_PID_CPYTO_REDI_PC50A,
|
||||
&rtl2832u_props, "Crypto ReDi PC 50 A", NULL) },
|
||||
+ { DVB_USB_DEVICE(USB_VID_GTEK, 0xa803,
|
||||
+ &rtl2832u_props, "Realtek RTL2832U reference design", NULL) },
|
||||
|
||||
{ DVB_USB_DEVICE(USB_VID_HANFTEK, 0x0131,
|
||||
&rtl2832u_props, "Astrometa DVB-T2", NULL) },
|
||||
26369
packages/linux/patches/3.13.7/linux-221-ngene-octopus.patch
vendored
26369
packages/linux/patches/3.13.7/linux-221-ngene-octopus.patch
vendored
File diff suppressed because it is too large
Load Diff
@@ -1,115 +0,0 @@
|
||||
From e28f3bbe9ce8cb3c81f289487a8724a7b4a6ddb2 Mon Sep 17 00:00:00 2001
|
||||
From: popcornmix <popcornmix@gmail.com>
|
||||
Date: Wed, 27 Nov 2013 22:52:53 +0000
|
||||
Subject: [PATCH 061/114] dvb: Add support for CableStar Device
|
||||
|
||||
---
|
||||
drivers/media/dvb-core/dvb-usb-ids.h | 1 +
|
||||
drivers/media/usb/dvb-usb-v2/az6007.c | 59 +++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 60 insertions(+)
|
||||
|
||||
diff --git a/drivers/media/dvb-core/dvb-usb-ids.h b/drivers/media/dvb-core/dvb-usb-ids.h
|
||||
index 7e0f619..8407178 100644
|
||||
--- a/drivers/media/dvb-core/dvb-usb-ids.h
|
||||
+++ b/drivers/media/dvb-core/dvb-usb-ids.h
|
||||
@@ -366,6 +366,7 @@
|
||||
#define USB_PID_TERRATEC_DVBS2CI_V2 0x10ac
|
||||
#define USB_PID_TECHNISAT_USB2_HDCI_V1 0x0001
|
||||
#define USB_PID_TECHNISAT_USB2_HDCI_V2 0x0002
|
||||
+#define USB_PID_TECHNISAT_USB2_CABLESTAR_HDCI 0x0003
|
||||
#define USB_PID_TECHNISAT_AIRSTAR_TELESTICK_2 0x0004
|
||||
#define USB_PID_TECHNISAT_USB2_DVB_S2 0x0500
|
||||
#define USB_PID_CPYTO_REDI_PC50A 0xa803
|
||||
diff --git a/drivers/media/usb/dvb-usb-v2/az6007.c b/drivers/media/usb/dvb-usb-v2/az6007.c
|
||||
index 44c64ef3..c1051c3 100644
|
||||
--- a/drivers/media/usb/dvb-usb-v2/az6007.c
|
||||
+++ b/drivers/media/usb/dvb-usb-v2/az6007.c
|
||||
@@ -68,6 +68,19 @@ struct az6007_device_state {
|
||||
.microcode_name = "dvb-usb-terratec-h7-drxk.fw",
|
||||
};
|
||||
|
||||
+static struct drxk_config cablestar_hdci_drxk = {
|
||||
+ .adr = 0x29,
|
||||
+ .parallel_ts = true,
|
||||
+ .dynamic_clk = true,
|
||||
+ .single_master = true,
|
||||
+ .enable_merr_cfg = true,
|
||||
+ .no_i2c_bridge = false,
|
||||
+ .chunk_size = 64,
|
||||
+ .mpeg_out_clk_strength = 0x02,
|
||||
+ .qam_demod_parameter_count = 2,
|
||||
+ .microcode_name = "dvb-usb-technisat-cablestar-hdci-drxk.fw",
|
||||
+};
|
||||
+
|
||||
static int drxk_gate_ctrl(struct dvb_frontend *fe, int enable)
|
||||
{
|
||||
struct az6007_device_state *st = fe_to_priv(fe);
|
||||
@@ -630,6 +643,27 @@ static int az6007_frontend_attach(struct dvb_usb_adapter *adap)
|
||||
return 0;
|
||||
}
|
||||
|
||||
+static int az6007_cablestar_hdci_frontend_attach(struct dvb_usb_adapter *adap)
|
||||
+{
|
||||
+ struct az6007_device_state *st = adap_to_priv(adap);
|
||||
+ struct dvb_usb_device *d = adap_to_d(adap);
|
||||
+
|
||||
+ pr_debug("attaching demod drxk\n");
|
||||
+
|
||||
+ adap->fe[0] = dvb_attach(drxk_attach, &cablestar_hdci_drxk,
|
||||
+ &d->i2c_adap);
|
||||
+ if (!adap->fe[0])
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ adap->fe[0]->sec_priv = adap;
|
||||
+ st->gate_ctrl = adap->fe[0]->ops.i2c_gate_ctrl;
|
||||
+ adap->fe[0]->ops.i2c_gate_ctrl = drxk_gate_ctrl;
|
||||
+
|
||||
+ az6007_ci_init(adap);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
static int az6007_tuner_attach(struct dvb_usb_adapter *adap)
|
||||
{
|
||||
struct dvb_usb_device *d = adap_to_d(adap);
|
||||
@@ -868,6 +902,29 @@ static int az6007_download_firmware(struct dvb_usb_device *d,
|
||||
}
|
||||
};
|
||||
|
||||
+static struct dvb_usb_device_properties az6007_cablestar_hdci_props = {
|
||||
+ .driver_name = KBUILD_MODNAME,
|
||||
+ .owner = THIS_MODULE,
|
||||
+ .firmware = AZ6007_FIRMWARE,
|
||||
+
|
||||
+ .adapter_nr = adapter_nr,
|
||||
+ .size_of_priv = sizeof(struct az6007_device_state),
|
||||
+ .i2c_algo = &az6007_i2c_algo,
|
||||
+ .tuner_attach = az6007_tuner_attach,
|
||||
+ .frontend_attach = az6007_cablestar_hdci_frontend_attach,
|
||||
+ .streaming_ctrl = az6007_streaming_ctrl,
|
||||
+/* ditch get_rc_config as it can't work (TS35 remote, I believe it's rc5) */
|
||||
+ .get_rc_config = NULL,
|
||||
+ .read_mac_address = az6007_read_mac_addr,
|
||||
+ .download_firmware = az6007_download_firmware,
|
||||
+ .identify_state = az6007_identify_state,
|
||||
+ .power_ctrl = az6007_power_ctrl,
|
||||
+ .num_adapters = 1,
|
||||
+ .adapter = {
|
||||
+ { .stream = DVB_USB_STREAM_BULK(0x02, 10, 4096), }
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
static struct usb_device_id az6007_usb_table[] = {
|
||||
{DVB_USB_DEVICE(USB_VID_AZUREWAVE, USB_PID_AZUREWAVE_6007,
|
||||
&az6007_props, "Azurewave 6007", RC_MAP_EMPTY)},
|
||||
@@ -875,6 +932,8 @@ static int az6007_download_firmware(struct dvb_usb_device *d,
|
||||
&az6007_props, "Terratec H7", RC_MAP_NEC_TERRATEC_CINERGY_XS)},
|
||||
{DVB_USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_H7_2,
|
||||
&az6007_props, "Terratec H7", RC_MAP_NEC_TERRATEC_CINERGY_XS)},
|
||||
+ {DVB_USB_DEVICE(USB_VID_TECHNISAT, USB_PID_TECHNISAT_USB2_CABLESTAR_HDCI,
|
||||
+ &az6007_cablestar_hdci_props, "Technisat CableStar Combo HD CI", RC_MAP_EMPTY)},
|
||||
{0},
|
||||
};
|
||||
|
||||
--
|
||||
1.8.5.5
|
||||
12
packages/linux/patches/3.14.8/linux-060-add_AUGUST_DVB-T205.patch
vendored
Normal file
12
packages/linux/patches/3.14.8/linux-060-add_AUGUST_DVB-T205.patch
vendored
Normal file
@@ -0,0 +1,12 @@
|
||||
diff -Naur linux-3.14.8/drivers/media/usb/dvb-usb-v2/rtl28xxu.c linux-3.14.8.patch/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
|
||||
--- linux-3.14.8/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2014-06-16 22:41:19.000000000 +0200
|
||||
+++ linux-3.14.8.patch/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2014-06-17 03:34:54.230287375 +0200
|
||||
@@ -1441,6 +1441,8 @@
|
||||
&rtl2832u_props, "Sveon STV20", NULL) },
|
||||
{ DVB_USB_DEVICE(USB_VID_KWORLD_2, USB_PID_SVEON_STV27,
|
||||
&rtl2832u_props, "Sveon STV27", NULL) },
|
||||
+ { DVB_USB_DEVICE(USB_VID_GTEK, 0xa803,
|
||||
+ &rtl2832u_props, "Realtek RTL2832U reference design", NULL) },
|
||||
|
||||
/* RTL2832P devices: */
|
||||
{ DVB_USB_DEVICE(USB_VID_HANFTEK, 0x0131,
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user