]>
Commit | Line | Data |
---|---|---|
a318f608 | 1 | --- freeswan-1.97/Makefile Fri Apr 12 06:08:31 2002 |
2 | +++ freeswan-1.97/Makefile.org Fri May 3 12:42:39 2002 | |
3 | @@ -50,7 +50,8 @@ | |
4 | @false | |
5 | ||
6 | # everything that's necessary to put Klips into the kernel | |
7 | -insert: patches klink klipsdefaults | |
8 | +.NOTPARALLEL: myprecheck patches klink klipsdefaults | |
9 | +insert: myprecheck patches klink klipsdefaults | |
10 | ||
11 | # create KERNELKLIPS and populate it with symlinks to the sources | |
12 | klink: | |
13 | @@ -214,6 +215,8 @@ | |
14 | POST=confcheck programs install kernel | |
15 | MPOST=confcheck programs install module | |
16 | RPOST=confcheck programs rpminstall module rpmkinstall rpms | |
17 | +KMPOST=confcheck programs install kmodule | |
18 | + | |
19 | ogo: $(PRE) pcf $(POST) | |
20 | oldgo: $(PRE) ocf $(POST) | |
21 | menugo: $(PRE) mcf $(POST) | |
22 | @@ -227,6 +230,7 @@ | |
23 | oldrpm: $(PRE) ocf $(RPOST) | |
24 | menurpm: $(PRE) mcf $(RPOST) | |
25 | xrpm: $(PRE) xcf $(RPOST) | |
26 | +modgo: $(PRE) ncf $(KMPOST) | |
27 | ||
28 | # preliminaries | |
29 | precheck: | |
30 | @@ -256,6 +260,11 @@ | |
31 | echo '*** please do that first; the results are necessary.' ; \ | |
32 | exit 1 ; \ | |
33 | fi | |
34 | +myprecheck: myocf | |
35 | + | |
36 | +myocf: precheck | |
37 | + -cd $(KERNELSRC) ; yes "" | $(MAKE) oldconfig; $(MAKE) include/linux/version.h | |
38 | + | |
39 | ||
40 | # set version code if this is a fresh CVS checkout | |
41 | verset: | |
42 | @@ -279,6 +288,16 @@ | |
43 | ocf: | |
44 | -cd $(KERNELSRC) ; $(MAKE) $(KERNMAKEOPTS) oldconfig dep </dev/null >/dev/null | |
45 | ||
46 | + | |
47 | +ENTER := "M\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" | |
48 | +ncf: insert | |
49 | + -cd $(KERNELSRC); echo -e $(ENTER) | $(MAKE) oldconfig | |
50 | + | |
51 | +ncf_k: ncf | |
52 | + -cd $(KERNELSRC); $(MAKE) dep kernel | |
53 | + | |
54 | +confcheck: ncf | |
55 | + | |
56 | rpm: | |
57 | mkdir -p ${RPMKERNDIR} | |
58 | rm -rf $(RPMTMPDIR) | |
59 | @@ -329,6 +348,24 @@ | |
60 | then set -x ; \ | |
61 | ( cd $(KERNELSRC) ; \ | |
62 | $(MAKE) $(KERNMAKEOPTS) modules 2>&1 ) | tee -a out.kbuild ; \ | |
63 | + | |
64 | + fi | |
65 | + utils/errcheck out.kbuild | |
66 | + | |
67 | + # kernel building, with error checks | |
68 | + kmodule: confcheck | |
69 | + rm -f out.kbuild out.kinstall | |
70 | + cp -pf Makefile.ipsec $(KERNELSRC)/net/ipsec/ | |
71 | + #( cd $(KERNELSRC) ; $(MAKE) dep kernel) 2>&1 | tee out.kbuild | |
72 | + @if egrep -q '^CONFIG_MODULES=y' $(KCFILE) ; \ | |
73 | + then set -x ; \ | |
74 | + ( cd $(KERNELSRC)/net/ipsec ; \ | |
75 | + ln -sf ../../arch .; ln -sf ../../Rules.make .; cd ../..; \ | |
76 | + $(MAKE) -C net/ipsec -f Makefile.ipsec 2>&1 ) | tee -a out.kbuild ; \ | |
77 | + rm $(KERNELSRC)/net/ipsec/arch $(KERNELSRC)/net/ipsec/Rules.make; \ | |
78 | + else \ | |
79 | + echo "BUG: You have to enable modules!"; \ | |
80 | + exit 1; \ | |
81 | fi | |
82 | utils/errcheck out.kbuild | |
83 |