Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ethan Grammatikidis (ec8efe8c07514c3e818fa3234e7218d0cc9fdce3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ethan Grammatikidis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ethan Grammatikidis (ec8efe8c07514c3e818fa3234e7218d0cc9fdce3)
  • Date: Thu, 12 Jul 2007 11:50:08 -0500

GIT changes to master grimoire by Ethan Grammatikidis <eekee57 AT fastmail.fm>:

utils/util-linux/BUILD | 2 +
utils/util-linux/HISTORY | 5 ++
utils/util-linux/glibc-fix.patch | 62
+++++++++++++++++++++++++++++++++++
utils/util-linux/glibc-umount2.patch | 18 ++++++++++
4 files changed, 87 insertions(+)

New commits:
commit ec8efe8c07514c3e818fa3234e7218d0cc9fdce3
Author: Ethan Grammatikidis <eekee57 AT fastmail.fm>
Commit: Ethan Grammatikidis <eekee57 AT fastmail.fm>

util-linux: added patches to build on arm with glibc

diff --git a/utils/util-linux/BUILD b/utils/util-linux/BUILD
index 162b76a..693ca9b 100755
--- a/utils/util-linux/BUILD
+++ b/utils/util-linux/BUILD
@@ -3,6 +3,8 @@ OPTS="$OPTS --build=${BUILD}" &

create_group tty &&
patch -p1 < $SCRIPT_DIRECTORY/util-linux-2.12p-cramfs-1.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/glibc-fix.patch
+patch -p1 < $SCRIPT_DIRECTORY/glibc-umount2.patch

sedit "s/HAVE_SLN=no/HAVE_SLN=yes/" MCONFIG &&
sedit "s/# ADD_RAW=yes/ADD_RAW=yes/" MCONFIG &&
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index 31bf4de..8d94f25 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,8 @@
+2007-07-12 Ethan Grammatikidis <eekee AT eekee.is-a-geek.org>
+ * BUILD, glibc-umount2.patch, glibc-fix.patch: Added from OE to
+ fix compile problems on arm. Applying patches regardless of
+ architecture, tested fine on i686
+
2007-03-11 Thomas Orgis <sobukus AT sourcemage.org>
* BUILD: moved the create_group tty down so that it will break the
chain
and let the cast fail early if it fails
diff --git a/utils/util-linux/glibc-fix.patch
b/utils/util-linux/glibc-fix.patch
new file mode 100644
index 0000000..d72c170
--- /dev/null
+++ b/utils/util-linux/glibc-fix.patch
@@ -0,0 +1,62 @@
+--- /tmp/llseek.c 2006-11-21 11:31:31.000000000 +0100
++++ util-linux-2.12r/fdisk/llseek.c 2006-11-21 11:33:21.218554000 +0100
+@@ -31,9 +31,18 @@
+
+ #ifdef __NR__llseek
+
++#ifdef _syscall5
++
+ static _syscall5(int,_llseek,unsigned int,fd,unsigned long,offset_high,
+ unsigned long, offset_low,long long *,result,
+ unsigned int, origin)
++#else
++static int _llseek (unsigned int fd, unsigned long oh,
++ unsigned long ol, long long *result,
++ unsigned int origin) {
++ return syscall (__NR__llseek, fd, oh, ol, result, origin);
++}
++#endif /* _syscall5 */
+
+ #else
+
+--- /tmp/sfdisk.c 2006-11-21 11:36:13.000000000 +0100
++++ util-linux-2.12r/fdisk/sfdisk.c 2006-11-21 11:37:17.678554000 +0100
+@@ -177,9 +177,16 @@
+ #endif
+
+ #ifndef use_lseek
++#ifdef _syscall5
+ static __attribute__used
+ _syscall5(int, _llseek, unsigned int, fd, ulong, hi, ulong, lo,
+ loff_t *, res, unsigned int, wh);
++#else
++int _llseek (unsigned int fd, ulong hi, ulong lo,
++ loff_t *res, unsigned int wh) {
++ return syscall (__NR__llseek, fd, hi, lo, res, wh);
++}
++#endif /* _syscall5 */
+ #endif
+
+ static int
+--- /tmp/cmos.c 2006-11-21 11:38:55.000000000 +0100
++++ util-linux-2.12r/hwclock/cmos.c 2006-11-21 11:41:45.458554000 +0100
+@@ -46,15 +46,16 @@
+
+ #include <unistd.h> /* for geteuid() */
+ #include <fcntl.h> /* for O_RDWR */
++#include <linux/version.h>
+ #include <errno.h>
+ #include "../defines.h" /* for HAVE_sys_io_h */
+ #include "nls.h"
+
+ #if defined(__i386__)
+-#ifdef HAVE_sys_io_h
+-#include <sys/io.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
++#include <asm/io.h>
+ #else
+-#include <asm/io.h> /* for inb, outb */
++#include <sys/io.h> /* for inb, outb */
+ #endif
+ #elif defined(__alpha__)
+ /* <asm/io.h> fails to compile, probably because of u8 etc */
diff --git a/utils/util-linux/glibc-umount2.patch
b/utils/util-linux/glibc-umount2.patch
new file mode 100644
index 0000000..3da3a85
--- /dev/null
+++ b/utils/util-linux/glibc-umount2.patch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10sparcumount.dpatch by Jeff Bailey <jbailey AT ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Sparc and Arm have umount2 in glibc.
+
+@DPATCH@
+--- util-linux/mount/umount.c 2005-05-20 11:39:07.000000000 +0000
++++ util-linux/mount/umount.c 2005-05-20 11:39:15.000000000 +0000
+@@ -31,7 +31,7 @@
+ #include <arpa/inet.h>
+ #endif
+
+-#if defined(MNT_FORCE) && !defined(__sparc__) && !defined(__arm__)
++#if defined(MNT_FORCE)
+ /* Interesting ... it seems libc knows about MNT_FORCE and presumably
+ about umount2 as well -- need not do anything */
+ #else /* MNT_FORCE */



  • [SM-Commit] GIT changes to master grimoire by Ethan Grammatikidis (ec8efe8c07514c3e818fa3234e7218d0cc9fdce3), Ethan Grammatikidis, 07/12/2007

Archive powered by MHonArc 2.6.24.

Top of Page