Attachment #33468 for bug #47947

Lines 14-19 Link Here

(-)slmodem-2.9.8.old/Makefile (+2 lines)
14	###########################################################################	14	###########################################################################
15		15
16	KERNEL_DIR:=/lib/modules/$(shell uname -r)/build	16	KERNEL_DIR:=/lib/modules/$(shell uname -r)/build
		17	DESTDIR = ${D}
17		18
18	# tools	19	# tools
19	INSTALL:=install	20	INSTALL:=install
Lines 25-30 Link Here
25		26
26	install: all install-drivers	27	install: all install-drivers
27	$(INSTALL) -D -m 755 modem/slmodemd ${DESTDIR}/usr/sbin/slmodemd	28	$(INSTALL) -D -m 755 modem/slmodemd ${DESTDIR}/usr/sbin/slmodemd
		29	$(INSTALL) -D -m 755 modem/modem_test ${DESTDIR}/usr/sbin/modem_test
28	$(RM) -rf ${DESTDIR}/var/lib/slmodem	30	$(RM) -rf ${DESTDIR}/var/lib/slmodem
29	$(INSTALL) -d -D -m 755 ${DESTDIR}/var/lib/slmodem	31	$(INSTALL) -d -D -m 755 ${DESTDIR}/var/lib/slmodem
30		32





#KBUILD_VERBOSE=1
#export KBUILD_VERBOSE
DESTDIR = ${D}

KERNEL_DIR:=/lib/modules/$(shell uname -r)/build


ifndef KERNELRELEASE
ifndef KERNEL_VER

all install uninstall:
	$(MAKE) $@ KERNEL_VER=$(shell uname -r)

#install: install-devices
#uninstall: remove-devices

#kernel-ver::
#	$(CC) -I$(KERNEL_DIR)/include -o $@ $@.c

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

install-devices:
	mkdir -p ${DESTDIR}/dev

obj:=.
module-dir:=${DESTDIR}/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)


install: uninstall-old
	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 && \

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.8.old/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 47947

Lines 15-20 Link Here

(-)slmodem-2.9.8.old/drivers/Makefile (-13 / +14 lines)
15		15
16	#KBUILD_VERBOSE=1	16	#KBUILD_VERBOSE=1
17	#export KBUILD_VERBOSE	17	#export KBUILD_VERBOSE
		18	DESTDIR = ${D}
18		19
19	KERNEL_DIR:=/lib/modules/$(shell uname -r)/build	20	KERNEL_DIR:=/lib/modules/$(shell uname -r)/build
20		21
Lines 28-45 Link Here
28	ifndef KERNELRELEASE	29	ifndef KERNELRELEASE
29	ifndef KERNEL_VER	30	ifndef KERNEL_VER
30		31
31	all install uninstall: kernel-ver	32	all install uninstall:
32	$(MAKE) $@ KERNEL_VER=$(shell ./kernel-ver)	33	$(MAKE) $@ KERNEL_VER=$(shell uname -r)
33		34
34	install: install-devices	35	#install: install-devices
35	uninstall: remove-devices	36	#uninstall: remove-devices
36		37
37	kernel-ver::	38	#kernel-ver::
38	$(CC) -I$(KERNEL_DIR)/include -o $@ $@.c	39	# $(CC) -I$(KERNEL_DIR)/include -o $@ $@.c
39		40
40	dep:	41	dep:
41	clean:	42	clean:
42	$(RM) kernel-ver $(obj-m) $(obj-m:.o=.ko) st7554.o amrmo_init.o sysdep_amr.o .mod.* ..cmd ~	43	$(RM) $(obj-m) $(obj-m:.o=.ko) st7554.o amrmo_init.o sysdep_amr.o .mod.* ..cmd ~
43		44
44	install-devices:	45	install-devices:
45	mkdir -p ${DESTDIR}/dev	46	mkdir -p ${DESTDIR}/dev
Lines 60-66 Link Here
60	obj:=.	61	obj:=.
61	module-dir:=${DESTDIR}/lib/modules/$(KERNEL_VER)/misc	62	module-dir:=${DESTDIR}/lib/modules/$(KERNEL_VER)/misc
62		63
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	64	CFLAGS:= ${CFLAGS} -D__KERNEL__ -DMODULE -DEXPORT_SYMTAB -DMODVERSIONS --include $(KERNEL_DIR)/include/linux/modversions.h -I$(KERNEL_DIR)/include
64		65
65	all: $(obj-m)	66	all: $(obj-m)
66		67
Lines 72-81 Link Here
72	install: uninstall-old	73	install: uninstall-old
73	install -D -m 644 slamr.o $(module-dir)/slamr.o	74	install -D -m 644 slamr.o $(module-dir)/slamr.o
74	install -D -m 644 slusb.o $(module-dir)/slusb.o	75	install -D -m 644 slusb.o $(module-dir)/slusb.o
75	cp /etc/modules.conf /etc/modules.conf.slamr && \	76	# cp /etc/modules.conf /etc/modules.conf.slamr && \
76	echo 'alias char-major-212 slamr' >> /etc/modules.conf && \	77	# echo 'alias char-major-212 slamr' >> /etc/modules.conf && \
77	echo 'alias char-major-213 slusb' >> /etc/modules.conf	78	# echo 'alias char-major-213 slusb' >> /etc/modules.conf
78	/sbin/depmod -a	79	# /sbin/depmod -a
79	uninstall:	80	uninstall:
80	/sbin/modprobe -r slamr slusb	81	/sbin/modprobe -r slamr slusb
81	cp /etc/modules.conf /etc/modules.conf.slamr && \	82	cp /etc/modules.conf /etc/modules.conf.slamr && \
Lines 102-108 Link Here
102	install:	103	install:
103	install -D -m 644 slamr.ko $(module-dir)/slamr.ko	104	install -D -m 644 slamr.ko $(module-dir)/slamr.ko
104	install -D -m 644 slusb.ko $(module-dir)/slusb.ko	105	install -D -m 644 slusb.ko $(module-dir)/slusb.ko
105	/sbin/depmod -a	106	# /sbin/depmod -a
106	uninstall:	107	uninstall:
107	modprobe -r slamr ; echo -n	108	modprobe -r slamr ; echo -n
108	modprobe -r slusb ; echo -n	109	modprobe -r slusb ; echo -n