浏览代码

- touchup a few bits that the submitter should have done in the first place

Bernhard Reutner-Fischer 18 年之前
父节点
当前提交
b861a915ba
共有 1 个文件被更改,包括 10 次插入1 次删除
  1. 10 1
      package/lm-sensors/lm-sensors.mk

+ 10 - 1
package/lm-sensors/lm-sensors.mk

@@ -29,6 +29,7 @@ ifneq ($(LM_SENSORS_PATCH),)
 		toolchain/patch-kernel.sh $(LM_SENSORS_DIR) $(LM_SENSORS_DIR)/debian/patches \*.patch; \
 		toolchain/patch-kernel.sh $(LM_SENSORS_DIR) $(LM_SENSORS_DIR)/debian/patches \*.patch; \
 	fi
 	fi
 endif
 endif
+	-$(SED) "s/-O[[:digit:]]//g" $(LM_SENSORS_DIR)/Makefile
 	touch $@
 	touch $@
 
 
 $(LM_SENSORS_DIR)/$(LM_SENSORS_BINARY): $(LM_SENSORS_DIR)/.unpacked
 $(LM_SENSORS_DIR)/$(LM_SENSORS_BINARY): $(LM_SENSORS_DIR)/.unpacked
@@ -38,6 +39,12 @@ $(LM_SENSORS_DIR)/$(LM_SENSORS_BINARY): $(LM_SENSORS_DIR)/.unpacked
 		DESTDIR=$(TARGET_DIR) user
 		DESTDIR=$(TARGET_DIR) user
 
 
 $(TARGET_DIR)/$(LM_SENSORS_TARGET_BINARY): $(LM_SENSORS_DIR)/$(LM_SENSORS_BINARY)
 $(TARGET_DIR)/$(LM_SENSORS_TARGET_BINARY): $(LM_SENSORS_DIR)/$(LM_SENSORS_BINARY)
+	if [ ! -f $(TARGET_DIR)/etc/sensors.conf ]; then \
+		cp -dpf $(LM_SENSORS_DIR)/etc/sensors.conf.eg \
+			$(TARGET_DIR)/etc/sensors.conf; \
+		$(SED) '/^#/d' -e '/^[[:space:]]*$$/d' \
+			$(TARGET_DIR)/etc/sensors.conf; \
+	fi
 	cp -dpf $(LM_SENSORS_DIR)/$(LM_SENSORS_BINARY) $@
 	cp -dpf $(LM_SENSORS_DIR)/$(LM_SENSORS_BINARY) $@
 	cp -dpf $(LM_SENSORS_DIR)/lib/libsensors.so* \
 	cp -dpf $(LM_SENSORS_DIR)/lib/libsensors.so* \
 		$(LM_SENSORS_DIR)/lib/libsensors.a $(TARGET_DIR)/usr/lib/
 		$(LM_SENSORS_DIR)/lib/libsensors.a $(TARGET_DIR)/usr/lib/
@@ -48,7 +55,9 @@ lm-sensors: uclibc libsysfs $(TARGET_DIR)/$(LM_SENSORS_TARGET_BINARY)
 
 
 lm-sensors-clean:
 lm-sensors-clean:
 	-$(MAKE) -C $(LM_SENSORS_DIR) clean
 	-$(MAKE) -C $(LM_SENSORS_DIR) clean
-	rm -f $(TARGET_DIR)/$(LM_SENSORS_TARGET_BINARY)
+	rm -f $(TARGET_DIR)/$(LM_SENSORS_TARGET_BINARY) \
+		$(TARGET_DIR)/lib/libsensors* \
+		$(TARGET_DIR)/etc/sensors.conf
 
 
 lm-sensors-dirclean:
 lm-sensors-dirclean:
 	rm -rf $(LM_SENSORS_DIR)
 	rm -rf $(LM_SENSORS_DIR)