SPECS: mol.spec - start playing with it, works for me (and probabl...

sparky sparky at pld-linux.org
Fri Sep 29 18:52:39 CEST 2006 

Author: sparky                       Date: Fri Sep 29 16:52:39 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- start playing with it, works for me (and probably only for my) DO NOT TOUCH

---- Files affected:
SPECS:
   mol.spec (1.38 -> 1.39) 

---- Diffs:

================================================================
Index: SPECS/mol.spec
diff -u SPECS/mol.spec:1.38 SPECS/mol.spec:1.39
--- SPECS/mol.spec:1.38	Wed Apr 12 14:15:40 2006
+++ SPECS/mol.spec	Fri Sep 29 18:52:34 2006
@@ -26,7 +26,8 @@
 Source0:	http://www.maconlinux.org/downloads/%{name}-%{version}.tgz
 # Source0-md5:	bfdd0bd6ae01018b5c46f87d4ad879f1
 #Source1:	mol.init
-Patch0:		%{name}-modules26.patch
+Patch0:		%{name}-modules-update.patch
+Patch1:		%{name}-modules26.patch
 #Patch0:	%{name}-curses.patch
 #Patch1:	%{name}-configure.patch
 #Patch2:	%{name}-kernel.patch
@@ -37,8 +38,9 @@
 #Patch7:	%{name}-gkh.patch
 #Patch8:	%{name}-gkh-compiler_h.patch
 #Patch9:	%{name}-gkh-includes.patch
+Patch10:	%{name}-warnings.patch
 URL:		http://www.maconlinux.org/
-BuildRequires:	XFree86-devel
+#BuildRequires:	XFree86-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
 #BuildRequires:	bison
@@ -69,24 +71,24 @@
 szybkością! Obsługiwane są wszystkie wersje PowerPC MacOS-a (włącznie
 z MacOSX 10.2).
 
-%package -n kernel-%{name}
+%package -n kernel%{_alt_kernel}-%{name}
 Summary:	Mac-on-Linux kernel modules
 Summary(pl):	Moduły jądra Mac-on-Linux
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Applications/Emulators
 Requires(post,postun):	/sbin/depmod
 Provides:	kernel(mol)
-Obsoletes:	kernel-mol
+#Obsoletes:	kernel-mol
 
-%description -n kernel-%{name}
+%description -n kernel%{_alt_kernel}-%{name}
 This package contains the Mac-on-Linux kernel module needed by MOL. It
 also contains the sheep_net kernel module (for networking).
 
-%description -n kernel-%{name} -l pl
+%description -n kernel%{_alt_kernel}-%{name} -l pl
 Ten pakiet zawiera moduł jądra Mac-on-Linux potrzebny dla MOL. Zawiera
 także moduł jądra sheep_net (dla sieci).
 
-%package -n kernel-smp-%{name}
+%package -n kernel%{_alt_kernel}-smp-%{name}
 Summary:	Mac-on-Linux kernel modules SMP
 Summary(pl):	Moduły jądra Mac-on-Linux SMP
 Release:	%{_rel}@%{_kernel_ver_str}
@@ -95,12 +97,12 @@
 Provides:	kernel(mol)
 #Obsoletes:	kernel-mol
 
-%description -n kernel-smp-%{name}
+%description -n kernel%{_alt_kernel}-smp-%{name}
 This package contains the Mac-on-Linux kernel module needed by MOL. It
 also contains the sheep_net kernel module (for networking). SMP
 version.
 
-%description -n kernel-smp-%{name} -l pl
+%description -n kernel%{_alt_kernel}-smp-%{name} -l pl
 Ten pakiet zawiera moduł jądra Mac-on-Linux potrzebny dla MOL. Zawiera
 także moduł jądra sheep_net (dla sieci). Wersja dla jąder SMP.
 
@@ -108,13 +110,16 @@
 %setup -q
 chmod +w -R .
 %patch0 -p1
+%patch1 -p1
+%patch10 -p1
 sed -i 's|@KERNEL_SRC@|%{_kernelsrcdir}|g' src/kmod/Linux/Makefile.26
 sed -i '/struct menu \*current_menu/s/static//' config/kconfig/mconf.c
+sed -i '/KERNEL_SOURCE=/s|=.*|="%{_kernelsrcdir}"|' scripts/kernelsrc
 
 cat << EOF | sed 's/^ *//' > config/defconfig-ppc
     CONFIG_PPC=y
     CONFIG_FBDEV=y
-%if %{without minimal}
+%if !%{with minimal}
     CONFIG_OLDWORLD=y
     CONFIG_X11=y
     CONFIG_VNC=y
@@ -142,7 +147,7 @@
     ### Network drivers
     CONFIG_TUN=y
     CONFIG_TAP=y
-    # CONFIG_SHEEP is not set
+    CONFIG_SHEEP=y
 
 EOF
 
@@ -153,7 +158,7 @@
 CFLAGS="%{rpmcflags} -I/usr/include/ncurses -DNETLINK_TAPBASE=16"; export CFLAGS
 
 %configure \
-%if %{without minimal}
+%if !%{with minimal}
 	--with-x	\
 	--enable-alsa	\
 	--enable-xdga	\
@@ -170,56 +175,51 @@
 	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
 		exit 1
 	fi
-	rm -rf include
-	install -d include/{linux,config}
-	ln -sf %{_kernelsrcdir}/config-$cfg .config
-	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
-	if [ -d "%{_kernelsrcdir}/include/asm-powerpc" ]; then
-		install -d include/asm
-		cp -a %{_kernelsrcdir}/include/asm-%{_target_base_arch}/* include/asm
-		cp -a %{_kernelsrcdir}/include/asm-powerpc/* include/asm
-	else
-		ln -sf %{_kernelsrcdir}/include/asm-powerpc include/asm
-	fi
-	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
-	touch include/config/MARKER
+	install -d o/include/linux
+	ln -sf %{_kernelsrcdir}/config-$cfg o/.config
+	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
+	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
+
+	%if %{with dist_kernel}
+		%{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+	%else
+		install -d o/include/config
+		touch o/include/config/MARKER
+		ln -sf %{_kernelsrcdir}/scripts o/scripts
+	%endif
 
-	%{__make} -C %{_kernelsrcdir} clean \
-		%{?with_verbose:V=1} \
-		RCS_FIND_IGNORE="-name '*.ko' -o" \
-		M=$PWD O=$PWD
 	%{__make} -C %{_kernelsrcdir} modules \
-		%{?with_verbose:V=1} \
-		M=$PWD O=$PWD
+		CC="%{__cc}" CPP="%{__cpp}" \
+		M=$PWD O=$PWD/o \
+		%{?with_verbose:V=1}
 	mv mol.ko mol-$cfg.ko
 done
 
-# Sheep don´t builds and other modules already in kernel
-#cd ../../netdriver/build
-#for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
-#	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
-#		exit 1
-#	fi
-#	rm -rf include
-#	install -d include/{linux,config}
-#	ln -sf %{_kernelsrcdir}/config-$cfg .config
-#	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
-#	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
-#	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
-#	touch include/config/MARKER
-#
-#	%{__make} -C %{_kernelsrcdir} clean \
-#		%{?with_verbose:V=1} \
-#		RCS_FIND_IGNORE="-name '*.ko' -o" \
-#		M=$PWD O=$PWD
-#	%{__make} -C %{_kernelsrcdir} modules \
-#		%{?with_verbose:V=1} \
-#		M=$PWD O=$PWD obj=. src=. \
-#		BUILD_SHEEP=m	\
-#		BUILD_TAP=n	\
-#		BUILD_TUN=n
-#	mv sheep.ko sheep-$cfg.ko
-#done
+cd ../../netdriver/build
+echo 'obj-m := sheep.o' > Makefile
+for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
+	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
+		exit 1
+	fi
+	install -d o/include/linux
+	ln -sf %{_kernelsrcdir}/config-$cfg o/.config
+	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
+	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
+
+	%if %{with dist_kernel}
+		%{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+	%else
+		install -d o/include/config
+		touch o/include/config/MARKER
+		ln -sf %{_kernelsrcdir}/scripts o/scripts
+	%endif
+
+	%{__make} -C %{_kernelsrcdir} modules \
+		CC="%{__cc}" CPP="%{__cpp}" \
+		M=$PWD O=$PWD/o \
+		%{?with_verbose:V=1}
+	mv sheep.ko sheep-$cfg.ko
+done
 cd ../../..
 
 %install
@@ -230,7 +230,7 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	prefix=%{_prefix}	\
-	docdir=/moldoc
+	docdir=moldoc
 
 #install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 
@@ -239,17 +239,13 @@
 install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
 install kmod/build/mol-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
 	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/mol.ko
-#install netdriver/build/ethertap-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-#	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/ethertap.ko
-#install netdriver/build/tun-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-#	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/tun.ko
+install netdriver/build/sheep-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
+	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/sheep.ko
 %if %{with smp} && %{with dist_kernel}
 install kmod/build/mol-smp.ko \
 	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/mol.ko
-#install netdriver/build/ethertap-smp.ko \
-#	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/ethertap.ko
-#install netdriver/build/tun-smp.ko \
-#	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/tun.ko
+install netdriver/build/sheep-smp.ko \
+	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/sheep.ko
 %endif
 cd ..
 %endif
@@ -275,17 +271,17 @@
 #fi
 
 %if %{with kernel}
-%post	-n kernel-%{name}
+%post	-n kernel%{_alt_kernel}-%{name}
 %depmod %{_kernel_ver}
 
-%postun -n kernel-%{name}
+%postun -n kernel%{_alt_kernel}-%{name}
 %depmod %{_kernel_ver}
 
 %if %{with smp} && %{with dist_kernel}
-%post	-n kernel-smp-%{name}
+%post	-n kernel%{_alt_kernel}-smp-%{name}
 %depmod %{_kernel_ver}smp
 
-%postun -n kernel-smp-%{name}
+%postun -n kernel%{_alt_kernel}-smp-%{name}
 %depmod %{_kernel_ver}smp
 %endif
 %endif
@@ -328,12 +324,12 @@
 %{_mandir}/man5/*
 
 %if %{with kernel}
-%files -n kernel-%{name}
+%files -n kernel%{_alt_kernel}-%{name}
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/*
 
 %if %{with smp} && %{with dist_kernel}
-%files -n kernel-smp-%{name}
+%files -n kernel%{_alt_kernel}-smp-%{name}
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}smp/misc/*
 %endif
@@ -345,6 +341,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.39  2006/09/29 16:52:34  sparky
+- start playing with it, works for me (and probably only for my) DO NOT TOUCH
+
 Revision 1.38  2006/04/12 12:15:40  glen
 - add kernel epoch, adapterized
 
@@ -420,7 +419,7 @@
 - massive attack s/pld.org.pl/pld-linux.org/
 
 Revision 1.16  2003/05/16 08:53:05  trojan
-- fixed depmod in %%post and %%postun when build with _without_dist_kernel
+- fixed depmod in %post and %postun when build with _without_dist_kernel
 
 Revision 1.15  2003/05/14 14:42:44  qboosh
 - added depmod options so modules can be installed for kernel other than running
@@ -438,7 +437,7 @@
 - various bug-fixes (X.2.4 works)
 
 Revision 1.1  2003/03/10 20:22:42  speedy
-initial kwark
+- initial kwark
 
 Revision 1.13  2003/03/07 12:32:13  qboosh
 - chkconfig --add moved to proper post, added Requires
@@ -451,7 +450,7 @@
 - new kernel modules
 
 Revision 1.10  2003/02/10 13:53:00  qboosh
-- replaced "uname -r" with %%{_kernel_ver}
+- replaced "uname -r" with %{_kernel_ver}
 - added missing dirs and _without_dist_kernel bcond
 
 Revision 1.9  2003/02/08 20:20:29  speedy
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mol.spec?r1=1.38&r2=1.39&f=u

More information about the pld-cvs-commit mailing list