浏览代码

- it helps to apply the patches.. ;)
- mdadm-clean tried to uninstall mdadm from the host, which may not be what was intended in the end

Bernhard Reutner-Fischer 18 年之前
父节点
当前提交
8159d76b80
共有 1 个文件被更改,包括 6 次插入4 次删除
  1. 6 4
      package/mdadm/mdadm.mk

+ 6 - 4
package/mdadm/mdadm.mk

@@ -14,23 +14,25 @@ MDADM_TARGET_BINARY:=sbin/mdadm
 $(DL_DIR)/$(MDADM_SOURCE):
 	$(WGET) -P $(DL_DIR) $(MDADM_SITE)/$(MDADM_SOURCE)
 
-$(MDADM_DIR)/.source: $(DL_DIR)/$(MDADM_SOURCE)
+$(MDADM_DIR)/.unpacked: $(DL_DIR)/$(MDADM_SOURCE)
 	$(MDADM_CAT) $(DL_DIR)/$(MDADM_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	touch $(MDADM_DIR)/.source
+	toolchain/patch-kernel.sh $(MDADM_DIR) package/mdadm mdadm-$(MDADM_VERSION)\*.patch
+	touch $@
 
-$(MDADM_DIR)/$(MDADM_BINARY): $(MDADM_DIR)/.source
+$(MDADM_DIR)/$(MDADM_BINARY): $(MDADM_DIR)/.unpacked
 	$(MAKE) CFLAGS="$(TARGET_CFLAGS)" CC=$(TARGET_CC) -C $(MDADM_DIR)
 
 $(TARGET_DIR)/$(MDADM_TARGET_BINARY): $(MDADM_DIR)/$(MDADM_BINARY)
 	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(MDADM_DIR) install
 	rm -Rf $(TARGET_DIR)/usr/share/man
+	$(STRIP) -s $@
 
 mdadm: uclibc $(TARGET_DIR)/$(MDADM_TARGET_BINARY)
 
 mdadm-source: $(DL_DIR)/$(MDADM_SOURCE)
 
 mdadm-clean:
-	$(MAKE) prefix=$(TARGET_DIR)/usr -C $(MDADM_DIR) uninstall
+	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(MDADM_DIR) uninstall
 	-$(MAKE) -C $(MDADM_DIR) clean
 
 mdadm-dirclean: