1 From 694755867a4adf61191bc065541888ad6828cfc6 Mon Sep 17 00:00:00 2001
2 From: FURUSO Shinichi <Shinichi.Furuso@jp.sony.com>
3 Date: Mon, 8 Aug 2011 14:01:03 +0900
4 Subject: [PATCH 1/2] rename KERNELSRC with KERNELDIR for sles10
7 Makefile | 136 +++++++++++++++++++++++++++++-----------------------------
8 Makefile.inc | 12 +++---
10 3 files changed, 79 insertions(+), 79 deletions(-)
12 diff --git a/Makefile b/Makefile
13 index 462bd77..1973524 100644
16 @@ -31,10 +31,10 @@ def:
17 @echo "Commonly used build commands:"
19 @echo "When using KLIPS:"
20 - @echo " make KERNELSRC=/usr/src/linux-2.6.36 module minstall programs install"
21 + @echo " make KERNELDIR=/usr/src/linux-2.6.36 module minstall programs install"
23 @echo "When using KLIPS with OCF:"
24 - @echo " make KERNELSRC=/usr/src/linux-2.6.36-ocf/ MODULE_DEF_INCLUDE=$${OPENSWANSRCDIR}/packaging/ocf/config-all.hmodules module minstall programs install"
25 + @echo " make KERNELDIR=/usr/src/linux-2.6.36-ocf/ MODULE_DEF_INCLUDE=$${OPENSWANSRCDIR}/packaging/ocf/config-all.hmodules module minstall programs install"
27 @echo "When using NETKEY:"
28 @echo " make programs install"
29 @@ -47,7 +47,7 @@ include ${OPENSWANSRCDIR}/Makefile.top
32 # what variant of our patches should we use, and where is it
33 -KERNELREL=$(shell ${KVSHORTUTIL} ${KERNELSRC}/Makefile)
34 +KERNELREL=$(shell ${KVSHORTUTIL} ${KERNELDIR}/Makefile)
36 # directories visited by all recursion
38 @@ -70,37 +70,37 @@ npatch: unapplynpatch applynpatch
39 sarefpatch: unapplysarefpatch applysarefpatch
42 - @echo "info: making unapplypatch in `pwd` and KERNELSRC=\"${KERNELSRC}\";"
43 - -@if [ -f ${KERNELSRC}/openswan.patch ]; then \
44 + @echo "info: making unapplypatch in `pwd` and KERNELDIR=\"${KERNELDIR}\";"
45 + -@if [ -f ${KERNELDIR}/openswan.patch ]; then \
46 echo Undoing previous patches; \
47 - cat ${KERNELSRC}/openswan.patch | (cd ${KERNELSRC} && patch -p1 -R --force -E -z .preipsec --reverse --ignore-whitespace ); \
48 + cat ${KERNELDIR}/openswan.patch | (cd ${KERNELDIR} && patch -p1 -R --force -E -z .preipsec --reverse --ignore-whitespace ); \
52 @echo "info: Now performing forward patches in `pwd`";
53 - ${MAKE} kernelpatch${KERNELREL} | tee ${KERNELSRC}/openswan.patch | (cd ${KERNELSRC} && patch -p1 -b -z .preipsec --forward --ignore-whitespace )
54 + ${MAKE} kernelpatch${KERNELREL} | tee ${KERNELDIR}/openswan.patch | (cd ${KERNELDIR} && patch -p1 -b -z .preipsec --forward --ignore-whitespace )
57 @echo "info: making unapplynpatch (note the second N) in `pwd`";
58 - -@if [ -f ${KERNELSRC}/natt.patch ]; then \
59 + -@if [ -f ${KERNELDIR}/natt.patch ]; then \
60 echo Undoing previous NAT patches; \
61 - cat ${KERNELSRC}/natt.patch | (cd ${KERNELSRC} && patch -p1 -R --force -E -z .preipsec --reverse --ignore-whitespace ); \
62 + cat ${KERNELDIR}/natt.patch | (cd ${KERNELDIR} && patch -p1 -R --force -E -z .preipsec --reverse --ignore-whitespace ); \
66 @echo "info: Now performing forward NAT patches in `pwd`";
67 - ${MAKE} nattpatch${KERNELREL} | tee ${KERNELSRC}/natt.patch | (cd ${KERNELSRC} && patch -p1 -b -z .preipsec --forward --ignore-whitespace )
68 + ${MAKE} nattpatch${KERNELREL} | tee ${KERNELDIR}/natt.patch | (cd ${KERNELDIR} && patch -p1 -b -z .preipsec --forward --ignore-whitespace )
71 @echo "info: making unapplysarefpatch in `pwd`";
72 - -@if [ -f ${KERNELSRC}/saref.patch ]; then \
73 + -@if [ -f ${KERNELDIR}/saref.patch ]; then \
74 echo Undoing previous saref patches; \
75 - cat ${KERNELSRC}/saref.patch | (cd ${KERNELSRC} && patch -p1 -R --force -E -z .preng --reverse --ignore-whitespace ); \
76 + cat ${KERNELDIR}/saref.patch | (cd ${KERNELDIR} && patch -p1 -R --force -E -z .preng --reverse --ignore-whitespace ); \
80 @echo "info: Now performing SAref patches in `pwd`";
81 - ${MAKE} sarefpatch${KERNELREL} | tee ${KERNELSRC}/klipsng.patch | (cd ${KERNELSRC} && patch -p1 -b -z .preng --forward --ignore-whitespace )
82 + ${MAKE} sarefpatch${KERNELREL} | tee ${KERNELDIR}/klipsng.patch | (cd ${KERNELDIR} && patch -p1 -b -z .preng --forward --ignore-whitespace )
85 PATCHER=packaging/utils/patcher
86 @@ -111,36 +111,36 @@ patches:
89 echo "===============" >>out.kpatch
90 - echo "`date` `cd $(KERNELSRC) ; pwd`" >>out.kpatch
91 + echo "`date` `cd $(KERNELDIR) ; pwd`" >>out.kpatch
92 $(MAKE) __patches$(KERNELREL) >>out.kpatch
95 PATCHES22=klips/patches2.2
96 __patches2.3 __patches2.4:
97 - @$(PATCHER) -v -c $(KERNELSRC) Documentation/Configure.help \
98 + @$(PATCHER) -v -c $(KERNELDIR) Documentation/Configure.help \
99 'CONFIG_KLIPS' $(PATCHES)/Documentation/Configure.help.fs2_2.patch
100 - @$(PATCHER) -v $(KERNELSRC) net/Config.in \
101 + @$(PATCHER) -v $(KERNELDIR) net/Config.in \
102 'CONFIG_KLIPS' $(PATCHES)/net/Config.in.fs2_4.patch
103 - @$(PATCHER) -v $(KERNELSRC) net/Makefile \
104 + @$(PATCHER) -v $(KERNELDIR) net/Makefile \
105 'CONFIG_KLIPS' $(PATCHES)/net/Makefile.fs2_4.patch
106 - @$(PATCHER) -v $(KERNELSRC) net/ipv4/af_inet.c \
107 + @$(PATCHER) -v $(KERNELDIR) net/ipv4/af_inet.c \
108 'CONFIG_KLIPS' $(PATCHES)/net/ipv4/af_inet.c.fs2_4.patch
109 - @$(PATCHER) -v $(KERNELSRC) net/ipv4/udp.c \
110 + @$(PATCHER) -v $(KERNELDIR) net/ipv4/udp.c \
111 'CONFIG_KLIPS' $(PATCHES)/net/ipv4/udp.c.fs2_4.patch
112 - @$(PATCHER) -v $(KERNELSRC) include/net/sock.h \
113 + @$(PATCHER) -v $(KERNELDIR) include/net/sock.h \
114 'CONFIG_KLIPS' $(PATCHES)/include/net/sock.h.fs2_4.patch
115 # Removed patches, will unpatch automatically.
116 - @$(PATCHER) -v $(KERNELSRC) include/linux/proc_fs.h
117 - @$(PATCHER) -v $(KERNELSRC) net/core/dev.c
118 - @$(PATCHER) -v $(KERNELSRC) net/ipv4/protocol.c
119 - @$(PATCHER) -v $(KERNELSRC) drivers/net/Space.c
120 - @$(PATCHER) -v $(KERNELSRC) include/linux/netlink.h
121 - @$(PATCHER) -v $(KERNELSRC) net/netlink/af_netlink.c
122 - @$(PATCHER) -v $(KERNELSRC) net/netlink/netlink_dev.c
123 - @$(PATCHER) -v $(KERNELSRC) drivers/isdn/isdn_net.c
124 + @$(PATCHER) -v $(KERNELDIR) include/linux/proc_fs.h
125 + @$(PATCHER) -v $(KERNELDIR) net/core/dev.c
126 + @$(PATCHER) -v $(KERNELDIR) net/ipv4/protocol.c
127 + @$(PATCHER) -v $(KERNELDIR) drivers/net/Space.c
128 + @$(PATCHER) -v $(KERNELDIR) include/linux/netlink.h
129 + @$(PATCHER) -v $(KERNELDIR) net/netlink/af_netlink.c
130 + @$(PATCHER) -v $(KERNELDIR) net/netlink/netlink_dev.c
131 + @$(PATCHER) -v $(KERNELDIR) drivers/isdn/isdn_net.c
134 - @KERNELDEFCONFIG=$(KERNELSRC)/arch/$(ARCH)/defconfig ; \
135 + @KERNELDEFCONFIG=$(KERNELDIR)/arch/$(ARCH)/defconfig ; \
136 KERNELCONFIG=$(KCFILE) ; \
137 if ! egrep -q 'CONFIG_KLIPS' $$KERNELDEFCONFIG ; \
139 @@ -233,15 +233,15 @@ obsolete_target:
143 - @if test ! -d $(KERNELSRC) -a ! -L $(KERNELSRC) ; \
144 + @if test ! -d $(KERNELDIR) -a ! -L $(KERNELDIR) ; \
146 - echo '*** cannot find directory "$(KERNELSRC)"!!' ; \
147 + echo '*** cannot find directory "$(KERNELDIR)"!!' ; \
148 echo '*** may be necessary to add symlink to kernel source' ; \
151 - @if ! cd $(KERNELSRC) ; \
152 + @if ! cd $(KERNELDIR) ; \
154 - echo '*** cannot "cd $(KERNELSRC)"!!' ; \
155 + echo '*** cannot "cd $(KERNELDIR)"!!' ; \
156 echo '*** may be necessary to add symlink to kernel source' ; \
159 @@ -264,21 +264,21 @@ Makefile: Makefile.ver
161 # configuring (exit statuses disregarded, something fishy here sometimes)
163 - -cd $(KERNELSRC) ; $(MAKE) $(KERNMAKEOPTS) xconfig
164 + -cd $(KERNELDIR) ; $(MAKE) $(KERNMAKEOPTS) xconfig
166 - -cd $(KERNELSRC) ; $(MAKE) $(KERNMAKEOPTS) menuconfig
167 + -cd $(KERNELDIR) ; $(MAKE) $(KERNMAKEOPTS) menuconfig
169 - -cd $(KERNELSRC) ; $(MAKE) $(KERNMAKEOPTS) config
170 + -cd $(KERNELDIR) ; $(MAKE) $(KERNMAKEOPTS) config
173 - -cd $(KERNELSRC) ; $(MAKE) $(KERNMAKEOPTS) oldconfig
174 + -cd $(KERNELDIR) ; $(MAKE) $(KERNMAKEOPTS) oldconfig
177 - cd $(KERNELSRC) ; $(MAKE) $(KERNMAKEOPTS) ${NONINTCONFIG} </dev/null
178 - cd $(KERNELSRC) ; $(MAKE) $(KERNMAKEOPTS) dep >/dev/null
179 + cd $(KERNELDIR) ; $(MAKE) $(KERNMAKEOPTS) ${NONINTCONFIG} </dev/null
180 + cd $(KERNELDIR) ; $(MAKE) $(KERNMAKEOPTS) dep >/dev/null
183 - -cd $(KERNELSRC) ; $(MAKE) $(KERNMAKEOPTS) clean
184 + -cd $(KERNELDIR) ; $(MAKE) $(KERNMAKEOPTS) clean
187 @if test ! -f $(KCFILE) ; \
188 @@ -309,11 +309,11 @@ kernel:
189 # we run make dep seperately, because there is no point in running ERRCHECK
190 # on the make dep output.
191 # see LKML thread "clean before or after dep?"
192 - ( cd $(KERNELSRC) ; $(MAKE) $(KERNMAKEOPTS) $(KERNCLEAN) $(KERNDEP) )
193 - ( cd $(KERNELSRC) ; $(MAKE) $(KERNMAKEOPTS) $(KERNEL) ) 2>&1 | tee out.kbuild
194 + ( cd $(KERNELDIR) ; $(MAKE) $(KERNMAKEOPTS) $(KERNCLEAN) $(KERNDEP) )
195 + ( cd $(KERNELDIR) ; $(MAKE) $(KERNMAKEOPTS) $(KERNEL) ) 2>&1 | tee out.kbuild
196 @if egrep -q '^CONFIG_MODULES=y' $(KCFILE) ; \
198 - ( cd $(KERNELSRC) ; \
199 + ( cd $(KERNELDIR) ; \
200 $(MAKE) $(KERNMAKEOPTS) modules 2>&1 ) | tee -a out.kbuild ; \
202 ${ERRCHECK} out.kbuild
203 @@ -347,33 +347,33 @@ ${MODBUILDDIR}/Makefile : ${OPENSWANSRCDIR}/packaging/makefiles/module.make
204 cp ${OPENSWANSRCDIR}/packaging/makefiles/module.make ${MODBUILDDIR}/Makefile
205 echo "# " >> ${MODBUILDDIR}/Makefile
206 echo "# Local Variables: " >> ${MODBUILDDIR}/Makefile
207 - echo "# compile-command: \"${MAKE} OPENSWANSRCDIR=${OPENSWANSRCDIR} ARCH=${ARCH} TOPDIR=${KERNELSRC} ${MODULE_FLAGS} MODULE_DEF_INCLUDE=${MODULE_DEF_INCLUDE} MODULE_DEFCONFIG=${MODULE_DEFCONFIG} -f Makefile ipsec.o\"" >> ${MODBUILDDIR}/Makefile
208 + echo "# compile-command: \"${MAKE} OPENSWANSRCDIR=${OPENSWANSRCDIR} ARCH=${ARCH} TOPDIR=${KERNELDIR} ${MODULE_FLAGS} MODULE_DEF_INCLUDE=${MODULE_DEF_INCLUDE} MODULE_DEFCONFIG=${MODULE_DEFCONFIG} -f Makefile ipsec.o\"" >> ${MODBUILDDIR}/Makefile
209 echo "# End: " >> ${MODBUILDDIR}/Makefile
212 - @if [ -f ${KERNELSRC}/README.openswan-2 ] ; then \
213 - echo "WARNING: Kernel source ${KERNELSRC} has already been patched with openswan-2, out of tree build might fail!"; \
214 + @if [ -f ${KERNELDIR}/README.openswan-2 ] ; then \
215 + echo "WARNING: Kernel source ${KERNELDIR} has already been patched with openswan-2, out of tree build might fail!"; \
217 - @if [ -f ${KERNELSRC}/README.freeswan ] ; then \
218 - echo "ERROR: Kernel source ${KERNELSRC} has already been patched with freeswan, out of tree build will fail!"; \
219 + @if [ -f ${KERNELDIR}/README.freeswan ] ; then \
220 + echo "ERROR: Kernel source ${KERNELDIR} has already been patched with freeswan, out of tree build will fail!"; \
222 - @if [ -f ${KERNELSRC}/Rules.make ] ; then \
223 + @if [ -f ${KERNELDIR}/Rules.make ] ; then \
224 echo "Building module for a 2.4 kernel"; ${MAKE} module24 ; \
225 else echo "Building module for a 2.6 kernel"; ${MAKE} module26; \
228 modclean moduleclean:
229 - @if [ -f ${KERNELSRC}/Rules.make ] ; then \
230 + @if [ -f ${KERNELDIR}/Rules.make ] ; then \
231 echo "Cleaning module for a 2.4 kernel"; ${MAKE} module24clean ; \
232 else echo "Cleaning module for a 2.6 kernel"; ${MAKE} module26clean; \
236 - @if [ ! -f ${KERNELSRC}/Rules.make ] ; then \
237 + @if [ ! -f ${KERNELDIR}/Rules.make ] ; then \
238 echo "Warning: Building for a 2.4 kernel in what looks like a 2.6 tree"; \
240 ${MAKE} ${MODBUILDDIR}/Makefile
241 - ${MAKE} -C ${MODBUILDDIR} OPENSWANSRCDIR=${OPENSWANSRCDIR} ARCH=${ARCH} V=${V} ${MODULE_FLAGS} MODULE_DEF_INCLUDE=${MODULE_DEF_INCLUDE} TOPDIR=${KERNELSRC} -f Makefile ipsec.o
242 + ${MAKE} -C ${MODBUILDDIR} OPENSWANSRCDIR=${OPENSWANSRCDIR} ARCH=${ARCH} V=${V} ${MODULE_FLAGS} MODULE_DEF_INCLUDE=${MODULE_DEF_INCLUDE} TOPDIR=${KERNELDIR} -f Makefile ipsec.o
244 @echo '========================================================='
246 @@ -394,15 +394,15 @@ mod24clean module24clean:
247 #autoodetect 2.4 and 2.6
248 module_install: minstall
250 - @if [ -f ${KERNELSRC}/Rules.make ] ; then \
251 + @if [ -f ${KERNELDIR}/Rules.make ] ; then \
252 ${MAKE} minstall24 ; else ${MAKE} minstall26; \
255 # module-only install, with error checks
257 - ( OSMODLIB=`${MAKE} -C $(KERNELSRC) -p dummy | ( sed -n -e '/^MODLIB/p' -e '/^MODLIB/q' ; cat > /dev/null ) | sed -e 's/^MODLIB[ :=]*\([^;]*\).*/\1/'` ; \
258 + ( OSMODLIB=`${MAKE} -C $(KERNELDIR) -p dummy | ( sed -n -e '/^MODLIB/p' -e '/^MODLIB/q' ; cat > /dev/null ) | sed -e 's/^MODLIB[ :=]*\([^;]*\).*/\1/'` ; \
259 if [ -z "$$OSMODLIB" ] ; then \
260 - OSMODLIB=`${MAKE} -C $(KERNELSRC) -n -p modules_install | ( sed -n -e '/^MODLIB/p' -e '/^MODLIB/q' ; cat > /dev/null ) | sed -e 's/^MODLIB[ :=]*\([^;]*\).*/\1/'` ; \
261 + OSMODLIB=`${MAKE} -C $(KERNELDIR) -n -p modules_install | ( sed -n -e '/^MODLIB/p' -e '/^MODLIB/q' ; cat > /dev/null ) | sed -e 's/^MODLIB[ :=]*\([^;]*\).*/\1/'` ; \
263 if [ -z "$$OSMODLIB" ] ; then \
264 echo "No known place to install module. Aborting." ; \
265 @@ -441,15 +441,15 @@ ${MOD26BUILDDIR}/Makefile : ${OPENSWANSRCDIR}/packaging/makefiles/module26.make
266 cp ${OPENSWANSRCDIR}/packaging/makefiles/module26.make ${MOD26BUILDDIR}/Makefile
267 echo "# " >> ${MOD26BUILDDIR}/Makefile
268 echo "# Local Variables: " >> ${MOD26BUILDDIR}/Makefile
269 - echo "# compile-command: \"${MAKE} -C ${OPENSWANSRCDIR} ARCH=${ARCH} KERNELSRC=${KERNELSRC} MOD26BUILDDIR=${MOD26BUILDDIR} module26\"" >> ${MOD26BUILDDIR}/Makefile
270 + echo "# compile-command: \"${MAKE} -C ${OPENSWANSRCDIR} ARCH=${ARCH} KERNELDIR=${KERNELDIR} MOD26BUILDDIR=${MOD26BUILDDIR} module26\"" >> ${MOD26BUILDDIR}/Makefile
271 echo "# End: " >> ${MOD26BUILDDIR}/Makefile
272 ln -s -f ${OPENSWANSRCDIR}/linux/net/ipsec/match*.S ${MOD26BUILDDIR}
275 - @if [ -f ${KERNELSRC}/Rules.make ] ; then \ echo "Warning: Building for a 2.6 kernel in what looks like a 2.4 tree"; \
276 + @if [ -f ${KERNELDIR}/Rules.make ] ; then \ echo "Warning: Building for a 2.6 kernel in what looks like a 2.4 tree"; \
278 ${MAKE} ${MOD26BUILDDIR}/Makefile
279 - ${MAKE} -C ${KERNELSRC} ${KERNELBUILDMFLAGS} BUILDDIR=${MOD26BUILDDIR} SUBDIRS=${MOD26BUILDDIR} MODULE_DEF_INCLUDE=${MODULE_DEF_INCLUDE} MODULE_DEFCONFIG=${MODULE_DEFCONFIG} MODULE_EXTRA_INCLUDE=${MODULE_EXTRA_INCLUDE} ARCH=${ARCH} V=${V} modules
280 + ${MAKE} -C ${KERNELDIR} ${KERNELBUILDMFLAGS} BUILDDIR=${MOD26BUILDDIR} SUBDIRS=${MOD26BUILDDIR} MODULE_DEF_INCLUDE=${MODULE_DEF_INCLUDE} MODULE_DEFCONFIG=${MODULE_DEFCONFIG} MODULE_EXTRA_INCLUDE=${MODULE_EXTRA_INCLUDE} ARCH=${ARCH} V=${V} modules
282 @echo '========================================================='
284 @@ -469,9 +469,9 @@ mod26clean module26clean:
286 # module-only install, with error checks
288 - ( OSMODLIB=`${MAKE} -C $(KERNELSRC) -p help | ( sed -n -e '/^MODLIB/p' -e '/^MODLIB/q' ; cat > /dev/null ) | sed -e 's/^MODLIB[ :=]*\([^;]*\).*/\1/'` ; \
289 + ( OSMODLIB=`${MAKE} -C $(KERNELDIR) -p help | ( sed -n -e '/^MODLIB/p' -e '/^MODLIB/q' ; cat > /dev/null ) | sed -e 's/^MODLIB[ :=]*\([^;]*\).*/\1/'` ; \
290 if [ -z "$$OSMODLIB" ] ; then \
291 - OSMODLIB=`${MAKE} -C $(KERNELSRC) -n -p modules_install | ( sed -n -e '/^MODLIB/p' -e '/^MODLIB/q' ; cat > /dev/null ) | sed -e 's/^MODLIB[ :=]*\([^;]*\).*/\1/'` ; \
292 + OSMODLIB=`${MAKE} -C $(KERNELDIR) -n -p modules_install | ( sed -n -e '/^MODLIB/p' -e '/^MODLIB/q' ; cat > /dev/null ) | sed -e 's/^MODLIB[ :=]*\([^;]*\).*/\1/'` ; \
294 if [ -z "$$OSMODLIB" ] ; then \
295 echo "No known place to install module. Aborting." ; \
296 @@ -506,10 +506,10 @@ kinstall:
297 # undocumented kernel folklore: modules_install must precede install (observed on RHL8.0)
298 @if egrep -q '^CONFIG_MODULES=y' $(KCFILE) ; \
300 - ( cd $(KERNELSRC) ; \
301 + ( cd $(KERNELDIR) ; \
302 $(MAKE) $(KERNMAKEOPTS) modules_install 2>&1 ) | tee -a out.kinstall ; \
304 - ( cd $(KERNELSRC) ; $(MAKE) $(KERNMAKEOPTS) install ) 2>&1 | tee -a out.kinstall
305 + ( cd $(KERNELDIR) ; $(MAKE) $(KERNMAKEOPTS) install ) 2>&1 | tee -a out.kinstall
306 ${ERRCHECK} out.kinstall
308 kernelpatch2.6 kernelpatch:
309 @@ -525,9 +525,9 @@ kernelpatch2.0:
310 packaging/utils/kernelpatch 2.0
313 - if [ -f ${KERNELSRC}/Makefile ]; then \
314 + if [ -f ${KERNELDIR}/Makefile ]; then \
315 ${MAKE} nattpatch${KERNELREL}; \
316 - else echo "Cannot determine Linux kernel version. Perhaps you need to set KERNELSRC? (eg: export KERNELSRC=/usr/src/linux-`uname -r`/)"; exit 1; \
317 + else echo "Cannot determine Linux kernel version. Perhaps you need to set KERNELDIR? (eg: export KERNELDIR=/usr/src/linux-`uname -r`/)"; exit 1; \
321 @@ -553,7 +553,7 @@ unpatch:
325 - for f in `find $(KERNELSRC)/. -name '*.preipsec' -print` ; \
326 + for f in `find $(KERNELDIR)/. -name '*.preipsec' -print` ; \
328 echo "restoring $$f:" ; \
329 dir=`dirname $$f` ; \
330 @@ -592,11 +592,11 @@ ipkg_strip:
333 @echo "Moving ipsec.o into temporary location..."
334 - KV=$(shell ${KVUTIL} ${KERNELSRC}/Makefile) && \
335 + KV=$(shell ${KVUTIL} ${KERNELDIR}/Makefile) && \
336 mkdir -p $(OPENSWANSRCDIR)/packaging/ipkg/kernel-module/lib/modules/$$KV/net/ipsec
337 - KV=$(shell ${KVUTIL} ${KERNELSRC}/Makefile) && \
338 + KV=$(shell ${KVUTIL} ${KERNELDIR}/Makefile) && \
339 cp ${OPENSWANSRCDIR}/modobj*/ipsec.[k]o $(OPENSWANSRCDIR)/packaging/ipkg/kernel-module/lib/modules/$$KV/net/ipsec/
340 - KV=$(shell ${KVUTIL} ${KERNELSRC}/Makefile)
341 + KV=$(shell ${KVUTIL} ${KERNELDIR}/Makefile)
344 rm -rf $(OPENSWANSRCDIR)/packaging/ipkg/kernel-module/
345 diff --git a/Makefile.inc b/Makefile.inc
346 index 5ceb09d..19c797e 100644
349 @@ -139,19 +139,19 @@ RCDIR?=$(DESTDIR)$(FINALRCDIR)
351 # this is a hack using the wildcard to look for existence of a file/dir
352 ifneq ($(wildcard /usr/src/linux-2.6),)
353 -KERNELSRC?=/usr/src/linux-2.6
354 +KERNELDIR?=/usr/src/linux-2.6
356 ifneq ($(wildcard /usr/src/linux-2.4),)
357 -KERNELSRC?=/usr/src/linux-2.4
358 +KERNELDIR?=/usr/src/linux-2.4
360 -KERNELSRC?=/lib/modules/$(shell uname -r)/build
361 +KERNELDIR?=/lib/modules/$(shell uname -r)/build
365 # where kernel configuration outputs are located
366 -KCFILE=$(KERNELSRC)/.config
367 -ACFILE=$(KERNELSRC)/include/linux/autoconf.h
368 -VERFILE=$(KERNELSRC)/include/linux/version.h
369 +KCFILE=$(KERNELDIR)/.config
370 +ACFILE=$(KERNELDIR)/include/linux/autoconf.h
371 +VERFILE=$(KERNELDIR)/include/linux/version.h
373 # where KLIPS kernel module is install
374 OSMOD_DESTDIR?=net/ipsec
375 diff --git a/Makefile.top b/Makefile.top
376 index cabbdb2..1094c60 100644
381 # where KLIPS goes in the kernel
382 # note, some of the patches know the last part of this path
383 -KERNELKLIPS=$(KERNELSRC)/net/ipsec
384 -KERNELCRYPTODES=$(KERNELSRC)/crypto/ciphers/des
385 -KERNELLIBFREESWAN=$(KERNELSRC)/lib/libfreeswan
386 -KERNELLIBZLIB=$(KERNELSRC)/lib/zlib
387 -KERNELINCLUDE=$(KERNELSRC)/include
388 +KERNELKLIPS=$(KERNELDIR)/net/ipsec
389 +KERNELCRYPTODES=$(KERNELDIR)/crypto/ciphers/des
390 +KERNELLIBFREESWAN=$(KERNELDIR)/lib/libfreeswan
391 +KERNELLIBZLIB=$(KERNELDIR)/lib/zlib
392 +KERNELINCLUDE=$(KERNELDIR)/include
394 MAKEUTILS=packaging/utils
395 ERRCHECK=${MAKEUTILS}/errcheck