瀏覽代碼

- repvik writes: e2fsprogs install several duplicate binaries that act slightly differently depending on what name they're called as. They can safely be removed and replaced with symlinks. This saves 480kb space.
Closes #1341

Bernhard Reutner-Fischer 18 年之前
父節點
當前提交
b7d87dd962
共有 1 個文件被更改,包括 10 次插入2 次删除
  1. 10 2
      package/e2fsprogs/e2fsprogs.mk

+ 10 - 2
package/e2fsprogs/e2fsprogs.mk

@@ -24,7 +24,7 @@ $(E2FSPROGS_DIR)/.unpacked: $(DL_DIR)/$(E2FSPROGS_SOURCE)
 	$(E2FSPROGS_CAT) $(DL_DIR)/$(E2FSPROGS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	toolchain/patch-kernel.sh $(E2FSPROGS_DIR) package/e2fsprogs/ e2fsprogs\*.patch
 	$(CONFIG_UPDATE) $(E2FSPROGS_DIR)/config
-	touch $(E2FSPROGS_DIR)/.unpacked
+	touch $@
 
 $(E2FSPROGS_DIR)/.configured: $(E2FSPROGS_DIR)/.unpacked
 	(cd $(E2FSPROGS_DIR); rm -rf config.cache; \
@@ -55,7 +55,7 @@ $(E2FSPROGS_DIR)/.configured: $(E2FSPROGS_DIR)/.unpacked
 		--without-catgets $(DISABLE_NLS) \
 		$(DISABLE_LARGEFILE) \
 	);
-	touch $(E2FSPROGS_DIR)/.configured
+	touch $@
 
 $(E2FSPROGS_DIR)/$(E2FSPROGS_BINARY): $(E2FSPROGS_DIR)/.configured
 	$(MAKE1) PATH=$(TARGET_PATH) -C $(E2FSPROGS_DIR)
@@ -68,6 +68,14 @@ $(E2FSPROGS_DIR)/$(E2FSPROGS_BINARY): $(E2FSPROGS_DIR)/.configured
 
 $(TARGET_DIR)/$(E2FSPROGS_TARGET_BINARY): $(E2FSPROGS_DIR)/$(E2FSPROGS_BINARY)
 	$(MAKE1) PATH=$(TARGET_PATH) DESTDIR=$(TARGET_DIR) -C $(E2FSPROGS_DIR) install
+	rm -rf ${TARGET_DIR}/sbin/mkfs.ext[23] ${TARGET_DIR}/sbin/fsck.ext[23] \
+		${TARGET_DIR}/sbin/findfs ${TARGET_DIR}/sbin/tune2fs
+	ln -sf mke2fs ${TARGET_DIR}/sbin/mkfs.ext2
+	ln -sf mke2fs ${TARGET_DIR}/sbin/mkfs.ext3
+	ln -sf e2fsck ${TARGET_DIR}/sbin/fsck.ext2
+	ln -sf e2fsck ${TARGET_DIR}/sbin/fsck.ext3
+	ln -sf e2label ${TARGET_DIR}/sbin/tune2fs
+	ln -sf e2label ${TARGET_DIR}/sbin/findfs
 	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
 		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
 	touch -c $(TARGET_DIR)/$(E2FSPROGS_TARGET_BINARY)