Attachment #27707 for bug #34399

View | Details | Raw Unified | Return to bug 34399
Collapse All | Expand All




	$(MAKE) -C $@ all

install: all install-drivers
	$(INSTALL) -D -m 755 modem/slmodemd ${D}/usr/sbin/slmodemd
	$(RM) -rf ${D}/var/lib/slmodem
	$(INSTALL) -d -D -m 755 ${D}/var/lib/slmodem

uninstall: uninstall-drivers
	$(RM) ${D}/usr/sbin/slmodemd
	$(RM) -rf ${D}/var/lib/slmodem

drivers:
	$(MAKE) -C drivers KERNEL_DIR=$(KERNEL_DIR)




	$(RM) kernel-ver $(obj-m) $(obj-m:.o=.ko) *st7554.o amrmo_init.o sysdep_amr.o *.mod.* .*.cmd *~

install-devices:
	#mkdir -p ${D}/dev
	#$(foreach minor,0 1 2 3, \
	#    mknod -m 600 ${D}/dev/slamr$(minor) c 212 $(minor) ; ) echo -n
	#$(foreach minor,0 1 2 3, \
	#    mknod -m 600 ${D}/dev/slusb$(minor) c 213 $(minor) ; ) echo -n
remove-devices:
	$(foreach minor,0 1 2 3, \
	    $(RM) ${D}/dev/slamr$(minor) ; ) echo -n
	$(foreach minor,0 1 2 3, \
	    $(RM) ${D}/dev/slusb$(minor) ; ) echo -n

else
ifeq ($(findstring 2.4,$(KERNEL_VER)),2.4)

slusb-objs:= old_st7554.o
obj:=.
module-dir:=${D}/lib/modules/$(KERNEL_VER)/misc

CFLAGS:= ${CFLAGS} -D__KERNEL__ -DMODULE -DEXPORT_SYMTAB -DMODVERSIONS --include $(KERNEL_DIR)/include/linux/modversions.h -I$(KERNEL_DIR)/include

all: $(obj-m)


slamr.o slusb.o:
	$(LD) -r -o $@ $^

install:
	install -D -m 644 slamr.o $(module-dir)/slamr.o
	install -D -m 644 slusb.o $(module-dir)/slusb.o
#	cp /etc/modules.conf /etc/modules.conf.slamr && \
#	    echo 'alias char-major-212 slamr' >> /etc/modules.conf && \
#	    echo 'alias char-major-213 slusb' >> /etc/modules.conf 
#	/sbin/depmod -a
uninstall:
	/sbin/modprobe -r slamr slusb
	cp /etc/modules.conf /etc/modules.conf.slamr && \


else

module-dir:=${D}/lib/modules/$(KERNEL_VER)/extra

all:
	$(MAKE) modules -C $(KERNEL_DIR) SUBDIRS=$(shell pwd)
install:
	install -D -m 644 slamr.ko $(module-dir)/slamr.ko
	install -D -m 644 slusb.ko $(module-dir)/slusb.ko
#	/sbin/depmod -a
uninstall:
	modprobe -r slamr ; echo -n
	modprobe -r slusb ; echo -n

Lines 13-22 Link Here

(-)slmodem-2.9.6.orig/modem/Makefile (-2 / +2 lines)
13	#	13	#
14	###########################################################################	14	###########################################################################
15		15
16	CC:= gcc	16	CC:= ${CC}
17	RM:= rm -f	17	RM:= rm -f
18		18
19	CFLAGS:= -Wall -g -O -I. -DCONFIG_DEBUG_MODEM	19	CFLAGS:= ${CFLAGS} -I. -DCONFIG_DEBUG_MODEM
20		20
21		21
22	modem-objs:= \	22	modem-objs:= \

Return to bug 34399

Lines 24-36 Link Here

(-)slmodem-2.9.6.orig/Makefile (-5 / +5 lines)
24	$(MAKE) -C $@ all	24	$(MAKE) -C $@ all
25		25
26	install: all install-drivers	26	install: all install-drivers
27	$(INSTALL) -D -m 755 modem/slmodemd ${DESTDIR}/usr/sbin/slmodemd	27	$(INSTALL) -D -m 755 modem/slmodemd ${D}/usr/sbin/slmodemd
28	$(RM) -rf ${DESTDIR}/var/lib/slmodem	28	$(RM) -rf ${D}/var/lib/slmodem
29	$(INSTALL) -d -D -m 755 ${DESTDIR}/var/lib/slmodem	29	$(INSTALL) -d -D -m 755 ${D}/var/lib/slmodem
30		30
31	uninstall: uninstall-drivers	31	uninstall: uninstall-drivers
32	$(RM) ${DESTDIR}/usr/sbin/slmodemd	32	$(RM) ${D}/usr/sbin/slmodemd
33	$(RM) -rf ${DESTDIR}/var/lib/slmodem	33	$(RM) -rf ${D}/var/lib/slmodem
34		34
35	drivers:	35	drivers:
36	$(MAKE) -C drivers KERNEL_DIR=$(KERNEL_DIR)	36	$(MAKE) -C drivers KERNEL_DIR=$(KERNEL_DIR)

Lines 42-66 Link Here

