include @TOP_OBJDIR@/src/config/Makefile.config
+<linux24 linux_24 linux22 linux_22 linux20 linux_20>
+# Override for Linux 2.4 and older
+MKAFS_OSTYPE=LINUX24
+<all>
+
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+
# OS specific object files:
AFS_OS_OBJS = \
osi_alloc.o \
osi_cred.o \
+ osi_gcpags.o \
osi_groups.o \
osi_inode.o \
osi_file.o \
osi_sysctl.o \
osi_vfsops.o \
osi_vm.o \
- osi_vnodeops.o
+<ppc64_linux26>
+ osi_flush.o \
+<linux26 linux_26>
+ osi_export.o \
+ osi_nfssrv.o \
+<linux24 linux_24 linux26 linux_26>
+ osi_ioctl.o \
+ osi_proc.o \
+<all>
+ osi_vnodeops.o \
+<linux26 linux_26>
+ osi_pagecopy.o \
+ osi_fetchstore.o
+<all>
+
+AFS_OS_PAGOBJS = \
+ osi_alloc.o \
+ osi_cred.o \
+ osi_groups.o \
+ osi_inode.o \
+ osi_misc.o \
+ osi_probe.o \
+ osi_sleep.o \
+ osi_syscall.o \
+<ppc64_linux26>
+ osi_flush.o \
+<linux24 linux_24 linux26 linux_26>
+ osi_ioctl.o \
+<all>
+ osi_pag_module.o
AFS_OS_NFSOBJS =
COMMON_DEFINES=-D__KERNEL__ -DKERNEL -D_KERNEL -DMODULE ${SMP_DEF}
LINUX_KERNEL_PATH=@LINUX_KERNEL_PATH@
+LINUX_KERNEL_BUILD=@LINUX_KERNEL_BUILD@
# System specific build commands and flags
-<linux26>
+<linux26 linux_26>
# All the platform-specific and kernel-related things are provided by
# the kernel build system. So we should _not_ use COMMON_KERN_CFLAGS!
CCFLAGS = -Wno-strict-prototypes
DEFINES = $(COMMON_DEFINES)
+# CFLAGS_* and AFLAGS_* will be copied into the kbuild makefile
+CFLAGS_afs_pag_user.o = -DAFS_PAG_MANAGER
+
<i386_linux22 i386_linux24>
CCFLAGS = $(COMMON_KERN_CFLAGS) @P5PLUS_KOPTS@
DEFINES = $(COMMON_DEFINES) -DCPU=586
-<amd64_linux24>
-CCFLAGS = $(COMMON_KERN_CFLAGS) -mcmodel=kernel
+<amd64_linux22 amd64_linux24>
+CCFLAGS = $(COMMON_KERN_CFLAGS) -mcmodel=kernel -mno-red-zone
DEFINES = $(COMMON_DEFINES)
-<i386_umlinux22 i386_umlinux24 i386_umlinux26>
+<i386_umlinux22 i386_umlinux24>
CCFLAGS = $(COMMON_KERN_CFLAGS) @P5PLUS_KOPTS@ -Wno-strict-prototypes -I$(LINUX_KERNEL_PATH)/arch/um/include -I$(LINUX_KERNEL_PATH)/arch/um/kernel/tt/include -I$(LINUX_KERNEL_PATH)/arch/um/kernel/skas/include
DEFINES = $(COMMON_DEFINES) -DCPU=586
CCFLAGS = $(COMMON_KERN_CFLAGS) -fsigned-char
DEFINES = $(COMMON_DEFINES) -D__s390__
-<s390x_linux22 s390x_linux24 s390x_linux26>
+<s390x_linux22 s390x_linux24>
CCFLAGS = $(COMMON_KERN_CFLAGS) -fsigned-char
DEFINES = $(COMMON_DEFINES) -D__s390x__
-mcpu=ultrasparc -m64 -mno-fpu -mcmodel=medlow -ffixed-g4 -fcall-used-g5 -fcall-used-g7 -Wno-sign-compare
DEFINES = $(COMMON_DEFINES) -DCPU=sparc64
-<ppc_linux22 ppc_linux24 ppc64_linux24>
+<ppc_linux22 ppc_linux24 ppc64_linux22 ppc64_linux24>
CCFLAGS = $(COMMON_KERN_CFLAGS) -fsigned-char -msoft-float -fno-builtin -ffixed-r2
DEFINES = $(COMMON_DEFINES) -D__powerpc__
include Makefile.common
-<linux26 umlinux26>
+<linux26 linux_26 umlinux26>
LINUX_MODULE_EXT=ko
-<all -linux26 -umlinux26>
+<all -linux26 -linux_26 -umlinux26>
LINUX_MODULE_EXT=o
<all>
ln -fs ../Makefile.common $${KDIR}/Makefile.common; \
ln -fs ../config $${KDIR}/config; \
done
-
+
# Compile SP and MP clients as requested
-${COMPDIRS} ${INSTDIRS} ${DESTDIRS}:
+${INSTDIRS} ${DESTDIRS}: ${COMPDIRS}
+ if [ "${LINUX_KERNEL_PACKAGING}" ] ; then \
+ TARGPREFIX="pack_"; \
+ fi ; \
+ for m in ${MPS} ; do \
+ KDIR=${KOBJ}-${LINUX_VERSION}${LINUX_MODULE_NAME}-$$m ; \
+ echo Building in directory: $${KDIR} ; \
+ if [ "$$m" = "MP" ] ; then \
+ SMP_DEF="-DAFS_SMP @RHCONFIG_MP@ ${LOCAL_SMP_DEF}" ; \
+ TARG="libafs.mp" ; \
+ elif [ "$$m" = "EP" ] ; then \
+ SMP_DEF="-DAFS_SMP @RHCONFIG_MP@ ${LOCAL_SMP_DEF}" ; \
+ TARG="libafs.ep" ; \
+ elif [ "$$m" = "BM" ] ; then \
+ SMP_DEF="-DAFS_SMP @RHCONFIG_MP@ ${LOCAL_SMP_DEF}" ; \
+ TARG="libafs.bm" ; \
+ else \
+ SMP_DEF="@RHCONFIG_SP@ ${LOCAL_SMP_DEF}" ; \
+ TARG=libafs ; \
+ fi ; \
+ cd $${KDIR} ; \
+ $(MAKE) -f Makefile.afs SMP_DEF="$${SMP_DEF}" $@_$${TARGPREFIX}$${TARG} CLIENT=${LINUX_VERSION}${LINUX_MODULE_NAME} KDIR=$${KDIR} || exit $$?; \
+ cd ../ ; \
+ done
+
+${COMPDIRS}: setup
$(RM) -f h
- ln -fs ${LINUX_KERNEL_PATH}/include/linux h
+ $(RM) -f sys
+ $(RM) -f netinet
+ if [ -d ${LINUX_KERNEL_PATH}/include2 ] ; then \
+ ln -fs ${LINUX_KERNEL_PATH}/include2/asm/../linux h ; \
+ ln -fs ${LINUX_KERNEL_PATH}/include2/asm/../linux sys ; \
+ ln -fs ${LINUX_KERNEL_PATH}/include2/asm/../linux netinet ; \
+ else \
+ ln -fs ${LINUX_KERNEL_PATH}/include/linux h ; \
+ ln -fs ${LINUX_KERNEL_PATH}/include/linux sys ; \
+ ln -fs ${LINUX_KERNEL_PATH}/include/linux netinet ; \
+ fi
$(RM) -f linux
ln -fs ${LINUX_KERNEL_PATH}/include/linux linux
$(RM) -f net
ln -fs ${LINUX_KERNEL_PATH}/include/net net
- $(RM) -f netinet
- ln -fs ${LINUX_KERNEL_PATH}/include/linux netinet
- $(RM) -f sys
- ln -fs ${LINUX_KERNEL_PATH}/include/linux sys
$(RM) -f asm-generic
ln -fs ${LINUX_KERNEL_PATH}/include/asm-generic asm-generic
$(RM) -f asm
<parisc_linux22 parisc_linux24 parisc_linux26>
ln -fs ${LINUX_KERNEL_PATH}/include/asm-parisc asm
-<alpha_linux_22 alpha_linux_24 alpha_linux26>
+<alpha_linux_22 alpha_linux_24 alpha_linux_26>
ln -fs ${LINUX_KERNEL_PATH}/include/asm-alpha asm
<i386_linux22 i386_linux24 i386_linux26>
ln -fs ${LINUX_KERNEL_PATH}/include/asm-i386 asm
ln -fs ${LINUX_KERNEL_PATH}/arch/um/include/sysdep
<amd64_linux24 amd64_linux26>
ln -fs ${LINUX_KERNEL_PATH}/include/asm-x86_64 asm
-<s390_linux22 s390_linux24 s390_linux26 s390x_linux26>
+<s390_linux22 s390_linux24 s390_linux26>
ln -fs ${LINUX_KERNEL_PATH}/include/asm-s390 asm
-<s390x_linux22 s390x_linux24>
+<s390x_linux22 s390x_linux24 s390x_linux26>
ln -fs ${LINUX_KERNEL_PATH}/include/asm-s390x asm
<ppc_linux22 ppc_linux24 ppc_linux26>
ln -fs ${LINUX_KERNEL_PATH}/include/asm-ppc asm
<ia64_linux24 ia64_linux26>
ln -fs ${LINUX_KERNEL_PATH}/include/asm-ia64 asm
<all>
+ if [ "${LINUX_KERNEL_PACKAGING}" ] ; then \
+ TARGPREFIX="pack_"; \
+ fi ; \
for m in ${MPS} ; do \
KDIR=${KOBJ}-${LINUX_VERSION}${LINUX_MODULE_NAME}-$$m ; \
echo Building in directory: $${KDIR} ; \
TARG=libafs ; \
fi ; \
cd $${KDIR} ; \
- $(MAKE) -f Makefile.afs SMP_DEF="$${SMP_DEF}" $@_$${TARG} CLIENT=${LINUX_VERSION}${LINUX_MODULE_NAME} KDIR=$${KDIR} || exit $$?; \
+ $(MAKE) -f Makefile.afs SMP_DEF="$${SMP_DEF}" $@_$${TARGPREFIX}$${TARG} CLIENT=${LINUX_VERSION}${LINUX_MODULE_NAME} KDIR=$${KDIR} || exit $$?; \
cd ../ ; \
<all>
done
linux_destdirs_libafs.ep: dest_libafs.ep
linux_destdirs_libafs.bm: dest_libafs.bm
+linux_compdirs_pack_libafs: depsrcs pack_libafs
+linux_instdirs_pack_libafs: install_pack_libafs
+linux_destdirs_pack_libafs: dest_pack_libafs
# Below this line are targets when in the COMMON directory:
# For Linux there is no kernel NFS server.
-LIBAFS = libafs-${CLIENT}.${LINUX_MODULE_EXT}
-LIBAFS_MP = libafs-${CLIENT}.mp.${LINUX_MODULE_EXT}
-LIBAFS_EP = libafs-${CLIENT}.ep.${LINUX_MODULE_EXT}
-LIBAFS_BM = libafs-${CLIENT}.bm.${LINUX_MODULE_EXT}
+LIBAFS = ${LINUX_LIBAFS_NAME}-${CLIENT}.${LINUX_MODULE_EXT}
+LIBAFS_MP = ${LINUX_LIBAFS_NAME}-${CLIENT}.mp.${LINUX_MODULE_EXT}
+LIBAFS_EP = ${LINUX_LIBAFS_NAME}-${CLIENT}.ep.${LINUX_MODULE_EXT}
+LIBAFS_BM = ${LINUX_LIBAFS_NAME}-${CLIENT}.bm.${LINUX_MODULE_EXT}
INST_LIBAFS = ${DESTDIR}${afskerneldir}/${LIBAFS}
INST_LIBAFS_MP = ${DESTDIR}${afskerneldir}/${LIBAFS_MP}
DEST_LIBAFS_EP = ${DEST}/root.client/usr/vice/etc/modload/${LIBAFS_EP}
DEST_LIBAFS_BM = ${DEST}/root.client/usr/vice/etc/modload/${LIBAFS_BM}
+SYSTEM_LIBAFS = /lib/modules/${CLIENT}/extra/${LINUX_LIBAFS_NAME}/${LINUX_LIBAFS_NAME}.ko
+
+INST_SYSTEM = ${DESTDIR}${SYSTEM_LIBAFS}
+DEST_SYSTEM = ${DEST}/root.client${SYSTEM_LIBAFS}
libafs: $(LIBAFS)
echo SP Build Complete
libafs.bm: $(LIBAFS_BM)
echo BM Build Complete
-<linux26 umlinux26>
-${LIBAFS} ${LIBAFS_MP} ${LIBAFS_EP} ${LIBAFS_BM}: libafs.ko
- cp libafs.ko $@
+<linux26 linux_26 umlinux26>
+pack_libafs: ${LINUX_LIBAFS_NAME}.ko
+ echo "Packaging Friendly Build Complete"
+
+${LIBAFS} ${LIBAFS_MP} ${LIBAFS_EP} ${LIBAFS_BM}: ${LINUX_LIBAFS_NAME}.ko
+ cp ${LINUX_LIBAFS_NAME}.ko $@
.FORCE:
-libafs.ko: .FORCE
- env EXTRA_CFLAGS="${EXTRA_CFLAGS}" ../$(srcdir)/make_kbuild_makefile.pl ${KDIR} $@ @TOP_OBJDIR@/src/config/Makefile.config Makefile.afs Makefile.common
- env EXTRA_CFLAGS="${EXTRA_CFLAGS}" $(MAKE) -C ${LINUX_KERNEL_PATH} M=@TOP_OBJDIR@/src/libafs/${KDIR} modules
-
-<all -linux26 -umlinux26>
+${LINUX_LIBAFS_NAME}.ko afspag.ko: .FORCE
+ env EXTRA_CFLAGS="${EXTRA_CFLAGS}" @TOP_SRCDIR@/libafs/make_kbuild_makefile.pl ${KDIR} $@ @TOP_OBJDIR@/src/config/Makefile.config Makefile.afs Makefile.common
+ env EXTRA_CFLAGS="${EXTRA_CFLAGS}" $(MAKE) -C ${LINUX_KERNEL_BUILD} M=@TOP_OBJDIR@/src/libafs/${KDIR} modules
+
+<all -linux26 -linux_26 -umlinux26>
${LIBAFS}: $(AFSAOBJS) $(AFSNONFSOBJS)
$(RM) -f $@
$(LD) -r -o $@ $(AFSAOBJS) $(AFSNONFSOBJS)
$(LD) -r -o $@ $(AFSAOBJS) $(AFSNONFSOBJS)
<all>
-install_libafs: $(INST_LIBAFS)
+install_libafs: $(LIBAFS)
+ ${INSTALL} -d ${DESTDIR}${afskerneldir}
+ ${INSTALL} -m 644 $(LIBAFS) $(INST_LIBAFS)
echo SP Install Complete
-install_libafs.mp: $(INST_LIBAFS_MP)
+install_pack_libafs: $(LINUX_LIBAFS_NAME).ko
+ ${INSTALL} -d ${DESTDIR}/lib/modules/${CLIENT}/extra/${LINUX_LIBAFS_NAME}
+ ${INSTALL} -m 644 $(LINUX_LIBAFS_NAME).ko $(INST_SYSTEM)
+ echo Packaging Friendly Install Complete
+
+install_libafs.mp: $(LIBAFS_MP)
+ ${INSTALL} -d ${DESTDIR}${afskerneldir}
+ ${INSTALL} -m 644 $(LIBAFS_MP) $(INST_LIBAFS_MP)
echo MP Install Complete
-install_libafs.ep: $(INST_LIBAFS_EP)
+install_libafs.ep: $(LIBAFS_EP)
+ ${INSTALL} -d ${DESTDIR}${afskerneldir}
+ ${INSTALL} -m 644 $(LIBAFS_EP) $(INST_LIBAFS_EP)
echo EP Install Complete
-install_libafs.bm: $(INST_LIBAFS_BM)
+install_libafs.bm: $(LIBAFS_BM)
+ ${INSTALL} -d ${DESTDIR}${afskerneldir}
+ ${INSTALL} -m 644 $(LIBAFS_BM) $(INST_LIBAFS_BM)
echo BM Install Complete
-dest_libafs: $(DEST_LIBAFS)
+dest_libafs: $(LIBAFS)
+ ${INSTALL} -d ${DEST}/root.client/usr/vice/etc/modload
+ ${INSTALL} -m 644 $(LIBAFS) $(DEST_LIBAFS)
echo SP Install Complete
-dest_libafs.mp: $(DEST_LIBAFS_MP)
+dest_pack_libafs: $(LINUX_LIBAFS_NAME).ko
+ ${INSTALL} -d ${DEST}/root.client/lib/modules/${CLIENT}/extra/${LINUX_LIBAFS_NAME}
+ ${INSTALL} -m 644 $(LINUX_LIBAFS_NAME).ko $(DEST_SYSTEM)
+ echo Packaging Friendly Install Complete
+
+dest_libafs.mp: $(LIBAFS_MP)
+ ${INSTALL} -d ${DEST}/root.client/usr/vice/etc/modload
+ ${INSTALL} -m 644 $(LIBAFS_MP) $(DEST_LIBAFS_MP)
echo MP Install Complete
-dest_libafs.ep: $(DEST_LIBAFS_EP)
+dest_libafs.ep: $(LIBAFS_EP)
+ ${INSTALL} -d ${DEST}/root.client/usr/vice/etc/modload
+ ${INSTALL} -m 644 $(LIBAFS_EP) $(DEST_LIBAFS_EP)
echo EP Install Complete
-dest_libafs.bm: $(DEST_LIBAFS_BM)
+dest_libafs.bm: $(LIBAFS_BM)
+ ${INSTALL} -d ${DEST}/root.client/usr/vice/etc/modload
+ ${INSTALL} -m 644 $(LIBAFS_BM) $(DEST_LIBAFS_BM)
echo BM Install Complete
-
-$(INST_LIBAFS): $(LIBAFS)
- ${INSTALL} -f $? $@
-
-$(INST_LIBAFS_MP): $(LIBAFS_MP)
- ${INSTALL} -f $? $@
-
-$(INST_LIBAFS_EP): $(LIBAFS_EP)
- ${INSTALL} -f $? $@
-
-$(INST_LIBAFS_BM): $(LIBAFS_BM)
- ${INSTALL} -f $? $@
-
-$(DEST_LIBAFS): $(LIBAFS)
- ${INSTALL} -f $? $@
-
-$(DEST_LIBAFS_MP): $(LIBAFS_MP)
- ${INSTALL} -f $? $@
-
-$(DEST_LIBAFS_EP): $(LIBAFS_EP)
- ${INSTALL} -f $? $@
-
-$(DEST_LIBAFS_BM): $(LIBAFS_BM)
- ${INSTALL} -f $? $@
git://git.openafs.org / openafs.git / blobdiff