]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
Removed util-linux-ng from toolchain (mount isn't needed).
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 15 Jun 2009 07:33:28 +0000 (09:33 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 15 Jun 2009 07:33:28 +0000 (09:33 +0200)
lfs/util-linux-ng

index 7b8f65f8767cda6ae208d747bb2f53c3cdb81172..b7ed6a4739c41fb478965045b50c5481131a367b 100644 (file)
@@ -63,7 +63,9 @@ info:
 
 install: $(OBJECT)
 
-package:
+packages: $(PACKAGES)
+
+$(PACKAGES): $(OBJECT)
        @$(DO_PACKAGE)
 
 $(objects):
@@ -82,17 +84,6 @@ $(OBJECT): $(objects)
        cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-pic-fix-1.patch
        cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-uuid-fix-1.patch
 
-ifeq "$(STAGE)" "toolchain"
-       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
-
-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
@@ -138,7 +129,6 @@ ifeq "$(STAGE)" "base"
        #setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep /bin/mount
        #chmod -v -s /bin/umount
        #setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep /bin/umount
-endif
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)