Some files removed

.gitignore

@@ -2,5 +2,7 @@ linux-cifs.spec~
 linux-cifs/test.sh
 linux-cifs/kernel_src.list_old
 linux-cifs/buildmodule.sh1
+linux-cifs/build.sh
+linux-cifs/gentoo
 
 

linux-cifs.spec

@@ -149,12 +149,13 @@ install -m755 %name.outformat %buildroot%_initdir/%name.outformat
 %kernel_src/kernel-source-etercifs-2.6.??-%src_package_version.tar.bz2
 
 %changelog
-* Mon Sep 01 2008 Konstantin Baev <kipruss@altlinux.org> 1:1.0-alt1
+* Wed Sep 03 2008 Konstantin Baev <kipruss@altlinux.org> 1:1.0-alt1
 - sources changed - now it's with Etersoft patches
 - source directory renamed to cifs
 - sources will be packaged in separate kernel-source package,
   named kernel-source-etercifs-legacy-1.50c
 - no more compiled module etercifs.ko in rpm, just install scripts and src
+- one script builds etercifs module for several kerneld from other sources
 
 * Thu Jan 31 2008 Vitaly Lipatov <lav@altlinux.ru> 1.50c-alt4
 - fix build on Fedora 8 (2.6.18-53)

linux-cifs/TODO

-        
-
-[12:51:54] <Lav> LinuxExtensions    UNIX-,    ģ 
-[12:52:23] <lebedev.sv>  ?       
-[12:52:37] <Lav>   nounix,      
-[12:53:14] <lebedev.sv>    ?     ?
-[12:53:54] <lebedev.sv>     ,   lin to win , mount -o nounix
-
-   LinuxExtensions ( unix)  ?
-
-   ݣ ,   ,   - ?
-+     gcc
-+      ?
-  wine,   - ?
-+    -e - ,    Ubuntu
-            /proc
-
-

linux-cifs/buildmodule.sh

@@ -7,30 +7,40 @@
 
 . ./functions.sh
 
-echo "====DISTR_VENDOR="$DISTR_VENDOR
+MODULEFILENAME=etercifs.ko
+KERNELVERSION=$(uname -r)
+
+# TODO: use regexp
+KERNEL=${KERNELVERSION:0:(`expr index "$KERNELVERSION" -`-1)}
+
+get_src_dir || fatal "Distro $($DISTR_VENDOR -e) is not supported yet"
+
+[ -n "`ls $ETERCIFS_SOURCES_LIST`" ] || fatal "Etercifs kernel module sources does not installed!"
+
+KERNEL_SOURCE_ETERCIFS_LINK=`ls -1 $ETERCIFS_SOURCES_LIST | grep $KERNEL | sort -r | head -n 1`
+KERNEL_SOURCE_ETERCIFS=`readlink -f $KERNEL_SOURCE_ETERCIFS_LINK`
+
+[ "$KERNEL_SOURCE_ETERCIFS" ] || fatal "Etercifs kernel module sources for current kernel does not installed!"
 
 tmpdir=
 
 tmpdir="$(mktemp -dt "Etercifs.XXXXXXXX")"
+
+# TODO: сделать независимо от типа архива
+tar -xjf $KERNEL_SOURCE_ETERCIFS -C $tmpdir
 trap exit_handler HUP PIPE INT QUIT TERM EXIT
-BUILDDIR="$tmpdir/buildroot"
 
-echo "====BUILDDIR="$BUILDDIR
+FILENAME=`basename $KERNEL_SOURCE_ETERCIFS`
+BUILDDIR=$tmpdir/${FILENAME%.tar.bz2}
 
-# Тут мы должны найти соответствующий нашему ядру src,
 # распаковать его в $BUILDDIR, и собрать
 
+# TODO:
 # При запуске сервиса:
 # Проверка, что если ядро обновилось до нашего, но новее - пересобираем
 # Проверка, что если ядро обновилось до нового - ругаемся
 
 
-MODULEFILENAME=etercifs.ko
-# BUILDDIR=$(pwd)
-KERNELVERSION=$(uname -r)
-
-echo "====KERNELVERSION="$KERNELVERSION
-
 # SMP build
 [ -z "$RPM_BUILD_NCPUS" ] && RPM_BUILD_NCPUS=`/usr/bin/getconf _NPROCESSORS_ONLN`
 [ "$RPM_BUILD_NCPUS" -gt 1 ] && MAKESMP="-j$RPM_BUILD_NCPUS" || MAKESMP=""
@@ -45,9 +55,6 @@ if [ -z "$INSTALL_MOD_PATH" ]; then
 	#INSTALL_MOD_PATH=/lib/modules/linux-cifs
 fi
 
