diff options
author | Andreas Oberritter <obi@opendreambox.org> | 2008-10-23 11:49:00 +0200 |
---|---|---|
committer | Andreas Oberritter <obi@opendreambox.org> | 2008-10-23 11:49:00 +0200 |
commit | ba461d51affed6e2fc3c7f6c14648e053a9e29e1 (patch) | |
tree | 4b3fd3d4d8375f91238939a5f32af5e943bb1a6b /packages/util-linux | |
parent | f3f694497294d8da821e1273f36ef0c795971a74 (diff) | |
download | openembedded-ba461d51affed6e2fc3c7f6c14648e053a9e29e1.tar.gz |
util-linux: backport from dev
Diffstat (limited to 'packages/util-linux')
-rw-r--r-- | packages/util-linux/files/fdiskbsdlabel-avr32.patch | 11 | ||||
-rw-r--r-- | packages/util-linux/files/glibc-fix.patch | 62 | ||||
-rw-r--r-- | packages/util-linux/files/glibc-umount2.patch | 18 | ||||
-rw-r--r-- | packages/util-linux/files/util-linux_2.12r-12.diff.gz | bin | 0 -> 100566 bytes | |||
-rw-r--r-- | packages/util-linux/util-linux.inc | 17 | ||||
-rw-r--r-- | packages/util-linux/util-linux_2.12r.bb | 8 |
6 files changed, 112 insertions, 4 deletions
diff --git a/packages/util-linux/files/fdiskbsdlabel-avr32.patch b/packages/util-linux/files/fdiskbsdlabel-avr32.patch new file mode 100644 index 0000000000..4a7d8f4dc8 --- /dev/null +++ b/packages/util-linux/files/fdiskbsdlabel-avr32.patch @@ -0,0 +1,11 @@ +--- /tmp/fdiskbsdlabel.h 2007-09-14 08:52:56.188364759 +0200 ++++ util-linux-2.12r/fdisk/fdiskbsdlabel.h 2007-09-14 08:53:31.279986639 +0200 +@@ -43,7 +43,7 @@ + + #define BSD_LINUX_BOOTDIR "/usr/ucb/mdec" + +-#if defined (i386) || defined (__sparc__) || defined (__arm__) || defined (__mips__) || defined (__s390__) || defined (__sh__) || defined(__x86_64__) ++#if defined (i386) || defined (__sparc__) || defined (__arm__) || defined (__mips__) || defined (__s390__) || defined (__sh__) || defined(__x86_64__) || defined(__avr32__) + #define BSD_LABELSECTOR 1 + #define BSD_LABELOFFSET 0 + #elif defined (__alpha__) || defined (__powerpc__) || defined (__ia64__) || defined (__hppa__) diff --git a/packages/util-linux/files/glibc-fix.patch b/packages/util-linux/files/glibc-fix.patch new file mode 100644 index 0000000000..d72c1701ef --- /dev/null +++ b/packages/util-linux/files/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/packages/util-linux/files/glibc-umount2.patch b/packages/util-linux/files/glibc-umount2.patch new file mode 100644 index 0000000000..3da3a85cfc --- /dev/null +++ b/packages/util-linux/files/glibc-umount2.patch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10sparcumount.dpatch by Jeff Bailey <jbailey@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 */ diff --git a/packages/util-linux/files/util-linux_2.12r-12.diff.gz b/packages/util-linux/files/util-linux_2.12r-12.diff.gz Binary files differnew file mode 100644 index 0000000000..a00cedeb15 --- /dev/null +++ b/packages/util-linux/files/util-linux_2.12r-12.diff.gz diff --git a/packages/util-linux/util-linux.inc b/packages/util-linux/util-linux.inc index 99207213bd..9f52d5cbe9 100644 --- a/packages/util-linux/util-linux.inc +++ b/packages/util-linux/util-linux.inc @@ -23,7 +23,7 @@ FILES_util-linux-cfdisk = "/sbin/cfdisk" FILES_util-linux-sfdisk = "/sbin/sfdisk" FILES_util-linux-swaponoff = "/sbin/swapon.${PN} /sbin/swapoff.${PN}" FILES_util-linux-losetup = "/sbin/losetup.${PN}" -FILES_util-linux-mount = "/bin/mount.${PN}" +FILES_util-linux-mount = "/bin/mount.${PN} ${sysconfdir}/default/mountall" FILES_util-linux-umount = "/bin/umount.${PN}" FILES_util-linux-readprofile = "/usr/sbin/readprofile" @@ -72,14 +72,17 @@ do_install () { 'OPT=${CFLAGS}' 'CC=${CC}' 'LD=${LD}' \ 'LDFLAGS=${LDFLAGS}' 'DESTDIR=${D}' install + test -f ${D}${base_sbindir}/pivot_root && \ + mv ${D}${base_sbindir}/pivot_root ${D}${base_sbindir}/pivot_root.${PN} mv ${D}${base_bindir}/dmesg ${D}${base_bindir}/dmesg.${PN} mv ${D}${base_bindir}/kill ${D}${base_bindir}/kill.${PN} mv ${D}${base_bindir}/more ${D}${base_bindir}/more.${PN} mv ${D}${base_sbindir}/hwclock ${D}${base_sbindir}/hwclock.${PN} mv ${D}${base_sbindir}/mkswap ${D}${base_sbindir}/mkswap.${PN} - mv ${D}${base_sbindir}/pivot_root ${D}${base_sbindir}/pivot_root.${PN} mv ${D}${base_sbindir}/shutdown ${D}${base_sbindir}/shutdown.${PN} mv ${D}${base_sbindir}/sln ${D}${base_sbindir}/sln.${PN} + mv ${D}${base_sbindir}/mkfs.minix ${D}${base_sbindir}/mkfs.minix.${PN} + mv ${D}${base_sbindir}/fsck.minix ${D}${base_sbindir}/fsck.minix.${PN} mv ${D}${bindir}/hexdump ${D}${bindir}/hexdump.${PN} mv ${D}${bindir}/last ${D}${bindir}/last.${PN} mv ${D}${bindir}/logger ${D}${bindir}/logger.${PN} @@ -92,6 +95,8 @@ do_install () { mv ${D}${base_bindir}/umount ${D}${base_bindir}/umount.${PN} mv ${D}${base_bindir}/mount ${D}${base_bindir}/mount.${PN} mv ${D}${base_sbindir}/fdisk ${D}${base_sbindir}/fdisk.${PN} + install -d ${D}${sysconfdir}/default/ + echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall checklink swapon ${D}${base_sbindir}/swapoff ".${PN}" checklink shutdown ${D}${base_sbindir}/reboot ".${PN}" @@ -105,8 +110,11 @@ pkg_postinst_${PN} () { update-alternatives --install ${base_bindir}/kill kill kill.${PN} 100 update-alternatives --install ${base_bindir}/more more more.${PN} 100 update-alternatives --install ${base_sbindir}/mkswap mkswap mkswap.${PN} 100 + test -x ${base_sbindir}/pivot_root.${PN} && \ update-alternatives --install ${base_sbindir}/pivot_root pivot_root pivot_root.${PN} 100 update-alternatives --install ${base_sbindir}/sln sln sln.${PN} 100 + update-alternatives --install ${base_sbindir}/mkfs.minix mkfs.minix mkfs.minix.${PN} 100 + update-alternatives --install ${base_sbindir}/fsck.minix fsck.minix fsck.minix.${PN} 100 update-alternatives --install ${bindir}/hexdump hexdump hexdump.${PN} 100 update-alternatives --install ${bindir}/last last last.${PN} 100 update-alternatives --install ${bindir}/logger logger logger.${PN} 100 @@ -123,16 +131,19 @@ pkg_postinst_${PN} () { } pkg_prerm_${PN} () { + test -x ${base_sbindir}/pivot_root.${PN} && \ + update-alternatives --remove pivot_root pivot_root.${PN} update-alternatives --remove dmesg dmesg.${PN} update-alternatives --remove kill kill.${PN} update-alternatives --remove more more.${PN} update-alternatives --remove halt halt.${PN} update-alternatives --remove hwclock hwclock.${PN} update-alternatives --remove mkswap mkswap.${PN} - update-alternatives --remove pivot_root pivot_root.${PN} update-alternatives --remove reboot reboot.${PN} update-alternatives --remove shutdown shutdown.${PN} update-alternatives --remove sln sln.${PN} + update-alternatives --remove mkfs.minix mkfs.minix.${PN} + update-alternatives --remove fsck.minix fsck.minix.${PN} update-alternatives --remove hexdump hexdump.${PN} update-alternatives --remove last last.${PN} update-alternatives --remove logger logger.${PN} diff --git a/packages/util-linux/util-linux_2.12r.bb b/packages/util-linux/util-linux_2.12r.bb index ded31fb578..179ea63cdb 100644 --- a/packages/util-linux/util-linux_2.12r.bb +++ b/packages/util-linux/util-linux_2.12r.bb @@ -1,3 +1,9 @@ require util-linux.inc -PR = "r6" +SRC_URI += "file://util-linux_2.12r-12.diff.gz;patch=1" +SRC_URI += "file://glibc-fix.patch;patch=1" +SRC_URI += "file://glibc-umount2.patch;patch=1" +SRC_URI += "file://fdiskbsdlabel-avr32.patch;patch=1" +SRC_URI += "file://util-linux-2.12r-cramfs-1.patch;patch=1" + +FILE_PR = "r15" |