diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
| commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
| tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/util-linux-ng/Makefile | |
| parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
| parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'package/util-linux-ng/Makefile')
| -rw-r--r-- | package/util-linux-ng/Makefile | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/package/util-linux-ng/Makefile b/package/util-linux-ng/Makefile index 4df74bf10..ef7b4766d 100644 --- a/package/util-linux-ng/Makefile +++ b/package/util-linux-ng/Makefile @@ -4,29 +4,34 @@ include ${TOPDIR}/rules.mk PKG_NAME:= util-linux-ng -PKG_VERSION:= 2.15 +PKG_VERSION:= 2.17 PKG_RELEASE:= 1 -PKG_MD5SUM:= 18c9f263a44db67a73c12caf49b03e22 +PKG_MD5SUM:= b4c0f196de2f583a4ed91d6f53ba2d88 PKG_DESCR:= Linux utilities PKG_SECTION:= admin +PKG_BUILDDEP+= e2fsprogs ncurses PKG_URL:= http://userweb.kernel.org/~kzak/util-linux-ng -PKG_SITES:= ${MASTER_SITE_KERNEL:=utils/util-linux-ng/v2.15/} +PKG_SITES:= ${MASTER_SITE_KERNEL:=utils/util-linux-ng/v${PKG_VERSION}/} -PKG_DESCR_1:= Partition table manipulation utility -PKG_DESCR_2:= Swap space management utilities +PKG_DESCR_FDISK:= Partition table manipulation utility +PKG_DESCR_SFDISK:= Scriptable Partition table manipulation utility +PKG_DESCR_SWAP:= Swap space management utilities PKG_DEPENDS_SWAP:= libblkid -PKG_DESCR_3:= Loop devices setup and control utility -PKG_DEPENDS_3:= kmod-loop +PKG_DESCR_LOOP:= Loop devices setup and control utility +PKG_DEPENDS_LOOP:= kmod-blk-dev-loop include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,FDISK,fdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION})) -$(eval $(call PKG_template,SWAP_UTILS,swap-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_SWAP},${PKG_DESCR_2},${PKG_SECTION})) -$(eval $(call PKG_template,LOSETUP,losetup,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_3},${PKG_DESCR_3},${PKG_SECTION})) +$(eval $(call PKG_template,FDISK,fdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_FDISK},${PKG_SECTION})) +$(eval $(call PKG_template,SFDISK,sfdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_SFDISK},${PKG_SECTION})) +$(eval $(call PKG_template,SWAP_UTILS,swap-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_SWAP},${PKG_DESCR_SWAP},${PKG_SECTION})) +$(eval $(call PKG_template,LOSETUP,losetup,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_LOOP},${PKG_DESCR_LOOP},${PKG_SECTION})) -CONFIGURE_STYLE:= gnu -BUILD_STYLE:= auto -INSTALL_STYLE:= auto +CONFIGURE_ARGS+= --disable-use-tty-group \ + --disable-schedutils \ + --disable-cramfs \ + --disable-libblkid \ + --disable-libuuid MAKE_FLAGS+= OPT="${TCFLAGS}" ARCH="${ARCH}" FAKE_FLAGS+= INSTALLSUID="install -m 4755" TCFLAGS+= -DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK @@ -34,6 +39,8 @@ TCFLAGS+= -DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK post-install: ${INSTALL_DIR} ${IDIR_FDISK}/usr/sbin ${CP} ${WRKINST}/sbin/fdisk ${IDIR_FDISK}/usr/sbin/ + ${INSTALL_DIR} ${IDIR_SFDISK}/usr/sbin + ${CP} ${WRKINST}/sbin/sfdisk ${IDIR_SFDISK}/usr/sbin/ ${INSTALL_DIR} ${IDIR_LOSETUP}/usr/sbin ${CP} ${WRKINST}/sbin/losetup ${IDIR_LOSETUP}/usr/sbin/ ${INSTALL_DIR} ${IDIR_SWAP_UTILS}/usr/sbin |