Author: glen Date: Thu Jun 30 19:46:05 2005 GMT
Module: SPECS Tag: DEVEL
---- Log message:
- 2.6 one. builds but doesn't work
---- Files affected:
SPECS:
umlinux.spec (1.23 -> 1.23.2.1)
---- Diffs:
================================================================
Index: SPECS/umlinux.spec
diff -u SPECS/umlinux.spec:1.23 SPECS/umlinux.spec:1.23.2.1
--- SPECS/umlinux.spec:1.23 Fri Jun 24 15:41:35 2005
+++ SPECS/umlinux.spec Thu Jun 30 21:46:00 2005
@@ -1,16 +1,22 @@
# $Revision$, $Date$
-%define kernel_version 2.4.27
+#%define kernel_version 2.6.11.1
+%define kernel_version 2.6.12.1
%define utils_version 20040406
+%define uml_patch 2.6.11.8-bs6
+#%define uml_patch 2.6.11.8-bs5
+#%define uml_patch 2.6.11-bs4
+#%define skas_patch 2.6.11-v9-pre2
+%define skas_patch 2.6.12-rc4-v9-pre2
Summary: User Mode Linux
Summary(pl): Linux w przestrzeni użytkownika
Name: umlinux
Version: 2
-Release: 1.%{kernel_version}.1
+Release: 1.1
Epoch: 0
License: GPL
Group: Applications/Emulators
-Source0:
ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-%{kernel_version}.tar.bz2
-# Source0-md5: 59a2e6fde1d110e2ffa20351ac8b4d9e
+Source0:
http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{kernel_version}.tar.bz2
+# Source0-md5: 971d541176438154f947705d7c5b77cd
Source1: %{name}-config
Source2:
http://dl.sourceforge.net/user-mode-linux/uml_utilities_%{utils_version}.tar.bz2
# Source2-md5: 2c1ccd9efacbfb39e42d482b89b2550a
@@ -18,27 +24,13 @@
# Source3-md5: 781dc3611ebf60ac07814a1cd31c936d
Source4: %{name}-etc-umltab
Source5: %{name}-rc-init
-Patch0:
http://dl.sourceforge.net/user-mode-linux/uml-patch-%{kernel_version}-1.bz2
+Patch0:
http://www.user-mode-linux.org/~blaisorblade/patches/guest/uml-%{uml_patch}/uml-%{uml_patch}.patch.bz2
Patch1:
ftp://ftp.linux.ee/pub/gentoo/portage/sys-apps/usermode-utilities/files/20040406-CAN-2004-1295.patch
-Patch2:
ftp://ftp.linux.ee/pub/gentoo/portage/sys-kernel/usermode-sources/files/usermode-sources-2.4.smbfs.patch
-Patch3:
ftp://ftp.linux.ee/pub/gentoo/portage/sys-kernel/usermode-sources/files/usermode-sources-2.4.CAN-2004-1056.patch
-Patch4:
ftp://ftp.linux.ee/pub/gentoo/portage/sys-kernel/usermode-sources/files/usermode-sources.AF_UNIX.patch
-Patch5:
ftp://ftp.linux.ee/pub/gentoo/portage/sys-kernel/usermode-sources/files/usermode-sources-2.4.binfmt_elf.patch
-Patch6:
ftp://ftp.linux.ee/pub/gentoo/portage/sys-kernel/usermode-sources/files/usermode-sources-2.4.XDRWrapFix.patch
-Patch7:
ftp://ftp.linux.ee/pub/gentoo/portage/sys-kernel/usermode-sources/files/usermode-sources-2.4.78362.patch
-Patch8:
ftp://ftp.linux.ee/pub/gentoo/portage/sys-kernel/usermode-sources/files/usermode-sources-2.4.77666.patch
-Patch9:
ftp://ftp.linux.ee/pub/gentoo/portage/sys-kernel/usermode-sources/files/usermode-sources-2.4.77094.patch
-Patch10:
ftp://ftp.linux.ee/pub/gentoo/portage/sys-kernel/usermode-sources/files/usermode-sources-2.4.27.CAN-2004-1295.patch
-Patch11:
ftp://ftp.linux.ee/pub/gentoo/portage/sys-kernel/usermode-sources/files/usermode-sources-2.4.78363.patch
-Patch12:
ftp://ftp.linux.ee/pub/gentoo/portage/sys-kernel/usermode-sources/files/usermode-sources-2.4.CAN-2004-1137.patch
-Patch13:
ftp://ftp.linux.ee/pub/gentoo/portage/sys-kernel/usermode-sources/files/usermode-sources-2.4.CAN-2004-1016.patch
-Patch14:
ftp://ftp.linux.ee/pub/gentoo/portage/sys-kernel/usermode-sources/files/usermode-sources-2.4.binfmt_a.out.patch
-Patch15:
ftp://ftp.linux.ee/pub/gentoo/portage/sys-kernel/usermode-sources/files/usermode-sources-2.4.brk-locked.patch
-Patch16:
ftp://ftp.linux.ee/pub/gentoo/portage/sys-kernel/usermode-sources/files/usermode-sources-2.4.cmdlineLeak.patch
-Patch17:
ftp://ftp.linux.ee/pub/gentoo/portage/sys-kernel/usermode-sources/files/usermode-sources-2.4.vma.patch
+Patch2:
http://www.user-mode-linux.org/~blaisorblade/patches/skas3-2.6/skas-%{skas_patch}/skas-%{skas_patch}.patch.bz2
URL: http://user-mode-linux.sourceforge.net/
BuildRequires: libpcap-static
BuildRequires: modutils
+BuildRequires: readline-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -58,12 +50,10 @@
%description modules -l pl
Moduły Linuksa w przestrzeni użytkownika.
-
%package utils
Summary: User Mode Linux Utilities
Summary(pl): Narzędzia dla Linuksa w przestrzeni użytkownika
Group: Applications/Emulators
-Version: %{utils_version}
%description utils
Utilities for User Mode Linux.
@@ -75,7 +65,6 @@
Summary: User Mode Linux Perl Utilities
Summary(pl): Narzędzia perlowe dla Linuksa w przestrzeni użytkownika
Group: Applications/Emulators
-Version: %{utils_version}
%description utils-perl
Perl Utilities for User Mode Linux.
@@ -96,33 +85,17 @@
%prep
%setup -q -n linux-%{kernel_version} -a 2
-%patch0 -p1
+#%patch0 -p1
cd tools
%patch1 -p1
cd ..
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
+#patch2 -p1
cp %{SOURCE1} ./.config
cp %{SOURCE3} .
%build
%{__make} ARCH=um oldconfig
-%{__make} ARCH=um dep
# $((0x... )) it's not /bin/sh compatible:
%{__make} ARCH=um SHELL=/bin/bash linux
%{__make} ARCH=um modules
@@ -190,13 +163,8 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.23 2005/06/24 13:41:35 glen
-- updated to 2.4.27
-- apply patches from gentoo
-- doesn't build (missing osdeps/thread.h)
-
-Revision 1.22 2005/06/24 11:55:37 glen
-- CAN-2004-1295
+Revision 1.23.2.1 2005/06/30 19:46:00 glen
+- 2.6 one. builds but doesn't work
Revision 1.21 2005/06/24 11:19:09 glen
- anybody using this?
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/umlinux.spec?r1=1.23&r2=1.23.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
