diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-03-03 08:52:56 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-03-03 08:52:56 +0000 |
| commit | bbdf9df60a72afd3e36c88e94e1f3fddf6cad185 (patch) | |
| tree | 0d8f7842a98d4c3fcda60bddd67129970dab51fb /package/util-linux/util-linux.mk | |
| parent | 890412421b1c5ef5dcc4fe9483fb172961adb973 (diff) | |
util-linux: bump version
Fixes #19
Diffstat (limited to 'package/util-linux/util-linux.mk')
| -rw-r--r-- | package/util-linux/util-linux.mk | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index cf8093afd..7814f1ce4 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -3,7 +3,7 @@ # util-linux # ############################################################# -UTIL-LINUX_VERSION:=2.12r +UTIL-LINUX_VERSION:=2.13-pre7 UTIL-LINUX_SOURCE:=util-linux-$(UTIL-LINUX_VERSION).tar.bz2 UTIL-LINUX_SITE:=$(BR2_KERNEL_MIRROR)/linux/utils/util-linux UTIL-LINUX_DIR:=$(BUILD_DIR)/util-linux-$(UTIL-LINUX_VERSION) @@ -11,15 +11,19 @@ UTIL-LINUX_CAT:=$(BZCAT) UTIL-LINUX_BINARY:=$(UTIL-LINUX_DIR)/misc-utils/chkdupexe UTIL-LINUX_TARGET_BINARY:=$(TARGET_DIR)/usr/bin/chkdupexe +# schedutils isn't support for all archs +ifneq ($(BR2_i386)$(BR2_powerpc)$(BR2_x86_64)$(BR2_ia64)$(BR2_alpha),) +UTIL-LINUX_SCHED_UTILS:=--enable-schedutils +else +UTIL-LINUX_SCHED_UTILS:=--disable-schedutils +endif + $(DL_DIR)/$(UTIL-LINUX_SOURCE): $(call DOWNLOAD,$(UTIL-LINUX_SITE),$(UTIL-LINUX_SOURCE)) $(UTIL-LINUX_DIR)/.unpacked: $(DL_DIR)/$(UTIL-LINUX_SOURCE) $(UTIL-LINUX_CAT) $(DL_DIR)/$(UTIL-LINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - toolchain/patch-kernel.sh $(UTIL-LINUX_DIR) package/util-linux/ util-linux\*.patch -ifneq ($(BR2_LARGEFILE),y) - $(SED) "/D_FILE_OFFSET_BITS/ d" $(UTIL-LINUX_DIR)/MCONFIG -endif touch $(UTIL-LINUX_DIR)/.unpacked $(UTIL-LINUX_DIR)/.configured: $(UTIL-LINUX_DIR)/.unpacked @@ -28,24 +32,21 @@ $(UTIL-LINUX_DIR)/.configured: $(UTIL-LINUX_DIR)/.unpacked $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --sbindir=/usr/sbin \ - --libdir=/lib \ - --libexecdir=/usr/lib \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --disable-use-tty-group \ + --prefix=/ \ + --exec-prefix=/ \ --sysconfdir=/etc \ --datadir=/usr/share \ --localstatedir=/var \ --mandir=/usr/man \ --infodir=/usr/info \ + $(UTIL-LINUX_SCHED_UTILS) \ $(DISABLE_NLS) \ $(DISABLE_LARGEFILE) \ ARCH=$(ARCH) \ ) - $(SED) "s,^INSTALLSUID=.*,INSTALLSUID=\\$$\(INSTALL\) -m \\$$\(BINMODE\)," \ - $(UTIL-LINUX_DIR)/MCONFIG - $(SED) "s,^USE_TTY_GROUP=.*,USE_TTY_GROUP=no," $(UTIL-LINUX_DIR)/MCONFIG touch $(UTIL-LINUX_DIR)/.configured $(UTIL-LINUX_BINARY): $(UTIL-LINUX_DIR)/.configured |