-echo "====KERNSRC="$KERNSRC
-echo "====INSTALL_MOD_PATH="$INSTALL_MOD_PATH
-
 echo
 echo "Build for $KERNELVERSION Linux kernel (headers in $KERNSRC)"
 
@@ -77,25 +84,24 @@ else
 	export GCCNAME=gcc
 fi
 
-echo "====GCCNAME="$GCCNAME
-
 if ! which $GCCNAME ; then
 	echo "GCC compiler have not found. Please install gcc package."
 	exit 1
 fi
 
-# # Clean, build and check
-# rm -f $BUILDDIR/$MODULEFILENAME
-# make $USEGCC -C $KERNSRC here=$BUILDDIR SUBDIRS=$BUILDDIR clean
-# make $USEGCC -C $KERNSRC here=$BUILDDIR SUBDIRS=$BUILDDIR modules $MAKESMP
-# 
-# #[ "$KERVER" = "2.4" ] && MODULENAME=$MODULENAME.o || MODULENAME=$MODULENAME.ko
-# test -r "$BUILDDIR/$MODULEFILENAME" || { echo "can't locate built module $MODULEFILENAME, continue" ; exit 1 ; }
-# strip --strip-debug --discard-all $BUILDDIR/$MODULEFILENAME
-# 
-# echo "Copying built module to $INSTALL_MOD_PATH"
-# mkdir -p $INSTALL_MOD_PATH
-# install -m 644 -o root -g root $BUILDDIR/$MODULEFILENAME $INSTALL_MOD_PATH/ || exit 1
-# depmod -ae || exit 1
-# #echo "$MODULENAME build correctly"
-# exit 0
+
+# Clean, build and check
+rm -f $BUILDDIR/$MODULEFILENAME
+make $USEGCC -C $KERNSRC here=$BUILDDIR SUBDIRS=$BUILDDIR clean
+make $USEGCC -C $KERNSRC here=$BUILDDIR SUBDIRS=$BUILDDIR modules $MAKESMP
+
+#[ "$KERVER" = "2.4" ] && MODULENAME=$MODULENAME.o || MODULENAME=$MODULENAME.ko
+test -r "$BUILDDIR/$MODULEFILENAME" || { echo "can't locate built module $MODULEFILENAME, continue" ; exit 1 ; }
+strip --strip-debug --discard-all $BUILDDIR/$MODULEFILENAME
+
+echo "Copying built module to $INSTALL_MOD_PATH"
+mkdir -p $INSTALL_MOD_PATH
+install -m 644 -o root -g root $BUILDDIR/$MODULEFILENAME $INSTALL_MOD_PATH/ || exit 1
+depmod -ae || exit 1
+#echo "$MODULENAME build correctly"
+exit 0

linux-cifs/dkms-linux-cifs.spec

-%define modname	linux-cifs
-
-Name: dkms-linux-cifs
-Version: 1.50c
-Release: alt1
-Summary: DKMS-ready CIFS Linux kernel module with Etersoft extensions
-License: GPL
-Packager: Vitaly Lipatov <lav@altlinux.ru>
-
-#Source: ftp://updates.etersoft.ru/pub/Etersoft/WINE@Etersoft/sources/tarball/%name-%version.tar.bz2
-
-Group: Development/Kernel
-Requires(preun): dkms
-Requires(post): dkms
-
-Requires: linux-cifs
-
-Buildarch: noarch
-
-%description
-The CIFS VFS is a virtual file system for Linux to allow access to
-servers and storage appliances compliant with the SNIA CIFS Specification
-version 1.0 or later.
-
-This package contains DKMS-ready CIFS Linux kernel module with Etersoft extensions.
-
-%prep
-%setup -c -T -n %name-%version
-
-%install
-mkdir -p %buildroot%_usrsrc/%modname-%version/
-cat > %buildroot%_usrsrc/%modname-%version/dkms.conf <<EOF
-# DKMS file for Linux CIFS with Etersoft's extensions
-
-PACKAGE_NAME="%modname"
-PACKAGE_VERSION="%version"
-
-BUILT_MODULE_NAME[0]="etercifs"
-DEST_MODULE_LOCATION[0]="/kernel/fs/cifs/"
-REMAKE_INITRD="no"
-AUTOINSTALL="YES"
-EOF
-
-%post
-if [ "$1" == 1 ]
-then
-  dkms add -m %modname -v %version --rpm_safe_upgrade
-fi
-dkms build -m %modname -v %version --rpm_safe_upgrade
-dkms install -m %modname -v %version --rpm_safe_upgrade
-
-%preun
-if [ "$1" == 0 ]
-then
-  dkms remove -m %modname -v %version --rpm_safe_upgrade --all
-fi
-
-%files
-%_usrsrc/%modname-%version/dkms.conf
-
-%changelog
-* Sat Jan 26 2008 Vitaly Lipatov <lav@altlinux.ru> 1.50c-alt1
-- initial build for Korinf project
-

