Updated util-linux-ng to new bugfix version.

[people/arne_f/ipfire-3.x.git] / lfs / util-linux-ng

diff --git a/lfs/util-linux-ng b/lfs/util-linux-ng
index 9a58ffc9acfaf374f9d4b37cc8a4518f3bcc271c..de87a9b6ae28ee7bb2ee0c1c33bbc91fc132e3cc 100644 (file)
--- a/lfs/util-linux-ng
+++ b/lfs/util-linux-ng
@@ -25,13 +25,13 @@
 include Config
 
 PKG_NAME   = util-linux-ng
-VER        = 2.13.1
+PKG_VER    = 2.14.2
 
-THISAPP    = $(PKG_NAME)-$(VER)
+THISAPP    = $(PKG_NAME)-$(PKG_VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
-TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
 ###############################################################################
 # Top-level Rules
@@ -39,7 +39,7 @@ TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
 objects = $(DL_FILE)
 
-install : $(TARGET)
+install : $(OBJECT)
 
 download : $(objects)
 
@@ -50,14 +50,19 @@ $(objects) :
 # Installation Details
 ###############################################################################
 
-$(TARGET) : 
+$(OBJECT) : 
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 
 ifeq "$(STAGE)" "toolchain"
-       cd $(DIR_APP) && ./configure --prefix=$(TOOLS_DIR)
-       cd $(DIR_APP) && make -C mount mount umount
-       cd $(DIR_APP) && make -C text-utils more
+       # There's a bug with this version of Util-linux-ng and the E2fsprogs version
+       # we installed, so -luuid needs to be added.
+       cd $(DIR_APP) && \
+               ./configure \
+                       $(CONFIGURE_ARCH) \
+                       --prefix=$(TOOLS_DIR)
+       cd $(DIR_APP) && make -C mount mount umount $(PARALLELISMFLAGS)
+       cd $(DIR_APP) && make -C text-utils more $(PARALLELISMFLAGS)
        cd $(DIR_APP) && cp -v mount/{,u}mount text-utils/more $(TOOLS_DIR)/bin
 endif
 
@@ -65,7 +70,12 @@ ifeq "$(STAGE)" "base"
        cd $(DIR_APP) && sed -e 's@etc/adjtime@var/lib/hwclock/adjtime@g' \
            -i $$(grep -rl '/etc/adjtime' .)
        mkdir -pv /var/lib/hwclock
-       cd $(DIR_APP) && ./configure
+       cd $(DIR_APP) && \
+               ./configure \
+                       $(CONFIGURE_ARCH) \
+                       --enable-arch \
+                       --enable-partx \
+                       --enable-write
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
        cd $(DIR_APP) && make install