memstat: bump to 0.8 and migrate to Makefile.package.in

Closes #1129

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/CHANGES b/CHANGES
index efc11367e902718d436c6ca0253eb8818c66ca5a..9b1c1af45f30455a5c268000422476d11b282c20 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,11 +6,13 @@
        X.org updated to 7.5.
 
        Updated/fixed packages: busybox, dosfstools, e2fsprogs,
-       libglib2, libpng, mtd-utils, pppd, setserial, squashfs, wget
+       libglib2, libpng, memstat, mtd-utils, pppd, setserial,
+       squashfs, wget
 
        Issues resolved (http://bugs.uclibc.org):
 
        #1111: Bump wget to 1.12 and migrate to Makefile.autotools.in
+       #1129: Bump memstat to 0.8 and migrate to Makefile.package.in
        #1273: BR2_INET_IPV6 does not enable IPv6 in pppd
        #1345: Bump pppd to 2.4.5 and convert to Makefile.autotools.in
 

diff --git a/package/memstat/memstat.mk b/package/memstat/memstat.mk
index a54509ac1354fff98517a3786cd06d1436f7529f..75c787507a19734e3ea11e4d65e751a1d609270a 100644 (file)
--- a/package/memstat/memstat.mk
+++ b/package/memstat/memstat.mk
@@ -4,48 +4,24 @@
 #
 #############################################################
 
-MEMSTAT_VERSION:=0.5
-MEMSTAT_SOURCE:=memstat_$(MEMSTAT_VERSION).tar.gz
-MEMSTAT_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/m/memstat
-MEMSTAT_DIR:=$(BUILD_DIR)/memstat-$(MEMSTAT_VERSION)
-
-$(DL_DIR)/$(MEMSTAT_SOURCE):
-       $(call DOWNLOAD,$(MEMSTAT_SITE),$(MEMSTAT_SOURCE))
-
-$(MEMSTAT_DIR)/.unpacked: $(DL_DIR)/$(MEMSTAT_SOURCE)
-       $(ZCAT) $(DL_DIR)/$(MEMSTAT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-       toolchain/patch-kernel.sh $(MEMSTAT_DIR) package/memstat/ memstat-$(MEMSTAT_VERSION)\*.patch
-       touch $@
-
-$(MEMSTAT_DIR)/.configured: $(MEMSTAT_DIR)/.unpacked
-       touch $@
-
-$(MEMSTAT_DIR)/memstat: $(MEMSTAT_DIR)/.configured
-       $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-               $(CFLAGS_WHOLE_PROGRAM) $(@D)/memstat.c -o $@
-
-$(TARGET_DIR)/usr/bin/memstat: $(MEMSTAT_DIR)/memstat
-       [ -e $(TARGET_DIR)/etc/memstat.conf ] || \
-               $(INSTALL) -m 0644 -D $(^D)/memstat.conf \
-                       $(TARGET_DIR)/etc/memstat.conf
-       $(INSTALL) -m 0755 -D $^ $@
-       $(STRIPCMD) $(STRIP_STRIP_ALL) $@
-
-memstat: $(TARGET_DIR)/usr/bin/memstat
-
-memstat-source: $(DL_DIR)/$(MEMSTAT_SOURCE)
-
-memstat-clean:
-       rm -f $(MEMSTAT_DIR)/memstat \
-               $(TARGET_DIR)/etc/memstat.conf $(TARGET_DIR)/usr/bin/memstat
-
-memstat-dirclean:
-       rm -rf $(MEMSTAT_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_MEMSTAT),y)
-TARGETS+=memstat
-endif
+MEMSTAT_VERSION = 0.8
+MEMSTAT_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/m/memstat
+MEMSTAT_SOURCE = memstat_$(MEMSTAT_VERSION).tar.gz
+
+define MEMSTAT_BUILD_CMDS
+       $(MAKE) CC=$(TARGET_CC) LD=$(TARGET_LD) CFLAGS="$(TARGET_CFLAGS)" \
+               -C $(@D) memstat
+endef
+
+define MEMSTAT_INSTALL_TARGET_CMDS
+       $(INSTALL) -D $(@D)/memstat.conf -m 0644 \
+               $(TARGET_DIR)/etc/memstat.conf
+       $(INSTALL) -D $(@D)/memstat $(TARGET_DIR)/usr/bin/memstat
+endef
+
+define MEMSTAT_UNINSTALL_TARGET_CMDS
+       rm -f $(TARGET_DIR)/etc/memstat.conf
+       rm -f $(TARGET_DIR)/usr/bin/memstat
+endef
+
+$(eval $(call GENTARGETS,package,memstat))