mirror of
https://git.yoctoproject.org/poky
synced 2026-04-18 21:32:12 +02:00
util-linux: added 2.12r from OE (needed by fakeroot)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1478 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Marcin Juszkiewicz
223
meta/packages/util-linux/files/MCONFIG
Normal file
223
meta/packages/util-linux/files/MCONFIG
Normal file
@@ -0,0 +1,223 @@
|
||||
# MCONFIG -- Configuration stuff for util-linux
|
||||
# Created: Sat Feb 4 15:50:30 1995
|
||||
# Copyright 1995 Rickard E. Faith (faith@cs.unc.edu)
|
||||
|
||||
# For a user-mode install, make (at least) three changes:
|
||||
# - remove the `-o root' part in INSTALLSUID
|
||||
# - set USE_TTY_GROUP=no
|
||||
# - define DESTDIR
|
||||
|
||||
# Select for ARCH one of intel, alpha, sparc, arm, m68k, mips
|
||||
# Select for CPU i386 if the binaries must be able to run on an intel 386
|
||||
# (by default i486 code is generated, see below)
|
||||
CPU=$(shell uname -m)
|
||||
ARCH=$(shell echo $(CPU) | sed 's/i.86/intel/;s/arm.*/arm/')
|
||||
|
||||
# If HAVE_PAM is set to "yes", then login, chfn, chsh, and newgrp
|
||||
# will use PAM for authentication. Additionally, passwd will not be
|
||||
# installed as it is not PAM aware.
|
||||
HAVE_PAM=no
|
||||
|
||||
# If HAVE_SHADOW is set to "yes", then login, chfn, chsh, newgrp, passwd,
|
||||
# and vipw will not be built or installed from the login-utils
|
||||
# subdirectory.
|
||||
HAVE_SHADOW=yes
|
||||
|
||||
# If HAVE_PASSWD is set to "yes", then passwd will not be built or
|
||||
# installed from the login-utils subdirectory (but login, chfn, chsh,
|
||||
# newgrp, and vipw *will* be installed).
|
||||
HAVE_PASSWD=no
|
||||
|
||||
# If you use chfn and chsh from this package, REQUIRE_PASSWORD will require
|
||||
# non-root users to enter the account password before updating /etc/passwd.
|
||||
REQUIRE_PASSWORD=yes
|
||||
#REQUIRE_PASSWORD=no
|
||||
|
||||
# If you use chsh from this package, ONLY_LISTED_SHELLS will require that
|
||||
# the selected shell be listed in /etc/shells -- otherwise only a warning is
|
||||
# printed. This prevents someone from setting their shell to /bin/false.
|
||||
ONLY_LISTED_SHELLS=yes
|
||||
#ONLY_LISTED_SHELLS=no
|
||||
|
||||
|
||||
# If HAVE_SYSVINIT is set to "yes", then simpleinit and shutdown will not
|
||||
# be built or installed from the login-utils subdirectory. (The shutdown
|
||||
# and halt that come with the SysVinit package should be used with the init
|
||||
# found in that package.)
|
||||
HAVE_SYSVINIT=no
|
||||
|
||||
# If HAVE_SYSVINIT_UTILS is set to "yes", then last, mesg, and wall will
|
||||
# not be built or installed from the login-utils subdirectory. (The
|
||||
# shutdown and init from the SysVinit package do not depend on the last,
|
||||
# mesg, and wall from that package.)
|
||||
HAVE_SYSVINIT_UTILS=no
|
||||
|
||||
# If HAVE_WRITE is set to "yes", then write will not be built or
|
||||
# installed from the misc-utils subdirectory.
|
||||
# (There is a network aware write in netwrite from NetKit 0.16 or later.)
|
||||
HAVE_WRITE=no
|
||||
|
||||
# If HAVE_GETTY is set to "yes", then agetty will not be built or
|
||||
# installed from the login-utils subdirectory. Note that agetty can
|
||||
# co-exist with other gettys, so this option should never be used.
|
||||
HAVE_GETTY=no
|
||||
|
||||
# If USE_TTY_GROUP is set to "yes", then wall and write will be installed
|
||||
# setgid to the "tty" group, and mesg will only set the group write bit.
|
||||
# Note that this is only useful if login/xterm/etc. change the group of the
|
||||
# user's tty to "tty" [The login in util-linux does this correctly, and
|
||||
# xterm will do it correctly if X is compiled with USE_TTY_GROUP set
|
||||
# properly.]
|
||||
USE_TTY_GROUP=no
|
||||
|
||||
# If HAVE_KILL is set to "yes", then kill will not be built or
|
||||
# installed from the misc-utils subdirectory.
|
||||
# (There is also a kill in the procps package.)
|
||||
HAVE_KILL=no
|
||||
|
||||
# If ALLOW_VCS_USE is set to "yes", then login will chown /dev/vcsN
|
||||
# to the current user, allowing her to make a screendump and do other
|
||||
# nifty things on the console, but also allowing him to keep an open
|
||||
# file descriptor after logging out to trick the next user.
|
||||
ALLOW_VCS_USE=yes
|
||||
|
||||
# If HAVE_RESET is set to "yes", then reset won't be installed. The version
|
||||
# of reset that comes with the ncurses package is less aggressive.
|
||||
HAVE_RESET=yes
|
||||
|
||||
# If HAVE_SLN is set to "yes", then sln won't be installed
|
||||
# (but the man page sln.8 will be installed anyway).
|
||||
# sln also comes with libc and glibc.
|
||||
HAVE_SLN=no
|
||||
|
||||
# If HAVE_FDUTILS is set to "yes", then setfdprm won't be installed.
|
||||
HAVE_FDUTILS=no
|
||||
|
||||
# If SILENT_PG is set to "yes", then pg will not ring the bell
|
||||
# when an invalid key is pressed
|
||||
SILENT_PG=no
|
||||
|
||||
# If configure decides that Native Language Support (NLS) is available,
|
||||
# it sets MAY_ENABLE_NLS in defines.h. If you don't want NLS, set
|
||||
# DISABLE_NLS to "yes".
|
||||
DISABLE_NLS=no
|
||||
|
||||
# Different optimizations for different cpus.
|
||||
# gcc 3.0 likes options -mcpu=i486 instead of -m486
|
||||
ifeq "$(ARCH)" "intel"
|
||||
ifeq "$(HAVE_OLD_GCC)" "yes"
|
||||
CPUHEAD=-m
|
||||
else
|
||||
CPUHEAD=-mcpu=i
|
||||
endif
|
||||
ifeq "$(CPU)" "i386"
|
||||
CPUTAIL=386
|
||||
else
|
||||
CPUTAIL=486
|
||||
endif
|
||||
CPUOPT= $(CPUHEAD)$(CPUTAIL)
|
||||
OPT= -pipe -O2 $(CPUOPT) -fomit-frame-pointer
|
||||
else
|
||||
ifeq "$(ARCH)" "arm"
|
||||
OPT= -pipe -O2 -fsigned-char -fomit-frame-pointer
|
||||
else
|
||||
OPT= -O2 -fomit-frame-pointer
|
||||
endif
|
||||
endif
|
||||
|
||||
WARNFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes
|
||||
|
||||
LIB=../lib
|
||||
|
||||
ERR_O=$(LIB)/err.o
|
||||
|
||||
# Set HAVE_SLANG to yes if you have slang (and prefer to use that for cfdisk)
|
||||
# (If neither HAVE_NCURSES nor HAVE_SLANG is defined, cfdisk is not made.)
|
||||
# HAVE_SLANG=yes
|
||||
# There is a subdirectory /usr/include/slang containing slcurses.h
|
||||
# SLANGFLAGS=-I/usr/include/slang
|
||||
# No such subdirectory - slcurses.h lives in /usr/include
|
||||
# (no extra definition required).
|
||||
LIBSLANG=-lslang
|
||||
|
||||
#
|
||||
# Paths used for compilation (not all are actually used, see CFLAGS below)
|
||||
#
|
||||
DEV_DIR= /dev
|
||||
ETC_DIR= /etc
|
||||
SBIN_DIR= /sbin
|
||||
USRSBIN_DIR= /usr/sbin
|
||||
USRLIB_DIR= /usr/lib
|
||||
USRBIN_DIR= /usr/bin
|
||||
USRGAMES_DIR= /usr/games
|
||||
USRSHAREMISC_DIR=/usr/share/misc
|
||||
LOCALE_DIR= /usr/share/locale
|
||||
BIN_DIR= /bin
|
||||
VAR_PATH= /var
|
||||
LOG_DIR= /var/log
|
||||
MAN_DIR= /usr/share/man
|
||||
INFO_DIR= /usr/share/info
|
||||
|
||||
#
|
||||
# Paths used for install
|
||||
#
|
||||
DEVDIR= $(DESTDIR)$(DEV_DIR)
|
||||
ETCDIR= $(DESTDIR)$(ETC_DIR)
|
||||
SBINDIR= $(DESTDIR)$(SBIN_DIR)
|
||||
USRSBINDIR= $(DESTDIR)$(USRSBIN_DIR)
|
||||
USRLIBDIR= $(DESTDIR)$(USRLIB_DIR)
|
||||
USRBINDIR= $(DESTDIR)$(USRBIN_DIR)
|
||||
USRGAMESDIR= $(DESTDIR)$(USRGAMES_DIR)
|
||||
USRSHAREMISCDIR=$(DESTDIR)$(USRSHAREMISC_DIR)
|
||||
LOCALEDIR= $(DESTDIR)$(LOCALE_DIR)
|
||||
BINDIR= $(DESTDIR)$(BIN_DIR)
|
||||
VARPATH= $(DESTDIR)$(VAR_PATH)
|
||||
LOGDIR= $(DESTDIR)$(LOG_DIR)
|
||||
MANDIR= $(DESTDIR)$(MAN_DIR)
|
||||
MAN1DIR= $(MANDIR)/man1
|
||||
MAN3DIR= $(MANDIR)/man3
|
||||
MAN5DIR= $(MANDIR)/man5
|
||||
MAN6DIR= $(MANDIR)/man6
|
||||
MAN8DIR= $(MANDIR)/man8
|
||||
INFODIR= $(DESTDIR)$(INFO_DIR)
|
||||
|
||||
# Directory for shutdown, halt, reboot, etc.
|
||||
SHUTDOWNDIR= $(SBINDIR)
|
||||
|
||||
# Modes
|
||||
DIRMODE= 755
|
||||
BINMODE= 755
|
||||
MANMODE= 644
|
||||
DATMODE= 644
|
||||
INFOMODE= 644
|
||||
SUIDMODE= 4755
|
||||
|
||||
CHMOD= chmod
|
||||
INSTALL= install
|
||||
INSTALLDIR= $(INSTALL) -d -m $(DIRMODE)
|
||||
INSTALLBIN= $(INSTALL) -m $(BINMODE)
|
||||
INSTALLMAN= $(INSTALL) -m $(MANMODE)
|
||||
INSTALLDAT= $(INSTALL) -m $(DATMODE)
|
||||
INSTALLSUID= $(INSTALL) -m $(SUIDMODE)
|
||||
|
||||
ifeq "$(DISABLE_NLS)" "yes"
|
||||
NLSFLAGS = -DDISABLE_NLS
|
||||
endif
|
||||
|
||||
CFLAGS := $(OPT) -I$(LIB) $(WARNFLAGS) \
|
||||
$(CURSESFLAGS) $(SLANGFLAGS) $(NLSFLAGS) \
|
||||
-D_FILE_OFFSET_BITS=64 \
|
||||
-DSBINDIR=\"$(SBIN_DIR)\" \
|
||||
-DUSRSBINDIR=\"$(USRSBIN_DIR)\" \
|
||||
-DLOGDIR=\"$(LOG_DIR)\" \
|
||||
-DVARPATH=\"$(VAR_PATH)\" \
|
||||
-DLOCALEDIR=\"$(LOCALE_DIR)\" \
|
||||
$(CFLAGS)
|
||||
|
||||
|
||||
%.o: %.c
|
||||
$(CC) -c $(CFLAGS) $< -o $@
|
||||
|
||||
%: %.cc
|
||||
$(CXX) $(CFLAGS) $< -o $@
|
||||
|
||||
203
meta/packages/util-linux/files/debian-bug392236.patch
Normal file
203
meta/packages/util-linux/files/debian-bug392236.patch
Normal file
@@ -0,0 +1,203 @@
|
||||
Index: util-linux-2.12r/fdisk/llseek.c
|
||||
===================================================================
|
||||
--- util-linux-2.12r.orig/fdisk/llseek.c 2003-07-13 23:13:33.000000000 +0200
|
||||
+++ util-linux-2.12r/fdisk/llseek.c 2007-04-04 19:01:14.000000000 +0200
|
||||
@@ -14,30 +14,23 @@
|
||||
|
||||
#ifdef __linux__
|
||||
|
||||
-#ifdef HAVE_LLSEEK
|
||||
-#include <syscall.h>
|
||||
-
|
||||
-#else /* HAVE_LLSEEK */
|
||||
+#include <sys/syscall.h>
|
||||
+#ifndef HAVE_LLSEEK
|
||||
|
||||
#if defined(__alpha__) || defined(__ia64__) || defined(__s390x__)
|
||||
|
||||
#define my_llseek lseek
|
||||
|
||||
#else
|
||||
-#include <linux/unistd.h> /* for __NR__llseek */
|
||||
-
|
||||
-static int _llseek (unsigned int, unsigned long,
|
||||
- unsigned long, long long *, unsigned int);
|
||||
|
||||
-#ifdef __NR__llseek
|
||||
+#ifdef SYS__llseek
|
||||
|
||||
-static _syscall5(int,_llseek,unsigned int,fd,unsigned long,offset_high,
|
||||
- unsigned long, offset_low,long long *,result,
|
||||
- unsigned int, origin)
|
||||
+#define _llseek(fd, offset_high, offset_low, result, origin) \
|
||||
+ syscall(SYS__llseek, fd, offset_high, offset_low, result, origin)
|
||||
|
||||
#else
|
||||
|
||||
-/* no __NR__llseek on compilation machine - might give it explicitly */
|
||||
+/* no SYS__llseek on compilation machine - might give it explicitly */
|
||||
static int _llseek (unsigned int fd, unsigned long oh,
|
||||
unsigned long ol, long long *result,
|
||||
unsigned int origin) {
|
||||
Index: util-linux-2.12r/fdisk/sfdisk.c
|
||||
===================================================================
|
||||
--- util-linux-2.12r.orig/fdisk/sfdisk.c 2005-01-04 23:31:57.000000000 +0100
|
||||
+++ util-linux-2.12r/fdisk/sfdisk.c 2007-04-04 19:01:14.000000000 +0200
|
||||
@@ -48,7 +48,7 @@
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/utsname.h>
|
||||
-#include <linux/unistd.h> /* _syscall */
|
||||
+#include <sys/syscall.h>
|
||||
#include "nls.h"
|
||||
#include "common.h"
|
||||
|
||||
@@ -177,9 +177,8 @@
|
||||
#endif
|
||||
|
||||
#ifndef use_lseek
|
||||
-static __attribute__used
|
||||
-_syscall5(int, _llseek, unsigned int, fd, ulong, hi, ulong, lo,
|
||||
- loff_t *, res, unsigned int, wh);
|
||||
+#define _llseek(fd, hi, lo, res, wh) \
|
||||
+ syscall(SYS__llseek, fd, hi, lo, res, wh)
|
||||
#endif
|
||||
|
||||
static int
|
||||
Index: util-linux-2.12r/lib/my_reboot.c
|
||||
===================================================================
|
||||
--- util-linux-2.12r.orig/lib/my_reboot.c 1999-07-09 04:56:36.000000000 +0200
|
||||
+++ util-linux-2.12r/lib/my_reboot.c 2007-04-04 19:01:14.000000000 +0200
|
||||
@@ -23,10 +23,11 @@
|
||||
#else /* no USE_LIBC */
|
||||
|
||||
/* direct syscall version */
|
||||
-#include <linux/unistd.h>
|
||||
+#include <sys/syscall.h>
|
||||
|
||||
-#ifdef _syscall3
|
||||
-_syscall3(int, reboot, int, magic, int, magic_too, int, cmd);
|
||||
+#ifdef SYS_reboot
|
||||
+#define reboot(magic, magic2, cmd) \
|
||||
+ syscall(SYS_reboot, magic, magic2, cmd)
|
||||
#else
|
||||
/* Let us hope we have a 3-argument reboot here */
|
||||
extern int reboot(int, int, int);
|
||||
Index: util-linux-2.12r/misc-utils/setterm.c
|
||||
===================================================================
|
||||
--- util-linux-2.12r.orig/misc-utils/setterm.c 2003-10-17 18:17:51.000000000 +0200
|
||||
+++ util-linux-2.12r/misc-utils/setterm.c 2007-04-04 19:01:14.000000000 +0200
|
||||
@@ -119,14 +119,13 @@
|
||||
|
||||
#if __GNU_LIBRARY__ < 5
|
||||
#ifndef __alpha__
|
||||
-# include <linux/unistd.h>
|
||||
-#define __NR_klogctl __NR_syslog
|
||||
-_syscall3(int, klogctl, int, type, char*, buf, int, len);
|
||||
+# include <sys/syscall.h>
|
||||
+#define klogctl(type, buf, len) \
|
||||
+ syscall(SYS_syslog, type, buf, len)
|
||||
#else /* __alpha__ */
|
||||
#define klogctl syslog
|
||||
#endif
|
||||
#endif
|
||||
-extern int klogctl(int type, char *buf, int len);
|
||||
|
||||
/* Constants. */
|
||||
|
||||
Index: util-linux-2.12r/mount/swapon.c
|
||||
===================================================================
|
||||
--- util-linux-2.12r.orig/mount/swapon.c 2004-12-22 10:50:19.000000000 +0100
|
||||
+++ util-linux-2.12r/mount/swapon.c 2007-04-04 19:01:14.000000000 +0200
|
||||
@@ -82,11 +82,11 @@
|
||||
#else
|
||||
/* We want a swapon with two args, but have an old libc.
|
||||
Build the kernel call by hand. */
|
||||
-#include <linux/unistd.h>
|
||||
-static
|
||||
-_syscall2(int, swapon, const char *, path, int, flags);
|
||||
-static
|
||||
-_syscall1(int, swapoff, const char *, path);
|
||||
+#include <sys/syscall.h>
|
||||
+#define swapon(path, flags) \
|
||||
+ syscall(SYS_swapon, path, flags)
|
||||
+#define swapoff(path) \
|
||||
+ syscall(SYS_swapoff, path)
|
||||
#endif
|
||||
#else
|
||||
/* just do as libc says */
|
||||
Index: util-linux-2.12r/mount/umount.c
|
||||
===================================================================
|
||||
--- util-linux-2.12r.orig/mount/umount.c 2007-04-04 19:01:14.000000000 +0200
|
||||
+++ util-linux-2.12r/mount/umount.c 2007-04-04 19:02:22.000000000 +0200
|
||||
@@ -37,14 +37,13 @@
|
||||
#else /* MNT_FORCE */
|
||||
|
||||
/* Does the present kernel source know about umount2? */
|
||||
-#include <linux/unistd.h>
|
||||
-#ifdef __NR_umount2
|
||||
+#include <sys/syscall.h>
|
||||
+#ifdef SYS_umount2
|
||||
|
||||
-int umount2(const char *path, int flags);
|
||||
+#define umount2(path, flags) \
|
||||
+ syscall(SYS_umount2, path, flags)
|
||||
|
||||
-_syscall2(int, umount2, const char *, path, int, flags);
|
||||
-
|
||||
-#else /* __NR_umount2 */
|
||||
+#else /* SYS_umount2 */
|
||||
|
||||
static int
|
||||
umount2(const char *path, int flags) {
|
||||
@@ -52,7 +51,7 @@
|
||||
errno = ENOSYS;
|
||||
return -1;
|
||||
}
|
||||
-#endif /* __NR_umount2 */
|
||||
+#endif /* SYS_umount2 */
|
||||
|
||||
#if !defined(MNT_FORCE)
|
||||
/* dare not try to include <linux/mount.h> -- lots of errors */
|
||||
Index: util-linux-2.12r/partx/partx.c
|
||||
===================================================================
|
||||
--- util-linux-2.12r.orig/partx/partx.c 2004-08-23 22:13:27.000000000 +0200
|
||||
+++ util-linux-2.12r/partx/partx.c 2007-04-04 19:01:14.000000000 +0200
|
||||
@@ -338,10 +338,9 @@
|
||||
#endif
|
||||
|
||||
#ifdef NEED__llseek
|
||||
-#include <linux/unistd.h> /* _syscall */
|
||||
-static
|
||||
-_syscall5(int, _llseek, uint, fd, ulong, hi, ulong, lo,
|
||||
- long long *, res, uint, wh);
|
||||
+#include <sys/syscall.h>
|
||||
+#define _llseek(fd, hi, lo, res, wh) \
|
||||
+ syscall(SYS__llseek, fd, hi, lo, res, wh)
|
||||
#endif
|
||||
|
||||
static int
|
||||
Index: util-linux-2.12r/sys-utils/dmesg.c
|
||||
===================================================================
|
||||
--- util-linux-2.12r.orig/sys-utils/dmesg.c 2004-05-04 18:38:12.000000000 +0200
|
||||
+++ util-linux-2.12r/sys-utils/dmesg.c 2007-04-04 19:01:14.000000000 +0200
|
||||
@@ -29,7 +29,7 @@
|
||||
* Only function 3 is allowed to non-root processes.
|
||||
*/
|
||||
|
||||
-#include <linux/unistd.h>
|
||||
+#include <sys/syscall.h>
|
||||
#include <stdio.h>
|
||||
#include <getopt.h>
|
||||
#include <stdlib.h>
|
||||
@@ -38,8 +38,8 @@
|
||||
#if __GNU_LIBRARY__ < 5
|
||||
|
||||
#ifndef __alpha__
|
||||
-# define __NR_klogctl __NR_syslog
|
||||
- static inline _syscall3(int, klogctl, int, type, char *, b, int, len);
|
||||
+# define klogctl(type, b, len) \
|
||||
+ syscall(SYS_syslog, type, b, len)
|
||||
#else /* __alpha__ */
|
||||
#define klogctl syslog
|
||||
#endif
|
||||
10
meta/packages/util-linux/files/defines.h
Normal file
10
meta/packages/util-linux/files/defines.h
Normal file
@@ -0,0 +1,10 @@
|
||||
#define UTIL_LINUX_VERSION "2.12"
|
||||
#define util_linux_version "util-linux-2.12"
|
||||
|
||||
#define HAVE_blkpg_h
|
||||
#define HAVE_kd_h
|
||||
#define HAVE_locale_h
|
||||
#define HAVE_langinfo_h
|
||||
#define HAVE_sys_user_h
|
||||
#define HAVE_asm_types_h
|
||||
//#define NEED_tqueue_h
|
||||
12
meta/packages/util-linux/files/fdiskbsdlabel_thumb.diff
Normal file
12
meta/packages/util-linux/files/fdiskbsdlabel_thumb.diff
Normal file
@@ -0,0 +1,12 @@
|
||||
--- util-linux-2.12r/fdisk/fdiskbsdlabel.h.orig 2006-01-21 23:53:51.000000000 +0100
|
||||
+++ util-linux-2.12r/fdisk/fdiskbsdlabel.h 2006-01-21 23:54:35.000000000 +0100
|
||||
@@ -52,6 +52,9 @@
|
||||
#elif defined (__s390__) || defined (__s390x__)
|
||||
#define BSD_LABELSECTOR 1
|
||||
#define BSD_LABELOFFSET 0
|
||||
+#elif defined (__thumb__)
|
||||
+#define BSD_LABELSECTOR 1
|
||||
+#define BSD_LABELOFFSET 0
|
||||
#else
|
||||
#error unknown architecture
|
||||
#endif
|
||||
23
meta/packages/util-linux/files/gcc34.patch
Normal file
23
meta/packages/util-linux/files/gcc34.patch
Normal file
@@ -0,0 +1,23 @@
|
||||
|
||||
#
|
||||
# Patch managed by http://www.holgerschurig.de/patcher.html
|
||||
#
|
||||
|
||||
--- util-linux-2.12o/disk-utils/fsck.cramfs.c~gcc34
|
||||
+++ util-linux-2.12o/disk-utils/fsck.cramfs.c
|
||||
@@ -77,15 +77,7 @@
|
||||
#define PAD_SIZE 512
|
||||
|
||||
#include <asm/page.h>
|
||||
-#ifdef PAGE_SIZE
|
||||
-#define PAGE_CACHE_SIZE ((int) PAGE_SIZE)
|
||||
-#elif defined __ia64__
|
||||
-#define PAGE_CACHE_SIZE (16384)
|
||||
-#elif defined __alpha__
|
||||
-#define PAGE_CACHE_SIZE (8192)
|
||||
-#else
|
||||
#define PAGE_CACHE_SIZE (4096)
|
||||
-#endif
|
||||
|
||||
/* Guarantee access to at least 8kB at a time */
|
||||
#define ROMBUFFER_BITS 13
|
||||
22
meta/packages/util-linux/files/glibc-fix.patch
Normal file
22
meta/packages/util-linux/files/glibc-fix.patch
Normal file
@@ -0,0 +1,22 @@
|
||||
--- /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 */
|
||||
17
meta/packages/util-linux/files/make_include
Normal file
17
meta/packages/util-linux/files/make_include
Normal file
@@ -0,0 +1,17 @@
|
||||
VERSION=2.12
|
||||
CC=gcc
|
||||
CFLAGS=
|
||||
LDFLAGS=
|
||||
HAVE_OLD_GCC=yes
|
||||
HAVE_RAW_H=yes
|
||||
HAVE_NCURSES=yes
|
||||
CURSESFLAGS=-DNCH=1
|
||||
LIBCURSES=-lncurses
|
||||
HAVE_TERMCAP=no
|
||||
NEED_LIBCRYPT=yes
|
||||
FOREIGN = --foreign-user
|
||||
HAVE_XGETTEXT=yes
|
||||
HAVE_OPENPTY=yes
|
||||
HAVE_PIVOT_ROOT=yes
|
||||
HAVE_GOOD_RPC=yes
|
||||
HAVE_ZLIB=yes
|
||||
3
meta/packages/util-linux/files/swapargs.h
Normal file
3
meta/packages/util-linux/files/swapargs.h
Normal file
@@ -0,0 +1,3 @@
|
||||
#define SWAPON_HAS_TWO_ARGS
|
||||
#include <asm/page.h>
|
||||
#include <sys/swap.h>
|
||||
19
meta/packages/util-linux/files/umount.diff
Normal file
19
meta/packages/util-linux/files/umount.diff
Normal file
@@ -0,0 +1,19 @@
|
||||
*** util-linux-2.12r/mount/umount.c.orig 2005-09-10 20:07:38.000000000 +0200
|
||||
--- util-linux-2.12r/mount/umount.c 2006-06-07 21:14:04.000000000 +0200
|
||||
***************
|
||||
*** 40,46 ****
|
||||
#include <linux/unistd.h>
|
||||
#ifdef __NR_umount2
|
||||
|
||||
! static int umount2(const char *path, int flags);
|
||||
|
||||
_syscall2(int, umount2, const char *, path, int, flags);
|
||||
|
||||
--- 40,46 ----
|
||||
#include <linux/unistd.h>
|
||||
#ifdef __NR_umount2
|
||||
|
||||
! int umount2(const char *path, int flags);
|
||||
|
||||
_syscall2(int, umount2, const char *, path, int, flags);
|
||||
|
||||
BIN
meta/packages/util-linux/files/util-linux_2.12r-12.diff.gz
Normal file
BIN
meta/packages/util-linux/files/util-linux_2.12r-12.diff.gz
Normal file
Binary file not shown.
32
meta/packages/util-linux/util-linux-native_2.12r.bb
Normal file
32
meta/packages/util-linux/util-linux-native_2.12r.bb
Normal file
@@ -0,0 +1,32 @@
|
||||
DESCRIPTION = "Util-linux is a suite of essential utilities for any Linux system."
|
||||
SECTION = "base"
|
||||
LICENSE = "GPL"
|
||||
DEPENDS = "zlib-native ncurses-native"
|
||||
|
||||
inherit autotools native
|
||||
|
||||
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux/util-linux-${PV}.tar.bz2 \
|
||||
file://gcc34.patch;patch=1 \
|
||||
file://MCONFIG \
|
||||
file://make_include \
|
||||
file://swapargs.h \
|
||||
file://fdiskbsdlabel_thumb.diff;patch=1 \
|
||||
file://defines.h"
|
||||
|
||||
S="${WORKDIR}/util-linux-${PV}"
|
||||
|
||||
EXTRA_OEMAKE="'OPT=${BUILD_CFLAGS}' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'LDFLAGS=${BUILD_LDFLAGS}' SBINDIR=${base_sbindir} USRSBINDIR=${base_sbindir} LOGDIR=${localstatedir}/log VARPATH=${localstatedir} LOCALEDIR=${datadir}/locale"
|
||||
|
||||
do_compile () {
|
||||
set -e
|
||||
install ${WORKDIR}/MCONFIG ${S}/MCONFIG
|
||||
install ${WORKDIR}/make_include ${S}/make_include
|
||||
install ${WORKDIR}/swapargs.h ${S}/mount/swapargs.h
|
||||
install ${WORKDIR}/defines.h ${S}/defines.h
|
||||
oe_runmake
|
||||
}
|
||||
|
||||
do_stage () {
|
||||
autotools_stage_all
|
||||
}
|
||||
|
||||
193
meta/packages/util-linux/util-linux.inc
Normal file
193
meta/packages/util-linux/util-linux.inc
Normal file
@@ -0,0 +1,193 @@
|
||||
DESCRIPTION = "Util-linux is a suite of essential utilities for any Linux system."
|
||||
SECTION = "base"
|
||||
LICENSE = "GPL"
|
||||
DEPENDS = "zlib ncurses"
|
||||
|
||||
inherit autotools
|
||||
|
||||
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux/util-linux-${PV}.tar.bz2 \
|
||||
file://gcc34.patch;patch=1 \
|
||||
file://MCONFIG \
|
||||
file://make_include \
|
||||
file://swapargs.h \
|
||||
file://fdiskbsdlabel_thumb.diff;patch=1 \
|
||||
file://umount.diff;patch=1 \
|
||||
file://defines.h"
|
||||
|
||||
PACKAGES_prepend = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-swaponoff util-linux-losetup util-linux-umount util-linux-mount util-linux-readprofile "
|
||||
|
||||
FILES_${PN}-doc += "/usr/share/misc/getopt/getopt-*.*"
|
||||
|
||||
FILES_util-linux-fdisk = "/sbin/fdisk.${PN}"
|
||||
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-umount = "/bin/umount.${PN}"
|
||||
FILES_util-linux-readprofile = "/usr/sbin/readprofile"
|
||||
|
||||
RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile "
|
||||
RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup"
|
||||
|
||||
do_compile () {
|
||||
set -e
|
||||
install ${WORKDIR}/MCONFIG ${S}/MCONFIG
|
||||
install ${WORKDIR}/make_include ${S}/make_include
|
||||
install ${WORKDIR}/swapargs.h ${S}/mount/swapargs.h
|
||||
install ${WORKDIR}/defines.h ${S}/defines.h
|
||||
oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= \
|
||||
'OPT=${CFLAGS}' 'CC=${CC}' 'LD=${LD}' \
|
||||
'LDFLAGS=${LDFLAGS}'
|
||||
}
|
||||
|
||||
checklink() {
|
||||
local targ link value
|
||||
targ="$1"
|
||||
link="$2"
|
||||
ext="$3"
|
||||
if test -h "$link"
|
||||
then
|
||||
value="$(readlink "$link")"
|
||||
if test "$value" = "$targ"
|
||||
then
|
||||
rm "$link"
|
||||
ln -s "$targ"."${PN}" "$link$ext"
|
||||
return 0
|
||||
else
|
||||
echo "$link: '$value' found '$targ' expected" >&2
|
||||
return 1
|
||||
fi
|
||||
else
|
||||
echo "$link: not a symbolic link" >&2
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
do_install () {
|
||||
# with ccache the timestamps on compiled files may
|
||||
# end up earlier than on their inputs, this allows
|
||||
# for the resultant compilation in the install step.
|
||||
oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= \
|
||||
'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}/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}
|
||||
mv ${D}${bindir}/mesg ${D}${bindir}/mesg.${PN}
|
||||
mv ${D}${bindir}/renice ${D}${bindir}/renice.${PN}
|
||||
mv ${D}${bindir}/wall ${D}${bindir}/wall.${PN}
|
||||
|
||||
mv ${D}${base_sbindir}/losetup ${D}${base_sbindir}/losetup.${PN}
|
||||
mv ${D}${base_sbindir}/swapon ${D}${base_sbindir}/swapon.${PN}
|
||||
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}
|
||||
|
||||
checklink swapon ${D}${base_sbindir}/swapoff ".${PN}"
|
||||
checklink shutdown ${D}${base_sbindir}/reboot ".${PN}"
|
||||
checklink shutdown ${D}${base_sbindir}/halt ".${PN}"
|
||||
checklink shutdown ${D}${base_sbindir}/fastboot ""
|
||||
checklink shutdown ${D}${base_sbindir}/fasthalt ""
|
||||
}
|
||||
|
||||
pkg_postinst_${PN} () {
|
||||
update-alternatives --install ${base_bindir}/dmesg dmesg dmesg.${PN} 100
|
||||
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
|
||||
update-alternatives --install ${bindir}/mesg mesg mesg.${PN} 100
|
||||
update-alternatives --install ${bindir}/renice renice renice.${PN} 100
|
||||
update-alternatives --install ${bindir}/wall wall wall.${PN} 100
|
||||
|
||||
# There seems to be problem, atleast on nslu2, with these, untill they are
|
||||
# fixed the busybox ones have higher priority
|
||||
update-alternatives --install ${base_sbindir}/hwclock hwclock hwclock.${PN} 10
|
||||
update-alternatives --install ${base_sbindir}/shutdown shutdown shutdown.${PN} 10
|
||||
update-alternatives --install ${base_sbindir}/reboot reboot reboot.${PN} 10
|
||||
update-alternatives --install ${base_sbindir}/halt halt halt.${PN} 10
|
||||
}
|
||||
|
||||
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 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}
|
||||
update-alternatives --remove mesg mesg.${PN}
|
||||
update-alternatives --remove renice renice.${PN}
|
||||
update-alternatives --remove wall wall.${PN}
|
||||
}
|
||||
|
||||
pkg_postinst_util-linux-fdisk () {
|
||||
update-alternatives --install ${base_sbindir}/fdisk fdisk fdisk.${PN} 100
|
||||
}
|
||||
|
||||
pkg_prerm_util-linux-fdisk () {
|
||||
update-alternatives --remove fdisk fdisk.${PN}
|
||||
}
|
||||
|
||||
pkg_postinst_util-linux-mount () {
|
||||
update-alternatives --install ${base_bindir}/mount mount mount.${PN} 100
|
||||
}
|
||||
|
||||
pkg_prerm_util-linux-mount () {
|
||||
update-alternatives --remove mount mount.${PN}
|
||||
}
|
||||
|
||||
pkg_postinst_util-linux-umount () {
|
||||
update-alternatives --install ${base_bindir}/umount umount umount.${PN} 100
|
||||
}
|
||||
|
||||
pkg_prerm_util-linux-umount () {
|
||||
update-alternatives --remove umount umount.${PN}
|
||||
}
|
||||
|
||||
pkg_postinst_util-linux-losetup () {
|
||||
update-alternatives --install ${base_sbindir}/losetup losetup losetup.${PN} 100
|
||||
}
|
||||
|
||||
pkg_prerm_util-linux-losetup () {
|
||||
update-alternatives --remove losetup losetup.${PN}
|
||||
}
|
||||
|
||||
pkg_postinst_util-linux-swaponoff () {
|
||||
update-alternatives --install ${base_sbindir}/swapoff swapoff swapoff.${PN} 100
|
||||
update-alternatives --install ${base_sbindir}/swapon swapon swapon.${PN} 100
|
||||
}
|
||||
|
||||
pkg_prerm_util-linux-swaponoff () {
|
||||
update-alternatives --remove swapoff swapoff.${PN}
|
||||
update-alternatives --remove swapon swapon.${PN}
|
||||
}
|
||||
7
meta/packages/util-linux/util-linux_2.12r.bb
Normal file
7
meta/packages/util-linux/util-linux_2.12r.bb
Normal file
@@ -0,0 +1,7 @@
|
||||
require util-linux.inc
|
||||
|
||||
SRC_URI += "file://util-linux_2.12r-12.diff.gz;patch=1"
|
||||
SRC_URI += "file://glibc-fix.patch;patch=1"
|
||||
SRC_URI += "file://debian-bug392236.patch;patch=1"
|
||||
|
||||
PR = "r11"
|
||||
Reference in New Issue
Block a user