Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8b07a935f768a683927dc56f831861f5bffc9b68
commit 8b07a935f768a683927dc56f831861f5bffc9b68
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Thu Sep 16 21:36:57 2010 +0200
user-mode-linux-2.6.35-1-i686
- version bump
- add patch to fix build with newer glibc
diff --git a/source/apps-extra/user-mode-linux/FrugalBuild
b/source/apps-extra/user-mode-linux/FrugalBuild
index 386598c..d0692ea 100644
--- a/source/apps-extra/user-mode-linux/FrugalBuild
+++ b/source/apps-extra/user-mode-linux/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Miklos Vajna <vmik...@frugalware.org>
pkgname=user-mode-linux
-pkgver=2.6.33
+pkgver=2.6.35
patchlevel=
pkgrel=1
pkgdesc="A safe, secure way of running Linux versions and Linux processes."
@@ -14,8 +14,8 @@ archs=('i686' 'x86_64')
up2date="lynx -dump http://www.kernel.org/kdist/finger_banner|grep stable|sed
-n 's/.* \([0-9]*\.[0-9]*\.[0-9]*\).*/\1/;1 p'"
# check http://uml.nagafix.co.uk/kernels for configs
source=(http://ftp.frugalware.org/pub/frugalware/frugalware-current/source/base/kernel/linux-$pkgver.tar.bz2
\
- config.i686 config.x86_64 README.Frugalware)
-signatures=(${source[0]}.sign '' '' '')
+ config.i686 config.x86_64 README.Frugalware glibc.diff)
+signatures=(${source[0]}.sign '' '' '' '')
if [ -n "$patchlevel" ]; then
source=("${sour...@]}"
http://ftp.frugalware.org/pub/frugalware/frugalware-current/source/base/kernel/patch-$pkgver$patchlevel.bz2)
signatures=("${signatur...@]}" ${source[4]}.sign)
diff --git a/source/apps-extra/user-mode-linux/config.i686
b/source/apps-extra/user-mode-linux/config.i686
index a2232a2..677a932 100644
--- a/source/apps-extra/user-mode-linux/config.i686
+++ b/source/apps-extra/user-mode-linux/config.i686
@@ -99,7 +99,7 @@ CONFIG_BINFMT_ELF=y
CONFIG_BINFMT_AOUT=y
CONFIG_BINFMT_MISC=y
CONFIG_HOSTFS=y
-CONFIG_HPPFS=y
+# CONFIG_HPPFS is not set
CONFIG_MCONSOLE=y
CONFIG_MAGIC_SYSRQ=y
# CONFIG_HIGHMEM is not set
diff --git a/source/apps-extra/user-mode-linux/config.x86_64
b/source/apps-extra/user-mode-linux/config.x86_64
index 6a9efd3..4dee928 100644
--- a/source/apps-extra/user-mode-linux/config.x86_64
+++ b/source/apps-extra/user-mode-linux/config.x86_64
@@ -52,7 +52,7 @@ CONFIG_LD_SCRIPT_STATIC=y
CONFIG_BINFMT_ELF=y
CONFIG_BINFMT_MISC=y
CONFIG_HOSTFS=y
-CONFIG_HPPFS=y
+# CONFIG_HPPFS is not set
CONFIG_MCONSOLE=y
CONFIG_MAGIC_SYSRQ=y
CONFIG_KERNEL_STACK_ORDER=2
diff --git a/source/apps-extra/user-mode-linux/glibc.diff
b/source/apps-extra/user-mode-linux/glibc.diff
new file mode 100644
index 0000000..a1c8015
--- /dev/null
+++ b/source/apps-extra/user-mode-linux/glibc.diff
@@ -0,0 +1,75 @@
+http://git.kernel.org/?p=linux/kernel/git/frob/linux-2.6-roland.git;a=patch;h=40c020cef085c0f25bf0a2d682440a4d3d67ad29
+
+From 40c020cef085c0f25bf0a2d682440a4d3d67ad29 Mon Sep 17 00:00:00 2001
+From: Roland McGrath <rol...@redhat.com>
+Date: Fri, 20 Aug 2010 16:02:27 -0700
+Subject: [PATCH] uml: fix CONFIG_STATIC_LINK=y build failure with newer glibc
+
+With glibc 2.11 or later that was built with --enable-multi-arch,
+the UML link fails with undefined references to __rel_iplt_start and
+similar symbols. In recent binutils, the default linker script
+defines these symbols (see ld --verbose). Fix the UML linker
+scripts to match the new defaults for these sections.
+
+Signed-off-by: Roland McGrath <rol...@redhat.com>
+---
+ arch/um/kernel/dyn.lds.S | 14 ++++++++++++--
+ arch/um/kernel/uml.lds.S | 17 +++++++++++++++++
+ 2 files changed, 29 insertions(+), 2 deletions(-)
+
+diff --git a/arch/um/kernel/dyn.lds.S b/arch/um/kernel/dyn.lds.S
+index 6926801..a3cab6d 100644
+--- a/arch/um/kernel/dyn.lds.S
++++ b/arch/um/kernel/dyn.lds.S
+@@ -50,8 +50,18 @@ SECTIONS
+ .rela.got : { *(.rela.got) }
+ .rel.bss : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) }
+ .rela.bss : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }
+- .rel.plt : { *(.rel.plt) }
+- .rela.plt : { *(.rela.plt) }
++ .rel.plt : {
++ *(.rel.plt)
++ PROVIDE_HIDDEN(__rel_iplt_start = .);
++ *(.rel.iplt)
++ PROVIDE_HIDDEN(__rel_iplt_end = .);
++ }
++ .rela.plt : {
++ *(.rela.plt)
++ PROVIDE_HIDDEN(__rela_iplt_start = .);
++ *(.rela.iplt)
++ PROVIDE_HIDDEN(__rela_iplt_end = .);
++ }
+ .init : {
+ KEEP (*(.init))
+ } =0x90909090
+diff --git a/arch/um/kernel/uml.lds.S b/arch/um/kernel/uml.lds.S
+index ec63785..a7cbffb 100644
+--- a/arch/um/kernel/uml.lds.S
++++ b/arch/um/kernel/uml.lds.S
+@@ -43,6 +43,23 @@ SECTIONS
+ __syscall_stub_end = .;
+ }
+
++ /*
++ * These are needed even in a static link, even if they wind up being empty.
++ * Newer glibc needs these __rel{,a}_iplt_{start,end} symbols.
++ */
++ .rel.plt : {
++ *(.rel.plt)
++ PROVIDE_HIDDEN(__rel_iplt_start = .);
++ *(.rel.iplt)
++ PROVIDE_HIDDEN(__rel_iplt_end = .);
++ }
++ .rela.plt : {
++ *(.rela.plt)
++ PROVIDE_HIDDEN(__rela_iplt_start = .);
++ *(.rela.iplt)
++ PROVIDE_HIDDEN(__rela_iplt_end = .);
++ }
++
+ #include "asm/common.lds.S"
+
+ init.data : { INIT_DATA }
+--
+1.7.2.3
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
