diff options
Diffstat (limited to 'package/util-linux')
| -rw-r--r-- | package/util-linux/Makefile | 93 | ||||
| -rw-r--r-- | package/util-linux/patches/501-mconfig.patch | 68 | ||||
| -rw-r--r-- | package/util-linux/patches/601-util-linux-2.12r-umount-no-special.patch | 11 |
3 files changed, 172 insertions, 0 deletions
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile new file mode 100644 index 0000000000..8ca8052ea1 --- /dev/null +++ b/package/util-linux/Makefile @@ -0,0 +1,93 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# $Id: Makefile 3822 2006-05-24 07:01:52Z nico $ + +include $(TOPDIR)/rules.mk + +PKG_NAME:=util-linux +PKG_VERSION:=2.12r +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=ftp://ftp.kernel.org/pub/linux/utils/$(PKG_NAME)/ \ + http://ftp.kernel.org/pub/linux/utils/$(PKG_NAME)/ \ + ftp://ftp.de.kernel.org/pub/linux/utils/$(PKG_NAME)/ \ + http://ftp.de.kernel.org/pub/linux/utils/$(PKG_NAME)/ +PKG_MD5SUM:=c261230b27fc0fbcc287c76884caf2d3 +PKG_CAT:=zcat + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install + +include $(INCLUDE_DIR)/package.mk + +define Package/util-linux/Default + SECTION:=utils + CATEGORY:=Utilities + URL:=http://www.kernel.org/pub/linux/utils/util-linux/ +endef + +define Package/fdisk + $(call Package/util-linux/Default) + TITLE:=Partition table manipulation utility + DESCRIPTION:=\ + This package contains an utility for managing disk partition tables. + URL:=http://www.kernel.org/pub/linux/utils/util-linux/ +endef + +define Package/losetup + $(call Package/util-linux/Default) + TITLE:=Loopback devices setup and control utility + DESCRIPTION:=\ + This package contains an utility for managing loopback devices. +endef + +define Package/swap-utils + $(call Package/util-linux/Default) + TITLE:=Swap space management utilities + DESCRIPTION:=\ + This package contains a collection of tools for managing swap space: \\\ + - mkswap\\\ + - swapon\\\ + - swapoff +endef + +define Build/Compile + $(call Build/Compile/Default, \ + OPT="$(TARGET_CFLAGS)" \ + INSTALLSUID="install -m 4755" \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install \ + ) +endef + +define Package/Template + @if [ \! -f "$(PKG_INSTALL_DIR)/$(1)" ]; then \ + rm -f $(PKG_BUILD_DIR)/.built; \ + $(MAKE) $(PKG_BUILD_DIR)/.built; \ + fi + install -d -m0755 $(2) + $(CP) $(PKG_INSTALL_DIR)/$(1) $(2)/ +endef + +define Package/fdisk/install + $(call Package/Template,sbin/fdisk,$(1)/usr/sbin) +endef + +define Package/losetup/install + $(call Package/Template,sbin/losetup,$(1)/usr/sbin) +endef + +define Package/swap-utils/install + $(call Package/Template,sbin/mkswap,$(1)/usr/sbin) + $(call Package/Template,sbin/swapon,$(1)/usr/sbin) + $(call Package/Template,sbin/swapoff,$(1)/usr/sbin) +endef + +$(eval $(call BuildPackage,fdisk)) +$(eval $(call BuildPackage,losetup)) +$(eval $(call BuildPackage,swap-utils)) diff --git a/package/util-linux/patches/501-mconfig.patch b/package/util-linux/patches/501-mconfig.patch new file mode 100644 index 0000000000..67e6530de9 --- /dev/null +++ b/package/util-linux/patches/501-mconfig.patch @@ -0,0 +1,68 @@ +--- util-linux-2.12r-orig/MCONFIG 2004-12-13 00:15:48.000000000 +0100 ++++ util-linux-2.12r/MCONFIG 2005-10-03 17:54:15.945049312 +0200 +@@ -16,8 +16,8 @@ + # 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/') ++CPU= ++ARCH=mips + + # If HAVE_PAM is set to "yes", then login, chfn, chsh, and newgrp + # will use PAM for authentication. Additionally, passwd will not be +@@ -64,12 +64,12 @@ + # 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 ++HAVE_WRITE=yes + + # 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 ++HAVE_GETTY=yes + + # 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. +@@ -82,13 +82,13 @@ + # 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 ++HAVE_KILL=yes + + # 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 ++ALLOW_VCS_USE=no + + # If DO_STAT_MAIL is set to "yes", then login will stat() the mailbox + # and tell the user that she has new mail. This can hang the login if +@@ -102,19 +102,19 @@ + # 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 ++HAVE_SLN=yes + + # If HAVE_FDUTILS is set to "yes", then setfdprm won't be installed. +-HAVE_FDUTILS=no ++HAVE_FDUTILS=yes + + # If SILENT_PG is set to "yes", then pg will not ring the bell + # when an invalid key is pressed +-SILENT_PG=no ++SILENT_PG=yes + + # 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 ++DISABLE_NLS=yes + + # Different optimizations for different cpus. + # Before gcc 2.8.0 only -m486 diff --git a/package/util-linux/patches/601-util-linux-2.12r-umount-no-special.patch b/package/util-linux/patches/601-util-linux-2.12r-umount-no-special.patch new file mode 100644 index 0000000000..d79598fc84 --- /dev/null +++ b/package/util-linux/patches/601-util-linux-2.12r-umount-no-special.patch @@ -0,0 +1,11 @@ +--- util-linux-2.12r.old/mount/umount.c ++++ util-linux-2.12r/mount/umount.c +@@ -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 */ |