Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 218381 | Differences between
and this patch

Collapse All | Expand All

(-)slmodem-2.9.11-20080417/drivers/Makefile.orig (-20 / +24 lines)
Lines 23-35 Link Here
23
ARCH64:=$(shell uname -m | sed -e '/amd64/s//x86_64/' | grep -c x86_64)
23
ARCH64:=$(shell uname -m | sed -e '/amd64/s//x86_64/' | grep -c x86_64)
24
24
25
ifeq ($(ARCH64), 0)
25
ifeq ($(ARCH64), 0)
26
obj-m:= slamr.o slusb.o
26
obj-m:= slamr.o
27
else
27
#obj-m:= slamr.o slusb.o
28
obj-m:= slusb.o
28
#else
29
#obj-m:= slusb.o
29
endif
30
endif
30
31
31
slamr-objs:= amrmo_init.o sysdep_amr.o amrlibs.o
32
slamr-objs:= amrmo_init.o sysdep_amr.o amrlibs.o
32
slusb-objs:= st7554.o
33
#slusb-objs:= st7554.o
33
34
34
ifndef KERNELRELEASE
35
ifndef KERNELRELEASE
35
ifndef KERNEL_VER
36
ifndef KERNEL_VER
Lines 52-69 Link Here
52
	mkdir -p ${DESTDIR}/dev
53
	mkdir -p ${DESTDIR}/dev
53
	$(foreach minor,0 1 2 3, \
54
	$(foreach minor,0 1 2 3, \
54
	    mknod -m 600 ${DESTDIR}/dev/slamr$(minor) c 242 $(minor) ; ) echo -n
55
	    mknod -m 600 ${DESTDIR}/dev/slamr$(minor) c 242 $(minor) ; ) echo -n
55
	$(foreach minor,0 1 2 3, \
56
#	$(foreach minor,0 1 2 3, \
56
	    mknod -m 600 ${DESTDIR}/dev/slusb$(minor) c 243 $(minor) ; ) echo -n
57
#	    mknod -m 600 ${DESTDIR}/dev/slusb$(minor) c 243 $(minor) ; ) echo -n
57
remove-devices:
58
remove-devices:
58
	$(foreach minor,0 1 2 3, \
59
	$(foreach minor,0 1 2 3, \
59
	    $(RM) ${DESTDIR}/dev/slamr$(minor) ; ) echo -n
60
	    $(RM) ${DESTDIR}/dev/slamr$(minor) ; ) echo -n
60
	$(foreach minor,0 1 2 3, \
61
#	$(foreach minor,0 1 2 3, \
61
	    $(RM) ${DESTDIR}/dev/slusb$(minor) ; ) echo -n
62
#	    $(RM) ${DESTDIR}/dev/slusb$(minor) ; ) echo -n
62
63
63
else
64
else
64
ifeq ($(findstring 2.4,$(KERNEL_VER)),2.4)
65
ifeq ($(findstring 2.4,$(KERNEL_VER)),2.4)
65
66
66
slusb-objs:= old_st7554.o
67
#slusb-objs:= old_st7554.o
67
obj:=.
68
obj:=.
68
module-dir:=${DESTDIR}/lib/modules/$(KERNEL_VER)/misc
69
module-dir:=${DESTDIR}/lib/modules/$(KERNEL_VER)/misc
69
70
Lines 72-101 Link Here
72
all: $(obj-m)
73
all: $(obj-m)
73
74
74
slamr.o: $(slamr-objs)
75
slamr.o: $(slamr-objs)
75
slusb.o: $(slusb-objs)
76
#slusb.o: $(slusb-objs)
76
slamr.o slusb.o:
77
#slamr.o slusb.o:
78
slamr.o :
77
	$(LD) -r -o $@ $^
79
	$(LD) -r -o $@ $^
