From be2f6582ef76308742cf886b01117bcc12eac120 Mon Sep 17 00:00:00 2001 From: nico Date: Fri, 7 Oct 2005 20:07:28 +0000 Subject: add util-linux for fdisk (thanks to Philipp Kewisch ) git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2071 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/util-linux/Config.in | 15 ++++++ package/util-linux/Makefile | 48 ++++++++++++++++++++ package/util-linux/ipkg/fdisk.control | 6 +++ package/util-linux/patches/501-mconfig.patch | 68 ++++++++++++++++++++++++++++ 4 files changed, 137 insertions(+) create mode 100644 package/util-linux/Config.in create mode 100644 package/util-linux/Makefile create mode 100644 package/util-linux/ipkg/fdisk.control create mode 100644 package/util-linux/patches/501-mconfig.patch (limited to 'package/util-linux') diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in new file mode 100644 index 000000000..b10b272b7 --- /dev/null +++ b/package/util-linux/Config.in @@ -0,0 +1,15 @@ +config BR2_COMPILE_UTIL_LINUX + bool + default n + depends BR2_PACKAGE_FDISK + +config BR2_PACKAGE_FDISK + tristate "fdisk - A partition table manipulation utility" + default m if CONFIG_DEVEL + select BR2_COMPILE_UTIL_LINUX + help + A partition table manipulation utility + + http://www.kernel.org/pub/linux/utils/util-linux/ + + diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile new file mode 100644 index 000000000..30a4398ae --- /dev/null +++ b/package/util-linux/Makefile @@ -0,0 +1,48 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=fdisk +PKG_VERSION:=2.12r +PKG_RELEASE:=1 +PKG_MD5SUM:=c261230b27fc0fbcc287c76884caf2d3 + +PKG_SOURCE_URL:=ftp://ftp.kernel.org/pub/linux/utils/util-linux/ \ + http://ftp.kernel.org/pub/linux/utils/util-linux/ \ + ftp://ftp.de.kernel.org/pub/linux/utils/util-linux/ \ + http://ftp.de.kernel.org/pub/linux/utils/util-linux/ +PKG_SOURCE:=util-linux-$(PKG_VERSION).tar.gz +PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/util-linux-$(PKG_VERSION) +PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install + +include $(TOPDIR)/package/rules.mk + +$(eval $(call PKG_template,FDISK,fdisk,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) + +$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared + (cd $(PKG_BUILD_DIR); \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ + LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ + ./configure \ + ); + touch $@ + +$(PKG_BUILD_DIR)/.built: + rm -rf $(PKG_INSTALL_DIR) + mkdir -p $(PKG_INSTALL_DIR) + $(MAKE) -C $(PKG_BUILD_DIR)/fdisk \ + $(TARGET_CONFIGURE_OPTS) \ + OPT="$(TARGET_CFLAGS)" \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install + touch $@ + +$(IPKG_FDISK): + install -d -m0755 $(IDIR_FDISK)/usr/sbin + cp -fpR $(PKG_INSTALL_DIR)/sbin/fdisk $(IDIR_FDISK)/usr/sbin/ + $(RSTRIP) $(IDIR_FDISK) + $(IPKG_BUILD) $(IDIR_FDISK) $(PACKAGE_DIR) + +mostlyclean: + -$(MAKE) -C $(PKG_BUILD_DIR) clean + rm -f $(PKG_BUILD_DIR)/.built diff --git a/package/util-linux/ipkg/fdisk.control b/package/util-linux/ipkg/fdisk.control new file mode 100644 index 000000000..30f37b445 --- /dev/null +++ b/package/util-linux/ipkg/fdisk.control @@ -0,0 +1,6 @@ +Package: fdisk +Priority: optional +Section: sys +Maintainer: Philipp Kewisch +Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/util-linux-2.1.2r.tar.gz +Description: Util-linux is a suite of essential utilities for any Linux system. This is the fdisk component of util-linux. Note however that this release is not stripped in any way. diff --git a/package/util-linux/patches/501-mconfig.patch b/package/util-linux/patches/501-mconfig.patch new file mode 100644 index 000000000..67e6530de --- /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 -- cgit v1.2.3 From 233e63e1f51db1ff775c24d3a72d06ecc52c0ff4 Mon Sep 17 00:00:00 2001 From: nico Date: Sat, 8 Oct 2005 14:28:28 +0000 Subject: add a swap-utils subpackage, fix ipkg/control fields, add cvs Id tag. git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2075 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/util-linux/Config.in | 14 ++++++++++++++ package/util-linux/Makefile | 13 ++++++++++++- package/util-linux/ipkg/fdisk.control | 9 +++++---- package/util-linux/ipkg/swap-utils.control | 7 +++++++ 4 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 package/util-linux/ipkg/swap-utils.control (limited to 'package/util-linux') diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index b10b272b7..ed62b7c01 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -13,3 +13,17 @@ config BR2_PACKAGE_FDISK http://www.kernel.org/pub/linux/utils/util-linux/ +config BR2_PACKAGE_SWAP_UTILS + tristate "swap-utils - Swap space management utilities" + default m if CONFIG_DEVEL + select BR2_COMPILE_UTIL_LINUX + help + A collection of tools to manage swap space : + + * mkswap + * swapon + * swapoff + + http://www.kernel.org/pub/linux/utils/util-linux/ + + diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index 30a4398ae..d2cf96ec1 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -1,3 +1,5 @@ +# $Id$ + include $(TOPDIR)/rules.mk PKG_NAME:=fdisk @@ -17,6 +19,7 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,FDISK,fdisk,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,SWAP_UTILS,swap-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared (cd $(PKG_BUILD_DIR); \ @@ -30,10 +33,11 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared $(PKG_BUILD_DIR)/.built: rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR) - $(MAKE) -C $(PKG_BUILD_DIR)/fdisk \ + $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ OPT="$(TARGET_CFLAGS)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ + INSTALLSUID="install -m 4755" \ all install touch $@ @@ -43,6 +47,13 @@ $(IPKG_FDISK): $(RSTRIP) $(IDIR_FDISK) $(IPKG_BUILD) $(IDIR_FDISK) $(PACKAGE_DIR) +$(IPKG_SWAP_UTILS): + install -d -m0755 $(IDIR_SWAP_UTILS)/usr/sbin + cp -fpR $(PKG_INSTALL_DIR)/sbin/mkswap $(IDIR_SWAP_UTILS)/usr/sbin/ + cp -fpR $(PKG_INSTALL_DIR)/sbin/swap{on,off} $(IDIR_SWAP_UTILS)/usr/sbin/ + $(RSTRIP) $(IDIR_SWAP_UTILS) + $(IPKG_BUILD) $(IDIR_SWAP_UTILS) $(PACKAGE_DIR) + mostlyclean: -$(MAKE) -C $(PKG_BUILD_DIR) clean rm -f $(PKG_BUILD_DIR)/.built diff --git a/package/util-linux/ipkg/fdisk.control b/package/util-linux/ipkg/fdisk.control index 30f37b445..9eea615cb 100644 --- a/package/util-linux/ipkg/fdisk.control +++ b/package/util-linux/ipkg/fdisk.control @@ -1,6 +1,7 @@ Package: fdisk Priority: optional -Section: sys -Maintainer: Philipp Kewisch -Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/util-linux-2.1.2r.tar.gz -Description: Util-linux is a suite of essential utilities for any Linux system. This is the fdisk component of util-linux. Note however that this release is not stripped in any way. +Section: admin +Maintainer: OpenWrt Developers Team , Philipp Kewisch +Source: http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/util-linux/ +Depends: +Description: A partition table manipulation utility diff --git a/package/util-linux/ipkg/swap-utils.control b/package/util-linux/ipkg/swap-utils.control new file mode 100644 index 000000000..6c4459d21 --- /dev/null +++ b/package/util-linux/ipkg/swap-utils.control @@ -0,0 +1,7 @@ +Package: swap-utils +Priority: optional +Section: admin +Maintainer: OpenWrt Developers Team +Source: http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/util-linux/ +Depends: +Description: Swap space management utilities -- cgit v1.2.3 From 7c673c3d2664cc0d6e240c81c1ad6f3bb17f7a10 Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 21 Oct 2005 17:21:28 +0000 Subject: remove Maintainer: and Source: from packages git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2210 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/util-linux/ipkg/fdisk.control | 2 -- package/util-linux/ipkg/swap-utils.control | 2 -- 2 files changed, 4 deletions(-) (limited to 'package/util-linux') diff --git a/package/util-linux/ipkg/fdisk.control b/package/util-linux/ipkg/fdisk.control index 9eea615cb..e34c91cbd 100644 --- a/package/util-linux/ipkg/fdisk.control +++ b/package/util-linux/ipkg/fdisk.control @@ -1,7 +1,5 @@ Package: fdisk Priority: optional Section: admin -Maintainer: OpenWrt Developers Team , Philipp Kewisch -Source: http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/util-linux/ Depends: Description: A partition table manipulation utility diff --git a/package/util-linux/ipkg/swap-utils.control b/package/util-linux/ipkg/swap-utils.control index 6c4459d21..c888251f6 100644 --- a/package/util-linux/ipkg/swap-utils.control +++ b/package/util-linux/ipkg/swap-utils.control @@ -1,7 +1,5 @@ Package: swap-utils Priority: optional Section: admin -Maintainer: OpenWrt Developers Team -Source: http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/util-linux/ Depends: Description: Swap space management utilities -- cgit v1.2.3 From 6b53157103d462f7ea0b81f9fe77412719ea2260 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 22 Oct 2005 12:12:59 +0000 Subject: lots of small package changes and dependency cleanups for the V= stuff git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2230 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/util-linux/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/util-linux') diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index d2cf96ec1..ad5dd19db 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -21,7 +21,7 @@ include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,FDISK,fdisk,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(eval $(call PKG_template,SWAP_UTILS,swap-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared +$(PKG_BUILD_DIR)/.configured: (cd $(PKG_BUILD_DIR); \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ -- cgit v1.2.3 From 7bd944d2153b871aaaee970811f27772cbe36a6f Mon Sep 17 00:00:00 2001 From: nico Date: Sat, 5 Nov 2005 02:16:36 +0000 Subject: reorganize/rationalize/format package menuconfig, make updatedd modular git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2333 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/util-linux/Config.in | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'package/util-linux') diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index ed62b7c01..87d41ea49 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -1,29 +1,31 @@ +menu "util-linux" + config BR2_COMPILE_UTIL_LINUX bool default n - depends BR2_PACKAGE_FDISK + depends BR2_PACKAGE_FDISK || BR2_PACKAGE_SWAP_UTILS config BR2_PACKAGE_FDISK - tristate "fdisk - A partition table manipulation utility" + prompt "fdisk............................. A partition table manipulation utility" + tristate default m if CONFIG_DEVEL select BR2_COMPILE_UTIL_LINUX help A partition table manipulation utility http://www.kernel.org/pub/linux/utils/util-linux/ - config BR2_PACKAGE_SWAP_UTILS - tristate "swap-utils - Swap space management utilities" + prompt "swap-utils........................ Swap space management utilities" + tristate default m if CONFIG_DEVEL select BR2_COMPILE_UTIL_LINUX help A collection of tools to manage swap space : - * mkswap * swapon * swapoff http://www.kernel.org/pub/linux/utils/util-linux/ - +endmenu -- cgit v1.2.3 From 97c31ddb562ac6e5829e29bf416fe94e8eec569f Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 7 Nov 2005 18:26:35 +0000 Subject: change bool in BR2_COMPILE_* to tristate to avoid unnecessary package/-install calls git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2388 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/util-linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/util-linux') diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index 87d41ea49..9f1c3a7f9 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -1,7 +1,7 @@ menu "util-linux" config BR2_COMPILE_UTIL_LINUX - bool + tristate default n depends BR2_PACKAGE_FDISK || BR2_PACKAGE_SWAP_UTILS -- cgit v1.2.3 From 3996413199e496cfb930f9855000d26ae5d3fa16 Mon Sep 17 00:00:00 2001 From: nico Date: Tue, 29 Nov 2005 11:13:32 +0000 Subject: add a losetup package, cosmetic fixes on package descriptions git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2567 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/util-linux/Config.in | 13 ++++++++++++- package/util-linux/Makefile | 7 +++++++ package/util-linux/ipkg/fdisk.control | 2 +- package/util-linux/ipkg/losetup.control | 5 +++++ 4 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 package/util-linux/ipkg/losetup.control (limited to 'package/util-linux') diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index 9f1c3a7f9..8faceb6e7 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -6,7 +6,7 @@ config BR2_COMPILE_UTIL_LINUX depends BR2_PACKAGE_FDISK || BR2_PACKAGE_SWAP_UTILS config BR2_PACKAGE_FDISK - prompt "fdisk............................. A partition table manipulation utility" + prompt "fdisk............................. Partition table manipulation utility" tristate default m if CONFIG_DEVEL select BR2_COMPILE_UTIL_LINUX @@ -15,6 +15,17 @@ config BR2_PACKAGE_FDISK http://www.kernel.org/pub/linux/utils/util-linux/ +config BR2_PACKAGE_LOSETUP + prompt "losetup........................... Loop devices setup and control utility" + tristate + default m if CONFIG_DEVEL + select BR2_COMPILE_UTIL_LINUX + select BR2_PACKAGE_KMOD_LOOP + help + A loop devices setup and control utility + + http://www.kernel.org/pub/linux/utils/util-linux/ + config BR2_PACKAGE_SWAP_UTILS prompt "swap-utils........................ Swap space management utilities" tristate diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index ad5dd19db..7eb180173 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -19,6 +19,7 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,FDISK,fdisk,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,LOSETUP,losetup,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(eval $(call PKG_template,SWAP_UTILS,swap-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.configured: @@ -47,6 +48,12 @@ $(IPKG_FDISK): $(RSTRIP) $(IDIR_FDISK) $(IPKG_BUILD) $(IDIR_FDISK) $(PACKAGE_DIR) +$(IPKG_LOSETUP): + install -d -m0755 $(IDIR_LOSETUP)/usr/sbin + cp -fpR $(PKG_INSTALL_DIR)/sbin/losetup $(IDIR_LOSETUP)/usr/sbin/ + $(RSTRIP) $(IDIR_LOSETUP) + $(IPKG_BUILD) $(IDIR_LOSETUP) $(PACKAGE_DIR) + $(IPKG_SWAP_UTILS): install -d -m0755 $(IDIR_SWAP_UTILS)/usr/sbin cp -fpR $(PKG_INSTALL_DIR)/sbin/mkswap $(IDIR_SWAP_UTILS)/usr/sbin/ diff --git a/package/util-linux/ipkg/fdisk.control b/package/util-linux/ipkg/fdisk.control index e34c91cbd..cf73e98df 100644 --- a/package/util-linux/ipkg/fdisk.control +++ b/package/util-linux/ipkg/fdisk.control @@ -2,4 +2,4 @@ Package: fdisk Priority: optional Section: admin Depends: -Description: A partition table manipulation utility +Description: Partition table manipulation utility diff --git a/package/util-linux/ipkg/losetup.control b/package/util-linux/ipkg/losetup.control new file mode 100644 index 000000000..502305058 --- /dev/null +++ b/package/util-linux/ipkg/losetup.control @@ -0,0 +1,5 @@ +Package: losetup +Priority: optional +Section: admin +Depends: kmod-loop +Description: Loop devices setup and control utility -- cgit v1.2.3 From 82daa5e9c007b2a16aa9e8c5526fd8d034ee4541 Mon Sep 17 00:00:00 2001 From: mbm Date: Wed, 1 Feb 2006 23:53:19 +0000 Subject: change cp to $(CP) git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3112 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/util-linux/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'package/util-linux') diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index 7eb180173..6e8f5abd7 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -44,20 +44,20 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_FDISK): install -d -m0755 $(IDIR_FDISK)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/sbin/fdisk $(IDIR_FDISK)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/fdisk $(IDIR_FDISK)/usr/sbin/ $(RSTRIP) $(IDIR_FDISK) $(IPKG_BUILD) $(IDIR_FDISK) $(PACKAGE_DIR) $(IPKG_LOSETUP): install -d -m0755 $(IDIR_LOSETUP)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/sbin/losetup $(IDIR_LOSETUP)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/losetup $(IDIR_LOSETUP)/usr/sbin/ $(RSTRIP) $(IDIR_LOSETUP) $(IPKG_BUILD) $(IDIR_LOSETUP) $(PACKAGE_DIR) $(IPKG_SWAP_UTILS): install -d -m0755 $(IDIR_SWAP_UTILS)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/sbin/mkswap $(IDIR_SWAP_UTILS)/usr/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/sbin/swap{on,off} $(IDIR_SWAP_UTILS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/mkswap $(IDIR_SWAP_UTILS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/swap{on,off} $(IDIR_SWAP_UTILS)/usr/sbin/ $(RSTRIP) $(IDIR_SWAP_UTILS) $(IPKG_BUILD) $(IDIR_SWAP_UTILS) $(PACKAGE_DIR) -- cgit v1.2.3 From 737022a15e9e7b872ffd8220604f29c6e4bc399d Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 13 Apr 2006 22:20:15 +0000 Subject: remove lots of non-essential packages git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3641 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/util-linux/Config.in | 42 ----------------- package/util-linux/Makefile | 66 --------------------------- package/util-linux/ipkg/fdisk.control | 5 -- package/util-linux/ipkg/losetup.control | 5 -- package/util-linux/ipkg/swap-utils.control | 5 -- package/util-linux/patches/501-mconfig.patch | 68 ---------------------------- 6 files changed, 191 deletions(-) delete mode 100644 package/util-linux/Config.in delete mode 100644 package/util-linux/Makefile delete mode 100644 package/util-linux/ipkg/fdisk.control delete mode 100644 package/util-linux/ipkg/losetup.control delete mode 100644 package/util-linux/ipkg/swap-utils.control delete mode 100644 package/util-linux/patches/501-mconfig.patch (limited to 'package/util-linux') diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in deleted file mode 100644 index 8faceb6e7..000000000 --- a/package/util-linux/Config.in +++ /dev/null @@ -1,42 +0,0 @@ -menu "util-linux" - -config BR2_COMPILE_UTIL_LINUX - tristate - default n - depends BR2_PACKAGE_FDISK || BR2_PACKAGE_SWAP_UTILS - -config BR2_PACKAGE_FDISK - prompt "fdisk............................. Partition table manipulation utility" - tristate - default m if CONFIG_DEVEL - select BR2_COMPILE_UTIL_LINUX - help - A partition table manipulation utility - - http://www.kernel.org/pub/linux/utils/util-linux/ - -config BR2_PACKAGE_LOSETUP - prompt "losetup........................... Loop devices setup and control utility" - tristate - default m if CONFIG_DEVEL - select BR2_COMPILE_UTIL_LINUX - select BR2_PACKAGE_KMOD_LOOP - help - A loop devices setup and control utility - - http://www.kernel.org/pub/linux/utils/util-linux/ - -config BR2_PACKAGE_SWAP_UTILS - prompt "swap-utils........................ Swap space management utilities" - tristate - default m if CONFIG_DEVEL - select BR2_COMPILE_UTIL_LINUX - help - A collection of tools to manage swap space : - * mkswap - * swapon - * swapoff - - http://www.kernel.org/pub/linux/utils/util-linux/ - -endmenu diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile deleted file mode 100644 index 6e8f5abd7..000000000 --- a/package/util-linux/Makefile +++ /dev/null @@ -1,66 +0,0 @@ -# $Id$ - -include $(TOPDIR)/rules.mk - -PKG_NAME:=fdisk -PKG_VERSION:=2.12r -PKG_RELEASE:=1 -PKG_MD5SUM:=c261230b27fc0fbcc287c76884caf2d3 - -PKG_SOURCE_URL:=ftp://ftp.kernel.org/pub/linux/utils/util-linux/ \ - http://ftp.kernel.org/pub/linux/utils/util-linux/ \ - ftp://ftp.de.kernel.org/pub/linux/utils/util-linux/ \ - http://ftp.de.kernel.org/pub/linux/utils/util-linux/ -PKG_SOURCE:=util-linux-$(PKG_VERSION).tar.gz -PKG_CAT:=zcat -PKG_BUILD_DIR:=$(BUILD_DIR)/util-linux-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install - -include $(TOPDIR)/package/rules.mk - -$(eval $(call PKG_template,FDISK,fdisk,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,LOSETUP,losetup,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,SWAP_UTILS,swap-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) - -$(PKG_BUILD_DIR)/.configured: - (cd $(PKG_BUILD_DIR); \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ - LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ - ./configure \ - ); - touch $@ - -$(PKG_BUILD_DIR)/.built: - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) - $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - OPT="$(TARGET_CFLAGS)" \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - INSTALLSUID="install -m 4755" \ - all install - touch $@ - -$(IPKG_FDISK): - install -d -m0755 $(IDIR_FDISK)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/sbin/fdisk $(IDIR_FDISK)/usr/sbin/ - $(RSTRIP) $(IDIR_FDISK) - $(IPKG_BUILD) $(IDIR_FDISK) $(PACKAGE_DIR) - -$(IPKG_LOSETUP): - install -d -m0755 $(IDIR_LOSETUP)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/sbin/losetup $(IDIR_LOSETUP)/usr/sbin/ - $(RSTRIP) $(IDIR_LOSETUP) - $(IPKG_BUILD) $(IDIR_LOSETUP) $(PACKAGE_DIR) - -$(IPKG_SWAP_UTILS): - install -d -m0755 $(IDIR_SWAP_UTILS)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/sbin/mkswap $(IDIR_SWAP_UTILS)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/sbin/swap{on,off} $(IDIR_SWAP_UTILS)/usr/sbin/ - $(RSTRIP) $(IDIR_SWAP_UTILS) - $(IPKG_BUILD) $(IDIR_SWAP_UTILS) $(PACKAGE_DIR) - -mostlyclean: - -$(MAKE) -C $(PKG_BUILD_DIR) clean - rm -f $(PKG_BUILD_DIR)/.built diff --git a/package/util-linux/ipkg/fdisk.control b/package/util-linux/ipkg/fdisk.control deleted file mode 100644 index cf73e98df..000000000 --- a/package/util-linux/ipkg/fdisk.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: fdisk -Priority: optional -Section: admin -Depends: -Description: Partition table manipulation utility diff --git a/package/util-linux/ipkg/losetup.control b/package/util-linux/ipkg/losetup.control deleted file mode 100644 index 502305058..000000000 --- a/package/util-linux/ipkg/losetup.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: losetup -Priority: optional -Section: admin -Depends: kmod-loop -Description: Loop devices setup and control utility diff --git a/package/util-linux/ipkg/swap-utils.control b/package/util-linux/ipkg/swap-utils.control deleted file mode 100644 index c888251f6..000000000 --- a/package/util-linux/ipkg/swap-utils.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: swap-utils -Priority: optional -Section: admin -Depends: -Description: Swap space management utilities diff --git a/package/util-linux/patches/501-mconfig.patch b/package/util-linux/patches/501-mconfig.patch deleted file mode 100644 index 67e6530de..000000000 --- a/package/util-linux/patches/501-mconfig.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- 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 -- cgit v1.2.3 From f2361b8a13721df22fd39a64512943a14214286d Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 18 Jun 2006 19:16:08 +0000 Subject: add util-linux git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4000 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/util-linux/Makefile | 77 ++++++++++++++++++++++++++++ package/util-linux/patches/501-mconfig.patch | 68 ++++++++++++++++++++++++ 2 files changed, 145 insertions(+) create mode 100644 package/util-linux/Makefile create mode 100644 package/util-linux/patches/501-mconfig.patch (limited to 'package/util-linux') diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile new file mode 100644 index 000000000..ef28bdb69 --- /dev/null +++ b/package/util-linux/Makefile @@ -0,0 +1,77 @@ +# $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_MD5SUM:=c261230b27fc0fbcc287c76884caf2d3 + +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_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install + +include $(TOPDIR)/package/rules.mk + +define Package/fdisk +SECTION:=base +CATEGORY:=Utilities +TITLE:=Partition table manipulation utility +DESCRIPTION:=A partition table manipulation utility +URL:=http://www.kernel.org/pub/linux/utils/util-linux/ +endef + +define Package/losetup +$(call Package/fdisk) +TITLE:=Loopback devices setup and control utility +DESCRIPTION:=A loopback devices setup and control utility +endef + +define Package/swap-utils +$(call Package/fdisk) +TITLE:=Swap space management utilities +DESCRIPTION:=A collection of tools to manage swap space \\\ + * mkswap\\\ + * swapon\\\ + * swapoff +endef + +define Build/Compile + rm -rf $(PKG_INSTALL_DIR) + mkdir -p $(PKG_INSTALL_DIR) + $(MAKE) -C $(PKG_BUILD_DIR) \ + $(TARGET_CONFIGURE_OPTS) \ + OPT="$(TARGET_CFLAGS)" \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + INSTALLSUID="install -m 4755" \ + 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 000000000..67e6530de --- /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 -- cgit v1.2.3 From 859e8f7f7d8bfbefd610d338d16498190cd51e15 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 21 Jun 2006 02:16:37 +0000 Subject: build system cleanup. move shared include files into $(TOPDIR)/include, move lzma, mkfs.* into toolchain/ git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4032 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/util-linux/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/util-linux') diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index ef28bdb69..673ade433 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -16,7 +16,7 @@ PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk define Package/fdisk SECTION:=base -- cgit v1.2.3 From 0b0afa4d818ec18187b09055fbb8d84a01590d6e Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 21 Jun 2006 02:32:39 +0000 Subject: add INCLUDE_DIR variable for $(TOPDIR)/include git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4033 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/util-linux/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/util-linux') diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index 673ade433..798e3c857 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -16,7 +16,7 @@ PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/fdisk SECTION:=base -- cgit v1.2.3 From 02cdebbb91a33d8e24da1c94a9d93ac39be168a7 Mon Sep 17 00:00:00 2001 From: mbm Date: Tue, 27 Jun 2006 00:35:46 +0000 Subject: credit where credit is due git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4091 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/util-linux/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'package/util-linux') diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index 798e3c857..79517f9df 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -1,3 +1,9 @@ +# +# 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 -- cgit v1.2.3 From 5f28d6150ea16e19d1d528ae07dd9ac0ac296d51 Mon Sep 17 00:00:00 2001 From: malbon Date: Wed, 23 Aug 2006 16:38:52 +0000 Subject: Fix building util-linux under xscale git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4637 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches/601-util-linux-2.12r-umount-no-special.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 package/util-linux/patches/601-util-linux-2.12r-umount-no-special.patch (limited to 'package/util-linux') 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 000000000..d79598fc8 --- /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 + #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 */ -- cgit v1.2.3 From 6e891afbdd5e312380a2161dfa0aae0b39fd770b Mon Sep 17 00:00:00 2001 From: nico Date: Sat, 23 Sep 2006 19:32:32 +0000 Subject: standardize Makefile git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4845 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/util-linux/Makefile | 56 ++++++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 23 deletions(-) (limited to 'package/util-linux') diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index 79517f9df..18fb25146 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -11,51 +11,58 @@ include $(TOPDIR)/rules.mk PKG_NAME:=util-linux PKG_VERSION:=2.12r PKG_RELEASE:=1 -PKG_MD5SUM:=c261230b27fc0fbcc287c76884caf2d3 +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +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_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +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 -SECTION:=base -CATEGORY:=Utilities -TITLE:=Partition table manipulation utility -DESCRIPTION:=A partition table manipulation utility -URL:=http://www.kernel.org/pub/linux/utils/util-linux/ + $(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/fdisk) -TITLE:=Loopback devices setup and control utility -DESCRIPTION:=A loopback devices setup and control utility + $(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/fdisk) -TITLE:=Swap space management utilities -DESCRIPTION:=A collection of tools to manage swap space \\\ - * mkswap\\\ - * swapon\\\ - * swapoff + $(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 - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) - $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ + $(call Build/Compile/Default, \ OPT="$(TARGET_CFLAGS)" \ - DESTDIR="$(PKG_INSTALL_DIR)" \ INSTALLSUID="install -m 4755" \ - all install + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install \ + ) endef define Package/Template @@ -70,14 +77,17 @@ 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)) -- cgit v1.2.3 From 8afb23270d23db6a033ba8fb77e1cf1a1d925a7c Mon Sep 17 00:00:00 2001 From: nico Date: Sun, 24 Sep 2006 20:49:31 +0000 Subject: new (last?) attempt at standardizing Makefiles git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4855 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/util-linux/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/util-linux') diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index 18fb25146..8ca8052ea 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -12,7 +12,6 @@ PKG_NAME:=util-linux PKG_VERSION:=2.12r PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) 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)/ \ @@ -21,6 +20,7 @@ PKG_SOURCE_URL:=ftp://ftp.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 -- cgit v1.2.3