Add a patch from Alexander Holler to fix segfault with ipsec interfaces

[openwrt.git] / package / openwrt / Makefile

diff --git a/package/openwrt/Makefile b/package/openwrt/Makefile
index 2c695bc..7e7b954 100644 (file)
--- a/package/openwrt/Makefile
+++ b/package/openwrt/Makefile
@@ -1,53 +1,54 @@
+# $Id$
+
 include $(TOPDIR)/rules.mk
 
+PKG_NAME := openwrt-utils
+PKG_RELEASE := 1
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_RELEASE)_$(ARCH).ipk
+PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg
+
 SHARED_INCLUDE:=${shell pwd}/include
 
-libshared-compile libnvram-compile wlc-compile:
+libshared-compile libnvram-compile:
        @$(MAKE) -C $(patsubst %-compile,%,$@) compile
        
-libshared-install libnvram-install wlc-install:
+libshared-install libnvram-install: libshared-compile libnvram-compile
        @$(MAKE) -C $(patsubst %-install,%,$@) install
 
 libshared-clean libnvram-clean wlc-clean:
        @$(MAKE) -C $(patsubst %-clean,%,$@) clean
 
-$(TARGET_DIR)/sbin/mtd: mtd.c
+$(PKG_IPK_DIR)/sbin/mtd: mtd.c
+       mkdir -p $(PKG_IPK_DIR)/sbin
        $(TARGET_CC) -o $@ $<
-       $(STRIP) $@
 
-$(TARGET_DIR)/sbin/jffs2root: jffs2root.c
+$(PKG_IPK_DIR)/sbin/jffs2root: jffs2root.c
+       mkdir -p $(PKG_IPK_DIR)/sbin
        $(TARGET_CC) -o $@ $<
-       $(STRIP) $@
 
-# wlconf tool extracted from linksys firmware GPL.unpackedtree
-# WRT54GS_3_37_2_1109_US
-LINKSYS_TGZ_SITE=http://openwrt.openbsd-geek.de
-LINKSYS_WLCONF_TGZ=linksys-wlconf.tar.gz
-LINKSYS_WLCONF_DIR=$(BUILD_DIR)/linksys-wlconf
+$(PKG_IPK_DIR)/usr/sbin/wlc: wlc.c libshared-install
+       mkdir -p $(PKG_IPK_DIR)/usr/sbin
+       $(TARGET_CC) -o $@ $< -lshared -L./libshared -I$(SHARED_INCLUDE)
 
-$(DL_DIR)/$(LINKSYS_WLCONF_TGZ):
-       $(WGET) -P $(DL_DIR) $(LINKSYS_TGZ_SITE)/$(LINKSYS_WLCONF_TGZ)
+$(PKG_IPK): $(PKG_IPK_DIR)/sbin/mtd $(PKG_IPK_DIR)/sbin/jffs2root $(PKG_IPK_DIR)/usr/sbin/wlc
+       $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_RELEASE) $(ARCH)
+       $(STRIP) $(PKG_IPK_DIR)/usr/sbin/*
+       $(STRIP) $(PKG_IPK_DIR)/sbin/*
+       mkdir -p $(PACKAGE_DIR)
+       $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
 
-$(LINKSYS_WLCONF_DIR)/.unpacked: $(DL_DIR)/$(LINKSYS_WLCONF_TGZ)
-       zcat $(DL_DIR)/$(LINKSYS_WLCONF_TGZ) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-       touch $(LINKSYS_WLCONF_DIR)/.unpacked
-       
-$(TARGET_DIR)/usr/sbin/wlconf: $(LINKSYS_WLCONF_DIR)/.unpacked 
-       $(MAKE) -C $(LINKSYS_WLCONF_DIR) INSTALLDIR=$(TARGET_DIR) \
-               CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld STRIP="$(STRIP)" \
-               CFLAGS="$(TARGET_CFLAGS) -I. -I$(SHARED_INCLUDE) \
-                       -Wall -DOPENWRT_WLCONF" \
-               LDFLAGS="-lnvram -lshared" \
-                       install
-       $(STRIP) $@
-
-source:
+$(IPKG_STATE_DIR)/info/$(PKG_NAME).list: $(PKG_IPK)
+       $(IPKG) install $<
+
+source: 
 prepare: 
-compile: libnvram-compile libshared-compile wlc-compile
-install: libnvram-install libshared-install wlc-install \
-       $(TARGET_DIR)/sbin/mtd $(TARGET_DIR)/sbin/jffs2root $(TARGET_DIR)/usr/sbin/wlconf
-
-clean: libnvram-clean libshared-clean wlc-clean
-       rm -rf $(LINKSYS_WLCONF_DIR)
-       rm -f $(TARGET_DIR)/sbin/mtd
-       rm -f $(TARGET_DIR)/sbin/jffs2root
+compile: prepare libnvram-compile libshared-compile $(PKG_IPK) $(PKG_WLCOMPAT)
+       mkdir -p $(STAGING_DIR)/usr/include
+       cp -a ./include/* $(STAGING_DIR)/usr/include/
+install: libnvram-install libshared-install \
+        $(IPKG_STATE_DIR)/info/$(PKG_NAME).list \
+
+clean: libshared-clean libnvram-clean
+       rm -rf $(PKG_BUILD_DIR)
+       rm -f $(PKG_IPK)