78
80
79
install: uninstall-old
81
install: uninstall-old
80
ifeq ($(ARCH64), 0)
82
ifeq ($(ARCH64), 0)
81
	install -D -m 644 slamr.o $(module-dir)/slamr.o
83
	install -D -m 644 slamr.o $(module-dir)/slamr.o
82
endif
84
endif
83
	install -D -m 644 slusb.o $(module-dir)/slusb.o
85
#	install -D -m 644 slusb.o $(module-dir)/slusb.o
84
	cp /etc/modules.conf /etc/modules.conf.slamr && \
86
	cp /etc/modules.conf /etc/modules.conf.slamr && \
85
	    echo 'alias char-major-242 slamr' >> /etc/modules.conf && \
87
	    echo 'alias char-major-242 slamr' >> /etc/modules.conf && \
86
	    echo 'alias char-major-243 slusb' >> /etc/modules.conf 
88
#	    echo 'alias char-major-243 slusb' >> /etc/modules.conf 
87
	/sbin/depmod -a
89
	/sbin/depmod -a
88
uninstall:
90
uninstall:
89
	/sbin/modprobe -r slamr slusb
91
#	/sbin/modprobe -r slamr slusb
92
	/sbin/modprobe -r slamr
90
	cp /etc/modules.conf /etc/modules.conf.slamr && \
93
	cp /etc/modules.conf /etc/modules.conf.slamr && \
91
	   egrep -ve 'alias char-major-242 slamr|alias char-major-243 slusb' /etc/modules.conf.slamr > /etc/modules.conf
94
          egrep -ve 'alias char-major-242 slamr' /etc/modules.conf.slamr > /etc/modules.conf
95
#	   egrep -ve 'alias char-major-242 slamr|alias char-major-243 slusb' /etc/modules.conf.slamr > /etc/modules.conf
92
	$(RM) $(module-dir)/slamr.o
96
	$(RM) $(module-dir)/slamr.o
93
	$(RM) $(module-dir)/slusb.o
97
#	$(RM) $(module-dir)/slusb.o
94
	/sbin/depmod -a
98
	/sbin/depmod -a
95
uninstall-old:
99
uninstall-old:
96
	$(RM) $(module-dir)/slmdm.o \
100
	$(RM) $(module-dir)/slmdm.o \
97
              $(module-dir)/slfax.o \
101
              $(module-dir)/slfax.o \
98
              $(module-dir)/slusb.o \
102
#              $(module-dir)/slusb.o \
99
              $(module-dir)/slamrmo.o \
103
              $(module-dir)/slamrmo.o \
100
              $(module-dir)/slmodem.o  # remove old 2.7,2.8 version
104
              $(module-dir)/slmodem.o  # remove old 2.7,2.8 version
101
105
Lines 112-126 Link Here
112
ifeq ($(ARCH64), 0)
116
ifeq ($(ARCH64), 0)
113
	install -D -m 644 slamr.ko $(module-dir)/slamr.ko
117
	install -D -m 644 slamr.ko $(module-dir)/slamr.ko
114
endif
118
endif
115
	install -D -m 644 slusb.ko $(module-dir)/slusb.ko
119
#	install -D -m 644 slusb.ko $(module-dir)/slusb.ko
116
	/sbin/depmod -a
120
	/sbin/depmod -a
117
uninstall:
121
uninstall:
118
ifeq ($(ARCH64), 0)
122
ifeq ($(ARCH64), 0)
119
	modprobe -r slamr ; echo -n
123
	modprobe -r slamr ; echo -n
120
endif
124
endif
121
	modprobe -r slusb ; echo -n
125
#	modprobe -r slusb ; echo -n
122
	$(RM) $(module-dir)/slamr.ko
126
	$(RM) $(module-dir)/slamr.ko
123
	$(RM) $(module-dir)/slusb.ko
127
#	$(RM) $(module-dir)/slusb.ko
124
	/sbin/depmod -a
128
	/sbin/depmod -a
125
endif
129
endif
126
130

Return to bug 218381