Re: Patch to fix the build of the smbfs.ko kernel module
Hajimu UMEMOTO wrote:
Hi,
On Sun, 17 Mar 2002 15:38:48 -0800
Maxime Henrion [EMAIL PROTECTED] said:
mux Actually, this patch is wrong because it won't ever compile des_enc.S.
mux Whatever I do, des_enc.c gets compiled and I can't figure out how to
mux compile a .S file with bsd.kmod.mk. If someone with more make(1) clue
mux than me could help out, that would be appreciated.
Did you make sure to do make depend after changing your Makefile?
I tried it and I could reproduce your problem with `make buildkernel
NOCLEAN=YES NO_KERNELDEPEND=YES'. Then, I tried with `make
buildkernel NOCLEAN=YES', and the problem was gone.
Oops. You are entirely right :-) Do you agree with the attached patch ?
I just changed ${.CURDIR}/../../crypto/des/arch/i386 to
${.CURDIR}/../../crypto/des/arch/${MACHINE_ARCH} in the .PATH directive
since make(1) is not whining about non-existing directories, and this
will allow to only modify the Makefile in one place when adding new
assembly des_enc.S files. I'll commit it if it's fine with you.
Maxime
Index: Makefile
===
RCS file: /home/ncvs/src/sys/modules/smbfs/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile11 Jan 2002 15:48:57 - 1.4
+++ Makefile18 Mar 2002 11:11:59 -
@@ -1,6 +1,7 @@
# $FreeBSD: src/sys/modules/smbfs/Makefile,v 1.4 2002/01/11 15:48:57 ru Exp $
.PATH: ${.CURDIR}/../../crypto/des \
+ ${.CURDIR}/../../crypto/des/arch/${MACHINE_ARCH} \
${.CURDIR}/../../kern \
${.CURDIR}/../../libkern \
${.CURDIR}/../../netsmb \
@@ -22,6 +23,11 @@
.if defined(NETSMBCRYPTO)
SRCS+= des_ecb.c des_setkey.c
+.if ${MACHINE_ARCH} == i386
+SRCS+= des_enc.S
+.else
+SRCS+= des_enc.c
+.endif
.endif
# Build with IPX support (1|0)
Re: Patch to fix the build of the smbfs.ko kernel module
On Mon, 18 Mar 2002 03:18:46 PST, Maxime Henrion wrote: Oops. You are entirely right :-) Do you agree with the attached patch ? Yes, please go ahead. Thanks for looking after this. Ciao, Sheldon. To Unsubscribe: send mail to [EMAIL PROTECTED] with unsubscribe freebsd-current in the body of the message
Re: Patch to fix the build of the smbfs.ko kernel module
Hajimu UMEMOTO wrote: Hi, On Sat, 16 Mar 2002 01:32:04 -0800 Maxime Henrion [EMAIL PROTECTED] said: mux Since the addition of optimized 3DES encryption for x86, the build of the mux smbfs kernel module has been broken (on all platforms). This is because mux new files are now needed (des_enc.S for x86, des_enc.c for other mux archs). The attached patch fixes this problem. Oops, I've forgot about smbfs.ko. It seems fine to me. Actually, this patch is wrong because it won't ever compile des_enc.S. Whatever I do, des_enc.c gets compiled and I can't figure out how to compile a .S file with bsd.kmod.mk. If someone with more make(1) clue than me could help out, that would be appreciated. Maxime To Unsubscribe: send mail to [EMAIL PROTECTED] with unsubscribe freebsd-current in the body of the message
Re: Patch to fix the build of the smbfs.ko kernel module
Hi,
On Sun, 17 Mar 2002 15:38:48 -0800
Maxime Henrion [EMAIL PROTECTED] said:
mux Actually, this patch is wrong because it won't ever compile des_enc.S.
mux Whatever I do, des_enc.c gets compiled and I can't figure out how to
mux compile a .S file with bsd.kmod.mk. If someone with more make(1) clue
mux than me could help out, that would be appreciated.
Did you make sure to do make depend after changing your Makefile?
I tried it and I could reproduce your problem with `make buildkernel
NOCLEAN=YES NO_KERNELDEPEND=YES'. Then, I tried with `make
buildkernel NOCLEAN=YES', and the problem was gone.
Sincerely,
--
Hajimu UMEMOTO @ Internet Mutual Aid Society Yokohama, Japan
[EMAIL PROTECTED] [EMAIL PROTECTED] ume@{,jp.}FreeBSD.org
http://www.imasy.org/~ume/
To Unsubscribe: send mail to [EMAIL PROTECTED]
with unsubscribe freebsd-current in the body of the message
Patch to fix the build of the smbfs.ko kernel module
Hi,
Since the addition of optimized 3DES encryption for x86, the build of the
smbfs kernel module has been broken (on all platforms). This is because
new files are now needed (des_enc.S for x86, des_enc.c for other
archs). The attached patch fixes this problem.
Reviews would be appreciated.
Maxime
Index: Makefile
===
RCS file: /home/ncvs/src/sys/modules/smbfs/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile11 Jan 2002 15:48:57 - 1.4
+++ Makefile16 Mar 2002 02:52:31 -
-1,6 +1,7
# $FreeBSD: src/sys/modules/smbfs/Makefile,v 1.4 2002/01/11 15:48:57 ru Exp $
.PATH: ${.CURDIR}/../../crypto/des \
+ ${.CURDIR}/../../crypto/des/arch/i386 \
${.CURDIR}/../../kern \
${.CURDIR}/../../libkern \
${.CURDIR}/../../netsmb \
-22,6 +23,11
.if defined(NETSMBCRYPTO)
SRCS+= des_ecb.c des_setkey.c
+.if ${MACHINE_ARCH} == i386
+SRCS+= des_enc.S
+.else
+SRCS+= des_enc.c
+.endif
.endif
# Build with IPX support (1|0)
Re: Patch to fix the build of the smbfs.ko kernel module
Hi,
On Sat, 16 Mar 2002 01:32:04 -0800
Maxime Henrion [EMAIL PROTECTED] said:
mux Since the addition of optimized 3DES encryption for x86, the build of the
mux smbfs kernel module has been broken (on all platforms). This is because
mux new files are now needed (des_enc.S for x86, des_enc.c for other
mux archs). The attached patch fixes this problem.
Oops, I've forgot about smbfs.ko. It seems fine to me.
--
Hajimu UMEMOTO @ Internet Mutual Aid Society Yokohama, Japan
[EMAIL PROTECTED] [EMAIL PROTECTED] ume@{,jp.}FreeBSD.org
http://www.imasy.org/~ume/
To Unsubscribe: send mail to [EMAIL PROTECTED]
with unsubscribe freebsd-current in the body of the message
