Convert shat to new packaging style

SVN-Revision: 897

diff --git a/openwrt/package/shat/Makefile b/openwrt/package/shat/Makefile
index 4b845052dd75034ee2dbd99f246f8e31a71b121e..c13e0ddcb40aa4c91474eb232b58b61eda5fa15a 100644 (file)
--- a/openwrt/package/shat/Makefile
+++ b/openwrt/package/shat/Makefile
@@ -1,50 +1,35 @@
-#############################################################
-#
-# shat
-#
-#############################################################
+# $Id$
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=shat
 PKG_VERSION:=0.9.3
 PKG_RELEASE:=1
 PKG_MD5SUM:=9784cbee03529e6dab5fda683233dc32
+
 PKG_SOURCE_URL:=http://world.maxina.de/src/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/src
 PKG_CAT:=zcat
-PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg
 
-$(DL_DIR)/$(PKG_SOURCE):
-        $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+include $(TOPDIR)/package/rules.mk
 
-$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE)
-       $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-       touch $(PKG_BUILD_DIR)/.unpacked
+$(eval $(call PKG_template,SHAT,shat,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/shatd: $(PKG_BUILD_DIR)/.unpacked
-       $(MAKE) -C $(PKG_BUILD_DIR) \
+$(PKG_BUILD_DIR)/.configured:
+       touch $(PKG_BUILD_DIR)/.configured
+
+$(PKG_BUILD_DIR)/.built:
+       $(MAKE) -C $(PKG_BUILD_DIR)/src \
                CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld \
                CFLAGS="$(TARGET_CFLAGS) -Wall -I$(PKG_BUILD_DIR)/include/linux/include -I$(PKG_BUILD_DIR)/include -DVERSION=\\\"$(PKG_VERSION)\\\" -DDROP_NETBIOS"
-
-$(PKG_IPK): $(PKG_BUILD_DIR)/shatd
-       $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-       mkdir -p $(PKG_IPK_DIR)/usr/sbin
-       cp $(PKG_BUILD_DIR)/shatd $(PKG_IPK_DIR)/usr/sbin/
-       cp $(PKG_BUILD_DIR)/shatc $(PKG_IPK_DIR)/usr/sbin/
-       $(STRIP) $(PKG_IPK_DIR)/usr/sbin/*
-       mkdir -p $(PACKAGE_DIR)
-       $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
-
-$(IPKG_STATE_DIR)/info/shat.list: $(PKG_IPK)
-       $(IPKG) install $(PKG_IPK)
-
-source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.unpacked
-compile: $(PKG_IPK)
-install: $(IPKG_STATE_DIR)/info/shat.list
-
-clean:
-       rm -rf $(PKG_BUILD_DIR)
-       rm -f $(PKG_IPK)
+       touch $(PKG_BUILD_DIR)/.built
+
+$(IPKG_SHAT):
+       install -d -m0755 $(IDIR_SHAT)/usr/sbin
+       install -m0755 $(PKG_BUILD_DIR)/src/shatd $(IDIR_SHAT)/usr/sbin/
+       install -m0755 $(PKG_BUILD_DIR)/src/shatc $(IDIR_SHAT)/usr/sbin/
+       $(RSTRIP) $(IDIR_SHAT)
+       $(IPKG_BUILD) $(IDIR_SHAT) $(PACKAGE_DIR)

diff --git a/openwrt/package/shat/ipkg/shat.control b/openwrt/package/shat/ipkg/shat.control
new file mode 100644 (file)
index 0000000..bbbf074
--- /dev/null
+++ b/openwrt/package/shat/ipkg/shat.control
@@ -0,0 +1,8 @@
+Package: shat
+Priority: optional
+Section: net
+Version: 0.9.3-1
+Architecture: mipsel
+Maintainer: Georg Lukas <georg@boerde.de>
+Source: buildroot internal
+Description: Source Hardware Address Translation - a tool for "nomadic routing"

diff --git a/openwrt/package/shat/shat.control b/openwrt/package/shat/shat.control
deleted file mode 100644 (file)
index bbbf074..0000000
--- a/openwrt/package/shat/shat.control
+++ /dev/null
@@ -1,8 +0,0 @@
-Package: shat
-Priority: optional
-Section: net
-Version: 0.9.3-1
-Architecture: mipsel
-Maintainer: Georg Lukas <georg@boerde.de>
-Source: buildroot internal
-Description: Source Hardware Address Translation - a tool for "nomadic routing"