linux-cifs/etercifs_src.list

+Generic /usr/src/kernel/sources/kernel-source-etercifs*
+ALTLinux /usr/src/kernel/sources/kernel-source-etercifs*

linux-cifs/functions.sh

@@ -12,12 +12,17 @@ fatal()
 }
 
 DISTR_VENDOR=/usr/bin/distr_vendor
+
 test -x $DISTR_VENDOR || fatal "Can't find distr_vendor"
 
 get_sd()
 {
 	#           
+	BASE_KERNEL_SOURCES_DIR=
 	BASE_KERNEL_SOURCES_DIR=`grep -i $1 kernel_src.list | head -n1 | cut -d" " -f 2 2>/dev/null`
+	#          etercifs   
+	ETERCIFS_SOURCES_LIST=
+	ETERCIFS_SOURCES_LIST=`grep -i $1 etercifs_src.list | head -n1 | cut -d" " -f 2 2>/dev/null`
 }
 
 get_src_dir()

linux-cifs/gentoo/CVS/Entries

-D/linux-cifs////
-/release_port.sh/1.1/Wed Jun 27 09:02:40 2007//

linux-cifs/gentoo/CVS/Repository

-wine-etersoft-public/linux-cifs/gentoo

linux-cifs/gentoo/CVS/Root

-:ext:cvs.etersoft/var/local/cvsroot

linux-cifs/gentoo/linux-cifs/CVS/Entries

-/linux-cifs-1.50c.ebuild/1.3/Sun Jan 27 16:02:09 2008//
-D

linux-cifs/gentoo/linux-cifs/CVS/Repository

-wine-etersoft-public/linux-cifs/gentoo/linux-cifs

linux-cifs/gentoo/linux-cifs/CVS/Root

-:ext:cvs.etersoft/var/local/cvsroot

linux-cifs/gentoo/linux-cifs/linux-cifs-1.50c.ebuild

