Lines 106-111
Link Here
|
106 |
|
106 |
|
107 |
cd ${S} |
107 |
cd ${S} |
108 |
|
108 |
|
|
|
109 |
epatch ${FILESDIR}/mplayer-gcc3.4.patch |
110 |
|
109 |
# Fix head/tail call for new coreutils |
111 |
# Fix head/tail call for new coreutils |
110 |
epatch ${FILESDIR}/${PN}-0.90-coreutils-fixup.patch |
112 |
epatch ${FILESDIR}/${PN}-0.90-coreutils-fixup.patch |
111 |
|
113 |
|
Lines 305-329
Link Here
|
305 |
then |
307 |
then |
306 |
unset ARCH |
308 |
unset ARCH |
307 |
local driverwasbuilt="ok" |
309 |
local driverwasbuilt="ok" |
308 |
local dirtytrick="no" |
310 |
#local dirtytrick="no" |
309 |
local oldwrite="${SANDBOX_WRITE}" |
311 |
#local oldwrite="${SANDBOX_WRITE}" |
310 |
cd ${S}/drivers |
312 |
cd ${S}/drivers |
311 |
if [ ${KV_MAJOR}.${KV_MINOR} = "2.6" -a ${KV_PATCH} -le 5 ]; then |
313 |
#if [ ${KV_MAJOR}.${KV_MINOR} = "2.6" -a ${KV_PATCH} -le 5 ]; then |
312 |
einfo "Kernel < 2.6.6, have to remove your include/asm and .config" |
314 |
# einfo "Kernel < 2.6.6, have to remove your include/asm and .config" |
313 |
einfo "temporarily. Putting them into ${T}, will try to restore them later." |
315 |
# einfo "temporarily. Putting them into ${T}, will try to restore them later." |
314 |
dirtytrick="yes" |
316 |
# dirtytrick="yes" |
315 |
addwrite /usr/src/linux/ |
317 |
# addwrite /usr/src/linux/ |
316 |
mv /usr/src/linux/.config ${T}/savedconfig |
318 |
# mv /usr/src/linux/.config ${T}/savedconfig |
317 |
mv /usr/src/linux/include/asm ${T}/savedasm |
319 |
# mv /usr/src/linux/include/asm ${T}/savedasm |
318 |
SANDBOX_WRITE="${oldwrite}" |
320 |
# SANDBOX_WRITE="${oldwrite}" |
319 |
fi |
321 |
#fi |
320 |
make all || driverwasbuilt="no" |
322 |
make all || driverwasbuilt="no" |
321 |
if [ ${dirtytrick} = "yes" ]; then |
323 |
#if [ ${dirtytrick} = "yes" ]; then |
322 |
addwrite /usr/src/linux |
324 |
# addwrite /usr/src/linux |
323 |
mv ${T}/savedconfig /usr/src/linux/.config |
325 |
# mv ${T}/savedconfig /usr/src/linux/.config |
324 |
mv ${T}/savedasm /usr/src/linux/include/asm |
326 |
# mv ${T}/savedasm /usr/src/linux/include/asm |
325 |
SANDBOX_WRITE="${oldwrite}" |
327 |
# SANDBOX_WRITE="${oldwrite}" |
326 |
fi |
328 |
#fi |
327 |
if [ ${driverwasbuilt} = "no" ]; then |
329 |
if [ ${driverwasbuilt} = "no" ]; then |
328 |
die "Failed to build matrox driver!" |
330 |
die "Failed to build matrox driver!" |
329 |
fi |
331 |
fi |