(-)slmodem-2.9.6.orig/drivers/Makefile (-16 / +16 lines)
42	$(RM) kernel-ver $(obj-m) $(obj-m:.o=.ko) st7554.o amrmo_init.o sysdep_amr.o .mod.* ..cmd ~	42	$(RM) kernel-ver $(obj-m) $(obj-m:.o=.ko) st7554.o amrmo_init.o sysdep_amr.o .mod.* ..cmd ~
43		43
44	install-devices:	44	install-devices:
45	mkdir -p ${DESTDIR}/dev	45	#mkdir -p ${D}/dev
46	$(foreach minor,0 1 2 3, \	46	#$(foreach minor,0 1 2 3, \
47	mknod -m 600 ${DESTDIR}/dev/slamr$(minor) c 212 $(minor) ; ) echo -n	47	# mknod -m 600 ${D}/dev/slamr$(minor) c 212 $(minor) ; ) echo -n
48	$(foreach minor,0 1 2 3, \	48	#$(foreach minor,0 1 2 3, \
49	mknod -m 600 ${DESTDIR}/dev/slusb$(minor) c 213 $(minor) ; ) echo -n	49	# mknod -m 600 ${D}/dev/slusb$(minor) c 213 $(minor) ; ) echo -n
50	remove-devices:	50	remove-devices:
51	$(foreach minor,0 1 2 3, \	51	$(foreach minor,0 1 2 3, \
52	$(RM) ${DESTDIR}/dev/slamr$(minor) ; ) echo -n	52	$(RM) ${D}/dev/slamr$(minor) ; ) echo -n
53	$(foreach minor,0 1 2 3, \	53	$(foreach minor,0 1 2 3, \
54	$(RM) ${DESTDIR}/dev/slusb$(minor) ; ) echo -n	54	$(RM) ${D}/dev/slusb$(minor) ; ) echo -n
55		55
56	else	56	else
57	ifeq ($(findstring 2.4,$(KERNEL_VER)),2.4)	57	ifeq ($(findstring 2.4,$(KERNEL_VER)),2.4)
58		58
59	slusb-objs:= old_st7554.o	59	slusb-objs:= old_st7554.o
60	obj:=.	60	obj:=.
61	module-dir:=${DESTDIR}/lib/modules/$(KERNEL_VER)/misc	61	module-dir:=${D}/lib/modules/$(KERNEL_VER)/misc
62		62
63	CFLAGS:= -Wall -pipe -O3 -fomit-frame-pointer -D__KERNEL__ -DMODULE -DEXPORT_SYMTAB -DMODVERSIONS --include $(KERNEL_DIR)/include/linux/modversions.h -I$(KERNEL_DIR)/include	63	CFLAGS:= ${CFLAGS} -D__KERNEL__ -DMODULE -DEXPORT_SYMTAB -DMODVERSIONS --include $(KERNEL_DIR)/include/linux/modversions.h -I$(KERNEL_DIR)/include
64		64
65	all: $(obj-m)	65	all: $(obj-m)
66		66
Lines 69-81 Link Here
69	slamr.o slusb.o:	69	slamr.o slusb.o:
70	$(LD) -r -o $@ $^	70	$(LD) -r -o $@ $^
71		71
72	install: uninstall-old	72	install:
73	install -D -m 644 slamr.o $(module-dir)/slamr.o	73	install -D -m 644 slamr.o $(module-dir)/slamr.o
74	install -D -m 644 slusb.o $(module-dir)/slusb.o	74	install -D -m 644 slusb.o $(module-dir)/slusb.o
75	cp /etc/modules.conf /etc/modules.conf.slamr && \	75	# cp /etc/modules.conf /etc/modules.conf.slamr && \
76	echo 'alias char-major-212 slamr' >> /etc/modules.conf && \	76	# echo 'alias char-major-212 slamr' >> /etc/modules.conf && \
77	echo 'alias char-major-213 slusb' >> /etc/modules.conf	77	# echo 'alias char-major-213 slusb' >> /etc/modules.conf
78	/sbin/depmod -a	78	# /sbin/depmod -a
79	uninstall:	79	uninstall:
80	/sbin/modprobe -r slamr slusb	80	/sbin/modprobe -r slamr slusb
81	cp /etc/modules.conf /etc/modules.conf.slamr && \	81	cp /etc/modules.conf /etc/modules.conf.slamr && \
Lines 95-108 Link Here
95		95
96	else	96	else
97		97
98	module-dir:=${DESTDIR}/lib/modules/$(KERNEL_VER)/extra	98	module-dir:=${D}/lib/modules/$(KERNEL_VER)/extra
99		99
100	all:	100	all:
101	$(MAKE) modules -C $(KERNEL_DIR) SUBDIRS=$(shell pwd)	101	$(MAKE) modules -C $(KERNEL_DIR) SUBDIRS=$(shell pwd)
102	install:	102	install:
103	install -D -m 644 slamr.ko $(module-dir)/slamr.ko	103	install -D -m 644 slamr.ko $(module-dir)/slamr.ko
104	install -D -m 644 slusb.ko $(module-dir)/slusb.ko	104	install -D -m 644 slusb.ko $(module-dir)/slusb.ko
105	/sbin/depmod -a	105	# /sbin/depmod -a
106	uninstall:	106	uninstall:
107	modprobe -r slamr ; echo -n	107	modprobe -r slamr ; echo -n
108	modprobe -r slusb ; echo -n	108	modprobe -r slusb ; echo -n