-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="Advanced Common Internet File System for Linux with Etersoft extension"
-HOMEPAGE="http://etersoft.ru/wine"
-CIFSVER=1.50c
-WINENUMVERSION=1.0.8
-SRC_URI="ftp://updates.etersoft.ru/pub/Etersoft/WINE@Etersoft-$WINENUMVERSION/sources/tarball/${P}.tar.bz2
-ftp://updates.etersoft.ru/pub/Etersoft/WINE@Etersoft-$WINENUMVERSION/sources/tarball/cifs-$CIFSVER.tar.bz2"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-RESTRICT="test" #72375
-
-RDEPEND=">=sys-kernel/linux-headers-2.6"
-
-# this will not build as 64bit code
-#export ABI=x86
-
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}/${P}" || die
-	mv ../new-cifs-backport ./ || die
-	patch -p1 -d new-cifs-backport/ <linux-cifs-shared-1.50c.patch || die
-}
-
-config_cache() {
-	local h ans="no"
-	use $1 && ans="yes"
-	shift
-	for h in "$@" ; do
-		[[ ${h} == *.h ]] \
-			&& h=header_${h} \
-			|| h=lib_${h}
-		export ac_cv_${h//[:\/.]/_}=${ans}
-	done
-}
-
-src_compile() {
-	export LDCONFIG=/bin/true
-	strip-flags
-	true
-}
-
-src_install() {
-	MAN_DIR=${D}/usr/man/ INIT_DIR=${D}/etc/init.d/ SBIN_DIR=${D}/usr/sbin/ INSTALL_MOD_PATH=${D}/lib/modules/ DESTDIR=${D} SRC_DIR=/usr/src/${P} ./build.sh || die
-	true
-}
-
-pkg_postinst() {
-	einfo "Use /etc/init.d/linux-cifs build for build kernel module"
-}

linux-cifs/gentoo/linux-cifs/metadata.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>wine</herd>
-<longdescription>
-Wine is an Open Source implementation of the Windows API on top of X and Unix.
-
-Think of Wine as a compatibility layer for running Windows programs. Wine does not require Microsoft Windows, as it is a completely free alternative implementation of the Windows API consisting of 100% non-Microsoft code, however Wine can optionally use native Windows DLLs if they are available. Wine provides both a development toolkit for porting Windows source code to Unix as well as a program loader, allowing many unmodified Windows programs to run on x86-based Unixes, including Linux, FreeBSD, and Solaris.
-</longdescription> 
-</pkgmetadata>

linux-cifs/gentoo/release_port.sh

-#!/bin/sh
-
-. /etc/rpm/etersoft-build-functions
-
-WORKDIR=/home/builder/Projects/eterbuild/functions
-
-PORTNAME=linux-cifs
-
-test -f $WORKDIR/config.in && . $WORKDIR/config.in
-
-#check_key
-
-update_from_cvs
-
-WINENUMVERSION=current
-TARNAME=gentoo-$PORTNAME.tar.bz2
-TARPATH=$WINEPUB_PATH-$WINENUMVERSION/sources/$TARNAME
-echo "Creating $TARPATH"
-tar cvfj $TARPATH $PORTNAME/* --exclude CVS

linux-cifs/kernel_src.list

-Generic /usr/src/kernel/sources/*
-ALTLinux /usr/src/kernel/sources/*
+Generic /usr/src/*
+ALTLinux /usr/src/*
+ASPLinux /usr/src/kernels/*
+ASPLinux/10 /lib/modules/*/build
+RedHat /usr/src/kernels/*
+RHEL /usr/src/kernels/*
+CentOS /usr/src/kernels/*
+LinuxXP /usr/src/kernels/*
+Scientific /usr/src/kernels/*
+FedoraCore /usr/src/kernels/*
+Debian /usr/src/*
+Ubuntu /usr/src/*
+SUSE /usr/src/linux-*/*/*
+NLD /usr/src/linux-*/*/*
+MOPSLinux /usr/src/*
+Slackware /usr/src/*
+Mandriva /usr/src/*
+Gentoo /usr/src/*
+

linux-cifs/linux-cifs.release.sh

-#!/bin/sh
-# Author: Vitaly Lipatov <lav@etersoft.ru>
-# 2006, Public domain
-# Release script for small projects packaged in RPM
-# Use etersoft-build-utils as helper
-. /etc/rpm/etersoft-build-functions
-
-WORKDIR=~/Projects/eterbuild/functions
-test -f $WORKDIR/config.in && . $WORKDIR/config.in
-
-check_key
-
-# Override spec's version
-#TARBALLVERSION=1.6
-
-update_from_cvs
-
-SPECNAME=linux-cifs.spec
-prepare_tarball
-
-echo "build_srpm"
-build_rpms_name $SPECNAME
-test -z "$BASENAME" && fatal "BASENAME is empty"
-#NAMEVER=$BASENAME-$VERSION
-
-#rpmbb $SPECNAME || fatal "Can't build"
-
-if [ -n "$WINEPUB_PATH" ] ; then
-#-a $USER = "lav" ] ; then
-	# Path to local publishing
-	ETERDESTSRPM=$WINEPUB_PATH/sources
-	cp -f $RPMSOURCEDIR/$TARNAME $ETERDESTSRPM/tarball/
-echo "publish_srpm"
-	publish_srpm
-fi
-
-#OTNAME=$RPMSOURCEDIR/$TARNAME
-# Usual path to public sources
-# scp $TARNAME cf.sf:~   (use below params for it)
-#PUBLICSERVER=etersoft
-#PUBLICPATH=/home/lav/download/$BASENAME
-
-#publish_tarball
-
-#cd gentoo
-#./release_port.sh
-#cd -
-
-
-SPECNAME=dkms-linux-cifs.spec
-prepare_tarball
-
-echo "build_srpm"
-build_rpms_name $SPECNAME
-test -z "$BASENAME" && fatal "BASENAME is empty"
-
-if [ -n "$WINEPUB_PATH" ] ; then
-	# Path to local publishing
-	ETERDESTSRPM=$WINEPUB_PATH/sources
-	cp -f $RPMSOURCEDIR/$TARNAME $ETERDESTSRPM/tarball/
-echo "publish_srpm"
-	publish_srpm
-fi
-

linux-cifs/linux-cifs_depmod.sh

-#!/bin/sh
-# 2007 (c) Etersoft http://etersoft.ru
-# Author: Vitaly Lipatov <lav@etersoft.ru>
-# GNU Public License
-
-#      ...
-for KERN in `find /lib/modules -maxdepth 1 -type d` ; do
-	[ -L "$KERN" ] && continue
-	[ -d "$KERN/kernel/extra/" ] || continue
-
-	KERNELVERSION=`basename $KERN`
-	[ -f /boot/System.map-$KERNELVERSION ] && /sbin/depmod -a -F /boot/System.map-$KERNELVERSION $KERNELVERSION
-done
-
-exit 0