X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/f80d4fdc68858ba956a39e19ad6efa868beb827e..387b2efd33e0d2aebb0ecb5e9422de37d19c23d3:/target/linux/package/openwrt/Makefile

diff --git a/target/linux/package/openwrt/Makefile b/target/linux/package/openwrt/Makefile
index 5d2ea199e..6fa350a9d 100644
--- a/target/linux/package/openwrt/Makefile
+++ b/target/linux/package/openwrt/Makefile
@@ -8,8 +8,8 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
 include $(TOPDIR)/package/rules.mk
 
-BR2_PACKAGE_OPENWRT:=y		# ignore menuconfig
-$(eval $(call PKG_template,OPENWRT,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+IDIR_OPENWRT:=$(PKG_BUILD_DIR)/ipkg
+IPKG_OPENWRT:=$(PACKAGE_DIR)/base-files-$(BOARD)_$(PKG_RELEASE)_$(ARCH).ipk
 
 $(PKG_BUILD_DIR)/.prepared:
 	mkdir -p $(PKG_BUILD_DIR)
@@ -21,7 +21,7 @@ $(PKG_BUILD_DIR)/jffs2root: jffs2root.c
 
 $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/jffs2root
 
-$(IDIR_OPENWRT)/sbin/jffs2root:
+$(IDIR_OPENWRT)/sbin/jffs2root: $(PKG_BUILD_DIR)/jffs2root
 	mkdir -p $(IDIR_OPENWRT)/sbin
 	cp $(PKG_BUILD_DIR)/jffs2root $(IDIR_OPENWRT)/sbin
 
@@ -30,14 +30,21 @@ endif
 
 $(PKG_BUILD_DIR)/.built:
 	touch $@
-
-$(IPKG_OPENWRT): 
-	mkdir -p $(IDIR_OPENWRT)/etc
-	cp files/network.overrides.$(BOARD) $(IDIR_OPENWRT)/etc/network.overrides
+	
+$(IDIR_OPENWRT):
+	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_OPENWRT) ipkg/base-files-arch.control $(PKG_RELEASE) $(ARCH)
+	$(SED) s,base-files-arch,base-files-$(BOARD),g $(IDIR_OPENWRT)/CONTROL/control
+
+$(IPKG_OPENWRT): $(IDIR_OPENWRT)
+	[ -d files/$(BOARD) ] && cp -a files/$(BOARD)/* $(IDIR_OPENWRT)/
+	find $(IDIR_OPENWRT) -name CVS | xargs rm -rf
+	find $(IDIR_OPENWRT) -name .svn | xargs rm -rf
 	$(RSTRIP) $(IDIR_OPENWRT)
 	$(IPKG_BUILD) $(IDIR_OPENWRT) $(PACKAGE_DIR)
 
-compile: install-dev
+install: compile
+	$(IPKG) install $(IPKG_OPENWRT)
+compile: install-dev $(IPKG_OPENWRT)
 install-dev:
 	mkdir -p $(STAGING_DIR)/usr/include
 	cp -a ./include/* $(STAGING_DIR)/usr/include/