[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

(usagi-users 01422) Latest snapshot against RHL rawhide 2.4.18-0.22

Hi,

during trying to apply latest USAGI snapshot against RHL rawhide
2.4.18-0.22 sources I found a minor (?) problem:

include/sysctl.h defines enum
        /* CTL_NET names: */

Conflict:

USAGI:
@@ -164,7 +166,8 @@
        NET_TR=14,
        NET_DECNET=15,
        NET_ECONET=16,
-       NET_KHTTPD=17
+       NET_KHTTPD=17,
+       NET_IPSEC=18
 };


RHL:
        NET_KHTTPD=17,
        NET_TUX=18
};


My current workaround:
        NET_IPSEC=19


Is this ok?


Attached you will find a patch against latest USAGI diff which
creates a ready-to-apply diff for RHL source. Compiling still not
tested because of slow machine :-(

BTW: Is there a recommended config option set available? If yes, I
can try to create a patch against current spec file also with the
goal to get an USAGI-enabled RHL-like kernel binary package (won't
distribute binary or source packages, but publish all needed
additional files  [normally a few small files and a new spec file).

        Peter

Attachment: usagi-linux24-s20020429-2.4.18-rhl.0.22.diff.patch
Description: Binary data

Attachment: filewbgs4s.sig
Description: PGP signature