fehler im cdk 22.09.03

[hrvill]

seit heute Abend kann ich HEAD nicht mehr compilen. Der Fehler liegt wohl bei make .driver:

Code: Alles auswählen

[root@notebook cdk]# make .driver
make -C /root/tuxbox-cvs/driver \
        KERNEL_LOCATION=/root/tuxbox-cvs/cdk/linux \
        CROSS_COMPILE=powerpc-tuxbox-linux-gnu- \
        HARDWARE=dbox2
make[1]: Entering directory `/root/tuxbox-cvs/driver'
make -C avs modules
make[2]: Entering directory `/root/tuxbox-cvs/driver/avs'
powerpc-tuxbox-linux-gnu-ld -r -o avs.o stv6412.o cxa2092.o cxa2126.o avs_core.o
make[2]: Leaving directory `/root/tuxbox-cvs/driver/avs'
make -C cam modules
make[2]: Entering directory `/root/tuxbox-cvs/driver/cam'
make[2]: Nothing to be done for `modules'.
make[2]: Leaving directory `/root/tuxbox-cvs/driver/cam'
make -C dvb modules
make[2]: Entering directory `/root/tuxbox-cvs/driver/dvb'
make -C drivers modules
make[3]: Entering directory `/root/tuxbox-cvs/driver/dvb/drivers'
make -C media modules
make[4]: Entering directory `/root/tuxbox-cvs/driver/dvb/drivers/media'
make -C dvb modules
make[5]: Entering directory `/root/tuxbox-cvs/driver/dvb/drivers/media/dvb'
make -C avia modules
make[6]: Entering directory `/root/tuxbox-cvs/driver/dvb/drivers/media/dvb/avia'
powerpc-tuxbox-linux-gnu-ld -r -o avia_av.o avia_av_core.o avia_av_ksyms.o avia_av_event.o avia_av_proc.o
powerpc-tuxbox-linux-gnu-ld -r -o avia_gt.o avia_gt_core.o avia_gt_enx.o avia_gt_gtx.o avia_gt_ucode.o avia_gt_accel.o avia_gt_dmx.o avia_gt_gv.o avia_gt_pcm.o avia_gt_capture.o avia_gt_pig.o avia_gt_ir.o avia_gt_vbi.o
powerpc-tuxbox-linux-gnu-ld -r -o avia_gt_fb.o avia_gt_fb_core.o fbgen.o
make[6]: Leaving directory `/root/tuxbox-cvs/driver/dvb/drivers/media/dvb/avia'
make -C dvb-core modules
make[6]: Entering directory `/root/tuxbox-cvs/driver/dvb/drivers/media/dvb/dvb-core'
powerpc-tuxbox-linux-gnu-gcc -D__KERNEL__ -DMODULE -I../../../../../include -I../../../../../dvb/include -I/root/tuxbox-cvs/cdk/linux/include -Wall -Wstrict-prototypes -Wno-trigraphs -Werror -O2 -fno-strict-aliasing -fno-common -fomit-frame-pointer -I/root/tuxbox-cvs/cdk/linux/arch/ppc -fsigned-char -msoft-float -pipe -ffixed-r2 -Wno-uninitialized -mmultiple -mstring -mcpu=823   -DKBUILD_BASENAME=dvbdev  -c -o dvbdev.o dvbdev.c
In file included from dvb_functions.h:53,
                 from dvbdev.c:34:
dvb_compat.h:101:1: "INIT_WORK" redefined
In file included from /root/tuxbox-cvs/cdk/linux/include/linux/jffs2_fs_sb.h:8,
                 from /root/tuxbox-cvs/cdk/linux/include/linux/fs.h:733,
                 from /root/tuxbox-cvs/cdk/linux/include/linux/capability.h:17,
                 from /root/tuxbox-cvs/cdk/linux/include/linux/binfmts.h:5,
                 from /root/tuxbox-cvs/cdk/linux/include/linux/sched.h:9,
                 from dvbdev.c:29:
/root/tuxbox-cvs/cdk/linux/include/linux/workqueue.h:18:1: this is the location of the previous definition
In file included from dvb_functions.h:53,
                 from dvbdev.c:34:
dvb_compat.h:102:1: "schedule_work" redefined
In file included from /root/tuxbox-cvs/cdk/linux/include/linux/jffs2_fs_sb.h:8,
                 from /root/tuxbox-cvs/cdk/linux/include/linux/fs.h:733,
                 from /root/tuxbox-cvs/cdk/linux/include/linux/capability.h:17,
                 from /root/tuxbox-cvs/cdk/linux/include/linux/binfmts.h:5,
                 from /root/tuxbox-cvs/cdk/linux/include/linux/sched.h:9,
                 from dvbdev.c:29:
/root/tuxbox-cvs/cdk/linux/include/linux/workqueue.h:16:1: this is the location of the previous definition
In file included from dvb_functions.h:53,
                 from dvbdev.c:34:
dvb_compat.h:103:1: "flush_scheduled_work" redefined
In file included from /root/tuxbox-cvs/cdk/linux/include/linux/jffs2_fs_sb.h:8,
                 from /root/tuxbox-cvs/cdk/linux/include/linux/fs.h:733,
                 from /root/tuxbox-cvs/cdk/linux/include/linux/capability.h:17,
                 from /root/tuxbox-cvs/cdk/linux/include/linux/binfmts.h:5,
                 from /root/tuxbox-cvs/cdk/linux/include/linux/sched.h:9,
                 from dvbdev.c:29:
/root/tuxbox-cvs/cdk/linux/include/linux/workqueue.h:17:1: this is the location of the previous definition
make[6]: *** [dvbdev.o] Error 1
make[6]: Leaving directory `/root/tuxbox-cvs/driver/dvb/drivers/media/dvb/dvb-core'
make[5]: *** [_modsubdir_dvb-core] Error 2
make[5]: Leaving directory `/root/tuxbox-cvs/driver/dvb/drivers/media/dvb'
make[4]: *** [_modsubdir_dvb] Error 2
make[4]: Leaving directory `/root/tuxbox-cvs/driver/dvb/drivers/media'
make[3]: *** [_modsubdir_media] Error 2
make[3]: Leaving directory `/root/tuxbox-cvs/driver/dvb/drivers'
make[2]: *** [_modsubdir_drivers] Error 2
make[2]: Leaving directory `/root/tuxbox-cvs/driver/dvb'
make[1]: *** [_modsubdir_dvb] Error 2
make[1]: Leaving directory `/root/tuxbox-cvs/driver'
make: *** [.driver] Error 2

Herbert

[Homar]

Ändere in der Datei tuxbox-cvs/driver/dvb/drivers/media/dvb/dvb-core/dvb_compat.h ab Zeile 98 wie folgt ab:
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
#include <linux/tqueue.h>
#ifndef work_struct
#define work_struct tq_struct
#endif
#ifndef INIT_WORK
#define INIT_WORK(wq,routine,data) INIT_TQUEUE(wq,routine,data)
#endif
#ifndef schedule_work
#define schedule_work(wq) schedule_task(wq)
#endif
#ifndef flush_scheduled_work
#define flush_scheduled_work() flush_scheduled_tasks()
#endif
#else
#include <linux/workqueue.h>
#endif

besser...

[hrvill]

lohnt es sich dafür einen Patch zu erstellen, oder wird das sowieso demnächst im CVS korrigiert?

Herbert

[obi]

sieht ganz gut aus. kann gern jemand einchecken. homar? ich verzichte, da mir vorhin die festplatte gestorben ist, auf der saemtliche dbox sachen waren.

[zexma]

ich verzichte, da mir vorhin die festplatte gestorben ist, auf der saemtliche dbox sachen waren.

Backup?

[Homar]

mich hats dieses Jahr schon zweimal erwischt

Zum glück war bei dem einen "nur" die Elektronik defekt, sodass ein Freund es wieder zum laufen gebracht hat...

[obi]

ich verzichte, da mir vorhin die festplatte gestorben ist, auf der saemtliche dbox sachen waren.

Backup?

naja, teilweise und sehr dezentral... wie das halt so ist, wenn man keinen platz fuer volle backups hat.

[DieMade]

Ich hab's mal eingecheckt.